diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/calendar/base/content/dialogs/calendar-dialog-utils.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/calendar/base/content/dialogs/calendar-dialog-utils.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/calendar/base/content/dialogs/calendar-dialog-utils.js	2015-04-22 13:03:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/calendar/base/content/dialogs/calendar-dialog-utils.js	2015-04-24 19:30:09.000000000 +0000
@@ -318,7 +318,7 @@
         let propIterator = fixIterator(item.propertyEnumerator, Components.interfaces.nsIProperty);
         let propsToDelete = [
             prop.name
-            for each (prop in propIterator)
+            for (prop in propIterator)
             if (prop.name.substr(0, cmpLength) == cmp)
         ];
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/calendar/timezones/zones.json thunderbird-trunk-40.0~a1~hg20150424r17837.240895/calendar/timezones/zones.json
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/calendar/timezones/zones.json	2015-04-22 13:03:30.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/calendar/timezones/zones.json	2015-04-24 19:30:10.000000000 +0000
@@ -1,18 +1,42 @@
 {
-  "version": "2.2015a",
+  "version": "2.2015b",
   "aliases": {
+    "AUS Central Standard Time": {
+      "aliasTo": "Australia/Darwin"
+    },
+    "AUS Eastern Standard Time": {
+      "aliasTo": "Australia/Sydney"
+    },
+    "Afghanistan Standard Time": {
+      "aliasTo": "Asia/Kabul"
+    },
     "Africa/Asmera": {
       "aliasTo": "Africa/Asmara"
     },
     "Africa/Timbuktu": {
       "aliasTo": "Africa/Bamako"
     },
+    "Alaskan Standard Time": {
+      "aliasTo": "America/Anchorage"
+    },
     "America/Argentina/ComodRivadavia": {
       "aliasTo": "America/Argentina/Catamarca"
     },
     "America/Louisville": {
       "aliasTo": "America/Kentucky/Louisville"
     },
+    "Arab Standard Time": {
+      "aliasTo": "Asia/Riyadh"
+    },
+    "Arabian Standard Time": {
+      "aliasTo": "Asia/Dubai"
+    },
+    "Arabic Standard Time": {
+      "aliasTo": "Asia/Baghdad"
+    },
+    "Argentina Standard Time": {
+      "aliasTo": "America/Buenos_Aires"
+    },
     "Asia/Calcutta": {
       "aliasTo": "Asia/Kolkata"
     },
@@ -22,12 +46,87 @@
     "Asia/Saigon": {
       "aliasTo": "Asia/Ho_Chi_Minh"
     },
+    "Atlantic Standard Time": {
+      "aliasTo": "America/Halifax"
+    },
     "Atlantic/Faeroe": {
       "aliasTo": "Atlantic/Faroe"
     },
     "Atlantic/Jan_Mayen": {
       "aliasTo": "Europe/Oslo"
     },
+    "Azerbaijan Standard Time": {
+      "aliasTo": "Asia/Baku"
+    },
+    "Azores Standard Time": {
+      "aliasTo": "Atlantic/Azores"
+    },
+    "Bahia Standard Time": {
+      "aliasTo": "America/Bahia"
+    },
+    "Bangladesh Standard Time": {
+      "aliasTo": "Asia/Dhaka"
+    },
+    "Belarus Standard Time": {
+      "aliasTo": "Europe/Minsk"
+    },
+    "Canada Central Standard Time": {
+      "aliasTo": "America/Regina"
+    },
+    "Cape Verde Standard Time": {
+      "aliasTo": "Atlantic/Cape_Verde"
+    },
+    "Caucasus Standard Time": {
+      "aliasTo": "Asia/Yerevan"
+    },
+    "Cen. Australia Standard Time": {
+      "aliasTo": "Australia/Adelaide"
+    },
+    "Central America Standard Time": {
+      "aliasTo": "America/Guatemala"
+    },
+    "Central Asia Standard Time": {
+      "aliasTo": "Asia/Almaty"
+    },
+    "Central Brazilian Standard Time": {
+      "aliasTo": "America/Cuiaba"
+    },
+    "Central Europe Standard Time": {
+      "aliasTo": "Europe/Budapest"
+    },
+    "Central European Standard Time": {
+      "aliasTo": "Europe/Warsaw"
+    },
+    "Central Pacific Standard Time": {
+      "aliasTo": "Pacific/Guadalcanal"
+    },
+    "Central Standard Time": {
+      "aliasTo": "America/Chicago"
+    },
+    "Central Standard Time (Mexico)": {
+      "aliasTo": "America/Mexico_City"
+    },
+    "China Standard Time": {
+      "aliasTo": "Asia/Shanghai"
+    },
+    "E. Africa Standard Time": {
+      "aliasTo": "Africa/Nairobi"
+    },
+    "E. Australia Standard Time": {
+      "aliasTo": "Australia/Brisbane"
+    },
+    "E. South America Standard Time": {
+      "aliasTo": "America/Sao_Paulo"
+    },
+    "Eastern Standard Time": {
+      "aliasTo": "America/New_York"
+    },
+    "Egypt Standard Time": {
+      "aliasTo": "Africa/Cairo"
+    },
+    "Ekaterinburg Standard Time": {
+      "aliasTo": "Asia/Yekaterinburg"
+    },
     "Etc/GMT": {
       "aliasTo": "UTC"
     },
@@ -49,24 +148,222 @@
     "Europe/Belfast": {
       "aliasTo": "Europe/London"
     },
+    "FLE Standard Time": {
+      "aliasTo": "Europe/Kiev"
+    },
+    "Fiji Standard Time": {
+      "aliasTo": "Pacific/Fiji"
+    },
     "GMT": {
       "aliasTo": "UTC"
     },
+    "GMT Standard Time": {
+      "aliasTo": "Europe/London"
+    },
     "GMT+0": {
       "aliasTo": "UTC"
     },
     "GMT0": {
       "aliasTo": "UTC"
     },
+    "GTB Standard Time": {
+      "aliasTo": "Europe/Bucharest"
+    },
+    "Georgian Standard Time": {
+      "aliasTo": "Asia/Tbilisi"
+    },
+    "Greenland Standard Time": {
+      "aliasTo": "America/Godthab"
+    },
     "Greenwich": {
       "aliasTo": "UTC"
     },
+    "Greenwich Standard Time": {
+      "aliasTo": "Atlantic/Reykjavik"
+    },
+    "Hawaiian Standard Time": {
+      "aliasTo": "Pacific/Honolulu"
+    },
+    "India Standard Time": {
+      "aliasTo": "Asia/Calcutta"
+    },
+    "Iran Standard Time": {
+      "aliasTo": "Asia/Tehran"
+    },
+    "Israel Standard Time": {
+      "aliasTo": "Asia/Jerusalem"
+    },
+    "Jordan Standard Time": {
+      "aliasTo": "Asia/Amman"
+    },
+    "Kaliningrad Standard Time": {
+      "aliasTo": "Europe/Kaliningrad"
+    },
+    "Korea Standard Time": {
+      "aliasTo": "Asia/Seoul"
+    },
+    "Libya Standard Time": {
+      "aliasTo": "Africa/Tripoli"
+    },
+    "Line Islands Standard Time": {
+      "aliasTo": "Pacific/Kiritimati"
+    },
+    "Magadan Standard Time": {
+      "aliasTo": "Asia/Magadan"
+    },
+    "Mauritius Standard Time": {
+      "aliasTo": "Indian/Mauritius"
+    },
+    "Middle East Standard Time": {
+      "aliasTo": "Asia/Beirut"
+    },
+    "Montevideo Standard Time": {
+      "aliasTo": "America/Montevideo"
+    },
+    "Morocco Standard Time": {
+      "aliasTo": "Africa/Casablanca"
+    },
+    "Mountain Standard Time": {
+      "aliasTo": "America/Denver"
+    },
+    "Mountain Standard Time (Mexico)": {
+      "aliasTo": "America/Chihuahua"
+    },
+    "Myanmar Standard Time": {
+      "aliasTo": "Asia/Rangoon"
+    },
+    "N. Central Asia Standard Time": {
+      "aliasTo": "Asia/Novosibirsk"
+    },
+    "Namibia Standard Time": {
+      "aliasTo": "Africa/Windhoek"
+    },
+    "Nepal Standard Time": {
+      "aliasTo": "Asia/Katmandu"
+    },
+    "New Zealand Standard Time": {
+      "aliasTo": "Pacific/Auckland"
+    },
+    "Newfoundland Standard Time": {
+      "aliasTo": "America/St_Johns"
+    },
+    "North Asia East Standard Time": {
+      "aliasTo": "Asia/Irkutsk"
+    },
+    "North Asia Standard Time": {
+      "aliasTo": "Asia/Krasnoyarsk"
+    },
+    "Pacific SA Standard Time": {
+      "aliasTo": "America/Santiago"
+    },
+    "Pacific Standard Time": {
+      "aliasTo": "America/Los_Angeles"
+    },
+    "Pacific Standard Time (Mexico)": {
+      "aliasTo": "America/Santa_Isabel"
+    },
+    "Pakistan Standard Time": {
+      "aliasTo": "Asia/Karachi"
+    },
+    "Paraguay Standard Time": {
+      "aliasTo": "America/Asuncion"
+    },
+    "Romance Standard Time": {
+      "aliasTo": "Europe/Paris"
+    },
+    "Russia Time Zone 10": {
+      "aliasTo": "Asia/Srednekolymsk"
+    },
+    "Russia Time Zone 11": {
+      "aliasTo": "Asia/Kamchatka"
+    },
+    "Russia Time Zone 3": {
+      "aliasTo": "Europe/Samara"
+    },
+    "Russian Standard Time": {
+      "aliasTo": "Europe/Moscow"
+    },
+    "SA Eastern Standard Time": {
+      "aliasTo": "America/Cayenne"
+    },
+    "SA Pacific Standard Time": {
+      "aliasTo": "America/Bogota"
+    },
+    "SA Western Standard Time": {
+      "aliasTo": "America/La_Paz"
+    },
+    "SE Asia Standard Time": {
+      "aliasTo": "Asia/Bangkok"
+    },
+    "Samoa Standard Time": {
+      "aliasTo": "Pacific/Apia"
+    },
+    "Singapore Standard Time": {
+      "aliasTo": "Asia/Singapore"
+    },
+    "South Africa Standard Time": {
+      "aliasTo": "Africa/Johannesburg"
+    },
+    "Sri Lanka Standard Time": {
+      "aliasTo": "Asia/Colombo"
+    },
+    "Syria Standard Time": {
+      "aliasTo": "Asia/Damascus"
+    },
+    "Taipei Standard Time": {
+      "aliasTo": "Asia/Taipei"
+    },
+    "Tasmania Standard Time": {
+      "aliasTo": "Australia/Hobart"
+    },
+    "Tokyo Standard Time": {
+      "aliasTo": "Asia/Tokyo"
+    },
+    "Tonga Standard Time": {
+      "aliasTo": "Pacific/Tongatapu"
+    },
+    "Turkey Standard Time": {
+      "aliasTo": "Europe/Istanbul"
+    },
     "UCT": {
       "aliasTo": "UTC"
     },
+    "US Eastern Standard Time": {
+      "aliasTo": "America/Indianapolis"
+    },
+    "US Mountain Standard Time": {
+      "aliasTo": "America/Phoenix"
+    },
+    "Ulaanbaatar Standard Time": {
+      "aliasTo": "Asia/Ulaanbaatar"
+    },
     "Universal": {
       "aliasTo": "UTC"
     },
+    "Venezuela Standard Time": {
+      "aliasTo": "America/Caracas"
+    },
+    "Vladivostok Standard Time": {
+      "aliasTo": "Asia/Vladivostok"
+    },
+    "W. Australia Standard Time": {
+      "aliasTo": "Australia/Perth"
+    },
+    "W. Central Africa Standard Time": {
+      "aliasTo": "Africa/Lagos"
+    },
+    "W. Europe Standard Time": {
+      "aliasTo": "Europe/Berlin"
+    },
+    "West Asia Standard Time": {
+      "aliasTo": "Asia/Tashkent"
+    },
+    "West Pacific Standard Time": {
+      "aliasTo": "Pacific/Port_Moresby"
+    },
+    "Yakutsk Standard Time": {
+      "aliasTo": "Asia/Yakutsk"
+    },
     "Z": {
       "aliasTo": "UTC"
     },
@@ -1207,7 +1504,7 @@
       "longitude": "+1132800"
     },
     "Asia/Choibalsan": {
-      "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Choibalsan\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0800\r\nTZOFFSETTO:+0800\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE",
+      "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Choibalsan\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0800\r\nTZOFFSETTO:+0900\r\nTZNAME:CHOST\r\nDTSTART:19700328T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0900\r\nTZOFFSETTO:+0800\r\nTZNAME:CHOT\r\nDTSTART:19700926T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA\r\nEND:STANDARD\r\nEND:VTIMEZONE",
       "latitude": "+0480400",
       "longitude": "+1143000"
     },
@@ -1242,12 +1539,12 @@
       "longitude": "+0684800"
     },
     "Asia/Gaza": {
-      "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Gaza\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0300\r\nTZNAME:EEST\r\nDTSTART:19700326T235959\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1TH\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0300\r\nTZOFFSETTO:+0200\r\nTZNAME:EET\r\nDTSTART:19700925T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=FR\r\nEND:STANDARD\r\nEND:VTIMEZONE",
+      "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Gaza\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0300\r\nTZOFFSETTO:+0200\r\nTZNAME:EET\r\nDTSTART:19701023T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=FR\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0300\r\nTZNAME:EEST\r\nDTSTART:19700327T235959\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1FR\r\nEND:DAYLIGHT\r\nEND:VTIMEZONE",
       "latitude": "+0313000",
       "longitude": "+0342800"
     },
     "Asia/Hebron": {
-      "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Hebron\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0300\r\nTZNAME:EEST\r\nDTSTART:19700326T235959\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1TH\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0300\r\nTZOFFSETTO:+0200\r\nTZNAME:EET\r\nDTSTART:19700925T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=FR\r\nEND:STANDARD\r\nEND:VTIMEZONE",
+      "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Hebron\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0300\r\nTZOFFSETTO:+0200\r\nTZNAME:EET\r\nDTSTART:19701023T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=FR\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0300\r\nTZNAME:EEST\r\nDTSTART:19700327T235959\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1FR\r\nEND:DAYLIGHT\r\nEND:VTIMEZONE",
       "latitude": "+0313200",
       "longitude": "+0350542"
     },
@@ -1262,7 +1559,7 @@
       "longitude": "+1140900"
     },
     "Asia/Hovd": {
-      "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Hovd\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0700\r\nTZOFFSETTO:+0700\r\nTZNAME:HOVT\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE",
+      "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Hovd\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0700\r\nTZOFFSETTO:+0800\r\nTZNAME:HOVST\r\nDTSTART:19700328T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0800\r\nTZOFFSETTO:+0700\r\nTZNAME:HOVT\r\nDTSTART:19700926T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA\r\nEND:STANDARD\r\nEND:VTIMEZONE",
       "latitude": "+0480100",
       "longitude": "+0913900"
     },
@@ -1487,7 +1784,7 @@
       "longitude": "+1394441"
     },
     "Asia/Ulaanbaatar": {
-      "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Ulaanbaatar\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0800\r\nTZOFFSETTO:+0800\r\nTZNAME:ULAT\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE",
+      "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Ulaanbaatar\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0800\r\nTZOFFSETTO:+0900\r\nTZNAME:ULAST\r\nDTSTART:19700328T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0900\r\nTZOFFSETTO:+0800\r\nTZNAME:ULAT\r\nDTSTART:19700926T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA\r\nEND:STANDARD\r\nEND:VTIMEZONE",
       "latitude": "+0475500",
       "longitude": "+1065300"
     },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/chat/protocols/twitter/twitter.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/chat/protocols/twitter/twitter.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/chat/protocols/twitter/twitter.js	2015-04-22 13:03:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/chat/protocols/twitter/twitter.js	2015-04-24 19:30:10.000000000 +0000
@@ -863,9 +863,16 @@
     Services.obs.notifyObservers(this._browserRequest, "browser-request", null);
   },
   finishAuthorizationRequest: function() {
+    // Clean up the cookies, so that several twitter OAuth dialogs can work
+    // during the same session (bug 954308).
+    let cookies = Services.cookies.getCookiesFromHost("twitter.com");
+    while (cookies.hasMoreElements()) {
+      let cookie = cookies.getNext().QueryInterface(Ci.nsICookie2);
+      Services.cookies.remove(cookie.host, cookie.name, cookie.path, false);
+    }
+
     if (!("_browserRequest" in this))
       return;
-
     this._browserRequest._active = false;
     if ("_listener" in this._browserRequest)
       this._browserRequest._listener._cleanUp();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/chat/protocols/xmpp/xmpp-session.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/chat/protocols/xmpp/xmpp-session.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/chat/protocols/xmpp/xmpp-session.jsm	2015-04-22 13:03:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/chat/protocols/xmpp/xmpp-session.jsm	2015-04-24 19:30:10.000000000 +0000
@@ -68,6 +68,25 @@
                               Stanza.node("ping", Stanza.NS.ping)),
                     this.cancelDisconnectTimer, this);
   },
+  _lastReceiveTime: 0,
+  _lastSendTime: 0,
+  checkPingTimer(aJustSentSomething = false) {
+    // Don't start a ping timer if we're not fully connected yet.
+    if (this.onXmppStanza != this.stanzaListeners.accountListening)
+      return;
+    let now = Date.now();
+    if (aJustSentSomething)
+      this._lastSendTime = now;
+    else
+      this._lastReceiveTime = now;
+    // We only cancel the ping timer if we've both received and sent
+    // something in the last two minutes. This is because Openfire
+    // servers will disconnect us if we don't send anything for a
+    // couple of minutes.
+    if (Math.min(this._lastSendTime, this._lastReceiveTime) >
+        now - this.kTimeBeforePing)
+      this.resetPingTimer();
+  },
 
   get DEBUG() this._account.DEBUG,
   get LOG() this._account.LOG,
@@ -112,6 +131,7 @@
     if (aCallback)
       this._handlers.set(aStanza.attributes.id, aCallback.bind(aThis));
     this.send(aStanza.getXML());
+    this.checkPingTimer(true);
     return aStanza.attributes.id;
   },
 
@@ -174,8 +194,7 @@
 
   /* When incoming data is available to be parsed */
   onDataReceived: function(aData) {
-    if (this.onXmppStanza == this.stanzaListeners.accountListening)
-      this.resetPingTimer();
+    this.checkPingTimer();
     let istream = Cc["@mozilla.org/io/string-input-stream;1"]
                     .createInstance(Ci.nsIStringInputStream);
     istream.setData(aData, aData.length);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/debian/changelog thunderbird-trunk-40.0~a1~hg20150424r17837.240895/debian/changelog
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/debian/changelog	2015-04-22 15:15:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/debian/changelog	2015-04-24 20:09:23.000000000 +0000
@@ -1,4 +1,4 @@
-thunderbird-trunk (40.0~a1~hg20150421r17821.240313-0ubuntu1~umd1~utopic) utopic; urgency=medium
+thunderbird-trunk (40.0~a1~hg20150424r17837.240895-0ubuntu1~umd1~utopic) utopic; urgency=medium
 
   * Refresh patches
     - update debian/patches/unity-menubar.patch
@@ -11,7 +11,7 @@
   * Don't build with --enable-tests when the tests aren't enabled
     - update debian/config/mozconfig.in
 
- -- Chris Coulson <chris.coulson@canonical.com>  Wed, 22 Apr 2015 13:43:09 +0100
+ -- Chris Coulson <chris.coulson@canonical.com>  Thu, 02 Apr 2015 13:23:55 +0100
 
 thunderbird-trunk (39.0~a1~hg20150322r17686.234897-0ubuntu1) utopic; urgency=medium
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/debian/config/mozconfig.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/debian/config/mozconfig.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/debian/config/mozconfig.in	2015-04-22 15:15:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/debian/config/mozconfig.in	2015-04-24 20:09:23.000000000 +0000
@@ -38,6 +38,8 @@
 %%endif
 %%ifdef MOZ_WANT_UNIT_TESTS
 ac_add_options --enable-tests
+%%else
+ac_add_options --disable-tests
 %%endif
 %%ifdef MOZ_ENABLE_BREAKPAD
 ac_add_options --enable-crashreporter
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/im/app/profile/all-instantbird.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/im/app/profile/all-instantbird.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/im/app/profile/all-instantbird.js	2015-04-22 13:03:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/im/app/profile/all-instantbird.js	2015-04-24 19:30:11.000000000 +0000
@@ -259,9 +259,7 @@
 pref("network.protocol-handler.expose.javascript", true);
 
 // 0-Accept, 1-dontAcceptForeign, 2-dontUse
-// Reject all cookies, so that several twitter OAuth dialogs can work
-// during the same session. (See bug 875)
-pref("network.cookie.cookieBehavior", 2);
+pref("network.cookie.cookieBehavior", 0);
 
 // The breakpad report server to link to in about:crashes
 pref("breakpad.reportURL", "http://crash-stats.instantbird.com/report/index/");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/im/installer/package-manifest.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/im/installer/package-manifest.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/im/installer/package-manifest.in	2015-04-22 13:03:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/im/installer/package-manifest.in	2015-04-24 19:30:11.000000000 +0000
@@ -472,6 +472,7 @@
 @RESPATH@/components/dom_offline.xpt
 @RESPATH@/components/dom_permissionsettings.xpt
 @RESPATH@/components/dom_power.xpt
+@RESPATH@/components/dom_push.xpt
 @RESPATH@/components/dom_presentation.xpt
 @RESPATH@/components/dom_quota.xpt
 @RESPATH@/components/dom_range.xpt
@@ -599,6 +600,9 @@
 @RESPATH@/components/ConsoleAPI.manifest
 @RESPATH@/components/ContactManager.js
 @RESPATH@/components/ContactManager.manifest
+@RESPATH@/components/Push.js
+@RESPATH@/components/Push.manifest
+@RESPATH@/components/PushNotificationService.js
 @RESPATH@/components/contentAreaDropListener.js
 @RESPATH@/components/contentAreaDropListener.manifest
 @RESPATH@/components/devtools_security.xpt
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/changesets thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/changesets
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/changesets	2015-04-22 13:10:57.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/changesets	2015-04-24 19:33:30.000000000 +0000
@@ -11,7 +11,7 @@
 el 356:6b23a751385f
 en-GB 444:876cf60b4ae5
 es-AR 963:577f5ba7bc49
-es-ES 2411:f8f993041fae
+es-ES 2413:770841c27aa1
 et 530:54f9fbfcd622
 eu 379:d7df5b30dd48
 fi 557:9fa360eef979
@@ -24,7 +24,7 @@
 hu 794:b45f6b60407e
 id 579:5e7f7e580a19
 is 297:33af74865c25
-it 3879:55cc0a9ab337
+it 3889:37f425b74b04
 ja 693:9eeb2e8d96ff
 ja-JP-mac 694:6a82bb12ec37
 ka 56:2ee9bc162267
@@ -34,7 +34,7 @@
 nl 3828:a1a46f64e7f6
 nn-NO 636:2032d95af2a7
 pa-IN 589:b51530b15a00
-pl 5414:941b08f7a692
+pl 5422:5710ce5afbf0
 pt-BR 664:723658175bdd
 pt-PT 2124:f25649a63bdf
 rm 388:945a12b3635b
@@ -47,7 +47,7 @@
 sr 254:e6fa777ae177
 sv-SE 3063:a01161649deb
 ta-LK 112:187926d7b15b
-tr 702:bf1ec72502fb
+tr 719:39f6732b093d
 uk 1162:a5cf4538556c
 vi 126:57cb46a94324
 zh-CN 745:b67602d9ea30
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/dom/chrome/appstrings.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/dom/chrome/appstrings.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/dom/chrome/appstrings.properties	2015-04-22 13:08:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/dom/chrome/appstrings.properties	2015-04-24 19:32:36.000000000 +0000
@@ -28,6 +28,7 @@
 externalProtocolChkMsg = Ricorda la scelta effettuata per tutti i link di questo tipo.
 externalProtocolLaunchBtn = Avvia applicazione
 malwareBlocked = Il sito web %S è stato segnalato come sito web malevolo ed è stato bloccato sulla base delle impostazioni di sicurezza.
+unwantedBlocked = Il sito web %S è stato segnalato come un sito contenente software indesiderato ed è stato bloccato sulla base delle impostazioni di sicurezza.
 phishingBlocked = Il sito web %S è stato segnalato come sito contraffatto, realizzato per indurre gli utenti a rivelare informazioni personali o finanziarie.
 cspBlocked = Questa pagina presenta dei criteri sulla sicurezza dei contenuti che ne impediscono il caricamento con questa modalità.
 corruptedContentError = La pagina richiesta non può essere visualizzata a causa di un errore rilevato durante la trasmissione dei dati.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/dom/chrome/netError.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/dom/chrome/netError.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/dom/chrome/netError.dtd	2015-04-22 13:08:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/dom/chrome/netError.dtd	2015-04-24 19:32:36.000000000 +0000
@@ -61,6 +61,10 @@
 <!ENTITY malwareBlocked.longDesc "
 <p>I siti web maligni cercano di installare dei software in grado di sottrarre le informazioni personali degli utenti, sfruttare il computer per attaccare altre macchine o semplicemente danneggiare il sistema.</p>
 <p>Il responsabile di un sito web segnalato nell’elenco dei siti pericolosi, nel caso ritenesse tale segnalazione errata, può <a href='http://www.stopbadware.org/home/reviewinfo' >chiedere una nuova valutazione</a>.</p>">
+<!ENTITY unwantedBlocked.title "Segnalato sito contenente software indesiderato">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Questo tipo di siti cerca di installare programmi che possono risultare ingannevoli e avere conseguenze inaspettate sul sistema.</p>
+">
 <!ENTITY phishingBlocked.title "Sospetto sito contraffatto">
 <!ENTITY phishingBlocked.longDesc "
 <p>L’inserimento di informazioni personali in questa pagina può dare origine a furti d’identità o altre frodi.</p>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/toolkit/chrome/global/aboutServiceWorkers.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/toolkit/chrome/global/aboutServiceWorkers.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/toolkit/chrome/global/aboutServiceWorkers.properties	2015-04-22 13:08:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/toolkit/chrome/global/aboutServiceWorkers.properties	2015-04-24 19:32:36.000000000 +0000
@@ -15,3 +15,4 @@
 unregister = Deregistra
 waiting = In attesa…
 unregisterError = Deregistrazione del Service worker non riuscita.
+pushEndpoint = Endpoint push:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/toolkit/chrome/global/aboutSupport.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/toolkit/chrome/global/aboutSupport.properties	2015-04-22 13:08:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/toolkit/chrome/global/aboutSupport.properties	2015-04-24 19:32:36.000000000 +0000
@@ -46,6 +46,7 @@
 canSandboxMedia = Sandbox plugin multimediali
 multiProcessStatus = %1$S/%2$S (predefinito: %3$S)
 asyncPanZoom = Panoramica/zoom asincroni (APZ)
+apzNone = nessuno
 wheelEnabled = input rotella attivo
 touchEnabled = input touch attivo
 wheelWarning = input rotella asincrono disattivato a causa di una preferenza non supportata: %S
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/toolkit/chrome/places/places.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/toolkit/chrome/places/places.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/toolkit/chrome/places/places.properties	2015-04-22 13:08:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/toolkit/chrome/places/places.properties	2015-04-24 19:32:36.000000000 +0000
@@ -16,4 +16,3 @@
 finduri-MonthYear = %1$S %2$S
 localhost = (file locali)
 backupFileSizeText = %1$S %2$S
-windows8TouchTitle = Windows 8 Touch
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/it/webapprt/webapprt/overrides/appstrings.properties	2015-04-22 13:08:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/it/webapprt/webapprt/overrides/appstrings.properties	2015-04-24 19:32:36.000000000 +0000
@@ -28,6 +28,7 @@
 externalProtocolChkMsg = Ricorda la scelta effettuata per tutti i link di questo tipo.
 externalProtocolLaunchBtn = Avvia applicazione
 malwareBlocked = Il sito web %S è stato segnalato come sito web malevolo ed è stato bloccato sulla base delle impostazioni di sicurezza.
+unwantedBlocked = Il sito web %S è stato segnalato come un sito contenente software indesiderato ed è stato bloccato sulla base delle impostazioni di sicurezza.
 phishingBlocked = Il sito web %S è stato segnalato come sito contraffatto, realizzato per indurre gli utenti a rivelare informazioni personali o finanziarie.
 cspBlocked = Tentativo da parte dell’applicazione di accedere a una risorsa con criteri sulla sicurezza dei contenuti che ne impediscono il caricamento con questa modalità.
 corruptedContentError = Impossibile continuare il caricamento dell’applicazione a causa di un errore rilevato durante la trasmissione dei dati.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/pl/dom/chrome/dom/dom.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/pl/dom/chrome/dom/dom.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/pl/dom/chrome/dom/dom.properties	2015-04-22 13:09:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/pl/dom/chrome/dom/dom.properties	2015-04-24 19:32:55.000000000 +0000
@@ -149,4 +149,4 @@
 XMLDocumentLoadPrincipalMismatch=Użycie metody „document.load” jest zabronione dla dokumentów pochodzących z innych okien. Wyłącznie w oknie, w którym dokument został utworzony, można wykonać „.load” dla tego dokumentu. Zamiast tej metody, lepiej używać „XMLHttpRequest”.
 IndexedDBTransactionAbortNavigation=Nieukończona transakcja IndexedDB została przerwana przez nawigację.
 WillChangeBudgetWarning=Użycie pamięci przez własność „will-change” jest zbyt wysokie. Powierzchnia pokrywa %1$S pikseli, budżet jest powierzchnią dokumentu pomnożoną przez %2$S (%3$S pikseli). Wszystkie wystąpienia „will-change” w dokumencie będą ignorowane, gdy budżet zostanie przekroczony.
-HittingMaxWorkersPerDomain=ServiceWorker nie mógł zostać uruchomiony natychmiast, ponieważ inne dokumenty tego samego pochodzenia wyczerpują ich limit. ServiceWorker został skolejkowany i zostanie uruchomiony, gdy inne zakończą swoje działanie.
+HittingMaxWorkersPerDomain=Service worker nie mógł zostać uruchomiony natychmiast, ponieważ inne dokumenty tego samego pochodzenia wyczerpują ich limit, został skolejkowany i zostanie uruchomiony, gdy inne zakończą swoje działanie.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/pl/toolkit/chrome/global/aboutServiceWorkers.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/pl/toolkit/chrome/global/aboutServiceWorkers.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/pl/toolkit/chrome/global/aboutServiceWorkers.dtd	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/pl/toolkit/chrome/global/aboutServiceWorkers.dtd	2015-04-24 19:32:55.000000000 +0000
@@ -0,0 +1,8 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY aboutServiceWorkers.title "O Service workerach">
+<!ENTITY aboutServiceWorkers.maintitle "Zarejestrowane Service workery">
+<!ENTITY aboutServiceWorkers.warning_not_enabled "Obsługa Service workerów jest wyłączona .">
+<!ENTITY aboutServiceWorkers.warning_no_serviceworkers "Brak zarejestrowanych Service workerów.">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/pl/toolkit/chrome/global/aboutServiceWorkers.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/pl/toolkit/chrome/global/aboutServiceWorkers.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/pl/toolkit/chrome/global/aboutServiceWorkers.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/pl/toolkit/chrome/global/aboutServiceWorkers.properties	2015-04-24 19:32:55.000000000 +0000
@@ -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/.
+
+title=Źródło: %S
+b2gtitle=Firefox OS AppID %S - InBrowserElement %S
+scope=Zakres:
+scriptSpec=Specyfikacja skryptu:
+currentWorkerURL=Aktualny adres URL workera:
+activeCacheName=Aktywna pamięć podręczna:
+waitingCacheName=Oczekująca pamięć podręczna:
+true=true
+false=false
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/pl/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/pl/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/pl/toolkit/chrome/global/aboutSupport.dtd	2015-04-22 13:09:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/pl/toolkit/chrome/global/aboutSupport.dtd	2015-04-24 19:32:55.000000000 +0000
@@ -53,6 +53,7 @@
 
 <!ENTITY aboutSupport.appBasicsUserAgent "Identyfikator programu">
 <!ENTITY aboutSupport.appBasicsMemoryUse "Zużycie pamięci">
+<!ENTITY aboutSupport.appBasicsServiceWorkers "Zarejestrowane Service workery">
 <!ENTITY aboutSupport.appBasicsMultiProcessSupport "Okna wieloprocesowe">
 
 <!ENTITY aboutSupport.showDir.label "Otwórz katalog">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-04-22 13:09:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-04-24 19:32:55.000000000 +0000
@@ -104,6 +104,7 @@
 <!ENTITY cmd.installAddon.label               "Zainstaluj">
 <!ENTITY cmd.installAddon.accesskey           "Z">
 <!ENTITY cmd.debugAddon.label "Debuguj">
+<!ENTITY cmd.debugAddon.accesskey "D">
 <!ENTITY cmd.uninstallAddon.label             "Usuń">
 <!ENTITY cmd.uninstallAddon.accesskey         "U">
 <!ENTITY cmd.showPreferencesWin.label         "Opcje">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/chat/xmpp.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/chat/xmpp.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/chat/xmpp.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/chat/xmpp.properties	2015-04-24 19:33:21.000000000 +0000
@@ -68,6 +68,14 @@
 chatRoomField.nick=_Rumuz
 chatRoomField.password=_Parola
 
+# LOCALIZATION NOTE (conversation.muc.*):
+#   These are displayed as a system message when a chatroom invitation is
+#   received.
+#   %1$S is the inviter.
+#   %2$S is the room.
+#   %3$S is the reason which is a message provided by the person sending the
+#   invitation.
+
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
 #   account wizard windows.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/dom/chrome/accessibility/mac/accessible.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/dom/chrome/accessibility/mac/accessible.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/dom/chrome/accessibility/mac/accessible.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/dom/chrome/accessibility/mac/accessible.properties	2015-04-24 19:33:21.000000000 +0000
@@ -25,6 +25,8 @@
 # The Role Description for definition list dl, dt and dd
 term    =       terim
 definition =    tanım
+# The Role Description for an input type="search" text field
+searchTextField = arama metni alanı
 # The Role Description for WAI-ARIA Landmarks
 search  =       arama
 banner  =       banner
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/dom/chrome/dom/dom.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/dom/chrome/dom/dom.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/dom/chrome/dom/dom.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/dom/chrome/dom/dom.properties	2015-04-24 19:33:21.000000000 +0000
@@ -153,8 +153,6 @@
 ImplicitMetaViewportTagFallback=meta-viewport etiketi bulunamadı. Gelecek sürümlerde beklenmedik davranışsal değişiklikleri önlemek için lütfen bu etiketi tanımlayın. Daha fazla yardım için: https://developer.mozilla.org/tr/docs/Mozilla/Mobile/Viewport_meta_tag
 # LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent"
 DataContainerEventWarning=DataContainerEvent kullanımı eskimiştir. Onun yerine CustomEvent kullanın.
-# LOCALIZATION NOTE: Do not translate "sendAsBinary" or "send(Blob data)"
-SendAsBinaryWarning=Standart dışı sendAsBinary yönetimi eskimiştir ve yakında kaldırılacaktır. Onun yerine standart send(Blob data) yöntemini kullanın.
 # LOCALIZATION NOTE: Do not translate "window.controllers"
 Window_ControllersWarning=window.controllers eskimiştir. UA tespiti için kullanmayın.
 ImportXULIntoContentWarning=XUL düğümlerini içerik belgesine aktarmak eskimiştir. Bu işlev yakında kaldırılacaktır.
@@ -163,3 +161,5 @@
 IndexedDBTransactionAbortNavigation=Henüz tamamlanmamış bir IndexedDB işlemi, sayfa gezintisi nedeniyle iptal edildi.
 # LOCALIZATION NOTE (WillChangeBudgetWarning): Do not translate Will-change, %1$S,%2$S,%3$S are numbers.
 WillChangeBudgetWarning=Will-change bellek tüketimi çok yüksek. Yüzey alanı %1$S pikseli kaplıyor, bütçe ise %2$S ile çarpılmış belge yüzeyi alanıdır (%3$S piksel). Bütçe aşılırsa belgedeki tüm will-change değerleri görmezden gelinir.
+# LOCALIZATION NOTE: Do not translate "ServiceWorker".
+HittingMaxWorkersPerDomain=Bir ServiceWorker hemen başlatılamadı çünkü aynı kökendeki diğer belgeler zaten maksimum işçi sayısını kullanıyor. ServiceWorker sıraya alındı ve diğer işçilerden bazılarının işi bittikten sonra başlatılacak.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/dom/chrome/plugins.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/dom/chrome/plugins.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/dom/chrome/plugins.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/dom/chrome/plugins.properties	2015-04-24 19:33:21.000000000 +0000
@@ -19,12 +19,13 @@
 mimetype_label=MIME Türü
 description_label=Tanım
 suffixes_label=Son ekler
+learn_more_label=Daha fazla bilgi
 
 # GMP Plugins
 gmp_license_info=Lisans bilgileri
 
 openH264_name=OpenH264 Video Çözücü (Cisco Systems, Inc. tarafından sağlanmaktadır)
-openH264_description=Web videolarını oynatın ve video sohbetlere katılın.
+openH264_description2=Bu yan uygulama, WebRTC şartnamesine uyum sağlamak ve H.264 video çözücüye ihtiyaç duyan cihazlarda WebRTC görüşmeleri yapabilmek amacıyla Mozilla tarafından otomatik yüklenir. Çözücünün kaynak kodlarını görmek ve daha bilgi almak için http://www.openh264.org/ adresini ziyaret edin.
 
 eme-adobe_name=Primetime İçerik Çözme Modülü (Adobe Systems, Incorporated tarafından sağlanmaktadır)
 eme-adobe_description=Korumalı web videolarını oynatır.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/dom/chrome/security/caps.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/dom/chrome/security/caps.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/dom/chrome/security/caps.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/dom/chrome/security/caps.properties	2015-04-24 19:33:21.000000000 +0000
@@ -4,6 +4,7 @@
 CheckMessage = Bu kararı hatırla
 CheckLoadURIError = Güvenlik hatası: %S içeriği %S yükleyemez veya başka yere bağlanamaz.
 CheckSameOriginError = Güvenlik hatası: %S içeriği %S üzerinden veri yükleyemez.
+ExternalDataError = Güvenlik hatası: %S üzerindeki içerik %S yüklemeye çalıştı ama içerik resim olarak kullanıldığında dışarıdan veri yükleyemez.\u00A0
 
 # LOCALIZATION NOTE (GetPropertyDeniedOrigins):
 # %1$S is the origin of the script which was denied access.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/dom/chrome/security/security.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/dom/chrome/security/security.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/dom/chrome/security/security.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/dom/chrome/security/security.properties	2015-04-24 19:33:21.000000000 +0000
@@ -5,6 +5,17 @@
 
 # CORS
 # LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
+CORSDisabled=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS devre dışı.)
+CORSRequestFailed=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS isteği başarısız oldu.)
+CORSRequestNotHttp=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS isteği http değil.)
+CORSMissingAllowOrigin=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS üstbilgisi 'Access-Control-Allow-Origin' eksik.)
+CORSAllowOriginNotMatchingOrigin=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS üstbilgisi 'Access-Control-Allow-Origin', '%2$S' ile eşleşmiyor.)
+CORSMethodNotFound=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS üstbilgisi 'Access-Control-Allow-Methods'ta metot bulunamadı.)
+CORSMissingAllowCredentials=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS üstbilgisi 'Access-Control-Allow-Credentials'ta 'true' bekleniyordu.)
+CORSPreflightDidNotSucceed=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS başlatma kanalı başarısız oldu.)
+CORSInvalidAllowMethod=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS üstbilgisi 'Access-Control-Allow-Methods'ta geçersiz '%2$S' jetonu.)
+CORSInvalidAllowHeader=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS üstbilgisi 'Access-Control-Allow-Headers'ta geçersiz '%2$S' jetonu.)
+CORSMissingAllowHeaderFromPreflight=Çapraz köken isteği engellendi: Aynı Köken İlkesi, %1$S üzerindeki uzak kaynağın okunmasına izin vermiyor. (Sebep: CORS başlangıç kanalındaki CORS üstbilgisi 'Access-Control-Allow-Headers'ta geçersiz '%2$S' jetonu.)
 
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=Site geçersiz bir Strict-Transport-Security üstbilgisi belirtti.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/editor/ui/chrome/composer/editingOverlay.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/editor/ui/chrome/composer/editingOverlay.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/editor/ui/chrome/composer/editingOverlay.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/editor/ui/chrome/composer/editingOverlay.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -15,8 +15,8 @@
 <!ENTITY saveCmd.accesskey "d">
 <!ENTITY saveAsCmd.label "Farklı Kaydet…">
 <!ENTITY saveAsCmd.accesskey "F">
-<!ENTITY saveAsChangeEncodingCmd.label "Kaydet ve Karakter Kümesini Değiştir">
-<!ENTITY saveAsChangeEncodingCmd.accesskey "m">
+
+
 <!ENTITY publishCmd.label "Yayımla">
 <!ENTITY publishCmd.accesskey "Y">
 <!ENTITY publishCmd.key "S">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/editor/ui/chrome/dialogs/EditorSaveAsCharset.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/editor/ui/chrome/dialogs/EditorSaveAsCharset.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/editor/ui/chrome/dialogs/EditorSaveAsCharset.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/editor/ui/chrome/dialogs/EditorSaveAsCharset.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -4,12 +4,8 @@
 <!-- These strings are generic to all or most of the editor's dialogs. -->
 <!-- This button is for the progressive disclosure of additional editing functionality -->
 <!-- These strings are for use specifically in the editor's link dialog. -->
+<!ENTITY documentTitleTitle.label "Sayfa Başlığı">
 
 
-
-<!ENTITY windowTitle.label "Karakter Kümesini Kaydet ve Değiştir">
-<!ENTITY documentTitleTitle.label "Sayfa Başlığı">
-<!ENTITY documentCharsetTitle.label "Karakter Kümesi">
-<!ENTITY documentCharsetDesc.label "Belgeyi farklı kaydetmek istediğiniz karakter kümesini seçin:">
 <!ENTITY documentExportToText.label "Metin Olarak Dışa Aktar">
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/am-server-top.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/am-server-top.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/am-server-top.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/am-server-top.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -74,7 +74,7 @@
 <!ENTITY abbreviateOff.label "Kısa isimler (örnek, 'n.p.m.mail-news')">
 <!ENTITY advancedButton.label "Gelişmiş…">
 <!ENTITY advancedButton.accesskey "G">
-<!ENTITY serverDefaultCharset.label "Varsayılan karakter kodlaması:">
+
 <!ENTITY localPath.label "Yerel dizin:">
 <!ENTITY localFolderPicker.label "Yerel dizin seçin">
 <!ENTITY browseFolder.label "Gözat…">
@@ -86,5 +86,5 @@
 <!ENTITY accountSettingsDesc.label "Bu bir özel hesaptır. Bu hesaba ilişkin kimlik bulunmamaktadır.">
 <!ENTITY storeType.label "İleti Depolama Türü:">
 <!ENTITY storeType.accesskey "T">
-<!ENTITY mboxStore.label "Tek bir büyük dosya (mbox)">
+
 <!ENTITY maildirStore.label "Her ileti için bir dosya (maildir)">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/folderProps.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/folderProps.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/folderProps.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/folderProps.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -5,17 +5,17 @@
 <!ENTITY folderProps.windowtitle.label           "Özellikler">
 
 <!ENTITY generalInfo.label                       "Genel bilgiler">
-<!ENTITY folderCharsetFallback.label             "Alternatif karakter kodlaması:">
-<!ENTITY folderCharsetFallback.accesskey         "k">
-<!ENTITY folderCharsetEnforce.label              "Dizindeki tüm iletilere kodlamayı uygula (ayrı ileti karakter kodlama ayarları ve otomatik tespit görmezden gelinecek)">
-<!ENTITY folderCharsetEnforce.accesskey          "A">
+
+
+
+
 <!ENTITY folderRebuildSummaryFileTip2.label      "Özet dosyası indeksini yeniden oluştur">
 <!ENTITY folderRebuildSummaryFile2.label         "Dizini onar">
 <!ENTITY folderRebuildSummaryFile2.accesskey     "r">
 <!ENTITY folderRebuildSummaryFile.explanation    "Bazen dizin indeks dosyası (.msf) hasar görebilir ve iletiler eksik görünebilir veya silinmiş iletiler görünmeye devam edebilir. Dizini onarmak bu sorunları çözebilir.">
 <!ENTITY folderIncludeInGlobalSearch.label       "Bu dizindeki iletileri global arama sonuçlarına dâhil et">
 <!ENTITY folderIncludeInGlobalSearch.accesskey   "g">
-     
+
 <!ENTITY retention.label "Kayıt ilkeleri">
 <!ENTITY retentionUseAccount.label  "Hesap ayarlarımı kullan">
 <!ENTITY retentionUseAccount.accesskey "H">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-04-24 19:33:21.000000000 +0000
@@ -86,14 +86,11 @@
 ## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
 smtpSendFailedUnknownReason=İleti bilinmeyen bir sebepten ötürü %S Gönderme Sunucusu (SMTP) kullanılarak gönderilemedi. Gönderme Sunucusu (SMTP) ayarlarınızın doğruluğunu kontrol edip yeniden deneyin.
 
-# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainNoSsl): %S is the server hostname
-smtpAuthChangeEncryptToPlainNoSsl=%S Gönderme Sunucusu (SMTP)'nun şifrelenmiş parolaları desteklemediği görülüyor. Hesabı yeni eklediyseniz Hesap Ayarları'ndaki Sunucu Ayarları'nda yer alan Yetkilendirme Yöntemi'ni "Parola, güvensiz aktarım" olarak değiştirin. Eskiden işe yarıyor da şimdi yaramıyorsa, parolanızın çalınmış olduğundan şüphelenebilirsiniz.
+# LOCALIZATION NOTE (smtpHintAuthEncryptToPlainNoSsl): %S is the server hostname
 
-# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainSsl): %S is the server hostname
-smtpAuthChangeEncryptToPlainSsl=%S Gönderme Sunucusu (SMTP)'nun şifrelenmiş parolaları desteklemediği görülüyor. Hesabı yeni eklediyseniz Hesap Ayarları'ndaki Sunucu Ayarları'nda yer alan Yetkilendirme Yöntemi'ni 'Normal parola' olarak değiştirin.
+# LOCALIZATION NOTE (smtpHintAuthEncryptToPlainSsl): %S is the server hostname
 
-# LOCALIZATION NOTE (smtpAuthChangePlainToEncrypt): %S is the server hostname
-smtpAuthChangePlainToEncrypt=%S Gönderme Sunucusu (SMTP) düz metin olarak girilen parolaları desteklemiyor. Lütfen Hesap Ayarları'ndaki Sunucu Ayarları'nda yer alan Yetkilendirme Yöntemi'ni "Şifrelenmiş parola" olarak değiştirin.
+# LOCALIZATION NOTE (smtpHintAuthPlainToEncrypt): %S is the server hostname
 
 # LOCALIZATION NOTE (smtpAuthFailure): %S is the server hostname
 smtpAuthFailure=%S Gönderme Sunucusu (SMTP)'nda yetkilendirme sağlanamadı. Lütfen parolayı kontrol edin ve Hesap Ayarları'ndaki Sunucu Ayarları'nda yer alan Yetkilendirme Yöntemi'ni doğrulayın.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/messenger.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/messenger.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/messenger.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/messenger.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -192,6 +192,8 @@
 <!ENTITY sortByFromCmd.accesskey "ö">
 <!ENTITY sortByRecipientCmd.label "Alıcı">
 <!ENTITY sortByRecipientCmd.accesskey "c">
+
+
 <!ENTITY sortByUnreadCmd.label "Okunmuş">
 <!ENTITY sortByUnreadCmd.accesskey "ş">
 <!ENTITY sortByOrderReceivedCmd.label "Alma sırası">
@@ -658,6 +660,7 @@
 <!ENTITY threadColumn.label "Dizi">
 <!ENTITY fromColumn.label "Gönderen">
 <!ENTITY recipientColumn.label "Alıcı">
+
 <!ENTITY subjectColumn.label "Konu">
 <!ENTITY dateColumn.label "Tarih">
 <!ENTITY priorityColumn.label "Öncelik">
@@ -680,6 +683,7 @@
 <!ENTITY threadColumn2.tooltip "İleti dizilerini göster">
 <!ENTITY fromColumn2.tooltip "Gönderene göre sırala">
 <!ENTITY recipientColumn2.tooltip "Alıcıya göre sırala">
+
 <!ENTITY subjectColumn2.tooltip "Konuya göre sırala">
 <!ENTITY dateColumn2.tooltip "Tarihe göre sırala">
 <!ENTITY priorityColumn2.tooltip "Önceliğe göre sırala">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/preferences/advanced.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/preferences/advanced.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/preferences/advanced.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -16,7 +16,7 @@
 <!ENTITY allowHWAccel.accesskey        "d">
 <!ENTITY storeType.label               "Yeni hesaplarda İleti Depolama Türü">
 <!ENTITY storeType.accesskey           "T">
-<!ENTITY mboxStore.label               "Tek bir büyük dosya (mbox)">
+
 <!ENTITY maildirStore.label            "Her ileti için bir dosya (maildir)">
 
 <!ENTITY scrolling.label               "Kaydırma">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/preferences/fonts.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/preferences/fonts.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/preferences/fonts.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/preferences/fonts.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -8,8 +8,8 @@
 <!ENTITY  language.accesskey                      "D">
 
 <!ENTITY  size.label                              "Boyut:">
-<!ENTITY  proportionalSize.accesskey              "o">
-<!ENTITY  sizeMono.accesskey                      "u">
+
+
 
 <!ENTITY  proportional.label                      "Orantılı:">
 <!ENTITY  proportional.accesskey                  "O">
@@ -20,20 +20,16 @@
 <!ENTITY  sans-serif.accesskey                    "n">
 <!ENTITY  monospace.label                         "Monospace:">
 <!ENTITY  monospace.accesskey                     "M">
-
-<!ENTITY  font.langGroup.latin1                   "Batı Avrupa">
-<!ENTITY  font.langGroup.latin2                   "Orta Avrupa">
+<!-- LOCALIZATION NOTE (font.langGroup.latin) :
+     Translate "Latin" as the name of Latin (Roman) script, not as the name of the Latin language. -->
 <!ENTITY  font.langGroup.japanese                 "Japonca">
 <!ENTITY  font.langGroup.trad-chinese             "Geleneksel Çince (Tayvan)">
 <!ENTITY  font.langGroup.simpl-chinese            "Basitleştirilmiş Çince">
 <!ENTITY  font.langGroup.trad-chinese-hk          "Geleneksel Çince (Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Korece">
 <!ENTITY  font.langGroup.cyrillic                 "Kiril">
-<!ENTITY  font.langGroup.baltic                   "Baltık">
 <!ENTITY  font.langGroup.el                       "Yunanca">
-<!ENTITY  font.langGroup.turkish                  "Türkçe">
-<!ENTITY  font.langGroup.unicode1                 "Unicode">
-<!ENTITY  font.langGroup.user-def                 "Kullanıcı Tanımlı">
+
 <!ENTITY  font.langGroup.thai                     "Tay Dili">
 <!ENTITY  font.langGroup.hebrew                   "İbranice">
 <!ENTITY  font.langGroup.arabic                   "Arapça">
@@ -48,8 +44,12 @@
 <!ENTITY  font.langGroup.gurmukhi                 "Gurmukhi Dili">
 <!ENTITY  font.langGroup.khmer                    "Kamboçya Dili">
 <!ENTITY  font.langGroup.malayalam                "Malayalam">
-<!-- Minimum font size -->
 
+
+
+
+
+<!-- Minimum font size -->
 <!ENTITY minSize.label                            "En küçük yazı tipi boyutu:">
 <!ENTITY minSize.accesskey                        "z">
 <!ENTITY minSize.none                             "Hiçbiri">
@@ -68,10 +68,10 @@
 
 <!ENTITY sendDefaultCharset.label         "Giden Posta:">
 <!ENTITY sendDefaultCharset.accesskey     "d">
-<!ENTITY languagesTitle1.label            "Karakter Kümeleri">
-<!ENTITY composingDescription.label       "Alınan ve gönderilen e-postalar için varsayılan karakter kodlamalarını ayarla">
+
+
 
 <!ENTITY viewDefaultCharsetList.label     "Gelen Posta:">
 <!ENTITY viewDefaultCharsetList.accesskey  "G">
-<!ENTITY replyInDefaultCharset2.label     "Mümkün olduğunda yanıtlarda varsayılan karakter kodlamasını kullan">
-<!ENTITY replyInDefaultCharset2.accesskey "y">
+
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/SearchDialog.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/SearchDialog.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/mail/chrome/messenger/SearchDialog.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/mail/chrome/messenger/SearchDialog.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -40,6 +40,7 @@
 <!ENTITY threadColumn.label "Dizi">
 <!ENTITY fromColumn.label "Gönderen">
 <!ENTITY recipientColumn.label "Alıcı">
+
 <!ENTITY subjectColumn.label "Konu">
 <!ENTITY dateColumn.label "Tarih">
 <!ENTITY priorityColumn.label "Öncelik">
@@ -61,6 +62,7 @@
 <!ENTITY threadColumn2.tooltip "İleti dizilerini göster">
 <!ENTITY fromColumn2.tooltip "Gönderene göre sırala">
 <!ENTITY recipientColumn2.tooltip "Alıcıya göre sırala">
+
 <!ENTITY subjectColumn2.tooltip "Konuya göre sırala">
 <!ENTITY dateColumn2.tooltip "Tarihe göre sırala">
 <!ENTITY priorityColumn2.tooltip "Önceliğe göre sırala">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/security/manager/chrome/pipnss/nsserrors.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/security/manager/chrome/pipnss/nsserrors.properties	2015-04-24 19:33:21.000000000 +0000
@@ -317,3 +317,4 @@
 MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=Sunucu sertifikasının yayımlanması için güvenilir öğe olmayan bir X.509 sürüm 1 sertifikası kullanıldı. X.509 sürüm 1 sertifikaları eskimiştir ve diğer sertifikaları imzalamak için kullanılmamalıdır.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=Sunucu, henüz geçerli olmayan bir sertifika sundu.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=Bu sunucunun sertifikasını yayımlamak için henüz geçerli olmayan bir sertifika kullanılmış.
+MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH=Sertifikanın imza alanındaki imza algoritması, signatureAlgorithm alanındaki algoritmayla eşleşmiyor.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/security/manager/chrome/pipnss/pipnss.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/security/manager/chrome/pipnss/pipnss.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/security/manager/chrome/pipnss/pipnss.properties	2015-04-24 19:33:21.000000000 +0000
@@ -268,6 +268,8 @@
 
 certErrorTrust_SelfSigned=Bu sertifika kendi kendine imzalandığı için sertifikaya güvenilmiyor.
 certErrorTrust_UnknownIssuer=Sertifikaya güvenilmiyor çünkü yayıncısının sertfikası tanınmıyor.
+certErrorTrust_UnknownIssuer2=Sunucu uygun aracı sertifikaları göndermiyor olabilir.
+certErrorTrust_UnknownIssuer3=Ek bir kök sertifikasının içe alınması gerekebilir.
 certErrorTrust_CaInvalid=Sertifikaya güvenilmiyor çünkü geçersiz bir sertifika makamı sertifikası tarafından verilmiş.
 certErrorTrust_Issuer=Yayıncısının sertifikasına güvenilmediği için bu sertifikaya güvenilmiyor.
 certErrorTrust_SignatureAlgorithmDisabled=Güvenli olmadığı için devre dışı bırakılmış bir imza algoritması ile imzalandığından, bu sertifikaya güvenilmiyor.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/security/manager/chrome/pippki/certManager.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/security/manager/chrome/pippki/certManager.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/security/manager/chrome/pippki/certManager.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/security/manager/chrome/pippki/certManager.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -39,10 +39,6 @@
 <!ENTITY certmgr.editcert.trustssl            "Bu sertifika, web sitelerini tanımlayabilir.">
 <!ENTITY certmgr.editcert.trustemail          "Bu sertifika posta kullanıcılarını tanımlayabilir.">
 <!ENTITY certmgr.editcert.trustobjsign        "Bu sertifika yazılım yayıncılarını tanımlayabilir.">
-<!ENTITY certmgr.editemailcert.title          "E-posta sertifikası güven ayarlarını düzenle">
-<!ENTITY certmgr.editemailcert.edittrust      "Sertifika güven ayarlarını düzenle:">
-<!ENTITY certmgr.editemailcert.dotrust        "Bu sertifikanın doğruluğuna güven.">
-<!ENTITY certmgr.editemailcert.donttrust      "Bu sertifikanın doğruluğuna güvenme.">
 
 <!ENTITY certmgr.deletecert.title             "Sertifikayı sil">
 
@@ -61,8 +57,6 @@
 <!ENTITY certmgr.view2.accesskey              "G">
 <!ENTITY certmgr.edit3.label                  "Güven ayarları...">
 <!ENTITY certmgr.edit3.accesskey              "G">
-<!ENTITY certmgr.editca.label                 "CA güvenini düzenle">
-<!ENTITY certmgr.editca.accesskey             "d">
 <!ENTITY certmgr.export.label                 "Dışa aktar…">
 <!ENTITY certmgr.export.accesskey             "D">
 <!ENTITY certmgr.delete2.label                "Sil…">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/security/manager/chrome/pippki/pippki.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/security/manager/chrome/pippki/pippki.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/security/manager/chrome/pippki/pippki.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/security/manager/chrome/pippki/pippki.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -14,11 +14,6 @@
 <!ENTITY resetPasswordButtonLabel "Sıfırla">
 <!ENTITY resetPassword.title  "Ana Parolayı Sıfırla">
 <!ENTITY resetPassword.text  "Eğer ana parolanızı sıfırlarsanız, web ve e-posta parolanız, form verileriniz, kişisel sertifikalarınız ve özel anahtarlarınız kaybolur. Ana parolanızı sıfırlamak istediğinizden emin misiniz?">
-<!-- Values for getpassword.xul -->
-
-<!ENTITY getPassword.title  "Ana parolanızı girin">
-<!ENTITY getPassword.tokenName2.label "Güvenlik aygıtı:">
-<!ENTITY getPassword.password.label "Parola:">
 <!-- Downloading a cert -->
 
 <!ENTITY downloadCert.title "Sertifika indiriliyor">
@@ -49,13 +44,6 @@
 
 <!ENTITY chooseToken.title  "Jeton Seçim Kutusu">
 <!ENTITY chooseToken.message1 "Lütfen bir jeton seçin.">
-
-<!ENTITY escrowWarn.title "Şifreleme anahtarı kopyası">
-<!ENTITY escrowWarn.message1 "Önemli: Bu sertifika makamı, özel şifreleme anahtarınızın bir yedeğini oluşturmak istiyor.">
-<!ENTITY escrowWarn.benefit1 "Bunun avantajı, özel şifreleme anahtarınızı kaybetmeniz hâlinde bu sertifika makamından bir kopyasını talep edebilecek olmanızdır.">
-<!ENTITY escrowWarn.message2 "Ancak bu durumda özel şireleme anahtarınız sertifika makamında tutulacaktır ve teoride şifrelenmiş e-posta ve belgelerinizi izniniz olmadan okumak amacıyla kullanılabilir.">
-<!ENTITY examineCert.label "Sertifikayı göster">
-<!ENTITY examineCert.accesskey "S">
 <!-- Strings for the CreateCertInfo dialog  -->
 
 <!ENTITY createCertInfo.title "Özel anahtar oluşturuluyor">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/security/manager/chrome/pippki/pippki.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/security/manager/chrome/pippki/pippki.properties	2015-04-24 19:33:21.000000000 +0000
@@ -12,11 +12,6 @@
 
 #For editing cert trust
 editTrustCA="%S" sertifikası bir Sertifika Makamını temsil ediyor.
-editTrustEmail="%S" sertifikasını yayımlayan:
-issuerNotTrusted=Bu sertifikayı yayımlayan sertifika makamına güvenmediğiniz için, burada aksi belirtilmediği sürece, bu sertifikanın doğruluğuna da güvenmiyorsunuz.
-issuerTrusted=Bu sertifikayı yayımlayan sertifika makamına güvendiğiniz için, burada aksi belirtilmediği sürece, bu sertifikanın doğruluğuna da güveniyorsunuz.
-issuerNotKnown=Bu sertifikayı yayımlayan sertifika makamını tanımadığınız için, burada aksi belirtilmediği sürece, bu sertifikanın doğruluğuna da güvenmiyorsunuz.
-issuerCertNotFound=Bu sertifika makamının sertifikası bulunamadı
 
 #For Deleting Certificates
 deleteSslCertConfirm3=Bu sunucu istisnalarını silmek istediğinizden emin misiniz?
@@ -74,14 +69,12 @@
 pageInfo_Privacy_Encrypted1=Bu sayfa size ulaşmadan önce şifrelendi.
 pageInfo_Privacy_Encrypted2=Şifreleme, bilgisayarlar arasındaki bilgi alışverişinin yetkisi olmayan üçüncü kişilerce görülmesini zorlaştırır. Dolayısıyla açtığınız bu sayfanın ağ üzerinde dolaşırken birileri tarafından görülme olasılığı çok azdır.
 pageInfo_MixedContent=Bağlantı kısmen şifrelenmiş
-pageInfo_Privacy_Broken1=Görüntülediğiniz sayfanın bazı kısımları, internet üzerinden aktarılmadan önce şifrelenmemiş veya şifreleme yeterince güçlü değil.
+pageInfo_Privacy_Broken2=Görüntülediğiniz sayfanın bazı kısımları, internet üzerinden aktarılmadan önce şifrelenmemiş veya şifreleme yeterince güçlü değil.
 
 #Cert Viewer
 certDetails=Sertifika görüntüleyicisi:
 notPresent=<Sertifikanın parçası değil>
 
-escrowFinalMessage=Kişisel anahtarınız korumak için, yalnızca "%S" kaynağına güveniyorsanız Tamam'a tıklayın.
-
 #Token Manager
 password_not_set=(ayarlı değil)
 failed_pw_change=Ana parola değiştirilemedi.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/aboutReader.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/aboutReader.properties	2015-04-24 19:33:21.000000000 +0000
@@ -18,20 +18,19 @@
 # LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
 aboutReader.fontTypeSample=Aa
 
-# LOCALIZATION NOTE (aboutReader.fontSizeSample): String used to sample a relative font size
-# for the font size setting. Tapping different samples will change the font size.
-aboutReader.fontSizeSample=A
-
-aboutReader.toolbar.close=Okuyucu görünümünü kapat
+aboutReader.toolbar.close=Okuyucu Görünümü'nü kapat
 aboutReader.toolbar.typeControls=Yazı denetimleri
-aboutReader.toolbar.addToReadingList=Okuma listesine ekle
-aboutReader.toolbar.removeFromReadingList=Okuma listesinden kaldır
-aboutReader.toolbar.openReadingList=Okuma listesini aç
-aboutReader.toolbar.closeReadingList=Okuma listesini kapat
+aboutReader.toolbar.addToReadingList=Okuma Listesi'ne ekle
+aboutReader.toolbar.removeFromReadingList=Okuma Listesi'nden kaldır
+aboutReader.toolbar.openReadingList=Okuma Listesi'ni aç
+aboutReader.toolbar.closeReadingList=Okuma Listesi'ni kapat
 aboutReader.toolbar.share=Paylaş
 
 aboutReader.footer.deleteThisArticle=Bu yazıyı sil
 
-# Reader View toolbar button
-readerView.enter=Okuyucu görünümüne geç
-readerView.close=Okuyucu görünümünü kapat
+# These are used for the Reader View toolbar button and the menuitem within the
+# View menu.
+readerView.enter=Okuyucu Görünümü'ne geç
+readerView.enter.accesskey=O
+readerView.close=Okuyucu Görünümü'nü kapat
+readerView.close.accesskey=O
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/aboutSupport.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/aboutSupport.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/aboutSupport.properties	2015-04-24 19:33:21.000000000 +0000
@@ -84,6 +84,9 @@
 loadedLibVersions = Kullanılan sürüm
 
 hasSeccompBPF = Seccomp-BPF (sistem çağrısı filtreleme)
+hasSeccompTSync = Seccomp işlem senkronizasyonu
+hasUserNamespaces = Kullanıcı isim uzayları
+hasPrivilegedUserNamespaces = Ayrıcalıklı işlemler için kullanıcı isim uzayları
 canSandboxContent = İçerik işlemi kum havuzu
 canSandboxMedia = Medya yan uygulaması kum havuzu
 
@@ -91,3 +94,11 @@
 # of windows, respectively, while %3$S will indicate whether windows are remote by default ('true'
 # or 'false')
 multiProcessStatus = %1$S/%2$S (varsayılan: %3$S)
+
+asyncPanZoom = Asenkron kaydır/yakınlaştır
+wheelEnabled = tekerlek girdisi etkin
+touchEnabled = dokunma girdisi etkin
+
+# LOCALIZATION NOTE %1 will be replaced with the key of a preference.
+wheelWarning = desteklenmeyen tercih nedeniyle asenkron tekerlek girdisi devre dışı bırakıldı: %S
+touchWarning = desteklenmeyen tercih nedeniyle asenkron dokunma girdisi devre dışı bırakıldı: %S
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/aboutTelemetry.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/aboutTelemetry.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/aboutTelemetry.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/aboutTelemetry.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -10,6 +10,8 @@
 
 <!ENTITY aboutTelemetry.generalDataSection "  Genel Veriler">
 
+<!ENTITY aboutTelemetry.telemetryLogSection "  Temeletry günlüğü">
+
 <!ENTITY aboutTelemetry.slowSqlSection "   Yavaş SQL Deyimleri ">
 
 <!ENTITY aboutTelemetry.chromeHangsSection "   Tarayıcı Takılmaları ">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/aboutTelemetry.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/aboutTelemetry.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/aboutTelemetry.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/aboutTelemetry.properties	2015-04-24 19:33:21.000000000 +0000
@@ -13,6 +13,14 @@
 
 generalDataHeadingValue = Değer
 
+telemetryLogTitle = Telemetry Günlüğü
+
+telemetryLogHeadingId = Kimlik
+
+telemetryLogHeadingTimestamp = Zaman damgası
+
+telemetryLogHeadingData = Veri
+
 slowSqlMain = Ana parçacıkta yavaş SQL deyimleri
 
 slowSqlOther = Yardımcı parçacıklarda yavaş SQL deyimleri
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/aboutWebrtc.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/aboutWebrtc.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/aboutWebrtc.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/aboutWebrtc.properties	2015-04-24 19:33:21.000000000 +0000
@@ -0,0 +1,119 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 (document_title, cannot_retrieve_log):
+# The text "WebRTC" is a proper noun and should not be translated.
+# It is the general label for the standards based technology. see http://www.webrtc.org
+document_title = WebRTC iç bilgileri
+cannot_retrieve_log = WebRTC günlük verileri alınamadı
+
+# LOCALIZATION NOTE (save_page_msg):
+# %1$S will be replaced by a full path file name: the target of the SavePage operation.
+save_page_msg = sayfa %1$S konumuna kaydedildi
+
+# LOCALIZATION NOTE (save_page_dialog_title): "about:webrtc" is a internal browser URL and should not be
+# translated. This string is used as a title for a file save dialog box.
+save_page_dialog_title = about:webrtc'yi farklı kaydet
+
+# LOCALIZATION NOTE (debug_mode_off_state_msg):
+# %1$S will be replaced by the full path file name of the debug log.
+debug_mode_off_state_msg = izleme günlüğü %1$S konumunda bulunabilir
+
+# LOCALIZATION NOTE (debug_mode_on_state_msg):
+# %1$S will be replaced by the full path file name of the debug log.
+debug_mode_on_state_msg = hata ayıklama modu etkin, izleme günlük konumu: %1$S
+
+# LOCALIZATION NOTE (aec_logging_msg_label, aec_logging_off_state_label,
+# aec_logging_on_state_label, aec_logging_on_state_msg):
+# AEC is an abbreviation for Acoustic Echo Cancellation.
+aec_logging_msg_label = AEC günlük kaydı
+aec_logging_off_state_label = AEC kaydını başlat
+aec_logging_on_state_label = AEC kaydını durdur
+aec_logging_on_state_msg = AEC kaydı etkin (Arayanla birkaç dakika konuştuktan sonra yakalamayı durdurun)
+
+# LOCALIZATION NOTE (aec_logging_off_state_msg):
+# %1$S will be replaced by the full path to the directory containing the captured log files.
+# AEC is an abbreviation for Acoustic Echo Cancellation.
+aec_logging_off_state_msg = yakalanan günlük dosyaları şurada bulunabilir: %1$S
+
+# LOCALIZATION NOTE (peer_connection_id_label): "PeerConnection" is a proper noun
+# associated with the WebRTC module. "ID" is an abbreviation for Identifier. This string
+# should not normally be translated and is used as a data label.
+peer_connection_id_label = PeerConnection kimliği
+
+# LOCALIZATION NOTE (sdp_heading, local_sdp_heading, remote_sdp_heading):
+# "SDP" is an abbreviation for Session Description Protocol, an IETF standard.
+# See http://wikipedia.org/wiki/Session_Description_Protocol
+sdp_heading = SDP
+local_sdp_heading = Yerel SDP
+remote_sdp_heading = Uzak SDP
+
+# LOCALIZATION NOTE (rtp_stats_heading): "RTP" is an abbreviation for the
+# Real-time Transport Protocol, an IETF specification, and should not
+# normally be translated. "Stats" is an abbreviation for Statistics.
+rtp_stats_heading = RTP istatistikleri
+
+# LOCALIZATION NOTE (ice_state, ice_stats_heading): "ICE" is an abbreviation
+# for Interactive Connectivity Establishment, which is an IETF protocol,
+# and should not normally be translated. "Stats" is an abbreviation for
+# Statistics.
+ice_state = ICE durumu
+ice_stats_heading = ICE istatistikleri
+
+# LOCALIZATION NOTE (av_sync_label): "A/V" stands for Audio/Video.
+# "sync" is an abbreviation for sychronization. This is used as
+# a data label.
+av_sync_label = A/V senkronizasyonu
+
+# LOCALIZATION NOTE (jitter_buffer_delay_label): A jitter buffer is an
+# element in the processing chain, see http://wikipedia.org/wiki/Jitter
+# This is used as a data label.
+jitter_buffer_delay_label = Kararsızlık-önbellek gecikmesi
+
+# LOCALIZATION NOTE (avg_bitrate_label, avg_framerate_label): "Avg." is an abbreviation
+# for Average. These are used as data labels.
+avg_bitrate_label = Ort. bit hızı
+avg_framerate_label = Ort. kare hızı
+
+# LOCALIZATION NOTE (local, remote): These adjectives are used to label a
+# line of statistics collected for a peer connection. The data represents
+# either the local or remote end of the connection.
+local = yerel
+remote = uzak
+
+# LOCALIZATION NOTE (nominated): This adjective is used to label a table column.
+# Cells in this column contain the localized javascript string representation of "true"
+# or are left blank.
+nominated = Aday
+
+# LOCALIZATION NOTE (selected): This adjective is used to label a table column.
+# Cells in this column contain the localized javascript string representation of "true"
+# or are left blank. This represents an attribute of an ICE candidate.
+selected = Seçildi
+
+save_page_label = Sayfayı kaydet
+debug_mode_msg_label = Hata ayıklama modu
+debug_mode_off_state_label = Hata ayıklama modunu başlat
+debug_mode_on_state_label = Hata ayıklama modunu durdur
+log_heading = Bağlantı günlüğü
+log_show_msg = günlüğü göster
+log_hide_msg = günlüğü gizle
+connection_closed = kapatıldı
+local_candidate = Yerel aday
+remote_candidate = Uzaktaki aday
+priority = Öncelik
+fold_show_msg = ayrıntıları göster
+fold_show_hint = bu bölümü genişletmek için tıklayın
+fold_hide_msg = ayrıntıları gizle
+fold_hide_hint = bu bölümü daraltmak için tıklayın
+dropped_frames_label = Atlanan kareler
+discarded_packets_label = Atılan paketler
+decoder_label = Çözücü
+encoder_label = Kodlayıcı
+received_label = Alınan
+packets = paket
+lost_label = Kaybolan
+jitter_label = Kararsızlık
+sent_label = Gönderilen
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/charsetMenu.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/charsetMenu.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/charsetMenu.dtd	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/charsetMenu.dtd	2015-04-24 19:33:21.000000000 +0000
@@ -2,5 +2,5 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY charsetMenu.label             "Karakter kodlaması">
-<!ENTITY charsetMenu.accesskey         "K">
+<!ENTITY charsetMenu2.label            "Metin kodlaması">
+<!ENTITY charsetMenu2.accesskey        "k">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/devtools/styleinspector.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/devtools/styleinspector.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/global/devtools/styleinspector.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/global/devtools/styleinspector.properties	2015-04-24 19:33:21.000000000 +0000
@@ -68,6 +68,10 @@
 # first opened and there's no node selected in the rule view.
 rule.empty=Hiçbir element seçilmedi.
 
+# LOCALIZATION NOTE (ruleView.selectorHighlighter.tooltip): Text displayed in a
+# tooltip when the mouse is over a selector highlighter icon in the rule view.
+rule.selectorHighlighter.tooltip=Bu seçiciyle eşleşen tüm elementleri işaretle
+
 # LOCALIZATION NOTE (ruleView.contextmenu.selectAll): Text displayed in the
 # rule view context menu.
 ruleView.contextmenu.selectAll=Tümünü seç
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties	2015-04-24 19:33:21.000000000 +0000
@@ -9,8 +9,3 @@
 itemWarnIntroSingle=Aşağıdaki öğenin kurulmasını istediniz:
 installButtonDisabledLabel=Kur (%S)
 installButtonLabel=Şimdi kur
-
-installComplete=Yazılım kurulumu tamamlandı. Değişikliklerin etkin olması için %S tekrar başlatılmalıdır.
-installCompleteTitle=Kurulum tamamlandı
-
-error-203=Öğe kurulum hatası
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/passwordmgr/passwordmgr.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/passwordmgr/passwordmgr.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/toolkit/chrome/passwordmgr/passwordmgr.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/toolkit/chrome/passwordmgr/passwordmgr.properties	2015-04-24 19:33:21.000000000 +0000
@@ -12,6 +12,9 @@
 # LOCALIZATION NOTE (rememberPasswordMsgNoUsername):
 # String is the login's hostname.
 rememberPasswordMsgNoUsername = %S parolasını hatırlamak ister misiniz?
+# LOCALIZATION NOTE (noUsernamePlaceholder):
+# This is displayed in place of the username when it is missing.
+noUsernamePlaceholder=Kullanıcı adı yok
 notNowButtonText = Şi&mdi değil
 notifyBarNotNowButtonText = Şimdi değil
 notifyBarNotNowButtonAccessKey = m
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/l10n/tr/webapprt/webapprt/overrides/appstrings.properties	2015-04-22 13:10:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/l10n/tr/webapprt/webapprt/overrides/appstrings.properties	2015-04-24 19:33:21.000000000 +0000
@@ -33,4 +33,4 @@
 cspBlocked=Bu uygulama, bu şekilde yüklenmesine izin vermeyen bir içerik güvenliği ilkesine sahip bir kaynağa erişmeye çalıştı.
 corruptedContentError=Veri aktarımında bir hata tespit edildiği için uygulama yüklenmeye devam edemiyor.
 remoteXUL=Uygulama, artık desteklenmeyen bir teknolojiyi kullanmaya çalıştı.
-sslv3Used=%S üzerinde SSLv3 kullanılıyor. Bu protokol kırılmış olduğu için bu uygulama %S üzerindeki verilerinizin güvenliğini garanti edemez.
+sslv3Used=Bu uygulama %S üzerindeki verilerinizin güvenliğini garanti edemiyor çünkü bu sitede kırılmış bir protokol olan SSLv3 kullanılıyor.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/base/content/folderPane.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/base/content/folderPane.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/base/content/folderPane.js	2015-04-22 13:03:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/base/content/folderPane.js	2015-04-24 19:30:08.000000000 +0000
@@ -2570,7 +2570,7 @@
 
     // Now delete the messages
     iter = fixIterator(folder.messages);
-    let messages = [m for each (m in iter)];
+    let messages = [m for (m in iter)];
     let children = toXPCOMArray(messages, Ci.nsIMutableArray);
     folder.deleteMessages(children, msgWindow, true, false, null, false);
   },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/components/preferences/preferences.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/components/preferences/preferences.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/components/preferences/preferences.xml	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/components/preferences/preferences.xml	2015-04-24 19:30:10.000000000 +0000
@@ -83,7 +83,8 @@
       <!-- Don't resize the window at pane change -->
       <field name="_shouldAnimate">false</field>
       <!-- Always use instantApply in Prefs in Tab -->
-      <property name="instantApply" readonly="true" onget="return true;"/>
+      <field name="_instantApplyInitialized">true</field>
+      <field name="instantApply">true</field>
       <method name="_selectPane">
         <parameter name="aPaneElement"/>
         <body>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/installer/package-manifest.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/installer/package-manifest.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/installer/package-manifest.in	2015-04-22 13:03:30.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/installer/package-manifest.in	2015-04-24 19:30:10.000000000 +0000
@@ -222,6 +222,9 @@
 @RESPATH@/components/gloda.manifest
 @RESPATH@/components/jsmimeemitter.js
 
+; OAuth2 for mail
+@RESPATH@/components/msgOAuth2Module.js
+
 ; New message notification
 @RESPATH@/components/newMailNotificationService.js
 
@@ -405,6 +408,7 @@
 @RESPATH@/components/dom_offline.xpt
 @RESPATH@/components/dom_json.xpt
 @RESPATH@/components/dom_power.xpt
+@RESPATH@/components/dom_push.xpt
 @RESPATH@/components/dom_quota.xpt
 @RESPATH@/components/dom_range.xpt
 @RESPATH@/components/dom_security.xpt
@@ -653,6 +657,9 @@
 @RESPATH@/components/PermissionSettings.js
 @RESPATH@/components/ContactManager.js
 @RESPATH@/components/ContactManager.manifest
+@RESPATH@/components/Push.js
+@RESPATH@/components/Push.manifest
+@RESPATH@/components/PushNotificationService.js
 @RESPATH@/components/TCPSocket.js
 @RESPATH@/components/TCPServerSocket.js
 @RESPATH@/components/TCPSocketParentIntermediary.js
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/linux/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/linux/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/linux/jar.mn	2015-04-22 13:03:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/linux/jar.mn	2015-04-24 19:30:11.000000000 +0000
@@ -254,6 +254,7 @@
   skin/classic/messenger/icons/arrow/foldercycler-arrow-right.png       (mail/icons/arrow/foldercycler-arrow-right.png)
   skin/classic/messenger/icons/connecting.png                 (mail/icons/connecting.png)
   skin/classic/messenger/icons/loading.png                    (mail/icons/loading.png)
+  skin/classic/messenger/icons/notloading.png                 (mail/icons/notloading.png)
   skin/classic/messenger/tagbg.png                            (mail/tagbg.png)
 % skin editor classic/1.0 %skin/classic/editor/
   skin/classic/editor/editor.css                              (editor/editor.css)
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/linux/mail/icons/notloading.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/linux/mail/icons/notloading.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/osx/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/osx/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/osx/jar.mn	2015-04-22 13:03:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/osx/jar.mn	2015-04-24 19:30:11.000000000 +0000
@@ -248,7 +248,9 @@
   skin/classic/messenger/icons/status-small@2x.png               (mail/icons/status-small@2x.png)
   skin/classic/messenger/icons/connecting.png                    (mail/icons/connecting.png)
   skin/classic/messenger/icons/loading.png                       (mail/icons/loading.png)
+  skin/classic/messenger/icons/notloading.png                    (mail/icons/notloading.png)
   skin/classic/messenger/icons/loading@2x.png                    (mail/icons/loading@2x.png)
+  skin/classic/messenger/icons/notloading@2x.png                 (mail/icons/notloading@2x.png)
   skin/classic/messenger/icons/junk.png                          (mail/icons/junk.png)
   skin/classic/messenger/icons/phishing.png                      (mail/icons/phishing.png)
   skin/classic/messenger/icons/remote-blocked.png                (mail/icons/remote-blocked.png)
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/osx/mail/icons/notloading@2x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/osx/mail/icons/notloading@2x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/osx/mail/icons/notloading.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/osx/mail/icons/notloading.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/osx/mail/messenger.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/osx/mail/messenger.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/osx/mail/messenger.css	2015-04-22 13:03:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/osx/mail/messenger.css	2015-04-24 19:30:11.000000000 +0000
@@ -50,9 +50,18 @@
 }
 
 @media (min-resolution: 2dppx) {
-  #wrapper-throbber-box > #throbber-box {
+  #throbber-box[busy="true"] {
     list-style-image: url("chrome://messenger/skin/icons/loading@2x.png");
   }
+
+  #throbber-box > image {
+    width: 17px;
+    margin: 0 4px;
+  }
+
+  #wrapper-throbber-box > #throbber-box {
+    list-style-image: url("chrome://messenger/skin/icons/notloading@2x.png");
+  }
 }
 
 /* ::::: online/offline icons ::::: */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/shared/mail/messenger.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/shared/mail/messenger.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/shared/mail/messenger.css	2015-04-22 13:03:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/shared/mail/messenger.css	2015-04-24 19:30:12.000000000 +0000
@@ -39,7 +39,7 @@
 }
 
 #wrapper-throbber-box > #throbber-box {
-  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
+  list-style-image: url("chrome://messenger/skin/icons/notloading.png");
 }
 
 /* ::::: online/offline icons ::::: */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/windows/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/windows/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/windows/jar.mn	2015-04-22 13:03:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/windows/jar.mn	2015-04-24 19:30:12.000000000 +0000
@@ -242,6 +242,7 @@
   skin/classic/messenger/tabs/stroke-start@2x.png             (mail/tabs/stroke-start@2x.png)
   skin/classic/messenger/icons/connecting.png                 (mail/icons/connecting.png)
   skin/classic/messenger/icons/loading.png                    (mail/icons/loading.png)
+  skin/classic/messenger/icons/notloading.png                 (mail/icons/notloading.png)
   skin/classic/messenger/icons/chat-toolbar.png               (mail/icons/chat-toolbar.png)
   skin/classic/messenger/icons/chat-toolbar-small.png         (mail/icons/chat-toolbar-small.png)
   skin/classic/messenger/icons/status.png                     (mail/icons/status.png)
@@ -555,6 +556,7 @@
   skin/classic/aero/messenger/icons/xp-pin-red.png                 (mail/icons/xp-pin-red.png)
   skin/classic/aero/messenger/icons/connecting.png                 (mail/icons/connecting.png)
   skin/classic/aero/messenger/icons/loading.png                    (mail/icons/loading.png)
+  skin/classic/aero/messenger/icons/notloading.png                 (mail/icons/notloading.png)
   skin/classic/aero/messenger/tagbg.png                            (mail/tagbg.png)
   skin/classic/aero/messenger/icons/download.png                   (mail/icons/download.png)
   skin/classic/aero/messenger/icons/download-inverted.png          (mail/icons/download-inverted.png)
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mail/themes/windows/mail/icons/notloading.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mail/themes/windows/mail/icons/notloading.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/addrbook/src/nsAbManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/addrbook/src/nsAbManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/addrbook/src/nsAbManager.cpp	2015-04-22 13:03:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/addrbook/src/nsAbManager.cpp	2015-04-24 19:30:09.000000000 +0000
@@ -246,7 +246,7 @@
     nsCString dirPrefId;
     directory->GetDirPrefId(dirPrefId);
     if (dirPrefId.Equals(aDirPrefId)) {
-      *aResult = directory;
+      directory.forget(aResult);
       return NS_OK;
     }
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/accountConfig.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/accountConfig.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/accountConfig.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/accountConfig.js	2015-04-24 19:30:09.000000000 +0000
@@ -50,6 +50,8 @@
    */
   incomingAlternatives : null,
   outgoingAlternatives : null,
+  // OAuth2 configuration, if needed.
+  oauthSettings : null,
   // just an internal string to refer to this. Do not show to user.
   id : null,
   // who created the config.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/createInBackend.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/createInBackend.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/createInBackend.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/createInBackend.js	2015-04-24 19:30:09.000000000 +0000
@@ -28,6 +28,11 @@
   if (config.rememberPassword && config.incoming.password.length)
     rememberPassword(inServer, config.incoming.password);
 
+  if (inServer.authMethod == Ci.nsMsgAuthMethod.OAuth2) {
+    inServer.setCharValue("oauth2.scope", config.oauthSettings.scope);
+    inServer.setCharValue("oauth2.issuer", config.oauthSettings.issuer);
+  }
+
   // SSL
   if (config.incoming.socketType == 1) // plain
     inServer.socketType = Ci.nsMsgSocketType.plain;
@@ -102,6 +107,14 @@
         rememberPassword(outServer, config.incoming.password);
     }
 
+    if (outServer.authMethod == Ci.nsMsgAuthMethod.OAuth2) {
+      let pref = "mail.smtpserver." + outServer.key + ".";
+      Services.prefs.setCharPref(pref + "oauth2.scope",
+                                 config.oauthSettings.scope);
+      Services.prefs.setCharPref(pref + "oauth2.issuer",
+                                 config.oauthSettings.issuer);
+    }
+
     if (config.outgoing.socketType == 1) // no SSL
       outServer.socketType = Ci.nsMsgSocketType.plain;
     else if (config.outgoing.socketType == 2) // SSL / TLS
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/emailWizard.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/emailWizard.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/emailWizard.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/emailWizard.js	2015-04-24 19:30:09.000000000 +0000
@@ -6,6 +6,7 @@
 Components.utils.import("resource:///modules/mailServices.js");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource:///modules/hostnameUtils.jsm");
+Components.utils.import("resource://gre/modules/OAuth2Providers.jsm");
 
 /**
  * This is the dialog opened by menu File | New account | Mail... .
@@ -34,8 +35,10 @@
 // from http://xyfer.blogspot.com/2005/01/javascript-regexp-email-validator.html
 var emailRE = /^[-_a-z0-9\'+*$^&%=~!?{}]+(?:\.[-_a-z0-9\'+*$^&%=~!?{}]+)*@(?:[-a-z0-9.]+\.[a-z]{2,6}|\d{1,3}(?:\.\d{1,3}){3})(?::\d+)?$/i;
 
-Cu.import("resource:///modules/gloda/log4moz.js");
-let gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard");
+if (typeof gEmailWizardLogger == "undefined") {
+  Cu.import("resource:///modules/gloda/log4moz.js");
+  var gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard");
+}
 
 var gStringsBundle;
 var gMessengerBundle;
@@ -181,6 +184,7 @@
         "authPasswordEncrypted");
     setLabelFromStringBundle("in-authMethod-kerberos", "authKerberos");
     setLabelFromStringBundle("in-authMethod-ntlm", "authNTLM");
+    setLabelFromStringBundle("in-authMethod-oauth2", "authOAuth2");
     setLabelFromStringBundle("out-authMethod-no", "authNo");
     setLabelFromStringBundle("out-authMethod-password-cleartext",
         "authPasswordCleartextViaSSL"); // will warn about insecure later
@@ -188,6 +192,7 @@
         "authPasswordEncrypted");
     setLabelFromStringBundle("out-authMethod-kerberos", "authKerberos");
     setLabelFromStringBundle("out-authMethod-ntlm", "authNTLM");
+    setLabelFromStringBundle("out-authMethod-oauth2", "authOAuth2");
 
     e("incoming_port").value = gStringsBundle.getString("port_auto");
     this.fillPortDropdown("smtp");
@@ -665,7 +670,7 @@
     assert(config instanceof AccountConfig,
         "BUG: Arg 'config' needs to be an AccountConfig object");
 
-    this._haveValidConfigForDomain = this._email.split("@")[1];;
+    this._haveValidConfigForDomain = this._email.split("@")[1];
 
     if (!this._realname || !this._email) {
       return;
@@ -792,6 +797,7 @@
           unknownString);
       let certStatus = gStringsBundle.getString(server.badCert ?
           "resultSSLCertWeak" : "resultSSLCertOK");
+      // TODO: we should really also display authentication method here.
       return gStringsBundle.getFormattedString(stringName,
           [ type, host, ssl, certStatus ]);
     };
@@ -1008,7 +1014,7 @@
     e("incoming_ssl").value = sanitize.enum(config.incoming.socketType,
                                             [ 0, 1, 2, 3 ], 0);
     e("incoming_authMethod").value = sanitize.enum(config.incoming.auth,
-                                                   [ 0, 3, 4, 5, 6 ], 0);
+                                                   [ 0, 3, 4, 5, 6, 10 ], 0);
     e("incoming_username").value = config.incoming.username;
     if (config.incoming.port) {
       e("incoming_port").value = config.incoming.port;
@@ -1017,6 +1023,19 @@
     }
     this.fillPortDropdown(config.incoming.type);
 
+    // If the hostname supports OAuth2 and imap is enabled, enable OAuth2.
+    let iDetails = OAuth2Providers.getHostnameDetails(config.incoming.hostname);
+    gEmailWizardLogger.info("OAuth2 details for incoming hostname " +
+                            config.incoming.hostname + " is " + iDetails);
+    e("in-authMethod-oauth2").hidden = !(iDetails && e("incoming_protocol").value == 1);
+    if (!e("in-authMethod-oauth2").hidden) {
+      config.oauthSettings = {};
+      [config.oauthSettings.issuer, config.oauthSettings.scope] = iDetails;
+      // oauthsettings are not stored nor changable in the user interface, so just
+      // store them in the base configuration.
+      this._currentConfig.oauthSettings = config.oauthSettings;
+    }
+
     // outgoing server
     e("outgoing_hostname").value = config.outgoing.hostname;
     e("outgoing_username").value = config.outgoing.username;
@@ -1026,14 +1045,27 @@
     e("outgoing_ssl").value = sanitize.enum(config.outgoing.socketType,
                                             [ 0, 1, 2, 3 ], 0);
     e("outgoing_authMethod").value = sanitize.enum(config.outgoing.auth,
-                                                   [ 0, 1, 3, 4, 5, 6 ], 0);
+                                                   [ 0, 1, 3, 4, 5, 6, 10 ], 0);
     if (config.outgoing.port) {
       e("outgoing_port").value = config.outgoing.port;
     } else {
       this.adjustOutgoingPortToSSLAndProtocol(config);
     }
-    // populate fields even if existingServerKey, in case user changes back
 
+    // If the hostname supports OAuth2 and imap is enabled, enable OAuth2.
+    let oDetails = OAuth2Providers.getHostnameDetails(config.outgoing.hostname);
+    gEmailWizardLogger.info("OAuth2 details for outgoing hostname " +
+                            config.outgoing.hostname + " is " + oDetails);
+    e("out-authMethod-oauth2").hidden = !oDetails;
+    if (!e("out-authMethod-oauth2").hidden) {
+      config.oauthSettings = {};
+      [config.oauthSettings.issuer, config.oauthSettings.scope] = oDetails;
+      // oauthsettings are not stored nor changable in the user interface, so just
+      // store them in the base configuration.
+      this._currentConfig.oauthSettings = config.oauthSettings;
+    }
+
+    // populate fields even if existingServerKey, in case user changes back
     if (config.outgoing.existingServerKey) {
       let menulist = e("outgoing_hostname");
       // We can't use menulist.value = config.outgoing.existingServerKey
@@ -1581,6 +1613,12 @@
         self._currentConfig.outgoing.auth = successfulConfig.outgoing.auth;
         self._currentConfig.incoming.username = successfulConfig.incoming.username;
         self._currentConfig.outgoing.username = successfulConfig.outgoing.username;
+
+        // We loaded dynamic client registration, fill this data back in to the
+        // config set.
+        if (successfulConfig.oauthSettings)
+          self._currentConfig.oauthSettings = successfulConfig.oauthSettings;
+
         self.finish();
       },
       function(e) // failed
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/emailWizard.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/emailWizard.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/emailWizard.xul	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/emailWizard.xul	2015-04-24 19:30:09.000000000 +0000
@@ -307,6 +307,7 @@
                 <menuitem id="in-authMethod-password-encrypted" value="4"/>
                 <menuitem id="in-authMethod-kerberos" value="5"/>
                 <menuitem id="in-authMethod-ntlm" value="6"/>
+                <menuitem id="in-authMethod-oauth2" value="10" hidden="true"/>
               </menupopup>
             </menulist>
           </row>
@@ -356,6 +357,7 @@
                 <menuitem id="out-authMethod-password-encrypted" value="4"/>
                 <menuitem id="out-authMethod-kerberos" value="5"/>
                 <menuitem id="out-authMethod-ntlm" value="6"/>
+                <menuitem id="out-authMethod-oauth2" value="10" hidden="true"/>
               </menupopup>
             </menulist>
           </row>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/guessConfig.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/guessConfig.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/guessConfig.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/guessConfig.js	2015-04-24 19:30:09.000000000 +0000
@@ -59,6 +59,13 @@
   assert(typeof(progressCallback) == "function", "need progressCallback");
   assert(typeof(successCallback) == "function", "need successCallback");
   assert(typeof(errorCallback) == "function", "need errorCallback");
+
+  // Servers that we know enough that they support OAuth2 do not need guessing.
+  if (resultConfig.incoming.auth == Ci.nsMsgAuthMethod.OAuth2) {
+    successCallback(resultConfig);
+    return null;
+  }
+
   if (!resultConfig)
     resultConfig = new AccountConfig();
   resultConfig.source = AccountConfig.kSourceGuess;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/readFromXML.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/readFromXML.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/readFromXML.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/readFromXML.js	2015-04-24 19:30:09.000000000 +0000
@@ -54,6 +54,16 @@
     throw exception ? exception : "need proper <domain> in XML";
   exception = null;
 
+  let oauthSettings = null;
+  if ("oauth2Settings" in clientConfigXML.clientConfig) {
+    oauthSettings = {};
+    oauthSettings.scope = sanitize.nonemptystring(
+      clientConfigXML.clientConfig.oauth2Settings.scope);
+    if (!oauthSettings.scope)
+      throw new Error("Malformed oauth2Settings in configuration XML");
+    d.oauthSettings = oauthSettings;
+  }
+
   // incoming server
   for (let iX of array_or_undef(xml.$incomingServer)) // input (XML)
   {
@@ -94,7 +104,13 @@
                 // @deprecated TODO remove
                 "secure" : Ci.nsMsgAuthMethod.passwordEncrypted,
                 "GSSAPI" : Ci.nsMsgAuthMethod.GSSAPI,
-                "NTLM" : Ci.nsMsgAuthMethod.NTLM });
+                "NTLM" : Ci.nsMsgAuthMethod.NTLM,
+                "OAuth2" : Ci.nsMsgAuthMethod.OAuth2 });
+
+          // If we're using OAuth2, but don't have working settings, bail.
+          if (iO.auth == Ci.nsMsgAuthMethod.OAuth2 && !oauthSettings)
+            continue;
+
           break; // take first that we support
         } catch (e) { exception = e; }
       }
@@ -175,7 +191,13 @@
                 "secure" : Ci.nsMsgAuthMethod.passwordEncrypted,
                 "GSSAPI" : Ci.nsMsgAuthMethod.GSSAPI,
                 "NTLM" : Ci.nsMsgAuthMethod.NTLM,
+                "OAuth2" : Ci.nsMsgAuthMethod.OAuth2,
               });
+
+          // If we're using OAuth2, but don't have working settings, bail.
+          if (oO.auth == Ci.nsMsgAuthMethod.OAuth2 && !oauthSettings)
+            continue;
+
           break; // take first that we support
         } catch (e) { exception = e; }
       }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/sanitizeDatatypes.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/sanitizeDatatypes.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/sanitizeDatatypes.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/sanitizeDatatypes.js	2015-04-24 19:30:09.000000000 +0000
@@ -118,7 +118,7 @@
 
     var uri;
     try {
-      uri = ioService().newURI(str, null, null);
+      uri = Services.io.newURI(str, null, null);
       uri = uri.QueryInterface(Ci.nsIURL);
     } catch (e) {
       throw new MalformedException("url_parsing.error", unchecked);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/util.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/util.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/util.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/util.js	2015-04-24 19:30:09.000000000 +0000
@@ -248,11 +248,13 @@
   return result;
 }
 
-let kDebug = false;
+if (typeof gEmailWizardLogger == "undefined") {
+  Cu.import("resource:///modules/gloda/log4moz.js");
+  var gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard");
+}
 function ddump(text)
 {
-  if (kDebug)
-    dump(text + "\n");
+  gEmailWizardLogger.info(text);
 }
 
 function debugObject(obj, name, maxDepth, curDepth)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/verifyConfig.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/verifyConfig.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/accountcreation/verifyConfig.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/accountcreation/verifyConfig.js	2015-04-24 19:30:09.000000000 +0000
@@ -30,6 +30,12 @@
  */
 
 Components.utils.import("resource:///modules/mailServices.js");
+Components.utils.import("resource://gre/modules/OAuth2Providers.jsm");
+
+if (typeof gEmailWizardLogger == "undefined") {
+  Cu.import("resource:///modules/gloda/log4moz.js");
+  var gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard");
+}
 
 function verifyConfig(config, alter, msgWindow, successCallback, errorCallback)
 {
@@ -63,10 +69,35 @@
     inServer.socketType = Ci.nsMsgSocketType.SSL;
   else if (config.incoming.socketType == 3) // STARTTLS
     inServer.socketType = Ci.nsMsgSocketType.alwaysSTARTTLS;
+
+  gEmailWizardLogger.info("Setting incoming server authMethod to " +
+                           config.incoming.auth);
   inServer.authMethod = config.incoming.auth;
 
   try {
-    if (inServer.password)
+    // Lookup issuer if needed.
+    if (config.incoming.auth == Ci.nsMsgAuthMethod.OAuth2 ||
+        config.outgoing.auth == Ci.nsMsgAuthMethod.OAuth2) {
+      if (!config.oauthSettings.issuer || !config.oauthSettings.scope) {
+        // lookup issuer or scope from hostname
+        let hostname = (config.incoming.auth == Ci.nsMsgAuthMethod.OAuth2) ?
+                       config.incoming.hostname : config.outgoing.hostname;
+        let hostDetails = OAuth2Providers.getHostnameDetails(hostname);
+        if (hostDetails)
+          [config.oauthSettings.issuer, config.oauthSettings.scope] = hostDetails;
+        if (!config.oauthSettings.issuer || !config.oauthSettings.scope)
+          throw "Could not get issuer for oauth2 authentication";
+      }
+      gEmailWizardLogger.info("Saving oauth parameters for issuer " +
+                               config.oauthSettings.issuer);
+      inServer.setCharValue("oauth2.scope", config.oauthSettings.scope);
+      inServer.setCharValue("oauth2.issuer", config.oauthSettings.issuer);
+      gEmailWizardLogger.info("OAuth2 issuer, scope is " +
+                              config.oauthSettings.issuer + ", " + config.oauthSettings.scope);
+    }
+
+    if (inServer.password ||
+        inServer.authMethod == Ci.nsMsgAuthMethod.OAuth2)
       verifyLogon(config, inServer, alter, msgWindow,
                   successCallback, errorCallback);
     else {
@@ -74,16 +105,20 @@
       MailServices.accounts.removeIncomingServer(inServer, true);
       successCallback(config);
     }
-  } catch (e) {
-    ddump("ERROR: verify logon shouldn't have failed");
-    errorCallback(e);
-    throw(e);
+    return;
+  }
+  catch (e) {
+    gEmailWizardLogger.error("ERROR: verify logon shouldn't have failed");
   }
-};
+  // Avoid pref pollution, clear out server prefs.
+  MailServices.accounts.removeIncomingServer(inServer, true);
+  errorCallback(e);
+}
 
 function verifyLogon(config, inServer, alter, msgWindow, successCallback,
                      errorCallback)
 {
+  gEmailWizardLogger.info("verifyLogon for server at " + inServer.hostName);
   // hack - save away the old callbacks.
   let saveCallbacks = msgWindow.notificationCallbacks;
   // set our own callbacks - this works because verifyLogon will
@@ -99,6 +134,7 @@
     // clear msgWindow so url won't prompt for passwords.
     uri.QueryInterface(Ci.nsIMsgMailNewsUrl).msgWindow = null;
   }
+  catch (e) { gEmailWizardLogger.error("verifyLogon failed: " + e); throw e;}
   finally {
     // restore them
     msgWindow.notificationCallbacks = saveCallbacks;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/AccountManager.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/AccountManager.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/prefs/content/AccountManager.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/prefs/content/AccountManager.js	2015-04-24 19:30:09.000000000 +0000
@@ -1563,16 +1563,24 @@
         const CATEGORY = "mailnews-accountmanager-extensions";
         let catEnum = catMan.enumerateCategory(CATEGORY);
         while (catEnum.hasMoreElements()) {
-          var string = Components.interfaces.nsISupportsCString;
-          var entryName = catEnum.getNext().QueryInterface(string).data;
-          var svc = Components.classes[catMan.getCategoryEntry(CATEGORY, entryName)]
-                              .getService(Ci.nsIMsgAccountManagerExtension);
-          if (svc.showPanel(server)) {
-            let bundleName = "chrome://" + svc.chromePackageName +
-                             "/locale/am-" + svc.name + ".properties";
-            let bundle = Services.strings.createBundle(bundleName);
-            let title = bundle.GetStringFromName("prefPanel-" + svc.name);
-            panelsToKeep.push({string: title, src: "am-" + svc.name + ".xul"});
+          let entryName = null;
+          try {
+            entryName = catEnum.getNext().QueryInterface(Ci.nsISupportsCString).data;
+            let svc = Components.classes[catMan.getCategoryEntry(CATEGORY, entryName)]
+                                .getService(Ci.nsIMsgAccountManagerExtension);
+            if (svc.showPanel(server)) {
+              let bundleName = "chrome://" + svc.chromePackageName +
+                               "/locale/am-" + svc.name + ".properties";
+              let bundle = Services.strings.createBundle(bundleName);
+              let title = bundle.GetStringFromName("prefPanel-" + svc.name);
+              panelsToKeep.push({string: title, src: "am-" + svc.name + ".xul"});
+            }
+          } catch(e) {
+            // Fetching of this extension panel failed so do not show it,
+            // just log error.
+            let extName = entryName || "(unknown)";
+            Components.utils.reportError("Error accessing panel from extension '" +
+                                         extName + "': " + e);
           }
         }
         amChrome = server.accountManagerChrome;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/search/content/FilterEditor.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/search/content/FilterEditor.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/search/content/FilterEditor.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/search/content/FilterEditor.js	2015-04-24 19:30:09.000000000 +0000
@@ -329,7 +329,7 @@
     disableDeferredAccount: function()
     {
       this.menuitemAfterPlugins.disabled = true;
-      this.checkboxOutgoing.disabled = true;
+      this.checkBoxOutgoing.disabled = true;
     }
   };
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/src/msgOAuth2Module.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/src/msgOAuth2Module.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/src/msgOAuth2Module.js	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/src/msgOAuth2Module.js	2015-04-24 19:30:09.000000000 +0000
@@ -9,6 +9,7 @@
 const Cr = Components.results;
 
 Components.utils.import("resource://gre/modules/OAuth2.jsm");
+Components.utils.import("resource://gre/modules/OAuth2Providers.jsm");
 Components.utils.import("resource://gre/modules/Preferences.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -22,19 +23,11 @@
   classID: Components.ID("{b63d8e4c-bf60-439b-be0e-7c9f67291042}"),
 
   _loadOAuthClientDetails(aIssuer) {
-    if (aIssuer == "accounts.google.com") {
-      // For the moment, these details are hard-coded, since Google does not
-      // provide dynamic client registration. Don't copy these values for your
-      // own application--register it yourself. This code (and possibly even the
-      // registration itself) will disappear when this is switched to dynamic
-      // client registration.
-      this._appKey = '406964657835-aq8lmia8j95dhl1a2bvharmfk3t1hgqj.apps.googleusercontent.com';
-      this._appSecret = 'kSmqreRr0qwBWJgbf5Y-PjSU';
-      this._authURI = "https://accounts.google.com/o/oauth2/auth";
-      this._tokenURI = "https://www.googleapis.com/oauth2/v3/token";
-    } else {
+    let details = OAuth2Providers.getIssuerDetails(aIssuer);
+    if (details)
+      [this._appKey, this._appSecret, this._authURI, this._tokenURI] = details;
+    else
       throw Cr.NS_ERROR_INVALID_ARGUMENT;
-    }
   },
   initFromSmtp(aServer) {
     return this._initPrefs("mail.smtpserver." + aServer.key + ".",
@@ -53,10 +46,10 @@
     // have them, we don't support OAuth2.
     if (!issuer || !scope) {
       // Since we currently only support gmail, init values if server matches.
-      if (aHostname == "imap.googlemail.com" || aHostname == "smtp.googlemail.com")
+      let details = OAuth2Providers.getHostnameDetails(aHostname);
+      if (details)
       {
-        issuer = "accounts.google.com";
-        scope = "http://mail.google.com/";
+        [issuer, scope] = details;
         Preferences.set(root + "oauth2.issuer", issuer);
         Preferences.set(root + "oauth2.scope", scope);
       }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/util/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/util/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/util/moz.build	2015-04-22 13:03:30.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/util/moz.build	2015-04-24 19:30:10.000000000 +0000
@@ -60,6 +60,7 @@
     'mailServices.js',
     'msgDBCacheManager.js',
     'OAuth2.jsm',
+    'OAuth2Providers.jsm',
     'StringBundle.js',
     'templateUtils.js',
     'traceHelper.js',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/util/OAuth2.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/util/OAuth2.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/util/OAuth2.jsm	2015-04-22 13:03:30.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/util/OAuth2.jsm	2015-04-24 19:30:10.000000000 +0000
@@ -56,10 +56,6 @@
     tokenExpires: 0,
 
     connect: function connect(aSuccess, aFailure, aWithUI, aRefresh) {
-        if (gConnecting[this.authURI]) {
-            aFailure("Window already open");
-            return;
-        }
 
         this.connectSuccessCallback = aSuccess;
         this.connectFailureCallback = aFailure;
@@ -67,14 +63,16 @@
         if (!aRefresh && this.accessToken) {
             aSuccess();
         } else if (this.refreshToken) {
-            gConnecting[this.authURI] = true;
             this.requestAccessToken(this.refreshToken, OAuth2.CODE_REFRESH);
         } else {
             if (!aWithUI) {
                 aFailure('{ "error": "auth_noui" }');
                 return;
             }
-            gConnecting[this.authURI] = true;
+            if (gConnecting[this.authURI]) {
+                aFailure("Window already open");
+                return;
+            }
             this.requestAuthorization();
         }
     },
@@ -156,9 +154,11 @@
         };
 
         this.wrappedJSObject = this._browserRequest;
+        gConnecting[this.authURI] = true;
         Services.ww.openWindow(null, this.requestWindowURI, null, this.requestWindowFeatures, this);
     },
     finishAuthorizationRequest: function() {
+        gConnecting[this.authURI] = false;
         if (!("_browserRequest" in this)) {
             return;
         }
@@ -183,7 +183,6 @@
     },
 
     onAuthorizationFailed: function(aError, aData) {
-        gConnecting[this.authURI] = false;
         this.connectFailureCallback(aData);
     },
 
@@ -210,7 +209,6 @@
     },
 
     onAccessTokenFailed: function onAccessTokenFailed(aError, aData) {
-        gConnecting[this.authURI] = false;
         if (aError != "offline") {
             this.refreshToken = null;
         }
@@ -218,7 +216,6 @@
     },
 
     onAccessTokenReceived: function onRequestTokenReceived(aData) {
-        gConnecting[this.authURI] = false;
         let result = JSON.parse(aData);
 
         this.accessToken = result.access_token;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/util/OAuth2Providers.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/util/OAuth2Providers.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/base/util/OAuth2Providers.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/base/util/OAuth2Providers.jsm	2015-04-24 19:30:10.000000000 +0000
@@ -0,0 +1,66 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Details of supported OAuth2 Providers.
+ */
+var EXPORTED_SYMBOLS = ["OAuth2Providers"];
+
+const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
+
+// map of hostnames to [issuer, scope]
+const kHostnames = new Map([
+  ["imap.googlemail.com", ["accounts.google.com", "http://mail.google.com/"]],
+  ["smtp.googlemail.com", ["accounts.google.com", "http://mail.google.com/"]],
+]);
+
+// map of issuers to appKey, appSecret, authURI, tokenURI
+
+// For the moment, these details are hard-coded, since Google does not
+// provide dynamic client registration. Don't copy these values for your
+// own application--register it yourself. This code (and possibly even the
+// registration itself) will disappear when this is switched to dynamic
+// client registration.
+const kIssuers = new Map ([
+  ["accounts.google.com", [
+    '406964657835-aq8lmia8j95dhl1a2bvharmfk3t1hgqj.apps.googleusercontent.com',
+    'kSmqreRr0qwBWJgbf5Y-PjSU',
+    'https://accounts.google.com/o/oauth2/auth',
+    'https://www.googleapis.com/oauth2/v3/token'
+  ]],
+]);
+
+/**
+ *  OAuth2Providers: Methods to lookup OAuth2 parameters for supported
+ *                   email providers.
+ */
+var OAuth2Providers = {
+
+  /**
+   * Map a hostname to the relevant issuer and scope.
+   *
+   * @param aHostname  String representing the url for an imap or smtp
+   *                   server (example "imap.googlemail.com").
+   *
+   * @returns          Array with [issuer, scope] for the hostname if found,
+   *                   else undefined. issuer is a string representing the
+   *                   organization, scope is an oauth parameter describing\
+   *                   the required access level.
+   */
+  getHostnameDetails: function (aHostname) { return kHostnames.get(aHostname);},
+
+  /**
+   * Map an issuer to OAuth2 account details.
+   *
+   * @param aIssuer    The organization issuing oauth2 parameters, example
+   *                   "accounts.google.com".
+   *
+   * @return           Array containing [appKey, appSecret, authURI, tokenURI]
+   *                   where appKey and appDetails are strings representing the
+   *                   account registered for Thunderbird with the organization,
+   *                   authURI and tokenURI are url strings representing
+   *                   endpoints to access OAuth2 authentication.
+   */
+  getIssuerDetails: function (aIssuer) { return kIssuers.get(aIssuer);}
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/db/gloda/modules/index_msg.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/db/gloda/modules/index_msg.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/db/gloda/modules/index_msg.js	2015-04-22 13:03:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/db/gloda/modules/index_msg.js	2015-04-24 19:30:10.000000000 +0000
@@ -1879,7 +1879,7 @@
     this._log.info("Queueing all accounts for indexing.");
 
     GlodaDatastore._beginTransaction();
-    let sideEffects = [this.indexAccount(account) for each
+    let sideEffects = [this.indexAccount(account) for
                        (account in fixIterator(MailServices.accounts.accounts,
                                                Ci.nsIMsgAccount))];
     GlodaDatastore._commitTransaction();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp	2015-04-22 13:03:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp	2015-04-24 19:30:11.000000000 +0000
@@ -2723,15 +2723,16 @@
     NS_ENSURE_ARG_POINTER(aToTraits);
   }
 
-  FILE* stream;
-  nsresult rv = aFile->OpenANSIFileDesc("rb", &stream);
+  int64_t fileSize;
+  nsresult rv = aFile->GetFileSize(&fileSize);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  int64_t fileSize;
-  rv = aFile->GetFileSize(&fileSize);
+  FILE* stream;
+  rv = aFile->OpenANSIFileDesc("rb", &stream);
+  NS_ENSURE_SUCCESS(rv, rv);
 
   bool error;
-  while(NS_SUCCEEDED(rv)) // break on error or done
+  do // break on error or done
   {
     char cookie[4];
     if ((error = (fread(cookie, sizeof(cookie), 1, stream) != 1)))
@@ -2768,10 +2769,11 @@
         break;
     }
     break;
-  }
+  } while (0);
 
   fclose(stream);
-  if (error || NS_FAILED(rv))
+
+  if (error)
     return NS_ERROR_FAILURE;
   return NS_OK;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/extensions/fts3/src/fts3_porter.c thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/extensions/fts3/src/fts3_porter.c
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/extensions/fts3/src/fts3_porter.c	2015-04-22 13:03:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/extensions/fts3/src/fts3_porter.c	2015-04-24 19:30:11.000000000 +0000
@@ -1115,7 +1115,7 @@
       } else {
         porter_stemmer(&z[iStartOffset], n, c->zToken, pnBytes);
       }
-      *pzToken = (const char**)c->zToken;
+      *pzToken = (const char*)c->zToken;
       *piStartOffset = iStartOffset;
       *piEndOffset = c->iOffset;
       *piPosition = c->iToken++;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/extensions/fts3/src/nsGlodaRankerFunction.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/extensions/fts3/src/nsGlodaRankerFunction.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/extensions/fts3/src/nsGlodaRankerFunction.cpp	2015-04-22 13:03:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/extensions/fts3/src/nsGlodaRankerFunction.cpp	2015-04-24 19:30:11.000000000 +0000
@@ -57,7 +57,7 @@
 {
 }
 
-static int32_t COLUMN_SATURATION[] = {10, 1, 1, 1, 1};
+static uint32_t COLUMN_SATURATION[] = {10, 1, 1, 1, 1};
 
 /**
  * Our ranking function basically just multiplies the weight of the column
@@ -77,19 +77,19 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   /* Check that the number of arguments passed to this function is correct.
-  ** If not, jump to wrong_number_args. Set aMatchinfo to point to the array
-  ** of unsigned integer values returned by FTS3 function matchinfo. Set
-  ** nPhrase to contain the number of reportable phrases in the users full-text
-  ** query, and nCol to the number of columns in the table.
-  */
+   * If not, return an error. Set aArgsData to point to the array
+   * of unsigned integer values returned by FTS3 function. Set nPhrase
+   * to contain the number of reportable phrases in the users full-text
+   * query, and nCol to the number of columns in the table.
+   */
   if (nVal < 1)
     return NS_ERROR_INVALID_ARG;
 
-  uint32_t lenMatchInfo;
-  int32_t *aMatchinfo = (int32_t *)aArguments->AsSharedBlob(0, &lenMatchInfo);
-  
-  int32_t nPhrase = aMatchinfo[0];
-  int32_t nCol = aMatchinfo[1];
+  uint32_t lenArgsData;
+  uint32_t *aArgsData = (uint32_t *)aArguments->AsSharedBlob(0, &lenArgsData);
+
+  uint32_t nPhrase = aArgsData[0];
+  uint32_t nCol = aArgsData[1];
   if (nVal != (1 + nCol))
     return NS_ERROR_INVALID_ARG;
 
@@ -97,12 +97,11 @@
 
   // SQLite 3.6.22 has a different matchinfo layout than SQLite 3.6.23+
 #if SQLITE_VERSION_NUMBER <= 3006022
-
   /* Iterate through each phrase in the users query. */
   for (uint32_t iPhrase = 0; iPhrase < nPhrase; iPhrase++) {
     // in SQ
     for (uint32_t iCol = 0; iCol < nCol; iCol++) {
-      int32_t nHitCount = aMatchinfo[2 + (iPhrase+1)*nCol + iCol];
+      uint32_t nHitCount = aArgsData[2 + (iPhrase+1)*nCol + iCol];
       double weight = aArguments->AsDouble(iCol+1);
       if (nHitCount > 0) {
         score += (nHitCount > COLUMN_SATURATION[iCol]) ?
@@ -111,9 +110,7 @@
       }
     }
   }
-
 #else
-
   /* Iterate through each phrase in the users query. */
   for (uint32_t iPhrase = 0; iPhrase < nPhrase; iPhrase++) {
     /* Now iterate through each column in the users query. For each column,
@@ -125,9 +122,9 @@
     ** the hit count and global hit counts for each column are found in 
     ** aPhraseinfo[iCol*3] and aPhraseinfo[iCol*3+1], respectively.
     */
-    int32_t *aPhraseinfo = &aMatchinfo[2 + iPhrase*nCol*3];
+    uint32_t *aPhraseinfo = &aArgsData[2 + iPhrase*nCol*3];
     for (uint32_t iCol = 0; iCol < nCol; iCol++) {
-      int32_t nHitCount = aPhraseinfo[3 * iCol];
+      uint32_t nHitCount = aPhraseinfo[3 * iCol];
       double weight = aArguments->AsDouble(iCol+1);
       if (nHitCount > 0) {
         score += (nHitCount > COLUMN_SATURATION[iCol]) ?
@@ -136,7 +133,6 @@
       }
     }
   }
-
 #endif
 
   nsCOMPtr<nsIWritableVariant> result =
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/extensions/smime/src/nsMsgComposeSecure.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/extensions/smime/src/nsMsgComposeSecure.cpp	2015-04-22 13:03:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/extensions/smime/src/nsMsgComposeSecure.cpp	2015-04-24 19:30:11.000000000 +0000
@@ -1014,12 +1014,12 @@
       }
     }
   } else {
-	  /* If we're not encrypting (presumably just signing) then write this
-		 data directly to the file. */
+    /* If we're not encrypting (presumably just signing) then write this
+       data directly to the file. */
 
     uint32_t n;
     rv = mStream->Write(buf, size, &n);
-    if (NS_FAILED(rv) || n < size) {
+    if (NS_FAILED(rv) || n < (uint32_t)size) {
       // XXX MK_MIME_ERROR_WRITING_FILE is -1, which is not a valid nsresult
       return static_cast<nsresult>(MK_MIME_ERROR_WRITING_FILE);
     }
@@ -1110,6 +1110,7 @@
    the signature for a multipart/signed object, this is used to write the
    base64-encoded representation of the signature to the file.
  */
+// TODO: size should probably be converted to uint32_t
 nsresult mime_encoder_output_fn(const char *buf, int32_t size, void *closure)
 {
   nsMsgComposeSecure *state = (nsMsgComposeSecure *) closure;
@@ -1117,7 +1118,7 @@
   state->GetOutputStream(getter_AddRefs(stream));
   uint32_t n;
   nsresult rv = stream->Write((char *) buf, size, &n);
-  if (NS_FAILED(rv) || n < size)
+  if (NS_FAILED(rv) || n < (uint32_t)size)
     return NS_ERROR_FAILURE;
   else
     return NS_OK;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/jsmime/jsmime.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/jsmime/jsmime.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/jsmime/jsmime.js	2015-04-22 13:03:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/jsmime/jsmime.js	2015-04-24 19:30:11.000000000 +0000
@@ -154,6 +154,7 @@
 addHeader("Resent-Bcc", parseAddress, writeAddress);
 addHeader("Resent-Cc", parseAddress, writeAddress);
 addHeader("Resent-From", parseAddress, writeAddress);
+addHeader("Resent-Reply-To", parseAddress, writeAddress);
 addHeader("Resent-Sender", parseAddress, writeAddress);
 addHeader("Resent-To", parseAddress, writeAddress);
 addHeader("Sender", parseAddress, writeAddress);
@@ -166,6 +167,9 @@
 addHeader("Delivered-To", parseAddress, writeAddress);
 addHeader("Return-Receipt-To", parseAddress, writeAddress);
 
+// http://cr.yp.to/proto/replyto.html
+addHeader("Mail-Reply-To", parseAddress, writeAddress);
+addHeader("Mail-Followup-To", parseAddress, writeAddress);
 
 // Parameter-based headers. Note that all parameters are slightly different, so
 // we use slightly different variants here.
@@ -206,13 +210,27 @@
   this.addUnstructured(value);
 }
 
+// Message-ID headers.
+function parseMessageID(values) {
+  // TODO: Proper parsing support for these headers is currently unsupported).
+  return this.decodeRFC2047Words(values[0]);
+}
+function writeMessageID(value) {
+  // TODO: Proper parsing support for these headers is currently unsupported).
+  this.addUnstructured(value);
+}
+
 // RFC 5322
 addHeader("Comments", parseUnstructured, writeUnstructured);
 addHeader("Keywords", parseUnstructured, writeUnstructured);
 addHeader("Subject", parseUnstructured, writeUnstructured);
+
 // RFC 2045
+addHeader("MIME-Version", parseUnstructured, writeUnstructured);
 addHeader("Content-Description", parseUnstructured, writeUnstructured);
 
+// RFC 7231
+addHeader("User-Agent", parseUnstructured, writeUnstructured);
 
 // Date headers
 function parseDate(values) { return this.parseDateHeader(values[0]); }
@@ -226,6 +244,9 @@
 addHeader("Injection-Date", parseDate, writeDate);
 addHeader("NNTP-Posting-Date", parseDate, writeDate);
 
+// RFC 5322
+addHeader("Message-ID", parseMessageID, writeMessageID);
+addHeader("Resent-Message-ID", parseMessageID, writeMessageID);
 
 // Miscellaneous headers (those that don't fall under the above schemes):
 
@@ -1183,10 +1204,13 @@
  * - Delivered-To
  * - Disposition-Notification-To
  * - From
+ * - Mail-Reply-To
+ * - Mail-Followup-To
  * - Reply-To
  * - Resent-Bcc
  * - Resent-Cc
  * - Resent-From
+ * - Resent-Reply-To
  * - Resent-Sender
  * - Resent-To
  * - Return-Receipt-To
@@ -2681,7 +2705,7 @@
   // If quoting the entire string at once could fit in the line length, then do
   // so. The check here is very loose, but this will inform is if we are going
   // to definitely overrun the soft margin.
-  if (text.length < this._softMargin) {
+  if ((this._currentLine.length + text.length) < this._softMargin) {
     try {
       this.addQuotable(text, qchars, mayBreakAfter);
       // If we don't have a breakpoint, and the text is encoded as a sequence of
@@ -2835,7 +2859,7 @@
   if (this._currentLine.length > 0) {
     this._commitLine();
   }
-  this.addText(name + ": ", true);
+  this.addText(name + ": ", false);
 };
 
 /**
@@ -2857,7 +2881,11 @@
     this.addHeaderName(preferredSpellings.get(lowerName));
     encoders.get(lowerName).call(this, value);
   } else if (typeof value === "string") {
-    // Assume it's an unstructured header
+    // Assume it's an unstructured header.
+    // All-lower-case-names are ugly, so capitalize first letters.
+    name = name.replace(/(^|-)[a-z]/g, function(match) {
+      return match.toUpperCase();
+    });
     this.addHeaderName(name);
     this.addUnstructured(value);
   } else {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/jsmime/test/test_mime_tree.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/jsmime/test/test_mime_tree.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/jsmime/test/test_mime_tree.js	2015-04-22 13:03:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/jsmime/test/test_mime_tree.js	2015-04-24 19:30:11.000000000 +0000
@@ -395,12 +395,12 @@
           ' for domain of bugzilla-daemon@mozilla.org) smtp.mail=bugzilla-dae' +
           'mon@mozilla.org'],
         'Date': ['Fri, 11 Apr 2008 07:17:29 -0700'],
-        'Message-Id': ['<200804111417.m3BEHTk4030129@mrapp51.mozilla.org>'],
+        'Message-ID': ['<200804111417.m3BEHTk4030129@mrapp51.mozilla.org>'],
         'From': ['bugzilla-daemon@mozilla.org'], 'To': ['bugmail@example.org'],
         'Subject': ['Bugzilla: confirm account creation'],
         'X-Bugzilla-Type': ['admin'],
         'Content-Type': ['text/plain; charset="UTF-8"'],
-        'Mime-Version': ['1.0']}}],
+        'MIME-Version': ['1.0']}}],
     ];
     parser_tests.forEach(function (data) {
       arrayTest(data, function () {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/jsmime/test/test_structured_header_emitters.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/jsmime/test/test_structured_header_emitters.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/jsmime/test/test_structured_header_emitters.js	2015-04-22 13:03:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/jsmime/test/test_structured_header_emitters.js	2015-04-24 19:30:11.000000000 +0000
@@ -42,7 +42,8 @@
   let addressing_headers = ['From', 'To', 'Cc', 'Bcc', 'Sender', 'Reply-To',
     'Resent-Bcc', 'Resent-To', 'Resent-From', 'Resent-Cc', 'Resent-Sender',
     'Approved', 'Disposition-Notification-To', 'Delivered-To',
-    'Return-Receipt-To'];
+    'Return-Receipt-To', 'Resent-Reply-To', 'Mail-Reply-To', 'Mail-Followup-To'
+  ];
   let address_tests = [
     [{name: "", email: ""}, ""],
     [{name: "John Doe", email: "john.doe@test.invalid"},
@@ -81,10 +82,12 @@
     let headers = new Map();
     headers.set('From', [{name:'', email: 'bugzilla-daemon@mozilla.org'}]);
     headers.set('subject', ['[Bug 939557] browsercomps.dll failed to build']);
+    headers.set('x-capitalization-test', ['should capitalize']);
     let str = headeremitter.emitStructuredHeaders(headers, {});
     assert.equal(str,
       'From: bugzilla-daemon@mozilla.org\r\n' +
-      'Subject: [Bug 939557] browsercomps.dll failed to build\r\n');
+      'Subject: [Bug 939557] browsercomps.dll failed to build\r\n'+
+      'X-Capitalization-Test: should capitalize\r\n');
   });
 });
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/jsmime/test/test_structured_headers.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/jsmime/test/test_structured_headers.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/jsmime/test/test_structured_headers.js	2015-04-22 13:03:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/jsmime/test/test_structured_headers.js	2015-04-24 19:30:11.000000000 +0000
@@ -94,7 +94,8 @@
   let addressing_headers = ['From', 'To', 'Cc', 'Bcc', 'Sender', 'Reply-To',
     'Resent-Bcc', 'Resent-To', 'Resent-From', 'Resent-Cc', 'Resent-Sender',
     'Approved', 'Disposition-Notification-To', 'Delivered-To',
-    'Return-Receipt-To'];
+    'Return-Receipt-To', 'Resent-Reply-To', 'Mail-Reply-To', 'Mail-Followup-To'
+  ];
   let address_tests = [
     ["", []],
     ["a@example.invalid", [{name: "", email: "a@example.invalid"}]],
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/test/unit/test_EncodeMimePartIIStr_UTF8.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/test/unit/test_EncodeMimePartIIStr_UTF8.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/test/unit/test_EncodeMimePartIIStr_UTF8.js	2015-04-22 13:03:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/test/unit/test_EncodeMimePartIIStr_UTF8.js	2015-04-24 19:30:12.000000000 +0000
@@ -16,8 +16,8 @@
     ["IamASCII", false, "IamASCII"],
     // Although an invalid email, we shouldn't crash on it (bug 479206)
     ["crash test@foo.invalid>", true, "\"crash test\"@foo.invalid"],
-    ["MXR now displays links to Github log & Blame for Gaia/Rust/Servo", false,
-     "MXR now displays links to Github log & Blame for Gaia/Rust/Servo"],
+    ["MXR now displays links to Github log & Blame for\r\n Gaia/Rust/Servo", false,
+     "MXR now displays links to Github log & Blame for\r\n Gaia/Rust/Servo"],
     ["-----------------------:", false, "-----------------------:"],
   ];
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/test/unit/test_structured_headers.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/test/unit/test_structured_headers.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mailnews/mime/test/unit/test_structured_headers.js	2015-04-22 13:03:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mailnews/mime/test/unit/test_structured_headers.js	2015-04-24 19:30:12.000000000 +0000
@@ -168,11 +168,14 @@
   headers.setHeader("From", [{name: "John Doe", email: "jdoe@test.invalid"}]);
   headers.setHeader("Subject", "A subject that spans a distance quite in " +
     "excess of 80 characters so as to force an intermediary CRLF");
+  headers.setHeader("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:40.0) Gecko/20100101 Thunderbird/40.0a1");
   let mimeText =
     "To: =?UTF-8?Q?Fran=c3=a7ois_Smith?= <user@☃.invalid>\r\n" +
     "From: John Doe <jdoe@test.invalid>\r\n" +
     "Subject: A subject that spans a distance quite in excess of 80 characters so\r\n" +
-    " as to force an intermediary CRLF\r\n";
+      " as to force an intermediary CRLF\r\n" +
+    "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:40.0) Gecko/20100101\r\n" +
+      " Thunderbird/40.0a1\r\n";
   do_check_eq(headers.buildMimeText(), mimeText);
 
   // Check the version used for the nsIMimeHeaders implementation. This requires
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/atk/InterfaceInitFuncs.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/atk/InterfaceInitFuncs.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/atk/InterfaceInitFuncs.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/atk/InterfaceInitFuncs.h	2015-04-24 19:30:50.000000000 +0000
@@ -17,8 +17,6 @@
 } // namespace a11y
 } // namespace mozilla
 
-struct MaiUtilClass;
-
 extern "C" {
 void actionInterfaceInitCB(AtkActionIface* aIface);
 void componentInterfaceInitCB(AtkComponentIface* aIface);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/generic/Accessible.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/generic/Accessible.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/generic/Accessible.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/generic/Accessible.h	2015-04-24 19:30:50.000000000 +0000
@@ -23,7 +23,6 @@
 class nsIFrame;
 class nsIAtom;
 class nsIPersistentProperties;
-class nsView;
 
 namespace mozilla {
 namespace a11y {
@@ -39,7 +38,6 @@
 class HyperTextAccessible;
 class ImageAccessible;
 class KeyBinding;
-class MathMLAccessible;
 class ProxyAccessible;
 class Relation;
 class RootAccessible;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/generic/DocAccessible.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/generic/DocAccessible.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/generic/DocAccessible.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/generic/DocAccessible.h	2015-04-24 19:30:50.000000000 +0000
@@ -23,8 +23,6 @@
 
 class nsAccessiblePivot;
 
-class nsIScrollableView;
-
 const uint32_t kDefaultCacheLength = 128;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/generic/ImageAccessible.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/generic/ImageAccessible.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/generic/ImageAccessible.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/generic/ImageAccessible.h	2015-04-24 19:30:50.000000000 +0000
@@ -8,8 +8,6 @@
 
 #include "BaseAccessibles.h"
 
-class nsGenericHTMLElement;
-
 namespace mozilla {
 namespace a11y {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/html/HTMLSelectAccessible.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/html/HTMLSelectAccessible.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/html/HTMLSelectAccessible.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/html/HTMLSelectAccessible.h	2015-04-24 19:30:50.000000000 +0000
@@ -8,8 +8,6 @@
 
 #include "HTMLFormControlAccessible.h"
 
-class nsIMutableArray;
-
 namespace mozilla {
 namespace a11y {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/html/HTMLTableAccessible.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/html/HTMLTableAccessible.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/html/HTMLTableAccessible.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/html/HTMLTableAccessible.h	2015-04-24 19:30:50.000000000 +0000
@@ -10,7 +10,6 @@
 #include "TableAccessible.h"
 #include "TableCellAccessible.h"
 
-class nsITableLayout;
 class nsITableCellLayout;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/interfaces/nsIAccessibilityService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/interfaces/nsIAccessibilityService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/interfaces/nsIAccessibilityService.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/interfaces/nsIAccessibilityService.h	2015-04-24 19:30:50.000000000 +0000
@@ -20,11 +20,7 @@
 } // namespace a11y
 } // namespace mozilla
 
-class nsINode;
-class nsIContent;
-class nsIFrame;
 class nsIPresShell;
-class nsPluginFrame;
 
 // 0e7e6879-854b-4260-bc6e-525b5fb5cf34
 #define NS_IACCESSIBILITYSERVICE_IID \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/jsat/EventManager.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/jsat/EventManager.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/jsat/EventManager.jsm	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/jsat/EventManager.jsm	2015-04-24 19:30:50.000000000 +0000
@@ -191,6 +191,12 @@
         let acc = aEvent.accessible;
         if (acc === this.contentControl.vc.position) {
           this.present(Presentation.nameChanged(acc));
+        } else {
+          let {liveRegion, isPolite} = this._handleLiveRegion(aEvent,
+            ['text', 'all']);
+          if (liveRegion) {
+            this.present(Presentation.nameChanged(acc, isPolite));
+          }
         }
         break;
       }
@@ -293,6 +299,12 @@
         if (position === target ||
             Utils.getEmbeddedControl(position) === target) {
           this.present(Presentation.valueChanged(target));
+        } else {
+          let {liveRegion, isPolite} = this._handleLiveRegion(aEvent,
+            ['text', 'all']);
+          if (liveRegion) {
+            this.present(Presentation.valueChanged(target, isPolite));
+          }
         }
       }
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/jsat/Presentation.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/jsat/Presentation.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/jsat/Presentation.jsm	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/jsat/Presentation.jsm	2015-04-24 19:30:50.000000000 +0000
@@ -523,18 +523,19 @@
   };
 
 B2GPresenter.prototype.nameChanged =
-  function B2GPresenter_nameChanged(aAccessible) {
+  function B2GPresenter_nameChanged(aAccessible, aIsPolite = true) {
     return {
       type: this.type,
       details: {
         eventType: 'name-change',
-        data: aAccessible.name
+        data: aAccessible.name,
+        options: {enqueue: aIsPolite}
       }
     };
   };
 
 B2GPresenter.prototype.valueChanged =
-  function B2GPresenter_valueChanged(aAccessible) {
+  function B2GPresenter_valueChanged(aAccessible, aIsPolite = true) {
 
     // the editable value changes are handled in the text changed presenter
     if (Utils.getState(aAccessible).contains(States.EDITABLE)) {
@@ -545,7 +546,8 @@
       type: this.type,
       details: {
         eventType: 'value-change',
-        data: aAccessible.value
+        data: aAccessible.value,
+        options: {enqueue: aIsPolite}
       }
     };
   };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/mac/RootAccessibleWrap.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/mac/RootAccessibleWrap.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/mac/RootAccessibleWrap.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/mac/RootAccessibleWrap.h	2015-04-24 19:30:50.000000000 +0000
@@ -15,8 +15,6 @@
 namespace mozilla {
 namespace a11y {
 
-struct objc_class;
-
 class RootAccessibleWrap : public RootAccessible
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/tests/mochitest/jsat/doc_content_integration.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/tests/mochitest/jsat/doc_content_integration.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/tests/mochitest/jsat/doc_content_integration.html	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/tests/mochitest/jsat/doc_content_integration.html	2015-04-24 19:30:51.000000000 +0000
@@ -44,6 +44,17 @@
       document.getElementById('fruit').setAttribute('aria-label', 'banana');
     }
 
+    function renameSlider() {
+      document.getElementById('slider').setAttribute(
+        'aria-label', 'mover');
+    }
+
+    function changeSliderValue() {
+      document.getElementById('slider').setAttribute('aria-valuenow', '5');
+      document.getElementById('slider').setAttribute(
+        'aria-valuetext', 'medium');
+    }
+
   </script>
   <style>
     #windows {
@@ -89,5 +100,9 @@
   </div>
   <button id="home">Home</button>
   <button id="fruit" aria-label="apple"></button>
+  <div id="live" aria-live="polite" aria-label="live">
+    <div id="slider" role="slider" aria-label="slider" aria-valuemin="0"
+      aria-valuemax="10"  aria-valuenow="0"></div>
+  </div>
 </body>
 </html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/tests/mochitest/jsat/jsatcommon.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/tests/mochitest/jsat/jsatcommon.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/tests/mochitest/jsat/jsatcommon.js	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/tests/mochitest/jsat/jsatcommon.js	2015-04-24 19:30:51.000000000 +0000
@@ -629,7 +629,7 @@
 function ExpectedValueChange(aValue, aOptions) {
   ExpectedPresent.call(this, {
     eventType: 'value-change',
-    data: [aValue]
+    data: aValue
   }, null, aOptions);
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/tests/mochitest/jsat/test_content_integration.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/tests/mochitest/jsat/test_content_integration.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/tests/mochitest/jsat/test_content_integration.html	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/tests/mochitest/jsat/test_content_integration.html	2015-04-24 19:30:51.000000000 +0000
@@ -58,9 +58,13 @@
            new ExpectedCursorChange(['Home', {'string': 'pushbutton'}])],
           [ContentMessages.simpleMoveNext,
            new ExpectedCursorChange(['apple', {'string': 'pushbutton'}])],
+           [ContentMessages.simpleMoveNext,
+           new ExpectedCursorChange(['slider', '0', {'string': 'slider'}])],
 
           // Simple traversal backward
           [ContentMessages.simpleMovePrevious,
+           new ExpectedCursorChange(['apple', {'string': 'pushbutton'}])],
+          [ContentMessages.simpleMovePrevious,
            new ExpectedCursorChange(['Home', {'string': 'pushbutton'}])],
           [ContentMessages.simpleMovePrevious,
            new ExpectedCursorChange(['much range', '6', {'string': 'slider'}, 'such app'])],
@@ -92,7 +96,7 @@
           // Move from an inner frame to the last element in the parent doc
           [ContentMessages.simpleMoveLast,
             new ExpectedCursorChange(
-              ['apple', {'string': 'pushbutton'}], { b2g_todo: true })],
+              ['slider', '0', {'string': 'slider'}], { b2g_todo: true })],
 
           [ContentMessages.clearCursor, 'AccessFu:CursorCleared'],
 
@@ -147,6 +151,12 @@
            new ExpectedCursorChange(['apple', {'string': 'pushbutton'}])],
           [doc.defaultView.renameFruit, new ExpectedNameChange('banana')],
 
+          // Name and value changes inside a live-region (no cursor present)
+          [doc.defaultView.renameSlider,
+            new ExpectedNameChange('mover')],
+          [doc.defaultView.changeSliderValue,
+            new ExpectedValueChange('medium')],
+
           // Blur button and reset cursor
           [ContentMessages.focusSelector('button#fruit', true), null],
           [ContentMessages.clearCursor, 'AccessFu:CursorCleared'],
@@ -222,14 +232,14 @@
 
           // Open dialog in outer doc, while cursor is also in outer doc
           [ContentMessages.simpleMoveLast,
-           new ExpectedCursorChange(['banana', {'string': 'pushbutton'}])],
+           new ExpectedCursorChange(['mover'])],
           [doc.defaultView.showAlert,
             new ExpectedCursorChange(['This is an alert!',
               {'string': 'headingLevel', 'args': [1]},
               {'string': 'dialog'}])],
 
           [doc.defaultView.hideAlert,
-           new ExpectedCursorChange(['banana', {'string': 'pushbutton'}])],
+           new ExpectedCursorChange(['mover'])],
 
           [ContentMessages.clearCursor, 'AccessFu:CursorCleared'],
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/windows/msaa/AccessibleWrap.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/windows/msaa/AccessibleWrap.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/windows/msaa/AccessibleWrap.cpp	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/windows/msaa/AccessibleWrap.cpp	2015-04-24 19:30:51.000000000 +0000
@@ -1180,13 +1180,6 @@
   nsresult rv = Accessible::HandleAccEvent(aEvent);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Don't fire native MSAA events or mess with the system caret
-  // when running in metro mode. This confuses input focus tracking
-  // in metro's UIA implementation.
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    return NS_OK;
-  }
-
   uint32_t eventType = aEvent->GetEventType();
 
   static_assert(sizeof(gWinEventMap)/sizeof(gWinEventMap[0]) == nsIAccessibleEvent::EVENT_LAST_ENTRY,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/windows/msaa/nsWinUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/windows/msaa/nsWinUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/windows/msaa/nsWinUtils.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/windows/msaa/nsWinUtils.h	2015-04-24 19:30:51.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsCOMPtr.h"
 #include "nsRefPtrHashtable.h"
 
-class nsIArray;
 class nsIContent;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/xul/XULListboxAccessible.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/xul/XULListboxAccessible.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/accessible/xul/XULListboxAccessible.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/accessible/xul/XULListboxAccessible.h	2015-04-24 19:30:51.000000000 +0000
@@ -14,8 +14,6 @@
 #include "XULMenuAccessible.h"
 #include "XULSelectControlAccessible.h"
 
-class nsIWeakReference;
-
 namespace mozilla {
 namespace a11y {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/addon-sdk/source/python-lib/cuddlefish/prefs.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/addon-sdk/source/python-lib/cuddlefish/prefs.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/addon-sdk/source/python-lib/cuddlefish/prefs.py	2015-04-22 13:05:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/addon-sdk/source/python-lib/cuddlefish/prefs.py	2015-04-24 19:30:52.000000000 +0000
@@ -62,7 +62,7 @@
     'browser.safebrowsing.gethashURL': 'http://localhost/safebrowsing-dummy/gethash',
     'browser.safebrowsing.reportURL': 'http://localhost/safebrowsing-dummy/report',
     'browser.safebrowsing.malware.reportURL': 'http://localhost/safebrowsing-dummy/malwarereport',
-    'browser.selfsupport.url': 'http://localhost/repair-dummy',
+    'browser.selfsupport.url': 'https://localhost/selfsupport-dummy',
     'browser.trackingprotection.gethashURL': 'http://localhost/safebrowsing-dummy/gethash',
     'browser.trackingprotection.updateURL': 'http://localhost/safebrowsing-dummy/update',
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/addon-sdk/source/test/preferences/no-connections.json thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/addon-sdk/source/test/preferences/no-connections.json
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/addon-sdk/source/test/preferences/no-connections.json	2015-04-22 13:05:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/addon-sdk/source/test/preferences/no-connections.json	2015-04-24 19:30:53.000000000 +0000
@@ -19,7 +19,7 @@
   "browser.safebrowsing.gethashURL": "http://localhost/safebrowsing-dummy/gethash",
   "browser.safebrowsing.reportURL": "http://localhost/safebrowsing-dummy/report",
   "browser.safebrowsing.malware.reportURL": "http://localhost/safebrowsing-dummy/malwarereport",
-  "browser.selfsupport.url": "http://localhost/repair-dummy",
+  "browser.selfsupport.url": "https://localhost/selfsupport-dummy",
   "browser.trackingprotection.gethashURL": "http://localhost/safebrowsing-dummy/gethash",
   "browser.trackingprotection.updateURL": "http://localhost/safebrowsing-dummy/update",
   "browser.newtabpage.directory.source": "data:application/json,{'jetpack':1}",
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/app/b2g.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/app/b2g.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/app/b2g.js	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/app/b2g.js	2015-04-24 19:30:53.000000000 +0000
@@ -323,7 +323,7 @@
 pref("media.video-queue.default-size", 3);
 
 // optimize images' memory usage
-pref("image.decode-only-on-draw.enabled", true);
+pref("image.decode-only-on-draw.enabled", false);
 pref("image.mem.allow_locking_in_content_processes", true);
 // Limit the surface cache to 1/8 of main memory or 128MB, whichever is smaller.
 // Almost everything that was factored into 'max_decoded_image_kb' is now stored
@@ -1124,8 +1124,5 @@
 // RequestSync API is enabled by default on B2G.
 pref("dom.requestSync.enabled", true);
 
-// Use vsync aligned rendering
-pref("gfx.vsync.hw-vsync.enabled", true);
-pref("gfx.vsync.compositor", true);
+// Resample touch events on b2g
 pref("gfx.touch.resample", true);
-pref("gfx.vsync.refreshdriver", true);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/chrome/content/content.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/chrome/content/content.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/chrome/content/content.css	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/chrome/content/content.css	2015-04-24 19:30:53.000000000 +0000
@@ -30,14 +30,19 @@
   pointer-events: none;
 }
 
-/* Scrollbar code will reset the margin to the correct side depending on
-   layout.scrollbar.side pref */
 xul|scrollbar[orient="vertical"] {
-  margin-left: -8px;
+  -moz-margin-start: -8px;
   min-width: 8px;
   max-width: 8px;
 }
 
+/* workaround for bug 1119057: as -moz-margin-start may not work as expected,
+ * force a right margin value in RTL mode.  */
+[dir="rtl"] xul|scrollbar[root="true"][orient="vertical"] {
+  -moz-margin-start: unset;
+  margin-right: -8px;
+}
+
 xul|scrollbar[orient="vertical"] xul|thumb {
   max-width: 6px !important;
   min-width: 6px !important;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/dolphin/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/dolphin/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/dolphin/sources.xml	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/dolphin/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -15,15 +15,15 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f4c86a6371082db0be8087b17a31bb79d35fb1d1"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator/sources.xml	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -19,8 +19,8 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="46e1877c0d88b085f7ebc5f432d5bb8f1e2d1f3b"/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-ics/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-ics/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-ics/sources.xml	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-ics/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -19,8 +19,8 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="46e1877c0d88b085f7ebc5f432d5bb8f1e2d1f3b"/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-jb/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-jb/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-jb/sources.xml	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-jb/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -17,10 +17,10 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f4c86a6371082db0be8087b17a31bb79d35fb1d1"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-kk/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-kk/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-kk/sources.xml	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-kk/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -15,15 +15,15 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f4c86a6371082db0be8087b17a31bb79d35fb1d1"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-l/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-l/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-l/sources.xml	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-l/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -12,18 +12,18 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
-  <project name="platform_build" path="build" remote="b2g" revision="6b0721ca0e92788df30daf8f7a5fb2863544f9c8">
+  <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f4c86a6371082db0be8087b17a31bb79d35fb1d1"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>
   <!-- Stock Android things -->
   <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="ffc05a232799fe8fcb3e47b7440b52b1fb4244c0"/>
   <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="337e0ef5e40f02a1ae59b90db0548976c70a7226"/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-x86-kk/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-x86-kk/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-x86-kk/sources.xml	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-x86-kk/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -15,15 +15,15 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f4c86a6371082db0be8087b17a31bb79d35fb1d1"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-x86-l/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-x86-l/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/emulator-x86-l/sources.xml	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/emulator-x86-l/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -12,18 +12,18 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
-  <project name="platform_build" path="build" remote="b2g" revision="6b0721ca0e92788df30daf8f7a5fb2863544f9c8">
+  <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f4c86a6371082db0be8087b17a31bb79d35fb1d1"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>
   <!-- Stock Android things -->
   <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="ffc05a232799fe8fcb3e47b7440b52b1fb4244c0"/>
   <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="337e0ef5e40f02a1ae59b90db0548976c70a7226"/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/flame/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/flame/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/flame/sources.xml	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/flame/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -17,10 +17,10 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f4c86a6371082db0be8087b17a31bb79d35fb1d1"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/flame-kk/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/flame-kk/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/flame-kk/sources.xml	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/flame-kk/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -15,15 +15,15 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f4c86a6371082db0be8087b17a31bb79d35fb1d1"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/gaia.json thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/gaia.json
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/gaia.json	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/gaia.json	2015-04-24 19:30:53.000000000 +0000
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "15134b080b5f406e5aa36f5136c17dafb4e31f64", 
+        "git_revision": "5d416244c0d9cbbb5823e872ac4b03addeb59bad", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "457b84a122653f399cb817513b5149c4c087afe9", 
+    "revision": "83f70a66bb6c579c56f55592e1dc1fc9957d81e2", 
     "repo_path": "integration/gaia-central"
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/nexus-4/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/nexus-4/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/nexus-4/sources.xml	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/nexus-4/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -17,10 +17,10 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f4c86a6371082db0be8087b17a31bb79d35fb1d1"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/nexus-5-l/sources.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/nexus-5-l/sources.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/config/nexus-5-l/sources.xml	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/config/nexus-5-l/sources.xml	2015-04-24 19:30:53.000000000 +0000
@@ -12,18 +12,18 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
-  <project name="platform_build" path="build" remote="b2g" revision="6b0721ca0e92788df30daf8f7a5fb2863544f9c8">
+  <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="15134b080b5f406e5aa36f5136c17dafb4e31f64"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d416244c0d9cbbb5823e872ac4b03addeb59bad"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="f2f2f0cbee2f2517070dd194051d509c07cdacff"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f4c86a6371082db0be8087b17a31bb79d35fb1d1"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="90f848a40efad820ab00fa52bec52dff37255b12"/>
   <!-- Stock Android things -->
   <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="ffc05a232799fe8fcb3e47b7440b52b1fb4244c0"/>
   <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="337e0ef5e40f02a1ae59b90db0548976c70a7226"/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/installer/package-manifest.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/installer/package-manifest.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/installer/package-manifest.in	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/installer/package-manifest.in	2015-04-24 19:30:53.000000000 +0000
@@ -209,6 +209,7 @@
 @RESPATH@/components/dom_json.xpt
 @RESPATH@/components/dom_messages.xpt
 @RESPATH@/components/dom_power.xpt
+@RESPATH@/components/dom_push.xpt
 @RESPATH@/components/dom_quota.xpt
 @RESPATH@/components/dom_range.xpt
 @RESPATH@/components/dom_security.xpt
@@ -631,7 +632,7 @@
 @RESPATH@/components/AppsService.manifest
 @RESPATH@/components/Push.js
 @RESPATH@/components/Push.manifest
-@RESPATH@/components/PushServiceLauncher.js
+@RESPATH@/components/PushNotificationService.js
 
 @RESPATH@/components/InterAppComm.manifest
 @RESPATH@/components/InterAppCommService.js
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties	2015-04-24 19:30:53.000000000 +0000
@@ -30,6 +30,7 @@
 externalProtocolChkMsg=Remember my choice for all links of this type.
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
+unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
 cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/app/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/app/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/app/moz.build	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/app/moz.build	2015-04-24 19:30:53.000000000 +0000
@@ -6,7 +6,7 @@
 
 DIRS += ['profile/extensions']
 
-if CONFIG['OS_ARCH'] == 'WINNT' and (CONFIG['MOZ_METRO'] or CONFIG['MOZ_ASAN']):
+if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_ASAN']:
     GeckoProgram(CONFIG['MOZ_APP_NAME'])
 else:
     GeckoProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
@@ -43,10 +43,9 @@
     '/xpcom/build',
 ]
 
-if not CONFIG['MOZ_METRO']:
-  DELAYLOAD_DLLS += [
-      'mozglue.dll',
-  ]
+DELAYLOAD_DLLS += [
+    'mozglue.dll',
+]
 
 USE_LIBS += [
     'mozglue',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/app/nsBrowserApp.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/app/nsBrowserApp.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/app/nsBrowserApp.cpp	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/app/nsBrowserApp.cpp	2015-04-24 19:30:53.000000000 +0000
@@ -31,10 +31,6 @@
 #include "nsIFile.h"
 #include "nsStringGlue.h"
 
-// Easy access to a five second startup delay used to get
-// a debugger attached in the metro environment. 
-// #define DEBUG_delay_start_metro
-
 #ifdef XP_WIN
 // we want a wmain entry point
 #ifdef MOZ_ASAN
@@ -61,12 +57,6 @@
 #define kOSXResourcesFolder "Resources"
 #endif
 #define kDesktopFolder "browser"
-#define kMetroFolder "metro"
-#define kMetroAppIniFilename "metroapp.ini"
-#ifdef XP_WIN
-#define kMetroTestFile "tests.ini"
-const char* kMetroConsoleIdParam = "testconsoleid=";
-#endif
 
 static void Output(const char *fmt, ... )
 {
@@ -128,40 +118,6 @@
   return false;
 }
 
-#if defined(XP_WIN) && defined(MOZ_METRO)
-/*
- * AttachToTestHarness - Windows helper for when we are running
- * in the immersive environment. Firefox is launched by Windows in
- * response to a request by metrotestharness, which is launched by
- * runtests.py. As such stdout in fx doesn't point to the right
- * stream. This helper touches up stdout such that test output gets
- * routed to a named pipe metrotestharness creates and dumps to its
- * stdout.
- */
-static void AttachToTestHarness()
-{
-  // attach to the metrotestharness named logging pipe
-  HANDLE winOut = CreateFileA("\\\\.\\pipe\\metrotestharness",
-                              GENERIC_WRITE,
-                              FILE_SHARE_WRITE, 0,
-                              OPEN_EXISTING, 0, 0);
-  
-  if (winOut == INVALID_HANDLE_VALUE) {
-    OutputDebugStringW(L"Could not create named logging pipe.\n");
-    return;
-  }
-
-  // Set the c runtime handle
-  int stdOut = _open_osfhandle((intptr_t)winOut, _O_APPEND);
-  if (stdOut == -1) {
-    OutputDebugStringW(L"Could not open c-runtime handle.\n");
-    return;
-  }
-  FILE *fp = _fdopen(stdOut, "a");
-  *stdout = *fp;
-}
-#endif
-
 XRE_GetFileFromPathType XRE_GetFileFromPath;
 XRE_CreateAppDataType XRE_CreateAppData;
 XRE_FreeAppDataType XRE_FreeAppData;
@@ -234,167 +190,28 @@
     return result;
   }
 
-  bool metroOnDesktop = false;
-
-#ifdef MOZ_METRO
-  if (argc > 1) {
-    // This command-line flag is passed to our executable when it is to be
-    // launched in metro mode (i.e. our EXE is registered as the default
-    // browser and the user has tapped our EXE's tile)
-    if (IsArg(argv[1], "ServerName:DefaultBrowserServer")) {
-      mainFlags = XRE_MAIN_FLAG_USE_METRO;
-      argv[1] = argv[0];
-      argv++;
-      argc--;
-    } else if (IsArg(argv[1], "BackgroundSessionClosed")) {
-      // This command line flag is used for indirect shutdowns, the OS
-      // relaunches Metro Firefox with this command line arg.
-      mainFlags = XRE_MAIN_FLAG_USE_METRO;
-    } else {
-#ifndef RELEASE_BUILD
-      // This command-line flag is used to test the metro browser in a desktop
-      // environment.
-      for (int idx = 1; idx < argc; idx++) {
-        if (IsArg(argv[idx], "metrodesktop")) {
-          metroOnDesktop = true;
-          // Disable crash reporting when running in metrodesktop mode.
-          char crashSwitch[] = "MOZ_CRASHREPORTER_DISABLE=1";
-          putenv(crashSwitch);
-          break;
-        } 
-      }
-#endif
-    }
+  ScopedAppData appData(&sAppData);
+  nsCOMPtr<nsIFile> exeFile;
+  rv = mozilla::BinaryPath::GetFile(argv[0], getter_AddRefs(exeFile));
+  if (NS_FAILED(rv)) {
+    Output("Couldn't find the application directory.\n");
+    return 255;
   }
-#endif
-
-  // Desktop browser launch
-  if (mainFlags != XRE_MAIN_FLAG_USE_METRO && !metroOnDesktop) {
-    ScopedAppData appData(&sAppData);
-    nsCOMPtr<nsIFile> exeFile;
-    rv = mozilla::BinaryPath::GetFile(argv[0], getter_AddRefs(exeFile));
-    if (NS_FAILED(rv)) {
-      Output("Couldn't find the application directory.\n");
-      return 255;
-    }
 
-    nsCOMPtr<nsIFile> greDir;
-    exeFile->GetParent(getter_AddRefs(greDir));
+  nsCOMPtr<nsIFile> greDir;
+  exeFile->GetParent(getter_AddRefs(greDir));
 #ifdef XP_MACOSX
-    greDir->SetNativeLeafName(NS_LITERAL_CSTRING(kOSXResourcesFolder));
+  greDir->SetNativeLeafName(NS_LITERAL_CSTRING(kOSXResourcesFolder));
 #endif
-    nsCOMPtr<nsIFile> appSubdir;
-    greDir->Clone(getter_AddRefs(appSubdir));
-    appSubdir->Append(NS_LITERAL_STRING(kDesktopFolder));
-
-    SetStrongPtr(appData.directory, static_cast<nsIFile*>(appSubdir.get()));
-    // xreDirectory already has a refcount from NS_NewLocalFile
-    appData.xreDirectory = xreDirectory;
-
-    return XRE_main(argc, argv, &appData, mainFlags);
-  }
-
-  // Metro browser launch
-#ifdef MOZ_METRO
-  nsCOMPtr<nsIFile> iniFile, appSubdir;
-
-  xreDirectory->Clone(getter_AddRefs(iniFile));
-  xreDirectory->Clone(getter_AddRefs(appSubdir));
-
-  iniFile->Append(NS_LITERAL_STRING(kMetroFolder));
-  iniFile->Append(NS_LITERAL_STRING(kMetroAppIniFilename));
+  nsCOMPtr<nsIFile> appSubdir;
+  greDir->Clone(getter_AddRefs(appSubdir));
+  appSubdir->Append(NS_LITERAL_STRING(kDesktopFolder));
 
-  appSubdir->Append(NS_LITERAL_STRING(kMetroFolder));
-
-  nsAutoCString path;
-  if (NS_FAILED(iniFile->GetNativePath(path))) {
-    Output("Couldn't get ini file path.\n");
-    return 255;
-  }
-
-  nsXREAppData *appData;
-  rv = XRE_CreateAppData(iniFile, &appData);
-  if (NS_FAILED(rv) || !appData) {
-    Output("Couldn't read application.ini");
-    return 255;
-  }
-
-  SetStrongPtr(appData->directory, static_cast<nsIFile*>(appSubdir.get()));
+  SetStrongPtr(appData.directory, static_cast<nsIFile*>(appSubdir.get()));
   // xreDirectory already has a refcount from NS_NewLocalFile
-  appData->xreDirectory = xreDirectory;
+  appData.xreDirectory = xreDirectory;
 
-#ifdef XP_WIN
-  if (!metroOnDesktop) {
-    nsCOMPtr<nsIFile> testFile;
-
-    xreDirectory->Clone(getter_AddRefs(testFile));
-    testFile->Append(NS_LITERAL_STRING(kMetroTestFile));
-
-    nsAutoCString path;
-    if (NS_FAILED(testFile->GetNativePath(path))) {
-      Output("Couldn't get test file path.\n");
-      return 255;
-    }
-
-    // Check for a metro test harness command line args file
-    HANDLE hTestFile = CreateFileA(path.get(),
-                                   GENERIC_READ,
-                                   0, nullptr, OPEN_EXISTING,
-                                   FILE_ATTRIBUTE_NORMAL,
-                                   nullptr);
-    if (hTestFile != INVALID_HANDLE_VALUE) {
-      // Typical test harness command line args string is around 100 bytes.
-      char buffer[1024];
-      memset(buffer, 0, sizeof(buffer));
-      DWORD bytesRead = 0;
-      if (!ReadFile(hTestFile, (VOID*)buffer, sizeof(buffer)-1,
-                    &bytesRead, nullptr) || !bytesRead) {
-        CloseHandle(hTestFile);
-        printf("failed to read test file '%s'", testFile);
-        return -1;
-      }
-      CloseHandle(hTestFile);
-
-      // Build new args array
-      char* newArgv[20];
-      int newArgc = 1;
-
-      memset(newArgv, 0, sizeof(newArgv));
-
-      char* ptr = buffer;
-      newArgv[0] = ptr;
-      while (*ptr != '\0' &&
-             (ptr - buffer) < sizeof(buffer) &&
-             newArgc < ARRAYSIZE(newArgv)) {
-        if (isspace(*ptr)) {
-          *ptr = '\0';
-          ptr++;
-          newArgv[newArgc] = ptr;
-          newArgc++;
-          continue;
-        }
-        ptr++;
-      }
-      if (ptr == newArgv[newArgc-1])
-        newArgc--;
-
-      // attach browser stdout to metrotestharness stdout
-      AttachToTestHarness();
-
-      int result = XRE_main(newArgc, newArgv, appData, mainFlags);
-      XRE_FreeAppData(appData);
-      return result;
-    }
-  }
-#endif
-
-  int result = XRE_main(argc, argv, appData, mainFlags);
-  XRE_FreeAppData(appData);
-  return result;
-#endif
-
-  NS_NOTREACHED("browser do_main failed to pickup proper initialization");
-  return 255;
+  return XRE_main(argc, argv, &appData, mainFlags);
 }
 
 #ifdef XP_WIN
@@ -572,11 +389,8 @@
     return rv;
   }
 
-#ifndef MOZ_METRO
-  // This will set this thread as the main thread, which in metro land is
-  // wrong. We initialize this later from the right thread in nsAppRunner.
+  // This will set this thread as the main thread.
   NS_LogInit();
-#endif
 
   // chop XPCOM_DLL off exePath
   *lastSlash = '\0';
@@ -597,9 +411,6 @@
 
 int main(int argc, char* argv[])
 {
-#ifdef DEBUG_delay_start_metro
-  Sleep(5000);
-#endif
   uint64_t start = TimeStamp_Now();
 
 #ifdef XP_MACOSX
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/app/profile/firefox.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/app/profile/firefox.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/app/profile/firefox.js	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/app/profile/firefox.js	2015-04-24 19:30:53.000000000 +0000
@@ -140,7 +140,6 @@
 // |app.update.url.override| user preference has been set for testing updates or
 // when the |app.update.cert.checkAttributes| preference is set to false. Also,
 // the |app.update.url.override| preference should ONLY be used for testing.
-// IMPORTANT! metro.js should also be updated for updates to certs.X.issuerName
 // IMPORTANT! media.gmp-manager.certs.* prefs should also be updated if these
 // are updated.
 
@@ -162,17 +161,8 @@
 pref("app.update.auto", true);
 
 // See chart in nsUpdateService.js source for more details
-// incompatibilities are ignored by updates in Metro
 pref("app.update.mode", 1);
 
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-// Enables update checking in the Metro environment.
-// add-on incompatibilities are ignored by updates in Metro.
-pref("app.update.metro.enabled", true);
-#endif
-#endif
-
 // If set to true, the Update Service will present no UI for any event.
 pref("app.update.silent", false);
 
@@ -1608,6 +1598,11 @@
 // version for each user.
 pref("devtools.telemetry.tools.opened.version", "{}");
 
+// Set imgur upload client ID
+pref("devtools.gcli.imgurClientID", '0df414e888d7240');
+// Imgur's upload URL
+pref("devtools.gcli.imgurUploadURL", "https://api.imgur.com/3/image");
+
 // Whether the character encoding menu is under the main Firefox button. This
 // preference is a string so that localizers can alter it.
 pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.properties");
@@ -1831,6 +1826,10 @@
 // Show the translation UI bits, like the info bar, notification icon and preferences.
 pref("browser.translation.ui.show", false);
 
+// Telemetry settings.
+// Determines if Telemetry pings can be archived locally.
+pref("toolkit.telemetry.archive.enabled", true);
+
 // Telemetry experiments settings.
 pref("experiments.enabled", true);
 pref("experiments.manifest.fetchIntervalSeconds", 86400);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/app-rules.mk thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/app-rules.mk
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/app-rules.mk	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/app-rules.mk	2015-04-24 19:30:53.000000000 +0000
@@ -1,4 +1 @@
 PURGECACHES_DIRS = $(DIST)/bin/browser
-ifdef MOZ_METRO
-PURGECACHES_DIRS += $(DIST)/bin/metro
-endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/aboutNetError.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/aboutNetError.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/aboutNetError.xhtml	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/aboutNetError.xhtml	2015-04-24 19:30:53.000000000 +0000
@@ -374,6 +374,7 @@
         <h1 id="et_nssFailure2">&nssFailure2.title;</h1>
         <h1 id="et_nssBadCert">&nssBadCert.title;</h1>
         <h1 id="et_malwareBlocked">&malwareBlocked.title;</h1>
+        <h1 id="et_unwantedBlocked">&unwantedBlocked.title;</h1>
         <h1 id="et_cspBlocked">&cspBlocked.title;</h1>
         <h1 id="et_remoteXUL">&remoteXUL.title;</h1>
         <h1 id="et_corruptedContentError">&corruptedContentError.title;</h1>
@@ -401,6 +402,7 @@
         <div id="ed_nssFailure2">&nssFailure2.longDesc2;</div>
         <div id="ed_nssBadCert">&nssBadCert.longDesc2;</div>
         <div id="ed_malwareBlocked">&malwareBlocked.longDesc;</div>
+        <div id="ed_unwantedBlocked">&unwantedBlocked.longDesc;</div>
         <div id="ed_cspBlocked">&cspBlocked.longDesc;</div>
         <div id="ed_remoteXUL">&remoteXUL.longDesc;</div>
         <div id="ed_corruptedContentError">&corruptedContentError.longDesc;</div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/baseMenuOverlay.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/baseMenuOverlay.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/baseMenuOverlay.xul	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/baseMenuOverlay.xul	2015-04-24 19:30:53.000000000 +0000
@@ -81,6 +81,8 @@
         <menuitem id="helpSafeMode"
                   accesskey="&helpSafeMode.accesskey;"
                   label="&helpSafeMode.label;"
+                  stopaccesskey="&helpSafeMode.stop.accesskey;"
+                  stoplabel="&helpSafeMode.stop.label;"
                   oncommand="safeModeRestart();"/>
         <menuseparator id="aboutSeparator"/>
         <menuitem id="aboutName"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/blockedSite.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/blockedSite.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/blockedSite.xhtml	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/blockedSite.xhtml	2015-04-24 19:30:53.000000000 +0000
@@ -79,6 +79,9 @@
           case "phishingBlocked" :
             initPage_phishing();
             break;
+          case "unwantedBlocked" :
+            initPage_unwanted();
+            break;
         }
       }        
       
@@ -87,7 +90,7 @@
        */
       function initPage_malware()
       {
-        // Remove phishing strings
+        // Remove phishing and unwanted strings
         var el = document.getElementById("errorTitleText_phishing");
         el.parentNode.removeChild(el);
 
@@ -97,6 +100,15 @@
         el = document.getElementById("errorLongDescText_phishing");
         el.parentNode.removeChild(el);
 
+        el = document.getElementById("errorTitleText_unwanted");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorShortDescText_unwanted");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorLongDescText_unwanted");
+        el.parentNode.removeChild(el);
+
         // Set sitename
         document.getElementById("malware_sitename").textContent = getHostString();
         document.title = document.getElementById("errorTitleText_malware")
@@ -104,11 +116,41 @@
       }
       
       /**
+       * Initialize custom strings and functionality for blocked malware case
+       */
+      function initPage_unwanted()
+      {
+        // Remove phishing and malware strings
+        var el = document.getElementById("errorTitleText_phishing");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorShortDescText_phishing");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorLongDescText_phishing");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorTitleText_malware");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorShortDescText_malware");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorLongDescText_malware");
+        el.parentNode.removeChild(el);
+
+        // Set sitename
+        document.getElementById("unwanted_sitename").textContent = getHostString();
+        document.title = document.getElementById("errorTitleText_unwanted")
+                                 .innerHTML;
+      }
+      
+      /**
        * Initialize custom strings and functionality for blocked phishing case
        */
       function initPage_phishing()
       {
-        // Remove malware strings
+        // Remove malware and unwanted strings
         var el = document.getElementById("errorTitleText_malware");
         el.parentNode.removeChild(el);
 
@@ -118,6 +160,15 @@
         el = document.getElementById("errorLongDescText_malware");
         el.parentNode.removeChild(el);
 
+        el = document.getElementById("errorTitleText_unwanted");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorShortDescText_unwanted");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorLongDescText_unwanted");
+        el.parentNode.removeChild(el);
+
         // Set sitename
         document.getElementById("phishing_sitename").textContent = getHostString();
         document.title = document.getElementById("errorTitleText_phishing")
@@ -161,6 +212,7 @@
       <div id="errorTitle">
         <h1 id="errorTitleText_phishing">&safeb.blocked.phishingPage.title;</h1>
         <h1 id="errorTitleText_malware">&safeb.blocked.malwarePage.title;</h1>
+        <h1 id="errorTitleText_unwanted">&safeb.blocked.unwantedPage.title;</h1>
       </div>
       
       <div id="errorLongContent">
@@ -169,12 +221,14 @@
         <div id="errorShortDesc">
           <p id="errorShortDescText_phishing">&safeb.blocked.phishingPage.shortDesc;</p>
           <p id="errorShortDescText_malware">&safeb.blocked.malwarePage.shortDesc;</p>
+          <p id="errorShortDescText_unwanted">&safeb.blocked.unwantedPage.shortDesc;</p>
         </div>
 
         <!-- Long Description -->
         <div id="errorLongDesc">
           <p id="errorLongDescText_phishing">&safeb.blocked.phishingPage.longDesc;</p>
           <p id="errorLongDescText_malware">&safeb.blocked.malwarePage.longDesc;</p>
+          <p id="errorLongDescText_unwanted">&safeb.blocked.unwantedPage.longDesc;</p>
         </div>
         
         <!-- Action buttons -->
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/browser.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/browser.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/browser.js	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/browser.js	2015-04-24 19:30:53.000000000 +0000
@@ -24,6 +24,8 @@
                                   "resource://gre/modules/BrowserUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PromiseUtils",
+                                  "resource://gre/modules/PromiseUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CharsetMenu",
                                   "resource://gre/modules/CharsetMenu.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ShortcutUtils",
@@ -49,6 +51,7 @@
 XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager",
                                   "resource://gre/modules/LightweightThemeManager.jsm");
 
+
 const nsIWebNavigation = Ci.nsIWebNavigation;
 
 var gLastBrowserCharset = null;
@@ -950,6 +953,7 @@
     mm.loadFrameScript("chrome://browser/content/tab-content.js", true);
     mm.loadFrameScript("chrome://browser/content/content.js", true);
     mm.loadFrameScript("chrome://browser/content/content-UITour.js", true);
+    mm.loadFrameScript("chrome://global/content/manifestMessages.js", true);
 
     window.messageManager.addMessageListener("Browser:LoadURI", RedirectLoad);
 
@@ -1276,6 +1280,12 @@
     gHomeButton.updateTooltip(homeButton);
     gHomeButton.updatePersonalToolbarStyle(homeButton);
 
+    let safeMode = document.getElementById("helpSafeMode");
+    if (Services.appinfo.inSafeMode) {
+      safeMode.label = safeMode.getAttribute("stoplabel");
+      safeMode.accesskey = safeMode.getAttribute("stopaccesskey");
+    }
+
     // BiDi UI
     gBidiUI = isBidiEnabled();
     if (gBidiUI) {
@@ -1383,11 +1393,6 @@
       Cu.reportError("Could not end startup crash tracking: " + ex);
     }
 
-    if (typeof WindowsPrefSync !== 'undefined') {
-      // Pulls in Metro controlled prefs and pushes out Desktop controlled prefs
-      WindowsPrefSync.init();
-    }
-
     // Delay this a minute because there's no rush
     setTimeout(() => {
       this.gmpInstallManager = new GMPInstallManager();
@@ -1551,9 +1556,6 @@
         Cu.reportError(ex);
       }
 
-      if (typeof WindowsPrefSync !== 'undefined') {
-        WindowsPrefSync.uninit();
-      }
       if (this.gmpInstallManager) {
         this.gmpInstallManager.uninit();
       }
@@ -2390,7 +2392,11 @@
 }
 
 function losslessDecodeURI(aURI) {
+  if (aURI.schemeIs("moz-action"))
+    throw new Error("losslessDecodeURI should never get a moz-action URI");
+
   var value = aURI.spec;
+
   // Try to decode as UTF-8 if there's no encoding sequence that we would break.
   if (!/%25(?:3B|2F|3F|3A|40|26|3D|2B|24|2C|23)/i.test(value))
     try {
@@ -2659,7 +2665,7 @@
                               msg.data.sslStatusAsString);
       break;
       case "Browser:SiteBlockedError":
-        this.onAboutBlocked(msg.data.elementId, msg.data.isMalware,
+        this.onAboutBlocked(msg.data.elementId, msg.data.reason,
                             msg.data.isTopFrame, msg.data.location);
       break;
       case "Browser:EnableOnlineMode":
@@ -2843,10 +2849,15 @@
     }
   },
 
-  onAboutBlocked: function (elementId, isMalware, isTopFrame, location) {
-    // Depending on what page we are displaying here (malware/phishing)
+  onAboutBlocked: function (elementId, reason, isTopFrame, location) {
+    // Depending on what page we are displaying here (malware/phishing/unwanted)
     // use the right strings and links for each.
-    let bucketName = isMalware ? "WARNING_MALWARE_PAGE_":"WARNING_PHISHING_PAGE_";
+    let bucketName = "WARNING_PHISHING_PAGE_";
+    if (reason === 'malware') {
+      bucketName = "WARNING_MALWARE_PAGE_";
+    } else if (reason === 'unwanted') {
+      bucketName = "WARNING_UNWANTED_PAGE_";
+    }
     let secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
     let nsISecTel = Ci.nsISecurityUITelemetry;
     bucketName += isTopFrame ? "TOP_" : "FRAME_";
@@ -2857,33 +2868,19 @@
         break;
 
       case "reportButton":
-        // This is the "Why is this site blocked" button.  For malware,
-        // we can fetch a site-specific report, for phishing, we redirect
-        // to the generic page describing phishing protection.
+        // This is the "Why is this site blocked" button. We redirect
+        // to the generic page describing phishing/malware protection.
 
-        // We log even if malware/phishing info URL couldn't be found:
+        // We log even if malware/phishing/unwanted info URL couldn't be found:
         // the measurement is for how many users clicked the WHY BLOCKED button
         secHistogram.add(nsISecTel[bucketName + "WHY_BLOCKED"]);
 
-        if (isMalware) {
-          // Get the stop badware "why is this blocked" report url,
-          // append the current url, and go there.
-          try {
-            let reportURL = formatURL("browser.safebrowsing.malware.reportURL", true);
-            reportURL += location;
-            gBrowser.loadURI(reportURL);
-          } catch (e) {
-            Components.utils.reportError("Couldn't get malware report URL: " + e);
-          }
-        }
-        else { // It's a phishing site, not malware
-          openHelpLink("phishing-malware", false, "current");
-        }
+        openHelpLink("phishing-malware", false, "current");
         break;
 
       case "ignoreWarningButton":
         secHistogram.add(nsISecTel[bucketName + "IGNORE_WARNING"]);
-        this.ignoreWarningButton(isMalware);
+        this.ignoreWarningButton(reason);
         break;
     }
   },
@@ -2910,7 +2907,7 @@
     }
   },
 
-  ignoreWarningButton: function (isMalware) {
+  ignoreWarningButton: function (reason) {
     // Allow users to override and continue through to the site,
     // but add a notify bar as a reminder, so that they don't lose
     // track after, e.g., tab switching.
@@ -2929,7 +2926,7 @@
     }];
 
     let title;
-    if (isMalware) {
+    if (reason === 'malware') {
       title = gNavigatorBundle.getString("safebrowsing.reportedAttackSite");
       buttons[1] = {
         label: gNavigatorBundle.getString("safebrowsing.notAnAttackButton.label"),
@@ -2938,7 +2935,7 @@
           openUILinkIn(gSafeBrowsing.getReportURL('MalwareError'), 'tab');
         }
       };
-    } else {
+    } else if (reason === 'phishing') {
       title = gNavigatorBundle.getString("safebrowsing.reportedWebForgery");
       buttons[1] = {
         label: gNavigatorBundle.getString("safebrowsing.notAForgeryButton.label"),
@@ -2947,6 +2944,10 @@
           openUILinkIn(gSafeBrowsing.getReportURL('Error'), 'tab');
         }
       };
+    } else if (reason === 'unwanted') {
+      title = gNavigatorBundle.getString("safebrowsing.reportedUnwantedSite");
+      // There is no button for reporting errors since Google doesn't currently
+      // provide a URL endpoint for these reports.
     }
 
     let notificationBox = gBrowser.getNotificationBox();
@@ -3028,56 +3029,6 @@
   });
 };
 
-function _checkDefaultAndSwitchToMetro() {
-#ifdef HAVE_SHELL_SERVICE
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-  let shell = Components.classes["@mozilla.org/browser/shell-service;1"].
-    getService(Components.interfaces.nsIShellService);
-  let isDefault = shell.isDefaultBrowser(false, false);
-
-  if (isDefault) {
-    let appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"].
-    getService(Components.interfaces.nsIAppStartup);
-
-    Services.prefs.setBoolPref('browser.sessionstore.resume_session_once', true);
-
-    let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
-                     .createInstance(Ci.nsISupportsPRBool);
-    Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
-
-    if (!cancelQuit.data) {
-      appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit |
-                      Components.interfaces.nsIAppStartup.eRestartTouchEnvironment);
-    }
-    return true;
-  }
-  return false;
-#endif
-#endif
-#endif
-}
-
-function SwitchToMetro() {
-#ifdef HAVE_SHELL_SERVICE
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-  if (this._checkDefaultAndSwitchToMetro()) {
-    return;
-  }
-
-  let shell = Components.classes["@mozilla.org/browser/shell-service;1"].
-    getService(Components.interfaces.nsIShellService);
-
-  shell.setDefaultBrowser(false, false);
-
-  let intervalID = window.setInterval(this._checkDefaultAndSwitchToMetro, 1000);
-  window.setTimeout(function() { window.clearInterval(intervalID); }, 10000);
-#endif
-#endif
-#endif
-}
-
 function getWebNavigation()
 {
   return gBrowser.webNavigation;
@@ -3994,6 +3945,11 @@
   },
 
   showTooltip: function (x, y, tooltip) {
+    if (Cc["@mozilla.org/widget/dragservice;1"].getService(Ci.nsIDragService).
+        getCurrentSession()) {
+      return;
+    }
+
     // The x,y coordinates are relative to the <browser> element using
     // the chrome zoom level.
     let elt = document.getElementById("remoteBrowserTooltip");
@@ -7525,6 +7481,18 @@
 
 // Prompt user to restart the browser in safe mode
 function safeModeRestart() {
+  if (Services.appinfo.inSafeMode) {
+    let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].
+                     createInstance(Ci.nsISupportsPRBool);
+    Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
+
+    if (cancelQuit.data)
+      return;
+
+    Services.startup.quit(Ci.nsIAppStartup.eRestart | Ci.nsIAppStartup.eAttemptQuit);
+    return;
+  }
+
   Services.obs.notifyObservers(null, "restart-in-safe-mode", "");
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/browser-menubar.inc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/browser-menubar.inc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/browser-menubar.inc	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/browser-menubar.inc	2015-04-24 19:30:53.000000000 +0000
@@ -48,15 +48,6 @@
                           command="Browser:OpenFile"
                           key="openFileKb"
                           accesskey="&openFileCmd.accesskey;"/>
-#ifdef HAVE_SHELL_SERVICE
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-                <menuitem id="menu_switchToMetro"
-                          label="&switchToMetroCmd2.label;"
-                          oncommand="SwitchToMetro()"/>
-#endif
-#endif
-#endif
                 <menuitem id="menu_close"
                           class="show-only-for-keyboard"
                           label="&closeCmd.label;"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/browser-places.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/browser-places.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/browser-places.js	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/browser-places.js	2015-04-24 19:30:53.000000000 +0000
@@ -56,7 +56,7 @@
   },
 
   // nsIDOMEventListener
-  handleEvent: function SU_handleEvent(aEvent) {
+  handleEvent(aEvent) {
     switch (aEvent.type) {
       case "popuphidden":
         if (aEvent.originalTarget == this.panel) {
@@ -69,26 +69,32 @@
           }
           this._restoreCommandsState();
           this._itemId = -1;
-          if (this._batching) {
-            PlacesUtils.transactionManager.endBatch(false);
-            this._batching = false;
-          }
+          if (this._batching)
+            this.endBatch();
 
           switch (this._actionOnHide) {
             case "cancel": {
-              PlacesUtils.transactionManager.undoTransaction();
+              if (!PlacesUIUtils.useAsyncTransactions) {
+                PlacesUtils.transactionManager.undoTransaction();
+                break;
+              }
+              PlacesTransactions.undo().catch(Cu.reportError);
               break;
             }
             case "remove": {
               // Remove all bookmarks for the bookmark's url, this also removes
               // the tags for the url.
-              PlacesUtils.transactionManager.beginBatch(null);
-              let itemIds = PlacesUtils.getBookmarksForURI(this._uriForRemoval);
-              for (let i = 0; i < itemIds.length; i++) {
-                let txn = new PlacesRemoveItemTransaction(itemIds[i]);
-                PlacesUtils.transactionManager.doTransaction(txn);
+              if (!PlacesUIUtils.useAsyncTransactions) {
+                let itemIds = PlacesUtils.getBookmarksForURI(this._uriForRemoval);
+                for (let itemId of itemIds) {
+                  let txn = new PlacesRemoveItemTransaction(itemId);
+                  PlacesUtils.transactionManager.doTransaction(txn);
+                }
+                break;
               }
-              PlacesUtils.transactionManager.endBatch(false);
+
+              PlacesTransactions.RemoveBookmarksForUrls(this._uriForRemoval)
+                                .transact().catch(Cu.reportError);
               break;
             }
           }
@@ -122,15 +128,30 @@
 
   _overlayLoaded: false,
   _overlayLoading: false,
-  showEditBookmarkPopup:
-  function SU_showEditBookmarkPopup(aItemId, aAnchorElement, aPosition) {
+  showEditBookmarkPopup: Task.async(function* (aNode, aAnchorElement, aPosition) {
+    // TODO: Deprecate this once async transactions are enabled and the legacy
+    // transactions code is gone (bug 1131491) - we don't want addons to to use
+    // the  completeNodeLikeObjectForItemId, so it's better if they keep passing
+    // the item-id for now).
+    if (typeof(aNode) == "number") {
+      let itemId = aNode;
+      if (PlacesUIUtils.useAsyncTransactions) {
+        let guid = yield PlacesUtils.promiseItemGuid(itemId);
+        aNode = yield PlacesUIUtils.promiseNodeLike(guid);
+      }
+      else {
+        aNode = { itemId };
+        yield PlacesUIUtils.completeNodeLikeObjectForItemId(aNode);
+      }
+    }
+
     // Performance: load the overlay the first time the panel is opened
     // (see bug 392443).
     if (this._overlayLoading)
       return;
 
     if (this._overlayLoaded) {
-      this._doShowEditBookmarkPanel(aItemId, aAnchorElement, aPosition);
+      this._doShowEditBookmarkPanel(aNode, aAnchorElement, aPosition);
       return;
     }
 
@@ -147,13 +168,12 @@
 
         this._overlayLoading = false;
         this._overlayLoaded = true;
-        this._doShowEditBookmarkPanel(aItemId, aAnchorElement, aPosition);
+        this._doShowEditBookmarkPanel(aNode, aAnchorElement, aPosition);
       }).bind(this)
     );
-  },
+  }),
 
-  _doShowEditBookmarkPanel:
-  function SU__doShowEditBookmarkPanel(aItemId, aAnchorElement, aPosition) {
+  _doShowEditBookmarkPanel: Task.async(function* (aNode, aAnchorElement, aPosition) {
     if (this.panel.state != "closed")
       return;
 
@@ -179,15 +199,15 @@
 
     // The label of the remove button differs if the URI is bookmarked
     // multiple times.
-    var bookmarks = PlacesUtils.getBookmarksForURI(gBrowser.currentURI);
-    var forms = gNavigatorBundle.getString("editBookmark.removeBookmarks.label");
-    var label = PluralForm.get(bookmarks.length, forms).replace("#1", bookmarks.length);
+    let bookmarks = PlacesUtils.getBookmarksForURI(gBrowser.currentURI);
+    let forms = gNavigatorBundle.getString("editBookmark.removeBookmarks.label");
+    let label = PluralForm.get(bookmarks.length, forms).replace("#1", bookmarks.length);
     this._element("editBookmarkPanelRemoveButton").label = label;
 
     // unset the unstarred state, if set
     this._element("editBookmarkPanelStarIcon").removeAttribute("unstarred");
 
-    this._itemId = aItemId !== undefined ? aItemId : this._itemId;
+    this._itemId = aNode.itemId;
     this.beginBatch();
 
     if (aAnchorElement) {
@@ -207,10 +227,10 @@
     }
     this.panel.openPopup(aAnchorElement, aPosition);
 
-    gEditItemOverlay.initPanel(this._itemId,
-                               { hiddenRows: ["description", "location",
+    gEditItemOverlay.initPanel({ node: aNode
+                               , hiddenRows: ["description", "location",
                                               "loadInSidebar", "keyword"] });
-  },
+  }),
 
   panelShown:
   function SU_panelShown(aEvent) {
@@ -247,13 +267,46 @@
     this.panel.hidePopup();
   },
 
-  beginBatch: function SU_beginBatch() {
-    if (!this._batching) {
+  // Matching the way it is used in the Library, editBookmarkOverlay implements
+  // an instant-apply UI, having no batched-Undo/Redo support.
+  // However, in this context (the Star UI) we have a Cancel button whose
+  // expected behavior is to undo all the operations done in the panel.
+  // Sometime in the future this needs to be reimplemented using a
+  // non-instant apply code path, but for the time being, we patch-around
+  // editBookmarkOverlay so that all of the actions done in the panel
+  // are treated by PlacesTransactions as a single batch.  To do so,
+  // we start a PlacesTransactions batch when the star UI panel is shown, and
+  // we keep the batch ongoing until the panel is hidden.
+  _batchBlockingDeferred: null,
+  beginBatch() {
+    if (this._batching)
+      return;
+    if (PlacesUIUtils.useAsyncTransactions) {
+      this._batchBlockingDeferred = PromiseUtils.defer();
+      PlacesTransactions.batch(function* () {
+        yield this._batchBlockingDeferred.promise;
+      }.bind(this));
+    }
+    else {
       PlacesUtils.transactionManager.beginBatch(null);
-      this._batching = true;
     }
+    this._batching = true;
+  },
+
+  endBatch() {
+    if (!this._batching)
+      return;
+
+    if (PlacesUIUtils.useAsyncTransactions) {
+      this._batchBlockingDeferred.resolve();
+      this._batchBlockingDeferred = null;
+    }
+    else {
+      PlacesUtils.transactionManager.endBatch(false);
+    }
+    this._batching = false;
   }
-}
+};
 
 ////////////////////////////////////////////////////////////////////////////////
 //// PlacesCommandHook
@@ -269,8 +322,11 @@
    *        aBrowser isn't bookmarked yet, defaults to the unfiled root.
    * @param [optional] aShowEditUI
    *        whether or not to show the edit-bookmark UI for the bookmark item
-   */  
-  bookmarkPage: function PCH_bookmarkPage(aBrowser, aParent, aShowEditUI) {
+   */
+  bookmarkPage: Task.async(function* (aBrowser, aParent, aShowEditUI) {
+    if (PlacesUIUtils.useAsyncTransactions)
+      return (yield this._bookmarkPagePT(aBrowser, aParent, aShowEditUI));
+
     var uri = aBrowser.currentURI;
     var itemId = PlacesUtils.getMostRecentBookmarkForURI(uri);
     if (itemId == -1) {
@@ -296,7 +352,7 @@
         StarUI.beginBatch();
       }
 
-      var parent = aParent != undefined ?
+      var parent = aParent !== undefined ?
                    aParent : PlacesUtils.unfiledBookmarksFolderId;
       var descAnno = { name: PlacesUIUtils.DESCRIPTION_ANNO, value: description };
       var txn = new PlacesCreateBookmarkTransaction(uri, parent, 
@@ -304,7 +360,7 @@
                                                     title, null, [descAnno]);
       PlacesUtils.transactionManager.doTransaction(txn);
       itemId = txn.item.id;
-      // Set the character-set
+      // Set the character-set.
       if (charset && !PrivateBrowsingUtils.isBrowserPrivate(aBrowser))
         PlacesUtils.setCharsetForURI(uri, charset);
     }
@@ -334,7 +390,82 @@
     } else {
       StarUI.showEditBookmarkPopup(itemId, aBrowser, "overlap");
     }
-  },
+  }),
+
+  // TODO: Replace bookmarkPage code with this function once legacy
+  // transactions are removed.
+  _bookmarkPagePT: Task.async(function* (aBrowser, aParentId, aShowEditUI) {
+    let url = new URL(aBrowser.currentURI.spec);
+    let info = yield PlacesUtils.bookmarks.fetch({ url });
+    if (!info) {
+      let parentGuid = aParentId !== undefined ?
+                         yield PlacesUtils.promiseItemGuid(aParentId) :
+                         PlacesUtils.bookmarks.unfiledGuid;
+      info = { url, parentGuid };
+      // Bug 1148838 - Make this code work for full page plugins.
+      let description = null;
+      let charset = null;
+      try {
+        let isErrorPage = /^about:(neterror|certerror|blocked)/
+                          .test(aBrowser.contentDocumentAsCPOW.documentURI);
+        info.title = isErrorPage ?
+          (yield PlacesUtils.promisePlaceInfo(aBrowser.currentURI)).title :
+          aBrowser.contentTitle;
+        info.title = info.title || url.href;
+        description = PlacesUIUtils.getDescriptionFromDocument(aBrowser.contentDocumentAsCPOW);
+        charset = aBrowser.characterSet;
+      }
+      catch (e) {
+      	Components.utils.reportError(e);
+      }
+
+      if (aShowEditUI) {
+        // If we bookmark the page here (i.e. page was not "starred" already)
+        // but open right into the "edit" state, start batching here, so
+        // "Cancel" in that state removes the bookmark.
+        StarUI.beginBatch();
+      }
+
+      if (description) {
+        info.annotations = [{ name: PlacesUIUtils.DESCRIPTION_ANNO
+                            , value: description }];
+      }
+
+      info.guid = yield PlacesTransactions.NewBookmark(info).transact();
+
+      // Set the character-set
+      if (charset && !PrivateBrowsingUtils.isBrowserPrivate(aBrowser))
+      	 PlacesUtils.setCharsetForURI(makeURI(url.href), charset);
+    }
+
+    // Revert the contents of the location bar
+    if (gURLBar)
+      gURLBar.handleRevert();
+
+    // If it was not requested to open directly in "edit" mode, we are done.
+    if (!aShowEditUI)
+      return;
+
+    let node = yield PlacesUIUtils.promiseNodeLikeFromFetchInfo(info);
+
+    // Try to dock the panel to:
+    // 1. the bookmarks menu button
+    // 2. the page-proxy-favicon
+    // 3. the content area
+    if (BookmarkingUI.anchor) {
+      StarUI.showEditBookmarkPopup(node, BookmarkingUI.anchor,
+                                   "bottomcenter topright");
+      return;
+    }
+
+    let pageProxyFavicon = document.getElementById("page-proxy-favicon");
+    if (isElementVisible(pageProxyFavicon)) {
+      StarUI.showEditBookmarkPopup(node, pageProxyFavicon,
+                                   "bottomcenter topright");
+    } else {
+      StarUI.showEditBookmarkPopup(node, aBrowser, "overlap");
+    }
+  }),
 
   /**
    * Adds a bookmark to the page loaded in the current tab. 
@@ -353,10 +484,27 @@
    * @param aTitle
    *        The link text
    */
-  bookmarkLink: function PCH_bookmarkLink(aParent, aURL, aTitle) {
-    var linkURI = makeURI(aURL);
-    var itemId = PlacesUtils.getMostRecentBookmarkForURI(linkURI);
-    if (itemId == -1) {
+  bookmarkLink: Task.async(function* (aParentId, aURL, aTitle) {
+    let node = null;
+    if (PlacesUIUtils.useAsyncTransactions) {
+      node = yield PlacesUIUtils.fetchNodeLike({ url: aURL });
+    }
+    else {
+      let linkURI = makeURI(aURL);
+      let itemId = PlacesUtils.getMostRecentBookmarkForURI(linkURI);
+      if (itemId != -1) {
+        node = { itemId, uri: aURL };
+        PlacesUIUtils.completeNodeLikeObjectForItemId(node);
+      }
+    }
+
+    if (node) {
+      PlacesUIUtils.showBookmarkDialog({ action: "edit"
+                                       , type: "bookmark"
+                                       , node
+                                       }, window);
+    }
+    else {
       PlacesUIUtils.showBookmarkDialog({ action: "add"
                                        , type: "bookmark"
                                        , uri: linkURI
@@ -367,13 +515,7 @@
                                                      , "keyword" ]
                                        }, window);
     }
-    else {
-      PlacesUIUtils.showBookmarkDialog({ action: "edit"
-                                       , type: "bookmark"
-                                       , itemId: itemId
-                                       }, window);
-    }
-  },
+  }),
 
   /**
    * List of nsIURI objects characterizing the tabs currently open in the
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/browser-syncui.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/browser-syncui.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/browser-syncui.js	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/browser-syncui.js	2015-04-24 19:30:53.000000000 +0000
@@ -136,6 +136,8 @@
   },
 
   _loginFailed: function () {
+    this.log.debug("_loginFailed has sync state=${sync}, readinglist state=${rl}",
+                   { sync: Weave.Status.login, rl: ReadingListScheduler.state});
     return Weave.Status.login == Weave.LOGIN_FAILED_LOGIN_REJECTED ||
            ReadingListScheduler.state == ReadingListScheduler.STATE_ERROR_AUTHENTICATION;
   },
@@ -234,8 +236,14 @@
       this.updateUI();
       return;
     }
-    // if we are still waiting for the identity manager to initialize, don't show errors
-    if (Weave.Status.login == Weave.LOGIN_FAILED_NOT_READY) {
+    // if we are still waiting for the identity manager to initialize, or it's
+    // a network/server error, don't show errors.  If it weren't for the legacy
+    // provider we could just check LOGIN_FAILED_LOGIN_REJECTED, but the legacy
+    // provider has states like LOGIN_FAILED_INVALID_PASSPHRASE which we
+    // probably do want to surface.
+    if (Weave.Status.login == Weave.LOGIN_FAILED_NOT_READY ||
+        Weave.Status.login == Weave.LOGIN_FAILED_NETWORK_ERROR ||
+        Weave.Status.login == Weave.LOGIN_FAILED_SERVER_ERROR) {
       this.updateUI();
       return;
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/content.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/content.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/content.js	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/content.js	2015-04-24 19:30:53.000000000 +0000
@@ -123,6 +123,13 @@
         InlineSpellCheckerContent.initContextMenu(event, editFlags, this);
     }
 
+    // Set the event target first as the copy image command needs it to
+    // determine what was context-clicked on. Then, update the state of the
+    // commands on the context menu.
+    docShell.contentViewer.QueryInterface(Ci.nsIContentViewerEdit)
+            .setCommandNode(event.target);
+    event.target.ownerDocument.defaultView.updateCommands("contentcontextmenu");
+
     let customMenuItems = PageMenuChild.build(event.target);
     let principal = doc.nodePrincipal;
     sendSyncMessage("contextmenu",
@@ -270,7 +277,7 @@
   let principal = e.target.nodePrincipal ? e.target.nodePrincipal : e.target.document.nodePrincipal;
 
   if (e.detail) {
-    sendAsyncMessage("WebChannelMessageToChrome", e.detail, null, principal);
+    sendAsyncMessage("WebChannelMessageToChrome", e.detail, { eventTarget: e.target }, principal);
   } else  {
     Cu.reportError("WebChannel message failed. No message detail.");
   }
@@ -279,12 +286,30 @@
 // Add message listener for "WebChannelMessageToContent" messages from chrome scripts
 addMessageListener("WebChannelMessageToContent", function (e) {
   if (e.data) {
-    content.dispatchEvent(new content.CustomEvent("WebChannelMessageToContent", {
-      detail: Cu.cloneInto({
-        id: e.data.id,
-        message: e.data.message,
-      }, content),
-    }));
+    // e.objects.eventTarget will be defined if sending a response to
+    // a WebChannelMessageToChrome event. An unsolicited send
+    // may not have an eventTarget defined, in this case send to the
+    // main content window.
+    let eventTarget = e.objects.eventTarget || content;
+
+    // if eventTarget is window then we want the document principal,
+    // otherwise use target itself.
+    let targetPrincipal = eventTarget instanceof Ci.nsIDOMWindow ? eventTarget.document.nodePrincipal : eventTarget.nodePrincipal;
+
+    if (e.principal.subsumes(targetPrincipal)) {
+      // if eventTarget is a window, use it as the targetWindow, otherwise
+      // find the window that owns the eventTarget.
+      let targetWindow = eventTarget instanceof Ci.nsIDOMWindow ? eventTarget : eventTarget.ownerDocument.defaultView;
+
+      eventTarget.dispatchEvent(new targetWindow.CustomEvent("WebChannelMessageToContent", {
+        detail: Cu.cloneInto({
+          id: e.data.id,
+          message: e.data.message,
+        }, targetWindow),
+      }));
+    } else {
+      Cu.reportError("WebChannel message failed. Principal mismatch.");
+    }
   } else {
     Cu.reportError("WebChannel message failed. No message data.");
   }
@@ -377,9 +402,15 @@
   },
 
   onAboutBlocked: function (targetElement, ownerDoc) {
+    var reason = 'phishing';
+    if (/e=malwareBlocked/.test(ownerDoc.documentURI)) {
+      reason = 'malware';
+    } else if (/e=unwantedBlocked/.test(ownerDoc.documentURI)) {
+      reason = 'unwanted';
+    }
     sendAsyncMessage("Browser:SiteBlockedError", {
       location: ownerDoc.location.href,
-      isMalware: /e=malwareBlocked/.test(ownerDoc.documentURI),
+      reason: reason,
       elementId: targetElement.getAttribute("id"),
       isTopFrame: (ownerDoc.defaultView.parent === ownerDoc.defaultView)
     });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/nsContextMenu.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/nsContextMenu.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/nsContextMenu.js	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/nsContextMenu.js	2015-04-24 19:30:53.000000000 +0000
@@ -628,7 +628,9 @@
     this.inSyntheticDoc = ownerDoc.mozSyntheticDocument;
     // First, do checks for nodes that never have children.
     if (this.target.nodeType == Node.ELEMENT_NODE) {
-      // See if the user clicked on an image.
+      // See if the user clicked on an image. This check mirrors
+      // nsDocumentViewer::GetInImage. Make sure to update both if this is
+      // changed.
       if (this.target instanceof Ci.nsIImageLoadingContent &&
           this.target.currentURI) {
         this.onImage = true;
@@ -1342,12 +1344,14 @@
 
   // Save URL of the clicked upon image, video, or audio.
   saveMedia: function() {
-    var doc =  this.target.ownerDocument;
+    let doc = this.ownerDoc;
     let referrerURI = gContextMenuContentData.documentURIObject;
     if (this.onCanvas) {
       // Bypass cache, since it's a data: URL.
-      saveImageURL(this.target.toDataURL(), "canvas.png", "SaveImageTitle",
-                   true, false, referrerURI, doc);
+      this._canvasToDataURL(this.target).then(function(dataURL) {
+        saveImageURL(dataURL, "canvas.png", "SaveImageTitle",
+                     true, false, referrerURI, doc);
+      }, Cu.reportError);
     }
     else if (this.onImage) {
       urlSecurityCheck(this.mediaURL, this.principal);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/sanitize.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/sanitize.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/sanitize.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/sanitize.js	2015-04-24 19:30:53.000000000 +0000
@@ -486,6 +486,11 @@
                     .getService(Ci.nsISiteSecurityService);
         sss.clearAll();
 
+        // Clear all push notification subscriptions
+        var push = Cc["@mozilla.org/push/NotificationService;1"]
+                    .getService(Ci.nsIPushNotificationService);
+        push.clearAll();
+
         TelemetryStopwatch.finish("FX_SANITIZE_SITESETTINGS");
       },
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/sync/setup.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/sync/setup.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/sync/setup.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/sync/setup.js	2015-04-24 19:30:53.000000000 +0000
@@ -472,13 +472,6 @@
           Weave.Service.identity.syncKey = Weave.Utils.generatePassphrase();
           this._handleNoScript(false);
           Weave.Svc.Prefs.set("firstSync", "newAccount");
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-          if (document.getElementById("metroSetupCheckbox").checked) {
-            Services.metro.storeSyncInfo(email, password, Weave.Service.identity.syncKey);
-          }
-#endif
-#endif
           this.wizardFinish();
           return false;
         }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/sync/setup.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/sync/setup.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/sync/setup.xul	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/sync/setup.xul	2015-04-24 19:30:53.000000000 +0000
@@ -172,20 +172,6 @@
             <label class="status" value=" "/>
           </hbox>
         </row>
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-        <row id="metroRow" align="center">
-          <spacer/>
-          <hbox align="center">
-            <checkbox label="&setup.setupMetro.label;"
-                      accesskey="&setup.setupMetro.accesskey;"
-                      control="weavePasswordConfirm"
-                      id="metroSetupCheckbox"
-                      checked="true"/>
-          </hbox>
-        </row>
-#endif
-#endif
         <row id="TOSRow" align="center">
           <spacer/>
           <hbox align="center">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_bug1104165-switchtab-decodeuri.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_bug1104165-switchtab-decodeuri.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_bug1104165-switchtab-decodeuri.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_bug1104165-switchtab-decodeuri.js	2015-04-24 19:30:53.000000000 +0000
@@ -0,0 +1,29 @@
+add_task(function* test_switchtab_decodeuri() {
+  info("Opening first tab");
+  let tab = gBrowser.addTab("http://example.org/browser/browser/base/content/test/general/dummy_page.html#test%7C1");
+  yield promiseTabLoadEvent(tab);
+
+  info("Opening and selecting second tab");
+  let newTab = gBrowser.selectedTab = gBrowser.addTab();
+
+  info("Wait for autocomplete")
+  yield promiseAutocompleteResultPopup("dummy_page");
+
+  info("Select autocomplete popup entry");
+  EventUtils.synthesizeKey("VK_DOWN" , {});
+  ok(gURLBar.value.startsWith("moz-action:switchtab"), "switch to tab entry found");
+
+  info("switch-to-tab");
+  yield new Promise((resolve, reject) => {
+    // In case of success it should switch tab.
+    gBrowser.tabContainer.addEventListener("TabSelect", function select() {
+      gBrowser.tabContainer.removeEventListener("TabSelect", select, false);
+      is(gBrowser.selectedTab, tab, "Should have switched to the right tab");
+      resolve();
+    }, false);
+    EventUtils.synthesizeKey("VK_RETURN" , { });
+  });
+
+  gBrowser.removeCurrentTab();
+  yield PlacesTestUtils.clearHistory();
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_bug304198.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_bug304198.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_bug304198.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_bug304198.js	2015-04-24 19:30:53.000000000 +0000
@@ -2,9 +2,7 @@
  * License, v. 2.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();
-
+add_task(function* () {
   let charsToDelete, deletedURLTab, fullURLTab, partialURLTab, testPartialURL, testURL;
 
   charsToDelete = 5;
@@ -13,112 +11,96 @@
   partialURLTab = gBrowser.addTab();
   testURL = "http://example.org/browser/browser/base/content/test/general/dummy_page.html";
 
+  let loaded1 = BrowserTestUtils.browserLoaded(deletedURLTab.linkedBrowser, testURL);
+  let loaded2 = BrowserTestUtils.browserLoaded(fullURLTab.linkedBrowser, testURL);
+  let loaded3 = BrowserTestUtils.browserLoaded(partialURLTab.linkedBrowser, testURL);
+  deletedURLTab.linkedBrowser.loadURI(testURL);
+  fullURLTab.linkedBrowser.loadURI(testURL);
+  partialURLTab.linkedBrowser.loadURI(testURL);
+  yield Promise.all([loaded1, loaded2, loaded3]);
+
+  testURL = gURLBar.trimValue(testURL);
+  testPartialURL = testURL.substr(0, (testURL.length - charsToDelete));
+
   function cleanUp() {
     gBrowser.removeTab(fullURLTab);
     gBrowser.removeTab(partialURLTab);
     gBrowser.removeTab(deletedURLTab);
   }
 
-  function cycleTabs() {
-    gBrowser.selectedTab = fullURLTab;
+  function* cycleTabs() {
+    yield BrowserTestUtils.switchTab(gBrowser, fullURLTab);
     is(gURLBar.textValue, testURL, 'gURLBar.textValue should be testURL after switching back to fullURLTab');
 
-    gBrowser.selectedTab = partialURLTab;
+    yield BrowserTestUtils.switchTab(gBrowser, partialURLTab);
     is(gURLBar.textValue, testPartialURL, 'gURLBar.textValue should be testPartialURL after switching back to partialURLTab');
-    gBrowser.selectedTab = deletedURLTab;
+    yield BrowserTestUtils.switchTab(gBrowser, deletedURLTab);
     is(gURLBar.textValue, '', 'gURLBar.textValue should be "" after switching back to deletedURLTab');
 
-    gBrowser.selectedTab = fullURLTab;
+    yield BrowserTestUtils.switchTab(gBrowser, fullURLTab);
     is(gURLBar.textValue, testURL, 'gURLBar.textValue should be testURL after switching back to fullURLTab');
   }
 
-  // function borrowed from browser_bug386835.js
-  function load(tab, url, cb) {
-    tab.linkedBrowser.addEventListener("load", function (event) {
-      event.currentTarget.removeEventListener("load", arguments.callee, true);
-      cb();
-    }, true);
-    tab.linkedBrowser.loadURI(url);
-  }
-
-  function urlbarBackspace(cb) {
-    gBrowser.selectedBrowser.focus();
-    gURLBar.addEventListener("focus", function () {
-      gURLBar.removeEventListener("focus", arguments.callee, false);
+  function urlbarBackspace() {
+    return new Promise((resolve, reject) => {
+      gBrowser.selectedBrowser.focus();
       gURLBar.addEventListener("input", function () {
         gURLBar.removeEventListener("input", arguments.callee, false);
-        cb();
+        resolve();
       }, false);
-      executeSoon(function () {
-        EventUtils.synthesizeKey("VK_BACK_SPACE", {});
-      });
-    }, false);
-    gURLBar.focus();
+      gURLBar.focus();
+      EventUtils.synthesizeKey("VK_BACK_SPACE", {});
+    });
   }
 
-  function prepareDeletedURLTab(cb) {
-    gBrowser.selectedTab = deletedURLTab;
+  function* prepareDeletedURLTab() {
+    yield BrowserTestUtils.switchTab(gBrowser, deletedURLTab);
     is(gURLBar.textValue, testURL, 'gURLBar.textValue should be testURL after initial switch to deletedURLTab');
 
     // simulate the user removing the whole url from the location bar
     gPrefService.setBoolPref("browser.urlbar.clickSelectsAll", true);
 
-    urlbarBackspace(function () {
-      is(gURLBar.textValue, "", 'gURLBar.textValue should be "" (just set)');
-      if (gPrefService.prefHasUserValue("browser.urlbar.clickSelectsAll"))
-        gPrefService.clearUserPref("browser.urlbar.clickSelectsAll");
-      cb();
-    });
+    yield urlbarBackspace();
+    is(gURLBar.textValue, "", 'gURLBar.textValue should be "" (just set)');
+    if (gPrefService.prefHasUserValue("browser.urlbar.clickSelectsAll")) {
+      gPrefService.clearUserPref("browser.urlbar.clickSelectsAll");
+    }
   }
 
-  function prepareFullURLTab(cb) {
-    gBrowser.selectedTab = fullURLTab;
+  function* prepareFullURLTab() {
+    yield BrowserTestUtils.switchTab(gBrowser, fullURLTab);
     is(gURLBar.textValue, testURL, 'gURLBar.textValue should be testURL after initial switch to fullURLTab');
-    cb();
   }
 
-  function preparePartialURLTab(cb) {
-    gBrowser.selectedTab = partialURLTab;
+  function* preparePartialURLTab() {
+    yield BrowserTestUtils.switchTab(gBrowser, partialURLTab);
     is(gURLBar.textValue, testURL, 'gURLBar.textValue should be testURL after initial switch to partialURLTab');
 
     // simulate the user removing part of the url from the location bar
     gPrefService.setBoolPref("browser.urlbar.clickSelectsAll", false);
 
-    var deleted = 0;
-    urlbarBackspace(function () {
+    let deleted = 0;
+    while (deleted < charsToDelete) {
+      yield urlbarBackspace(arguments.callee);
       deleted++;
-      if (deleted < charsToDelete) {
-        urlbarBackspace(arguments.callee);
-      } else {
-        is(gURLBar.textValue, testPartialURL, "gURLBar.textValue should be testPartialURL (just set)");
-        if (gPrefService.prefHasUserValue("browser.urlbar.clickSelectsAll"))
-          gPrefService.clearUserPref("browser.urlbar.clickSelectsAll");
-        cb();
-      }
-    });
-  }
+    }
 
-  function runTests() {
-    testURL = gURLBar.trimValue(testURL);
-    testPartialURL = testURL.substr(0, (testURL.length - charsToDelete));
-
-    // prepare the three tabs required by this test
-    prepareFullURLTab(function () {
-      preparePartialURLTab(function () {
-        prepareDeletedURLTab(function () {
-          // now cycle the tabs and make sure everything looks good
-          cycleTabs();
-          cleanUp();
-          finish();
-        });
-      });
-    });
+    is(gURLBar.textValue, testPartialURL, "gURLBar.textValue should be testPartialURL (just set)");
+    if (gPrefService.prefHasUserValue("browser.urlbar.clickSelectsAll")) {
+      gPrefService.clearUserPref("browser.urlbar.clickSelectsAll");
+    }
   }
 
-  load(deletedURLTab, testURL, function() {
-    load(fullURLTab, testURL, function() {
-      load(partialURLTab, testURL, runTests);
-    });
-  });
-}
+  // prepare the three tabs required by this test
+
+  // First tab
+  yield* prepareFullURLTab();
+  yield* preparePartialURLTab();
+  yield* prepareDeletedURLTab();
+
+  // now cycle the tabs and make sure everything looks good
+  yield* cycleTabs();
+  cleanUp();
+});
+
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_bug565575.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_bug565575.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_bug565575.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_bug565575.js	2015-04-24 19:30:53.000000000 +0000
@@ -1,13 +1,14 @@
-function test() {
+add_task(function* () {
   gBrowser.selectedBrowser.focus();
-  BrowserOpenTab();
+
+  yield BrowserTestUtils.openNewForegroundTab(gBrowser, () => BrowserOpenTab(), false);
   ok(gURLBar.focused, "location bar is focused for a new tab");
 
-  gBrowser.selectedTab = gBrowser.tabs[0];
+  yield BrowserTestUtils.switchTab(gBrowser, gBrowser.tabs[0]);
   ok(!gURLBar.focused, "location bar isn't focused for the previously selected tab");
 
-  gBrowser.selectedTab = gBrowser.tabs[1];
+  yield BrowserTestUtils.switchTab(gBrowser, gBrowser.tabs[1]);
   ok(gURLBar.focused, "location bar is re-focused when selecting the new tab");
 
   gBrowser.removeCurrentTab();
-}
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_bug655584.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_bug655584.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_bug655584.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_bug655584.js	2015-04-24 19:30:53.000000000 +0000
@@ -4,20 +4,20 @@
 
 // Bug 655584 - awesomebar suggestions don't update after tab is closed
 
-function test() {
+add_task(function* () {
   var tab1 = gBrowser.addTab();
   var tab2 = gBrowser.addTab();
 
   // When urlbar in a new tab is focused, and a tab switch occurs,
   // the urlbar popup should be closed
-  gBrowser.selectedTab = tab2;
+  yield BrowserTestUtils.switchTab(gBrowser, tab2);
   gURLBar.focus(); // focus the urlbar in the tab we will switch to
-  gBrowser.selectedTab = tab1;
+  yield BrowserTestUtils.switchTab(gBrowser, tab1);
   gURLBar.openPopup();
-  gBrowser.selectedTab = tab2;
+  yield BrowserTestUtils.switchTab(gBrowser, tab2);
   ok(!gURLBar.popupOpen, "urlbar focused in tab to switch to, close popup");
   
   // cleanup
   gBrowser.removeCurrentTab();
   gBrowser.removeCurrentTab();
-}
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_bug710878.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_bug710878.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_bug710878.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_bug710878.js	2015-04-24 19:30:53.000000000 +0000
@@ -5,23 +5,20 @@
 {
   waitForExplicitFinish();
 
-  let doc;
-
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
     gBrowser.selectedBrowser.removeEventListener("load", onload, true);
-    doc = content.document;
     waitForFocus(performTest, content);
   }, true);
 
-  content.location = "data:text/html,<a href='%23xxx'><span>word1 <span> word2 </span></span><span> word3</span></a>";
+  content.location = "data:text/html;charset=utf-8,<a href='%23xxx'><span>word1 <span> word2 </span></span><span> word3</span></a>";
 
   function performTest()
   {
+    let doc = content.document;
     let link = doc.querySelector("a");;
     let text = gatherTextUnder(link);
     is(text, "word1 word2 word3", "Text under link is correctly computed.");
-    doc = null;
     gBrowser.removeCurrentTab();
     finish();
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_clipboard.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_clipboard.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_clipboard.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_clipboard.js	2015-04-24 19:30:53.000000000 +0000
@@ -1,7 +1,9 @@
 // This test is used to check copy and paste in editable areas to ensure that non-text
 // types (html and images) are copied to and pasted from the clipboard properly.
 
-let testPage = "<div id='main' contenteditable='true'>Test <b>Bold</b> After Text</div>";
+let testPage = "<body style='margin: 0'><img id='img' tabindex='1' src='http://example.org/browser/browser/base/content/test/general/moz.png'>" +
+               "  <div id='main' contenteditable='true'>Test <b>Bold</b> After Text</div>" +
+               "</body>";
 
 add_task(function*() {
   let tab = gBrowser.addTab();
@@ -12,7 +14,12 @@
   yield promiseTabLoadEvent(tab, "data:text/html," + escape(testPage));
   yield SimpleTest.promiseFocus(browser.contentWindowAsCPOW);
 
-  let results = yield ContentTask.spawn(browser, {}, function* () {
+  const modifier = (content.navigator.platform.indexOf("Mac") >= 0) ?
+                   Components.interfaces.nsIDOMWindowUtils.MODIFIER_META :
+                   Components.interfaces.nsIDOMWindowUtils.MODIFIER_CONTROL;
+
+  let results = yield ContentTask.spawn(browser, { modifier: modifier },
+                                        function* (arg) {
     var doc = content.document;
     var main = doc.getElementById("main");
     main.focus();
@@ -20,10 +27,7 @@
     const utils = content.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
                          .getInterface(Components.interfaces.nsIDOMWindowUtils);
 
-    const modifier = (content.navigator.platform.indexOf("Mac") >= 0) ?
-                     Components.interfaces.nsIDOMWindowUtils.MODIFIER_META :
-                     Components.interfaces.nsIDOMWindowUtils.MODIFIER_CONTROL;
-
+    const modifier = arg.modifier;
     function sendKey(key)
     {
      if (utils.sendKeyEvent("keydown", key, 0, modifier)) {
@@ -46,7 +50,7 @@
     selection.modify("extend", "right", "word");
     selection.modify("extend", "right", "word");
 
-    yield new content.Promise((resolve, reject) => {
+    yield new Promise((resolve, reject) => {
       addEventListener("copy", function copyEvent(event) {
         removeEventListener("copy", copyEvent, true);
         // The data is empty as the selection is copied during the event default phase.
@@ -59,7 +63,7 @@
 
     selection.modify("move", "right", "line");
 
-    yield new content.Promise((resolve, reject) => {
+    yield new Promise((resolve, reject) => {
       addEventListener("paste", function copyEvent(event) {
         removeEventListener("paste", copyEvent, true);
         let clipboardData = event.clipboardData; 
@@ -80,7 +84,7 @@
     selection.modify("extend", "left", "word");
     selection.modify("extend", "left", "character");
 
-    yield new content.Promise((resolve, reject) => {
+    yield new Promise((resolve, reject) => {
       addEventListener("cut", function copyEvent(event) {
         removeEventListener("cut", copyEvent, true);
         event.clipboardData.setData("text/plain", "Some text");
@@ -94,7 +98,7 @@
 
     selection.modify("move", "left", "line");
 
-    yield new content.Promise((resolve, reject) => {
+    yield new Promise((resolve, reject) => {
       addEventListener("paste", function copyEvent(event) {
         removeEventListener("paste", copyEvent, true);
         let clipboardData = event.clipboardData; 
@@ -110,6 +114,7 @@
     });
 
     is(main.innerHTML, "<i>Italic</i> Test <b>Bold</b> After<b></b>", "Copy and paste html 2");
+
     return results;
   });
 
@@ -118,6 +123,61 @@
     ok(results[t].startsWith("PASSED"), results[t]);
   }
 
+  // Next, check that the Copy Image command works.
+
+  // The context menu needs to be opened to properly initialize for the copy
+  // image command to run.
+  let contextMenu = document.getElementById("contentAreaContextMenu");
+  let contextMenuShown = promisePopupShown(contextMenu);
+  BrowserTestUtils.synthesizeMouseAtCenter("#img", { type: "contextmenu", button: 2 }, gBrowser.selectedBrowser);
+  yield contextMenuShown;
+
+  document.getElementById("context-copyimage-contents").doCommand();
+
+  contextMenu.hidePopup();
+  yield promisePopupHidden(contextMenu);
+
+  // Focus the content again
+  yield SimpleTest.promiseFocus(browser.contentWindowAsCPOW);
+
+  let expectedContent = yield ContentTask.spawn(browser, { modifier: modifier },
+                                                function* (arg) {
+    var doc = content.document;
+    var main = doc.getElementById("main");
+    main.focus();
+
+    yield new Promise((resolve, reject) => {
+      addEventListener("paste", function copyEvent(event) {
+        removeEventListener("paste", copyEvent, true);
+        let clipboardData = event.clipboardData;
+
+        // DataTransfer doesn't support the image types yet, so only text/html
+        // will be present.
+        if (clipboardData.getData("text/html") !=
+            '<img id="img" tabindex="1" src="http://example.org/browser/browser/base/content/test/general/moz.png">') {
+          reject();
+        }
+        resolve();
+      }, true)
+
+      const utils = content.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                           .getInterface(Components.interfaces.nsIDOMWindowUtils);
+
+      const modifier = arg.modifier;
+      if (utils.sendKeyEvent("keydown", "v", 0, modifier)) {
+        utils.sendKeyEvent("keypress", "v", "v".charCodeAt(0), modifier);
+      }
+      utils.sendKeyEvent("keyup", "v", 0, modifier);
+    });
+
+    // Return the new content which should now include an image.
+    return main.innerHTML;
+  });
+
+  is(expectedContent, '<i>Italic</i> <img id="img" tabindex="1" ' +
+                      'src="http://example.org/browser/browser/base/content/test/general/moz.png">' +
+                      'Test <b>Bold</b> After<b></b>', "Paste after copy image");
+
   gBrowser.removeCurrentTab();
 });
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_fxa_oauth.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_fxa_oauth.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_fxa_oauth.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_fxa_oauth.js	2015-04-24 19:30:54.000000000 +0000
@@ -147,8 +147,8 @@
           Assert.ok(tabOpened);
           Assert.equal(tokenData.code, "code1");
           Assert.equal(tokenData.state, "state");
-          Assert.equal(keys.kAr, "kAr");
-          Assert.equal(keys.kBr, "kBr");
+          Assert.deepEqual(keys.kAr, {k: "kAr"});
+          Assert.deepEqual(keys.kBr, {k: "kBr"});
           resolve();
         };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_fxa_oauth_with_keys.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_fxa_oauth_with_keys.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_fxa_oauth_with_keys.html	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_fxa_oauth_with_keys.html	2015-04-24 19:30:54.000000000 +0000
@@ -16,7 +16,9 @@
             state: "state",
             code: "code1",
             closeWindow: "signin",
-            keys: { kAr: 'kAr', kBr: 'kBr' },
+            // Keys normally contain more information, but this is enough
+            // to keep Loop's tests happy.
+            keys: { kAr: { k: 'kAr' }, kBr: { k: 'kBr' }},
           },
         },
       },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser.ini	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser.ini	2015-04-24 19:30:53.000000000 +0000
@@ -144,7 +144,6 @@
 [browser_bookmark_titles.js]
 skip-if = buildapp == 'mulet' || toolkit == "windows" # Disabled on Windows due to frequent failures (bugs 825739, 841341)
 [browser_bug304198.js]
-skip-if = e10s
 [browser_bug321000.js]
 skip-if = true # browser_bug321000.js is disabled because newline handling is shaky (bug 592528)
 [browser_bug329212.js]
@@ -215,7 +214,6 @@
 [browser_bug562649.js]
 [browser_bug563588.js]
 [browser_bug565575.js]
-skip-if = e10s
 [browser_bug565667.js]
 skip-if = toolkit != "cocoa"
 [browser_bug567306.js]
@@ -250,7 +248,6 @@
 [browser_bug647886.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 1093373 - Relies on browser.sessionHistory
 [browser_bug655584.js]
-skip-if = e10s
 [browser_bug664672.js]
 [browser_bug676619.js]
 skip-if = buildapp == 'mulet' || os == "mac" # mac: Intermittent failures, bug 925225
@@ -337,7 +334,6 @@
 [browser_menuButtonFitts.js]
 skip-if = os != "win" # The Fitts Law menu button is only supported on Windows (bug 969376)
 [browser_middleMouse_noJSPaste.js]
-skip-if = e10s # Bug 921952 - Content:Click event issues
 [browser_minimize.js]
 skip-if = e10s # Bug 1100664 - test directly access content docShells (TypeError: gBrowser.docShell is null)
 [browser_mixedcontent_securityflags.js]
@@ -388,7 +384,7 @@
 [browser_save_link_when_window_navigates.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_save_video.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 1100698 - test uses synthesizeMouse and then does a load of other stuff that breaks in e10s
+skip-if = buildapp == 'mulet'
 [browser_save_video_frame.js]
 [browser_scope.js]
 [browser_searchSuggestionUI.js]
@@ -465,12 +461,12 @@
 [browser_windowopen_reflows.js]
 skip-if = buildapp == 'mulet'
 [browser_wyciwyg_urlbarCopying.js]
-skip-if = e10s # Bug 1100703 - test directly manipulates content (content.document.getElementById)
 [browser_zbug569342.js]
 skip-if = e10s # Bug 1094240 - has findbar-related failures
 [browser_registerProtocolHandler_notification.js]
 skip-if = e10s # Bug 940206 - nsIWebContentHandlerRegistrar::registerProtocolHandler doesn't work in e10s
 [browser_no_mcb_on_http_site.js]
+[browser_bug1104165-switchtab-decodeuri.js]
 [browser_bug1003461-switchtab-override.js]
 [browser_bug1024133-switchtab-override-keynav.js]
 [browser_bug1025195_switchToTabHavingURI_aOpenParams.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_middleMouse_noJSPaste.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_middleMouse_noJSPaste.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_middleMouse_noJSPaste.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_middleMouse_noJSPaste.js	2015-04-24 19:30:54.000000000 +0000
@@ -3,51 +3,32 @@
 
 const middleMousePastePref = "middlemouse.contentLoadURL";
 const autoScrollPref = "general.autoScroll";
-function test() {
-  waitForExplicitFinish();
 
-  Services.prefs.setBoolPref(middleMousePastePref, true);
-  Services.prefs.setBoolPref(autoScrollPref, false);
-  let tab = gBrowser.selectedTab = gBrowser.addTab();
-
-  registerCleanupFunction(function () {
-    Services.prefs.clearUserPref(middleMousePastePref);
-    Services.prefs.clearUserPref(autoScrollPref);
-    gBrowser.removeTab(tab);
-  });
+add_task(function* () {
+  yield pushPrefs([middleMousePastePref, true], [autoScrollPref, false]);
 
-  addPageShowListener(function () {
-    let pagePrincipal = gBrowser.contentPrincipal;
+  let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser);
 
-    // copy javascript URI to the clipboard
-    let url = "javascript:http://www.example.com/";
-    waitForClipboard(url,
-      function() {
-        Components.classes["@mozilla.org/widget/clipboardhelper;1"]
-                  .getService(Components.interfaces.nsIClipboardHelper)
-                  .copyString(url, document);
-      },
-      function () {
-        // Middle click on the content area
-        info("Middle clicking");
-        EventUtils.sendMouseEvent({type: "click", button: 1}, gBrowser);
-      },
-      function() {
-        ok(false, "Failed to copy URL to the clipboard");
-        finish();
-      }
-    );
-
-    addPageShowListener(function () {
-      is(gBrowser.currentURI.spec, url.replace(/^javascript:/, ""), "url loaded by middle click doesn't include JS");
-      finish();
+  let url = "javascript:http://www.example.com/";
+  yield new Promise((resolve, reject) => {
+    SimpleTest.waitForClipboard(url, () => {
+      Components.classes["@mozilla.org/widget/clipboardhelper;1"]
+                .getService(Components.interfaces.nsIClipboardHelper)
+                .copyString(url, document);
+    }, resolve, () => {
+      ok(false, "Clipboard copy failed");
+      reject();
     });
   });
-}
 
-function addPageShowListener(func) {
-  gBrowser.selectedBrowser.addEventListener("pageshow", function loadListener() {
-    gBrowser.selectedBrowser.removeEventListener("pageshow", loadListener, false);
-    func();
-  });
-}
+  let middlePagePromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+
+  // Middle click on the content area
+  info("Middle clicking");
+  yield BrowserTestUtils.synthesizeMouse(null, 10, 10, {button: 1}, gBrowser.selectedBrowser);
+  yield middlePagePromise;
+
+  is(gBrowser.currentURI.spec, url.replace(/^javascript:/, ""), "url loaded by middle click doesn't include JS");
+
+  gBrowser.removeTab(tab);
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_save_video.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_save_video.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_save_video.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_save_video.js	2015-04-24 19:30:54.000000000 +0000
@@ -8,70 +8,68 @@
  * TestCase for bug 564387
  * <https://bugzilla.mozilla.org/show_bug.cgi?id=564387>
  */
-function test() {
-  waitForExplicitFinish();
+add_task(function* () {
   var fileName;
 
+  let loadPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
   gBrowser.loadURI("http://mochi.test:8888/browser/browser/base/content/test/general/web_video.html");
+  yield loadPromise;
 
-  gBrowser.addEventListener("pageshow", function pageShown(event) {
-    if (event.target.location == "about:blank")
-      return;
-    gBrowser.removeEventListener("pageshow", pageShown);
-
-    executeSoon(function () {
-      document.addEventListener("popupshown", contextMenuOpened);
-
-      var video1 = gBrowser.contentDocument.getElementById("video1");
-      EventUtils.synthesizeMouseAtCenter(video1,
-                                         { type: "contextmenu", button: 2 },
-                                         gBrowser.contentWindow);
-      info("context menu click on video1");
-    });
-  });
+  let popupShownPromise = BrowserTestUtils.waitForEvent(document, "popupshown");
 
-  function contextMenuOpened(event) {
-    event.currentTarget.removeEventListener("popupshown", contextMenuOpened);
-    info("context menu opened on video1");
-
-    // Create the folder the video will be saved into.
-    var destDir = createTemporarySaveDirectory();
-    var destFile = destDir.clone();
-
-    MockFilePicker.displayDirectory = destDir;
-    MockFilePicker.showCallback = function(fp) {
-      fileName = fp.defaultString;
-      destFile.append (fileName);
-      MockFilePicker.returnFiles = [destFile];
-      MockFilePicker.filterIndex = 1; // kSaveAsType_URL
-    };
+  yield BrowserTestUtils.synthesizeMouseAtCenter("#video1",
+                                                 { type: "contextmenu", button: 2 },
+                                                 gBrowser.selectedBrowser);
+  info("context menu click on video1");
+
+  yield popupShownPromise;
+
+  info("context menu opened on video1");
+
+  // Create the folder the video will be saved into.
+  var destDir = createTemporarySaveDirectory();
+  var destFile = destDir.clone();
+
+  MockFilePicker.displayDirectory = destDir;
+  MockFilePicker.showCallback = function(fp) {
+    fileName = fp.defaultString;
+    destFile.append(fileName);
+    MockFilePicker.returnFiles = [destFile];
+    MockFilePicker.filterIndex = 1; // kSaveAsType_URL
+  };
+
+  let transferCompletePromise = new Promise((resolve) => {
+    function onTransferComplete(downloadSuccess) {
+      ok(downloadSuccess, "Video file should have been downloaded successfully");
+
+      is(fileName, "web-video1-expectedName.ogv",
+         "Video file name is correctly retrieved from Content-Disposition http header");
+      resolve();
+    }
 
     mockTransferCallback = onTransferComplete;
     mockTransferRegisterer.register();
+  });
+
+  registerCleanupFunction(function () {
+    mockTransferRegisterer.unregister();
+    MockFilePicker.cleanup();
+    destDir.remove(true);
+  });
+
+  // Select "Save Video As" option from context menu
+  var saveVideoCommand = document.getElementById("context-savevideo");
+  saveVideoCommand.doCommand();
+  info("context-savevideo command executed");
+
+  let contextMenu = document.getElementById("contentAreaContextMenu");
+  let popupHiddenPromise = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
+  contextMenu.hidePopup();
+  yield popupHiddenPromise;
+
+  yield transferCompletePromise;
+});
 
-    registerCleanupFunction(function () {
-      mockTransferRegisterer.unregister();
-      MockFilePicker.cleanup();
-      destDir.remove(true);
-    });
-
-    // Select "Save Video As" option from context menu
-    var saveVideoCommand = document.getElementById("context-savevideo");
-    saveVideoCommand.doCommand();
-    info("context-savevideo command executed");
-
-    event.target.hidePopup();
-  }
-
-  function onTransferComplete(downloadSuccess) {
-    ok(downloadSuccess, "Video file should have been downloaded successfully");
-
-    is(fileName, "web-video1-expectedName.ogv",
-       "Video file name is correctly retrieved from Content-Disposition http header");
-
-    finish();
-  }
-}
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
   .getService(Ci.mozIJSSubScriptLoader)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_syncui.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_syncui.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_syncui.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_syncui.js	2015-04-24 19:30:54.000000000 +0000
@@ -108,6 +108,59 @@
   Assert.equal(Notifications.notifications.length, 0, "no notifications left");
 });
 
+add_task(function* testSyncLoginNetworkError() {
+  Assert.equal(Notifications.notifications.length, 0, "start with no notifications");
+
+  // This test relies on the fact that observers are synchronous, and that error
+  // notifications synchronously create the error notification, which itself
+  // fires an observer notification.
+  // ie, we should see the error notification *during* the notifyObservers call.
+
+  // To prove that, we cause a notification that *does* show an error and make
+  // sure we see the error notification during that call. We then cause a
+  // notification that *should not* show an error, and the lack of the
+  // notification during the call implies the error was ignored.
+
+  // IOW, if this first part of the test fails in the future, it means the
+  // above is no longer true and we need a different strategy to check for
+  // ignored errors.
+
+  let sawNotificationAdded = false;
+  let obs = (subject, topic, data) => {
+    sawNotificationAdded = true;
+  }
+  Services.obs.addObserver(obs, "weave:notification:added", false);
+  try {
+    // notify of a display-able error - we should synchronously see our flag set.
+    Weave.Status.sync = Weave.LOGIN_FAILED;
+    Weave.Status.login = Weave.LOGIN_FAILED_LOGIN_REJECTED;
+    Services.obs.notifyObservers(null, "weave:ui:login:error", null);
+    Assert.ok(sawNotificationAdded);
+
+    // clear the notification.
+    let promiseNotificationRemoved = promiseObserver("weave:notification:removed");
+    Services.obs.notifyObservers(null, "readinglist:sync:start", null);
+    Services.obs.notifyObservers(null, "readinglist:sync:finish", null);
+    yield promiseNotificationRemoved;
+
+    // cool - so reset the flag and test what should *not* show an error.
+    sawNotificationAdded = false;
+    Weave.Status.sync = Weave.LOGIN_FAILED;
+    Weave.Status.login = Weave.LOGIN_FAILED_NETWORK_ERROR;
+    Services.obs.notifyObservers(null, "weave:ui:login:error", null);
+    Assert.ok(!sawNotificationAdded);
+
+    // ditto for LOGIN_FAILED_SERVER_ERROR
+    Weave.Status.sync = Weave.LOGIN_FAILED;
+    Weave.Status.login = Weave.LOGIN_FAILED_SERVER_ERROR;
+    Services.obs.notifyObservers(null, "weave:ui:login:error", null);
+    Assert.ok(!sawNotificationAdded);
+    // we are done.
+  } finally {
+    Services.obs.removeObserver(obs, "weave:notification:added");
+  }
+});
+
 add_task(function* testRLLoginError() {
   let promiseNotificationAdded = promiseObserver("weave:notification:added");
   Assert.equal(Notifications.notifications.length, 0, "start with no notifications");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_wyciwyg_urlbarCopying.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_wyciwyg_urlbarCopying.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/test/general/browser_wyciwyg_urlbarCopying.js	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/test/general/browser_wyciwyg_urlbarCopying.js	2015-04-24 19:30:54.000000000 +0000
@@ -1,39 +1,31 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-function test() {
-  waitForExplicitFinish();
-
-  let url = "http://mochi.test:8888/browser/browser/base/content/test/general/test_wyciwyg_copying.html";
-  let tab = gBrowser.selectedTab = gBrowser.addTab(url);
-  tab.linkedBrowser.addEventListener("pageshow", function () {
-    let btn = content.document.getElementById("btn");
-    executeSoon(function () {
-      EventUtils.synthesizeMouseAtCenter(btn, {}, content);
-      let currentURL = gBrowser.currentURI.spec;
-      ok(/^wyciwyg:\/\//i.test(currentURL), currentURL + " is a wyciwyg URI");
-
-      executeSoon(function () {
-        testURLBarCopy(url, endTest);
-      });
-    });
-  }, false);
-
-  function endTest() {
-    while (gBrowser.tabs.length > 1)
-      gBrowser.removeCurrentTab();
-    finish();
-  }
-
-  function testURLBarCopy(targetValue, cb) {
+function testURLBarCopy(targetValue) {
+  return new Promise((resolve, reject) => {
     info("Expecting copy of: " + targetValue);
     waitForClipboard(targetValue, function () {
       gURLBar.focus();
       gURLBar.select();
 
       goDoCommand("cmd_copy");
-    }, cb, cb);
-  }
+    }, resolve, () => {
+      ok(false, "Clipboard copy failed");
+      reject();
+    });
+  });
 }
 
-
+add_task(function* () {
+  const url = "http://mochi.test:8888/browser/browser/base/content/test/general/test_wyciwyg_copying.html";
+  let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, url);
+
+  yield BrowserTestUtils.synthesizeMouseAtCenter("#btn", {}, tab.linkedBrowser);
+  let currentURL = gBrowser.currentURI.spec;
+  ok(/^wyciwyg:\/\//i.test(currentURL), currentURL + " is a wyciwyg URI");
+
+  yield testURLBarCopy(url);
+
+  while (gBrowser.tabs.length > 1)
+    gBrowser.removeCurrentTab();
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/urlbarBindings.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/urlbarBindings.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/base/content/urlbarBindings.xml	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/base/content/urlbarBindings.xml	2015-04-24 19:30:54.000000000 +0000
@@ -305,7 +305,7 @@
               if (this.hasAttribute("actiontype")) {
                 this.handleRevert();
                 let prevTab = gBrowser.selectedTab;
-                if (switchToTabHavingURI(url) &&
+                if (switchToTabHavingURI(action.params.originalUrl || url) &&
                     isTabEmpty(prevTab))
                   gBrowser.removeTab(prevTab);
                 return;
@@ -716,9 +716,24 @@
         ]]></getter>
         <setter>
           <![CDATA[
+          let uri;
           try {
-            val = losslessDecodeURI(makeURI(val));
-          } catch (ex) { }
+            uri = makeURI(val);
+          } catch (ex) {}
+
+          if (uri) {
+            let action = this._parseActionUrl(val);
+            if (action) {
+              if (action.params.url) {
+                // Store the original URL in the action URL.
+                action.params.originalUrl = action.params.url;
+                action.params.url = losslessDecodeURI(makeURI(action.params.url));
+                val = "moz-action:" + action.type + "," + JSON.stringify(action.params);
+              }
+            } else {
+              val = losslessDecodeURI(uri);
+            }
+          }
 
           // Trim popup selected values, but never trim results coming from
           // autofill.
@@ -758,6 +773,12 @@
 
           try {
             action.params = JSON.parse(params);
+            if (action.params.input) {
+              action.params.input = decodeURIComponent(action.params.input);
+            }
+            if (action.params.searchQuery) {
+              action.params.searchQuery = decodeURIComponent(action.params.searchQuery);
+            }
           } catch (e) {
             // If this failed, we assume that params is not a JSON object, and
             // is instead just a flat string. This will happen when
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/jar.mn	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/jar.mn	2015-04-24 19:30:54.000000000 +0000
@@ -18,11 +18,3 @@
   content/branding/identity-icons-brand@2x.png   (identity-icons-brand@2x.png)
   content/branding/silhouette-40.svg             (silhouette-40.svg)
   content/branding/aboutDialog.css               (aboutDialog.css)
-#ifdef MOZ_METRO
-  content/branding/metro-about.css               (metro-about.css)
-  content/branding/metro-about-footer.png        (metro-about-footer.png)
-  content/branding/metro-about-wordmark.png      (metro-about-wordmark.png)
-  content/branding/metro_firstrun_logo.png       (metro_firstrun_logo.png)
-  content/branding/metro_firstrun_logo@1.4x.png  (metro_firstrun_logo@1.4x.png)
-  content/branding/metro_firstrun_logo@1.8x.png  (metro_firstrun_logo@1.8x.png)
-#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/Makefile.in	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/Makefile.in	2015-04-24 19:30:54.000000000 +0000
@@ -4,10 +4,3 @@
 
 # Branding Makefile
 #  - jars chrome artwork
-
-# resources needed for the metro tile interface
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
-TILE_DEST := $(DIST)/bin/tileresources
-INSTALL_TARGETS += TILE
-endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/metro-about.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/metro-about.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/metro-about.css	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/metro-about.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +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/. */
-
-#about-flyoutpanel {
-  background-color: #331e54;
-  color: white;
-}
-
-#about-policy-label:hover,
-#about-policy-label:active {
-  background: #181327;
-}
-
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/metro-about-footer.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/metro-about-footer.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/metro-about-wordmark.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/metro-about-wordmark.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/metro_firstrun_logo@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/metro_firstrun_logo@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/metro_firstrun_logo@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/metro_firstrun_logo@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/metro_firstrun_logo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/metro_firstrun_logo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/VisualElements_logo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/VisualElements_logo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/VisualElements_smalllogo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/VisualElements_smalllogo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/content/VisualElements_splashscreen.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/content/VisualElements_splashscreen.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/Makefile.in	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/Makefile.in	2015-04-24 19:30:54.000000000 +0000
@@ -4,8 +4,7 @@
 
 include $(topsrcdir)/config/config.mk
 
-# On Windows only do this step for browser, skip for metro.
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 BRANDING_FILES := \
 	firefox.ico \
 	document.ico \
@@ -47,10 +46,3 @@
 BRANDING_DEST := $(DIST)/branding
 BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
-
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-VISUALMANIFEST := VisualElementsManifest.xml
-VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
-VISUALMANIFEST_PATH := $(DIST)/bin
-PP_TARGETS += VISUALMANIFEST
-endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/VisualElementsManifest.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/VisualElementsManifest.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/aurora/VisualElementsManifest.xml	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/aurora/VisualElementsManifest.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<Application
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <VisualElements
-      DisplayName="@MOZ_APP_DISPLAYNAME@"
-      Logo="tileresources\VisualElements_logo.png"
-      SmallLogo="tileresources\VisualElements_smalllogo.png"
-      ForegroundText="light"
-      BackgroundColor="#1c112e">
-    <DefaultTile
-        ShortName="@MOZ_APP_DISPLAYNAME@"
-        ShowName="allLogos"
-            />
-    <SplashScreen
-        Image="tileresources\VisualElements_splashscreen.png" />
-  </VisualElements>
-</Application>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/jar.mn	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/jar.mn	2015-04-24 19:30:54.000000000 +0000
@@ -18,11 +18,3 @@
   content/branding/identity-icons-brand@2x.png   (identity-icons-brand@2x.png)
   content/branding/silhouette-40.svg             (silhouette-40.svg)
   content/branding/aboutDialog.css               (aboutDialog.css)
-#ifdef MOZ_METRO
-  content/branding/metro-about.css               (metro-about.css)
-  content/branding/metro-about-footer.png        (metro-about-footer.png)
-  content/branding/metro-about-wordmark.png      (metro-about-wordmark.png)
-  content/branding/metro_firstrun_logo.png       (metro_firstrun_logo.png)
-  content/branding/metro_firstrun_logo@1.4x.png  (metro_firstrun_logo@1.4x.png)
-  content/branding/metro_firstrun_logo@1.8x.png  (metro_firstrun_logo@1.8x.png)
-#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/Makefile.in	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/Makefile.in	2015-04-24 19:30:54.000000000 +0000
@@ -4,10 +4,3 @@
 
 # Branding Makefile
 #  - jars chrome artwork
-
-# resources needed for the metro tile interface
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
-TILE_DEST := $(DIST)/bin/tileresources
-INSTALL_TARGETS += TILE
-endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/metro-about.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/metro-about.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/metro-about.css	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/metro-about.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +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/. */
-
-#about-flyoutpanel {
-  background-color: #002147;
-  color: white;
-}
-
-#about-policy-label:hover,
-#about-policy-label:active {
-  background: #0a111c;
-}
-
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/metro-about-footer.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/metro-about-footer.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/metro-about-wordmark.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/metro-about-wordmark.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/metro_firstrun_logo@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/metro_firstrun_logo@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/metro_firstrun_logo@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/metro_firstrun_logo@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/metro_firstrun_logo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/metro_firstrun_logo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/VisualElements_logo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/VisualElements_logo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/VisualElements_smalllogo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/VisualElements_smalllogo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/content/VisualElements_splashscreen.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/content/VisualElements_splashscreen.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/Makefile.in	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/Makefile.in	2015-04-24 19:30:54.000000000 +0000
@@ -4,8 +4,7 @@
 
 include $(topsrcdir)/config/config.mk
 
-# On Windows only do this step for browser, skip for metro.
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 BRANDING_FILES := \
 	firefox.ico \
 	document.ico \
@@ -47,10 +46,3 @@
 BRANDING_DEST := $(DIST)/branding
 BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
-
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-VISUALMANIFEST := VisualElementsManifest.xml
-VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
-VISUALMANIFEST_PATH := $(DIST)/bin
-PP_TARGETS += VISUALMANIFEST
-endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/VisualElementsManifest.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/VisualElementsManifest.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/nightly/VisualElementsManifest.xml	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/nightly/VisualElementsManifest.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<Application
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <VisualElements
-      DisplayName="@MOZ_APP_DISPLAYNAME@"
-      Logo="tileresources\VisualElements_logo.png"
-      SmallLogo="tileresources\VisualElements_smalllogo.png"
-      ForegroundText="light"
-      BackgroundColor="#001226">
-    <DefaultTile
-        ShortName="@MOZ_APP_DISPLAYNAME@"
-        ShowName="allLogos"
-            />
-    <SplashScreen
-        Image="tileresources\VisualElements_splashscreen.png" />
-  </VisualElements>
-</Application>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/jar.mn	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/jar.mn	2015-04-24 19:30:54.000000000 +0000
@@ -17,11 +17,3 @@
   content/branding/identity-icons-brand@2x.png   (identity-icons-brand@2x.png)
   content/branding/silhouette-40.svg             (silhouette-40.svg)
   content/branding/aboutDialog.css               (aboutDialog.css)
-#ifdef MOZ_METRO
-  content/branding/metro-about.css               (metro-about.css)
-  content/branding/metro-about-footer.png        (metro-about-footer.png)
-  content/branding/metro-about-wordmark.png      (metro-about-wordmark.png)
-  content/branding/metro_firstrun_logo.png       (metro_firstrun_logo.png)
-  content/branding/metro_firstrun_logo@1.4x.png  (metro_firstrun_logo@1.4x.png)
-  content/branding/metro_firstrun_logo@1.8x.png  (metro_firstrun_logo@1.8x.png)
-#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/Makefile.in	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/Makefile.in	2015-04-24 19:30:54.000000000 +0000
@@ -4,10 +4,3 @@
 
 # Branding Makefile
 #  - jars chrome artwork
-
-# resources needed for the metro tile interface
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
-TILE_DEST := $(DIST)/bin/tileresources
-INSTALL_TARGETS += TILE
-endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/metro-about.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/metro-about.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/metro-about.css	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/metro-about.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +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/. */
-
-#about-flyoutpanel {
-  background-color: #0095dd;
-  color: white;
-}
-
-#about-policy-label:hover,
-#about-policy-label:active {
-  background: #036fa4;
-}
-
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/metro-about-footer.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/metro-about-footer.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/metro-about-wordmark.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/metro-about-wordmark.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/metro_firstrun_logo@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/metro_firstrun_logo@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/metro_firstrun_logo@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/metro_firstrun_logo@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/metro_firstrun_logo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/metro_firstrun_logo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/VisualElements_logo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/VisualElements_logo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/VisualElements_smalllogo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/VisualElements_smalllogo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/content/VisualElements_splashscreen.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/content/VisualElements_splashscreen.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/Makefile.in	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/Makefile.in	2015-04-24 19:30:54.000000000 +0000
@@ -4,8 +4,7 @@
 
 include $(topsrcdir)/config/config.mk
 
-# On Windows only do this step for browser, skip for metro.
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 BRANDING_FILES := \
 	firefox.ico \
 	document.ico \
@@ -47,10 +46,3 @@
 BRANDING_DEST := $(DIST)/branding
 BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
-
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-VISUALMANIFEST := VisualElementsManifest.xml
-VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
-VISUALMANIFEST_PATH := $(DIST)/bin
-PP_TARGETS += VISUALMANIFEST
-endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/VisualElementsManifest.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/VisualElementsManifest.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/official/VisualElementsManifest.xml	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/official/VisualElementsManifest.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<Application
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <VisualElements
-      DisplayName="@MOZ_APP_DISPLAYNAME@"
-      Logo="tileresources\VisualElements_logo.png"
-      SmallLogo="tileresources\VisualElements_smalllogo.png"
-      ForegroundText="light"
-      BackgroundColor="#1895f5">
-    <DefaultTile
-        ShortName="@MOZ_APP_DISPLAYNAME@"
-        ShowName="allLogos"
-            />
-    <SplashScreen
-        Image="tileresources\VisualElements_splashscreen.png" />
-  </VisualElements>
-</Application>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/jar.mn	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/jar.mn	2015-04-24 19:30:55.000000000 +0000
@@ -18,11 +18,3 @@
   content/branding/identity-icons-brand@2x.png   (identity-icons-brand@2x.png)
   content/branding/silhouette-40.svg             (silhouette-40.svg)
   content/branding/aboutDialog.css               (aboutDialog.css)
-#ifdef MOZ_METRO
-  content/branding/metro-about.css               (metro-about.css)
-  content/branding/metro-about-footer.png        (metro-about-footer.png)
-  content/branding/metro-about-wordmark.png      (metro-about-wordmark.png)
-  content/branding/metro_firstrun_logo.png       (metro_firstrun_logo.png)
-  content/branding/metro_firstrun_logo@1.4x.png  (metro_firstrun_logo@1.4x.png)
-  content/branding/metro_firstrun_logo@1.8x.png  (metro_firstrun_logo@1.8x.png)
-#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/Makefile.in	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/Makefile.in	2015-04-24 19:30:55.000000000 +0000
@@ -4,10 +4,3 @@
 
 # Branding Makefile
 #  - jars chrome artwork
-
-# resources needed for the metro tile interface
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
-TILE_DEST := $(DIST)/bin/tileresources
-INSTALL_TARGETS += TILE
-endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/metro-about.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/metro-about.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/metro-about.css	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/metro-about.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +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/. */
-
-#about-flyoutpanel {
-  background-color: #002147;
-  color: white;
-}
-
-#about-policy-label:hover,
-#about-policy-label:active {
-  background: #0a111c;
-}
-
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/metro-about-footer.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/metro-about-footer.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/metro-about-wordmark.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/metro-about-wordmark.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/metro_firstrun_logo@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/metro_firstrun_logo@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/metro_firstrun_logo@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/metro_firstrun_logo@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/metro_firstrun_logo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/metro_firstrun_logo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/VisualElements_logo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/VisualElements_logo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/VisualElements_smalllogo.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/VisualElements_smalllogo.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/content/VisualElements_splashscreen.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/content/VisualElements_splashscreen.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/Makefile.in	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/Makefile.in	2015-04-24 19:30:55.000000000 +0000
@@ -4,8 +4,7 @@
 
 include $(topsrcdir)/config/config.mk
 
-# On Windows only do this step for browser, skip for metro.
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 BRANDING_FILES := \
 	firefox.ico \
 	document.ico \
@@ -47,10 +46,3 @@
 BRANDING_DEST := $(DIST)/branding
 BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
-
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-VISUALMANIFEST := VisualElementsManifest.xml
-VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
-VISUALMANIFEST_PATH := $(DIST)/bin
-PP_TARGETS += VISUALMANIFEST
-endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/VisualElementsManifest.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/VisualElementsManifest.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/branding/unofficial/VisualElementsManifest.xml	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/branding/unofficial/VisualElementsManifest.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<Application
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <VisualElements
-      DisplayName="@MOZ_APP_DISPLAYNAME@"
-      Logo="tileresources\VisualElements_logo.png"
-      SmallLogo="tileresources\VisualElements_smalllogo.png"
-      ForegroundText="light"
-      BackgroundColor="#0a1833">
-    <DefaultTile
-        ShortName="@MOZ_APP_DISPLAYNAME@"
-        ShowName="allLogos"
-            />
-    <SplashScreen
-        Image="tileresources\VisualElements_splashscreen.png" />
-  </VisualElements>
-</Application>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/build.mk thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/build.mk
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/build.mk	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/build.mk	2015-04-24 19:30:55.000000000 +0000
@@ -52,9 +52,4 @@
 
 .PHONY: mochitest-browser-chrome
 
-mochitest-metro-chrome:
-	$(RUN_MOCHITEST) --metro-immersive --browser-chrome
-	$(CHECK_TEST_ERROR)
-
-
 endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/CustomizableUI.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/CustomizableUI.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/CustomizableUI.jsm	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/CustomizableUI.jsm	2015-04-24 19:30:55.000000000 +0000
@@ -172,10 +172,6 @@
 #endif
     ];
 
-    if (gPalette.has("switch-to-metro-button")) {
-      panelPlacements.push("switch-to-metro-button");
-    }
-
 #ifdef E10S_TESTING_ONLY
     if (gPalette.has("e10s-button")) {
       let newWindowIndex = panelPlacements.indexOf("new-window-button");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/CustomizableWidgets.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/CustomizableWidgets.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/CustomizableWidgets.jsm	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/CustomizableWidgets.jsm	2015-04-24 19:30:55.000000000 +0000
@@ -993,30 +993,6 @@
     }
   }];
 
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-if (Services.metro && Services.metro.supported) {
-  let widgetArgs = {tooltiptext: "switch-to-metro-button2.tooltiptext"};
-  let brandShortName = BrandBundle.GetStringFromName("brandShortName");
-  let metroTooltip = CustomizableUI.getLocalizedProperty(widgetArgs, "tooltiptext",
-                                                         [brandShortName]);
-  CustomizableWidgets.push({
-    id: "switch-to-metro-button",
-    label: "switch-to-metro-button2.label",
-    tooltiptext: metroTooltip,
-    defaultArea: CustomizableUI.AREA_PANEL,
-    showInPrivateBrowsing: false, /* See bug 928068 */
-    onCommand: function(aEvent) {
-      let win = aEvent.view;
-      if (win && typeof win.SwitchToMetro == "function") {
-        win.SwitchToMetro();
-      }
-    }
-  });
-}
-#endif
-#endif
-
 if (Services.prefs.getBoolPref("privacy.panicButton.enabled")) {
   CustomizableWidgets.push({
     id: "panic-button",
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js	2015-04-24 19:30:55.000000000 +0000
@@ -27,7 +27,7 @@
 // Creating and destroying a widget should correctly deal with panel placeholders
 add_task(function testPanelPlaceholders() {
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-  let expectedPlaceholders = (isInWin8() ? 1 : 2) + (isInDevEdition() ? 1 : 0);
+  let expectedPlaceholders = 2 + (isInDevEdition() ? 1 : 0);
   is(panel.querySelectorAll(".panel-customization-placeholder").length, expectedPlaceholders, "The number of placeholders should be correct.");
   CustomizableUI.createWidget({id: kTestWidget2, label: 'Pretty label', tooltiptext: 'Pretty tooltip', defaultArea: CustomizableUI.AREA_PANEL});
   let elem = document.getElementById(kTestWidget2);
@@ -36,7 +36,7 @@
   ok(wrapper, "There should be a wrapper");
   is(wrapper.firstChild.id, kTestWidget2, "Wrapper should have test widget");
   is(wrapper.parentNode, panel, "Wrapper should be in panel");
-  expectedPlaceholders = (isInWin8() ? 3 : 1) + (isInDevEdition() ? 1 : 0);
+  expectedPlaceholders = 1 + (isInDevEdition() ? 1 : 0);
   is(panel.querySelectorAll(".panel-customization-placeholder").length, expectedPlaceholders, "The number of placeholders should be correct.");
   CustomizableUI.destroyWidget(kTestWidget2);
   wrapper = document.getElementById("wrapper-" + kTestWidget2);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js	2015-04-24 19:30:55.000000000 +0000
@@ -24,7 +24,6 @@
                              "add-ons-button",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, printButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@@ -51,7 +50,6 @@
                              "add-ons-button",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, savePageButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   ok(CustomizableUI.inDefaultState, "Should be in default state.");
@@ -76,7 +74,6 @@
                              "add-ons-button",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, newWindowButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   ok(CustomizableUI.inDefaultState, "Should still be in default state.");
@@ -100,7 +97,6 @@
                              "add-ons-button",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, historyPanelMenu);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@@ -128,7 +124,6 @@
                              "add-ons-button",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, preferencesButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@@ -156,7 +151,6 @@
                                "add-ons-button",
                                "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterInsert);
-  addSwitchToMetroButtonInWindows8(placementsAfterInsert);
   simulateItemDrag(openFileButton, zoomControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@@ -196,7 +190,6 @@
                                "add-ons-button",
                                "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterInsert);
-  addSwitchToMetroButtonInWindows8(placementsAfterInsert);
   simulateItemDrag(openFileButton, editControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@@ -233,7 +226,6 @@
                              "add-ons-button",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, zoomControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   ok(CustomizableUI.inDefaultState, "Should still be in default state.");
@@ -258,7 +250,6 @@
                              "add-ons-button",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, newWindowButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   let zoomControls = document.getElementById("zoom-controls");
@@ -286,7 +277,6 @@
                              "add-ons-button",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, privateBrowsingButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   let zoomControls = document.getElementById("zoom-controls");
@@ -314,7 +304,6 @@
                              "add-ons-button",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, savePageButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   let zoomControls = document.getElementById("zoom-controls");
@@ -341,7 +330,6 @@
                              "edit-controls",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   let zoomControls = document.getElementById("zoom-controls");
@@ -367,7 +355,6 @@
                              "add-ons-button",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   let paletteChildElementCount = palette.childElementCount;
   simulateItemDrag(editControls, palette);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -390,7 +377,7 @@
   yield startCustomizing();
   let editControls = document.getElementById("edit-controls");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-  let numPlaceholders = isInWin8() ? 1 : 2;
+  let numPlaceholders = 2;
   for (let i = 0; i < numPlaceholders; i++) {
     // NB: We can't just iterate over all of the placeholders
     // because each drag-drop action recreates them.
@@ -408,7 +395,6 @@
                                "edit-controls",
                                "developer-button"];
     removeDeveloperButtonIfDevEdition(placementsAfterMove);
-    addSwitchToMetroButtonInWindows8(placementsAfterMove);
     simulateItemDrag(editControls, placeholder);
     assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
     let zoomControls = document.getElementById("zoom-controls");
@@ -451,18 +437,11 @@
                              "edit-controls",
                              "developer-button"];
   removeDeveloperButtonIfDevEdition(placementsAfterMove);
-  addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, target);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   let itemToDrag = "sync-button";
   let button = document.getElementById(itemToDrag);
   placementsAfterMove.splice(11, 0, itemToDrag);
-  if (isInWin8()) {
-    placementsAfterMove[10] = placementsAfterMove[11];
-    placementsAfterMove[11] = placementsAfterMove[12];
-    placementsAfterMove[12] = placementsAfterMove[13];
-    placementsAfterMove[13] = "edit-controls";
-  }
   simulateItemDrag(button, editControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js	2015-04-24 19:30:55.000000000 +0000
@@ -10,18 +10,14 @@
 add_task(function() {
   yield startCustomizing();
 
-  if (isInWin8()) {
-    CustomizableUI.removeWidgetFromArea("switch-to-metro-button");
-    ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
-  }
   if (isInDevEdition()) {
     CustomizableUI.addWidgetToArea("developer-button", CustomizableUI.AREA_PANEL);
     ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   }
-  if (!isInWin8() && !isInDevEdition()) {
+  if (!isInDevEdition()) {
     ok(CustomizableUI.inDefaultState, "Should be in default state.");
   } else {
-    ok(!CustomizableUI.inDefaultState, "Should not be in default state if on Win8 or DevEdition.");
+    ok(!CustomizableUI.inDefaultState, "Should not be in default state if on DevEdition.");
   }
 
   let btn = document.getElementById("open-file-button");
@@ -35,9 +31,6 @@
   yield startCustomizing();
   is(getVisiblePlaceholderCount(panel), 2, "Should only have 2 visible placeholders after re-entering");
 
-  if (isInWin8()) {
-    CustomizableUI.addWidgetToArea("switch-to-metro-button", CustomizableUI.AREA_PANEL);
-  }
   if (isInDevEdition()) {
     CustomizableUI.addWidgetToArea("developer-button", CustomizableUI.AREA_NAVBAR, 2);
   }
@@ -58,18 +51,12 @@
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
   let placementsAfterAppend = placements;
 
-  if (!isInWin8()) {
-    placementsAfterAppend = placements.concat(["open-file-button"]);
-    simulateItemDrag(btn, panel);
-  }
+  placementsAfterAppend = placements.concat(["open-file-button"]);
+  simulateItemDrag(btn, panel);
 
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
 
-  if (isInWin8() && !isInDevEdition()) {
-    ok(CustomizableUI.inDefaultState, "Should be in default state if on Win8 and not on DevEdition.");
-  } else {
-    ok(!CustomizableUI.inDefaultState, "Should not be in default state if not Win8 or on DevEdition.");
-  }
+  ok(!CustomizableUI.inDefaultState, "Should not be in default state.");
 
   is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder before exiting");
 
@@ -80,10 +67,9 @@
   let palette = document.getElementById("customization-palette");
   simulateItemDrag(btn, palette);
 
-  if (!isInWin8()) {
-    btn = document.getElementById("open-file-button");
-    simulateItemDrag(btn, palette);
-  }
+  btn = document.getElementById("open-file-button");
+  simulateItemDrag(btn, palette);
+
   if (isInDevEdition()) {
     CustomizableUI.addWidgetToArea("developer-button", CustomizableUI.AREA_NAVBAR, 2);
   }
@@ -101,7 +87,6 @@
 
   let btn = document.getElementById("add-ons-button");
   let btn2 = document.getElementById("developer-button");
-  let btn3 = document.getElementById("switch-to-metro-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let palette = document.getElementById("customization-palette");
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
@@ -110,11 +95,6 @@
   simulateItemDrag(btn, palette);
   simulateItemDrag(btn2, palette);
 
-  if (isInWin8()) {
-    placementsAfterAppend = placementsAfterAppend.filter(p => p != btn3.id);
-    simulateItemDrag(btn3, palette);
-  }
-
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder before exiting");
@@ -126,10 +106,6 @@
   simulateItemDrag(btn, panel);
   simulateItemDrag(btn2, panel);
 
-  if (isInWin8()) {
-    simulateItemDrag(btn3, panel);
-  }
-
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placements);
 
   if (isInDevEdition()) {
@@ -149,7 +125,6 @@
 
   let btn = document.getElementById("edit-controls");
   let btn2 = document.getElementById("developer-button");
-  let btn3 = document.getElementById("switch-to-metro-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let palette = document.getElementById("customization-palette");
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
@@ -157,12 +132,6 @@
   placements.pop();
   simulateItemDrag(btn2, palette);
 
-  if (isInWin8()) {
-    // Remove switch-to-metro-button
-    placements.pop();
-    simulateItemDrag(btn3, palette);
-  }
-
   let placementsAfterAppend = placements.concat([placements.shift()]);
   simulateItemDrag(btn, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
@@ -175,10 +144,6 @@
 
   simulateItemDrag(btn2, panel);
 
-  if (isInWin8()) {
-    simulateItemDrag(btn3, panel);
-  }
-
   let zoomControls = document.getElementById("zoom-controls");
   simulateItemDrag(btn, zoomControls);
 
@@ -194,18 +159,10 @@
   yield startCustomizing();
   let numPlaceholders = -1;
 
-  if (isInWin8()) {
-    if (isInDevEdition()) {
-      numPlaceholders = 2;
-    } else {
-      numPlaceholders = 1;
-    }
+  if (isInDevEdition()) {
+    numPlaceholders = 3;
   } else {
-    if (isInDevEdition()) {
-      numPlaceholders = 3;
-    } else {
-      numPlaceholders = 2;
-    }
+    numPlaceholders = 2;
   }
 
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/test/head.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/test/head.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/customizableui/test/head.js	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/customizableui/test/head.js	2015-04-24 19:30:55.000000000 +0000
@@ -127,18 +127,6 @@
   }
 }
 
-function isInWin8() {
-  if (!Services.metro)
-    return false;
-  return Services.metro.supported;
-}
-
-function addSwitchToMetroButtonInWindows8(areaPanelPlacements) {
-  if (isInWin8()) {
-    areaPanelPlacements.push("switch-to-metro-button");
-  }
-}
-
 function assertAreaPlacements(areaId, expectedPlacements) {
   let actualPlacements = getAreaWidgetIds(areaId);
   placementArraysEqual(areaId, actualPlacements, expectedPlacements);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/css/panel.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/css/panel.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/css/panel.css	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/css/panel.css	2015-04-24 19:30:55.000000000 +0000
@@ -260,6 +260,8 @@
   display: inline-block;
   font-size: .85rem;
   color: #777;
+  /* See .room-entry-context-item for the margin/size reductions. */
+  width: calc(100% - 1rem - 16px);
 }
 
 .room-list > .room-entry.room-active > h2 {
@@ -354,6 +356,19 @@
   vertical-align: middle;
 }
 
+/* Keep ".room-list > .room-entry > h2" in sync with these. */
+.room-entry-context-item {
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: 1rem;
+  height: 16px;
+}
+
+.room-entry-context-item > a > img {
+  height: 16px;
+  width: 16px;
+}
+
 /* Buttons */
 
 .button-group {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/js/contacts.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/js/contacts.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/js/contacts.js	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/js/contacts.js	2015-04-24 19:30:55.000000000 +0000
@@ -11,6 +11,8 @@
 loop.contacts = (function(_, mozL10n) {
   "use strict";
 
+  var sharedMixins = loop.shared.mixins;
+
   const Button = loop.shared.views.Button;
   const ButtonGroup = loop.shared.views.ButtonGroup;
   const CALL_TYPES = loop.shared.utils.CALL_TYPES;
@@ -82,6 +84,8 @@
   };
 
   const GravatarPromo = React.createClass({displayName: "GravatarPromo",
+    mixins: [sharedMixins.WindowCloseMixin],
+
     propTypes: {
       handleUse: React.PropTypes.func.isRequired
     },
@@ -98,6 +102,16 @@
       this.setState({ showMe: false });
     },
 
+    handleLinkClick: function(event) {
+      if (!event.target || !event.target.href) {
+        return;
+      }
+
+      event.preventDefault();
+      navigator.mozLoop.openURL(event.target.href);
+      this.closeWindow();
+    },
+
     handleUseButtonClick: function() {
       navigator.mozLoop.setLoopPref("contacts.gravatars.promo", false);
       navigator.mozLoop.setLoopPref("contacts.gravatars.show", true);
@@ -121,7 +135,8 @@
       return (
         React.createElement("div", {className: "contacts-gravatar-promo"}, 
           React.createElement(Button, {additionalClass: "button-close", onClick: this.handleCloseButtonClick}), 
-          React.createElement("p", {dangerouslySetInnerHTML: {__html: message}}), 
+          React.createElement("p", {dangerouslySetInnerHTML: {__html: message}, 
+             onClick: this.handleLinkClick}), 
           React.createElement(ButtonGroup, null, 
             React.createElement(Button, {caption: mozL10n.get("gravatars_promo_button_nothanks"), 
                     onClick: this.handleCloseButtonClick}), 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/js/contacts.jsx thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/js/contacts.jsx
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/js/contacts.jsx	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/js/contacts.jsx	2015-04-24 19:30:55.000000000 +0000
@@ -11,6 +11,8 @@
 loop.contacts = (function(_, mozL10n) {
   "use strict";
 
+  var sharedMixins = loop.shared.mixins;
+
   const Button = loop.shared.views.Button;
   const ButtonGroup = loop.shared.views.ButtonGroup;
   const CALL_TYPES = loop.shared.utils.CALL_TYPES;
@@ -82,6 +84,8 @@
   };
 
   const GravatarPromo = React.createClass({
+    mixins: [sharedMixins.WindowCloseMixin],
+
     propTypes: {
       handleUse: React.PropTypes.func.isRequired
     },
@@ -98,6 +102,16 @@
       this.setState({ showMe: false });
     },
 
+    handleLinkClick: function(event) {
+      if (!event.target || !event.target.href) {
+        return;
+      }
+
+      event.preventDefault();
+      navigator.mozLoop.openURL(event.target.href);
+      this.closeWindow();
+    },
+
     handleUseButtonClick: function() {
       navigator.mozLoop.setLoopPref("contacts.gravatars.promo", false);
       navigator.mozLoop.setLoopPref("contacts.gravatars.show", true);
@@ -121,7 +135,8 @@
       return (
         <div className="contacts-gravatar-promo">
           <Button additionalClass="button-close" onClick={this.handleCloseButtonClick}/>
-          <p dangerouslySetInnerHTML={{__html: message}}></p>
+          <p dangerouslySetInnerHTML={{__html: message}}
+             onClick={this.handleLinkClick}></p>
           <ButtonGroup>
             <Button caption={mozL10n.get("gravatars_promo_button_nothanks")}
                     onClick={this.handleCloseButtonClick}/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/js/panel.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/js/panel.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/js/panel.js	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/js/panel.js	2015-04-24 19:30:55.000000000 +0000
@@ -215,6 +215,8 @@
   });
 
   var ToSView = React.createClass({displayName: "ToSView",
+    mixins: [sharedMixins.WindowCloseMixin],
+
     getInitialState: function() {
       var getPref = navigator.mozLoop.getLoopPref.bind(navigator.mozLoop);
 
@@ -225,6 +227,16 @@
       };
     },
 
+    handleLinkClick: function(event) {
+      if (!event.target || !event.target.href) {
+        return;
+      }
+
+      event.preventDefault();
+      navigator.mozLoop.openURL(event.target.href);
+      this.closeWindow();
+    },
+
     renderPartnerLogo: function() {
       if (!this.state.showPartnerLogo) {
         return null;
@@ -262,7 +274,8 @@
           React.createElement("div", {id: "powered-by-wrapper"}, 
             this.renderPartnerLogo(), 
             React.createElement("p", {className: "terms-service", 
-               dangerouslySetInnerHTML: {__html: tosHTML}})
+               dangerouslySetInnerHTML: {__html: tosHTML}, 
+               onClick: this.handleLinkClick})
            )
         );
       } else {
@@ -305,6 +318,10 @@
    * Panel settings (gear) menu.
    */
   var SettingsDropdown = React.createClass({displayName: "SettingsDropdown",
+    propTypes: {
+      mozLoop: React.PropTypes.object.isRequired
+    },
+
     mixins: [sharedMixins.DropdownMenuMixin, sharedMixins.WindowCloseMixin],
 
     handleClickSettingsEntry: function() {
@@ -312,30 +329,31 @@
     },
 
     handleClickAccountEntry: function() {
-      navigator.mozLoop.openFxASettings();
+      this.props.mozLoop.openFxASettings();
+      this.closeWindow();
     },
 
     handleClickAuthEntry: function() {
       if (this._isSignedIn()) {
-        navigator.mozLoop.logOutFromFxA();
+        this.props.mozLoop.logOutFromFxA();
       } else {
-        navigator.mozLoop.logInToFxA();
+        this.props.mozLoop.logInToFxA();
       }
     },
 
     handleHelpEntry: function(event) {
       event.preventDefault();
-      var helloSupportUrl = navigator.mozLoop.getLoopPref('support_url');
-      window.open(helloSupportUrl);
-      window.close();
+      var helloSupportUrl = this.props.mozLoop.getLoopPref("support_url");
+      this.props.mozLoop.openURL(helloSupportUrl);
+      this.closeWindow();
     },
 
     _isSignedIn: function() {
-      return !!navigator.mozLoop.userProfile;
+      return !!this.props.mozLoop.userProfile;
     },
 
     openGettingStartedTour: function() {
-      navigator.mozLoop.openGettingStartedTour("settings-menu");
+      this.props.mozLoop.openGettingStartedTour("settings-menu");
       this.closeWindow();
     },
 
@@ -356,7 +374,7 @@
             React.createElement(SettingsDropdownEntry, {label: mozL10n.get("settings_menu_item_account"), 
                                    onClick: this.handleClickAccountEntry, 
                                    icon: "account", 
-                                   displayed: this._isSignedIn() && navigator.mozLoop.fxAEnabled}), 
+                                   displayed: this._isSignedIn() && this.props.mozLoop.fxAEnabled}), 
             React.createElement(SettingsDropdownEntry, {icon: "tour", 
                                    label: mozL10n.get("tour_label"), 
                                    onClick: this.openGettingStartedTour}), 
@@ -364,7 +382,7 @@
                                           mozL10n.get("settings_menu_item_signout") :
                                           mozL10n.get("settings_menu_item_signin"), 
                                    onClick: this.handleClickAuthEntry, 
-                                   displayed: navigator.mozLoop.fxAEnabled, 
+                                   displayed: this.props.mozLoop.fxAEnabled, 
                                    icon: this._isSignedIn() ? "signout" : "signin"}), 
             React.createElement(SettingsDropdownEntry, {label: mozL10n.get("help_label"), 
                                    onClick: this.handleHelpEntry, 
@@ -413,13 +431,43 @@
     }
   });
 
+  var RoomEntryContextItem = React.createClass({displayName: "RoomEntryContextItem",
+    propTypes: {
+      mozLoop: React.PropTypes.object.isRequired,
+      roomUrls: React.PropTypes.object
+    },
+
+    handleClick: function(event) {
+      event.stopPropagation();
+      event.preventDefault();
+      this.props.mozLoop.openURL(event.currentTarget.href);
+    },
+
+    render: function() {
+      var roomUrl = this.props.roomUrls && this.props.roomUrls[0];
+      if (!roomUrl) {
+        return null;
+      }
+
+      return (
+        React.createElement("div", {className: "room-entry-context-item"}, 
+          React.createElement("a", {href: roomUrl.location, onClick: this.handleClick}, 
+            React.createElement("img", {title: roomUrl.description, 
+                 src: roomUrl.thumbnail})
+          )
+        )
+      );
+    }
+  });
+
   /**
    * Room list entry.
    */
   var RoomEntry = React.createClass({displayName: "RoomEntry",
     propTypes: {
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
-      room:       React.PropTypes.instanceOf(loop.store.Room).isRequired
+      mozLoop: React.PropTypes.object.isRequired,
+      room: React.PropTypes.instanceOf(loop.store.Room).isRequired
     },
 
     mixins: [loop.shared.mixins.WindowCloseMixin],
@@ -453,7 +501,7 @@
     handleDeleteButtonClick: function(event) {
       event.stopPropagation();
       event.preventDefault();
-      navigator.mozLoop.confirm({
+      this.props.mozLoop.confirm({
         message: mozL10n.get("rooms_list_deleteConfirmation_label"),
         okButton: null,
         cancelButton: null
@@ -502,7 +550,9 @@
             React.createElement("button", {className: "delete-link", 
               title: mozL10n.get("rooms_list_delete_tooltip"), 
               onClick: this.handleDeleteButtonClick})
-          )
+          ), 
+          React.createElement(RoomEntryContextItem, {mozLoop: this.props.mozLoop, 
+                                roomUrls: this.props.room.decryptedContext.urls})
         )
       );
     }
@@ -574,6 +624,7 @@
                 React.createElement(RoomEntry, {
                   key: room.roomToken, 
                   dispatcher: this.props.dispatcher, 
+                  mozLoop: this.props.mozLoop, 
                   room: room}
                 )
               );
@@ -689,7 +740,7 @@
       showTabButtons: React.PropTypes.bool,
       selectedTab: React.PropTypes.string,
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
-      mozLoop: React.PropTypes.object,
+      mozLoop: React.PropTypes.object.isRequired,
       roomStore:
         React.PropTypes.instanceOf(loop.store.RoomStore).isRequired
     },
@@ -848,7 +899,7 @@
             React.createElement("div", {className: "signin-details"}, 
               React.createElement(AuthLink, null), 
               React.createElement("div", {className: "footer-signin-separator"}), 
-              React.createElement(SettingsDropdown, null)
+              React.createElement(SettingsDropdown, {mozLoop: this.props.mozLoop})
             )
           )
         )
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/js/panel.jsx thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/js/panel.jsx
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/js/panel.jsx	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/js/panel.jsx	2015-04-24 19:30:55.000000000 +0000
@@ -215,6 +215,8 @@
   });
 
   var ToSView = React.createClass({
+    mixins: [sharedMixins.WindowCloseMixin],
+
     getInitialState: function() {
       var getPref = navigator.mozLoop.getLoopPref.bind(navigator.mozLoop);
 
@@ -225,6 +227,16 @@
       };
     },
 
+    handleLinkClick: function(event) {
+      if (!event.target || !event.target.href) {
+        return;
+      }
+
+      event.preventDefault();
+      navigator.mozLoop.openURL(event.target.href);
+      this.closeWindow();
+    },
+
     renderPartnerLogo: function() {
       if (!this.state.showPartnerLogo) {
         return null;
@@ -262,7 +274,8 @@
           <div id="powered-by-wrapper">
             {this.renderPartnerLogo()}
             <p className="terms-service"
-               dangerouslySetInnerHTML={{__html: tosHTML}}></p>
+               dangerouslySetInnerHTML={{__html: tosHTML}}
+               onClick={this.handleLinkClick}></p>
            </div>
         );
       } else {
@@ -305,6 +318,10 @@
    * Panel settings (gear) menu.
    */
   var SettingsDropdown = React.createClass({
+    propTypes: {
+      mozLoop: React.PropTypes.object.isRequired
+    },
+
     mixins: [sharedMixins.DropdownMenuMixin, sharedMixins.WindowCloseMixin],
 
     handleClickSettingsEntry: function() {
@@ -312,30 +329,31 @@
     },
 
     handleClickAccountEntry: function() {
-      navigator.mozLoop.openFxASettings();
+      this.props.mozLoop.openFxASettings();
+      this.closeWindow();
     },
 
     handleClickAuthEntry: function() {
       if (this._isSignedIn()) {
-        navigator.mozLoop.logOutFromFxA();
+        this.props.mozLoop.logOutFromFxA();
       } else {
-        navigator.mozLoop.logInToFxA();
+        this.props.mozLoop.logInToFxA();
       }
     },
 
     handleHelpEntry: function(event) {
       event.preventDefault();
-      var helloSupportUrl = navigator.mozLoop.getLoopPref('support_url');
-      window.open(helloSupportUrl);
-      window.close();
+      var helloSupportUrl = this.props.mozLoop.getLoopPref("support_url");
+      this.props.mozLoop.openURL(helloSupportUrl);
+      this.closeWindow();
     },
 
     _isSignedIn: function() {
-      return !!navigator.mozLoop.userProfile;
+      return !!this.props.mozLoop.userProfile;
     },
 
     openGettingStartedTour: function() {
-      navigator.mozLoop.openGettingStartedTour("settings-menu");
+      this.props.mozLoop.openGettingStartedTour("settings-menu");
       this.closeWindow();
     },
 
@@ -356,7 +374,7 @@
             <SettingsDropdownEntry label={mozL10n.get("settings_menu_item_account")}
                                    onClick={this.handleClickAccountEntry}
                                    icon="account"
-                                   displayed={this._isSignedIn() && navigator.mozLoop.fxAEnabled} />
+                                   displayed={this._isSignedIn() && this.props.mozLoop.fxAEnabled} />
             <SettingsDropdownEntry icon="tour"
                                    label={mozL10n.get("tour_label")}
                                    onClick={this.openGettingStartedTour} />
@@ -364,7 +382,7 @@
                                           mozL10n.get("settings_menu_item_signout") :
                                           mozL10n.get("settings_menu_item_signin")}
                                    onClick={this.handleClickAuthEntry}
-                                   displayed={navigator.mozLoop.fxAEnabled}
+                                   displayed={this.props.mozLoop.fxAEnabled}
                                    icon={this._isSignedIn() ? "signout" : "signin"} />
             <SettingsDropdownEntry label={mozL10n.get("help_label")}
                                    onClick={this.handleHelpEntry}
@@ -413,13 +431,43 @@
     }
   });
 
+  var RoomEntryContextItem = React.createClass({
+    propTypes: {
+      mozLoop: React.PropTypes.object.isRequired,
+      roomUrls: React.PropTypes.object
+    },
+
+    handleClick: function(event) {
+      event.stopPropagation();
+      event.preventDefault();
+      this.props.mozLoop.openURL(event.currentTarget.href);
+    },
+
+    render: function() {
+      var roomUrl = this.props.roomUrls && this.props.roomUrls[0];
+      if (!roomUrl) {
+        return null;
+      }
+
+      return (
+        <div className="room-entry-context-item">
+          <a href={roomUrl.location} onClick={this.handleClick}>
+            <img title={roomUrl.description}
+                 src={roomUrl.thumbnail} />
+          </a>
+        </div>
+      );
+    }
+  });
+
   /**
    * Room list entry.
    */
   var RoomEntry = React.createClass({
     propTypes: {
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
-      room:       React.PropTypes.instanceOf(loop.store.Room).isRequired
+      mozLoop: React.PropTypes.object.isRequired,
+      room: React.PropTypes.instanceOf(loop.store.Room).isRequired
     },
 
     mixins: [loop.shared.mixins.WindowCloseMixin],
@@ -453,7 +501,7 @@
     handleDeleteButtonClick: function(event) {
       event.stopPropagation();
       event.preventDefault();
-      navigator.mozLoop.confirm({
+      this.props.mozLoop.confirm({
         message: mozL10n.get("rooms_list_deleteConfirmation_label"),
         okButton: null,
         cancelButton: null
@@ -503,6 +551,8 @@
               title={mozL10n.get("rooms_list_delete_tooltip")}
               onClick={this.handleDeleteButtonClick} />
           </h2>
+          <RoomEntryContextItem mozLoop={this.props.mozLoop}
+                                roomUrls={this.props.room.decryptedContext.urls} />
         </div>
       );
     }
@@ -574,6 +624,7 @@
                 <RoomEntry
                   key={room.roomToken}
                   dispatcher={this.props.dispatcher}
+                  mozLoop={this.props.mozLoop}
                   room={room}
                 />
               );
@@ -689,7 +740,7 @@
       showTabButtons: React.PropTypes.bool,
       selectedTab: React.PropTypes.string,
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
-      mozLoop: React.PropTypes.object,
+      mozLoop: React.PropTypes.object.isRequired,
       roomStore:
         React.PropTypes.instanceOf(loop.store.RoomStore).isRequired
     },
@@ -848,7 +899,7 @@
             <div className="signin-details">
               <AuthLink />
               <div className="footer-signin-separator" />
-              <SettingsDropdown />
+              <SettingsDropdown mozLoop={this.props.mozLoop}/>
             </div>
           </div>
         </div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/shared/js/actions.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/shared/js/actions.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/shared/js/actions.js	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/shared/js/actions.js	2015-04-24 19:30:55.000000000 +0000
@@ -469,6 +469,17 @@
     }),
 
     /**
+     * Used to record a link click for metrics purposes.
+     */
+    RecordClick: Action.define("recordClick", {
+      // Note: for ToS and Privacy links, this should be the link, for
+      // other links this should be a generic description so that we don't
+      // record what users are clicking, just the information about the fact
+      // they clicked the link in that spot (e.g. "Shared URL").
+      linkInfo: String
+    }),
+
+    /**
      * Requires detailed information on sad feedback.
      */
     RequireFeedbackDetails: Action.define("requireFeedbackDetails", {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/shared/js/mixins.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/shared/js/mixins.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/content/shared/js/mixins.js	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/content/shared/js/mixins.js	2015-04-24 19:30:55.000000000 +0000
@@ -241,6 +241,18 @@
     },
 
     /**
+     * Resets the dimensions cache, e.g. for when the session is ended, and
+     * before a new session, so that we always ensure we see an update when a
+     * new session is started.
+     */
+    resetDimensionsCache: function() {
+      this._videoDimensionsCache = {
+        local: {},
+        remote: {}
+      };
+    },
+
+    /**
      * Whenever the dimensions change of a video stream, this function is called
      * by `updateVideoDimensions` to store the new values and notifies the callee
      * if the dimensions changed compared to the currently stored values.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/LoopRooms.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/LoopRooms.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/LoopRooms.jsm	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/LoopRooms.jsm	2015-04-24 19:30:55.000000000 +0000
@@ -202,10 +202,10 @@
    *                          information.
    */
   promiseEncryptRoomData: Task.async(function* (roomData) {
-    // For now, disable encryption/context if context is disabled, or if
-    // FxA is turned on.
-    if (!MozLoopService.getLoopPref("contextInConverations.enabled") ||
-        this.sessionType == LOOP_SESSION_TYPE.FXA) {
+    // XXX We should only return unencrypted data whilst we're still working
+    // on context. Once bug 1115340 is fixed, this function should no longer be
+    // here.
+    function getUnencryptedData() {
       var serverRoomData = extend({}, roomData);
       delete serverRoomData.decryptedContext;
 
@@ -218,6 +218,11 @@
       };
     }
 
+    // For now, disable encryption/context if context is disabled
+    if (!MozLoopService.getLoopPref("contextInConverations.enabled")) {
+      return getUnencryptedData();
+    }
+
     var newRoomData = extend({}, roomData);
 
     if (!newRoomData.context) {
@@ -227,7 +232,17 @@
     // First get the room key.
     let key = yield this.promiseGetOrCreateRoomKey(newRoomData);
 
-    newRoomData.context.wrappedKey = yield this.promiseEncryptedRoomKey(key);
+    try {
+      newRoomData.context.wrappedKey = yield this.promiseEncryptedRoomKey(key);
+    }
+    catch (ex) {
+      // XXX Bug 1153788 should remove this, then we can remove the whole
+      // try/catch.
+      if (ex.message == "FxA re-register not implemented") {
+        return getUnencryptedData();
+      }
+      return Promise.reject(ex);
+    }
 
     // Now encrypt the actual data.
     newRoomData.context.value = yield loopCrypto.encryptBytes(key,
@@ -654,8 +669,7 @@
       };
 
       // If we're not encrypting currently, then only send the roomName.
-      if (!Services.prefs.getBoolPref("loop.contextInConverations.enabled") ||
-          this.sessionType == LOOP_SESSION_TYPE.FXA) {
+      if (!Services.prefs.getBoolPref("loop.contextInConverations.enabled")) {
         sendData = {
           roomName: newRoomName
         };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/MozLoopAPI.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/MozLoopAPI.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/MozLoopAPI.jsm	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/MozLoopAPI.jsm	2015-04-24 19:30:55.000000000 +0000
@@ -708,6 +708,19 @@
     },
 
     /**
+     * Opens a URL in a new tab in the browser.
+     *
+     * @param {String} url The new url to open
+     */
+    openURL: {
+      enumerable: true,
+      writable: true,
+      value: function(url) {
+        return MozLoopService.openURL(url);
+      }
+    },
+
+    /**
      * Copies passed string onto the system clipboard.
      *
      * @param {String} str The string to copy
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/MozLoopService.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/MozLoopService.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/MozLoopService.jsm	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/MozLoopService.jsm	2015-04-24 19:30:55.000000000 +0000
@@ -959,6 +959,9 @@
 
     gFxAOAuthClientPromise = this.promiseFxAOAuthParameters().then(
       parameters => {
+        // Add the fact that we want keys to the parameters.
+        parameters.keys = true;
+
         try {
           gFxAOAuthClient = new FxAccountsOAuthClient({
             parameters: parameters,
@@ -1031,7 +1034,10 @@
    * @param {Deferred} deferred used to resolve the gFxAOAuthClientPromise
    * @param {Object} result (with code and state)
    */
-  _fxAOAuthComplete: function(deferred, result) {
+  _fxAOAuthComplete: function(deferred, result, keys) {
+    if (keys.kBr) {
+      Services.prefs.setCharPref("loop.key.fxa", keys.kBr.k);
+    }
     gFxAOAuthClientPromise = null;
     // Note: The state was already verified in FxAccountsOAuthClient.
     deferred.resolve(result);
@@ -1331,8 +1337,14 @@
     return new Promise((resolve, reject) => {
       if (this.userProfile) {
         // We're an FxA user.
-        // XXX Bug 1153788 will implement this for FxA.
-        reject(new Error("unimplemented"));
+        if (Services.prefs.prefHasUserValue("loop.key.fxa")) {
+          resolve(MozLoopService.getLoopPref("key.fxa"));
+          return;
+        }
+
+        // XXX If we don't have a key for FxA yet, then simply reject for now.
+        // We'll create some sign-in/sign-out UX in bug 1153788.
+        reject(new Error("FxA re-register not implemented"));
         return;
       }
 
@@ -1651,6 +1663,16 @@
   }),
 
   /**
+   * Opens a URL in a new tab in the browser.
+   *
+   * @param {String} url The new url to open
+   */
+  openURL: function(url) {
+    let win = Services.wm.getMostRecentWindow("navigator:browser");
+    win.openUILinkIn(url, "tab");
+  },
+
+  /**
    * Performs a hawk based request to the loop server.
    *
    * @param {LOOP_SESSION_TYPE} sessionType The type of session to use for the request.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/index.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/index.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/index.html	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/index.html	2015-04-24 19:30:55.000000000 +0000
@@ -29,6 +29,7 @@
         })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
         ga('create', 'UA-36116321-15', 'auto');
+        ga('set', 'anonymizeIp', true);
         ga('send', 'pageview');
       }
     </script>
@@ -129,6 +130,7 @@
     <script type="text/javascript" src="js/standaloneMozLoop.js"></script>
     <script type="text/javascript" src="js/fxOSMarketplace.js"></script>
     <script type="text/javascript" src="js/standaloneRoomViews.js"></script>
+    <script type="text/javascript" src="js/standaloneMetricsStore.js"></script>
     <script type="text/javascript" src="js/webapp.js"></script>
 
     <script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/js/standaloneMetricsStore.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/js/standaloneMetricsStore.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/js/standaloneMetricsStore.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/js/standaloneMetricsStore.js	2015-04-24 19:30:55.000000000 +0000
@@ -0,0 +1,210 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 loop = loop || {};
+loop.store = loop.store || {};
+
+/**
+ * The standalone metrics store is used to log activities to
+ * analytics.
+ *
+ * Where possible we log events via receiving actions. However, some
+ * combinations of actions and events require us to listen directly to
+ * changes in the activeRoomStore so that we gain the benefit of the logic
+ * in that store.
+ */
+loop.store.StandaloneMetricsStore = (function() {
+  "use strict";
+
+  var ROOM_STATES = loop.store.ROOM_STATES;
+  var FAILURE_DETAILS = loop.shared.utils.FAILURE_DETAILS;
+
+  loop.store.metrics = loop.store.metrics || {};
+
+  var METRICS_GA_CATEGORY = loop.store.METRICS_GA_CATEGORY = {
+    general: "/conversation/ interactions",
+    download: "Firefox Downloads"
+  };
+
+  var METRICS_GA_ACTIONS = loop.store.METRICS_GA_ACTIONS = {
+    audioMute: "audio mute",
+    button: "button click",
+    download: "download button click",
+    faceMute: "face mute",
+    link: "link click",
+    pageLoad: "page load messages",
+    success: "success",
+    support: "support link click"
+  }
+
+  var StandaloneMetricsStore = loop.store.createStore({
+    actions: [
+      "gotMediaPermission",
+      "joinRoom",
+      "leaveRoom",
+      "mediaConnected",
+      "recordClick"
+    ],
+
+    /**
+     * Initializes the store and starts listening to the activeRoomStore.
+     *
+     * @param  {Object} options Options for the store, should include a
+     *                          reference to the activeRoomStore.
+     */
+    initialize: function(options) {
+      options = options || {};
+
+      if (!options.activeRoomStore) {
+        throw new Error("Missing option activeRoomStore");
+      }
+
+      // Don't bother listening if we're not storing metrics.
+      // I'd love for ga to be an option, but that messes up the function
+      // working properly.
+      if (window.ga) {
+        this.activeRoomStore = options.activeRoomStore;
+
+        this.listenTo(options.activeRoomStore, "change",
+          this._onActiveRoomStoreChange.bind(this));
+      }
+    },
+
+    /**
+     * Returns initial state data for this store. These are mainly reflections
+     * of activeRoomStore so we can match initial states for change tracking
+     * purposes.
+     *
+     * @return {Object} The initial store state.
+     */
+    getInitialStoreState: function() {
+      return {
+        audioMuted: false,
+        roomState: ROOM_STATES.INIT,
+        videoMuted: false
+      };
+    },
+
+    /**
+     * Saves an event to ga.
+     *
+     * @param  {String} category The category for the event.
+     * @param  {String} action   The type of action.
+     * @param  {String} label    The label detailing the action.
+     */
+    _storeEvent: function(category, action, label) {
+      // ga might not be defined if donottrack is enabled, see index.html.
+      if (!window.ga) {
+        return;
+      }
+
+      // For now all we need to do is forward onto ga.
+      window.ga("send", "event", category, action, label);
+    },
+
+    /**
+     * Handles media permssion being obtained.
+     */
+    gotMediaPermission: function() {
+      this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.success,
+        "Media granted");
+    },
+
+    /**
+     * Handles the user clicking the join room button.
+     */
+    joinRoom: function() {
+      this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.button,
+        "Join the conversation");
+    },
+
+    /**
+     * Handles the user clicking the leave room button.
+     */
+    leaveRoom: function() {
+      this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.button,
+        "Leave conversation");
+    },
+
+    /**
+     * Handles notification that two-way media has been achieved.
+     */
+    mediaConnected: function() {
+      this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.success,
+        "Media connected")
+    },
+
+    /**
+     * Handles recording link clicks.
+     *
+     * @param {sharedActions.RecordClick} actionData The data associated with
+     *                                               the link.
+     */
+    recordClick: function(actionData) {
+      this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.linkClick,
+        actionData.linkInfo);
+    },
+
+    /**
+     * Handles notifications that the activeRoomStore has changed, updating
+     * the metrics for room state and mute state as necessary.
+     */
+    _onActiveRoomStoreChange: function() {
+      var roomStore = this.activeRoomStore.getStoreState();
+
+      this._checkRoomState(roomStore.roomState, roomStore.failureReason);
+
+      this._checkMuteState("audio", roomStore.audioMuted);
+      this._checkMuteState("video", roomStore.videoMuted);
+    },
+
+    /**
+     * Handles checking of the room state to look for events we need to send.
+     *
+     * @param {String} roomState     The new room state.
+     * @param {String} failureReason Optional, if the room is in the failure
+     *                               state, this should contain the reason for
+     *                               the failure.
+     */
+    _checkRoomState: function(roomState, failureReason) {
+      if (this._storeState.roomState === roomState) {
+        return;
+      }
+      this._storeState.roomState = roomState;
+
+      if (roomState === ROOM_STATES.FAILED &&
+          failureReason === FAILURE_DETAILS.EXPIRED_OR_INVALID) {
+        this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.pageLoad,
+          "Link expired or invalid");
+      }
+
+      if (roomState === ROOM_STATES.FULL) {
+        this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.pageLoad,
+          "Room full");
+      }
+    },
+
+    /**
+     * Handles check of the mute state to look for events we need to send.
+     *
+     * @param  {String} type  The type of mute being adjusted, i.e. "audio" or
+     *                        "video".
+     * @param  {Boolean} muted The new state of mute
+     */
+    _checkMuteState: function(type, muted) {
+      var muteItem = type + "Muted";
+      if (this._storeState[muteItem] === muted) {
+        return;
+      }
+      this._storeState[muteItem] = muted;
+
+      var muteType = type === "audio" ? METRICS_GA_ACTIONS.audioMute : METRICS_GA_ACTIONS.faceMute;
+      var muteState = muted ? "mute" : "unmute";
+
+      this._storeEvent(METRICS_GA_CATEGORY.general, muteType, muteState);
+    }
+  });
+
+  return StandaloneMetricsStore;
+})();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js	2015-04-24 19:30:55.000000000 +0000
@@ -160,11 +160,23 @@
   });
 
   var StandaloneRoomHeader = React.createClass({displayName: "StandaloneRoomHeader",
+    propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+    },
+
+    recordClick: function() {
+      this.props.dispatcher.dispatch(new sharedActions.RecordClick({
+        linkInfo: "Support link click"
+      }));
+    },
+
     render: function() {
       return (
         React.createElement("header", null, 
           React.createElement("h1", null, mozL10n.get("clientShortname2")), 
-          React.createElement("a", {target: "_blank", href: loop.config.generalSupportUrl}, 
+          React.createElement("a", {href: loop.config.generalSupportUrl, 
+             onClick: this.recordClick, 
+             target: "_blank"}, 
             React.createElement("i", {className: "icon icon-help"})
           )
         )
@@ -173,7 +185,14 @@
   });
 
   var StandaloneRoomFooter = React.createClass({displayName: "StandaloneRoomFooter",
+    propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+    },
+
     _getContent: function() {
+      // We use this technique of static markup as it means we get
+      // just one overall string for L10n to define the structure of
+      // the whole item.
       return mozL10n.get("legal_text_and_links", {
         "clientShortname": mozL10n.get("clientShortname2"),
         "terms_of_use_url": React.renderToStaticMarkup(
@@ -189,10 +208,21 @@
       });
     },
 
+    recordClick: function(event) {
+      // Check for valid href, as this is clicking on the paragraph -
+      // so the user may be clicking on the text rather than the link.
+      if (event.target && event.target.href) {
+        this.props.dispatcher.dispatch(new sharedActions.RecordClick({
+          linkInfo: event.target.href
+        }))
+      }
+    },
+
     render: function() {
       return (
         React.createElement("footer", null, 
-          React.createElement("p", {dangerouslySetInnerHTML: {__html: this._getContent()}}), 
+          React.createElement("p", {dangerouslySetInnerHTML: {__html: this._getContent()}, 
+             onClick: this.recordClick}), 
           React.createElement("div", {className: "footer-logo"})
         )
       );
@@ -201,10 +231,17 @@
 
   var StandaloneRoomContextItem = React.createClass({displayName: "StandaloneRoomContextItem",
     propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
       receivingScreenShare: React.PropTypes.bool,
       roomContextUrl: React.PropTypes.object
     },
 
+    recordClick: function() {
+      this.props.dispatcher.dispatch(new sharedActions.RecordClick({
+        linkInfo: "Shared URL"
+      }));
+    },
+
     render: function() {
       if (!this.props.roomContextUrl ||
           !this.props.roomContextUrl.location) {
@@ -225,7 +262,9 @@
             React.createElement("img", {src: this.props.roomContextUrl.thumbnail}), 
           React.createElement("div", {className: "standalone-context-url-description-wrapper"}, 
             this.props.roomContextUrl.description, 
-            React.createElement("br", null), React.createElement("a", {href: location}, location)
+            React.createElement("br", null), React.createElement("a", {href: location, 
+                     onClick: this.recordClick, 
+                     target: "_blank"}, location)
           )
         )
       );
@@ -234,6 +273,7 @@
 
   var StandaloneRoomContextView = React.createClass({displayName: "StandaloneRoomContextView",
     propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
       receivingScreenShare: React.PropTypes.bool.isRequired,
       roomContextUrls: React.PropTypes.array,
       roomName: React.PropTypes.string,
@@ -259,6 +299,7 @@
         React.createElement("div", {className: "standalone-room-info"}, 
           React.createElement("h2", {className: "room-name"}, this.props.roomName), 
           React.createElement(StandaloneRoomContextItem, {
+            dispatcher: this.props.dispatcher, 
             receivingScreenShare: this.props.receivingScreenShare, 
             roomContextUrl: roomContextUrl})
         )
@@ -342,6 +383,12 @@
         this.updateVideoContainer();
       }
 
+      if (nextState.roomState === ROOM_STATES.INIT ||
+          nextState.roomState === ROOM_STATES.GATHER ||
+          nextState.roomState === ROOM_STATES.READY) {
+        this.resetDimensionsCache();
+      }
+
       // When screen sharing stops.
       if (this.state.receivingScreenShare && !nextState.receivingScreenShare) {
         // Remove the custom screenshare styles on the remote camera.
@@ -517,7 +564,7 @@
       return (
         React.createElement("div", {className: "room-conversation-wrapper"}, 
           React.createElement("div", {className: "beta-logo"}), 
-          React.createElement(StandaloneRoomHeader, null), 
+          React.createElement(StandaloneRoomHeader, {dispatcher: this.props.dispatcher}), 
           React.createElement(StandaloneRoomInfoArea, {roomState: this.state.roomState, 
                                   failureReason: this.state.failureReason, 
                                   joinRoom: this.joinRoom, 
@@ -527,6 +574,7 @@
           React.createElement("div", {className: "video-layout-wrapper"}, 
             React.createElement("div", {className: "conversation room-conversation"}, 
               React.createElement(StandaloneRoomContextView, {
+                dispatcher: this.props.dispatcher, 
                 receivingScreenShare: this.state.receivingScreenShare, 
                 roomContextUrls: this.state.roomContextUrls, 
                 roomName: this.state.roomName, 
@@ -556,7 +604,7 @@
           React.createElement(loop.fxOSMarketplaceViews.FxOSHiddenMarketplaceView, {
             marketplaceSrc: this.state.marketplaceSrc, 
             onMarketplaceMessage: this.state.onMarketplaceMessage}), 
-          React.createElement(StandaloneRoomFooter, null)
+          React.createElement(StandaloneRoomFooter, {dispatcher: this.props.dispatcher})
         )
       );
     }
@@ -564,6 +612,8 @@
 
   return {
     StandaloneRoomContextView: StandaloneRoomContextView,
+    StandaloneRoomFooter: StandaloneRoomFooter,
+    StandaloneRoomHeader: StandaloneRoomHeader,
     StandaloneRoomView: StandaloneRoomView
   };
 })(navigator.mozL10n);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx	2015-04-24 19:30:55.000000000 +0000
@@ -160,11 +160,23 @@
   });
 
   var StandaloneRoomHeader = React.createClass({
+    propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+    },
+
+    recordClick: function() {
+      this.props.dispatcher.dispatch(new sharedActions.RecordClick({
+        linkInfo: "Support link click"
+      }));
+    },
+
     render: function() {
       return (
         <header>
           <h1>{mozL10n.get("clientShortname2")}</h1>
-          <a target="_blank" href={loop.config.generalSupportUrl}>
+          <a href={loop.config.generalSupportUrl}
+             onClick={this.recordClick}
+             target="_blank">
             <i className="icon icon-help"></i>
           </a>
         </header>
@@ -173,7 +185,14 @@
   });
 
   var StandaloneRoomFooter = React.createClass({
+    propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+    },
+
     _getContent: function() {
+      // We use this technique of static markup as it means we get
+      // just one overall string for L10n to define the structure of
+      // the whole item.
       return mozL10n.get("legal_text_and_links", {
         "clientShortname": mozL10n.get("clientShortname2"),
         "terms_of_use_url": React.renderToStaticMarkup(
@@ -189,10 +208,21 @@
       });
     },
 
+    recordClick: function(event) {
+      // Check for valid href, as this is clicking on the paragraph -
+      // so the user may be clicking on the text rather than the link.
+      if (event.target && event.target.href) {
+        this.props.dispatcher.dispatch(new sharedActions.RecordClick({
+          linkInfo: event.target.href
+        }))
+      }
+    },
+
     render: function() {
       return (
         <footer>
-          <p dangerouslySetInnerHTML={{__html: this._getContent()}}></p>
+          <p dangerouslySetInnerHTML={{__html: this._getContent()}}
+             onClick={this.recordClick}></p>
           <div className="footer-logo" />
         </footer>
       );
@@ -201,10 +231,17 @@
 
   var StandaloneRoomContextItem = React.createClass({
     propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
       receivingScreenShare: React.PropTypes.bool,
       roomContextUrl: React.PropTypes.object
     },
 
+    recordClick: function() {
+      this.props.dispatcher.dispatch(new sharedActions.RecordClick({
+        linkInfo: "Shared URL"
+      }));
+    },
+
     render: function() {
       if (!this.props.roomContextUrl ||
           !this.props.roomContextUrl.location) {
@@ -225,7 +262,9 @@
             <img src={this.props.roomContextUrl.thumbnail} />
           <div className="standalone-context-url-description-wrapper">
             {this.props.roomContextUrl.description}
-            <br /><a href={location}>{location}</a>
+            <br /><a href={location}
+                     onClick={this.recordClick}
+                     target="_blank">{location}</a>
           </div>
         </div>
       );
@@ -234,6 +273,7 @@
 
   var StandaloneRoomContextView = React.createClass({
     propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
       receivingScreenShare: React.PropTypes.bool.isRequired,
       roomContextUrls: React.PropTypes.array,
       roomName: React.PropTypes.string,
@@ -259,6 +299,7 @@
         <div className="standalone-room-info">
           <h2 className="room-name">{this.props.roomName}</h2>
           <StandaloneRoomContextItem
+            dispatcher={this.props.dispatcher}
             receivingScreenShare={this.props.receivingScreenShare}
             roomContextUrl={roomContextUrl} />
         </div>
@@ -342,6 +383,12 @@
         this.updateVideoContainer();
       }
 
+      if (nextState.roomState === ROOM_STATES.INIT ||
+          nextState.roomState === ROOM_STATES.GATHER ||
+          nextState.roomState === ROOM_STATES.READY) {
+        this.resetDimensionsCache();
+      }
+
       // When screen sharing stops.
       if (this.state.receivingScreenShare && !nextState.receivingScreenShare) {
         // Remove the custom screenshare styles on the remote camera.
@@ -517,7 +564,7 @@
       return (
         <div className="room-conversation-wrapper">
           <div className="beta-logo" />
-          <StandaloneRoomHeader />
+          <StandaloneRoomHeader dispatcher={this.props.dispatcher} />
           <StandaloneRoomInfoArea roomState={this.state.roomState}
                                   failureReason={this.state.failureReason}
                                   joinRoom={this.joinRoom}
@@ -527,6 +574,7 @@
           <div className="video-layout-wrapper">
             <div className="conversation room-conversation">
               <StandaloneRoomContextView
+                dispatcher={this.props.dispatcher}
                 receivingScreenShare={this.state.receivingScreenShare}
                 roomContextUrls={this.state.roomContextUrls}
                 roomName={this.state.roomName}
@@ -556,7 +604,7 @@
           <loop.fxOSMarketplaceViews.FxOSHiddenMarketplaceView
             marketplaceSrc={this.state.marketplaceSrc}
             onMarketplaceMessage={this.state.onMarketplaceMessage} />
-          <StandaloneRoomFooter />
+          <StandaloneRoomFooter dispatcher={this.props.dispatcher} />
         </div>
       );
     }
@@ -564,6 +612,8 @@
 
   return {
     StandaloneRoomContextView: StandaloneRoomContextView,
+    StandaloneRoomFooter: StandaloneRoomFooter,
+    StandaloneRoomHeader: StandaloneRoomHeader,
     StandaloneRoomView: StandaloneRoomView
   };
 })(navigator.mozL10n);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/js/webapp.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/js/webapp.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/js/webapp.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/js/webapp.js	2015-04-24 19:30:55.000000000 +0000
@@ -1087,8 +1087,16 @@
     var feedbackStore = new loop.store.FeedbackStore(dispatcher, {
       feedbackClient: feedbackClient
     });
+    var standaloneMetricsStore = new loop.store.StandaloneMetricsStore(dispatcher, {
+      activeRoomStore: activeRoomStore
+    });
 
-    loop.store.StoreMixin.register({feedbackStore: feedbackStore});
+    loop.store.StoreMixin.register({
+      feedbackStore: feedbackStore,
+      // This isn't used in any views, but is saved here to ensure it
+      // is kept alive.
+      standaloneMetricsStore: standaloneMetricsStore
+    });
 
     window.addEventListener("unload", function() {
       dispatcher.dispatch(new sharedActions.WindowUnload());
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/js/webapp.jsx thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/js/webapp.jsx
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/standalone/content/js/webapp.jsx	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/standalone/content/js/webapp.jsx	2015-04-24 19:30:55.000000000 +0000
@@ -1087,8 +1087,16 @@
     var feedbackStore = new loop.store.FeedbackStore(dispatcher, {
       feedbackClient: feedbackClient
     });
+    var standaloneMetricsStore = new loop.store.StandaloneMetricsStore(dispatcher, {
+      activeRoomStore: activeRoomStore
+    });
 
-    loop.store.StoreMixin.register({feedbackStore: feedbackStore});
+    loop.store.StoreMixin.register({
+      feedbackStore: feedbackStore,
+      // This isn't used in any views, but is saved here to ensure it
+      // is kept alive.
+      standaloneMetricsStore: standaloneMetricsStore
+    });
 
     window.addEventListener("unload", function() {
       dispatcher.dispatch(new sharedActions.WindowUnload());
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/desktop-local/panel_test.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/desktop-local/panel_test.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/desktop-local/panel_test.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/desktop-local/panel_test.js	2015-04-24 19:30:55.000000000 +0000
@@ -71,6 +71,7 @@
       },
       confirm: sandbox.stub(),
       notifyUITour: sandbox.stub(),
+      openURL: sandbox.stub(),
       getSelectedTabMetadata: sandbox.stub()
     };
 
@@ -188,6 +189,19 @@
         }));
     }
 
+    it("should hide the account entry when FxA is not enabled", function() {
+      navigator.mozLoop.userProfile = {email: "test@example.com"};
+      navigator.mozLoop.fxAEnabled = false;
+
+      var view = TestUtils.renderIntoDocument(
+        React.createElement(loop.panel.SettingsDropdown, {
+          mozLoop: fakeMozLoop
+        }));
+
+      expect(view.getDOMNode().querySelectorAll(".icon-account"))
+        .to.have.length.of(0);
+    });
+
     describe('TabView', function() {
       var view, callTab, roomsTab, contactsTab;
 
@@ -268,18 +282,14 @@
       });
     });
 
-    it("should hide the account entry when FxA is not enabled", function() {
-        navigator.mozLoop.userProfile = {email: "test@example.com"};
-        navigator.mozLoop.fxAEnabled = false;
-
-        var view = TestUtils.renderIntoDocument(
-          React.createElement(loop.panel.SettingsDropdown));
-
-        expect(view.getDOMNode().querySelectorAll(".icon-account"))
-          .to.have.length.of(0);
-      });
-
     describe("SettingsDropdown", function() {
+      function mountTestComponent() {
+        return TestUtils.renderIntoDocument(
+          React.createElement(loop.panel.SettingsDropdown, {
+            mozLoop: fakeMozLoop
+          }));
+      }
+
       beforeEach(function() {
         navigator.mozLoop.logInToFxA = sandbox.stub();
         navigator.mozLoop.logOutFromFxA = sandbox.stub();
@@ -294,8 +304,7 @@
         function() {
           navigator.mozLoop.loggedInToFxA = false;
 
-          var view = TestUtils.renderIntoDocument(
-            React.createElement(loop.panel.SettingsDropdown));
+          var view = mountTestComponent();
 
           expect(view.getDOMNode().querySelectorAll(".icon-signout"))
             .to.have.length.of(0);
@@ -306,8 +315,7 @@
       it("should show a signout entry when user is authenticated", function() {
         navigator.mozLoop.userProfile = {email: "test@example.com"};
 
-        var view = TestUtils.renderIntoDocument(
-          React.createElement(loop.panel.SettingsDropdown));
+        var view = mountTestComponent();
 
         expect(view.getDOMNode().querySelectorAll(".icon-signout"))
           .to.have.length.of(1);
@@ -318,8 +326,7 @@
       it("should show an account entry when user is authenticated", function() {
         navigator.mozLoop.userProfile = {email: "test@example.com"};
 
-        var view = TestUtils.renderIntoDocument(
-          React.createElement(loop.panel.SettingsDropdown));
+        var view = mountTestComponent();
 
         expect(view.getDOMNode().querySelectorAll(".icon-account"))
           .to.have.length.of(1);
@@ -328,8 +335,7 @@
       it("should open the FxA settings when the account entry is clicked", function() {
         navigator.mozLoop.userProfile = {email: "test@example.com"};
 
-        var view = TestUtils.renderIntoDocument(
-          React.createElement(loop.panel.SettingsDropdown));
+        var view = mountTestComponent();
 
         TestUtils.Simulate.click(
           view.getDOMNode().querySelector(".icon-account"));
@@ -341,8 +347,7 @@
         function() {
           navigator.mozLoop.loggedInToFxA = false;
 
-          var view = TestUtils.renderIntoDocument(
-            React.createElement(loop.panel.SettingsDropdown));
+          var view = mountTestComponent();
 
           expect(view.getDOMNode().querySelectorAll(".icon-account"))
             .to.have.length.of(0);
@@ -350,8 +355,7 @@
 
       it("should sign in the user on click when unauthenticated", function() {
         navigator.mozLoop.loggedInToFxA = false;
-        var view = TestUtils.renderIntoDocument(
-          React.createElement(loop.panel.SettingsDropdown));
+        var view = mountTestComponent();
 
         TestUtils.Simulate.click(
           view.getDOMNode().querySelector(".icon-signin"));
@@ -361,8 +365,7 @@
 
       it("should sign out the user on click when authenticated", function() {
         navigator.mozLoop.userProfile = {email: "test@example.com"};
-        var view = TestUtils.renderIntoDocument(
-          React.createElement(loop.panel.SettingsDropdown));
+        var view = mountTestComponent();
 
         TestUtils.Simulate.click(
           view.getDOMNode().querySelector(".icon-signout"));
@@ -372,28 +375,41 @@
     });
 
     describe("Help", function() {
-      var supportUrl = "https://example.com";
+      var view, supportUrl;
+
+      function mountTestComponent() {
+        return TestUtils.renderIntoDocument(
+          React.createElement(loop.panel.SettingsDropdown, {
+            mozLoop: fakeMozLoop
+          }));
+      }
 
       beforeEach(function() {
+        supportUrl = "https://example.com";
         navigator.mozLoop.getLoopPref = function(pref) {
           if (pref === "support_url")
             return supportUrl;
           return "unseen";
         };
-
-        sandbox.stub(window, "open");
-        sandbox.stub(window, "close");
       });
 
       it("should open a tab to the support page", function() {
-        var view = TestUtils.renderIntoDocument(
-          React.createElement(loop.panel.SettingsDropdown));
+        view = mountTestComponent();
+
+        TestUtils.Simulate
+          .click(view.getDOMNode().querySelector(".icon-help"));
+
+        sinon.assert.calledOnce(fakeMozLoop.openURL);
+        sinon.assert.calledWithExactly(fakeMozLoop.openURL, supportUrl);
+      });
+
+      it("should close the panel", function() {
+        view = mountTestComponent();
 
         TestUtils.Simulate
           .click(view.getDOMNode().querySelector(".icon-help"));
 
-        sinon.assert.calledOnce(window.open);
-        sinon.assert.calledWithExactly(window.open, supportUrl);
+        sinon.assert.calledOnce(fakeWindow.close);
       });
     });
 
@@ -463,6 +479,10 @@
     });
 
     function mountRoomEntry(props) {
+      props = _.extend({
+        dispatcher: dispatcher,
+        mozLoop: fakeMozLoop
+      }, props);
       return TestUtils.renderIntoDocument(
         React.createElement(loop.panel.RoomEntry, props));
     }
@@ -472,7 +492,6 @@
 
       beforeEach(function() {
         roomEntry = mountRoomEntry({
-          dispatcher: dispatcher,
           deleteRoom: sandbox.stub(),
           room: new loop.store.Room(roomData)
         });
@@ -522,7 +541,6 @@
 
       beforeEach(function() {
         roomEntry = mountRoomEntry({
-          dispatcher: dispatcher,
           room: new loop.store.Room(roomData)
         });
         deleteButton = roomEntry.getDOMNode().querySelector("button.delete-link");
@@ -555,6 +573,49 @@
       });
     });
 
+    describe("Context Indicator", function() {
+      var roomEntry;
+
+      function mountEntryForContext() {
+        return mountRoomEntry({
+          room: new loop.store.Room(roomData)
+        });
+      }
+
+      it("should not display a context indicator if the room doesn't have any", function() {
+        roomEntry = mountEntryForContext();
+
+        expect(roomEntry.getDOMNode().querySelector(".room-entry-context-item")).eql(null);
+      });
+
+      it("should a context indicator if the room specifies context", function() {
+        roomData.decryptedContext.urls = [{
+          description: "invalid entry",
+          location: "http://invalid",
+          thumbnail: "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
+        }];
+
+        roomEntry = mountEntryForContext();
+
+        expect(roomEntry.getDOMNode().querySelector(".room-entry-context-item")).not.eql(null);
+      });
+
+      it("should call mozLoop.openURL to open a new url", function() {
+        roomData.decryptedContext.urls = [{
+          description: "invalid entry",
+          location: "http://invalid/",
+          thumbnail: "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
+        }];
+
+        roomEntry = mountEntryForContext();
+
+        TestUtils.Simulate.click(roomEntry.getDOMNode().querySelector("a"));
+
+        sinon.assert.calledOnce(fakeMozLoop.openURL);
+        sinon.assert.calledWithExactly(fakeMozLoop.openURL, "http://invalid/");
+      });
+    });
+
     describe("Room Entry click", function() {
       var roomEntry, roomEntryNode;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/mochitest/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/mochitest/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/mochitest/browser.ini	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/mochitest/browser.ini	2015-04-24 19:30:55.000000000 +0000
@@ -7,7 +7,7 @@
     google_service.sjs
     head.js
     loop_fxa.sjs
-    ../../../../base/content/test/general/browser_fxa_oauth.html
+    ../../../../base/content/test/general/browser_fxa_oauth_with_keys.html
 
 [browser_CardDavImporter.js]
 [browser_fxa_login.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/mochitest/loop_fxa.sjs thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/mochitest/loop_fxa.sjs
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/mochitest/loop_fxa.sjs	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/mochitest/loop_fxa.sjs	2015-04-24 19:30:55.000000000 +0000
@@ -134,7 +134,7 @@
  */
 function oauth_authorization(request, response) {
   response.setStatusLine(request.httpVersion, 302, "Found");
-  response.setHeader("Location", "browser_fxa_oauth.html");
+  response.setHeader("Location", "browser_fxa_oauth_with_keys.html");
 }
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/standalone/index.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/standalone/index.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/standalone/index.html	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/standalone/index.html	2015-04-24 19:30:55.000000000 +0000
@@ -60,12 +60,14 @@
   <script src="../../standalone/content/js/standaloneMozLoop.js"></script>
   <script src="../../standalone/content/js/fxOSMarketplace.js"></script>
   <script src="../../standalone/content/js/standaloneRoomViews.js"></script>
+  <script src="../../standalone/content/js/standaloneMetricsStore.js"></script>
   <script src="../../standalone/content/js/webapp.js"></script>
   <!-- Test scripts -->
   <script src="standalone_client_test.js"></script>
   <script src="standaloneAppStore_test.js"></script>
   <script src="standaloneMozLoop_test.js"></script>
   <script src="standaloneRoomViews_test.js"></script>
+  <script src="standaloneMetricsStore_test.js"></script>
   <script src="webapp_test.js"></script>
   <script src="multiplexGum_test.js"></script>
   <script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/standalone/standaloneMetricsStore_test.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/standalone/standaloneMetricsStore_test.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/standalone/standaloneMetricsStore_test.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/standalone/standaloneMetricsStore_test.js	2015-04-24 19:30:55.000000000 +0000
@@ -0,0 +1,142 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 expect = chai.expect;
+
+describe("loop.store.StandaloneMetricsStore", function() {
+  "use strict";
+
+  var sandbox, dispatcher, store, fakeActiveRoomStore;
+
+  var sharedActions = loop.shared.actions;
+  var METRICS_GA_CATEGORY = loop.store.METRICS_GA_CATEGORY;
+  var METRICS_GA_ACTIONS = loop.store.METRICS_GA_ACTIONS;
+  var ROOM_STATES = loop.store.ROOM_STATES;
+  var FAILURE_DETAILS = loop.shared.utils.FAILURE_DETAILS;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    dispatcher = new loop.Dispatcher();
+
+    window.ga = sinon.stub();
+
+    var fakeStore = loop.store.createStore({
+      getInitialStoreState: function() {
+        return {
+          audioMuted: false,
+          roomState: ROOM_STATES.INIT,
+          videoMuted: false
+        };
+      }
+    });
+
+    fakeActiveRoomStore = new fakeStore(dispatcher);
+
+    store = new loop.store.StandaloneMetricsStore(dispatcher, {
+      activeRoomStore: fakeActiveRoomStore
+    });
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+    delete window.ga;
+  });
+
+  describe("Action Handlers", function() {
+    beforeEach(function() {
+    });
+
+    it("should log an event on GotMediaPermission", function() {
+      store.gotMediaPermission();
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.success,
+        "Media granted");
+    });
+
+    it("should log an event on JoinRoom", function() {
+      store.joinRoom();
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.button,
+        "Join the conversation");
+    });
+
+    it("should log an event on LeaveRoom", function() {
+      store.leaveRoom();
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.button,
+        "Leave conversation");
+    });
+
+    it("should log an event on MediaConnected", function() {
+      store.mediaConnected();
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.success,
+        "Media connected");
+    });
+
+    it("should log an event on RecordClick", function() {
+      store.recordClick(new sharedActions.RecordClick({
+        linkInfo: "fake"
+      }));
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.linkClick,
+        "fake");
+    })
+  });
+
+  describe("Store Change Handlers", function() {
+    it("should log an event on room full", function() {
+      fakeActiveRoomStore.setStoreState({roomState: ROOM_STATES.FULL});
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.pageLoad,
+        "Room full");
+    });
+
+    it("should log an event when the room is expired or invalid", function() {
+      fakeActiveRoomStore.setStoreState({
+        roomState: ROOM_STATES.FAILED,
+        failureReason: FAILURE_DETAILS.EXPIRED_OR_INVALID
+      });
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.pageLoad,
+        "Link expired or invalid");
+    });
+
+    it("should log an event when video mute is changed", function() {
+      fakeActiveRoomStore.setStoreState({
+        videoMuted: true
+      });
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.faceMute,
+        "mute");
+    });
+
+    it("should log an event when audio mute is changed", function() {
+      fakeActiveRoomStore.setStoreState({
+        audioMuted: true
+      });
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.audioMute,
+        "mute");
+    });
+  });
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/standalone/standaloneRoomViews_test.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/standalone/standaloneRoomViews_test.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/standalone/standaloneRoomViews_test.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/standalone/standaloneRoomViews_test.js	2015-04-24 19:30:55.000000000 +0000
@@ -45,7 +45,10 @@
     });
 
     function mountTestComponent(extraProps) {
-      var props = _.extend({ receivingScreenShare: false }, extraProps);
+      var props = _.extend({
+        dispatcher: dispatcher,
+        receivingScreenShare: false
+      }, extraProps);
       return TestUtils.renderIntoDocument(
         React.createElement(
           loop.standaloneRoomViews.StandaloneRoomContextView, props));
@@ -98,6 +101,48 @@
 
       expect(view.getDOMNode().querySelector(".standalone-context-url")).eql(null);
     });
+
+    it("should dispatch a RecordClick action when the link is clicked", function() {
+      var view = mountTestComponent({
+        roomName: "Mark's room",
+        roomContextUrls: [{
+          description: "Mark's super page",
+          location: "http://invalid.com",
+          thumbnail: "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
+        }]
+      });
+
+      TestUtils.Simulate.click(view.getDOMNode()
+        .querySelector(".standalone-context-url-description-wrapper > a"));
+
+      sinon.assert.calledOnce(dispatcher.dispatch);
+      sinon.assert.calledWithExactly(dispatcher.dispatch,
+        new sharedActions.RecordClick({
+          linkInfo: "Shared URL"
+        }));
+    });
+  });
+
+  describe("StandaloneRoomHeader", function() {
+    function mountTestComponent() {
+      return TestUtils.renderIntoDocument(
+        React.createElement(
+          loop.standaloneRoomViews.StandaloneRoomHeader, {
+            dispatcher: dispatcher
+          }));
+    }
+
+    it("should dispatch a RecordClick action when the support link is clicked", function() {
+      var view = mountTestComponent();
+
+      TestUtils.Simulate.click(view.getDOMNode().querySelector("a"));
+
+      sinon.assert.calledOnce(dispatcher.dispatch);
+      sinon.assert.calledWithExactly(dispatcher.dispatch,
+        new sharedActions.RecordClick({
+          linkInfo: "Support link click"
+        }));
+    });
   });
 
   describe("StandaloneRoomView", function() {
@@ -169,6 +214,19 @@
 
           sinon.assert.calledOnce(view.updateVideoContainer);
       });
+
+      it("should reset the video dimensions cache when the gather state is entered", function() {
+        activeRoomStore.setStoreState({roomState: ROOM_STATES.SESSION_CONNECTED});
+
+        var view = mountTestComponent();
+
+        activeRoomStore.setStoreState({roomState: ROOM_STATES.GATHER});
+
+        expect(view._videoDimensionsCache).eql({
+          local: {},
+          remote: {}
+        });
+      })
     });
 
     describe("#publishStream", function() {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js	2015-04-24 19:30:55.000000000 +0000
@@ -3,6 +3,7 @@
 /* global Services, Assert */
 
 const kGuestKeyPref = "loop.key";
+const kFxAKeyPref = "loop.key.fxa";
 
 do_register_cleanup(function() {
   Services.prefs.clearUserPref(kGuestKeyPref);
@@ -33,12 +34,25 @@
   Assert.equal(key, kFakeKey, "should return existing key");
 });
 
+add_task(function* test_fxaGetKnownKey() {
+  const kFakeKey = "75312468";
+  // Set the userProfile to look like we're logged into FxA with a key stored.
+  MozLoopServiceInternal.fxAOAuthTokenData = { token_type: "bearer" };
+  MozLoopServiceInternal.fxAOAuthProfile = { email: "fake@invalid.com" };
+  Services.prefs.setCharPref(kFxAKeyPref, kFakeKey);
+
+  let key = yield MozLoopService.promiseProfileEncryptionKey();
+
+  Assert.equal(key, kFakeKey, "should return existing key");
+});
+
 add_task(function* test_fxaGetKey() {
-  // Set the userProfile to look like we're logged into FxA.
+  // Set the userProfile to look like we're logged into FxA without a key stored.
   MozLoopServiceInternal.fxAOAuthTokenData = { token_type: "bearer" };
   MozLoopServiceInternal.fxAOAuthProfile = { email: "fake@invalid.com" };
+  Services.prefs.clearUserPref(kFxAKeyPref);
 
   // Currently unimplemented, add a test when we implement the code.
   yield Assert.rejects(MozLoopService.promiseProfileEncryptionKey(),
-    /unimplemented/, "should reject as unimplemented");
+    /not implemented/, "should reject as unimplemented");
 });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/ui/fake-mozLoop.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/ui/fake-mozLoop.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/loop/ui/fake-mozLoop.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/loop/ui/fake-mozLoop.js	2015-04-24 19:30:55.000000000 +0000
@@ -7,7 +7,12 @@
   {
     "roomToken": "_nxD4V4FflQ",
     "decryptedContext": {
-      "roomName": "First Room Name"
+      "roomName": "First Room Name",
+      "urls": [{
+        description: "The mozilla page",
+        location: "https://www.mozilla.org",
+        thumbnail: "https://www.mozilla.org/favicon.ico"
+      }]
     },
     "roomUrl": "http://localhost:3000/rooms/_nxD4V4FflQ",
     "roomOwner": "Alexis",
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/bookmarkProperties.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/bookmarkProperties.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/bookmarkProperties.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/bookmarkProperties.js	2015-04-24 19:30:55.000000000 +0000
@@ -37,9 +37,11 @@
  *     - "edit" - for editing a bookmark item or a folder.
  *       @ type (String). Possible values:
  *         - "bookmark"
- *           @ itemId (Integer) - the id of the bookmark item.
+ *           @ node (an nsINavHistoryResultNode object) - a node representing
+ *             the bookmark.
  *         - "folder" (also applies to livemarks)
- *           @ itemId (Integer) - the id of the folder.
+ *           @ node (an nsINavHistoryResultNode object) - a node representing
+ *             the folder.
  *   @ hiddenRows (Strings array) - optional, list of rows to be hidden
  *     regardless of the item edited or added by the dialog.
  *     Possible values:
@@ -49,10 +51,7 @@
  *     - "keyword"
  *     - "tags"
  *     - "loadInSidebar"
- *     - "feedLocation"
- *     - "siteLocation"
  *     - "folderPicker" - hides both the tree and the menu.
- *   @ readOnly (Boolean) - optional, states if the panel should be read-only
  *
  * window.arguments[0].performed is set to true if any transaction has
  * been performed by the dialog.
@@ -61,6 +60,10 @@
 Components.utils.import('resource://gre/modules/XPCOMUtils.jsm');
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
                                   "resource://gre/modules/PrivateBrowsingUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Task",
+                                  "resource://gre/modules/Task.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PromiseUtils",
+                                  "resource://gre/modules/PromiseUtils.jsm");
 
 const BOOKMARK_ITEM = 0;
 const BOOKMARK_FOLDER = 1;
@@ -97,7 +100,6 @@
   _defaultInsertionPoint: null,
   _hiddenRows: [],
   _batching: false,
-  _readOnly: false,
 
   /**
    * This method returns the correct label for the dialog's "accept"
@@ -146,8 +148,8 @@
   /**
    * Determines the initial data for the item edited or added by this dialog
    */
-  _determineItemInfo: function BPP__determineItemInfo() {
-    var dialogInfo = window.arguments[0];
+  _determineItemInfo() {
+    let dialogInfo = window.arguments[0];
     this._action = dialogInfo.action == "add" ? ACTION_ADD : ACTION_EDIT;
     this._hiddenRows = dialogInfo.hiddenRows ? dialogInfo.hiddenRows : [];
     if (this._action == ACTION_ADD) {
@@ -159,11 +161,12 @@
       if ("defaultInsertionPoint" in dialogInfo) {
         this._defaultInsertionPoint = dialogInfo.defaultInsertionPoint;
       }
-      else
+      else {
         this._defaultInsertionPoint =
           new InsertionPoint(PlacesUtils.bookmarksMenuFolderId,
                              PlacesUtils.bookmarks.DEFAULT_INDEX,
                              Ci.nsITreeView.DROP_ON);
+      }
 
       switch (dialogInfo.type) {
         case "bookmark":
@@ -230,52 +233,15 @@
         this._description = dialogInfo.description;
     }
     else { // edit
-      NS_ASSERT("itemId" in dialogInfo);
-      this._itemId = dialogInfo.itemId;
-      this._title = PlacesUtils.bookmarks.getItemTitle(this._itemId);
-      this._readOnly = !!dialogInfo.readOnly;
-
+      this._node = dialogInfo.node;
       switch (dialogInfo.type) {
         case "bookmark":
           this._itemType = BOOKMARK_ITEM;
-
-          this._uri = PlacesUtils.bookmarks.getBookmarkURI(this._itemId);
-          // keyword
-          this._keyword = PlacesUtils.bookmarks
-                                     .getKeywordForBookmark(this._itemId);
-          // Load In Sidebar
-          this._loadInSidebar = PlacesUtils.annotations
-                                           .itemHasAnnotation(this._itemId,
-                                                              PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO);
           break;
-
         case "folder":
           this._itemType = BOOKMARK_FOLDER;
-          PlacesUtils.livemarks.getLivemark({ id: this._itemId })
-            .then(aLivemark => {
-              this._itemType = LIVEMARK_CONTAINER;
-              this._feedURI = aLivemark.feedURI;
-              this._siteURI = aLivemark.siteURI;
-              this._fillEditProperties();
-
-              let acceptButton = document.documentElement.getButton("accept");
-              acceptButton.disabled = !this._inputIsValid();
-
-              let newHeight = window.outerHeight +
-                              this._element("descriptionField").boxObject.height;
-              window.resizeTo(window.outerWidth, newHeight);
-            }, () => undefined);
-
           break;
       }
-
-      // Description
-      if (PlacesUtils.annotations
-                     .itemHasAnnotation(this._itemId, PlacesUIUtils.DESCRIPTION_ANNO)) {
-        this._description = PlacesUtils.annotations
-                                       .getItemAnnotation(this._itemId,
-                                                          PlacesUIUtils.DESCRIPTION_ANNO);
-      }
     }
   },
 
@@ -301,7 +267,7 @@
    * This method should be called by the onload of the Bookmark Properties
    * dialog to initialize the state of the panel.
    */
-  onDialogLoad: function BPP_onDialogLoad() {
+  onDialogLoad: Task.async(function* () {
     this._determineItemInfo();
 
     document.title = this._getDialogTitle();
@@ -312,11 +278,23 @@
 
     switch (this._action) {
       case ACTION_EDIT:
-        this._fillEditProperties();
-        acceptButton.disabled = this._readOnly;
+        gEditItemOverlay.initPanel({ node: this._node
+                                   , hiddenRows: this._hiddenRows });
+        acceptButton.disabled = gEditItemOverlay.readOnly;
         break;
       case ACTION_ADD:
-        this._fillAddProperties();
+        this._node = yield this._promiseNewItem();
+        // Edit the new item
+        gEditItemOverlay.initPanel({ node: this._node
+                                   , hiddenRows: this._hiddenRows });
+
+        // Empty location field if the uri is about:blank, this way inserting a new
+        // url will be easier for the user, Accept button will be automatically
+        // disabled by the input listener until the user fills the field.
+        let locationField = this._element("locationField");
+        if (locationField.value == "about:blank")
+          locationField.value = "";
+
         // if this is an uri related dialog disable accept button until
         // the user fills an uri value.
         if (this._itemType == BOOKMARK_ITEM)
@@ -324,6 +302,11 @@
         break;
     }
 
+    // Adjust the dialog size to the changes done by initPanel. This is necessary because
+    // initPanel, which shows and hides elements, may run after some async work was done
+    // here - i.e. after the DOM load event was processed.
+    window.sizeToContent();
+
     // When collapsible elements change their collapsed attribute we must
     // resize the dialog.
     // sizeToContent is not usable due to bug 90276, so we'll use resizeTo
@@ -338,7 +321,7 @@
           .addEventListener("DOMAttrModified", this, false);
     }
 
-    if (!this._readOnly) {
+    if (!gEditItemOverlay.readOnly) {
       // Listen on uri fields to enable accept button if input is valid
       if (this._itemType == BOOKMARK_ITEM) {
         this._element("locationField")
@@ -348,16 +331,10 @@
               .addEventListener("input", this, false);
         }
       }
-      else if (this._itemType == LIVEMARK_CONTAINER) {
-        this._element("feedLocationField")
-            .addEventListener("input", this, false);
-        this._element("siteLocationField")
-            .addEventListener("input", this, false);
-      }
     }
 
     window.sizeToContent();
-  },
+  }),
 
   // nsIDOMEventListener
   _elementsHeight: [],
@@ -366,8 +343,6 @@
     switch (aEvent.type) {
       case "input":
         if (target.id == "editBMPanel_locationField" ||
-            target.id == "editBMPanel_feedLocationField" ||
-            target.id == "editBMPanel_siteLocationField" ||
             target.id == "editBMPanel_keywordField") {
           // Check uri fields to enable accept button if input is valid
           document.documentElement
@@ -397,41 +372,39 @@
     }
   },
 
-  _beginBatch: function BPP__beginBatch() {
+	// Hack for implementing batched-Undo around the editBookmarkOverlay
+	// instant-apply code. For all the details see the comment above beginBatch
+	// in browser-places.js
+  _batchBlockingDeferred: null,
+  _beginBatch() {
     if (this._batching)
       return;
-
-    PlacesUtils.transactionManager.beginBatch(null);
+    if (PlacesUIUtils.useAsyncTransactions) {
+      this._batchBlockingDeferred = PromiseUtils.defer();
+      PlacesTransactions.batch(function* () {
+        yield this._batchBlockingDeferred.promise;
+      }.bind(this));
+    }
+    else {
+      PlacesUtils.transactionManager.beginBatch(null);
+    }
     this._batching = true;
   },
 
-  _endBatch: function BPP__endBatch() {
+  _endBatch() {
     if (!this._batching)
       return;
 
-    PlacesUtils.transactionManager.endBatch(false);
+    if (PlacesUIUtils.useAsyncTransactions) {
+      this._batchBlockingDeferred.resolve();
+      this._batchBlockingDeferred = null;
+    }
+    else {
+      PlacesUtils.transactionManager.endBatch(false);
+    }
     this._batching = false;
   },
 
-  _fillEditProperties: function BPP__fillEditProperties() {
-    gEditItemOverlay.initPanel(this._itemId,
-                               { hiddenRows: this._hiddenRows,
-                                 forceReadOnly: this._readOnly });
-  },
-
-  _fillAddProperties: function BPP__fillAddProperties() {
-    this._createNewItem();
-    // Edit the new item
-    gEditItemOverlay.initPanel(this._itemId,
-                               { hiddenRows: this._hiddenRows });
-    // Empty location field if the uri is about:blank, this way inserting a new
-    // url will be easier for the user, Accept button will be automatically
-    // disabled by the input listener until the user fills the field.
-    var locationField = this._element("locationField");
-    if (locationField.value == "about:blank")
-      locationField.value = "";
-  },
-
   // nsISupports
   QueryInterface: function BPP_QueryInterface(aIID) {
     if (aIID.equals(Ci.nsIDOMEventListener) ||
@@ -445,7 +418,7 @@
     return document.getElementById("editBMPanel_" + aID);
   },
 
-  onDialogUnload: function BPP_onDialogUnload() {
+  onDialogUnload() {
     // gEditItemOverlay does not exist anymore here, so don't rely on it.
     // Calling removeEventListener with arguments which do not identify any
     // currently registered EventListener on the EventTarget has no effect.
@@ -455,13 +428,9 @@
         .removeEventListener("DOMAttrModified", this, false);
     this._element("locationField")
         .removeEventListener("input", this, false);
-    this._element("feedLocationField")
-        .removeEventListener("input", this, false);
-    this._element("siteLocationField")
-        .removeEventListener("input", this, false);
   },
 
-  onDialogAccept: function BPP_onDialogAccept() {
+  onDialogAccept() {
     // We must blur current focused element to save its changes correctly
     document.commandDispatcher.focusedElement.blur();
     // The order here is important! We have to uninit the panel first, otherwise
@@ -471,13 +440,16 @@
     window.arguments[0].performed = true;
   },
 
-  onDialogCancel: function BPP_onDialogCancel() {
+  onDialogCancel() {
     // The order here is important! We have to uninit the panel first, otherwise
     // changes done as part of Undo may change the panel contents and by
     // that force it to commit more transactions.
     gEditItemOverlay.uninitPanel(true);
     this._endBatch();
-    PlacesUtils.transactionManager.undoTransaction();
+    if (PlacesUIUtils.useAsyncTransactions)
+      PlacesTransactions.undo().catch(Components.utils.reportError);
+    else
+      PlacesUtils.transactionManager.undoTransaction();
     window.arguments[0].performed = false;
   },
 
@@ -583,15 +555,14 @@
    */
   _getTransactionsForURIList: function BPP__getTransactionsForURIList() {
     var transactions = [];
-    for (var i = 0; i < this._URIs.length; ++i) {
-      var uri = this._URIs[i];
-      var title = this._getURITitleFromHistory(uri);
-      var createTxn = new PlacesCreateBookmarkTransaction(uri, -1, 
+    for (let uri of this._URIs) {
+      let title = this._getURITitleFromHistory(uri);
+      let createTxn = new PlacesCreateBookmarkTransaction(uri, -1,
                                                           PlacesUtils.bookmarks.DEFAULT_INDEX,
                                                           title);
       transactions.push(createTxn);
     }
-    return transactions; 
+    return transactions;
   },
 
   /**
@@ -624,9 +595,6 @@
                                                aContainer, aIndex);
   },
 
-  /**
-   * Dialog-accept code-path for creating a new item (any type)
-   */
   _createNewItem: function BPP__getCreateItemTransaction() {
     var [container, index] = this._getInsertionPointDetails();
     var txn;
@@ -637,12 +605,93 @@
         break;
       case LIVEMARK_CONTAINER:
         txn = this._getCreateNewLivemarkTransaction(container, index);
-        break;      
+        break;
       default: // BOOKMARK_ITEM
         txn = this._getCreateNewBookmarkTransaction(container, index);
     }
 
     PlacesUtils.transactionManager.doTransaction(txn);
     this._itemId = PlacesUtils.bookmarks.getIdForItemAt(container, index);
-  }
+
+    return Object.freeze({
+      itemId: this._itemId,
+      get bookmarkGuid() {
+        throw new Error("Node-like bookmarkGuid getter called even though " +
+                        "async transactions are disabled");
+      },
+      title: this._title,
+      uri: this._uri ? this._uri.spec : "",
+      type: this._itemType == BOOKMARK_ITEM ?
+              Ci.nsINavHistoryResultNode.RESULT_TYPE_URI :
+              Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER
+    });
+  },
+
+  _promiseNewItem: Task.async(function* () {
+    if (!PlacesUIUtils.useAsyncTransactions)
+      return this._createNewItem();
+
+    let txnFunc =
+      { [BOOKMARK_FOLDER]: PlacesTransactions.NewFolder,
+        [LIVEMARK_CONTAINER]: PlacesTransactions.NewLivemark,
+        [BOOKMARK_ITEM]: PlacesTransactions.NewBookmark
+      }[this._itemType];
+
+    let [containerId, index] = this._getInsertionPointDetails();
+    let parentGuid = yield PlacesUtils.promiseItemGuid(containerId);
+    let annotations = [];
+    if (this._description) {
+      annotations.push({ name: PlacesUIUtils.DESCRIPTION_ANNO
+                       , value: this._description });
+    }
+    if (this._loadInSidebar) {
+      annotations.push({ name: PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO
+                       , value: true });
+    }
+
+    let itemGuid;
+    let info = { parentGuid, index, title: this._title, annotations };
+    if (this._itemType == BOOKMARK_ITEM) {
+      info.url = this._uri;
+      if (this._keyword)
+        info.keyword = this._keyword;
+      if (this._postData)
+        info.postData = this._postData;
+
+      if (this._charSet && !PrivateBrowsingUtils.isWindowPrivate(window))
+        PlacesUtils.setCharsetForURI(this._uri, this._charSet);
+
+      itemGuid = yield PlacesTransactions.NewBookmark(info).transact();
+    }
+    else if (this._itemType == LIVEMARK_CONTAINER) {
+      info.feedUrl = this._feedURI;
+      if (this._siteURI)
+        info.siteUrl = this._siteURI;
+
+      itemGuid = yield PlacesTransactions.NewLivemark(info).transact();
+    }
+    else if (this._itemType == BOOKMARK_FOLDER) {
+      itemGuid = yield PlacesTransactions.NewFolder(info).transact();
+      for (let uri of this._URIs) {
+        let placeInfo = yield PlacesUtils.promisePlaceInfo(uri);
+        let title = placeInfo ? placeInfo.title : "";
+        yield PlacesTransactions.transact({ parentGuid: itemGuid, uri, title });
+      }
+    }
+    else {
+      throw new Error(`unexpected value for _itemType:  ${this._itemType}`);
+    }
+
+    this._itemGuid = itemGuid;
+    this._itemId = yield PlacesUtils.promiseItemId(itemGuid);
+    return Object.freeze({
+      itemId: this._itemId,
+      bookmarkGuid: this._itemGuid,
+      title: this._title,
+      uri: this._uri ? this._uri.spec : "",
+      type: this._itemType == BOOKMARK_ITEM ?
+              Ci.nsINavHistoryResultNode.RESULT_TYPE_URI :
+              Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER
+    });
+  })
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/controller.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/controller.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/controller.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/controller.js	2015-04-24 19:30:55.000000000 +0000
@@ -129,15 +129,6 @@
   },
 
   isCommandEnabled: function PC_isCommandEnabled(aCommand) {
-    if (PlacesUIUtils.useAsyncTransactions) {
-      switch (aCommand) {
-      case "placesCmd_new:folder":
-      case "placesCmd_new:bookmark":
-      case "placesCmd_createBookmark":
-        return false;
-      }
-    }
-
     switch (aCommand) {
     case "cmd_undo":
       if (!PlacesUIUtils.useAsyncTransactions)
@@ -279,7 +270,7 @@
       this.newItem("bookmark");
       break;
     case "placesCmd_new:separator":
-      this.newSeparator().then(null, Components.utils.reportError);
+      this.newSeparator().catch(Cu.reportError);
       break;
     case "placesCmd_show:info":
       this.showBookmarkPropertiesForSelection();
@@ -666,27 +657,13 @@
   /**
    * Opens the bookmark properties for the selected URI Node.
    */
-  showBookmarkPropertiesForSelection:
-  function PC_showBookmarkPropertiesForSelection() {
-    var node = this._view.selectedNode;
+  showBookmarkPropertiesForSelection() {
+    let node = this._view.selectedNode;
     if (!node)
       return;
 
-    var itemType = PlacesUtils.nodeIsFolder(node) ||
-                   PlacesUtils.nodeIsTagQuery(node) ? "folder" : "bookmark";
-    var concreteId = PlacesUtils.getConcreteItemId(node);
-    var isRootItem = PlacesUtils.isRootItem(concreteId);
-    var itemId = node.itemId;
-    if (isRootItem || PlacesUtils.nodeIsTagQuery(node)) {
-      // If this is a root or the Tags query we use the concrete itemId to catch
-      // the correct title for the node.
-      itemId = concreteId;
-    }
-
     PlacesUIUtils.showBookmarkDialog({ action: "edit"
-                                     , type: itemType
-                                     , itemId: itemId
-                                     , readOnly: isRootItem
+                                     , node
                                      , hiddenRows: [ "folderPicker" ]
                                      }, window.top);
   },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/editBookmarkOverlay.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/editBookmarkOverlay.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/editBookmarkOverlay.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/editBookmarkOverlay.js	2015-04-24 19:30:55.000000000 +0000
@@ -2,250 +2,270 @@
  * License, v. 2.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/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Task",
+                                  "resource://gre/modules/Task.jsm");
+
 const LAST_USED_ANNO = "bookmarkPropertiesDialog/folderLastUsed";
 const MAX_FOLDER_ITEM_IN_MENU_LIST = 5;
 
-var gEditItemOverlay = {
-  _uri: null,
-  _itemId: -1,
-  _itemIds: [],
-  _uris: [],
-  _tags: [],
-  _allTags: [],
-  _multiEdit: false,
-  _itemType: -1,
-  _readOnly: false,
-  _hiddenRows: [],
+let gEditItemOverlay = {
   _observersAdded: false,
   _staticFoldersListBuilt: false,
-  _initialized: false,
-  _titleOverride: "",
 
-  // the first field which was edited after this panel was initialized for
-  // a certain item
-  _firstEditedField: "",
+  _paneInfo: null,
+  _setPaneInfo(aInitInfo) {
+    if (!aInitInfo)
+      return this._paneInfo = null;
+
+    if ("uris" in aInitInfo && "node" in aInitInfo)
+      throw new Error("ambiguous pane info");
+    if (!("uris" in aInitInfo) && !("node" in aInitInfo))
+      throw new Error("Neither node nor uris set for pane info");
+
+    let node = "node" in aInitInfo ? aInitInfo.node : null;
+
+    // Since there's no true UI for folder shortcuts (they show up just as their target
+    // folders), when the pane shows for them it's opened in read-only mode, showing the
+    // properties of the target folder.
+    let itemId = node ? node.itemId : -1;
+    let itemGuid = PlacesUIUtils.useAsyncTransactions && node ?
+                     PlacesUtils.getConcreteItemGuid(node) : null;
+    let isItem = itemId != -1;
+    let isFolderShortcut = isItem &&
+      node.type == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT;
+    let isURI = node && PlacesUtils.nodeIsURI(node);
+    let uri = isURI ? NetUtil.newURI(node.uri) : null;
+    let title = node ? node.title : null;
+    let isBookmark = isItem && isURI;
+    let bulkTagging = !node;
+    let uris = bulkTagging ? aInitInfo.uris : null;
+    let visibleRows = new Set();
+    let isParentReadOnly = false;
+    if (node && "parent" in node) {
+      let parent = node.parent;
+      if (parent) {
+        isParentReadOnly = !PlacesUtils.nodeIsFolder(parent) ||
+                            PlacesUIUtils.isContentsReadOnly(parent);
+      }
+    }
 
+    return this._paneInfo = { itemId, itemGuid, isItem,
+                              isURI, uri, title,
+                              isBookmark, isFolderShortcut, isParentReadOnly,
+                              bulkTagging, uris,
+                              visibleRows };
+  },
+
+  get initialized() {
+    return this._paneInfo != null;
+  },
+
+  // Backwards-compatibility getters
   get itemId() {
-    return this._itemId;
+    if (!this.initialized || this._paneInfo.bulkTagging)
+      return -1;
+    return this._paneInfo.itemId;
   },
 
   get uri() {
-    return this._uri;
+    if (!this.initialized)
+      return null;
+    if (this._paneInfo.bulkTagging)
+      return this._paneInfo.uris[0];
+    return this._paneInfo.uri;
   },
 
   get multiEdit() {
-    return this._multiEdit;
+    return this.initialized && this._paneInfo.bulkTagging;
   },
 
-  /**
-   * Determines the initial data for the item edited or added by this dialog
-   */
-  _determineInfo: function EIO__determineInfo(aInfo) {
-    // hidden rows
-    if (aInfo && aInfo.hiddenRows)
-      this._hiddenRows = aInfo.hiddenRows;
-    else
-      this._hiddenRows.splice(0, this._hiddenRows.length);
-    // force-read-only
-    this._readOnly = aInfo && aInfo.forceReadOnly;
-    this._titleOverride = aInfo && aInfo.titleOverride ? aInfo.titleOverride
-                                                       : "";
-  },
-
-  _showHideRows: function EIO__showHideRows() {
-    var isBookmark = this._itemId != -1 &&
-                     this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK;
-    var isQuery = false;
-    if (this._uri)
-      isQuery = this._uri.schemeIs("place");
-
-    this._element("nameRow").collapsed = this._hiddenRows.indexOf("name") != -1;
-    this._element("folderRow").collapsed =
-      this._hiddenRows.indexOf("folderPicker") != -1 || this._readOnly;
-    this._element("tagsRow").collapsed = !this._uri ||
-      this._hiddenRows.indexOf("tags") != -1 || isQuery;
-    // Collapse the tag selector if the item does not accept tags.
-    if (!this._element("tagsSelectorRow").collapsed &&
-        this._element("tagsRow").collapsed)
-      this.toggleTagsSelector();
-    this._element("descriptionRow").collapsed =
-      this._hiddenRows.indexOf("description") != -1 || this._readOnly;
-    this._element("keywordRow").collapsed = !isBookmark || this._readOnly ||
-      this._hiddenRows.indexOf("keyword") != -1 || isQuery;
-    this._element("locationRow").collapsed = !(this._uri && !isQuery) ||
-      this._hiddenRows.indexOf("location") != -1;
-    this._element("loadInSidebarCheckbox").collapsed = !isBookmark || isQuery ||
-      this._readOnly || this._hiddenRows.indexOf("loadInSidebar") != -1;
-    this._element("feedLocationRow").collapsed = !this._isLivemark ||
-      this._hiddenRows.indexOf("feedLocation") != -1;
-    this._element("siteLocationRow").collapsed = !this._isLivemark ||
-      this._hiddenRows.indexOf("siteLocation") != -1;
-    this._element("selectionCount").hidden = !this._multiEdit;
+  // Check if the pane is initialized to show only read-only fields.
+  get readOnly() {
+    // Bug 1120314 - Folder shortcuts are read-only due to some quirky implementation
+    // details (the most important being the "smart" semantics of node.title).
+    return (!this.initialized ||
+            (!this._paneInfo.visibleRows.has("tagsRow") &&
+             (this._paneInfo.isFolderShortcut ||
+              this._paneInfo.isParentReadOnly)));
+  },
+
+  // the first field which was edited after this panel was initialized for
+  // a certain item
+  _firstEditedField: "",
+
+  _initNamePicker() {
+    if (this._paneInfo.bulkTagging)
+      throw new Error("_initNamePicker called unexpectedly");
+
+    // title may by null, which, for us, is the same as an empty string.
+    this._initTextField(this._namePicker, this._paneInfo.title || "");
+  },
+
+  _initLocationField() {
+    if (!this._paneInfo.isURI)
+      throw new Error("_initLocationField called unexpectedly");
+    this._initTextField(this._locationField, this._paneInfo.uri.spec);
   },
 
+  _initDescriptionField() {
+    if (!this._paneInfo.isItem)
+      throw new Error("_initDescriptionField called unexpectedly");
+
+    this._initTextField(this._descriptionField,
+                        PlacesUIUtils.getItemDescription(this._paneInfo.itemId));
+  },
+
+  _initKeywordField: Task.async(function* (aNewKeyword) {
+    if (!this._paneInfo.isBookmark)
+      throw new Error("_initKeywordField called unexpectedly");
+
+    let newKeyword = aNewKeyword;
+    if (newKeyword === undefined) {
+      let itemId = this._paneInfo.itemId;
+      newKeyword = PlacesUtils.bookmarks.getKeywordForBookmark(itemId);
+    }
+    this._initTextField(this._keywordField, newKeyword);
+  }),
+
+  _initLoadInSidebar: Task.async(function* () {
+    if (!this._paneInfo.isBookmark)
+      throw new Error("_initLoadInSidebar called unexpectedly");
+
+    this._loadInSidebarCheckbox.checked =
+      PlacesUtils.annotations.itemHasAnnotation(
+        this._paneInfo.itemId, PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO);
+  }),
+
   /**
-   * Initialize the panel
-   * @param aFor
-   *        Either a places-itemId (of a bookmark, folder or a live bookmark),
-   *        an array of itemIds (used for bulk tagging), or a URI object (in 
-   *        which case, the panel would be initialized in read-only mode).
-   * @param [optional] aInfo
-   *        JS object which stores additional info for the panel
-   *        initialization. The following properties may bet set:
-   *        * hiddenRows (Strings array): list of rows to be hidden regardless
-   *          of the item edited. Possible values: "title", "location",
-   *          "description", "keyword", "loadInSidebar", "feedLocation",
-   *          "siteLocation", folderPicker"
-   *        * forceReadOnly - set this flag to initialize the panel to its
-   *          read-only (view) mode even if the given item is editable.
+   * Initialize the panel.
+   *
+   * @param aInfo
+   *        An object having:
+   *        1. one of the following properties:
+   *        - node: either a result node or a node-like object representing the
+   *          item to be edited. A node-like object must have the following
+   *          properties (with values that match exactly those a result node
+   *          would have): itemId, bookmarkGuid, uri, title, type.
+   *        - uris: an array of uris for bulk tagging.
+   *
+   *        2. any of the following optional properties:
+   *          - hiddenRows (Strings array): list of rows to be hidden regardless
+   *            of the item edited. Possible values: "title", "location",
+   *            "description", "keyword", "loadInSidebar", "feedLocation",
+   *            "siteLocation", folderPicker"
    */
-  initPanel: function EIO_initPanel(aFor, aInfo) {
+  initPanel(aInfo) {
+    if (typeof(aInfo) != "object" || aInfo === null)
+      throw new Error("aInfo must be an object.");
+
     // For sanity ensure that the implementer has uninited the panel before
     // trying to init it again, or we could end up leaking due to observers.
-    if (this._initialized)
+    if (this.initialized)
       this.uninitPanel(false);
 
-    var aItemIdList;
-    if (Array.isArray(aFor)) {
-      aItemIdList = aFor;
-      aFor = aItemIdList[0];
-    }
-    else if (this._multiEdit) {
-      this._multiEdit = false;
-      this._tags = [];
-      this._uris = [];
-      this._allTags = [];
-      this._itemIds = [];
-      this._element("selectionCount").hidden = true;
-    }
-
-    this._folderMenuList = this._element("folderMenuList");
-    this._folderTree = this._element("folderTree");
-
-    this._determineInfo(aInfo);
-    if (aFor instanceof Ci.nsIURI) {
-      this._itemId = -1;
-      this._uri = aFor;
-      this._readOnly = true;
+    let { itemId, itemGuid, isItem,
+          isURI, uri, title,
+          isBookmark, bulkTagging, uris,
+          visibleRows } = this._setPaneInfo(aInfo);
+
+    let showOrCollapse =
+      (rowId, isAppropriateForInput, nameInHiddenRows = null) => {
+        let visible = isAppropriateForInput;
+        if (visible && "hiddenRows" in aInfo && nameInHiddenRows)
+          visible &= aInfo.hiddenRows.indexOf(nameInHiddenRows) == -1;
+        if (visible)
+          visibleRows.add(rowId);
+        return !(this._element(rowId).collapsed = !visible);
+      };
+
+    if (showOrCollapse("nameRow", !bulkTagging, "name")) {
+      this._initNamePicker();
+      this._namePicker.readOnly = this.readOnly;
     }
-    else {
-      this._itemId = aFor;
-      // We can't store information on invalid itemIds.
-      this._readOnly = this._readOnly || this._itemId == -1;
-
-      var containerId = PlacesUtils.bookmarks.getFolderIdForItem(this._itemId);
-      this._itemType = PlacesUtils.bookmarks.getItemType(this._itemId);
-      if (this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK) {
-        this._uri = PlacesUtils.bookmarks.getBookmarkURI(this._itemId);
-        this._initTextField("keywordField",
-                            PlacesUtils.bookmarks
-                                       .getKeywordForBookmark(this._itemId));
-        this._element("loadInSidebarCheckbox").checked =
-          PlacesUtils.annotations.itemHasAnnotation(this._itemId,
-                                                    PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO);
-      }
-      else {
-        this._uri = null;
-        this._isLivemark = false;
-        PlacesUtils.livemarks.getLivemark({id: this._itemId })
-          .then(aLivemark => {
-            this._isLivemark = true;
-            this._initTextField("feedLocationField", aLivemark.feedURI.spec, true);
-            this._initTextField("siteLocationField", aLivemark.siteURI ? aLivemark.siteURI.spec : "", true);
-            this._showHideRows();
-          }, () => undefined);
-      }
 
-      // folder picker
-      this._initFolderMenuList(containerId);
+    if (showOrCollapse("locationRow", isURI, "location")) {
+      this._initLocationField();
+      this._locationField.readOnly = !this._paneInfo.isItem;
+    }
 
-      // description field
-      this._initTextField("descriptionField", 
-                          PlacesUIUtils.getItemDescription(this._itemId));
+    if (showOrCollapse("descriptionRow",
+                       this._paneInfo.isItem && !this.readOnly,
+                       "description")) {
+      this._initDescriptionField();
     }
 
-    if (this._itemId == -1 ||
-        this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK) {
-      this._isLivemark = false;
-
-      this._initTextField("locationField", this._uri.spec);
-      if (!aItemIdList) {
-        var tags = PlacesUtils.tagging.getTagsForURI(this._uri).join(", ");
-        this._initTextField("tagsField", tags, false);
-      }
-      else {
-        this._multiEdit = true;
-        this._allTags = [];
-        this._itemIds = aItemIdList;
-        for (var i = 0; i < aItemIdList.length; i++) {
-          if (aItemIdList[i] instanceof Ci.nsIURI) {
-            this._uris[i] = aItemIdList[i];
-            this._itemIds[i] = -1;
-          }
-          else
-            this._uris[i] = PlacesUtils.bookmarks.getBookmarkURI(this._itemIds[i]);
-          this._tags[i] = PlacesUtils.tagging.getTagsForURI(this._uris[i]);
-        }
-        this._allTags = this._getCommonTags();
-        this._initTextField("tagsField", this._allTags.join(", "), false);
-        this._element("itemsCountText").value =
-          PlacesUIUtils.getPluralString("detailsPane.itemsCountLabel",
-                                        this._itemIds.length,
-                                        [this._itemIds.length]);
-      }
+    if (showOrCollapse("keywordRow", isBookmark, "keyword"))
+      this._initKeywordField();
 
-      // tags selector
-      this._rebuildTagsSelectorList();
+    // Collapse the tag selector if the item does not accept tags.
+    if (showOrCollapse("tagsRow", isURI || bulkTagging, "tags"))
+      this._initTagsField().catch(Components.utils.reportError);
+    else if (!this._element("tagsSelectorRow").collapsed)
+      this.toggleTagsSelector().catch(Components.utils.reportError);
+
+    // Load in sidebar.
+    if (showOrCollapse("loadInSidebarCheckbox", isBookmark, "loadInSidebar")) {
+      this._initLoadInSidebar();
+    }
+
+    // Folder picker.
+    // Technically we should check that the item is not moveable, but that's
+    // not cheap (we don't always have the parent), and there's no use case for
+    // this (it's only the Star UI that shows the folderPicker)
+    if (showOrCollapse("folderRow", isItem, "folderPicker")) {
+      let containerId = PlacesUtils.bookmarks.getFolderIdForItem(itemId);
+      this._initFolderMenuList(containerId);
     }
 
-    // name picker
-    this._initNamePicker();
-    
-    this._showHideRows();
+    // Selection count.
+    if (showOrCollapse("selectionCount", bulkTagging)) {
+      this._element("itemsCountText").value =
+        PlacesUIUtils.getPluralString("detailsPane.itemsCountLabel",
+                                      uris.length,
+                                      [uris.length]);
+    }
 
-    // observe changes
+    // Observe changes.
     if (!this._observersAdded) {
-      // Single bookmarks observe any change.  History entries and multiEdit
-      // observe only tags changes, through bookmarks.
-      if (this._itemId != -1 || this._uri || this._multiEdit)
-        PlacesUtils.bookmarks.addObserver(this, false);
-
-      this._element("namePicker").addEventListener("blur", this);
-      this._element("locationField").addEventListener("blur", this);
-      this._element("tagsField").addEventListener("blur", this);
-      this._element("keywordField").addEventListener("blur", this);
-      this._element("descriptionField").addEventListener("blur", this);
+      PlacesUtils.bookmarks.addObserver(this, false);
       window.addEventListener("unload", this, false);
       this._observersAdded = true;
     }
-
-    this._initialized = true;
   },
 
   /**
-   * Finds tags that are in common among this._tags entries that track tags
-   * for each selected uri.
-   * The tags arrays should be kept up-to-date for this to work properly.
-   *
-   * @return array of common tags for the selected uris.
+   * Finds tags that are in common among this._currentInfo.uris;
    */
-  _getCommonTags: function() {
-    return this._tags[0].filter(
-      function (aTag) this._tags.every(
-        function (aTags) aTags.indexOf(aTag) != -1
-      ), this
-    );
-  },
-
-  _initTextField: function(aTextFieldId, aValue, aReadOnly) {
-    var field = this._element(aTextFieldId);
-    field.readOnly = aReadOnly !== undefined ? aReadOnly : this._readOnly;
+  _getCommonTags() {
+    if ("_cachedCommonTags" in this._paneInfo)
+      return this._paneInfo._cachedCommonTags;
+
+    let uris = [...this._paneInfo.uris];
+    let firstURI = uris.shift();
+    let commonTags = new Set(PlacesUtils.tagging.getTagsForURI(firstURI));
+    if (commonTags.size == 0)
+      return this._cachedCommonTags = [];
+
+    for (let uri of uris) {
+      let curentURITags = PlacesUtils.tagging.getTagsForURI(uri);
+      for (let tag of commonTags) {
+        if (curentURITags.indexOf(tag) == -1) {
+          commonTags.delete(tag)
+          if (commonTags.size == 0)
+            return this._paneInfo.cachedCommonTags = [];
+        }
+      }
+    }
+    return this._paneInfo._cachedCommonTags = [...commonTags];
+  },
 
-    if (field.value != aValue) {
-      field.value = aValue;
+  _initTextField(aElement, aValue) {
+    if (aElement.value != aValue) {
+      aElement.value = aValue;
 
-      // clear the undo stack
-      var editor = field.editor;
+      // Clear the undo stack
+      let editor = aElement.editor;
       if (editor)
         editor.transactionManager.clear();
     }
@@ -259,8 +279,7 @@
    *        The identifier of the bookmarks folder.
    * @return the new menu item.
    */
-  _appendFolderItemToMenupopup:
-  function EIO__appendFolderItemToMenuList(aMenupopup, aFolderId) {
+  _appendFolderItemToMenupopup(aMenupopup, aFolderId) {
     // First make sure the folders-separator is visible
     this._element("foldersSeparator").hidden = false;
 
@@ -339,144 +358,136 @@
     this._folderMenuList.disabled = this._readOnly;
   },
 
-  QueryInterface: function EIO_QueryInterface(aIID) {
-    if (aIID.equals(Ci.nsIDOMEventListener) ||
-        aIID.equals(Ci.nsINavBookmarkObserver) ||
-        aIID.equals(Ci.nsISupports))
-      return this;
+  QueryInterface:
+  XPCOMUtils.generateQI([Components.interfaces.nsIDOMEventListener,
+                         Components.interfaces.nsINavBookmarkObserver]),
 
-    throw Cr.NS_ERROR_NO_INTERFACE;
-  },
-
-  _element: function EIO__element(aID) {
-    return document.getElementById("editBMPanel_" + aID);
-  },
+  _element(aID) document.getElementById("editBMPanel_" + aID),
 
-  _getItemStaticTitle: function EIO__getItemStaticTitle() {
-    if (this._titleOverride)
-      return this._titleOverride;
-
-    let title = "";
-    if (this._itemId == -1) {
-      title = PlacesUtils.history.getPageTitle(this._uri);
-    }
-    else {
-      title = PlacesUtils.bookmarks.getItemTitle(this._itemId);
-    }
-    return title;
-  },
-
-  _initNamePicker: function EIO_initNamePicker() {
-    var namePicker = this._element("namePicker");
-    namePicker.value = this._getItemStaticTitle();
-    namePicker.readOnly = this._readOnly;
-
-    // clear the undo stack
-    var editor = namePicker.editor;
-    if (editor)
-      editor.transactionManager.clear();
-  },
-
-  uninitPanel: function EIO_uninitPanel(aHideCollapsibleElements) {
+  uninitPanel(aHideCollapsibleElements) {
     if (aHideCollapsibleElements) {
-      // hide the folder tree if it was previously visible
+      // Hide the folder tree if it was previously visible.
       var folderTreeRow = this._element("folderTreeRow");
       if (!folderTreeRow.collapsed)
         this.toggleFolderTreeVisibility();
 
-      // hide the tag selector if it was previously visible
+      // Hide the tag selector if it was previously visible.
       var tagsSelectorRow = this._element("tagsSelectorRow");
       if (!tagsSelectorRow.collapsed)
         this.toggleTagsSelector();
     }
 
     if (this._observersAdded) {
-      if (this._itemId != -1 || this._uri || this._multiEdit)
-        PlacesUtils.bookmarks.removeObserver(this);
-
-      this._element("namePicker").removeEventListener("blur", this);
-      this._element("locationField").removeEventListener("blur", this);
-      this._element("tagsField").removeEventListener("blur", this);
-      this._element("keywordField").removeEventListener("blur", this);
-      this._element("descriptionField").removeEventListener("blur", this);
-
+      PlacesUtils.bookmarks.removeObserver(this);
       this._observersAdded = false;
     }
 
-    this._itemId = -1;
-    this._uri = null;
-    this._uris = [];
-    this._tags = [];
-    this._allTags = [];
-    this._itemIds = [];
-    this._multiEdit = false;
+    this._setPaneInfo(null);
     this._firstEditedField = "";
-    this._initialized = false;
-    this._titleOverride = "";
-    this._readOnly = false;
-  },
-
-  onTagsFieldBlur: function EIO_onTagsFieldBlur() {
-    if (this._updateTags()) // if anything has changed
-      this._mayUpdateFirstEditField("tagsField");
-  },
-
-  _updateTags: function EIO__updateTags() {
-    if (this._multiEdit)
-      return this._updateMultipleTagsForItems();
-    return this._updateSingleTagForItem();
-  },
-
-  _updateSingleTagForItem: function EIO__updateSingleTagForItem() {
-    var currentTags = PlacesUtils.tagging.getTagsForURI(this._uri);
-    var tags = this._getTagsArrayFromTagField();
-    if (tags.length > 0 || currentTags.length > 0) {
-      var tagsToRemove = [];
-      var tagsToAdd = [];
-      var txns = []; 
-      for (var i = 0; i < currentTags.length; i++) {
-        if (tags.indexOf(currentTags[i]) == -1)
-          tagsToRemove.push(currentTags[i]);
-      }
-      for (var i = 0; i < tags.length; i++) {
-        if (currentTags.indexOf(tags[i]) == -1)
-          tagsToAdd.push(tags[i]);
-      }
-
-      if (tagsToRemove.length > 0) {
-        let untagTxn = new PlacesUntagURITransaction(this._uri, tagsToRemove);
-        txns.push(untagTxn);
-      }
-      if (tagsToAdd.length > 0) {
-        let tagTxn = new PlacesTagURITransaction(this._uri, tagsToAdd);
-        txns.push(tagTxn);
-      }
+  },
 
-      if (txns.length > 0) {
-        let aggregate = new PlacesAggregatedTransaction("Update tags", txns);
-        PlacesUtils.transactionManager.doTransaction(aggregate);
-
-        // Ensure the tagsField is in sync, clean it up from empty tags
-        var tags = PlacesUtils.tagging.getTagsForURI(this._uri).join(", ");
-        this._initTextField("tagsField", tags, false);
-        return true;
-      }
+  onTagsFieldChange() {
+    if (!this.readOnly) {
+      this._updateTags().then(
+        anyChanges => {
+          if (anyChanges)
+            this._mayUpdateFirstEditField("tagsField");
+        }, Components.utils.reportError);
     }
-    return false;
   },
 
-   /**
-    * Stores the first-edit field for this dialog, if the passed-in field
-    * is indeed the first edited field
-    * @param aNewField
-    *        the id of the field that may be set (without the "editBMPanel_"
-    *        prefix)
-    */
-  _mayUpdateFirstEditField: function EIO__mayUpdateFirstEditField(aNewField) {
+  /**
+   * For a given array of currently-set tags and the tags-input-field
+   * value, returns which tags should be removed and which should be added in
+   * the form of { removedTags: [...], newTags: [...] }.
+   */
+  _getTagsChanges(aCurrentTags) {
+    let inputTags = this._getTagsArrayFromTagsInputField();
+
+    // Optimize the trivial cases (which are actually the most common).
+    if (inputTags.length == 0 && aCurrentTags.length == 0)
+      return { newTags: [], removedTags: [] };
+    if (inputTags.length == 0)
+      return { newTags: [], removedTags: aCurrentTags };
+    if (aCurrentTags.length == 0)
+      return { newTags: inputTags, removedTags: [] };
+
+    let removedTags = aCurrentTags.filter(t => inputTags.indexOf(t) == -1);
+    let newTags = inputTags.filter(t => aCurrentTags.indexOf(t) == -1);
+    return { removedTags, newTags };
+  },
+
+  // Adds and removes tags for one or more uris.
+  _setTagsFromTagsInputField: Task.async(function* (aCurrentTags, aURIs) {
+    let { removedTags, newTags } = this._getTagsChanges(aCurrentTags);
+    if (removedTags.length + newTags.length == 0)
+      return false;
+
+    if (!PlacesUIUtils.useAsyncTransactions) {
+      let txns = [];
+      for (let uri of aURIs) {
+        if (removedTags.length > 0)
+          txns.push(new PlacesUntagURITransaction(uri, removedTags));
+        if (newTags.length > 0)
+          txns.push(new PlacesTagURITransaction(uri, newTags));
+      }
+
+      PlacesUtils.transactionManager.doTransaction(
+        new PlacesAggregatedTransaction("Update tags", txns));
+      return true;
+    }
+
+    let setTags = function* () {
+      if (newTags.length > 0) {
+        yield PlacesTransactions.Tag({ urls: aURIs, tags: newTags })
+                                .transact();
+      }
+      if (removedTags.length > 0) {
+        yield PlacesTransactions.Untag({ urls: aURIs, tags: removedTags })
+                          .transact();
+      }
+    };
+
+    // Only in the library info-pane it's safe (and necessary) to batch these.
+    // TODO bug 1093030: cleanup this mess when the bookmarksProperties dialog
+    // and star UI code don't "run a batch in the background".
+    if (window.document.documentElement.id == "places")
+      PlacesTransactions.batch(setTags).catch(Components.utils.reportError);
+    else
+      Task.spawn(setTags).catch(Components.utils.reportError);
+    return true;
+  }),
+
+  _updateTags: Task.async(function*() {
+    let uris = this._paneInfo.bulkTagging ?
+                 this._paneInfo.uris : [this._paneInfo.uri];
+    let currentTags = this._paneInfo.bulkTagging ?
+                        yield this._getCommonTags() :
+                        PlacesUtils.tagging.getTagsForURI(uris[0]);
+    let anyChanges = yield this._setTagsFromTagsInputField(currentTags, uris);
+    if (!anyChanges)
+      return false;
+
+    // Ensure the tagsField is in sync, clean it up from empty tags
+    currentTags = this._paneInfo.bulkTagging ?
+                    this._getCommonTags() :
+                    PlacesUtils.tagging.getTagsForURI(this._uri);
+    this._initTextField(this._tagsField, currentTags.join(", "), false);
+    return true;
+  }),
+
+  /**
+   * Stores the first-edit field for this dialog, if the passed-in field
+   * is indeed the first edited field
+   * @param aNewField
+   *        the id of the field that may be set (without the "editBMPanel_"
+   *        prefix)
+   */
+  _mayUpdateFirstEditField(aNewField) {
     // * The first-edit-field behavior is not applied in the multi-edit case
     // * if this._firstEditedField is already set, this is not the first field,
     //   so there's nothing to do
-    if (this._multiEdit || this._firstEditedField)
+    if (this._paneInfo.bulkTagging || this._firstEditedField)
       return;
 
     this._firstEditedField = aNewField;
@@ -487,124 +498,116 @@
     prefs.setCharPref("browser.bookmarks.editDialog.firstEditField", aNewField);
   },
 
-  _updateMultipleTagsForItems: function EIO__updateMultipleTagsForItems() {
-    var tags = this._getTagsArrayFromTagField();
-    if (tags.length > 0 || this._allTags.length > 0) {
-      var tagsToRemove = [];
-      var tagsToAdd = [];
-      var txns = []; 
-      for (var i = 0; i < this._allTags.length; i++) {
-        if (tags.indexOf(this._allTags[i]) == -1)
-          tagsToRemove.push(this._allTags[i]);
-      }
-      for (var i = 0; i < this._tags.length; i++) {
-        tagsToAdd[i] = [];
-        for (var j = 0; j < tags.length; j++) {
-          if (this._tags[i].indexOf(tags[j]) == -1)
-            tagsToAdd[i].push(tags[j]);
-        }
-      }
-
-      if (tagsToAdd.length > 0) {
-        for (let i = 0; i < this._uris.length; i++) {
-          if (tagsToAdd[i].length > 0) {
-            let tagTxn = new PlacesTagURITransaction(this._uris[i],
-                                                     tagsToAdd[i]);
-            txns.push(tagTxn);
-          }
-        }
-      }
-      if (tagsToRemove.length > 0) {
-        for (let i = 0; i < this._uris.length; i++) {
-          let untagTxn = new PlacesUntagURITransaction(this._uris[i],
-                                                       tagsToRemove);
-          txns.push(untagTxn);
-        }
-      }
-
-      if (txns.length > 0) {
-        let aggregate = new PlacesAggregatedTransaction("Update tags", txns);
-        PlacesUtils.transactionManager.doTransaction(aggregate);
-
-        this._allTags = tags;
-        this._tags = [];
-        for (let i = 0; i < this._uris.length; i++) {
-          this._tags[i] = PlacesUtils.tagging.getTagsForURI(this._uris[i]);
-        }
-
-        // Ensure the tagsField is in sync, clean it up from empty tags
-        this._initTextField("tagsField", tags, false);
-        return true;
-      }
-    }
-    return false;
-  },
-
-  onNamePickerBlur: function EIO_onNamePickerBlur() {
-    if (this._itemId == -1)
+  onNamePickerChange() {
+    if (this.readOnly || !this._paneInfo.isItem)
       return;
 
-    var namePicker = this._element("namePicker")
-
     // Here we update either the item title or its cached static title
-    var newTitle = namePicker.value;
+    let newTitle = this._namePicker.value;
     if (!newTitle &&
-        PlacesUtils.bookmarks.getFolderIdForItem(this._itemId) == PlacesUtils.tagsFolderId) {
+        PlacesUtils.bookmarks.getFolderIdForItem(itemId) == PlacesUtils.tagsFolderId) {
       // We don't allow setting an empty title for a tag, restore the old one.
       this._initNamePicker();
     }
-    else if (this._getItemStaticTitle() != newTitle) {
+    else {
       this._mayUpdateFirstEditField("namePicker");
-      let txn = new PlacesEditItemTitleTransaction(this._itemId, newTitle);
-      PlacesUtils.transactionManager.doTransaction(txn);
+      if (!PlacesUIUtils.useAsyncTransactions) {
+        let txn = new PlacesEditItemTitleTransaction(this._paneInfo.itemId,
+                                                     newTitle);
+        PlacesUtils.transactionManager.doTransaction(txn);
+        return;
+      }
+      let guid = this._paneInfo.itemGuid;
+      PlacesTransactions.EditTitle({ guid, title: newTitle })
+                        .transact().catch(Components.utils.reportError);
     }
   },
 
-  onDescriptionFieldBlur: function EIO_onDescriptionFieldBlur() {
-    var description = this._element("descriptionField").value;
+  onDescriptionFieldChange() {
+    if (this.readOnly || !this._paneInfo.isItem)
+      return;
+
+    let itemId = this._paneInfo.itemId;
+    let description = this._element("descriptionField").value;
     if (description != PlacesUIUtils.getItemDescription(this._itemId)) {
-      var annoObj = { name   : PlacesUIUtils.DESCRIPTION_ANNO,
-                      type   : Ci.nsIAnnotationService.TYPE_STRING,
-                      flags  : 0,
-                      value  : description,
-                      expires: Ci.nsIAnnotationService.EXPIRE_NEVER };
-      var txn = new PlacesSetItemAnnotationTransaction(this._itemId, annoObj);
-      PlacesUtils.transactionManager.doTransaction(txn);
+      let annotation =
+        { name: PlacesUIUtils.DESCRIPTION_ANNO, value: description };
+      if (!PlacesUIUtils.useAsyncTransactions) {
+        let txn = new PlacesSetItemAnnotationTransaction(itemId,
+                                                         annotation);
+        PlacesUtils.transactionManager.doTransaction(txn);
+        return;
+      }
+      let guid = this._paneInfo.itemGuid;
+      PlacesTransactions.Annotate({ guid, annotation })
+                        .transact().catch(Components.utils.reportError);
     }
   },
 
-  onLocationFieldBlur: function EIO_onLocationFieldBlur() {
-    var uri;
+  onLocationFieldChange() {
+    if (this.readOnly || !this._paneInfo.isBookmark)
+      return;
+
+    let newURI;
     try {
-      uri = PlacesUIUtils.createFixedURI(this._element("locationField").value);
+      newURI = PlacesUIUtils.createFixedURI(this._locationField.value);
+    }
+    catch(ex) {
+      // TODO: Bug 1089141 - Provide some feedback about the invalid url.
+      return;
     }
-    catch(ex) { return; }
 
-    if (!this._uri.equals(uri)) {
-      var txn = new PlacesEditBookmarkURITransaction(this._itemId, uri);
+    if (this._paneInfo.uri.equals(newURI))
+      return;
+
+    if (!PlacesUIUtils.useAsyncTransactions) {
+      let itemId = this._paneInfo.itemId;
+      let txn = new PlacesEditBookmarkURITransaction(this._itemId, newURI);
       PlacesUtils.transactionManager.doTransaction(txn);
-      this._uri = uri;
+      return;
     }
+    let guid = this._paneInfo.itemGuid;
+    PlacesTransactions.EditUrl({ guid, url: newURI })
+                      .transact().catch(Components.utils.reportError);
   },
 
-  onKeywordFieldBlur: function EIO_onKeywordFieldBlur() {
-    var keyword = this._element("keywordField").value;
-    if (keyword != PlacesUtils.bookmarks.getKeywordForBookmark(this._itemId)) {
-      var txn = new PlacesEditBookmarkKeywordTransaction(this._itemId, keyword);
+  onKeywordFieldChange() {
+    if (this.readOnly || !this._paneInfo.isBookmark)
+      return;
+
+    let itemId = this._paneInfo.itemId;
+    let newKeyword = this._keywordField.value;
+    if (!PlacesUIUtils.useAsyncTransactions) {
+      let txn = new PlacesEditBookmarkKeywordTransaction(itemId, newKeyword);
       PlacesUtils.transactionManager.doTransaction(txn);
+      return;
     }
+    let guid = this._paneInfo.itemGuid;
+    PlacesTransactions.EditKeyword({ guid, keyword: newKeyword })
+                      .transact().catch(Components.utils.reportError);
   },
 
-  onLoadInSidebarCheckboxCommand:
-  function EIO_onLoadInSidebarCheckboxCommand() {
-    let annoObj = { name : PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO };
-    if (this._element("loadInSidebarCheckbox").checked)
-      annoObj.value = true;
-    let txn = new PlacesSetItemAnnotationTransaction(this._itemId, annoObj);
-    PlacesUtils.transactionManager.doTransaction(txn);
+  onLoadInSidebarCheckboxCommand() {
+    if (!this.initialized || !this._paneInfo.isBookmark)
+      return;
+
+    let annotation = { name : PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO };
+    if (this._loadInSidebarCheckbox.checked)
+      annotation.value = true;
+
+    if (!PlacesUIUtils.useAsyncTransactions) {
+      let itemId = this._paneInfo.itemId;
+      let txn = new PlacesSetItemAnnotationTransaction(itemId,
+                                                       annotation);
+      PlacesUtils.transactionManager.doTransaction(txn);
+      return;
+    }
+    let guid = this._paneInfo.itemGuid;
+    PlacesTransactions.Annotate({ guid, annotation })
+                      .transact().catch(Components.utils.reportError);
   },
 
-  toggleFolderTreeVisibility: function EIO_toggleFolderTreeVisibility() {
+  toggleFolderTreeVisibility() {
     var expander = this._element("foldersExpander");
     var folderTreeRow = this._element("folderTreeRow");
     if (!folderTreeRow.collapsed) {
@@ -637,8 +640,7 @@
     }
   },
 
-  _getFolderIdFromMenuList:
-  function EIO__getFolderIdFromMenuList() {
+  _getFolderIdFromMenuList() {
     var selectedItem = this._folderMenuList.selectedItem;
     NS_ASSERT("folderId" in selectedItem,
               "Invalid menuitem in the folders-menulist");
@@ -653,24 +655,21 @@
    * @param aFolderId
    *        The identifier of the bookmarks folder.
    */
-  _getFolderMenuItem:
-  function EIO__getFolderMenuItem(aFolderId) {
-    var menupopup = this._folderMenuList.menupopup;
-
-    for (let i = 0; i < menupopup.childNodes.length; i++) {
-      if ("folderId" in menupopup.childNodes[i] &&
-          menupopup.childNodes[i].folderId == aFolderId)
-        return menupopup.childNodes[i];
-    }
+  _getFolderMenuItem(aFolderId) {
+    let menuPopup = this._folderMenuList.menupopup;
+    let menuItem = Array.prototype.find.call(
+      menuPopup.childNodes, menuItem => menuItem.folderId === aFolderId);
+    if (menuItem !== undefined)
+      return menuItem;
 
     // 3 special folders + separator + folder-items-count limit
     if (menupopup.childNodes.length == 4 + MAX_FOLDER_ITEM_IN_MENU_LIST)
-      menupopup.removeChild(menupopup.lastChild);
+      menupopup.removeChild(menuPopup.lastChild);
 
-    return this._appendFolderItemToMenupopup(menupopup, aFolderId);
+    return this._appendFolderItemToMenupopup(menuPopup, aFolderId);
   },
 
-  onFolderMenuListCommand: function EIO_onFolderMenuListCommand(aEvent) {
+  onFolderMenuListCommand(aEvent) {
     // Set a selectedIndex attribute to show special icons
     this._folderMenuList.setAttribute("selectedIndex",
                                       this._folderMenuList.selectedIndex);
@@ -678,8 +677,8 @@
     if (aEvent.target.id == "editBMPanel_chooseFolderMenuItem") {
       // reset the selection back to where it was and expand the tree
       // (this menu-item is hidden when the tree is already visible
-      var container = PlacesUtils.bookmarks.getFolderIdForItem(this._itemId);
-      var item = this._getFolderMenuItem(container);
+      let containerId = PlacesUtils.bookmarks.getFolderIdForItem(this._itemId);
+      let item = this._getFolderMenuItem(containerId);
       this._folderMenuList.selectedItem = item;
       // XXXmano HACK: setTimeout 100, otherwise focus goes back to the
       // menulist right away
@@ -688,19 +687,30 @@
     }
 
     // Move the item
-    var container = this._getFolderIdFromMenuList();
-    if (PlacesUtils.bookmarks.getFolderIdForItem(this._itemId) != container) {
-      var txn = new PlacesMoveItemTransaction(this._itemId, 
-                                              container, 
-                                              PlacesUtils.bookmarks.DEFAULT_INDEX);
-      PlacesUtils.transactionManager.doTransaction(txn);
+    let containerId = this._getFolderIdFromMenuList();
+    if (PlacesUtils.bookmarks.getFolderIdForItem(this._paneInfo.itemId) != containerId) {
+      if (PlacesUIUtils.useAsyncTransactions) {
+        Task.spawn(function* () {
+          let newParentGuid = yield PlacesUtils.promiseItemGuid(containerId);
+          let guid = this._paneInfo.itemGuid;
+          yield PlacesTransactions.Move({ guid, newParentGuid }).transact();
+        }.bind(this));
+      }
+      else {
+        let txn = new PlacesMoveItemTransaction(this._itemId,
+                                                containerId,
+                                                PlacesUtils.bookmarks.DEFAULT_INDEX);
+        PlacesUtils.transactionManager.doTransaction(txn);
+      }
 
       // Mark the containing folder as recently-used if it isn't in the
       // static list
-      if (container != PlacesUtils.unfiledBookmarksFolderId &&
-          container != PlacesUtils.toolbarFolderId &&
-          container != PlacesUtils.bookmarksMenuFolderId)
-        this._markFolderAsRecentlyUsed(container);
+      if (containerId != PlacesUtils.unfiledBookmarksFolderId &&
+          containerId != PlacesUtils.toolbarFolderId &&
+          containerId != PlacesUtils.bookmarksMenuFolderId) {
+        this._markFolderAsRecentlyUsed(container)
+            .catch(Components.utils.reportError);
+      }
     }
 
     // Update folder-tree selection
@@ -713,7 +723,7 @@
     }
   },
 
-  onFolderTreeSelect: function EIO_onFolderTreeSelect() {
+  onFolderTreeSelect() {
     var selectedNode = this._folderTree.selectedNode;
 
     // Disable the "New Folder" button if we cannot create a new folder
@@ -732,26 +742,48 @@
     folderItem.doCommand();
   },
 
-  _markFolderAsRecentlyUsed:
-  function EIO__markFolderAsRecentlyUsed(aFolderId) {
-    var txns = [];
+  _markFolderAsRecentlyUsed: Task.async(function* (aFolderId) {
+    if (!PlacesUIUtils.useAsyncTransactions) {
+      let txns = [];
+
+      // Expire old unused recent folders.
+      let annotation = this._getLastUsedAnnotationObject(false);
+      while (this._recentFolders.length > MAX_FOLDER_ITEM_IN_MENU_LIST) {
+        let folderId = this._recentFolders.pop().folderId;
+        let annoTxn = new PlacesSetItemAnnotationTransaction(folderId, anno);
+        txns.push(annoTxn);
+      }
 
-    // Expire old unused recent folders
-    var anno = this._getLastUsedAnnotationObject(false);
-    while (this._recentFolders.length > MAX_FOLDER_ITEM_IN_MENU_LIST) {
-      var folderId = this._recentFolders.pop().folderId;
-      let annoTxn = new PlacesSetItemAnnotationTransaction(folderId, anno);
+      // Mark folder as recently used
+      annotation = this._getLastUsedAnnotationObject(true);
+      let annoTxn = new PlacesSetItemAnnotationTransaction(aFolderId, anno);
       txns.push(annoTxn);
+
+      let aggregate =
+        new PlacesAggregatedTransaction("Update last used folders", txns);
+      PlacesUtils.transactionManager.doTransaction(aggregate);
+      return;
     }
 
-    // Mark folder as recently used
-    anno = this._getLastUsedAnnotationObject(true);
-    let annoTxn = new PlacesSetItemAnnotationTransaction(aFolderId, anno);
-    txns.push(annoTxn);
+    // Expire old unused recent folders.
+    let guids = [];
+    while (this._recentFolders.length > MAX_FOLDER_ITEM_IN_MENU_LIST) {
+      let folderId = this._recentFolders.pop().folderId;
+      let guid = yield PlacesUtils.promiseItemGuid(folderId);
+      guids.push(guid);
+    }
+    if (guids.length > 0) {
+      let annotation = this._getLastUsedAnnotationObject(false);
+      PlacesTransactions.Annotate({ guids, annotation  })
+                        .transact().catch(Components.utils.reportError);
+    }
 
-    let aggregate = new PlacesAggregatedTransaction("Update last used folders", txns);
-    PlacesUtils.transactionManager.doTransaction(aggregate);
-  },
+    // Mark folder as recently used
+    let annotation = this._getLastUsedAnnotationObject(true);
+    let guid = yield PlacesUtils.promiseItemGuid(aFolderId);
+    PlacesTransactions.Annotate({ guid, annotation })
+                      .transact().catch(Components.utils.reportError);
+  }),
 
   /**
    * Returns an object which could then be used to set/unset the
@@ -762,20 +794,14 @@
    * @returns an object representing the annotation which could then be used
    *          with the transaction manager.
    */
-  _getLastUsedAnnotationObject:
-  function EIO__getLastUsedAnnotationObject(aLastUsed) {
-    var anno = { name: LAST_USED_ANNO,
-                 type: Ci.nsIAnnotationService.TYPE_INT32,
-                 flags: 0,
-                 value: aLastUsed ? new Date().getTime() : null,
-                 expires: Ci.nsIAnnotationService.EXPIRE_NEVER };
-
-    return anno;
+  _getLastUsedAnnotationObject(aLastUsed) {
+    return { name: LAST_USED_ANNO,
+             value: aLastUsed ? new Date().getTime() : null };
   },
 
-  _rebuildTagsSelectorList: function EIO__rebuildTagsSelectorList() {
-    var tagsSelector = this._element("tagsSelector");
-    var tagsSelectorRow = this._element("tagsSelectorRow");
+  _rebuildTagsSelectorList: Task.async(function* () {
+    let tagsSelector = this._element("tagsSelector");
+    let tagsSelectorRow = this._element("tagsSelectorRow");
     if (tagsSelectorRow.collapsed)
       return;
 
@@ -785,14 +811,14 @@
     let selectedTag = selectedIndex >= 0 ? tagsSelector.selectedItem.label
                                          : null;
 
-    while (tagsSelector.hasChildNodes())
+    while (tagsSelector.hasChildNodes()) {
       tagsSelector.removeChild(tagsSelector.lastChild);
+    }
 
-    var tagsInField = this._getTagsArrayFromTagField();
-    var allTags = PlacesUtils.tagging.allTags;
-    for (var i = 0; i < allTags.length; i++) {
-      var tag = allTags[i];
-      var elt = document.createElement("listitem");
+    let tagsInField = this._getTagsArrayFromTagsInputField();
+    let allTags = PlacesUtils.tagging.allTags;
+    for (tag of allTags) {
+      let elt = document.createElement("listitem");
       elt.setAttribute("type", "checkbox");
       elt.setAttribute("label", tag);
       if (tagsInField.indexOf(tag) != -1)
@@ -814,9 +840,9 @@
       tagsSelector.selectedIndex = selectedIndex;
       tagsSelector.ensureIndexIsVisible(selectedIndex);
     }
-  },
+  }),
 
-  toggleTagsSelector: function EIO_toggleTagsSelector() {
+  toggleTagsSelector: Task.async(function* () {
     var tagsSelector = this._element("tagsSelector");
     var tagsSelectorRow = this._element("tagsSelectorRow");
     var expander = this._element("tagsSelectorExpander");
@@ -825,7 +851,7 @@
       expander.setAttribute("tooltiptext",
                             expander.getAttribute("tooltiptextup"));
       tagsSelectorRow.collapsed = false;
-      this._rebuildTagsSelectorList();
+      yield this._rebuildTagsSelectorList();
 
       // This is a no-op if we've added the listener.
       tagsSelector.addEventListener("CheckboxStateChange", this, false);
@@ -836,52 +862,59 @@
                             expander.getAttribute("tooltiptextdown"));
       tagsSelectorRow.collapsed = true;
     }
-  },
+  }),
 
   /**
    * Splits "tagsField" element value, returning an array of valid tag strings.
    *
    * @return Array of tag strings found in the field value.
    */
-  _getTagsArrayFromTagField: function EIO__getTagsArrayFromTagField() {
+  _getTagsArrayFromTagsInputField() {
     let tags = this._element("tagsField").value;
     return tags.trim()
                .split(/\s*,\s*/) // Split on commas and remove spaces.
                .filter(function (tag) tag.length > 0); // Kill empty tags.
   },
 
-  newFolder: function EIO_newFolder() {
-    var ip = this._folderTree.insertionPoint;
+  newFolder: Task.async(function* () {
+    let ip = this._folderTree.insertionPoint;
 
     // default to the bookmarks menu folder
     if (!ip || ip.itemId == PlacesUIUtils.allBookmarksFolderId) {
-        ip = new InsertionPoint(PlacesUtils.bookmarksMenuFolderId,
-                                PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                Ci.nsITreeView.DROP_ON);
+      ip = new InsertionPoint(PlacesUtils.bookmarksMenuFolderId,
+                              PlacesUtils.bookmarks.DEFAULT_INDEX,
+                              Ci.nsITreeView.DROP_ON);
     }
 
     // XXXmano: add a separate "New Folder" string at some point...
-    var defaultLabel = this._element("newFolderButton").label;
-    var txn = new PlacesCreateFolderTransaction(defaultLabel, ip.itemId, ip.index);
-    PlacesUtils.transactionManager.doTransaction(txn);
+    let title = this._element("newFolderButton").label;
+    if (PlacesUIUtils.useAsyncTransactions) {
+      let parentGuid = yield ip.promiseGuid();
+      yield PlacesTransactions.NewFolder({ parentGuid, title, index: ip.index })
+                              .transact().catch(Components.utils.reportError);
+    }
+    else {
+      let txn = new PlacesCreateFolderTransaction(title, ip.itemId, ip.index);
+      PlacesUtils.transactionManager.doTransaction(txn);
+    }
+
     this._folderTree.focus();
     this._folderTree.selectItems([ip.itemId]);
     PlacesUtils.asContainer(this._folderTree.selectedNode).containerOpen = true;
     this._folderTree.selectItems([this._lastNewItem]);
     this._folderTree.startEditing(this._folderTree.view.selection.currentIndex,
                                   this._folderTree.columns.getFirstColumn());
-  },
+  }),
 
   // nsIDOMEventListener
-  handleEvent: function EIO_nsIDOMEventListener(aEvent) {
+  handleEvent(aEvent) {
     switch (aEvent.type) {
     case "CheckboxStateChange":
       // Update the tags field when items are checked/unchecked in the listbox
-      let tags = this._getTagsArrayFromTagField();
+      let tags = this._getTagsArrayFromTagsInputField();
       let tagCheckbox = aEvent.target;
 
       let curTagIndex = tags.indexOf(tagCheckbox.label);
-
       let tagsSelector = this._element("tagsSelector");
       tagsSelector.selectedItem = tagCheckbox;
 
@@ -896,151 +929,144 @@
       this._element("tagsField").value = tags.join(", ");
       this._updateTags();
       break;
-    case "blur":
-      let replaceFn = (str, firstLetter) => firstLetter.toUpperCase();
-      let nodeName = aEvent.target.id.replace(/editBMPanel_(\w)/, replaceFn);
-      this["on" + nodeName + "Blur"]();
-      break;
     case "unload":
       this.uninitPanel(false);
       break;
     }
   },
 
-  // nsINavBookmarkObserver
-  onItemChanged: function EIO_onItemChanged(aItemId, aProperty,
-                                            aIsAnnotationProperty, aValue,
-                                            aLastModified, aItemType) {
-    if (aProperty == "tags") {
-      // Tags case is special, since they should be updated if either:
-      // - the notification is for the edited bookmark
-      // - the notification is for the edited history entry
-      // - the notification is for one of edited uris
-      let shouldUpdateTagsField = this._itemId == aItemId;
-      if (this._itemId == -1 || this._multiEdit) {
-        // Check if the changed uri is part of the modified ones.
+  _initTagsField: Task.async(function* () {
+    let tags;
+    if (this._paneInfo.isURI)
+      tags = PlacesUtils.tagging.getTagsForURI(this._paneInfo.uri);
+    else if (this._paneInfo.bulkTagging)
+      tags = this._getCommonTags();
+    else
+      throw new Error("_promiseTagsStr called unexpectedly");
+
+    this._initTextField(this._tagsField, tags.join(", "));
+  }),
+
+  _onTagsChange(aItemId) {
+    let paneInfo = this._paneInfo;
+    let updateTagsField = false;
+    if (paneInfo.isURI) {
+      if (paneInfo.isBookmark && aItemId == paneInfo.itemId) {
+        updateTagsField = true;
+      }
+      else if (!paneInfo.isBookmark) {
         let changedURI = PlacesUtils.bookmarks.getBookmarkURI(aItemId);
-        let uris = this._multiEdit ? this._uris : [this._uri];
-        uris.forEach(function (aURI, aIndex) {
-          if (aURI.equals(changedURI)) {
-            shouldUpdateTagsField = true;
-            if (this._multiEdit) {
-              this._tags[aIndex] = PlacesUtils.tagging.getTagsForURI(this._uris[aIndex]);
-            }
-          }
-        }, this);
+        updateTagsField = changedURI.equals(paneInfo.uri);
       }
-
-      if (shouldUpdateTagsField) {
-        if (this._multiEdit) {
-          this._allTags = this._getCommonTags();
-          this._initTextField("tagsField", this._allTags.join(", "), false);
-        }
-        else {
-          let tags = PlacesUtils.tagging.getTagsForURI(this._uri).join(", ");
-          this._initTextField("tagsField", tags, false);
-        }
+    }
+    else if (paneInfo.bulkTagging) {
+      let changedURI = PlacesUtils.bookmarks.getBookmarkURI(aItemId);
+      if (paneInfo.uris.some(uri => uri.equals(changedURI))) {
+        updateTagsField = true;
+        delete this._paneInfo._cachedCommonTags;
       }
-
-      // Any tags change should be reflected in the tags selector.
-      this._rebuildTagsSelectorList();
-      return;
     }
+    else {
+      throw new Error("_onTagsChange called unexpectedly");
+    }
+
+    if (updateTagsField)
+      this._initTagsField().catch(Components.utils.reportError);
 
-    if (this._itemId != aItemId) {
-      if (aProperty == "title") {
-        // If the title of a folder which is listed within the folders
-        // menulist has been changed, we need to update the label of its
-        // representing element.
-        var menupopup = this._folderMenuList.menupopup;
-        for (let i = 0; i < menupopup.childNodes.length; i++) {
-          if ("folderId" in menupopup.childNodes[i] &&
-              menupopup.childNodes[i].folderId == aItemId) {
-            menupopup.childNodes[i].label = aValue;
-            break;
-          }
+    // Any tags change should be reflected in the tags selector.
+    if (this._element("tagsSelector"))
+      this._rebuildTagsSelectorList().catch(Components.utils.reportError);
+  },
+
+  _onItemTitleChange(aItemId, aNewTitle) {
+    if (!this._paneInfo.isBookmark)
+      return;
+    if (aItemId == this._paneInfo.itemId) {
+      this._paneInfo.title = aNewTitle;
+      this._initTextField(this._namePicker);
+    }
+    else if (this._paneInfo.visibleRows.has("folderRow")) {
+      // If the title of a folder which is listed within the folders
+      // menulist has been changed, we need to update the label of its
+      // representing element.
+      let menupopup = this._folderMenuList.menupopup;
+      for (menuitem of menupopup.childNodes) {
+        if ("folderId" in menuItem && menuItem.folderId == aItemId) {
+          menuitem.label = aNewTitle;
+          break;
         }
       }
+    }
+  },
 
+  // nsINavBookmarkObserver
+  onItemChanged(aItemId, aProperty, aIsAnnotationProperty, aValue,
+                aLastModified, aItemType) {
+    if (aProperty == "tags" && this._paneInfo.visibleRows.has("tagsRow"))
+      this._onTagsChange(aItemId);
+    else if (this._paneInfo.isItem && aProperty == "title")
+      this._onItemTitleChange(aItemId, aValue);
+    else (!this._paneInfo.isItem || this._paneInfo.itemId != aItemId)
       return;
-    }
 
     switch (aProperty) {
-    case "title":
-      var namePicker = this._element("namePicker");
-      if (namePicker.value != aValue) {
-        namePicker.value = aValue;
-        // clear undo stack
-        namePicker.editor.transactionManager.clear();
-      }
-      break;
     case "uri":
-      var locationField = this._element("locationField");
-      if (locationField.value != aValue) {
-        this._uri = Cc["@mozilla.org/network/io-service;1"].
-                    getService(Ci.nsIIOService).
-                    newURI(aValue, null, null);
-        this._initTextField("locationField", this._uri.spec);
-        this._initNamePicker();
-        this._initTextField("tagsField",
-                             PlacesUtils.tagging
-                                        .getTagsForURI(this._uri).join(", "),
-                            false);
-        this._rebuildTagsSelectorList();
+      let newURI = NetUtil.newURI(aValue);
+      if (!newURI.equals(this._paneInfo.uri)) {
+        this._paneInfo.uri = newURI;
+        if (this._paneInfo.visibleRows.has("locationRow"))
+          this._initLocationField();
+
+        if (this._paneInfo.visibleRows.has("tagsRow")) {
+          delete this._paneInfo._cachedCommonTags;
+          this._onTagsChange(aItemId);
+        }
       }
       break;
     case "keyword":
-      this._initTextField("keywordField",
-                          PlacesUtils.bookmarks
-                                     .getKeywordForBookmark(this._itemId));
+      if (this._paneInfo.visibleRows.has("keywordRow"))
+        this._initKeywordField(aValue);
       break;
     case PlacesUIUtils.DESCRIPTION_ANNO:
-      this._initTextField("descriptionField",
-                          PlacesUIUtils.getItemDescription(this._itemId));
+      if (this._paneInfo.visibleRows.has("descriptionRow"))
+        this._initDescriptionField();
       break;
     case PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO:
-      this._element("loadInSidebarCheckbox").checked =
-        PlacesUtils.annotations.itemHasAnnotation(this._itemId,
-                                                  PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO);
-      break;
-    case PlacesUtils.LMANNO_FEEDURI:
-      let feedURISpec =
-        PlacesUtils.annotations.getItemAnnotation(this._itemId,
-                                                  PlacesUtils.LMANNO_FEEDURI);
-      this._initTextField("feedLocationField", feedURISpec, true);
-      break;
-    case PlacesUtils.LMANNO_SITEURI:
-      let siteURISpec = "";
-      try {
-        siteURISpec =
-          PlacesUtils.annotations.getItemAnnotation(this._itemId,
-                                                    PlacesUtils.LMANNO_SITEURI);
-      } catch (ex) {}
-      this._initTextField("siteLocationField", siteURISpec, true);
+      if (this._paneInfo.visibleRows.has("loadInSidebarCheckbox"))
+        this._initLoadInSidebar();
       break;
     }
   },
 
-  onItemMoved: function EIO_onItemMoved(aItemId, aOldParent, aOldIndex,
-                                        aNewParent, aNewIndex, aItemType) {
-    if (aItemId != this._itemId ||
-        aNewParent == this._getFolderIdFromMenuList())
+  onItemMoved(aItemId, aOldParent, aOldIndex,
+              aNewParent, aNewIndex, aItemType) {
+    if (!this._paneInfo.isItem ||
+        !this._paneInfo.visibleRows.has("folderPicker") ||
+        this._paneInfo.itemId != aItemOd ||
+        aNewParent == this._getFolderIdFromMenuList()) {
       return;
+    }
 
-    var folderItem = this._getFolderMenuItem(aNewParent);
-
-    // just setting selectItem _does not_ trigger oncommand, so we don't
-    // recurse
-    this._folderMenuList.selectedItem = folderItem;
+    // Just setting selectItem _does not_ trigger oncommand, so we don't
+    // recurse.
+    this._folderMenuList.selectedItem = this._getFolderMenuItem(aNewParent);
   },
 
-  onItemAdded: function EIO_onItemAdded(aItemId, aParentId, aIndex, aItemType,
-                                        aURI) {
+  onItemAdded(aItemId, aParentId, aIndex, aItemType, aURI) {
     this._lastNewItem = aItemId;
   },
 
-  onItemRemoved: function() { },
-  onBeginUpdateBatch: function() { },
-  onEndUpdateBatch: function() { },
-  onItemVisited: function() { },
+  onItemRemoved() { },
+  onBeginUpdateBatch() { },
+  onEndUpdateBatch() { },
+  onItemVisited() { },
 };
+
+
+for (let elt of ["folderMenuList", "folderTree", "namePicker",
+                 "locationField", "descriptionField", "keywordField",
+                 "tagsField", "loadInSidebarCheckbox"]) {
+  let eltScoped = elt;
+  XPCOMUtils.defineLazyGetter(gEditItemOverlay, `_${eltScoped}`,
+                              () => gEditItemOverlay._element(eltScoped));
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/editBookmarkOverlay.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/editBookmarkOverlay.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/editBookmarkOverlay.xul	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/editBookmarkOverlay.xul	2015-04-24 19:30:55.000000000 +0000
@@ -29,7 +29,8 @@
                  class="editBMPanel_rowLabel"
                  accesskey="&editBookmarkOverlay.name.accesskey;"
                  control="editBMPanel_namePicker"/>
-          <textbox id="editBMPanel_namePicker"/>
+          <textbox id="editBMPanel_namePicker"
+                   onchange="gEditItemOverlay.onNamePickerChange();"/>
         </row>
 
         <row align="center" id="editBMPanel_locationRow">
@@ -38,25 +39,8 @@
                  accesskey="&editBookmarkOverlay.location.accesskey;"
                  control="editBMPanel_locationField"/>
           <textbox id="editBMPanel_locationField"
-                   class="uri-element"/>
-        </row>
-
-        <row align="center" id="editBMPanel_feedLocationRow">
-          <label value="&editBookmarkOverlay.feedLocation.label;"
-                 class="editBMPanel_rowLabel"
-                 accesskey="&editBookmarkOverlay.feedLocation.accesskey;"
-                 control="editBMPanel_feedLocationField"/>
-          <textbox id="editBMPanel_feedLocationField"
-                   class="uri-element"/>
-        </row>
-
-        <row align="center" id="editBMPanel_siteLocationRow">
-          <label value="&editBookmarkOverlay.siteLocation.label;"
-                 class="editBMPanel_rowLabel"
-                 accesskey="&editBookmarkOverlay.siteLocation.accesskey;"
-                 control="editBMPanel_siteLocationField"/>
-          <textbox id="editBMPanel_siteLocationField"
-                   class="uri-element"/>
+                   class="uri-element"
+                   onchange="gEditItemOverlay.onLocationFieldChange();"/>
         </row>
 
         <row align="center" id="editBMPanel_folderRow">
@@ -114,7 +98,7 @@
               <button label="&editBookmarkOverlay.newFolderButton.label;"
                       id="editBMPanel_newFolderButton"
                       accesskey="&editBookmarkOverlay.newFolderButton.accesskey;"
-                      oncommand="gEditItemOverlay.newFolder();"/>
+                      oncommand="gEditItemOverlay.newFolder().catch(Components.utils.reportError);"/>
             </hbox>
           </vbox>
         </row>
@@ -133,7 +117,8 @@
                      completedefaultindex="true"
                      tabscrolling="true"
                      showcommentcolumn="true"
-                     placeholder="&editBookmarkOverlay.tagsEmptyDesc.label;"/>
+                     placeholder="&editBookmarkOverlay.tagsEmptyDesc.label;"
+                     onchange="gEditItemOverlay.onTagsFieldChange();"/>
             <button id="editBMPanel_tagsSelectorExpander"
                     class="expander-down"
                     tooltiptext="&editBookmarkOverlay.tagsExpanderDown.tooltip;"
@@ -157,7 +142,8 @@
                  class="editBMPanel_rowLabel"
                  accesskey="&editBookmarkOverlay.keyword.accesskey;"
                  control="editBMPanel_keywordField"/>
-          <textbox id="editBMPanel_keywordField"/>
+          <textbox id="editBMPanel_keywordField"
+                   onchange="gEditItemOverlay.onKeywordFieldChange();"/>
         </row>
 
         <row id="editBMPanel_descriptionRow">
@@ -168,7 +154,8 @@
                  control="editBMPanel_descriptionField"/>
           <textbox id="editBMPanel_descriptionField"
                    multiline="true"
-                   rows="4"/>
+                   rows="4"
+                   onchange="gEditItemOverlay.onDescriptionFieldChange();"/>
         </row>
       </rows>
     </grid>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/places.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/places.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/places.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/places.js	2015-04-24 19:30:55.000000000 +0000
@@ -615,7 +615,8 @@
     // Make sure the infoBox UI is visible if we need to use it, we hide it
     // below when we don't.
     infoBox.hidden = false;
-    var aSelectedNode = aNodeList.length == 1 ? aNodeList[0] : null;
+    let selectedNode = aNodeList.length == 1 ? aNodeList[0] : null;
+
     // If a textbox within a panel is focused, force-blur it so its contents
     // are saved
     if (gEditItemOverlay.itemId != -1) {
@@ -627,12 +628,12 @@
 
       // don't update the panel if we are already editing this node unless we're
       // in multi-edit mode
-      if (aSelectedNode) {
-        var concreteId = PlacesUtils.getConcreteItemId(aSelectedNode);
-        var nodeIsSame = gEditItemOverlay.itemId == aSelectedNode.itemId ||
+      if (selectedNode) {
+        var concreteId = PlacesUtils.getConcreteItemId(selectedNode);
+        var nodeIsSame = gEditItemOverlay.itemId == selectedNode.itemId ||
                          gEditItemOverlay.itemId == concreteId ||
-                         (aSelectedNode.itemId == -1 && gEditItemOverlay.uri &&
-                          gEditItemOverlay.uri == aSelectedNode.uri);
+                         (selectedNode.itemId == -1 && gEditItemOverlay.uri &&
+                          gEditItemOverlay.uri == selectedNode.uri);
         if (nodeIsSame && detailsDeck.selectedIndex == 1 &&
             !gEditItemOverlay.multiEdit)
           return;
@@ -642,70 +643,54 @@
     // Clean up the panel before initing it again.
     gEditItemOverlay.uninitPanel(false);
 
-    if (aSelectedNode && !PlacesUtils.nodeIsSeparator(aSelectedNode)) {
+    if (selectedNode && !PlacesUtils.nodeIsSeparator(selectedNode)) {
       detailsDeck.selectedIndex = 1;
       // Using the concrete itemId is arguably wrong.  The bookmarks API
       // does allow setting properties for folder shortcuts as well, but since
       // the UI does not distinct between the couple, we better just show
       // the concrete item properties for shortcuts to root nodes.
-      var concreteId = PlacesUtils.getConcreteItemId(aSelectedNode);
+      var concreteId = PlacesUtils.getConcreteItemId(selectedNode);
       var isRootItem = concreteId != -1 && PlacesUtils.isRootItem(concreteId);
       var readOnly = isRootItem ||
-                     aSelectedNode.parent.itemId == PlacesUIUtils.leftPaneFolderId;
+                     selectedNode.parent.itemId == PlacesUIUtils.leftPaneFolderId;
       var useConcreteId = isRootItem ||
-                          PlacesUtils.nodeIsTagQuery(aSelectedNode);
+                          PlacesUtils.nodeIsTagQuery(selectedNode);
       var itemId = -1;
       if (concreteId != -1 && useConcreteId)
         itemId = concreteId;
-      else if (aSelectedNode.itemId != -1)
-        itemId = aSelectedNode.itemId;
+      else if (selectedNode.itemId != -1)
+        itemId = selectedNode.itemId;
       else
-        itemId = PlacesUtils._uri(aSelectedNode.uri);
+        itemId = PlacesUtils._uri(selectedNode.uri);
 
-      gEditItemOverlay.initPanel(itemId, { hiddenRows: ["folderPicker"]
-                                         , forceReadOnly: readOnly
-                                         , titleOverride: aSelectedNode.title
-                                         });
-
-      // Dynamically generated queries, like history date containers, have
-      // itemId !=0 and do not exist in history.  For them the panel is
-      // read-only, but empty, since it can't get a valid title for the object.
-      // In such a case we force the title using the selectedNode one, for UI
-      // polishness.
-      if (aSelectedNode.itemId == -1 &&
-          (PlacesUtils.nodeIsDay(aSelectedNode) ||
-           PlacesUtils.nodeIsHost(aSelectedNode)))
-        gEditItemOverlay._element("namePicker").value = aSelectedNode.title;
+      gEditItemOverlay.initPanel({ node: selectedNode
+                                 , hiddenRows: ["folderPicker"] });
 
-      this._detectAndSetDetailsPaneMinimalState(aSelectedNode);
+      this._detectAndSetDetailsPaneMinimalState(selectedNode);
     }
-    else if (!aSelectedNode && aNodeList[0]) {
-      var itemIds = [];
-      for (var i = 0; i < aNodeList.length; i++) {
-        if (!PlacesUtils.nodeIsBookmark(aNodeList[i]) &&
-            !PlacesUtils.nodeIsURI(aNodeList[i])) {
-          detailsDeck.selectedIndex = 0;
-          var selectItemDesc = document.getElementById("selectItemDescription");
-          var itemsCountLabel = document.getElementById("itemsCountText");
-          selectItemDesc.hidden = false;
-          itemsCountLabel.value =
-            PlacesUIUtils.getPluralString("detailsPane.itemsCountLabel",
-                                          aNodeList.length, [aNodeList.length]);
-          infoBox.hidden = true;
-          return;
-        }
-        itemIds[i] = aNodeList[i].itemId != -1 ? aNodeList[i].itemId :
-                     PlacesUtils._uri(aNodeList[i].uri);
+    else if (!selectedNode && aNodeList[0]) {
+      if (aNodeList.every(PlacesUtils.nodeIsURI)) {
+        let uris = [for (node of aNodeList) PlacesUtils._uri(node.uri)];
+        detailsDeck.selectedIndex = 1;
+        gEditItemOverlay.initPanel({ uris
+                                   , hiddenRows: ["folderPicker",
+                                                  "loadInSidebar",
+                                                  "location",
+                                                  "keyword",
+                                                  "description",
+                                                  "name"]});
+        this._detectAndSetDetailsPaneMinimalState(selectedNode);
+      }
+      else {
+        detailsDeck.selectedIndex = 0;
+        let selectItemDesc = document.getElementById("selectItemDescription");
+        let itemsCountLabel = document.getElementById("itemsCountText");
+        selectItemDesc.hidden = false;
+        itemsCountLabel.value =
+          PlacesUIUtils.getPluralString("detailsPane.itemsCountLabel",
+                                        aNodeList.length, [aNodeList.length]);
+        infoBox.hidden = true;
       }
-      detailsDeck.selectedIndex = 1;
-      gEditItemOverlay.initPanel(itemIds,
-                                 { hiddenRows: ["folderPicker",
-                                                "loadInSidebar",
-                                                "location",
-                                                "keyword",
-                                                "description",
-                                                "name"]});
-      this._detectAndSetDetailsPaneMinimalState(aSelectedNode);
     }
     else {
       detailsDeck.selectedIndex = 0;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/treeView.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/treeView.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/content/treeView.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/content/treeView.js	2015-04-24 19:30:55.000000000 +0000
@@ -1691,8 +1691,13 @@
     // We may only get here if the cell is editable.
     let node = this._rows[aRow];
     if (node.title != aText) {
-      let txn = new PlacesEditItemTitleTransaction(node.itemId, aText);
-      PlacesUtils.transactionManager.doTransaction(txn);
+      if (!PlacesUIUtils.useAsyncTransactions) {
+        let txn = new PlacesEditItemTitleTransaction(node.itemId, aText);
+        PlacesUtils.transactionManager.doTransaction(txn);
+        return;
+      }
+      PlacesTransactions.EditTitle({ guid: node.bookmarkGuid, title: aText })
+                        .transact().catch(Cu.reportError);
     }
   },
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/PlacesUIUtils.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/PlacesUIUtils.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/PlacesUIUtils.jsm	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/PlacesUIUtils.jsm	2015-04-24 19:30:55.000000000 +0000
@@ -1211,6 +1211,155 @@
     let cloudSyncEnabled = CloudSync && CloudSync.ready && CloudSync().tabsReady && CloudSync().tabs.hasRemoteTabs();
     return weaveEnabled || cloudSyncEnabled;
   },
+
+  /**
+   * WARNING TO ADDON AUTHORS: DO NOT USE THIS METHOD. IT'S LIKELY TO BE REMOVED IN A
+   * FUTURE RELEASE.
+   *
+   * Checks if a place: href represents a folder shortcut.
+   *
+   * @param queryString
+   *        the query string to check (a place: href)
+   * @return whether or not queryString represents a folder shortcut.
+   * @throws if queryString is malformed.
+   */
+  isFolderShortcutQueryString(queryString) {
+    // Based on GetSimpleBookmarksQueryFolder in nsNavHistory.cpp.
+
+    let queriesParam = { }, optionsParam = { };
+    PlacesUtils.history.queryStringToQueries(queryString,
+                                             queriesParam,
+                                             { },
+                                             optionsParam);
+    let queries = queries.value;
+    if (queries.length == 0)
+      throw new Error(`Invalid place: uri: ${queryString}`);
+    return queries.length == 1 &&
+           queries[0].folderCount == 1 &&
+           !queries[0].hasBeginTime &&
+           !queries[0].hasEndTime &&
+           !queries[0].hasDomain &&
+           !queries[0].hasURI &&
+           !queries[0].hasSearchTerms &&
+           !queries[0].tags.length == 0 &&
+           optionsParam.value.maxResults == 0;
+  },
+
+  /**
+   * WARNING TO ADDON AUTHORS: DO NOT USE THIS METHOD. IT"S LIKELY TO BE REMOVED IN A
+   * FUTURE RELEASE.
+   *
+   * Helpers for consumers of editBookmarkOverlay which don't have a node as their input.
+   * Given a partial node-like object, having at least the itemId property set, this
+   * method completes the rest of the properties necessary for initialising the edit
+   * overlay with it.
+   *
+   * @param aNodeLike
+   *        an object having at least the itemId nsINavHistoryResultNode property set,
+   *        along with any other properties available.
+   */
+  completeNodeLikeObjectForItemId(aNodeLike) {
+    if (this.useAsyncTransactions) {
+      // When async-transactions are enabled, node-likes must have
+      // bookmarkGuid set, and we cannot set it synchronously.
+      throw new Error("completeNodeLikeObjectForItemId cannot be used when " +
+                      "async transactions are enabled");
+    }
+    if (!("itemId" in aNodeLike))
+      throw new Error("itemId missing in aNodeLike");
+
+    let itemId = aNodeLike.itemId;
+    let defGetter = XPCOMUtils.defineLazyGetter.bind(XPCOMUtils, aNodeLike);
+
+    if (!("title" in aNodeLike))
+      defGetter("title", () => PlacesUtils.bookmarks.getItemTitle(itemId));
+
+    if (!("uri" in aNodeLike)) {
+      defGetter("uri", () => {
+        let uri = null;
+        try {
+          uri = PlacesUtils.bookmarks.getBookmarkURI(itemId);
+        }
+        catch(ex) { }
+        return uri ? uri.spec : "";
+      });
+    }
+
+    if (!("type" in aNodeLike)) {
+      defGetter("type", () => {
+        if (aNodeLike.uri.length > 0) {
+          if (/^place:/.test(aNodeLike.uri)) {
+            if (this.isFolderShortcutQueryString(aNodeLike.uri))
+              return Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT;
+
+            return Ci.nsINavHistoryResultNode.RESULT_TYPE_QUERY;
+          }
+
+          return Ci.nsINavHistoryResultNode.RESULT_TYPE_URI;
+        }
+
+        let itemType = PlacesUtils.bookmarks.getItemType(itemId);
+        if (itemType == PlacesUtils.bookmarks.TYPE_FOLDER)
+          return Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER;
+
+        throw new Error("Unexpected item type");
+      });
+    }
+  },
+
+  /**
+   * Helpers for consumers of editBookmarkOverlay which don't have a node as their input.
+   *
+   * Given a bookmark object for either a url bookmark or a folder, returned by
+   * Bookmarks.fetch (see Bookmark.jsm), this creates a node-like object suitable for
+   * initialising the edit overlay with it.
+   *
+   * @param aFetchInfo
+   *        a bookmark object returned by Bookmarks.fetch.
+   * @return a node-like object suitable for initialising editBookmarkOverlay.
+   * @throws if aFetchInfo is representing a separator.
+   */
+  promiseNodeLikeFromFetchInfo: Task.async(function* (aFetchInfo) {
+    if (aFetchInfo.itemType == PlacesUtils.bookmarks.TYPE_SEPARATOR)
+      throw new Error("promiseNodeLike doesn't support separators");
+
+    return Object.freeze({
+      itemId: yield PlacesUtils.promiseItemId(aFetchInfo.guid),
+      bookmarkGuid: aFetchInfo.guid,
+      title: aFetchInfo.title,
+      uri: aFetchInfo.url !== undefined ? aFetchInfo.url.href : "",
+
+      get type() {
+        if (aFetchInfo.itemType == PlacesUtils.bookmarks.TYPE_FOLDER)
+          return Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER;
+
+        if (this.uri.length == 0)
+          throw new Error("Unexpected item type");
+
+        if (/^place:/.test(this.uri)) {
+          if (this.isFolderShortcutQueryString(this.uri))
+            return Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT;
+
+          return Ci.nsINavHistoryResultNode.RESULT_TYPE_QUERY;
+        }
+
+        return Ci.nsINavHistoryResultNode.RESULT_TYPE_URI;
+      }
+    });
+  }),
+
+  /**
+   * Shortcut for calling promiseNodeLikeFromFetchInfo on the result of
+   * Bookmarks.fetch for the given guid/info object.
+   *
+   * @see promiseNodeLikeFromFetchInfo above and Bookmarks.fetch in Bookmarks.jsm.
+   */
+  fetchNodeLike: Task.async(function* (aGuidOrInfo) {
+    let info = yield PlacesUtils.bookmarks.fetch(aGuidOrInfo);
+    if (!info)
+      return null;
+    return (yield this.promiseNodeLikeFromFetchInfo(info));
+  })
 };
 
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/browser/browser_bookmarksProperties.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/browser/browser_bookmarksProperties.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/browser/browser_bookmarksProperties.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/browser/browser_bookmarksProperties.js	2015-04-24 19:30:55.000000000 +0000
@@ -113,8 +113,7 @@
 
   run: function() {
     // Check that the dialog is read-only.
-    ok(this.window.BookmarkPropertiesPanel._readOnly, "Dialog is read-only");
-
+    ok(this.window.gEditItemOverlay.readOnly, "Dialog is read-only");
     // Check that accept button is disabled
     var acceptButton = this.window.document.documentElement.getButton("accept");
     ok(acceptButton.disabled, "Accept button is disabled");
@@ -126,7 +125,7 @@
        PlacesUtils.bookmarks.getItemTitle(PlacesUtils.unfiledBookmarksFolderId),
        "Node title is correct");
     // Blur the field and ensure root's name has not been changed.
-    this.window.gEditItemOverlay.onNamePickerBlur();
+    this.window.gEditItemOverlay._namePicker.blur();
     is(namepicker.value,
        PlacesUtils.bookmarks.getItemTitle(PlacesUtils.unfiledBookmarksFolderId),
        "Root title is correct");
@@ -149,7 +148,6 @@
 
 //------------------------------------------------------------------------------
 // Bug 462662 - Pressing Enter to select tag from autocomplete closes bookmarks properties dialog
-
 gTests.push({
   desc: "Bug 462662 - Pressing Enter to select tag from autocomplete closes bookmarks properties dialog",
   sidebar: SIDEBAR_BOOKMARKS_ID,
@@ -226,9 +224,11 @@
 
     // Open tags autocomplete popup.
     info("About to focus the tagsField");
-    tagsField.focus();
-    tagsField.value = "";
-    EventUtils.synthesizeKey("t", {}, this.window);
+    executeSoon(() => {
+                  tagsField.focus();
+                  tagsField.value = "";
+                  EventUtils.synthesizeKey("t", {}, this.window);
+                });
   },
 
   finish: function() {
@@ -247,9 +247,10 @@
   }
 });
 
+
 //------------------------------------------------------------------------------
 // Bug 475529 -  Add button in new folder dialog not default anymore
-
+/*
 gTests.push({
   desc: "Bug 475529 - Add button in new folder dialog not default anymore",
   sidebar: SIDEBAR_BOOKMARKS_ID,
@@ -271,7 +272,7 @@
   },
 
   run: function() {
-    this._itemId = this.window.gEditItemOverlay._itemId;
+    this._itemId = this.window.gEditItemOverlay._paneInfo.itemId;
     // Change folder name
     var namePicker = this.window.document.getElementById("editBMPanel_namePicker");
     var self = this;
@@ -283,9 +284,9 @@
       });
     }, false);
 
-    namePicker.value = "n";
     info("About to focus the namePicker field");
     namePicker.focus();
+    EventUtils.synthesizeKey("n", {}, this.window);
     EventUtils.synthesizeKey("VK_RETURN", {}, this.window);
   },
 
@@ -304,6 +305,7 @@
     PlacesUtils.bookmarks.removeItem(this._itemId);
   }
 });
+*/
 
 //------------------------------------------------------------------------------
 // Bug 476020 - Pressing Esc while having the tag autocomplete open closes the bookmarks panel
@@ -562,7 +564,7 @@
         // Windows has been loaded, execute our test now.
         executeSoon(function () {
           // Ensure overlay is loaded
-          ok(win.gEditItemOverlay._initialized, "EditItemOverlay is initialized");
+          ok(win.gEditItemOverlay.initialized, "EditItemOverlay is initialized");
           gCurrentTest.window = win;
           try {
             gCurrentTest.run();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/browser/browser_library_panel_leak.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/browser/browser_library_panel_leak.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/browser/browser_library_panel_leak.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/browser/browser_library_panel_leak.js	2015-04-24 19:30:55.000000000 +0000
@@ -25,7 +25,7 @@
     isnot(organizer.PlacesOrganizer, null, "Sanity check: PlacesOrganizer should exist");
     isnot(organizer.gEditItemOverlay, null, "Sanity check: gEditItemOverlay should exist");
 
-    ok(organizer.gEditItemOverlay._initialized, "gEditItemOverlay is initialized");
+    ok(organizer.gEditItemOverlay.initialized, "gEditItemOverlay is initialized");
     isnot(organizer.gEditItemOverlay.itemId, -1, "Editing a bookmark");
 
     // Select History in the left pane.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/chrome/test_bug427633_no_newfolder_if_noip.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/chrome/test_bug427633_no_newfolder_if_noip.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/chrome/test_bug427633_no_newfolder_if_noip.xul	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/chrome/test_bug427633_no_newfolder_if_noip.xul	2015-04-24 19:30:55.000000000 +0000
@@ -56,9 +56,9 @@
 
         // Init panel.
         ok(gEditItemOverlay, "gEditItemOverlay is in context");
-        let itemId = yield PlacesUtils.promiseItemId(bm.guid);
-        gEditItemOverlay.initPanel(itemId);
-        ok(gEditItemOverlay._initialized, "gEditItemOverlay is initialized");
+        let node = yield PlacesUIUtils.promiseNodeLikeFromFetchInfo(bm);
+        gEditItemOverlay.initPanel({ node });
+        ok(gEditItemOverlay.initialized, "gEditItemOverlay is initialized");
 
         let tree = gEditItemOverlay._element("folderTree");
         yield openFolderTree(tree);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/chrome/test_bug485100-change-case-loses-tag.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/chrome/test_bug485100-change-case-loses-tag.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/chrome/test_bug485100-change-case-loses-tag.xul	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/chrome/test_bug485100-change-case-loses-tag.xul	2015-04-24 19:30:55.000000000 +0000
@@ -55,19 +55,19 @@
 
         // Init panel
         ok(gEditItemOverlay, "gEditItemOverlay is in context");
-        let itemId = yield PlacesUtils.promiseItemId(bm.guid);
-        gEditItemOverlay.initPanel(itemId);
+        let node = yield PlacesUIUtils.promiseNodeLikeFromFetchInfo(bm);
+        gEditItemOverlay.initPanel({ node });
 
         // add a tag
         document.getElementById("editBMPanel_tagsField").value = testTag;
-        gEditItemOverlay.onTagsFieldBlur();
+        gEditItemOverlay.onTagsFieldChange();
 
         // test that the tag has been added in the backend
         is(PlacesUtils.tagging.getTagsForURI(testURI)[0], testTag, "tags match");
 
         // change the tag
         document.getElementById("editBMPanel_tagsField").value = testTagUpper;
-        gEditItemOverlay.onTagsFieldBlur();
+        gEditItemOverlay.onTagsFieldChange();
 
         // test that the tag has been added in the backend
         is(PlacesUtils.tagging.getTagsForURI(testURI)[0], testTagUpper, "tags match");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/chrome/test_bug631374_tags_selector_scroll.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/chrome/test_bug631374_tags_selector_scroll.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/chrome/test_bug631374_tags_selector_scroll.xul	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/chrome/test_bug631374_tags_selector_scroll.xul	2015-04-24 19:30:55.000000000 +0000
@@ -73,9 +73,9 @@
 
         // Init panel.
         ok(gEditItemOverlay, "gEditItemOverlay is in context");
-        let id1 = yield PlacesUtils.promiseItemId(bm1.guid);
-        gEditItemOverlay.initPanel(id1);
-        ok(gEditItemOverlay._initialized, "gEditItemOverlay is initialized");
+        let node1 = yield PlacesUIUtils.promiseNodeLikeFromFetchInfo(bm1);
+        gEditItemOverlay.initPanel({ node: node1 });
+        ok(gEditItemOverlay.initialized, "gEditItemOverlay is initialized");
 
         yield openTagSelector();
         let tagsSelector = document.getElementById("editBMPanel_tagsSelector");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/chrome/test_editBookmarkOverlay_tags_liveUpdate.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/chrome/test_editBookmarkOverlay_tags_liveUpdate.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/places/tests/chrome/test_editBookmarkOverlay_tags_liveUpdate.xul	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/places/tests/chrome/test_editBookmarkOverlay_tags_liveUpdate.xul	2015-04-24 19:30:55.000000000 +0000
@@ -75,8 +75,8 @@
         });
 
         // Init panel.
-        itemId = yield PlacesUtils.promiseItemId(bm.guid);
-        gEditItemOverlay.initPanel(itemId);
+        let node = yield PlacesUIUtils.promiseNodeLikeFromFetchInfo(bm);
+        gEditItemOverlay.initPanel({ node });
 
         // Add a tag.
         PlacesUtils.tagging.tagURI(TEST_URI, [TEST_TAG]);
@@ -104,11 +104,10 @@
           url: TEST_URI2.spec
         });
 
-        // Init panel with multiple bookmarks.
-        itemId2 = yield PlacesUtils.promiseItemId(bm2.guid);
-        gEditItemOverlay.initPanel([itemId, itemId2]);
+        // Init panel with multiple uris.
+        gEditItemOverlay.initPanel({ uris: [TEST_URI, TEST_URI2] });
 
-        // Add a tag to the first bookmark.
+        // Add a tag to the first uri.
         PlacesUtils.tagging.tagURI(TEST_URI, [TEST_TAG]);
         is(PlacesUtils.tagging.getTagsForURI(TEST_URI)[0], TEST_TAG,
            "Correctly added a tag to the first bookmark.");
@@ -116,7 +115,7 @@
            "Editing multiple bookmarks without matching tags should not show any tag.");
         checkTagsSelector([TEST_TAG], []);
 
-        // Add a tag to the second bookmark.
+        // Add a tag to the second uri.
         PlacesUtils.tagging.tagURI(TEST_URI2, [TEST_TAG]);
         is(PlacesUtils.tagging.getTagsForURI(TEST_URI2)[0], TEST_TAG,
            "Correctly added a tag to the second bookmark.");
@@ -141,7 +140,7 @@
         checkTagsSelector([], []);
 
         // Init panel with a nsIURI entry.
-        gEditItemOverlay.initPanel(TEST_URI);
+        gEditItemOverlay.initPanel({ uris: [TEST_URI] });
 
         // Add a tag.
         PlacesUtils.tagging.tagURI(TEST_URI, [TEST_TAG]);
@@ -160,7 +159,7 @@
         checkTagsSelector([], []);
 
         // Init panel with multiple nsIURI entries.
-        gEditItemOverlay.initPanel([TEST_URI, TEST_URI2]);
+        gEditItemOverlay.initPanel({ uris: [TEST_URI, TEST_URI2] });
 
         // Add a tag to the first entry.
         PlacesUtils.tagging.tagURI(TEST_URI, [TEST_TAG]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/advanced.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/advanced.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/advanced.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/advanced.js	2015-04-24 19:30:55.000000000 +0000
@@ -625,22 +625,10 @@
   {
     var enabledPref = document.getElementById("app.update.enabled");
     var autoPref = document.getElementById("app.update.auto");
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-    var metroEnabledPref = document.getElementById("app.update.metro.enabled");
-#endif
-#endif
     var radiogroup = document.getElementById("updateRadioGroup");
 
     if (!enabledPref.value)   // Don't care for autoPref.value in this case.
       radiogroup.value="manual";    // 3. Never check for updates.
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-    // enabledPref.value && autoPref.value && metroEnabledPref.value
-    else if (metroEnabledPref.value && this._showingWin8Prefs)
-      radiogroup.value="autoMetro"; // 0. Automatically install updates for both Metro and Desktop
-#endif
-#endif
     else if (autoPref.value)  // enabledPref.value && autoPref.value
       radiogroup.value="auto";      // 1. Automatically install updates for Desktop only
     else                      // enabledPref.value && !autoPref.value
@@ -659,14 +647,6 @@
     // the warnIncompatible checkbox value is set by readAddonWarn
     warnIncompatible.disabled = radiogroup.disabled || modePref.locked ||
                                 !enabledPref.value || !autoPref.value;
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-    if (this._showingWin8Prefs) {
-      warnIncompatible.disabled |= metroEnabledPref.value;
-      warnIncompatible.checked |= metroEnabledPref.value;
-    }
-#endif
-#endif
 
 #ifdef MOZ_MAINTENANCE_SERVICE
     // Check to see if the maintenance service is installed.
@@ -715,31 +695,12 @@
     var enabledPref = document.getElementById("app.update.enabled");
     var autoPref = document.getElementById("app.update.auto");
     var modePref = document.getElementById("app.update.mode");
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-    var metroEnabledPref = document.getElementById("app.update.metro.enabled");
-    // Initialize the pref to false only if we're showing the option
-    if (this._showingWin8Prefs) {
-      metroEnabledPref.value = false;
-    }
-#endif
-#endif
     var radiogroup = document.getElementById("updateRadioGroup");
     switch (radiogroup.value) {
       case "auto":      // 1. Automatically install updates for Desktop only
         enabledPref.value = true;
         autoPref.value = true;
         break;
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-      case "autoMetro": // 0. Automatically install updates for both Metro and Desktop
-        enabledPref.value = true;
-        autoPref.value = true;
-        metroEnabledPref.value = true;
-        modePref.value = 1;
-        break;
-#endif
-#endif
       case "checkOnly": // 2. Check, but let me choose
         enabledPref.value = true;
         autoPref.value = false;
@@ -753,15 +714,6 @@
     warnIncompatible.disabled = enabledPref.locked || !enabledPref.value ||
                                 autoPref.locked || !autoPref.value ||
                                 modePref.locked;
-
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-    if (this._showingWin8Prefs) {
-      warnIncompatible.disabled |= metroEnabledPref.value;
-      warnIncompatible.checked |= metroEnabledPref.value;
-    }
-#endif
-#endif
   },
 
   /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/advanced.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/advanced.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/advanced.xul	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/advanced.xul	2015-04-24 19:30:55.000000000 +0000
@@ -61,11 +61,6 @@
 #ifdef MOZ_UPDATER
       <preference id="app.update.enabled"              name="app.update.enabled"              type="bool"/>
       <preference id="app.update.auto"                 name="app.update.auto"                 type="bool"/>
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-      <preference id="app.update.metro.enabled"        name="app.update.metro.enabled"        type="bool"/>
-#endif
-#endif
       <preference id="app.update.mode"                 name="app.update.mode"                 type="int"/>
 
       <preference id="app.update.disable_button.showUpdateHistory"
@@ -310,18 +305,6 @@
             <caption label="&updateApp.label;"/>
             <radiogroup id="updateRadioGroup"
                         oncommand="gAdvancedPane.updateWritePrefs();">
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-              <radio id="autoMetro"
-                     value="autoMetro"
-                     label="&updateAutoMetro.label;"
-                     accesskey="&updateAutoMetro.accesskey;"/>
-              <hbox id="autoMetroIndent"
-                    class="indent">
-                <label value="&updateAutoMetroWarn.label;"/>
-              </hbox>
-#endif
-#endif
               <radio id="autoDesktop"
                      value="auto"
                      label="&updateAuto1.label;"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/in-content/advanced.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/in-content/advanced.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/in-content/advanced.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/in-content/advanced.js	2015-04-24 19:30:55.000000000 +0000
@@ -663,22 +663,10 @@
   {
     var enabledPref = document.getElementById("app.update.enabled");
     var autoPref = document.getElementById("app.update.auto");
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-    var metroEnabledPref = document.getElementById("app.update.metro.enabled");
-#endif
-#endif
     var radiogroup = document.getElementById("updateRadioGroup");
 
     if (!enabledPref.value)   // Don't care for autoPref.value in this case.
       radiogroup.value="manual";    // 3. Never check for updates.
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-    // enabledPref.value && autoPref.value && metroEnabledPref.value
-    else if (metroEnabledPref.value && this._showingWin8Prefs)
-      radiogroup.value="autoMetro"; // 0. Automatically install updates
-#endif
-#endif
     else if (autoPref.value)  // enabledPref.value && autoPref.value
       radiogroup.value="auto";      // 1. Automatically install updates
     else                      // enabledPref.value && !autoPref.value
@@ -697,14 +685,6 @@
     // the warnIncompatible checkbox value is set by readAddonWarn
     warnIncompatible.disabled = radiogroup.disabled || modePref.locked ||
                                 !enabledPref.value || !autoPref.value;
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-    if (this._showingWin8Prefs) {
-      warnIncompatible.disabled |= metroEnabledPref.value;
-      warnIncompatible.checked |= metroEnabledPref.value;
-    }
-#endif
-#endif
 
 #ifdef MOZ_MAINTENANCE_SERVICE
     // Check to see if the maintenance service is installed.
@@ -735,31 +715,12 @@
     var enabledPref = document.getElementById("app.update.enabled");
     var autoPref = document.getElementById("app.update.auto");
     var modePref = document.getElementById("app.update.mode");
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-    var metroEnabledPref = document.getElementById("app.update.metro.enabled");
-    // Initialize the pref to false only if we're showing the option
-    if (this._showingWin8Prefs) {
-      metroEnabledPref.value = false;
-    }
-#endif
-#endif
     var radiogroup = document.getElementById("updateRadioGroup");
     switch (radiogroup.value) {
       case "auto":      // 1. Automatically install updates for Desktop only
         enabledPref.value = true;
         autoPref.value = true;
         break;
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-      case "autoMetro": // 0. Automatically install updates for both Metro and Desktop
-        enabledPref.value = true;
-        autoPref.value = true;
-        metroEnabledPref.value = true;
-        modePref.value = 1;
-        break;
-#endif
-#endif
       case "checkOnly": // 2. Check, but let me choose
         enabledPref.value = true;
         autoPref.value = false;
@@ -773,14 +734,6 @@
     warnIncompatible.disabled = enabledPref.locked || !enabledPref.value ||
                                 autoPref.locked || !autoPref.value ||
                                 modePref.locked;
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-    if (this._showingWin8Prefs) {
-      warnIncompatible.disabled |= metroEnabledPref.value;
-      warnIncompatible.checked |= metroEnabledPref.value;
-    }
-#endif
-#endif
   },
 
   /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/in-content/advanced.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/in-content/advanced.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/in-content/advanced.xul	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/in-content/advanced.xul	2015-04-24 19:30:55.000000000 +0000
@@ -70,13 +70,6 @@
   <preference id="app.update.auto"
               name="app.update.auto"
               type="bool"/>
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-  <preference id="app.update.metro.enabled"
-              name="app.update.metro.enabled"
-              type="bool"/>
-#endif
-#endif
   <preference id="app.update.mode"
               name="app.update.mode"
               type="int"/>
@@ -329,18 +322,6 @@
       <groupbox id="updateApp" align="start">
         <caption><label>&updateApp.label;</label></caption>
         <radiogroup id="updateRadioGroup" align="start">
-#ifdef XP_WIN
-#ifdef MOZ_METRO
-              <radio id="autoMetro"
-                     value="autoMetro"
-                     label="&updateAutoMetro.label;"
-                     accesskey="&updateAutoMetro.accesskey;"/>
-              <hbox id="autoMetroIndent"
-                    class="indent">
-                <label>&updateAutoMetroWarn.label;</label>
-              </hbox>
-#endif
-#endif
           <radio id="autoDesktop"
                  value="auto"
                  label="&updateAuto1.label;"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/in-content/main.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/in-content/main.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/in-content/main.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/in-content/main.js	2015-04-24 19:30:55.000000000 +0000
@@ -27,31 +27,6 @@
     // in case the default changes.  On other Windows OS's defaults can also
     // be set while the prefs are open.
     window.setInterval(this.updateSetDefaultBrowser, 1000);
-
-#ifdef MOZ_METRO
-    // Pre Windows 8, we should hide the update related settings
-    // for the Metro browser
-    let version = Components.classes["@mozilla.org/system-info;1"].
-                  getService(Components.interfaces.nsIPropertyBag2).
-                  getProperty("version");
-    let preWin8 = parseFloat(version) < 6.2;
-    this._showingWin8Prefs = !preWin8;
-    if (preWin8) {
-      ["autoMetro", "autoMetroIndent"].forEach(
-        function(id) document.getElementById(id).collapsed = true
-      );
-    } else {
-      let brandShortName =
-        document.getElementById("bundleBrand").getString("brandShortName");
-      let bundlePrefs = document.getElementById("bundlePreferences");
-      let autoDesktop = document.getElementById("autoDesktop");
-      autoDesktop.label =
-        bundlePrefs.getFormattedString("updateAutoDesktop.label",
-                                       [brandShortName]);
-      autoDesktop.accessKey =
-        bundlePrefs.getString("updateAutoDesktop.accessKey");
-    }
-#endif
 #endif
 #endif
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/in-content/sync.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/in-content/sync.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/in-content/sync.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/in-content/sync.js	2015-04-24 19:30:55.000000000 +0000
@@ -573,8 +573,12 @@
   },
 
   manageFirefoxAccount: function() {
-    let url = Services.prefs.getCharPref("identity.fxaccounts.settings.uri");
-    this.openContentInBrowser(url);
+    fxAccounts.promiseAccountsManageURI()
+      .then(url => {
+        this.openContentInBrowser(url, {
+          replaceQueryString: true
+        });
+      });
   },
 
   verifyFirefoxAccount: function() {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/main.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/main.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/main.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/main.js	2015-04-24 19:30:55.000000000 +0000
@@ -26,31 +26,6 @@
     // in case the default changes.  On other Windows OS's defaults can also
     // be set while the prefs are open.
     window.setInterval(this.updateSetDefaultBrowser, 1000);
-
-#ifdef MOZ_METRO
-    // Pre Windows 8, we should hide the update related settings
-    // for the Metro browser
-    let version = Components.classes["@mozilla.org/system-info;1"].
-                  getService(Components.interfaces.nsIPropertyBag2).
-                  getProperty("version");
-    let preWin8 = parseFloat(version) < 6.2;
-    this._showingWin8Prefs = !preWin8;
-    if (preWin8) {
-      ["autoMetro", "autoMetroIndent"].forEach(
-        function(id) document.getElementById(id).collapsed = true
-      );
-    } else {
-      let brandShortName =
-        document.getElementById("bundleBrand").getString("brandShortName");
-      let bundlePrefs = document.getElementById("bundlePreferences");
-      let autoDesktop = document.getElementById("autoDesktop");
-      autoDesktop.label =
-        bundlePrefs.getFormattedString("updateAutoDesktop.label",
-                                       [brandShortName]);
-      autoDesktop.accessKey =
-        bundlePrefs.getString("updateAutoDesktop.accessKey");
-    }
-#endif
 #endif
 #endif
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/sync.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/sync.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/preferences/sync.js	2015-04-22 13:05:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/preferences/sync.js	2015-04-24 19:30:55.000000000 +0000
@@ -405,8 +405,12 @@
   },
 
   manageFirefoxAccount: function() {
-    let url = Services.prefs.getCharPref("identity.fxaccounts.settings.uri");
-    this.openContentInBrowser(url);
+    fxAccounts.promiseAccountsManageURI()
+      .then(url => {
+        this.openContentInBrowser(url, {
+          replaceQueryString: true
+        });
+      });
   },
 
   verifyFirefoxAccount: function() {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/safebrowsing/content/test/browser_bug400731.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/safebrowsing/content/test/browser_bug400731.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/safebrowsing/content/test/browser_bug400731.js	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/safebrowsing/content/test/browser_bug400731.js	2015-04-24 19:30:55.000000000 +0000
@@ -34,6 +34,25 @@
   var style = content.getComputedStyle(el, null);
   is(style.display, "inline-block", "Ignore Warning button should be display:inline-block for malware");
   
+  // Now launch the unwanted software test
+  window.addEventListener("DOMContentLoaded", testUnwanted, true);
+  content.location = "http://www.itisatrap.org/firefox/unwanted.html";
+}
+
+function testUnwanted(event) {
+  if (event.target != gBrowser.selectedBrowser.contentDocument) {
+    return;
+  }
+
+  window.removeEventListener("DOMContentLoaded", testUnwanted, true);
+
+  // Confirm that "Ignore this warning" is visible - bug 422410
+  var el = content.document.getElementById("ignoreWarningButton");
+  ok(el, "Ignore warning button should be present for unwanted software");
+
+  var style = content.getComputedStyle(el, null);
+  is(style.display, "inline-block", "Ignore Warning button should be display:inline-block for unwanted software");
+
   // Now launch the phishing test
   window.addEventListener("DOMContentLoaded", testPhishing, true);
   content.location = "http://www.itisatrap.org/firefox/its-a-trap.html";
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/safebrowsing/content/test/head.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/safebrowsing/content/test/head.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/safebrowsing/content/test/head.js	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/safebrowsing/content/test/head.js	2015-04-24 19:30:55.000000000 +0000
@@ -1,5 +1,5 @@
 // Force SafeBrowsing to be initialized for the tests
-Services.prefs.setCharPref("urlclassifier.malwareTable", "test-malware-simple");
+Services.prefs.setCharPref("urlclassifier.malwareTable", "test-malware-simple,test-unwanted-simple");
 Services.prefs.setCharPref("urlclassifier.phishTable", "test-phish-simple");
 SafeBrowsing.init();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/selfsupport/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/selfsupport/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/selfsupport/moz.build	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/selfsupport/moz.build	2015-04-24 19:30:55.000000000 +0000
@@ -8,3 +8,7 @@
     'SelfSupportService.js',
     'SelfSupportService.manifest',
 ]
+
+BROWSER_CHROME_MANIFESTS += [
+    'test/browser.ini',
+]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/selfsupport/SelfSupportService.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/selfsupport/SelfSupportService.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/selfsupport/SelfSupportService.js	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/selfsupport/SelfSupportService.js	2015-04-24 19:30:55.000000000 +0000
@@ -7,6 +7,7 @@
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 
 const policy = Cc["@mozilla.org/datareporting/service;1"]
                  .getService(Ci.nsISupports)
@@ -63,6 +64,10 @@
       }
     }.bind(this));
   },
+
+  resetPref: function(name) {
+    Services.prefs.clearUserPref(name);
+  },
 }
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([MozSelfSupportInterface]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/selfsupport/test/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/selfsupport/test/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/selfsupport/test/browser.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/selfsupport/test/browser.ini	2015-04-24 19:30:55.000000000 +0000
@@ -0,0 +1,3 @@
+[DEFAULT]
+
+[browser_selfsupportAPI.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/selfsupport/test/browser_selfsupportAPI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/selfsupport/test/browser_selfsupportAPI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/selfsupport/test/browser_selfsupportAPI.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/selfsupport/test/browser_selfsupportAPI.js	2015-04-24 19:30:55.000000000 +0000
@@ -0,0 +1,47 @@
+Cu.import("resource://gre/modules/Preferences.jsm");
+
+function test() {
+  const prefNewName = "browser.newpref.fake";
+  Assert.ok(!Preferences.has(prefNewName), "pref should not exist");
+
+  const prefExistingName = "extensions.hotfix.id";
+  Assert.ok(Preferences.has(prefExistingName), "pref should exist");
+  Assert.ok(!Preferences.isSet(prefExistingName), "pref should not be user-set");
+  let prefExistingOriginalValue = Preferences.get(prefExistingName);
+
+  registerCleanupFunction(function() {
+    Preferences.set(prefExistingName, prefExistingOriginalValue);
+    Services.prefs.deleteBranch(prefNewName);
+  });
+
+  // 1. do nothing on an inexistent pref
+  MozSelfSupport.resetPref(prefNewName);
+  Assert.ok(!Preferences.has(prefNewName), "pref should still not exist");
+
+  // 2. creation of a new pref
+  Preferences.set(prefNewName, 10);
+  Assert.ok(Preferences.has(prefNewName), "pref should exist");
+  Assert.equal(Preferences.get(prefNewName), 10, "pref value should be 10");
+
+  MozSelfSupport.resetPref(prefNewName);
+  Assert.ok(!Preferences.has(prefNewName), "pref should not exist any more");
+
+  // 3. do nothing on an unchanged existing pref
+  MozSelfSupport.resetPref(prefExistingName);
+  Assert.ok(Preferences.has(prefExistingName), "pref should still exist");
+  Assert.equal(Preferences.get(prefExistingName), prefExistingOriginalValue, "pref value should be the same as original");
+
+  // 4. change the value of an existing pref
+  Preferences.set(prefExistingName, "anyone@mozilla.org");
+  Assert.ok(Preferences.has(prefExistingName), "pref should exist");
+  Assert.equal(Preferences.get(prefExistingName), "anyone@mozilla.org", "pref value should have changed");
+
+  MozSelfSupport.resetPref(prefExistingName);
+  Assert.ok(Preferences.has(prefExistingName), "pref should still exist");
+  Assert.equal(Preferences.get(prefExistingName), prefExistingOriginalValue, "pref value should be the same as original");
+
+  // 5. delete an existing pref
+  // deleteBranch is implemented in such a way that
+  // clearUserPref can't undo its action
+  // see discussion in bug 1075160
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/SessionFile.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/SessionFile.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/SessionFile.jsm	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/SessionFile.jsm	2015-04-24 19:30:55.000000000 +0000
@@ -55,6 +55,9 @@
 const PREF_UPGRADE_BACKUP = "browser.sessionstore.upgradeBackup.latestBuildID";
 const PREF_MAX_UPGRADE_BACKUPS = "browser.sessionstore.upgradeBackup.maxUpgradeBackups";
 
+const PREF_MAX_SERIALIZE_BACK = "browser.sessionstore.max_serialize_back";
+const PREF_MAX_SERIALIZE_FWD = "browser.sessionstore.max_serialize_forward";
+
 this.SessionFile = {
   /**
    * Read the contents of the session file, asynchronously.
@@ -256,11 +259,11 @@
 
     // Initialize the worker to let it handle backups and also
     // as a workaround for bug 964531.
-    SessionWorker.post("init", [
-      result.origin,
-      this.Paths,
-      Preferences.get(PREF_MAX_UPGRADE_BACKUPS, 3)
-    ]);
+    SessionWorker.post("init", [result.origin, this.Paths, {
+      maxUpgradeBackups: Preferences.get(PREF_MAX_UPGRADE_BACKUPS, 3),
+      maxSerializeBack: Preferences.get(PREF_MAX_SERIALIZE_BACK, 10),
+      maxSerializeForward: Preferences.get(PREF_MAX_SERIALIZE_FWD, -1)
+    }]);
 
     return result;
   }),
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/SessionHistory.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/SessionHistory.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/SessionHistory.jsm	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/SessionHistory.jsm	2015-04-24 19:30:55.000000000 +0000
@@ -70,53 +70,16 @@
     let history = webNavigation.sessionHistory.QueryInterface(Ci.nsISHistoryInternal);
 
     if (history && history.count > 0) {
-      let oldest;
-      let maxSerializeBack =
-        Services.prefs.getIntPref("browser.sessionstore.max_serialize_back");
-      if (maxSerializeBack >= 0) {
-        oldest = Math.max(0, history.index - maxSerializeBack);
-      } else { // History.getEntryAtIndex(0, ...) is the oldest.
-        oldest = 0;
-      }
-
-      let newest;
-      let maxSerializeFwd =
-        Services.prefs.getIntPref("browser.sessionstore.max_serialize_forward");
-      if (maxSerializeFwd >= 0) {
-        newest = Math.min(history.count - 1, history.index + maxSerializeFwd);
-      } else { // History.getEntryAtIndex(history.count - 1, ...) is the newest.
-        newest = history.count - 1;
-      }
-
       // Loop over the transaction linked list directly so we can get the
       // persist property for each transaction.
-      let txn = history.rootTransaction;
-      let i = 0;
-      while (txn && i < oldest) {
-        txn = txn.next;
-        i++;
-      }
-
-      while (txn && i <= newest) {
-        let shEntry = txn.sHEntry;
-        let entry = this.serializeEntry(shEntry, isPinned);
+      for (let txn = history.rootTransaction; txn; txn = txn.next) {
+        let entry = this.serializeEntry(txn.sHEntry, isPinned);
         entry.persist = txn.persist;
         data.entries.push(entry);
-        txn = txn.next;
-        i++;
-      }
-
-      if (i <= newest) {
-        // In some cases, there don't seem to be as many history entries as
-        // history.count claims. we'll save whatever history we can, print an
-        // error message, and still save sessionstore.js.
-        debug("SessionStore failed gathering complete history " +
-              "for the focused window/tab. See bug 669196.");
       }
 
-      // Set the one-based index of the currently active tab,
-      // ensuring it isn't out of bounds if an exception was thrown above.
-      data.index = Math.min(history.index - oldest + 1, data.entries.length);
+      // Ensure the index isn't out of bounds if an exception was thrown above.
+      data.index = Math.min(history.index + 1, data.entries.length);
     }
 
     // If either the session history isn't available yet or doesn't have any
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/SessionSaver.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/SessionSaver.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/SessionSaver.jsm	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/SessionSaver.jsm	2015-04-24 19:30:55.000000000 +0000
@@ -246,12 +246,7 @@
    * Write the given state object to disk.
    */
   _writeState: function (state) {
-    // Inform observers
-    notify(null, "sessionstore-state-write");
-
-    stopWatchStart("SERIALIZE_DATA_MS", "SERIALIZE_DATA_LONGEST_OP_MS", "WRITE_STATE_LONGEST_OP_MS");
-    let data = JSON.stringify(state);
-    stopWatchFinish("SERIALIZE_DATA_MS", "SERIALIZE_DATA_LONGEST_OP_MS");
+    stopWatchStart("WRITE_STATE_LONGEST_OP_MS");
 
     // We update the time stamp before writing so that we don't write again
     // too soon, if saving is requested before the write completes. Without
@@ -262,10 +257,9 @@
     // Write (atomically) to a session file, using a tmp file. Once the session
     // file is successfully updated, save the time stamp of the last save and
     // notify the observers.
-    stopWatchStart("SEND_SERIALIZED_STATE_LONGEST_OP_MS");
-    let promise = SessionFile.write(data);
-    stopWatchFinish("WRITE_STATE_LONGEST_OP_MS",
-                    "SEND_SERIALIZED_STATE_LONGEST_OP_MS");
+    let promise = SessionFile.write(state);
+    stopWatchFinish("WRITE_STATE_LONGEST_OP_MS");
+
     promise = promise.then(() => {
       this.updateLastSaveTime();
       notify(null, "sessionstore-state-write-complete");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/SessionWorker.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/SessionWorker.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/SessionWorker.js	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/SessionWorker.js	2015-04-24 19:30:55.000000000 +0000
@@ -88,15 +88,25 @@
    * @param {string} origin Which of sessionstore.js or its backups
    *   was used. One of the `STATE_*` constants defined above.
    * @param {object} paths The paths at which to find the various files.
-   * @param {number} maxUpgradeBackups The number of old upgrade backups that should be kept.
+   * @param {object} prefs The preferences the worker needs to known.
    */
-  init: function (origin, paths, maxUpgradeBackups) {
+  init(origin, paths, prefs = {}) {
     if (!(origin in paths || origin == STATE_EMPTY)) {
       throw new TypeError("Invalid origin: " + origin);
     }
+
+    // Check that all required preference values were passed.
+    for (let pref of ["maxUpgradeBackups", "maxSerializeBack", "maxSerializeForward"]) {
+      if (!prefs.hasOwnProperty(pref)) {
+        throw new TypeError(`Missing preference value for ${pref}`);
+      }
+    }
+
     this.state = origin;
     this.Paths = paths;
-    this.maxUpgradeBackups = maxUpgradeBackups || 3;
+    this.maxUpgradeBackups = prefs.maxUpgradeBackups;
+    this.maxSerializeBack = prefs.maxSerializeBack;
+    this.maxSerializeForward = prefs.maxSerializeForward;
     this.upgradeBackupNeeded = paths.nextUpgradeBackup != paths.upgradeBackup;
     return {result: true};
   },
@@ -106,7 +116,7 @@
    * Write the session to disk, performing any necessary backup
    * along the way.
    *
-   * @param {string} stateString The state to write to disk.
+   * @param {object} state The state to write to disk.
    * @param {object} options
    *  - performShutdownCleanup If |true|, we should
    *    perform shutdown-time cleanup to ensure that private data
@@ -114,10 +124,31 @@
    *  - isFinalWrite If |true|, write to Paths.clean instead of
    *    Paths.recovery
    */
-  write: function (stateString, options = {}) {
+  write: function (state, options = {}) {
     let exn;
     let telemetry = {};
 
+    // Cap the number of backward and forward shistory entries on shutdown.
+    if (options.isFinalWrite) {
+      for (let window of state.windows) {
+        for (let tab of window.tabs) {
+          let lower = 0;
+          let upper = tab.entries.length;
+
+          if (this.maxSerializeBack > -1) {
+            lower = Math.max(lower, tab.index - this.maxSerializeBack - 1);
+          }
+          if (this.maxSerializeForward > -1) {
+            upper = Math.min(upper, tab.index + this.maxSerializeForward);
+          }
+
+          tab.entries = tab.entries.slice(lower, upper);
+          tab.index -= lower;
+        }
+      }
+    }
+
+    let stateString = JSON.stringify(state);
     let data = Encoder.encode(stateString);
     let startWriteMs, stopWriteMs;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/browser_history_cap.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/browser_history_cap.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/browser_history_cap.js	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/browser_history_cap.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-/**
- * This test ensures that the preferences (added in bug 943339) that control how
- * many back and forward button session history entries we store work correctly.
- *
- * It adds a number of entries to the session history, restores them and checks
- * that the restored state matches the preferences.
- */
-
-add_task(function *test_history_cap() {
-  const baseURL = "http://example.com/browser_history_cap#"
-  const maxEntries  = 9; // The number of generated session history entries.
-  const middleEntry = 4; // The zero-based index of the middle entry.
-
-  const maxBack1 = 2; // The history cap settings used for the first test,
-  const maxFwd1 = 3;  // where maxBack1 + 1 + maxFwd1 < maxEntries.
-
-  const maxBack2 = 5; // The history cap settings used for the other tests, 
-  const maxFwd2 = 5;  // where maxBack2 + 1 + maxFwd2 > maxEntries.
-
-  // Set the relevant preferences for the first test.
-  gPrefService.setIntPref("browser.sessionhistory.max_entries", maxEntries);
-  gPrefService.setIntPref("browser.sessionstore.max_serialize_back", maxBack1);
-  gPrefService.setIntPref("browser.sessionstore.max_serialize_forward", maxFwd1);
-
-  // Make sure the settings we modify are reset afterward.
-  registerCleanupFunction(() => {
-    gPrefService.clearUserPref("browser.sessionhistory.max_entries");
-    gPrefService.clearUserPref("browser.sessionstore.max_serialize_back");
-    gPrefService.clearUserPref("browser.sessionstore.max_serialize_forward");
-  });
-
-  let tab = gBrowser.addTab();
-  let browser = tab.linkedBrowser;
-  yield promiseBrowserLoaded(browser);
-
-  // Generate the tab state entries and set the one-based
-  // tab-state index to the middle session history entry.
-  let tabState = {entries: [], index: middleEntry + 1};
-  for (let i = 0; i < maxEntries; i++) {
-    tabState.entries.push({url: baseURL + i});
-  }
-
-  info("Testing situation where only a subset of session history entries should be restored.");
-
-  yield promiseTabState(tab, tabState);
-  TabState.flush(tab.linkedBrowser);
-
-  let restoredTabState = JSON.parse(ss.getTabState(tab));
-  is(restoredTabState.entries.length, maxBack1 + 1 + maxFwd1,
-    "The expected number of session history entries was restored.");
-  is(restoredTabState.index, maxBack1 + 1, "The restored tab-state index is correct");
-
-  let indexURLOffset = middleEntry - (restoredTabState.index - 1);
-  for (let i = 0; i < restoredTabState.entries.length; i++) {
-    is(restoredTabState.entries[i].url, baseURL + (i + indexURLOffset),
-        "URL of restored entry matches the expected URL.");
-  }
-
-  // Set the relevant preferences for the other tests.
-  gPrefService.setIntPref("browser.sessionstore.max_serialize_back", maxBack2);
-  gPrefService.setIntPref("browser.sessionstore.max_serialize_forward", maxFwd2);
-
-  info("Testing situation where all of the entries in the session history should be restored.");
-
-  yield promiseTabState(tab, tabState);
-  TabState.flush(tab.linkedBrowser);
-
-  restoredTabState = JSON.parse(ss.getTabState(tab));
-  is(restoredTabState.entries.length, maxEntries,
-    "The expected number of session history entries was restored.");
-  is(restoredTabState.index, middleEntry + 1, "The restored tab-state index is correct");
-
-  for (let i = middleEntry - 2; i <= middleEntry + 2; i++) {
-    is(restoredTabState.entries[i].url, baseURL + i,
-        "URL of restored entry matches the expected URL.");
-  }
-
-  info("Testing situation where only the 1 + maxFwd2 oldest entries should be restored.");
-
-  // Set the one-based tab-state index to the oldest session history entry.
-  tabState.index = 1;
-
-  yield promiseTabState(tab, tabState);
-  TabState.flush(tab.linkedBrowser);
-
-  restoredTabState = JSON.parse(ss.getTabState(tab));
-  is(restoredTabState.entries.length, 1 + maxFwd2,
-    "The expected number of session history entries was restored.");
-  is(restoredTabState.index, 1, "The restored tab-state index is correct");
-
-  for (let i = 0; i <= 2; i++) {
-    is(restoredTabState.entries[i].url, baseURL + i,
-        "URL of restored entry matches the expected URL.");
-  }
-
-  info("Testing situation where only the maxBack2 + 1 newest entries should be restored.");
-
-  // Set the one-based tab-state index to the newest session history entry.
-  tabState.index = maxEntries;
-
-  yield promiseTabState(tab, tabState);
-  TabState.flush(tab.linkedBrowser);
-
-  restoredTabState = JSON.parse(ss.getTabState(tab));
-  is(restoredTabState.entries.length, maxBack2 + 1,
-    "The expected number of session history entries was restored.");
-  is(restoredTabState.index, maxBack2 + 1, "The restored tab-state index is correct");
-
-  indexURLOffset = (maxEntries - 1) - maxBack2;
-  for (let i = maxBack2 - 2; i <= maxBack2; i++) {
-    is(restoredTabState.entries[i].url, baseURL + (i + indexURLOffset),
-        "URL of restored entry matches the expected URL.");
-  }
-
-  gBrowser.removeTab(tab);
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/browser.ini	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/browser.ini	2015-04-24 19:30:55.000000000 +0000
@@ -83,7 +83,6 @@
 [browser_frametree.js]
 [browser_frame_history.js]
 [browser_global_store.js]
-[browser_history_cap.js]
 [browser_history_persist.js]
 [browser_label_and_icon.js]
 [browser_merge_closed_tabs.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/head.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/head.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/head.js	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/head.js	2015-04-24 19:30:55.000000000 +0000
@@ -239,7 +239,7 @@
  * Wait until session restore has finished collecting its data and is
  * has written that data ("sessionstore-state-write-complete").
  *
- * @param {function} aCallback If sessionstore-state-write is sent
+ * @param {function} aCallback If sessionstore-state-write-complete is sent
  * within buffering interval + 100 ms, the callback is passed |true|,
  * otherwise, it is passed |false|.
  */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/unit/test_backup_once.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/unit/test_backup_once.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/unit/test_backup_once.js	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/unit/test_backup_once.js	2015-04-24 19:30:55.000000000 +0000
@@ -79,24 +79,27 @@
   return Task.spawn(function*() {
     do_print("Checking whether " + path + " has the right contents");
     let actual = yield OS.File.read(path, { encoding: "utf-8"});
-    if (actual != expect) {
-      throw new Error("File " + path + " should contain\n\t" + expect + "\nbut contains " + actual);
-    }
+    Assert.deepEqual(JSON.parse(actual), expect, `File ${path} contains the expected data.`);
   });
 }
 
+function generateFileContents(id) {
+  let url = `http://example.com/test_backup_once#${id}_${Math.random()}`;
+  return {windows: [{tabs: [{entries: [{url}], index: 1}]}]}
+}
+
 // Write to the store, and check that it creates:
 // - $Path.recovery with the new data
 // - $Path.nextUpgradeBackup with the old data
 add_task(function* test_first_write_backup() {
-  let initial_content = "initial content " + Math.random();
-  let new_content = "test_1 " + Math.random();
+  let initial_content = generateFileContents("initial");
+  let new_content = generateFileContents("test_1");
 
   do_print("Before the first write, none of the files should exist");
   yield promise_check_exist(Paths.backups, false);
 
   yield File.makeDir(Paths.backups);
-  yield File.writeAtomic(Paths.clean, initial_content, { encoding: "utf-8" });
+  yield File.writeAtomic(Paths.clean, JSON.stringify(initial_content), { encoding: "utf-8" });
   yield SessionFile.write(new_content);
 
   do_print("After first write, a few files should have been created");
@@ -116,8 +119,9 @@
 // - $Path.recovery contains the new data
 // - $Path.recoveryBackup contains the previous data
 add_task(function* test_second_write_no_backup() {
-  let new_content = "test_2 " + Math.random();
+  let new_content = generateFileContents("test_2");
   let previous_backup_content = yield File.read(Paths.recovery, { encoding: "utf-8" });
+  previous_backup_content = JSON.parse(previous_backup_content);
 
   yield OS.File.remove(Paths.cleanBackup);
 
@@ -136,7 +140,7 @@
 // Make sure that we create $Paths.clean and remove $Paths.recovery*
 // upon shutdown
 add_task(function* test_shutdown() {
-  let output = "test_3 " + Math.random();
+  let output = generateFileContents("test_3");
 
   yield File.writeAtomic(Paths.recovery, "I should disappear");
   yield File.writeAtomic(Paths.recoveryBackup, "I should also disappear");
@@ -145,7 +149,5 @@
 
   do_check_false((yield File.exists(Paths.recovery)));
   do_check_false((yield File.exists(Paths.recoveryBackup)));
-  let input = yield File.read(Paths.clean, { encoding: "utf-8"});
-  do_check_eq(input, output);
-
+  yield promise_check_contents(Paths.clean, output);
 });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/unit/test_shutdown_cleanup.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/unit/test_shutdown_cleanup.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/unit/test_shutdown_cleanup.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/unit/test_shutdown_cleanup.js	2015-04-24 19:30:55.000000000 +0000
@@ -0,0 +1,151 @@
+"use strict";
+
+/**
+ * This test ensures that we correctly clean up the session state before
+ * writing to disk a last time on shutdown. For now it only tests that each
+ * tab's shistory is capped to a maximum number of preceding and succeeding
+ * entries.
+ */
+
+const {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
+const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
+const {SessionWorker} = Cu.import("resource:///modules/sessionstore/SessionWorker.jsm", {});
+
+const profd = do_get_profile();
+const {SessionFile} = Cu.import("resource:///modules/sessionstore/SessionFile.jsm", {});
+const {Paths} = SessionFile;
+
+const {OS} = Cu.import("resource://gre/modules/osfile.jsm", {});
+const {File} = OS;
+
+const MAX_ENTRIES = 9;
+const URL = "http://example.com/#";
+
+// We need a XULAppInfo to initialize SessionFile
+let XULAppInfo = {
+  vendor: "Mozilla",
+  name: "SessionRestoreTest",
+  ID: "{230de50e-4cd1-11dc-8314-0800200c9a66}",
+  version: "1",
+  appBuildID: "2007010101",
+  platformVersion: "",
+  platformBuildID: "2007010101",
+  inSafeMode: false,
+  logConsoleErrors: true,
+  OS: "XPCShell",
+  XPCOMABI: "noarch-spidermonkey",
+
+  QueryInterface: XPCOMUtils.generateQI([
+    Ci.nsIXULAppInfo,
+    Ci.nsIXULRuntime,
+  ])
+};
+
+let XULAppInfoFactory = {
+  createInstance: function (outer, iid) {
+    if (outer != null)
+      throw Cr.NS_ERROR_NO_AGGREGATION;
+    return XULAppInfo.QueryInterface(iid);
+  }
+};
+
+let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
+registrar.registerFactory(Components.ID("{fbfae60b-64a4-44ef-a911-08ceb70b9f31}"),
+                          "XULAppInfo", "@mozilla.org/xre/app-info;1",
+                          XULAppInfoFactory);
+
+add_task(function* setup() {
+  let source = do_get_file("data/sessionstore_valid.js");
+  source.copyTo(profd, "sessionstore.js");
+
+  // Finish SessionFile initialization.
+  yield SessionFile.read();
+
+  // Reset prefs on cleanup.
+  do_register_cleanup(() => {
+    Services.prefs.clearUserPref("browser.sessionstore.max_serialize_back");
+    Services.prefs.clearUserPref("browser.sessionstore.max_serialize_forward");
+  });
+});
+
+function createSessionState(index) {
+  // Generate the tab state entries and set the one-based
+  // tab-state index to the middle session history entry.
+  let tabState = {entries: [], index};
+  for (let i = 0; i < MAX_ENTRIES; i++) {
+    tabState.entries.push({url: URL + i});
+  }
+
+  return {windows: [{tabs: [tabState]}]};
+}
+
+function* setMaxBackForward(back, fwd) {
+  Services.prefs.setIntPref("browser.sessionstore.max_serialize_back", back);
+  Services.prefs.setIntPref("browser.sessionstore.max_serialize_forward", fwd);
+  yield SessionFile.read();
+}
+
+function* writeAndParse(state, path, options = {}) {
+  yield SessionWorker.post("write", [state, options]);
+  return JSON.parse(yield File.read(path, {encoding: "utf-8"}));
+}
+
+add_task(function* test_shistory_cap_none() {
+  let state = createSessionState(5);
+
+  // Don't limit the number of shistory entries.
+  yield setMaxBackForward(-1, -1);
+
+  // Check that no caps are applied.
+  let diskState = yield writeAndParse(state, Paths.clean, {isFinalWrite: true});
+  Assert.deepEqual(state, diskState, "no cap applied");
+});
+
+add_task(function* test_shistory_cap_middle() {
+  let state = createSessionState(5);
+  yield setMaxBackForward(2, 3);
+
+  // Cap is only applied on clean shutdown.
+  let diskState = yield writeAndParse(state, Paths.recovery);
+  Assert.deepEqual(state, diskState, "no cap applied");
+
+  // Check that the right number of shistory entries was discarded
+  // and the shistory index updated accordingly.
+  diskState = yield writeAndParse(state, Paths.clean, {isFinalWrite: true});
+  let tabState = state.windows[0].tabs[0];
+  tabState.entries = tabState.entries.slice(2, 8);
+  tabState.index = 3;
+  Assert.deepEqual(state, diskState, "cap applied");
+});
+
+add_task(function* test_shistory_cap_lower_bound() {
+  let state = createSessionState(1);
+  yield setMaxBackForward(5, 5);
+
+  // Cap is only applied on clean shutdown.
+  let diskState = yield writeAndParse(state, Paths.recovery);
+  Assert.deepEqual(state, diskState, "no cap applied");
+
+  // Check that the right number of shistory entries was discarded.
+  diskState = yield writeAndParse(state, Paths.clean, {isFinalWrite: true});
+  let tabState = state.windows[0].tabs[0];
+  tabState.entries = tabState.entries.slice(0, 6);
+  Assert.deepEqual(state, diskState, "cap applied");
+});
+
+add_task(function* test_shistory_cap_upper_bound() {
+  let state = createSessionState(MAX_ENTRIES);
+  yield setMaxBackForward(5, 5);
+
+  // Cap is only applied on clean shutdown.
+  let diskState = yield writeAndParse(state, Paths.recovery);
+  Assert.deepEqual(state, diskState, "no cap applied");
+
+  // Check that the right number of shistory entries was discarded
+  // and the shistory index updated accordingly.
+  diskState = yield writeAndParse(state, Paths.clean, {isFinalWrite: true});
+  let tabState = state.windows[0].tabs[0];
+  tabState.entries = tabState.entries.slice(3);
+  tabState.index = 6;
+  Assert.deepEqual(state, diskState, "cap applied");
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/unit/xpcshell.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/unit/xpcshell.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/sessionstore/test/unit/xpcshell.ini	2015-04-22 13:05:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/sessionstore/test/unit/xpcshell.ini	2015-04-24 19:30:55.000000000 +0000
@@ -9,7 +9,8 @@
   data/sessionstore_valid.js
 
 [test_backup_once.js]
+[test_histogram_corrupt_files.js]
+[test_shutdown_cleanup.js]
 [test_startup_nosession_async.js]
 [test_startup_session_async.js]
 [test_startup_invalid_session.js]
-[test_histogram_corrupt_files.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/uitour/test/browser_backgroundTab.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/uitour/test/browser_backgroundTab.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/uitour/test/browser_backgroundTab.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/uitour/test/browser_backgroundTab.js	2015-04-24 19:30:56.000000000 +0000
@@ -0,0 +1,49 @@
+"use strict";
+
+let gTestTab;
+let gContentAPI;
+let gContentWindow;
+
+Components.utils.import("resource:///modules/UITour.jsm");
+
+function test() {
+  requestLongerTimeout(2);
+  UITourTest();
+}
+
+let tests = [
+  function test_bg_getConfiguration(done) {
+    info("getConfiguration is on the allowed list so should work");
+    loadForegroundTab().then(() => {
+      gContentAPI.getConfiguration("availableTargets", (data) => {
+        ok(data, "Got data from getConfiguration");
+        gBrowser.removeCurrentTab();
+        done();
+      });
+    });
+  },
+  taskify(function* test_bg_showInfo() {
+    info("showInfo isn't on the allowed action list so should be denied");
+    yield loadForegroundTab();
+
+    yield showInfoPromise("appMenu", "Hello from the backgrund", "Surprise!").then(
+      () => ok(false, "panel shouldn't have shown from a background tab"),
+      () => ok(true, "panel wasn't shown from a background tab"));
+
+    gBrowser.removeCurrentTab();
+  }),
+];
+
+
+function loadForegroundTab() {
+  let newTab = gBrowser.addTab("about:blank", {skipAnimation: true});
+  gBrowser.selectedTab = newTab;
+
+  return new Promise((resolve) => {
+    newTab.linkedBrowser.addEventListener("load", function onLoad() {
+      newTab.linkedBrowser.removeEventListener("load", onLoad, true);
+      isnot(gBrowser.selectedTab, gTestTab, "Make sure tour tab isn't selected");
+      resolve();
+    }, true);
+  });
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/uitour/test/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/uitour/test/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/components/uitour/test/browser.ini	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/components/uitour/test/browser.ini	2015-04-24 19:30:56.000000000 +0000
@@ -5,6 +5,8 @@
   uitour.html
   ../UITour-lib.js
 
+[browser_backgroundTab.js]
+skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_no_tabs.js]
 [browser_UITour.js]
 skip-if = os == "linux" || e10s # Intermittent failures, bug 951965
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/animationinspector/test/browser_animation_playerFronts_are_refreshed.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/animationinspector/test/browser_animation_playerFronts_are_refreshed.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/animationinspector/test/browser_animation_playerFronts_are_refreshed.js	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/animationinspector/test/browser_animation_playerFronts_are_refreshed.js	2015-04-24 19:30:56.000000000 +0000
@@ -11,9 +11,6 @@
   yield addTab(TEST_URL_ROOT + "doc_simple_animation.html");
   let {controller, inspector} = yield openAnimationInspector();
 
-  is(controller.animationPlayers.length, 0,
-    "There are no AnimationPlayerFront objects at first");
-
   info("Selecting an animated node");
   // selectNode waits for the inspector-updated event before resolving, which
   // means the controller.PLAYERS_UPDATED_EVENT event has been emitted before
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_disables_on_finished.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_disables_on_finished.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_disables_on_finished.js	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_disables_on_finished.js	2015-04-24 19:30:56.000000000 +0000
@@ -10,15 +10,17 @@
   yield addTab(TEST_URL_ROOT + "doc_simple_animation.html");
   let {inspector, panel, controller} = yield openAnimationInspector();
 
-  info("Apply 2 finite animations to the test node");
+  info("Select the test node");
+  yield selectNode(".still", inspector);
+
+  info("Apply 2 finite animations to the test node and wait for the widgets to appear");
+  let onUiUpdated = panel.once(panel.UI_UPDATED_EVENT);
   yield executeInContent("devtools:test:setAttribute", {
     selector: ".still",
     attributeName: "class",
     attributeValue: "ball still multi-finite"
   });
-
-  info("Select the test node");
-  yield selectNode(".still", inspector);
+  yield onUiUpdated;
 
   is(controller.animationPlayers.length, 2, "2 animation players exist");
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_dont_show_time_after_duration.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_dont_show_time_after_duration.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_dont_show_time_after_duration.js	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_dont_show_time_after_duration.js	2015-04-24 19:30:56.000000000 +0000
@@ -14,15 +14,17 @@
   yield addTab(TEST_URL_ROOT + "doc_simple_animation.html");
   let {inspector, panel} = yield openAnimationInspector();
 
-  info("Start an animation on the test node");
+  info("Select the test node");
+  yield selectNode(".still", inspector);
+
+  info("Start an animation on the test node and wait for the widget to appear");
+  let onUiUpdated = panel.once(panel.UI_UPDATED_EVENT);
   yield executeInContent("devtools:test:setAttribute", {
     selector: ".still",
     attributeName: "class",
     attributeValue: "ball still short"
   });
-
-  info("Select the node");
-  yield selectNode(".still", inspector);
+  yield onUiUpdated;
 
   info("Wait until the animation ends");
   let widget = panel.playerWidgets[0];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_have_control_buttons.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_have_control_buttons.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_have_control_buttons.js	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/animationinspector/test/browser_animation_playerWidgets_have_control_buttons.js	2015-04-24 19:30:56.000000000 +0000
@@ -31,7 +31,8 @@
   info("Faking an older server version by setting " +
     "AnimationsController.hasSetCurrentTime to false");
 
-  yield selectNode("body", inspector);
+  // Selecting <div.still> to make sure no widgets are displayed in the panel.
+  yield selectNode(".still", inspector);
   controller.hasSetCurrentTime = false;
 
   info("Selecting the animated node again");
@@ -46,13 +47,12 @@
   ok(container.children[0].classList.contains("toggle"),
     "The first button is the play/pause button");
 
-  yield selectNode("body", inspector);
+  yield selectNode(".still", inspector);
   controller.hasSetCurrentTime = true;
 
   info("Faking an older server version by setting " +
     "AnimationsController.hasSetPlaybackRate to false");
 
-  yield selectNode("body", inspector);
   controller.hasSetPlaybackRate = false;
 
   info("Selecting the animated node again");
@@ -65,6 +65,6 @@
   ok(!container.querySelector("select"),
     "The playback rate select does not exist");
 
-  yield selectNode("body", inspector);
+  yield selectNode(".still", inspector);
   controller.hasSetPlaybackRate = true;
 });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js	2015-04-24 19:30:56.000000000 +0000
@@ -10,6 +10,9 @@
   yield addTab(TEST_URL_ROOT + "doc_simple_animation.html");
   let {inspector, panel} = yield openAnimationInspector();
 
+  info("Select the non-animated test node");
+  yield selectNode(".still", inspector);
+
   ok(!panel.toggleAllButtonEl.classList.contains("paused"),
     "The toggle button is in its running state by default");
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/commands-index.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/commands-index.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/commands-index.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/commands-index.js	2015-04-24 19:30:56.000000000 +0000
@@ -4,9 +4,56 @@
 
 "use strict";
 
-const gcli = require("gcli/index");
+const { createSystem, connectFront, disconnectFront } = require("gcli/system");
+const { GcliFront } = require("devtools/server/actors/gcli");
 
-const commandModules = [
+/**
+ * This is the basic list of modules that should be loaded into each
+ * requisition instance whether server side or client side
+ */
+exports.baseModules = [
+  "gcli/types/delegate",
+  "gcli/types/selection",
+  "gcli/types/array",
+
+  "gcli/types/boolean",
+  "gcli/types/command",
+  "gcli/types/date",
+  "gcli/types/file",
+  "gcli/types/javascript",
+  "gcli/types/node",
+  "gcli/types/number",
+  "gcli/types/resource",
+  "gcli/types/setting",
+  "gcli/types/string",
+  "gcli/types/union",
+  "gcli/types/url",
+
+  "gcli/fields/fields",
+  "gcli/fields/delegate",
+  "gcli/fields/selection",
+
+  "gcli/ui/focus",
+  "gcli/ui/intro",
+
+  "gcli/converters/converters",
+  "gcli/converters/basic",
+  "gcli/converters/terminal",
+
+  "gcli/languages/command",
+  "gcli/languages/javascript",
+
+  "gcli/commands/clear",
+  "gcli/commands/context",
+  "gcli/commands/help",
+  "gcli/commands/pref",
+];
+
+/**
+ * Some commands belong to a tool (see getToolModules). This is a list of the
+ * modules that are *not* owned by a tool.
+ */
+exports.devtoolsModules = [
   "devtools/tilt/tilt-commands",
   "gcli/commands/addon",
   "gcli/commands/appcache",
@@ -28,15 +75,83 @@
   "gcli/commands/tools",
 ];
 
-gcli.addItemsByModule(commandModules, { delayedLoad: true });
-
-const defaultTools = require("main").defaultTools;
-for (let definition of defaultTools) {
-  if (definition.commands) {
-    gcli.addItemsByModule(definition.commands, { delayedLoad: true });
+/**
+ * Register commands from tools with 'command: [ "some/module" ]' definitions.
+ * The map/reduce incantation squashes the array of arrays to a single array.
+ */
+const defaultTools = require("definitions").defaultTools;
+exports.devtoolsToolModules = defaultTools.map(def => def.commands || [])
+                                 .reduce((prev, curr) => prev.concat(curr), []);
+
+/**
+ * Add modules to a system for use in a content process (but don't call load)
+ */
+exports.addAllItemsByModule = function(system) {
+  system.addItemsByModule(exports.baseModules, { delayedLoad: true });
+  system.addItemsByModule(exports.devtoolsModules, { delayedLoad: true });
+  system.addItemsByModule(exports.devtoolsToolModules, { delayedLoad: true });
+
+  const { mozDirLoader } = require("gcli/commands/cmd");
+  system.addItemsByModule("mozcmd", { delayedLoad: true, loader: mozDirLoader });
+};
+
+/**
+ * This is WeakMap<Target, Links> where Links is an object that looks like
+ *   { refs: number, promise: Promise<System>, front: GcliFront }
+ */
+var linksForTarget = new WeakMap();
+
+/**
+ * The toolbox uses the following properties on a command to allow it to be
+ * added to the toolbox toolbar
+ */
+var customProperties = [ "buttonId", "buttonClass", "tooltipText" ];
+
+/**
+ * Create a system which connects to a GCLI in a remote target
+ * @return Promise<System> for the given target
+ */
+exports.getSystem = function(target) {
+  const existingLinks = linksForTarget.get(target);
+  if (existingLinks != null) {
+    existingLinks.refs++;
+    return existingLinks.promise;
   }
-}
 
-const { mozDirLoader } = require("gcli/commands/cmd");
+  const system = createSystem({ location: "client" });
+
+  exports.addAllItemsByModule(system);
 
-gcli.addItemsByModule("mozcmd", { delayedLoad: true, loader: mozDirLoader });
+  // Load the client system
+  const links = {
+    refs: 1,
+    system,
+    promise: system.load().then(() => {
+      return GcliFront.create(target).then(front => {
+        links.front = front;
+        return connectFront(system, front, customProperties).then(() => system);
+      });
+    })
+  };
+
+  linksForTarget.set(target, links);
+  return links.promise;
+};
+
+/**
+ * Someone that called getSystem doesn't need it any more, so decrement the
+ * count of users of the system for that target, and destroy if needed
+ */
+exports.releaseSystem = function(target) {
+  const links = linksForTarget.get(target);
+  if (links == null) {
+    throw new Error("releaseSystem called for unknown target");
+  }
+
+  links.refs--;
+  if (links.refs === 0) {
+    disconnectFront(links.system, links.front);
+    links.system.destroy();
+    linksForTarget.delete(target);
+  }
+};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_addon.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_addon.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_addon.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_addon.js	2015-04-24 19:30:56.000000000 +0000
@@ -7,7 +7,7 @@
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   let options = yield helpers.openTab("about:blank");
   yield helpers.openToolbar(options);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_appcache_invalid.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_appcache_invalid.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_appcache_invalid.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_appcache_invalid.js	2015-04-24 19:30:56.000000000 +0000
@@ -11,7 +11,7 @@
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   let lines = [
     'Manifest has a character encoding of ISO-8859-1. Manifests must have the ' +
       'utf-8 character encoding.',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_appcache_valid.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_appcache_valid.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_appcache_valid.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_appcache_valid.js	2015-04-24 19:30:56.000000000 +0000
@@ -10,7 +10,7 @@
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   let options = yield helpers.openTab(TEST_URI);
   yield helpers.openToolbar(options);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_calllog_chrome.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_calllog_chrome.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_calllog_chrome.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_calllog_chrome.js	2015-04-24 19:30:56.000000000 +0000
@@ -8,7 +8,7 @@
 let tests = {};
 
 function test() {
-  return Task.spawn(function() {
+  return Task.spawn(function*() {
     let options = yield helpers.openTab(TEST_URI);
     yield helpers.openToolbar(options);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_calllog.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_calllog.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_calllog.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_calllog.js	2015-04-24 19:30:56.000000000 +0000
@@ -8,7 +8,7 @@
 let tests = {};
 
 function test() {
-  return Task.spawn(function() {
+  return Task.spawn(function*() {
     let options = yield helpers.openTab(TEST_URI);
     yield helpers.openToolbar(options);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_commands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_commands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_commands.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_commands.js	2015-04-24 19:30:56.000000000 +0000
@@ -9,7 +9,7 @@
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   let options = yield helpers.openTab(TEST_URI);
   yield helpers.openToolbar(options);
 
@@ -49,7 +49,7 @@
   yield helpers.audit(options, [
     {
       setup: "console close",
-      exec: { output: true }
+      exec: { output: "" }
     }
   ]);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_csscoverage_startstop.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_csscoverage_startstop.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_csscoverage_startstop.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_csscoverage_startstop.js	2015-04-24 19:30:56.000000000 +0000
@@ -33,18 +33,21 @@
  * Visit all the pages in the test
  */
 function* navigate(usage, options) {
-  yield usage.start();
+  yield usage.start(options.chromeWindow, options.target);
 
   ok(usage.isRunning(), "csscoverage is running");
 
+  let load1Promise = helpers.listenOnce(options.browser, "load", true);
+
   yield helpers.navigate(PAGE_1, options);
 
   // Wait for the test pages to auto-cycle
-  let ev = yield helpers.listenOnce(options.browser, "load", true);
-  is(ev.target.location.href, PAGE_1, "page 1 loaded");
+  yield load1Promise;
+  is(options.window.location.href, PAGE_1, "page 1 loaded");
 
-  ev = yield helpers.listenOnce(options.browser, "load", true);
-  is(ev.target.location.href, PAGE_3, "page 3 loaded");
+  // Page 2 is a frame in page 1. JS in the page navigates to page 3.
+  yield helpers.listenOnce(options.browser, "load", true);
+  is(options.window.location.href, PAGE_3, "page 3 loaded");
 
   yield usage.stop();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_jsb.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_jsb.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_jsb.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_jsb.js	2015-04-24 19:30:56.000000000 +0000
@@ -10,7 +10,7 @@
   return Task.spawn(testTask).then(finish, helpers.handleError);
 }
 
-function testTask() {
+function* testTask() {
   let options = yield helpers.openTab("about:blank");
   yield helpers.openToolbar(options);
 
@@ -29,7 +29,10 @@
     {
       setup: 'jsb ' + TEST_URI,
       // Should result in a new scratchpad window
-      exec: { }
+      exec: {
+        output: '',
+        error: false
+      }
     }
   ]);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_media.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_media.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_media.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_media.js	2015-04-24 19:30:56.000000000 +0000
@@ -74,7 +74,7 @@
 };
 
 function test() {
-  return Task.spawn(function() {
+  return Task.spawn(function*() {
     let options = yield helpers.openTab(TEST_URI);
     yield helpers.openToolbar(options);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_pagemod_export.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_pagemod_export.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_pagemod_export.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_pagemod_export.js	2015-04-24 19:30:56.000000000 +0000
@@ -10,7 +10,7 @@
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   let options = yield helpers.openTab(TEST_URI);
   yield helpers.openToolbar(options);
 
@@ -302,7 +302,8 @@
         args: {
           searchAttributes: { value: undefined, status: 'INCOMPLETE' },
           searchElements: { value: undefined, status: 'INCOMPLETE' },
-          root: { value: undefined },
+          // root: { value: undefined }, // 'root' is a node which is remote
+                                         // so we can't see the value in tests
           ignoreCase: { value: false },
         }
       },
@@ -317,7 +318,8 @@
         args: {
           searchAttributes: { value: 'foo' },
           searchElements: { value: 'bar' },
-          root: { value: undefined },
+          // root: { value: undefined }, // 'root' is a node which is remote
+                                         // so we can't see the value in tests
           ignoreCase: { value: false },
         }
       },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_pref1.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_pref1.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_pref1.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_pref1.js	2015-04-24 19:30:56.000000000 +0000
@@ -13,7 +13,7 @@
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   let options = yield helpers.openTab(TEST_URI);
   yield helpers.openToolbar(options);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_pref2.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_pref2.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_pref2.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_pref2.js	2015-04-24 19:30:56.000000000 +0000
@@ -13,7 +13,7 @@
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   let options = yield helpers.openTab(TEST_URI);
   yield helpers.openToolbar(options);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_pref3.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_pref3.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_pref3.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_pref3.js	2015-04-24 19:30:56.000000000 +0000
@@ -16,7 +16,7 @@
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   let options = yield helpers.openTab(TEST_URI);
   yield helpers.openToolbar(options);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_screenshot.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_screenshot.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_screenshot.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_screenshot.js	2015-04-24 19:30:56.000000000 +0000
@@ -11,7 +11,7 @@
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   waitForExplicitFinish();
 
   info("RUN TEST: non-private window");
@@ -81,11 +81,6 @@
         input:  'screenshot --selector img#testImage',
         markup: 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV',
         status: 'VALID',
-        args: {
-          selector: {
-            value: options.window.document.getElementById("testImage")
-          },
-        }
       },
     },
   ]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_settings.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_settings.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_cmd_settings.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_cmd_settings.js	2015-04-24 19:30:56.000000000 +0000
@@ -16,14 +16,18 @@
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   // Setup
   let options = yield helpers.openTab(TEST_URI);
 
-  require("devtools/commandline/commands-index");
-  let gcli = require("gcli/index");
-  yield gcli.load();
-  let settings = gcli.settings;
+  const { createSystem } = require("gcli/system");
+  const system = createSystem({ location: "server" });
+
+  const gcliInit = require("devtools/commandline/commands-index");
+  gcliInit.addAllItemsByModule(system);
+  yield system.load();
+
+  let settings = system.settings;
 
   let hideIntroEnabled = settings.get("devtools.gcli.hideIntro");
   let tabSize = settings.get("devtools.editor.tabsize");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_async.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_async.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_async.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_async.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testAsync.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_async.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testBasic = function(options) {
@@ -74,7 +59,6 @@
         args: {
           command: { name: 'tsslow' },
           hello: {
-            value: undefined,
             arg: '',
             status: 'INCOMPLETE'
           },
@@ -95,7 +79,6 @@
         args: {
           command: { name: 'tsslow' },
           hello: {
-            value: undefined,
             arg: ' S',
             status: 'INCOMPLETE'
           },
@@ -116,7 +99,6 @@
         args: {
           command: { name: 'tsslow' },
           hello: {
-            value: 'Shalom',
             arg: ' Shalom ',
             status: 'VALID',
             message: ''
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_canon.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_canon.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_canon.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_canon.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testCanon.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_canon.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 var Commands = require('gcli/commands/commands').Commands;
@@ -219,6 +204,9 @@
       { name: 'num', type: 'number' },
       { name: 'opt', type: { name: 'selection', data: [ '1', '2', '3' ] } },
     ],
+    customProp1: 'localValue',
+    customProp2: true,
+    customProp3: 42,
     exec: function(args, context) {
       return context.commandName + ':' +
               args.str + ':' + args.num + ':' + args.opt;
@@ -235,6 +223,24 @@
             '],"isParent":false}]',
             'JSON.stringify(commandSpecs)');
 
+  var customProps = [ 'customProp1', 'customProp2', 'customProp3', ];
+  var commandSpecs2 = altCommands.getCommandSpecs(customProps);
+  assert.is(JSON.stringify(commandSpecs2),
+            '[{' +
+              '"item":"command",' +
+              '"name":"tss",' +
+              '"params":[' +
+                '{"name":"str","type":"string"},' +
+                '{"name":"num","type":"number"},' +
+                '{"name":"opt","type":{"name":"selection","data":["1","2","3"]}}' +
+              '],' +
+              '"isParent":false,' +
+              '"customProp1":"localValue",' +
+              '"customProp2":true,' +
+              '"customProp3":42' +
+            '}]',
+            'JSON.stringify(commandSpecs)');
+
   var remoter = function(args, context) {
     assert.is(context.commandName, 'tss', 'commandName is tss');
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_cli1.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_cli1.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_cli1.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_cli1.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testCli1.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_cli1.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 
@@ -268,7 +253,6 @@
       }
     },
     {
-      skipRemainingIf: options.isNoDom,
       name: '|tsv option',
       setup: function() {
         return helpers.setInput(options, 'tsv option', 0);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_cli2.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_cli2.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_cli2.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_cli2.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,45 +15,18 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testCli2.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_cli2.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
-var nodetype = require('gcli/types/node');
-
-exports.setup = function(options) {
-  if (options.window) {
-    nodetype.setDocument(options.window.document);
-  }
-};
-
-exports.shutdown = function(options) {
-  nodetype.unsetDocument();
-};
-
 exports.testSingleString = function(options) {
   return helpers.audit(options, [
     {
@@ -376,7 +349,6 @@
       }
     },
     {
-      skipRemainingIf: options.isNoDom,
       name: 'tsf x (cursor=4)',
       setup: function() {
         return helpers.setInput(options, 'tsf x', 4);
@@ -406,21 +378,14 @@
 };
 
 exports.testElementWeb = function(options) {
-  var inputElement = options.isNoDom ?
-      null :
-      options.window.document.getElementById('gcli-input');
-
   return helpers.audit(options, [
     {
-      skipIf: function gcliInputElementExists() {
-        return inputElement == null;
-      },
-      setup:    'tse #gcli-input',
+      setup:    'tse #gcli-root',
       check: {
-        input:  'tse #gcli-input',
+        input:  'tse #gcli-root',
         hints:                 ' [options]',
-        markup: 'VVVVVVVVVVVVVVV',
-        cursor: 15,
+        markup: 'VVVVVVVVVVVVVV',
+        cursor: 14,
         current: 'node',
         status: 'VALID',
         predictions: [ ],
@@ -428,8 +393,7 @@
         args: {
           command: { name: 'tse' },
           node: {
-            value: inputElement,
-            arg: ' #gcli-input',
+            arg: ' #gcli-root',
             status: 'VALID',
             message: ''
           },
@@ -444,7 +408,6 @@
 exports.testElement = function(options) {
   return helpers.audit(options, [
     {
-      skipRemainingIf: options.isNoDom,
       setup:    'tse',
       check: {
         input:  'tse',
@@ -457,7 +420,7 @@
         unassigned: [ ],
         args: {
           command: { name: 'tse' },
-          node: { value: undefined, arg: '', status: 'INCOMPLETE' },
+          node: { arg: '', status: 'INCOMPLETE' },
           nodes: { arg: '', status: 'VALID', message: '' },
           nodes2: { arg: '', status: 'VALID', message: '' },
         }
@@ -605,7 +568,7 @@
       }
     },
     {
-      skipIf: options.isPhantomjs,
+      skipIf: options.isPhantomjs, // PhantomJS gets predictions wrong
       setup:    'tsn x',
       check: {
         input:  'tsn x',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_completion1.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_completion1.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_completion1.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_completion1.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testCompletion1.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_completion1.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testActivate = function(options) {
@@ -183,7 +168,7 @@
       }
     },
     {
-      skipIf: options.isPhantomjs,
+      skipIf: options.isPhantomjs, // PhantomJS gets predictions wrong
       setup: 'tsg d',
       check: {
         hints: ' [options] -> ccc'
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_completion2.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_completion2.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_completion2.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_completion2.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testCompletion2.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_completion2.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testLong = function(options) {
@@ -170,7 +155,6 @@
       }
     },
     {
-      skipIf: options.isNoDom,
       name: '<TAB>',
       setup: function() {
         // Doing it this way avoids clearing the input buffer
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_context.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_context.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_context.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_context.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testContext.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_context.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testBaseline = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_date.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_date.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_date.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_date.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testDate.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_date.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 
@@ -66,15 +51,15 @@
   var date = types.createType({ name: 'date', max: max, min: min });
   assert.is(date.getMax(), max, 'max setup');
 
-  var incremented = date.increment(min);
+  var incremented = date.nudge(min, 1);
   assert.is(incremented, max, 'incremented');
 };
 
 exports.testIncrement = function(options) {
   var date = options.requisition.system.types.createType('date');
   return date.parseString('now').then(function(conversion) {
-    var plusOne = date.increment(conversion.value);
-    var minusOne = date.decrement(plusOne);
+    var plusOne = date.nudge(conversion.value, 1);
+    var minusOne = date.nudge(plusOne, -1);
 
     // See comments in testParse
     var gap = new Date().getTime() - minusOne.getTime();
@@ -126,7 +111,7 @@
       },
       exec: {
         output: [ /^Exec: tsdate/, /2001/, /1980/ ],
-        type: 'string',
+        type: 'testCommandOutput',
         error: false
       }
     },
@@ -172,7 +157,7 @@
       },
       exec: {
         output: [ /^Exec: tsdate/, /2001/, /1980/ ],
-        type: 'string',
+        type: 'testCommandOutput',
         error: false
       }
     },
@@ -213,7 +198,7 @@
       },
       exec: {
         output: [ /^Exec: tsdate/, new Date().getFullYear() ],
-        type: 'string',
+        type: 'testCommandOutput',
         error: false
       }
     },
@@ -253,7 +238,7 @@
       },
       exec: {
         output: [ /^Exec: tsdate/, new Date().getFullYear() ],
-        type: 'string',
+        type: 'testCommandOutput',
         error: false
       }
     }
@@ -264,7 +249,7 @@
   return helpers.audit(options, [
     {
       // createRequisitionAutomator doesn't fake UP/DOWN well enough
-      skipRemainingIf: options.isNoDom,
+      skipRemainingIf: options.isNode,
       setup:    'tsdate 2001-01-01<UP>',
       check: {
         input:  'tsdate 2001-01-02',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_exec.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_exec.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_exec.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_exec.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,54 +15,18 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testExec.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_exec.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
-var nodetype = require('gcli/types/node');
-
-var mockBody = {
-  style: {}
-};
-
-var mockEmptyNodeList = {
-  length: 0,
-  item: function() { return null; }
-};
-
-var mockRootNodeList = {
-  length: 1,
-  item: function(i) { return mockBody; }
-};
-
-var mockDoc = {
-  querySelectorAll: function(css) {
-    return (css === ':root') ? mockRootNodeList : mockEmptyNodeList;
-  }
-};
 
 exports.testParamGroup = function(options) {
   var tsg = options.requisition.system.commands.get('tsg');
@@ -121,7 +85,7 @@
         }
       },
       exec: {
-        output: 'Exec: tsv optionType=string, optionValue=10'
+        output: 'Exec: tsv optionType=option1 optionValue=10'
       }
     },
     {
@@ -151,7 +115,7 @@
         }
       },
       exec: {
-        output: 'Exec: tsv optionType=number, optionValue=10'
+        output: 'Exec: tsv optionType=option2 optionValue=10'
       }
     },
     // Delegated remote types can't transfer value types so we only test for
@@ -163,7 +127,7 @@
         args: { optionValue: { value: '10' } }
       },
       exec: {
-        output: 'Exec: tsv optionType=string, optionValue=10'
+        output: 'Exec: tsv optionType=option1 optionValue=10'
       }
     },
     {
@@ -173,7 +137,7 @@
         args: { optionValue: { value: 10 } }
       },
       exec: {
-        output: 'Exec: tsv optionType=number, optionValue=10'
+        output: 'Exec: tsv optionType=option2 optionValue=10'
       }
     }
   ]);
@@ -228,7 +192,7 @@
         }
       },
       exec: {
-        output: 'Exec: tsr text=fred bloggs'
+        output: 'Exec: tsr text=fred\\ bloggs'
       }
     },
     {
@@ -253,7 +217,7 @@
         }
       },
       exec: {
-        output: 'Exec: tsr text=fred bloggs'
+        output: 'Exec: tsr text=fred\\ bloggs'
       }
     },
     {
@@ -278,7 +242,7 @@
         }
       },
       exec: {
-        output: 'Exec: tsr text=fred bloggs'
+        output: 'Exec: tsr text=fred\\ bloggs'
       }
     }
   ]);
@@ -403,7 +367,6 @@
         args: {
           command: { name: 'tsj' },
           javascript: {
-            value: '1 + 1',
             arg: ' { 1 + 1 }',
             status: 'VALID',
             message: ''
@@ -418,12 +381,9 @@
 };
 
 exports.testExecNode = function(options) {
-  var origDoc = nodetype.getDocument();
-  nodetype.setDocument(mockDoc);
-
   return helpers.audit(options, [
     {
-      skipIf: options.isNoDom,
+      skipIf: options.isRemote,
       setup:    'tse :root',
       check: {
         input:  'tse :root',
@@ -437,19 +397,16 @@
         args: {
           command: { name: 'tse' },
           node: {
-            value: mockBody,
             arg: ' :root',
             status: 'VALID',
             message: ''
           },
           nodes: {
-            value: mockEmptyNodeList,
             arg: '',
             status: 'VALID',
             message: ''
           },
           nodes2: {
-            value: mockEmptyNodeList,
             arg: '',
             status: 'VALID',
             message: ''
@@ -459,8 +416,10 @@
       exec: {
         output: /^Exec: tse/
       },
-      post: function() {
-        nodetype.setDocument(origDoc);
+      post: function(output) {
+        assert.is(output.data.args.node, ':root', 'node should be :root');
+        assert.is(output.data.args.nodes, 'Error', 'nodes should be Error');
+        assert.is(output.data.args.nodes2, 'Error', 'nodes2 should be Error');
       }
     }
   ]);
@@ -552,7 +511,7 @@
         }
       },
       exec: {
-        output: 'Exec: tselarr num=1, arr='
+        output: 'Exec: tselarr num=1 arr='
       }
     },
     {
@@ -573,7 +532,7 @@
         }
       },
       exec: {
-        output: 'Exec: tselarr num=1, arr=a'
+        output: 'Exec: tselarr num=1 arr=a'
       }
     },
     {
@@ -594,7 +553,7 @@
         }
       },
       exec: {
-        output: 'Exec: tselarr num=1, arr=a,b'
+        output: 'Exec: tselarr num=1 arr=a b'
       }
     }
   ]);
@@ -621,7 +580,7 @@
         }
       },
       exec: {
-        output: 'Exec: tsm abc=a, txt=10, num=10'
+        output: 'Exec: tsm abc=a txt=10 num=10'
       }
     }
   ]);
@@ -651,9 +610,47 @@
         }
       },
       exec: {
-        output: 'Exec: tsg solo=aaa, txt1=null, bool=false, txt2=d, num=42'
+        output: 'Exec: tsg solo=aaa txt1= bool=false txt2=d num=42'
       }
     }
   ]);
+};
+
+exports.testNested = function(options) {
+  var commands = options.requisition.system.commands;
+  commands.add({
+    name: 'nestorama',
+    exec: function(args, context) {
+      return context.updateExec('tsb').then(function(tsbOutput) {
+        return context.updateExec('tsu 6').then(function(tsuOutput) {
+          return JSON.stringify({
+            tsb: tsbOutput.data,
+            tsu: tsuOutput.data
+          });
+        });
+      });
+    }
+  });
 
+  return helpers.audit(options, [
+    {
+      setup: 'nestorama',
+      exec: {
+        output:
+          '{' +
+            '"tsb":{' +
+              '"name":"tsb",' +
+              '"args":{"toggle":"false"}' +
+            '},' +
+            '"tsu":{' +
+              '"name":"tsu",' +
+              '"args":{"num":"6"}' +
+            '}' +
+          '}'
+      },
+      post: function() {
+        commands.remove('nestorama');
+      }
+    }
+  ]);
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_fail.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_fail.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_fail.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_fail.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testFail.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_fail.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testBasic = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_file.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_file.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_file.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_file.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testFile.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_file.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 var local = false;
@@ -47,10 +32,7 @@
 exports.testBasic = function(options) {
   return helpers.audit(options, [
     {
-      // These tests require us to be using node directly or to be in
-      // PhantomJS connected to an execute enabled node server or to be in
-      // firefox.
-      skipRemainingIf: options.isPhantomjs || options.isFirefox,
+      skipRemainingIf: options.isFirefox, // No file implementation in Firefox
       setup:    'tsfile open /',
       check: {
         input:  'tsfile open /',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_fileparser.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_fileparser.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_fileparser.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_fileparser.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testFileparser.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_fileparser.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 var fileparser = require('gcli/util/fileparser');
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_filesystem.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_filesystem.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_filesystem.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_filesystem.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testFilesystem.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_filesystem.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 var filesystem = require('gcli/util/filesystem');
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_focus.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_focus.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_focus.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_focus.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testFocus.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_focus.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testBasic = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_history.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_history.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_history.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_history.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testHistory.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_history.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 var History = require('gcli/ui/history').History;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_incomplete.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_incomplete.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_incomplete.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_incomplete.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testIncomplete.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_incomplete.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_inputter.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_inputter.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_inputter.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_inputter.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testInputter.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_inputter.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 var KeyEvent = require('gcli/util/util').KeyEvent;
 
@@ -89,7 +74,7 @@
   var ev1 = { keyCode: KeyEvent.DOM_VK_RETURN };
   return terminal.handleKeyUp(ev1).then(function() {
     assert.ok(latestEvent != null, 'events this test');
-    assert.is(latestData, 'Exec: tss ', 'last command is tss');
+    assert.is(latestData.name, 'tss', 'last command is tss');
 
     assert.is(terminal.getInputState().typed,
               '',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_intro.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_intro.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_intro.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_intro.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testIntro.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_intro.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testIntroStatus = function(options) {
@@ -67,7 +52,6 @@
     },
     {
       setup:    'intro',
-      skipIf: options.isNoDom,
       check: {
         typed:  'intro',
         markup: 'VVVVV',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_js.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_js.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_js.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_js.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,73 +15,55 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testJs.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_js.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
-var javascript = require('gcli/types/javascript');
-
-var tempWindow;
 
 exports.setup = function(options) {
-  if (options.isNoDom) {
+  if (jsTestDisallowed(options)) {
     return;
   }
 
-  tempWindow = javascript.getGlobalObject();
-  Object.defineProperty(options.window, 'donteval', {
+  // Check that we're not trespassing on 'donteval'
+  var win = options.requisition.environment.window;
+  Object.defineProperty(win, 'donteval', {
     get: function() {
       assert.ok(false, 'donteval should not be used');
+      console.trace();
       return { cant: '', touch: '', 'this': '' };
     },
     enumerable: true,
-    configurable : true
+    configurable: true
   });
-  javascript.setGlobalObject(options.window);
 };
 
 exports.shutdown = function(options) {
-  if (options.isNoDom) {
+  if (jsTestDisallowed(options)) {
     return;
   }
 
-  javascript.setGlobalObject(tempWindow);
-  tempWindow = undefined;
-  delete options.window.donteval;
+  delete options.requisition.environment.window.donteval;
 };
 
-function jsTestAllowed(options) {
-  return options.isRemote || options.isNoDom ||
+function jsTestDisallowed(options) {
+  return options.isRemote || // Altering the environment (which isn't remoted)
+         options.isNode ||
          options.requisition.system.commands.get('{') == null;
 }
 
 exports.testBasic = function(options) {
   return helpers.audit(options, [
     {
-      skipRemainingIf: jsTestAllowed,
+      skipRemainingIf: jsTestDisallowed,
       setup:    '{',
       check: {
         input:  '{',
@@ -236,7 +218,7 @@
 exports.testDocument = function(options) {
   return helpers.audit(options, [
     {
-      skipRemainingIf: jsTestAllowed,
+      skipRemainingIf: jsTestDisallowed,
       setup:    '{ docu',
       check: {
         input:  '{ docu',
@@ -315,7 +297,8 @@
           command: { name: '{' },
           javascript: {
             value: 'document.title',
-            arg: '{ document.title ',
+            // arg: '{ document.title ',
+            // Node/JSDom gets this wrong and omits the trailing space. Why?
             status: 'VALID',
             message: ''
           }
@@ -348,14 +331,9 @@
 };
 
 exports.testDonteval = function(options) {
-  if (!options.isNoDom) {
-    // nodom causes an eval here, maybe that's node/v8?
-    assert.ok('donteval' in options.window, 'donteval exists');
-  }
-
   return helpers.audit(options, [
     {
-      skipRemainingIf: jsTestAllowed,
+      skipRemainingIf: true, // Commented out until we fix non-enumerable props
       setup:    '{ don',
       check: {
         input:  '{ don',
@@ -476,7 +454,7 @@
 exports.testExec = function(options) {
   return helpers.audit(options, [
     {
-      skipRemainingIf: jsTestAllowed,
+      skipRemainingIf: jsTestDisallowed,
       setup:    '{ 1+1',
       check: {
         input:  '{ 1+1',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard1.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard1.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard1.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard1.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,46 +15,19 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testKeyboard1.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_keyboard1.js");
 }
 
-// <INJECTED SOURCE:END>
-
 var javascript = require('gcli/types/javascript');
 // var helpers = require('./helpers');
 
-var tempWindow;
-
-exports.setup = function(options) {
-  tempWindow = javascript.getGlobalObject();
-  javascript.setGlobalObject(options.window);
-};
-
-exports.shutdown = function(options) {
-  javascript.setGlobalObject(tempWindow);
-  tempWindow = undefined;
-};
-
 exports.testSimple = function(options) {
   return helpers.audit(options, [
     {
@@ -75,16 +48,12 @@
 exports.testScript = function(options) {
   return helpers.audit(options, [
     {
-      skipIf: function commandJsMissing() {
-        return options.requisition.system.commands.get('{') == null;
-      },
+      skipRemainingIf: options.isRemote ||
+              options.requisition.system.commands.get('{') == null,
       setup: '{ wind<TAB>',
       check: { input: '{ window' }
     },
     {
-      skipIf: function commandJsMissing() {
-        return options.requisition.system.commands.get('{') == null;
-      },
       setup: '{ window.docum<TAB>',
       check: { input: '{ window.document' }
     }
@@ -94,9 +63,8 @@
 exports.testJsdom = function(options) {
   return helpers.audit(options, [
     {
-      skipIf: function jsDomOrCommandJsMissing() {
-        return options.requisition.system.commands.get('{') == null;
-      },
+      skipIf: options.isRemote ||
+              options.requisition.system.commands.get('{') == null,
       setup: '{ window.document.titl<TAB>',
       check: { input: '{ window.document.title ' }
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard2.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard2.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard2.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard2.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testKeyboard2.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_keyboard2.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testIncr = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard3.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard3.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard3.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard3.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testKeyboard3.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_keyboard3.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testDecr = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard4.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard4.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard4.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard4.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testKeyboard4.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_keyboard4.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testIncrFloat = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard5.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard5.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard5.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard5.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testKeyboard5.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_keyboard5.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testCompleteDown = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard6.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard6.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard6.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_keyboard6.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testKeyboard6.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_keyboard6.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testCompleteUp = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_menu.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_menu.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_menu.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_menu.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testMenu.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_menu.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testOptions = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_node.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_node.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_node.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_node.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,49 +15,22 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testNode.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_node.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
-var nodetype = require('gcli/types/node');
-
-exports.setup = function(options) {
-  if (options.window) {
-    nodetype.setDocument(options.window.document);
-  }
-};
-
-exports.shutdown = function(options) {
-  nodetype.unsetDocument();
-};
 
 exports.testNode = function(options) {
   return helpers.audit(options, [
     {
-      skipRemainingIf: options.isNoDom,
       setup:    'tse ',
       check: {
         input:  'tse ',
@@ -165,11 +138,8 @@
 };
 
 exports.testNodeDom = function(options) {
-  var requisition = options.requisition;
-
   return helpers.audit(options, [
     {
-      skipRemainingIf: options.isNoDom,
       setup:    'tse :root',
       check: {
         input:  'tse :root',
@@ -202,10 +172,12 @@
           nodes2: { status: 'VALID' }
         }
       },
-      post: function() {
-        assert.is(requisition.getAssignment('node').value.tagName,
-                  'HTML',
-                  'root id');
+      exec: {
+      },
+      post: function(output) {
+        if (!options.isRemote) {
+          assert.is(output.args.node.tagName, 'HTML', ':root tagName');
+        }
       }
     },
     {
@@ -234,11 +206,8 @@
 };
 
 exports.testNodes = function(options) {
-  var requisition = options.requisition;
-
   return helpers.audit(options, [
     {
-      skipRemainingIf: options.isNoDom,
       setup:    'tse :root --nodes *',
       check: {
         input:  'tse :root --nodes *',
@@ -253,10 +222,18 @@
           nodes2: { status: 'VALID' }
         }
       },
-      post: function() {
-        assert.is(requisition.getAssignment('node').value.tagName,
-                  'HTML',
-                  '#gcli-input id');
+      exec: {
+      },
+      post: function(output) {
+        if (!options.isRemote) {
+          assert.is(output.args.node.tagName, 'HTML', ':root tagName');
+          assert.ok(output.args.nodes.length > 3, 'nodes length');
+          assert.is(output.args.nodes2.length, 0, 'nodes2 length');
+        }
+
+        assert.is(output.data.args.node, ':root', 'node data');
+        assert.is(output.data.args.nodes, '*', 'nodes data');
+        assert.is(output.data.args.nodes2, 'Error', 'nodes2 data');
       }
     },
     {
@@ -275,10 +252,18 @@
           nodes2: { arg: ' --nodes2 div', status: 'VALID' }
         }
       },
-      post: function() {
-        assert.is(requisition.getAssignment('node').value.tagName,
-                  'HTML',
-                  'root id');
+      exec: {
+      },
+      post: function(output) {
+        if (!options.isRemote) {
+          assert.is(output.args.node.tagName, 'HTML', ':root tagName');
+          assert.is(output.args.nodes.length, 0, 'nodes length');
+          assert.is(output.args.nodes2.item(0).tagName, 'DIV', 'div tagName');
+        }
+
+        assert.is(output.data.args.node, ':root', 'node data');
+        assert.is(output.data.args.nodes, 'Error', 'nodes data');
+        assert.is(output.data.args.nodes2, 'div', 'nodes2 data');
       }
     },
     {
@@ -305,13 +290,6 @@
           },
           nodes2: { arg: '', status: 'VALID', message: '' }
         }
-      },
-      post: function() {
-        /*
-        assert.is(requisition.getAssignment('nodes2').value.constructor.name,
-                  'NodeList',
-                  '#gcli-input id');
-        */
       }
     },
     {
@@ -333,16 +311,6 @@
           nodes: { arg: '', status: 'VALID', message: '' },
           nodes2: { arg: ' --nodes2 ffff', status: 'VALID', message: '' }
         }
-      },
-      post: function() {
-        /*
-        assert.is(requisition.getAssignment('nodes').value.constructor.name,
-                  'NodeList',
-                  '#gcli-input id');
-        assert.is(requisition.getAssignment('nodes2').value.constructor.name,
-                  'NodeList',
-                  '#gcli-input id');
-        */
       }
     },
   ]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_pref1.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_pref1.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_pref1.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_pref1.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testPref1.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_pref1.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testPrefShowStatus = function(options) {
@@ -67,7 +52,7 @@
       setup:    'pref show ',
       check: {
         typed:  'pref show ',
-        hints:            'allowSet',
+        hints:            'eagerHelper',
         markup: 'VVVVVVVVVV',
         status: 'ERROR'
       }
@@ -144,7 +129,7 @@
       setup:    'pref set ',
       check: {
         typed:  'pref set ',
-        hints:           'allowSet <value>',
+        hints:           'eagerHelper <value>',
         markup: 'VVVVVVVVV',
         status: 'ERROR'
       }
@@ -159,6 +144,7 @@
       }
     },
     {
+      skipIf: options.isRemote,
       setup:    'pref set tempTBool 4',
       check: {
         typed:  'pref set tempTBool 4',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_pref2.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_pref2.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_pref2.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_pref2.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testPref2.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_pref2.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 var mockSettings = require('./mockSettings');
@@ -55,10 +40,6 @@
     return;
   }
 
-  var allowSet = settings.getSetting('allowSet');
-  var initialAllowSet = allowSet.value;
-  allowSet.value = false;
-
   assert.is(mockSettings.tempNumber.value, 42, 'set to 42');
 
   return helpers.audit(options, [
@@ -73,7 +54,6 @@
       }
     },
     {
-      skipRemainingIf: options.isNoDom,
       setup:    'pref set tempNumber 4',
       check: {
         input:  'pref set tempNumber 4',
@@ -99,16 +79,6 @@
         }
       },
       exec: {
-        output: [ /void your warranty/, /I promise/ ]
-      },
-      post: function() {
-        assert.is(mockSettings.tempNumber.value, 42, 'still set to 42');
-        allowSet.value = true;
-      }
-    },
-    {
-      setup:    'pref set tempNumber 4',
-      exec: {
         output: ''
       },
       post: function() {
@@ -128,8 +98,6 @@
       },
       post: function() {
         assert.is(mockSettings.tempNumber.value, 42, 'reset to 42');
-
-        allowSet.value = initialAllowSet;
       }
     },
     {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_remotews.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_remotews.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_remotews.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_remotews.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testRemoteWs.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_remotews.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 
@@ -83,8 +68,8 @@
       check: {
         args: {
           prefix: {
-            value: function(connection) {
-              assert.is(connection.prefix, 'remote', 'disconnecting remote');
+            value: function(front) {
+              assert.is(front.prefix, 'remote', 'disconnecting remote');
             }
           }
         }
@@ -112,8 +97,8 @@
       check: {
         args: {
           prefix: {
-            value: function(connection) {
-              assert.is(connection.prefix, 'remote', 'disconnecting remote');
+            value: function(front) {
+              assert.is(front.prefix, 'remote', 'disconnecting remote');
             }
           }
         }
@@ -466,8 +451,8 @@
         unassigned: [ ],
         args: {
           prefix: {
-            value: function(connection) {
-              assert.is(connection.prefix, 'remote', 'disconnecting remote');
+            value: function(front) {
+              assert.is(front.prefix, 'remote', 'disconnecting remote');
             },
             arg: ' remote',
             status: 'VALID',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_remotexhr.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_remotexhr.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_remotexhr.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_remotexhr.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testRemoteXhr.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_remotexhr.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 
@@ -83,8 +68,8 @@
       check: {
         args: {
           prefix: {
-            value: function(connection) {
-              assert.is(connection.prefix, 'remote', 'disconnecting remote');
+            value: function(front) {
+              assert.is(front.prefix, 'remote', 'disconnecting remote');
             }
           }
         }
@@ -112,8 +97,8 @@
       check: {
         args: {
           prefix: {
-            value: function(connection) {
-              assert.is(connection.prefix, 'remote', 'disconnecting remote');
+            value: function(front) {
+              assert.is(front.prefix, 'remote', 'disconnecting remote');
             }
           }
         }
@@ -466,8 +451,8 @@
         unassigned: [ ],
         args: {
           prefix: {
-            value: function(connection) {
-              assert.is(connection.prefix, 'remote', 'disconnecting remote');
+            value: function(front) {
+              assert.is(front.prefix, 'remote', 'disconnecting remote');
             },
             arg: ' remote',
             status: 'VALID',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_resource.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_resource.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_resource.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_resource.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,17 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testResource.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_resource.js");
 }
 
-// <INJECTED SOURCE:END>
-
+// var helpers = require('./helpers');
 // var assert = require('../testharness/assert');
 
 var Promise = require('gcli/util/promise').Promise;
@@ -47,84 +33,85 @@
 var resource = require('gcli/types/resource');
 var Status = require('gcli/types/types').Status;
 
-
-var tempDocument;
-
-exports.setup = function(options) {
-  tempDocument = resource.getDocument();
-  if (options.window) {
-    resource.setDocument(options.window.document);
-  }
-};
-
-exports.shutdown = function(options) {
-  resource.setDocument(tempDocument);
-  tempDocument = undefined;
+exports.testCommand = function(options) {
+  return helpers.audit(options, [
+    {
+      setup:    'tsres ',
+      check: {
+        predictionsContains: [ 'inline-css' ],
+      }
+    }
+  ]);
 };
 
 exports.testAllPredictions1 = function(options) {
-  if (options.isFirefox || options.isNoDom) {
-    assert.log('Skipping checks due to firefox document.stylsheets support.');
+  if (options.isRemote) {
+    assert.log('Can\'t directly test remote types locally.');
     return;
   }
 
+  var context = options.requisition.conversionContext;
   var resource = options.requisition.system.types.createType('resource');
-  return resource.getLookup().then(function(opts) {
+  return resource.getLookup(context).then(function(opts) {
     assert.ok(opts.length > 1, 'have all resources');
 
     return util.promiseEach(opts, function(prediction) {
-      return checkPrediction(resource, prediction);
+      return checkPrediction(resource, prediction, context);
     });
   });
 };
 
 exports.testScriptPredictions = function(options) {
-  if (options.isFirefox || options.isNoDom) {
-    assert.log('Skipping checks due to firefox document.stylsheets support.');
+  if (options.isRemote || options.isNode) {
+    assert.log('Can\'t directly test remote types locally.');
     return;
   }
 
+  var context = options.requisition.conversionContext;
   var types = options.requisition.system.types;
   var resource = types.createType({ name: 'resource', include: 'text/javascript' });
-  return resource.getLookup().then(function(opts) {
+  return resource.getLookup(context).then(function(opts) {
     assert.ok(opts.length > 1, 'have js resources');
 
     return util.promiseEach(opts, function(prediction) {
-      return checkPrediction(resource, prediction);
+      return checkPrediction(resource, prediction, context);
     });
   });
 };
 
 exports.testStylePredictions = function(options) {
-  if (options.isFirefox || options.isNoDom) {
-    assert.log('Skipping checks due to firefox document.stylsheets support.');
+  if (options.isRemote) {
+    assert.log('Can\'t directly test remote types locally.');
     return;
   }
 
+  var context = options.requisition.conversionContext;
   var types = options.requisition.system.types;
   var resource = types.createType({ name: 'resource', include: 'text/css' });
-  return resource.getLookup().then(function(opts) {
+  return resource.getLookup(context).then(function(opts) {
     assert.ok(opts.length >= 1, 'have css resources');
 
     return util.promiseEach(opts, function(prediction) {
-      return checkPrediction(resource, prediction);
+      return checkPrediction(resource, prediction, context);
     });
   });
 };
 
 exports.testAllPredictions2 = function(options) {
-  if (options.isNoDom) {
-    assert.log('Skipping checks due to nodom document.stylsheets support.');
+  if (options.isRemote) {
+    assert.log('Can\'t directly test remote types locally.');
     return;
   }
+
+  var context = options.requisition.conversionContext;
   var types = options.requisition.system.types;
 
   var scriptRes = types.createType({ name: 'resource', include: 'text/javascript' });
-  return scriptRes.getLookup().then(function(scriptOptions) {
+  return scriptRes.getLookup(context).then(function(scriptOptions) {
     var styleRes = types.createType({ name: 'resource', include: 'text/css' });
-    return styleRes.getLookup().then(function(styleOptions) {
+    return styleRes.getLookup(context).then(function(styleOptions) {
       var allRes = types.createType({ name: 'resource' });
-      return allRes.getLookup().then(function(allOptions) {
+      return allRes.getLookup(context).then(function(allOptions) {
         assert.is(scriptOptions.length + styleOptions.length,
                   allOptions.length,
                   'split');
@@ -134,27 +121,26 @@
 };
 
 exports.testAllPredictions3 = function(options) {
-  if (options.isNoDom) {
-    assert.log('Skipping checks due to nodom document.stylsheets support.');
+  if (options.isRemote) {
+    assert.log('Can\'t directly test remote types locally.');
     return;
   }
 
+  var context = options.requisition.conversionContext;
   var types = options.requisition.system.types;
   var res1 = types.createType({ name: 'resource' });
-  return res1.getLookup().then(function(options1) {
+  return res1.getLookup(context).then(function(options1) {
     var res2 = types.createType('resource');
-    return res2.getLookup().then(function(options2) {
+    return res2.getLookup(context).then(function(options2) {
       assert.is(options1.length, options2.length, 'type spec');
     });
   });
 };
 
-function checkPrediction(res, prediction) {
+function checkPrediction(res, prediction, context) {
   var name = prediction.name;
   var value = prediction.value;
 
-  // resources don't need context so cheat and pass in null
-  var context = null;
   return res.parseString(name, context).then(function(conversion) {
     assert.is(conversion.getStatus(), Status.VALID, 'status VALID for ' + name);
     assert.is(conversion.value, value, 'value for ' + name);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_short.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_short.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_short.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_short.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testShort.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_short.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testBasic = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_spell.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_spell.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_spell.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_spell.js	2015-04-24 19:30:56.000000000 +0000
@@ -14,31 +14,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testSpell.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_spell.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 var spell = require('gcli/util/spell');
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_split.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_split.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_split.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_split.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testSplit.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_split.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 
 var cli = require('gcli/cli');
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_string.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_string.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_string.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_string.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testString.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_string.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var helpers = require('./helpers');
 
 exports.testNewLine = function(options) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_tokenize.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_tokenize.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_tokenize.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_tokenize.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testTokenize.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_tokenize.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 var cli = require('gcli/cli');
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_tooltip.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_tooltip.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_tooltip.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_tooltip.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,40 +15,20 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testTooltip.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_tooltip.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 
 exports.testActivate = function(options) {
-  if (!options.display) {
-    assert.log('No display. Skipping activate tests');
-    return;
-  }
-
   return helpers.audit(options, [
     {
       setup:    ' ',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_types.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_types.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_types.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_types.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,49 +15,25 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testTypes.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_types.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 var util = require('gcli/util/util');
 var Promise = require('gcli/util/promise').Promise;
-var nodetype = require('gcli/types/node');
-
-exports.setup = function(options) {
-  if (options.window) {
-    nodetype.setDocument(options.window.document);
-  }
-};
-
-exports.shutdown = function(options) {
-  nodetype.unsetDocument();
-};
 
-function forEachType(options, typeSpec, callback) {
+function forEachType(options, templateTypeSpec, callback) {
   var types = options.requisition.system.types;
   return util.promiseEach(types.getTypeNames(), function(name) {
+    var typeSpec = {};
+    util.copyProperties(templateTypeSpec, typeSpec);
     typeSpec.name = name;
     typeSpec.requisition = options.requisition;
 
@@ -79,29 +55,19 @@
     else if (name === 'union') {
       typeSpec.alternatives = [{ name: 'string' }];
     }
+    else if (options.isRemote) {
+      if (name === 'node' || name === 'nodelist') {
+        return;
+      }
+    }
 
     var type = types.createType(typeSpec);
     var reply = callback(type);
-    return Promise.resolve(reply).then(function(value) {
-      // Clean up
-      delete typeSpec.name;
-      delete typeSpec.requisition;
-      delete typeSpec.data;
-      delete typeSpec.delegateType;
-      delete typeSpec.subtype;
-      delete typeSpec.alternatives;
-
-      return value;
-    });
+    return Promise.resolve(reply);
   });
 }
 
 exports.testDefault = function(options) {
-  if (options.isNoDom) {
-    assert.log('Skipping tests due to issues with resource type.');
-    return;
-  }
-
   return forEachType(options, {}, function(type) {
     var context = options.requisition.executionContext;
     var blank = type.getBlank(context).value;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_union.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_union.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_union.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_union.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,31 +15,16 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testUnion.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_union.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 
@@ -126,7 +111,7 @@
       }
     },
     {
-      skipIf: options.isPhantomjs, // Phantom goes weird with predictions
+      skipIf: options.isPhantomjs, // PhantomJS gets predictions wrong
       setup:    'unionc1 5',
       check: {
         input:  'unionc1 5',
@@ -160,7 +145,7 @@
       }
     },
     {
-      skipRemainingIf: options.isPhantomjs,
+      skipIf: options.isPhantomjs, // PhantomJS URL type is broken
       setup:    'unionc2 on',
       check: {
         input:  'unionc2 on',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_url.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_url.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/browser_gcli_url.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/browser_gcli_url.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,38 +15,23 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
-var exports = {};
-
-var TEST_URI = "data:text/html;charset=utf-8,<p id='gcli-input'>gcli-testUrl.js</p>";
+const exports = {};
 
 function test() {
-  return Task.spawn(function() {
-    let options = yield helpers.openTab(TEST_URI);
-    yield helpers.openToolbar(options);
-    gcli.addItems(mockCommands.items);
-
-    yield helpers.runTests(options, exports);
-
-    gcli.removeItems(mockCommands.items);
-    yield helpers.closeToolbar(options);
-    yield helpers.closeTab(options);
-  }).then(finish, helpers.handleError);
+  helpers.runTestModule(exports, "browser_gcli_url.js");
 }
 
-// <INJECTED SOURCE:END>
-
 // var assert = require('../testharness/assert');
 // var helpers = require('./helpers');
 
 exports.testDefault = function(options) {
   return helpers.audit(options, [
     {
-      skipRemainingIf: options.isPhantomjs,
+      skipRemainingIf: options.isPhantomjs, // PhantomJS URL type is broken
       setup:    'urlc',
       check: {
         input:  'urlc',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/helpers.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/helpers.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/helpers.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/helpers.js	2015-04-24 19:30:56.000000000 +0000
@@ -18,7 +18,7 @@
 
 // A copy of this code exists in firefox mochitests. They should be kept
 // in sync. Hence the exports synonym for non AMD contexts.
-var { helpers, gcli, assert } = (function() {
+var { helpers, assert } = (function() {
 
 var helpers = {};
 
@@ -30,23 +30,24 @@
 var Promise = require('gcli/util/promise').Promise;
 var cli = require('gcli/cli');
 var KeyEvent = require('gcli/util/util').KeyEvent;
-var gcli = require('gcli/index');
+
+const { GcliFront } = require("devtools/server/actors/gcli");
 
 /**
  * See notes in helpers.checkOptions()
  */
-var createFFDisplayAutomator = function(display) {
+var createDeveloperToolbarAutomator = function(toolbar) {
   var automator = {
     setInput: function(typed) {
-      return display.inputter.setInput(typed);
+      return toolbar.inputter.setInput(typed);
     },
 
     setCursor: function(cursor) {
-      return display.inputter.setCursor(cursor);
+      return toolbar.inputter.setCursor(cursor);
     },
 
     focus: function() {
-      return display.inputter.focus();
+      return toolbar.inputter.focus();
     },
 
     fakeKey: function(keyCode) {
@@ -56,36 +57,36 @@
         timeStamp: new Date().getTime()
       };
 
-      display.inputter.onKeyDown(fakeEvent);
+      toolbar.inputter.onKeyDown(fakeEvent);
 
       if (keyCode === KeyEvent.DOM_VK_BACK_SPACE) {
-        var input = display.inputter.element;
+        var input = toolbar.inputter.element;
         input.value = input.value.slice(0, -1);
       }
 
-      return display.inputter.handleKeyUp(fakeEvent);
+      return toolbar.inputter.handleKeyUp(fakeEvent);
     },
 
     getInputState: function() {
-      return display.inputter.getInputState();
+      return toolbar.inputter.getInputState();
     },
 
     getCompleterTemplateData: function() {
-      return display.completer._getCompleterTemplateData();
+      return toolbar.completer._getCompleterTemplateData();
     },
 
     getErrorMessage: function() {
-      return display.tooltip.errorEle.textContent;
+      return toolbar.tooltip.errorEle.textContent;
     }
   };
 
   Object.defineProperty(automator, 'focusManager', {
-    get: function() { return display.focusManager; },
+    get: function() { return toolbar.focusManager; },
     enumerable: true
   });
 
   Object.defineProperty(automator, 'field', {
-    get: function() { return display.tooltip.field; },
+    get: function() { return toolbar.tooltip.field; },
     enumerable: true
   });
 
@@ -223,9 +224,9 @@
   options.chromeWindow = options.chromeWindow || window;
 
   return options.chromeWindow.DeveloperToolbar.show(true).then(function() {
-    var display = options.chromeWindow.DeveloperToolbar.display;
-    options.automator = createFFDisplayAutomator(display);
-    options.requisition = display.requisition;
+    var toolbar = options.chromeWindow.DeveloperToolbar;
+    options.automator = createDeveloperToolbarAutomator(toolbar);
+    options.requisition = toolbar.requisition;
     return options;
   });
 };
@@ -331,17 +332,17 @@
  * Warning: For use with Firefox Mochitests only.
  *
  * As addTab, but that also opens the developer toolbar. In addition a new
- * 'automator' property is added to the options object with the display from GCLI
- * in the developer toolbar
+ * 'automator' property is added to the options object which uses the
+ * developer toolbar
  */
 helpers.addTabWithToolbar = function(url, callback, options) {
   return helpers.addTab(url, function(innerOptions) {
     var win = innerOptions.chromeWindow;
 
     return win.DeveloperToolbar.show(true).then(function() {
-      var display = win.DeveloperToolbar.display;
-      innerOptions.automator = createFFDisplayAutomator(display);
-      innerOptions.requisition = display.requisition;
+      var toolbar = win.DeveloperToolbar;
+      innerOptions.automator = createDeveloperToolbarAutomator(toolbar);
+      innerOptions.requisition = toolbar.requisition;
 
       var reply = callback.call(null, innerOptions);
 
@@ -376,7 +377,7 @@
 
   var recover = function(error) {
     ok(false, error);
-    console.error(error);
+    console.error(error, error.stack);
   };
 
   info("SETUP");
@@ -410,6 +411,87 @@
   }, recover);
 };
 
+const MOCK_COMMANDS_URI = "chrome://mochitests/content/browser/browser/devtools/commandline/test/mockCommands.js";
+
+const defer = function() {
+  const deferred = { };
+  deferred.promise = new Promise(function(resolve, reject) {
+    deferred.resolve = resolve;
+    deferred.reject = reject;
+  });
+  return deferred;
+};
+
+/**
+ * This does several actions associated with running a GCLI test in mochitest
+ * 1. Create a new tab containing basic markup for GCLI tests
+ * 2. Open the developer toolbar
+ * 3. Register the mock commands with the server process
+ * 4. Wait for the proxy commands to be auto-regitstered with the client
+ * 5. Register the mock converters with the client process
+ * 6. Run all the tests
+ * 7. Tear down all the setup
+ */
+helpers.runTestModule = function(exports, name) {
+  return Task.spawn(function*() {
+    const uri = "data:text/html;charset=utf-8," +
+                "<style>div{color:red;}</style>" +
+                "<div id='gcli-root'>" + name + "</div>";
+
+    const options = yield helpers.openTab(uri);
+    options.isRemote = true;
+
+    yield helpers.openToolbar(options);
+
+    const system = options.requisition.system;
+
+    // Register a one time listener with the local set of commands
+    const addedDeferred = defer();
+    const removedDeferred = defer();
+    let state = 'preAdd'; // Then 'postAdd' then 'postRemove'
+
+    system.commands.onCommandsChange.add(function(ev) {
+      if (system.commands.get('tsslow') != null) {
+        if (state === 'preAdd') {
+          addedDeferred.resolve();
+          state = 'postAdd';
+        }
+      }
+      else {
+        if (state === 'postAdd') {
+          removedDeferred.resolve();
+          state = 'postRemove';
+        }
+      }
+    });
+
+    // Send a message to add the commands to the content process
+    const front = yield GcliFront.create(options.target);
+    yield front._testOnly_addItemsByModule(MOCK_COMMANDS_URI);
+
+    // This will cause the local set of commands to be updated with the
+    // command proxies, wait for that to complete.
+    yield addedDeferred.promise;
+
+    // Now we need to add the converters to the local GCLI
+    const converters = mockCommands.items.filter(item => item.item === 'converter');
+    system.addItems(converters);
+
+    // Next run the tests
+    yield helpers.runTests(options, exports);
+
+    // Finally undo the mock commands and converters
+    system.removeItems(converters);
+    const removePromise = system.commands.onCommandsChange.once();
+    yield front._testOnly_removeItemsByModule(MOCK_COMMANDS_URI);
+    yield removedDeferred.promise;
+
+    // And close everything down
+    yield helpers.closeToolbar(options);
+    yield helpers.closeTab(options);
+  }).then(finish, helpers.handleError);
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -759,15 +841,15 @@
   var outstanding = [];
   var suffix = name ? ' (for \'' + name + '\')' : '';
 
-  if (!options.isNoDom && 'input' in checks) {
+  if (!options.isNode && 'input' in checks) {
     assert.is(helpers._actual.input(options), checks.input, 'input' + suffix);
   }
 
-  if (!options.isNoDom && 'cursor' in checks) {
+  if (!options.isNode && 'cursor' in checks) {
     assert.is(helpers._actual.cursor(options), checks.cursor, 'cursor' + suffix);
   }
 
-  if (!options.isNoDom && 'current' in checks) {
+  if (!options.isNode && 'current' in checks) {
     assert.is(helpers._actual.current(options), checks.current, 'current' + suffix);
   }
 
@@ -775,18 +857,18 @@
     assert.is(helpers._actual.status(options), checks.status, 'status' + suffix);
   }
 
-  if (!options.isNoDom && 'markup' in checks) {
+  if (!options.isNode && 'markup' in checks) {
     assert.is(helpers._actual.markup(options), checks.markup, 'markup' + suffix);
   }
 
-  if (!options.isNoDom && 'hints' in checks) {
+  if (!options.isNode && 'hints' in checks) {
     var hintCheck = function(actualHints) {
       assert.is(actualHints, checks.hints, 'hints' + suffix);
     };
     outstanding.push(helpers._actual.hints(options).then(hintCheck));
   }
 
-  if (!options.isNoDom && 'predictions' in checks) {
+  if (!options.isNode && 'predictions' in checks) {
     var predictionsCheck = function(actualPredictions) {
       helpers.arrayIs(actualPredictions,
                        checks.predictions,
@@ -795,12 +877,16 @@
     outstanding.push(helpers._actual.predictions(options).then(predictionsCheck));
   }
 
-  if (!options.isNoDom && 'predictionsContains' in checks) {
+  if (!options.isNode && 'predictionsContains' in checks) {
     var containsCheck = function(actualPredictions) {
       checks.predictionsContains.forEach(function(prediction) {
         var index = actualPredictions.indexOf(prediction);
         assert.ok(index !== -1,
                   'predictionsContains:' + prediction + suffix);
+        if (index === -1) {
+          log('Actual predictions (' + actualPredictions.length + '): ' +
+              actualPredictions.join(', '));
+        }
       });
     };
     outstanding.push(helpers._actual.predictions(options).then(containsCheck));
@@ -813,26 +899,26 @@
   }
 
   /* TODO: Fix this
-  if (!options.isNoDom && 'tooltipState' in checks) {
+  if (!options.isNode && 'tooltipState' in checks) {
     assert.is(helpers._actual.tooltipState(options),
               checks.tooltipState,
               'tooltipState' + suffix);
   }
   */
 
-  if (!options.isNoDom && 'outputState' in checks) {
+  if (!options.isNode && 'outputState' in checks) {
     assert.is(helpers._actual.outputState(options),
               checks.outputState,
               'outputState' + suffix);
   }
 
-  if (!options.isNoDom && 'options' in checks) {
+  if (!options.isNode && 'options' in checks) {
     helpers.arrayIs(helpers._actual.options(options),
                      checks.options,
                      'options' + suffix);
   }
 
-  if (!options.isNoDom && 'error' in checks) {
+  if (!options.isNode && 'error' in checks) {
     assert.is(helpers._actual.message(options), checks.error, 'error' + suffix);
   }
 
@@ -894,7 +980,7 @@
                   'arg.' + paramName + '.status' + suffix);
       }
 
-      if (!options.isNoDom && 'message' in check) {
+      if (!options.isNode && 'message' in check) {
         if (typeof check.message.test === 'function') {
           assert.ok(check.message.test(assignment.message),
                     'arg.' + paramName + '.message' + suffix);
@@ -952,12 +1038,12 @@
 
       var context = requisition.conversionContext;
       var convertPromise;
-      if (options.isNoDom) {
+      if (options.isNode) {
         convertPromise = output.convert('string', context);
       }
       else {
         convertPromise = output.convert('dom', context).then(function(node) {
-          return node.textContent.trim();
+          return (node == null) ? '' : node.textContent.trim();
         });
       }
 
@@ -1171,9 +1257,8 @@
             '';
         assert.log('Skipped ' + name + ' ' + skipReason);
 
-        // Tests need at least one pass, fail or todo. Let's create a dummy pass
-        // in case there are none.
-        ok(true, "Each test requires at least one pass, fail or todo so here is a pass.");
+        // Tests need at least one pass, fail or todo. Create a dummy pass
+        assert.ok(true, 'Each test requires at least one pass, fail or todo');
 
         return Promise.resolve(undefined);
       }
@@ -1270,5 +1355,5 @@
   }
 }
 
-return { helpers: helpers, gcli: gcli, assert: assert };
+return { helpers: helpers, assert: assert };
 })();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/mockCommands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/mockCommands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/commandline/test/mockCommands.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/commandline/test/mockCommands.js	2015-04-24 19:30:56.000000000 +0000
@@ -15,16 +15,21 @@
  */
 
 'use strict';
-// <INJECTED SOURCE:START>
 
 // THIS FILE IS GENERATED FROM SOURCE IN THE GCLI PROJECT
-// DO NOT EDIT IT DIRECTLY
-
-// <INJECTED SOURCE:END>
-
+// PLEASE TALK TO SOMEONE IN DEVELOPER TOOLS BEFORE EDITING IT
 
 var Promise = require('gcli/util/promise').Promise;
-var mockCommands = {};
+
+var mockCommands;
+if (typeof exports !== 'undefined') {
+  // If we're being loaded via require();
+  mockCommands = exports;
+}
+else {
+  // If we're being loaded via loadScript in mochitest
+  mockCommands = {};
+}
 
 // We use an alias for exports here because this module is used in Firefox
 // mochitests where we don't have define/require
@@ -41,32 +46,70 @@
 };
 
 function createExec(name) {
-  return function(args, executionContext) {
-    var argsOut = Object.keys(args).map(function(key) {
-      return key + '=' + args[key];
-    }).join(', ');
-    return 'Exec: ' + name + ' ' + argsOut;
+  return function(args, context) {
+    var promises = [];
+
+    Object.keys(args).map(function(argName) {
+      var value = args[argName];
+      var type = this.getParameterByName(argName).type;
+      var promise = Promise.resolve(type.stringify(value, context));
+      promises.push(promise.then(function(str) {
+        return { name: argName, value: str };
+      }.bind(this)));
+    }.bind(this));
+
+    return Promise.all(promises).then(function(data) {
+      var argValues = {};
+      data.forEach(function(entry) { argValues[entry.name] = entry.value; });
+
+      return context.typedData('testCommandOutput', {
+        name: name,
+        args: argValues
+      });
+    }.bind(this));
   };
 }
 
 mockCommands.items = [
   {
     item: 'converter',
-    from: 'json',
-    to: 'string',
-    exec: function(json, context) {
-      return JSON.stringify(json, null, '  ');
+    from: 'testCommandOutput',
+    to: 'dom',
+    exec: function(testCommandOutput, context) {
+      var view = context.createView({
+        data: testCommandOutput,
+        html: '' +
+          '<table>' +
+            '<thead>' +
+              '<tr>' +
+                '<th colspan="3">Exec: ${name}</th>' +
+              '</tr>' +
+            '</thead>' +
+            '<tbody>' +
+              '<tr foreach="key in ${args}">' +
+                '<td> ${key}</td>' +
+                '<td>=</td>' +
+                '<td>${args[key]}</td>' +
+              '</tr>' +
+            '</tbody>' +
+          '</table>',
+        options: {
+          allowEval: true
+        }
+      });
+
+      return view.toDom(context.document);
     }
   },
   {
     item: 'converter',
-    from: 'json',
-    to: 'view',
-    exec: function(json, context) {
-      var html = JSON.stringify(json, null, '&#160;').replace(/\n/g, '<br/>');
-      return {
-        html: '<pre>' + html + '</pre>'
-      };
+    from: 'testCommandOutput',
+    to: 'string',
+    exec: function(testCommandOutput, context) {
+      var argsOut = Object.keys(testCommandOutput.args).map(function(key) {
+        return key + '=' + testCommandOutput.args[key];
+      }).join(' ');
+      return 'Exec: ' + testCommandOutput.name + ' ' + argsOut;
     }
   },
   {
@@ -508,7 +551,7 @@
     exec: function(args, context) {
       if (args.method === 'reject') {
         return new Promise(function(resolve, reject) {
-          setTimeout(function() {
+          context.environment.window.setTimeout(function() {
             reject('rejected promise');
           }, 10);
         });
@@ -516,7 +559,7 @@
 
       if (args.method === 'rejecttyped') {
         return new Promise(function(resolve, reject) {
-          setTimeout(function() {
+          context.environment.window.setTimeout(function() {
             reject(context.typedData('number', 54));
           }, 10);
         });
@@ -524,7 +567,7 @@
 
       if (args.method === 'throwinpromise') {
         return new Promise(function(resolve, reject) {
-          setTimeout(function() {
+          context.environment.window.setTimeout(function() {
             resolve('should be lost');
           }, 10);
         }).then(function() {
@@ -655,7 +698,7 @@
           name: 'selection',
           data: function(context) {
             return new Promise(function(resolve, reject) {
-              setTimeout(function() {
+              context.environment.window.setTimeout(function() {
                 resolve([
                   'Shalom', 'Namasté', 'Hallo', 'Dydd-da',
                   'Chào', 'Hej', 'Saluton', 'Sawubona'
@@ -738,5 +781,16 @@
     exec: function(args, context) {
       return args;
     }
+  },
+  {
+    item: 'command',
+    name: 'tsres',
+    params: [
+      {
+        name: 'resource',
+        type: 'resource'
+      }
+    ],
+    exec: createExec('tsres'),
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/debugger/debugger-commands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/debugger/debugger-commands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/debugger/debugger-commands.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/debugger/debugger-commands.js	2015-04-24 19:30:56.000000000 +0000
@@ -5,7 +5,7 @@
 "use strict";
 
 const { Cc, Ci, Cu } = require("chrome");
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
 
@@ -67,8 +67,8 @@
  */
 exports.items.push({
   name: "break",
-  description: gcli.lookup("breakDesc"),
-  manual: gcli.lookup("breakManual")
+  description: l10n.lookup("breakDesc"),
+  manual: l10n.lookup("breakManual")
 });
 
 /**
@@ -76,7 +76,9 @@
  */
 exports.items.push({
   name: "break list",
-  description: gcli.lookup("breaklistDesc"),
+  item: "command",
+  runAt: "client",
+  description: l10n.lookup("breaklistDesc"),
   returnType: "breakpoints",
   exec: function(args, context) {
     let dbg = getPanel(context, "jsdebugger", { ensureOpened: true });
@@ -102,7 +104,7 @@
     } else {
       return context.createView({
         html: "<p>${message}</p>",
-        data: { message: gcli.lookup("breaklistNone") }
+        data: { message: l10n.lookup("breaklistNone") }
       });
     }
   }
@@ -126,7 +128,7 @@
       "            data-command='break del ${breakpoint.label}'" +
       "            onclick='${onclick}'" +
       "            ondblclick='${ondblclick}'>" +
-      "        " + gcli.lookup("breaklistOutRemove") + "</span>" +
+      "        " + l10n.lookup("breaklistOutRemove") + "</span>" +
       "    </td>" +
       "  </tr>" +
       " </tbody>" +
@@ -141,16 +143,18 @@
  */
 exports.items.push({
   name: "break add",
-  description: gcli.lookup("breakaddDesc"),
-  manual: gcli.lookup("breakaddManual")
+  description: l10n.lookup("breakaddDesc"),
+  manual: l10n.lookup("breakaddManual")
 });
 
 /**
  * 'break add line' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: "break add line",
-  description: gcli.lookup("breakaddlineDesc"),
+  description: l10n.lookup("breakaddlineDesc"),
   params: [
     {
       name: "file",
@@ -160,19 +164,19 @@
           return getAllSources(getPanel(context, "jsdebugger"));
         }
       },
-      description: gcli.lookup("breakaddlineFileDesc")
+      description: l10n.lookup("breakaddlineFileDesc")
     },
     {
       name: "line",
       type: { name: "number", min: 1, step: 10 },
-      description: gcli.lookup("breakaddlineLineDesc")
+      description: l10n.lookup("breakaddlineLineDesc")
     }
   ],
   returnType: "string",
   exec: function(args, context) {
     let dbg = getPanel(context, "jsdebugger");
     if (!dbg) {
-      return gcli.lookup("debuggerStopped");
+      return l10n.lookup("debuggerStopped");
     }
 
     let deferred = context.defer();
@@ -182,9 +186,9 @@
     let position = { actor: item.value, line: args.line };
 
     dbg.addBreakpoint(position).then(() => {
-      deferred.resolve(gcli.lookup("breakaddAdded"));
+      deferred.resolve(l10n.lookup("breakaddAdded"));
     }, aError => {
-      deferred.resolve(gcli.lookupFormat("breakaddFailed", [aError]));
+      deferred.resolve(l10n.lookupFormat("breakaddFailed", [aError]));
     });
 
     return deferred.promise;
@@ -195,8 +199,10 @@
  * 'break del' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: "break del",
-  description: gcli.lookup("breakdelDesc"),
+  description: l10n.lookup("breakdelDesc"),
   params: [
     {
       name: "breakpoint",
@@ -214,14 +220,14 @@
           }));
         }
       },
-      description: gcli.lookup("breakdelBreakidDesc")
+      description: l10n.lookup("breakdelBreakidDesc")
     }
   ],
   returnType: "string",
   exec: function(args, context) {
     let dbg = getPanel(context, "jsdebugger");
     if (!dbg) {
-      return gcli.lookup("debuggerStopped");
+      return l10n.lookup("debuggerStopped");
     }
 
     let source = dbg._view.Sources.getItemForAttachment(a => {
@@ -233,9 +239,9 @@
                      line: args.breakpoint.lineNumber };
 
     dbg.removeBreakpoint(position).then(() => {
-      deferred.resolve(gcli.lookup("breakdelRemoved"));
+      deferred.resolve(l10n.lookup("breakdelRemoved"));
     }, () => {
-      deferred.resolve(gcli.lookup("breakNotFound"));
+      deferred.resolve(l10n.lookup("breakNotFound"));
     });
 
     return deferred.promise;
@@ -247,16 +253,18 @@
  */
 exports.items.push({
   name: "dbg",
-  description: gcli.lookup("dbgDesc"),
-  manual: gcli.lookup("dbgManual")
+  description: l10n.lookup("dbgDesc"),
+  manual: l10n.lookup("dbgManual")
 });
 
 /**
  * 'dbg open' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: "dbg open",
-  description: gcli.lookup("dbgOpen"),
+  description: l10n.lookup("dbgOpen"),
   params: [],
   exec: function(args, context) {
     let target = context.environment.target;
@@ -268,8 +276,10 @@
  * 'dbg close' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: "dbg close",
-  description: gcli.lookup("dbgClose"),
+  description: l10n.lookup("dbgClose"),
   params: [],
   exec: function(args, context) {
     if (!getPanel(context, "jsdebugger")) {
@@ -284,13 +294,15 @@
  * 'dbg interrupt' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: "dbg interrupt",
-  description: gcli.lookup("dbgInterrupt"),
+  description: l10n.lookup("dbgInterrupt"),
   params: [],
   exec: function(args, context) {
     let dbg = getPanel(context, "jsdebugger");
     if (!dbg) {
-      return gcli.lookup("debuggerStopped");
+      return l10n.lookup("debuggerStopped");
     }
 
     let controller = dbg._controller;
@@ -305,13 +317,15 @@
  * 'dbg continue' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: "dbg continue",
-  description: gcli.lookup("dbgContinue"),
+  description: l10n.lookup("dbgContinue"),
   params: [],
   exec: function(args, context) {
     let dbg = getPanel(context, "jsdebugger");
     if (!dbg) {
-      return gcli.lookup("debuggerStopped");
+      return l10n.lookup("debuggerStopped");
     }
 
     let controller = dbg._controller;
@@ -326,22 +340,26 @@
  * 'dbg step' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: "dbg step",
-  description: gcli.lookup("dbgStepDesc"),
-  manual: gcli.lookup("dbgStepManual")
+  description: l10n.lookup("dbgStepDesc"),
+  manual: l10n.lookup("dbgStepManual")
 });
 
 /**
  * 'dbg step over' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: "dbg step over",
-  description: gcli.lookup("dbgStepOverDesc"),
+  description: l10n.lookup("dbgStepOverDesc"),
   params: [],
   exec: function(args, context) {
     let dbg = getPanel(context, "jsdebugger");
     if (!dbg) {
-      return gcli.lookup("debuggerStopped");
+      return l10n.lookup("debuggerStopped");
     }
 
     let controller = dbg._controller;
@@ -356,13 +374,15 @@
  * 'dbg step in' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: 'dbg step in',
-  description: gcli.lookup("dbgStepInDesc"),
+  description: l10n.lookup("dbgStepInDesc"),
   params: [],
   exec: function(args, context) {
     let dbg = getPanel(context, "jsdebugger");
     if (!dbg) {
-      return gcli.lookup("debuggerStopped");
+      return l10n.lookup("debuggerStopped");
     }
 
     let controller = dbg._controller;
@@ -377,13 +397,15 @@
  * 'dbg step over' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: 'dbg step out',
-  description: gcli.lookup("dbgStepOutDesc"),
+  description: l10n.lookup("dbgStepOutDesc"),
   params: [],
   exec: function(args, context) {
     let dbg = getPanel(context, "jsdebugger");
     if (!dbg) {
-      return gcli.lookup("debuggerStopped");
+      return l10n.lookup("debuggerStopped");
     }
 
     let controller = dbg._controller;
@@ -398,14 +420,16 @@
  * 'dbg list' command
  */
 exports.items.push({
+  item: "command",
+  runAt: "client",
   name: "dbg list",
-  description: gcli.lookup("dbgListSourcesDesc"),
+  description: l10n.lookup("dbgListSourcesDesc"),
   params: [],
   returnType: "dom",
   exec: function(args, context) {
     let dbg = getPanel(context, "jsdebugger");
     if (!dbg) {
-      return gcli.lookup("debuggerClosed");
+      return l10n.lookup("debuggerClosed");
     }
 
     let sources = getAllSources(dbg);
@@ -440,10 +464,12 @@
   }
 ].forEach(function(cmd) {
   const lookup = function(id) {
-    return gcli.lookup(cmd.l10nPrefix + id);
+    return l10n.lookup(cmd.l10nPrefix + id);
   };
 
   exports.items.push({
+    item: "command",
+    runAt: "client",
     name: "dbg " + cmd.name,
     description: lookup("Desc"),
     params: [
@@ -475,7 +501,7 @@
       const dbg = getPanel(context, "jsdebugger");
       const doc = context.environment.chromeDocument;
       if (!dbg) {
-        throw new Error(gcli.lookup("debuggerClosed"));
+        throw new Error(l10n.lookup("debuggerClosed"));
       }
 
       const { promise, resolve, reject } = context.defer();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/definitions.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/definitions.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/definitions.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/definitions.js	2015-04-24 19:30:56.000000000 +0000
@@ -0,0 +1,409 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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";
+
+const {Cc, Ci, Cu} = require("chrome");
+
+const { Services } = require("resource://gre/modules/Services.jsm");
+
+loader.lazyGetter(this, "osString", () => Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS);
+
+// Panels
+loader.lazyGetter(this, "OptionsPanel", () => require("devtools/framework/toolbox-options").OptionsPanel);
+loader.lazyGetter(this, "InspectorPanel", () => require("devtools/inspector/inspector-panel").InspectorPanel);
+loader.lazyGetter(this, "WebConsolePanel", () => require("devtools/webconsole/panel").WebConsolePanel);
+loader.lazyGetter(this, "DebuggerPanel", () => require("devtools/debugger/panel").DebuggerPanel);
+loader.lazyGetter(this, "StyleEditorPanel", () => require("devtools/styleeditor/styleeditor-panel").StyleEditorPanel);
+loader.lazyGetter(this, "ShaderEditorPanel", () => require("devtools/shadereditor/panel").ShaderEditorPanel);
+loader.lazyGetter(this, "CanvasDebuggerPanel", () => require("devtools/canvasdebugger/panel").CanvasDebuggerPanel);
+loader.lazyGetter(this, "WebAudioEditorPanel", () => require("devtools/webaudioeditor/panel").WebAudioEditorPanel);
+loader.lazyGetter(this, "PerformancePanel", () => require("devtools/performance/panel").PerformancePanel);
+loader.lazyGetter(this, "NetMonitorPanel", () => require("devtools/netmonitor/panel").NetMonitorPanel);
+loader.lazyGetter(this, "StoragePanel", () => require("devtools/storage/panel").StoragePanel);
+loader.lazyGetter(this, "ScratchpadPanel", () => require("devtools/scratchpad/scratchpad-panel").ScratchpadPanel);
+
+// Strings
+const toolboxProps = "chrome://browser/locale/devtools/toolbox.properties";
+const inspectorProps = "chrome://browser/locale/devtools/inspector.properties";
+const webConsoleProps = "chrome://browser/locale/devtools/webconsole.properties";
+const debuggerProps = "chrome://browser/locale/devtools/debugger.properties";
+const styleEditorProps = "chrome://browser/locale/devtools/styleeditor.properties";
+const shaderEditorProps = "chrome://browser/locale/devtools/shadereditor.properties";
+const canvasDebuggerProps = "chrome://browser/locale/devtools/canvasdebugger.properties";
+const webAudioEditorProps = "chrome://browser/locale/devtools/webaudioeditor.properties";
+const profilerProps = "chrome://browser/locale/devtools/profiler.properties";
+const netMonitorProps = "chrome://browser/locale/devtools/netmonitor.properties";
+const storageProps = "chrome://browser/locale/devtools/storage.properties";
+const scratchpadProps = "chrome://browser/locale/devtools/scratchpad.properties";
+
+loader.lazyGetter(this, "toolboxStrings", () => Services.strings.createBundle(toolboxProps));
+loader.lazyGetter(this, "profilerStrings",() => Services.strings.createBundle(profilerProps));
+loader.lazyGetter(this, "webConsoleStrings", () => Services.strings.createBundle(webConsoleProps));
+loader.lazyGetter(this, "debuggerStrings", () => Services.strings.createBundle(debuggerProps));
+loader.lazyGetter(this, "styleEditorStrings", () => Services.strings.createBundle(styleEditorProps));
+loader.lazyGetter(this, "shaderEditorStrings", () => Services.strings.createBundle(shaderEditorProps));
+loader.lazyGetter(this, "canvasDebuggerStrings", () => Services.strings.createBundle(canvasDebuggerProps));
+loader.lazyGetter(this, "webAudioEditorStrings", () => Services.strings.createBundle(webAudioEditorProps));
+loader.lazyGetter(this, "inspectorStrings", () => Services.strings.createBundle(inspectorProps));
+loader.lazyGetter(this, "netMonitorStrings", () => Services.strings.createBundle(netMonitorProps));
+loader.lazyGetter(this, "storageStrings", () => Services.strings.createBundle(storageProps));
+loader.lazyGetter(this, "scratchpadStrings", () => Services.strings.createBundle(scratchpadProps));
+
+let Tools = {};
+exports.Tools = Tools;
+
+// Definitions
+Tools.options = {
+  id: "options",
+  ordinal: 0,
+  url: "chrome://browser/content/devtools/framework/toolbox-options.xul",
+  icon: "chrome://browser/skin/devtools/tool-options.svg",
+  invertIconForLightTheme: true,
+  bgTheme: "theme-body",
+  label: l10n("options.label", toolboxStrings),
+  iconOnly: true,
+  panelLabel: l10n("options.panelLabel", toolboxStrings),
+  tooltip: l10n("optionsButton.tooltip", toolboxStrings),
+  inMenu: false,
+
+  isTargetSupported: function(target) {
+    return true;
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new OptionsPanel(iframeWindow, toolbox);
+  }
+}
+
+Tools.inspector = {
+  id: "inspector",
+  accesskey: l10n("inspector.accesskey", inspectorStrings),
+  key: l10n("inspector.commandkey", inspectorStrings),
+  ordinal: 1,
+  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
+  icon: "chrome://browser/skin/devtools/tool-inspector.svg",
+  invertIconForLightTheme: true,
+  url: "chrome://browser/content/devtools/inspector/inspector.xul",
+  label: l10n("inspector.label", inspectorStrings),
+  panelLabel: l10n("inspector.panelLabel", inspectorStrings),
+  tooltip: l10n("inspector.tooltip", inspectorStrings),
+  inMenu: true,
+  commands: [
+    "devtools/resize-commands",
+    "devtools/inspector/inspector-commands",
+    "devtools/eyedropper/commands.js"
+  ],
+
+  preventClosingOnKey: true,
+  onkey: function(panel) {
+    panel.toolbox.highlighterUtils.togglePicker();
+  },
+
+  isTargetSupported: function(target) {
+    return target.hasActor("inspector");
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new InspectorPanel(iframeWindow, toolbox);
+  }
+};
+
+Tools.webConsole = {
+  id: "webconsole",
+  key: l10n("cmd.commandkey", webConsoleStrings),
+  accesskey: l10n("webConsoleCmd.accesskey", webConsoleStrings),
+  modifiers: Services.appinfo.OS == "Darwin" ? "accel,alt" : "accel,shift",
+  ordinal: 2,
+  icon: "chrome://browser/skin/devtools/tool-webconsole.svg",
+  invertIconForLightTheme: true,
+  url: "chrome://browser/content/devtools/webconsole.xul",
+  label: l10n("ToolboxTabWebconsole.label", webConsoleStrings),
+  menuLabel: l10n("MenuWebconsole.label", webConsoleStrings),
+  panelLabel: l10n("ToolboxWebConsole.panelLabel", webConsoleStrings),
+  tooltip: l10n("ToolboxWebconsole.tooltip", webConsoleStrings),
+  inMenu: true,
+  commands: "devtools/webconsole/console-commands",
+
+  preventClosingOnKey: true,
+  onkey: function(panel, toolbox) {
+    if (toolbox.splitConsole)
+      return toolbox.focusConsoleInput();
+
+    panel.focusInput();
+  },
+
+  isTargetSupported: function(target) {
+    return true;
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new WebConsolePanel(iframeWindow, toolbox);
+  }
+};
+
+Tools.jsdebugger = {
+  id: "jsdebugger",
+  key: l10n("debuggerMenu.commandkey", debuggerStrings),
+  accesskey: l10n("debuggerMenu.accesskey", debuggerStrings),
+  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
+  ordinal: 3,
+  icon: "chrome://browser/skin/devtools/tool-debugger.svg",
+  invertIconForLightTheme: true,
+  highlightedicon: "chrome://browser/skin/devtools/tool-debugger-paused.svg",
+  url: "chrome://browser/content/devtools/debugger.xul",
+  label: l10n("ToolboxDebugger.label", debuggerStrings),
+  panelLabel: l10n("ToolboxDebugger.panelLabel", debuggerStrings),
+  tooltip: l10n("ToolboxDebugger.tooltip", debuggerStrings),
+  inMenu: true,
+  commands: "devtools/debugger/debugger-commands",
+
+  isTargetSupported: function(target) {
+    return true;
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new DebuggerPanel(iframeWindow, toolbox);
+  }
+};
+
+Tools.styleEditor = {
+  id: "styleeditor",
+  key: l10n("open.commandkey", styleEditorStrings),
+  ordinal: 4,
+  accesskey: l10n("open.accesskey", styleEditorStrings),
+  modifiers: "shift",
+  icon: "chrome://browser/skin/devtools/tool-styleeditor.svg",
+  invertIconForLightTheme: true,
+  url: "chrome://browser/content/devtools/styleeditor.xul",
+  label: l10n("ToolboxStyleEditor.label", styleEditorStrings),
+  panelLabel: l10n("ToolboxStyleEditor.panelLabel", styleEditorStrings),
+  tooltip: l10n("ToolboxStyleEditor.tooltip2", styleEditorStrings),
+  inMenu: true,
+  commands: "devtools/styleeditor/styleeditor-commands",
+
+  isTargetSupported: function(target) {
+    return target.hasActor("styleEditor") || target.hasActor("styleSheets");
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new StyleEditorPanel(iframeWindow, toolbox);
+  }
+};
+
+Tools.shaderEditor = {
+  id: "shadereditor",
+  ordinal: 5,
+  visibilityswitch: "devtools.shadereditor.enabled",
+  icon: "chrome://browser/skin/devtools/tool-styleeditor.svg",
+  invertIconForLightTheme: true,
+  url: "chrome://browser/content/devtools/shadereditor.xul",
+  label: l10n("ToolboxShaderEditor.label", shaderEditorStrings),
+  panelLabel: l10n("ToolboxShaderEditor.panelLabel", shaderEditorStrings),
+  tooltip: l10n("ToolboxShaderEditor.tooltip", shaderEditorStrings),
+
+  isTargetSupported: function(target) {
+    return target.hasActor("webgl") && !target.chrome;
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new ShaderEditorPanel(iframeWindow, toolbox);
+  }
+};
+
+Tools.canvasDebugger = {
+  id: "canvasdebugger",
+  ordinal: 6,
+  visibilityswitch: "devtools.canvasdebugger.enabled",
+  icon: "chrome://browser/skin/devtools/tool-styleeditor.svg",
+  invertIconForLightTheme: true,
+  url: "chrome://browser/content/devtools/canvasdebugger.xul",
+  label: l10n("ToolboxCanvasDebugger.label", canvasDebuggerStrings),
+  panelLabel: l10n("ToolboxCanvasDebugger.panelLabel", canvasDebuggerStrings),
+  tooltip: l10n("ToolboxCanvasDebugger.tooltip", canvasDebuggerStrings),
+
+  // Hide the Canvas Debugger in the Add-on Debugger and Browser Toolbox
+  // (bug 1047520).
+  isTargetSupported: function(target) {
+    return target.hasActor("canvas") && !target.chrome;
+  },
+
+  build: function (iframeWindow, toolbox) {
+    return new CanvasDebuggerPanel(iframeWindow, toolbox);
+  }
+};
+
+Tools.performance = {
+  id: "performance",
+  ordinal: 7,
+  icon: "chrome://browser/skin/devtools/tool-profiler.svg",
+  invertIconForLightTheme: true,
+  url: "chrome://browser/content/devtools/performance.xul",
+  visibilityswitch: "devtools.performance.enabled",
+  label: l10n("profiler.label2", profilerStrings),
+  panelLabel: l10n("profiler.panelLabel2", profilerStrings),
+  tooltip: l10n("profiler.tooltip2", profilerStrings),
+  accesskey: l10n("profiler.accesskey", profilerStrings),
+  key: l10n("profiler.commandkey2", profilerStrings),
+  modifiers: "shift",
+  inMenu: true,
+
+  isTargetSupported: function (target) {
+    return target.hasActor("profiler");
+  },
+
+  build: function (frame, target) {
+    return new PerformancePanel(frame, target);
+  }
+};
+
+Tools.netMonitor = {
+  id: "netmonitor",
+  accesskey: l10n("netmonitor.accesskey", netMonitorStrings),
+  key: l10n("netmonitor.commandkey", netMonitorStrings),
+  ordinal: 9,
+  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
+  visibilityswitch: "devtools.netmonitor.enabled",
+  icon: "chrome://browser/skin/devtools/tool-network.svg",
+  invertIconForLightTheme: true,
+  url: "chrome://browser/content/devtools/netmonitor.xul",
+  label: l10n("netmonitor.label", netMonitorStrings),
+  panelLabel: l10n("netmonitor.panelLabel", netMonitorStrings),
+  tooltip: l10n("netmonitor.tooltip", netMonitorStrings),
+  inMenu: true,
+
+  isTargetSupported: function(target) {
+    return target.getTrait("networkMonitor");
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new NetMonitorPanel(iframeWindow, toolbox);
+  }
+};
+
+Tools.storage = {
+  id: "storage",
+  key: l10n("storage.commandkey", storageStrings),
+  ordinal: 10,
+  accesskey: l10n("storage.accesskey", storageStrings),
+  modifiers: "shift",
+  visibilityswitch: "devtools.storage.enabled",
+  icon: "chrome://browser/skin/devtools/tool-storage.svg",
+  invertIconForLightTheme: true,
+  url: "chrome://browser/content/devtools/storage.xul",
+  label: l10n("storage.label", storageStrings),
+  menuLabel: l10n("storage.menuLabel", storageStrings),
+  panelLabel: l10n("storage.panelLabel", storageStrings),
+  tooltip: l10n("storage.tooltip2", storageStrings),
+  inMenu: true,
+
+  isTargetSupported: function(target) {
+    return target.isLocalTab ||
+           ( target.hasActor("storage") &&
+             target.getTrait("storageInspector") );
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new StoragePanel(iframeWindow, toolbox);
+  }
+};
+
+Tools.webAudioEditor = {
+  id: "webaudioeditor",
+  ordinal: 11,
+  visibilityswitch: "devtools.webaudioeditor.enabled",
+  icon: "chrome://browser/skin/devtools/tool-webaudio.svg",
+  invertIconForLightTheme: true,
+  url: "chrome://browser/content/devtools/webaudioeditor.xul",
+  label: l10n("ToolboxWebAudioEditor1.label", webAudioEditorStrings),
+  panelLabel: l10n("ToolboxWebAudioEditor1.panelLabel", webAudioEditorStrings),
+  tooltip: l10n("ToolboxWebAudioEditor1.tooltip", webAudioEditorStrings),
+
+  isTargetSupported: function(target) {
+    return !target.chrome && target.hasActor("webaudio");
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new WebAudioEditorPanel(iframeWindow, toolbox);
+  }
+};
+
+Tools.scratchpad = {
+  id: "scratchpad",
+  ordinal: 12,
+  visibilityswitch: "devtools.scratchpad.enabled",
+  icon: "chrome://browser/skin/devtools/tool-scratchpad.svg",
+  invertIconForLightTheme: true,
+  url: "chrome://browser/content/devtools/scratchpad.xul",
+  label: l10n("scratchpad.label", scratchpadStrings),
+  panelLabel: l10n("scratchpad.panelLabel", scratchpadStrings),
+  tooltip: l10n("scratchpad.tooltip", scratchpadStrings),
+  inMenu: false,
+  commands: "devtools/scratchpad/scratchpad-commands",
+
+  isTargetSupported: function(target) {
+    return target.isRemote;
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new ScratchpadPanel(iframeWindow, toolbox);
+  }
+};
+
+let defaultTools = [
+  Tools.options,
+  Tools.webConsole,
+  Tools.inspector,
+  Tools.jsdebugger,
+  Tools.styleEditor,
+  Tools.shaderEditor,
+  Tools.canvasDebugger,
+  Tools.webAudioEditor,
+  Tools.performance,
+  Tools.netMonitor,
+  Tools.storage,
+  Tools.scratchpad
+];
+
+exports.defaultTools = defaultTools;
+
+Tools.darkTheme = {
+  id: "dark",
+  label: l10n("options.darkTheme.label", toolboxStrings),
+  ordinal: 1,
+  stylesheets: ["chrome://browser/skin/devtools/dark-theme.css"],
+  classList: ["theme-dark"],
+};
+
+Tools.lightTheme = {
+  id: "light",
+  label: l10n("options.lightTheme.label", toolboxStrings),
+  ordinal: 2,
+  stylesheets: ["chrome://browser/skin/devtools/light-theme.css"],
+  classList: ["theme-light"],
+};
+
+exports.defaultThemes = [
+  Tools.darkTheme,
+  Tools.lightTheme,
+];
+
+/**
+ * Lookup l10n string from a string bundle.
+ *
+ * @param {string} name
+ *        The key to lookup.
+ * @param {StringBundle} bundle
+ *        The key to lookup.
+ * @returns A localized version of the given key.
+ */
+function l10n(name, bundle)
+{
+  try {
+    return bundle.GetStringFromName(name);
+  } catch (ex) {
+    Services.console.logStringMessage("Error reading '" + name + "'");
+    throw new Error("l10n error with " + name);
+  }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/eyedropper/commands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/eyedropper/commands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/eyedropper/commands.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/eyedropper/commands.js	2015-04-24 19:30:56.000000000 +0000
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const eventEmitter = new EventEmitter();
 
@@ -12,14 +12,19 @@
  * 'eyedropper' command
  */
 exports.items = [{
+  item: "command",
+  runAt: "client",
   name: "eyedropper",
-  description: gcli.lookup("eyedropperDesc"),
-  manual: gcli.lookup("eyedropperManual"),
+  description: l10n.lookup("eyedropperDesc"),
+  manual: l10n.lookup("eyedropperManual"),
   buttonId: "command-button-eyedropper",
   buttonClass: "command-button command-button-invertable",
-  tooltipText: gcli.lookup("eyedropperTooltip"),
+  tooltipText: l10n.lookup("eyedropperTooltip"),
   state: {
     isChecked: function(target) {
+      if (!target.tab) {
+        return false;
+      }
       let chromeWindow = target.tab.ownerDocument.defaultView;
       let dropper = EyedropperManager.getInstance(chromeWindow);
       if (dropper) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/framework/sidebar.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/framework/sidebar.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/framework/sidebar.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/framework/sidebar.js	2015-04-24 19:30:57.000000000 +0000
@@ -120,7 +120,7 @@
     let tabs = this._tabbox.tabs;
 
     // Create a container and insert it first in the tabbox
-    let allTabsContainer = this._panelDoc.createElementNS(XULNS, "box");
+    let allTabsContainer = this._panelDoc.createElementNS(XULNS, "stack");
     this._tabbox.insertBefore(allTabsContainer, tabs);
 
     // Move the tabs inside and make them flex
@@ -130,8 +130,10 @@
     // Create the dropdown menu next to the tabs
     this._allTabsBtn = this._panelDoc.createElementNS(XULNS, "toolbarbutton");
     this._allTabsBtn.setAttribute("class", "devtools-sidebar-alltabs");
+    this._allTabsBtn.setAttribute("right", "0");
+    this._allTabsBtn.setAttribute("top", "0");
+    this._allTabsBtn.setAttribute("width", "15");
     this._allTabsBtn.setAttribute("type", "menu");
-    this._allTabsBtn.setAttribute("label", l10n("sidebar.showAllTabs.label"));
     this._allTabsBtn.setAttribute("tooltiptext", l10n("sidebar.showAllTabs.tooltip"));
     this._allTabsBtn.setAttribute("hidden", "true");
     allTabsContainer.appendChild(this._allTabsBtn);
@@ -162,7 +164,7 @@
 
     // Moving back the tabs as a first child of the tabbox
     this._tabbox.insertBefore(tabs, this._tabbox.tabpanels);
-    this._tabbox.querySelector("box").remove();
+    this._tabbox.querySelector("stack").remove();
 
     this._allTabsBtn = null;
   },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js	2015-04-24 19:30:57.000000000 +0000
@@ -118,6 +118,10 @@
           todo(false, "Front for " + actor + " still held in pool!");
           continue;
         }
+        // gcliActor is for the commandline which is separate to the toolbox
+        if (actor.contains("gcliActor")) {
+          continue;
+        }
         ok(false, "Front for " + actor + " still held in pool!");
       }
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/framework/toolbox.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/framework/toolbox.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/framework/toolbox.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/framework/toolbox.js	2015-04-24 19:30:57.000000000 +0000
@@ -713,10 +713,13 @@
       this._buildPickerButton();
     }
 
-    let spec = CommandUtils.getCommandbarSpec("devtools.toolbox.toolbarSpec");
-    let environment = CommandUtils.createEnvironment(this, '_target');
-    return CommandUtils.createRequisition(environment).then(requisition => {
+    const options = {
+      environment: CommandUtils.createEnvironment(this, '_target')
+    };
+    return CommandUtils.createRequisition(this.target, options).then(requisition => {
       this._requisition = requisition;
+
+      const spec = CommandUtils.getCommandbarSpec("devtools.toolbox.toolbarSpec");
       return CommandUtils.createButtons(spec, this.target, this.doc,
                                         requisition).then(buttons => {
         let container = this.doc.getElementById("toolbox-buttons");
@@ -1752,7 +1755,7 @@
     let win = this.frame.ownerGlobal;
 
     if (this._requisition) {
-      this._requisition.destroy();
+      CommandUtils.destroyRequisition(this._requisition, this.target);
     }
     this._telemetry.toolClosed("toolbox");
     this._telemetry.destroy();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/inspector/inspector-commands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/inspector/inspector-commands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/inspector/inspector-commands.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/inspector/inspector-commands.js	2015-04-24 19:30:57.000000000 +0000
@@ -4,18 +4,20 @@
 
 "use strict";
 
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 exports.items = [{
+  item: "command",
+  runAt: "server",
   name: "inspect",
-  description: gcli.lookup("inspectDesc"),
-  manual: gcli.lookup("inspectManual"),
+  description: l10n.lookup("inspectDesc"),
+  manual: l10n.lookup("inspectManual"),
   params: [
     {
       name: "selector",
       type: "node",
-      description: gcli.lookup("inspectNodeDesc"),
-      manual: gcli.lookup("inspectNodeManual")
+      description: l10n.lookup("inspectNodeDesc"),
+      manual: l10n.lookup("inspectNodeManual")
     }
   ],
   exec: function(args, context) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/inspector/inspector-panel.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/inspector/inspector-panel.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/inspector/inspector-panel.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/inspector/inspector-panel.js	2015-04-24 19:30:57.000000000 +0000
@@ -833,6 +833,12 @@
     let button = this._paneToggleButton;
     let isVisible = !button.hasAttribute("pane-collapsed");
 
+    // Make sure the sidebar has a width attribute before collapsing because
+    // ViewHelpers needs it.
+    if (isVisible && !sidePane.hasAttribute("width")) {
+      sidePane.setAttribute("width", sidePane.getBoundingClientRect().width);
+    }
+
     ViewHelpers.togglePane({
       visible: !isVisible,
       animated: true,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/main.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/main.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/main.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/main.js	2015-04-24 19:30:57.000000000 +0000
@@ -4,11 +4,20 @@
 
 "use strict";
 
-const {Cc, Ci, Cu} = require("chrome");
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+const { Cu } = require("chrome");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
+const { gDevTools } = require("resource:///modules/devtools/gDevTools.jsm");
+
+const { defaultTools, defaultThemes } = require("definitions");
+
+defaultTools.forEach(definition => gDevTools.registerTool(definition));
+defaultThemes.forEach(definition => gDevTools.registerTheme(definition));
+
+// Re-export for backwards compatibility, but we should probably the
+// definitions from require("definitions") in the future
+exports.defaultTools = require("definitions").defaultTools;
+exports.defaultThemes = require("definitions").defaultThemes;
+exports.Tools = require("definitions").Tools;
 
 Object.defineProperty(exports, "Toolbox", {
   get: () => require("devtools/framework/toolbox").Toolbox
@@ -17,398 +26,7 @@
   get: () => require("devtools/framework/target").TargetFactory
 });
 
-loader.lazyGetter(this, "osString", () => Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS);
-
-let events = require("sdk/system/events");
-
-// Panels
-loader.lazyGetter(this, "OptionsPanel", () => require("devtools/framework/toolbox-options").OptionsPanel);
-loader.lazyGetter(this, "InspectorPanel", () => require("devtools/inspector/inspector-panel").InspectorPanel);
-loader.lazyGetter(this, "WebConsolePanel", () => require("devtools/webconsole/panel").WebConsolePanel);
-loader.lazyGetter(this, "DebuggerPanel", () => require("devtools/debugger/panel").DebuggerPanel);
-loader.lazyGetter(this, "StyleEditorPanel", () => require("devtools/styleeditor/styleeditor-panel").StyleEditorPanel);
-loader.lazyGetter(this, "ShaderEditorPanel", () => require("devtools/shadereditor/panel").ShaderEditorPanel);
-loader.lazyGetter(this, "CanvasDebuggerPanel", () => require("devtools/canvasdebugger/panel").CanvasDebuggerPanel);
-loader.lazyGetter(this, "WebAudioEditorPanel", () => require("devtools/webaudioeditor/panel").WebAudioEditorPanel);
-loader.lazyGetter(this, "PerformancePanel", () => require("devtools/performance/panel").PerformancePanel);
-loader.lazyGetter(this, "NetMonitorPanel", () => require("devtools/netmonitor/panel").NetMonitorPanel);
-loader.lazyGetter(this, "StoragePanel", () => require("devtools/storage/panel").StoragePanel);
-loader.lazyGetter(this, "ScratchpadPanel", () => require("devtools/scratchpad/scratchpad-panel").ScratchpadPanel);
-
-// Strings
-const toolboxProps = "chrome://browser/locale/devtools/toolbox.properties";
-const inspectorProps = "chrome://browser/locale/devtools/inspector.properties";
-const webConsoleProps = "chrome://browser/locale/devtools/webconsole.properties";
-const debuggerProps = "chrome://browser/locale/devtools/debugger.properties";
-const styleEditorProps = "chrome://browser/locale/devtools/styleeditor.properties";
-const shaderEditorProps = "chrome://browser/locale/devtools/shadereditor.properties";
-const canvasDebuggerProps = "chrome://browser/locale/devtools/canvasdebugger.properties";
-const webAudioEditorProps = "chrome://browser/locale/devtools/webaudioeditor.properties";
-const profilerProps = "chrome://browser/locale/devtools/profiler.properties";
-const netMonitorProps = "chrome://browser/locale/devtools/netmonitor.properties";
-const storageProps = "chrome://browser/locale/devtools/storage.properties";
-const scratchpadProps = "chrome://browser/locale/devtools/scratchpad.properties";
-
-loader.lazyGetter(this, "toolboxStrings", () => Services.strings.createBundle(toolboxProps));
-loader.lazyGetter(this, "profilerStrings",() => Services.strings.createBundle(profilerProps));
-loader.lazyGetter(this, "webConsoleStrings", () => Services.strings.createBundle(webConsoleProps));
-loader.lazyGetter(this, "debuggerStrings", () => Services.strings.createBundle(debuggerProps));
-loader.lazyGetter(this, "styleEditorStrings", () => Services.strings.createBundle(styleEditorProps));
-loader.lazyGetter(this, "shaderEditorStrings", () => Services.strings.createBundle(shaderEditorProps));
-loader.lazyGetter(this, "canvasDebuggerStrings", () => Services.strings.createBundle(canvasDebuggerProps));
-loader.lazyGetter(this, "webAudioEditorStrings", () => Services.strings.createBundle(webAudioEditorProps));
-loader.lazyGetter(this, "inspectorStrings", () => Services.strings.createBundle(inspectorProps));
-loader.lazyGetter(this, "netMonitorStrings", () => Services.strings.createBundle(netMonitorProps));
-loader.lazyGetter(this, "storageStrings", () => Services.strings.createBundle(storageProps));
-loader.lazyGetter(this, "scratchpadStrings", () => Services.strings.createBundle(scratchpadProps));
-
-let Tools = {};
-exports.Tools = Tools;
-
-// Definitions
-Tools.options = {
-  id: "options",
-  ordinal: 0,
-  url: "chrome://browser/content/devtools/framework/toolbox-options.xul",
-  icon: "chrome://browser/skin/devtools/tool-options.svg",
-  invertIconForLightTheme: true,
-  bgTheme: "theme-body",
-  label: l10n("options.label", toolboxStrings),
-  iconOnly: true,
-  panelLabel: l10n("options.panelLabel", toolboxStrings),
-  tooltip: l10n("optionsButton.tooltip", toolboxStrings),
-  inMenu: false,
-
-  isTargetSupported: function(target) {
-    return true;
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new OptionsPanel(iframeWindow, toolbox);
-  }
-}
-
-Tools.inspector = {
-  id: "inspector",
-  accesskey: l10n("inspector.accesskey", inspectorStrings),
-  key: l10n("inspector.commandkey", inspectorStrings),
-  ordinal: 1,
-  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
-  icon: "chrome://browser/skin/devtools/tool-inspector.svg",
-  invertIconForLightTheme: true,
-  url: "chrome://browser/content/devtools/inspector/inspector.xul",
-  label: l10n("inspector.label", inspectorStrings),
-  panelLabel: l10n("inspector.panelLabel", inspectorStrings),
-  tooltip: l10n("inspector.tooltip", inspectorStrings),
-  inMenu: true,
-  commands: [
-    "devtools/resize-commands",
-    "devtools/inspector/inspector-commands",
-    "devtools/eyedropper/commands.js"
-  ],
-
-  preventClosingOnKey: true,
-  onkey: function(panel) {
-    panel.toolbox.highlighterUtils.togglePicker();
-  },
-
-  isTargetSupported: function(target) {
-    return target.hasActor("inspector");
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new InspectorPanel(iframeWindow, toolbox);
-  }
-};
-
-Tools.webConsole = {
-  id: "webconsole",
-  key: l10n("cmd.commandkey", webConsoleStrings),
-  accesskey: l10n("webConsoleCmd.accesskey", webConsoleStrings),
-  modifiers: Services.appinfo.OS == "Darwin" ? "accel,alt" : "accel,shift",
-  ordinal: 2,
-  icon: "chrome://browser/skin/devtools/tool-webconsole.svg",
-  invertIconForLightTheme: true,
-  url: "chrome://browser/content/devtools/webconsole.xul",
-  label: l10n("ToolboxTabWebconsole.label", webConsoleStrings),
-  menuLabel: l10n("MenuWebconsole.label", webConsoleStrings),
-  panelLabel: l10n("ToolboxWebConsole.panelLabel", webConsoleStrings),
-  tooltip: l10n("ToolboxWebconsole.tooltip", webConsoleStrings),
-  inMenu: true,
-  commands: "devtools/webconsole/console-commands",
-
-  preventClosingOnKey: true,
-  onkey: function(panel, toolbox) {
-    if (toolbox.splitConsole)
-      return toolbox.focusConsoleInput();
-
-    panel.focusInput();
-  },
-
-  isTargetSupported: function(target) {
-    return true;
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new WebConsolePanel(iframeWindow, toolbox);
-  }
-};
-
-Tools.jsdebugger = {
-  id: "jsdebugger",
-  key: l10n("debuggerMenu.commandkey", debuggerStrings),
-  accesskey: l10n("debuggerMenu.accesskey", debuggerStrings),
-  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
-  ordinal: 3,
-  icon: "chrome://browser/skin/devtools/tool-debugger.svg",
-  invertIconForLightTheme: true,
-  highlightedicon: "chrome://browser/skin/devtools/tool-debugger-paused.svg",
-  url: "chrome://browser/content/devtools/debugger.xul",
-  label: l10n("ToolboxDebugger.label", debuggerStrings),
-  panelLabel: l10n("ToolboxDebugger.panelLabel", debuggerStrings),
-  tooltip: l10n("ToolboxDebugger.tooltip", debuggerStrings),
-  inMenu: true,
-  commands: "devtools/debugger/debugger-commands",
-
-  isTargetSupported: function(target) {
-    return true;
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new DebuggerPanel(iframeWindow, toolbox);
-  }
-};
-
-Tools.styleEditor = {
-  id: "styleeditor",
-  key: l10n("open.commandkey", styleEditorStrings),
-  ordinal: 4,
-  accesskey: l10n("open.accesskey", styleEditorStrings),
-  modifiers: "shift",
-  icon: "chrome://browser/skin/devtools/tool-styleeditor.svg",
-  invertIconForLightTheme: true,
-  url: "chrome://browser/content/devtools/styleeditor.xul",
-  label: l10n("ToolboxStyleEditor.label", styleEditorStrings),
-  panelLabel: l10n("ToolboxStyleEditor.panelLabel", styleEditorStrings),
-  tooltip: l10n("ToolboxStyleEditor.tooltip2", styleEditorStrings),
-  inMenu: true,
-  commands: "devtools/styleeditor/styleeditor-commands",
-
-  isTargetSupported: function(target) {
-    return target.hasActor("styleEditor") || target.hasActor("styleSheets");
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new StyleEditorPanel(iframeWindow, toolbox);
-  }
-};
-
-Tools.shaderEditor = {
-  id: "shadereditor",
-  ordinal: 5,
-  visibilityswitch: "devtools.shadereditor.enabled",
-  icon: "chrome://browser/skin/devtools/tool-styleeditor.svg",
-  invertIconForLightTheme: true,
-  url: "chrome://browser/content/devtools/shadereditor.xul",
-  label: l10n("ToolboxShaderEditor.label", shaderEditorStrings),
-  panelLabel: l10n("ToolboxShaderEditor.panelLabel", shaderEditorStrings),
-  tooltip: l10n("ToolboxShaderEditor.tooltip", shaderEditorStrings),
-
-  isTargetSupported: function(target) {
-    return target.hasActor("webgl") && !target.chrome;
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new ShaderEditorPanel(iframeWindow, toolbox);
-  }
-};
-
-Tools.canvasDebugger = {
-  id: "canvasdebugger",
-  ordinal: 6,
-  visibilityswitch: "devtools.canvasdebugger.enabled",
-  icon: "chrome://browser/skin/devtools/tool-styleeditor.svg",
-  invertIconForLightTheme: true,
-  url: "chrome://browser/content/devtools/canvasdebugger.xul",
-  label: l10n("ToolboxCanvasDebugger.label", canvasDebuggerStrings),
-  panelLabel: l10n("ToolboxCanvasDebugger.panelLabel", canvasDebuggerStrings),
-  tooltip: l10n("ToolboxCanvasDebugger.tooltip", canvasDebuggerStrings),
-
-  // Hide the Canvas Debugger in the Add-on Debugger and Browser Toolbox
-  // (bug 1047520).
-  isTargetSupported: function(target) {
-    return target.hasActor("canvas") && !target.chrome;
-  },
-
-  build: function (iframeWindow, toolbox) {
-    return new CanvasDebuggerPanel(iframeWindow, toolbox);
-  }
-};
-
-Tools.performance = {
-  id: "performance",
-  ordinal: 7,
-  icon: "chrome://browser/skin/devtools/tool-profiler.svg",
-  invertIconForLightTheme: true,
-  url: "chrome://browser/content/devtools/performance.xul",
-  visibilityswitch: "devtools.performance.enabled",
-  label: l10n("profiler.label2", profilerStrings),
-  panelLabel: l10n("profiler.panelLabel2", profilerStrings),
-  tooltip: l10n("profiler.tooltip2", profilerStrings),
-  accesskey: l10n("profiler.accesskey", profilerStrings),
-  key: l10n("profiler.commandkey2", profilerStrings),
-  modifiers: "shift",
-  inMenu: true,
-
-  isTargetSupported: function (target) {
-    return target.hasActor("profiler");
-  },
-
-  build: function (frame, target) {
-    return new PerformancePanel(frame, target);
-  }
-};
-
-Tools.netMonitor = {
-  id: "netmonitor",
-  accesskey: l10n("netmonitor.accesskey", netMonitorStrings),
-  key: l10n("netmonitor.commandkey", netMonitorStrings),
-  ordinal: 9,
-  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
-  visibilityswitch: "devtools.netmonitor.enabled",
-  icon: "chrome://browser/skin/devtools/tool-network.svg",
-  invertIconForLightTheme: true,
-  url: "chrome://browser/content/devtools/netmonitor.xul",
-  label: l10n("netmonitor.label", netMonitorStrings),
-  panelLabel: l10n("netmonitor.panelLabel", netMonitorStrings),
-  tooltip: l10n("netmonitor.tooltip", netMonitorStrings),
-  inMenu: true,
-
-  isTargetSupported: function(target) {
-    return target.getTrait("networkMonitor");
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new NetMonitorPanel(iframeWindow, toolbox);
-  }
-};
-
-Tools.storage = {
-  id: "storage",
-  key: l10n("storage.commandkey", storageStrings),
-  ordinal: 10,
-  accesskey: l10n("storage.accesskey", storageStrings),
-  modifiers: "shift",
-  visibilityswitch: "devtools.storage.enabled",
-  icon: "chrome://browser/skin/devtools/tool-storage.svg",
-  invertIconForLightTheme: true,
-  url: "chrome://browser/content/devtools/storage.xul",
-  label: l10n("storage.label", storageStrings),
-  menuLabel: l10n("storage.menuLabel", storageStrings),
-  panelLabel: l10n("storage.panelLabel", storageStrings),
-  tooltip: l10n("storage.tooltip2", storageStrings),
-  inMenu: true,
-
-  isTargetSupported: function(target) {
-    return target.isLocalTab ||
-           ( target.hasActor("storage") &&
-             target.getTrait("storageInspector") );
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new StoragePanel(iframeWindow, toolbox);
-  }
-};
-
-Tools.webAudioEditor = {
-  id: "webaudioeditor",
-  ordinal: 11,
-  visibilityswitch: "devtools.webaudioeditor.enabled",
-  icon: "chrome://browser/skin/devtools/tool-webaudio.svg",
-  invertIconForLightTheme: true,
-  url: "chrome://browser/content/devtools/webaudioeditor.xul",
-  label: l10n("ToolboxWebAudioEditor1.label", webAudioEditorStrings),
-  panelLabel: l10n("ToolboxWebAudioEditor1.panelLabel", webAudioEditorStrings),
-  tooltip: l10n("ToolboxWebAudioEditor1.tooltip", webAudioEditorStrings),
-
-  isTargetSupported: function(target) {
-    return !target.chrome && target.hasActor("webaudio");
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new WebAudioEditorPanel(iframeWindow, toolbox);
-  }
-};
-
-Tools.scratchpad = {
-  id: "scratchpad",
-  ordinal: 12,
-  visibilityswitch: "devtools.scratchpad.enabled",
-  icon: "chrome://browser/skin/devtools/tool-scratchpad.svg",
-  invertIconForLightTheme: true,
-  url: "chrome://browser/content/devtools/scratchpad.xul",
-  label: l10n("scratchpad.label", scratchpadStrings),
-  panelLabel: l10n("scratchpad.panelLabel", scratchpadStrings),
-  tooltip: l10n("scratchpad.tooltip", scratchpadStrings),
-  inMenu: false,
-  commands: "devtools/scratchpad/scratchpad-commands",
-
-  isTargetSupported: function(target) {
-    return target.isRemote;
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new ScratchpadPanel(iframeWindow, toolbox);
-  }
-};
-
-let defaultTools = [
-  Tools.options,
-  Tools.webConsole,
-  Tools.inspector,
-  Tools.jsdebugger,
-  Tools.styleEditor,
-  Tools.shaderEditor,
-  Tools.canvasDebugger,
-  Tools.webAudioEditor,
-  Tools.performance,
-  Tools.netMonitor,
-  Tools.storage,
-  Tools.scratchpad
-];
-
-exports.defaultTools = defaultTools;
-
-for (let definition of defaultTools) {
-  gDevTools.registerTool(definition);
-}
-
-Tools.darkTheme = {
-  id: "dark",
-  label: l10n("options.darkTheme.label", toolboxStrings),
-  ordinal: 1,
-  stylesheets: ["chrome://browser/skin/devtools/dark-theme.css"],
-  classList: ["theme-dark"],
-};
-
-Tools.lightTheme = {
-  id: "light",
-  label: l10n("options.lightTheme.label", toolboxStrings),
-  ordinal: 2,
-  stylesheets: ["chrome://browser/skin/devtools/light-theme.css"],
-  classList: ["theme-light"],
-};
-
-let defaultThemes = [
-  Tools.darkTheme,
-  Tools.lightTheme,
-];
-
-for (let definition of defaultThemes) {
-  gDevTools.registerTheme(definition);
-}
-
-var unloadObserver = {
+const unloadObserver = {
   observe: function(subject, topic, data) {
     if (subject.wrappedJSObject === require("@loader/unload")) {
       Services.obs.removeObserver(unloadObserver, "sdk:loader:destroy");
@@ -423,23 +41,5 @@
 };
 Services.obs.addObserver(unloadObserver, "sdk:loader:destroy", false);
 
+const events = require("sdk/system/events");
 events.emit("devtools-loaded", {});
-
-/**
- * Lookup l10n string from a string bundle.
- *
- * @param {string} name
- *        The key to lookup.
- * @param {StringBundle} bundle
- *        The key to lookup.
- * @returns A localized version of the given key.
- */
-function l10n(name, bundle)
-{
-  try {
-    return bundle.GetStringFromName(name);
-  } catch (ex) {
-    Services.console.logStringMessage("Error reading '" + name + "'");
-    throw new Error("l10n error with " + name);
-  }
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/markupview/markup-view.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/markupview/markup-view.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/markupview/markup-view.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/markupview/markup-view.js	2015-04-24 19:30:57.000000000 +0000
@@ -2162,7 +2162,7 @@
    */
   isImagePreviewTarget: function(target, tooltip) {
     if (!this.tooltipData || this.tooltipData.target !== target) {
-      return promise.reject();
+      return promise.reject(false);
     }
 
     return this.tooltipData.data.then(({data, size}) => {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/moz.build	2015-04-22 13:05:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/moz.build	2015-04-24 19:30:57.000000000 +0000
@@ -41,5 +41,6 @@
 JAR_MANIFESTS += ['jar.mn']
 
 EXTRA_JS_MODULES.devtools += [
+    'definitions.js',
     'main.js',
 ]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/performance/modules/front.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/performance/modules/front.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/performance/modules/front.js	2015-04-22 13:05:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/performance/modules/front.js	2015-04-24 19:30:57.000000000 +0000
@@ -430,7 +430,7 @@
   stopRecording: Task.async(function*(model) {
     // If model isn't in the PerformanceActorsConnections internal store,
     // then do nothing.
-    if (!this._recordings.includes(model)) {
+    if (this._recordings.indexOf(model) === -1) {
       return;
     }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/responsivedesign/resize-commands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/responsivedesign/resize-commands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/responsivedesign/resize-commands.js	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/responsivedesign/resize-commands.js	2015-04-24 19:30:57.000000000 +0000
@@ -11,43 +11,54 @@
                          createBundle("chrome://branding/locale/brand.properties").
                          GetStringFromName("brandShortName");
 
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 exports.items = [
   {
     name: 'resize',
-    description: gcli.lookup('resizeModeDesc')
+    description: l10n.lookup('resizeModeDesc')
   },
   {
+    item: "command",
+    runAt: "client",
     name: 'resize on',
-    description: gcli.lookup('resizeModeOnDesc'),
-    manual: gcli.lookupFormat('resizeModeManual2', [BRAND_SHORT_NAME]),
+    description: l10n.lookup('resizeModeOnDesc'),
+    manual: l10n.lookupFormat('resizeModeManual2', [BRAND_SHORT_NAME]),
     exec: gcli_cmd_resize
   },
   {
+    item: "command",
+    runAt: "client",
     name: 'resize off',
-    description: gcli.lookup('resizeModeOffDesc'),
-    manual: gcli.lookupFormat('resizeModeManual2', [BRAND_SHORT_NAME]),
+    description: l10n.lookup('resizeModeOffDesc'),
+    manual: l10n.lookupFormat('resizeModeManual2', [BRAND_SHORT_NAME]),
     exec: gcli_cmd_resize
   },
   {
+    item: "command",
+    runAt: "client",
     name: 'resize toggle',
     buttonId: "command-button-responsive",
     buttonClass: "command-button command-button-invertable",
-    tooltipText: gcli.lookup("resizeModeToggleTooltip"),
-    description: gcli.lookup('resizeModeToggleDesc'),
-    manual: gcli.lookupFormat('resizeModeManual2', [BRAND_SHORT_NAME]),
+    tooltipText: l10n.lookup("resizeModeToggleTooltip"),
+    description: l10n.lookup('resizeModeToggleDesc'),
+    manual: l10n.lookupFormat('resizeModeManual2', [BRAND_SHORT_NAME]),
     state: {
       isChecked: function(aTarget) {
+        if (!aTarget.tab) {
+          return false;
+        }
         let browserWindow = aTarget.tab.ownerDocument.defaultView;
         let mgr = browserWindow.ResponsiveUI.ResponsiveUIManager;
         return mgr.isActiveForTab(aTarget.tab);
       },
       onChange: function(aTarget, aChangeHandler) {
-        let browserWindow = aTarget.tab.ownerDocument.defaultView;
-        let mgr = browserWindow.ResponsiveUI.ResponsiveUIManager;
-        mgr.on("on", aChangeHandler);
-        mgr.on("off", aChangeHandler);
+        if (aTarget.tab) {
+          let browserWindow = aTarget.tab.ownerDocument.defaultView;
+          let mgr = browserWindow.ResponsiveUI.ResponsiveUIManager;
+          mgr.on("on", aChangeHandler);
+          mgr.on("off", aChangeHandler);
+        }
       },
       offChange: function(aTarget, aChangeHandler) {
         if (aTarget.tab) {
@@ -61,18 +72,20 @@
     exec: gcli_cmd_resize
   },
   {
+    item: "command",
+    runAt: "client",
     name: 'resize to',
-    description: gcli.lookup('resizeModeToDesc'),
+    description: l10n.lookup('resizeModeToDesc'),
     params: [
       {
         name: 'width',
         type: 'number',
-        description: gcli.lookup("resizePageArgWidthDesc"),
+        description: l10n.lookup("resizePageArgWidthDesc"),
       },
       {
         name: 'height',
         type: 'number',
-        description: gcli.lookup("resizePageArgHeightDesc"),
+        description: l10n.lookup("resizePageArgHeightDesc"),
       },
     ],
     exec: gcli_cmd_resize
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/scratchpad/scratchpad-commands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/scratchpad/scratchpad-commands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/scratchpad/scratchpad-commands.js	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/scratchpad/scratchpad-commands.js	2015-04-24 19:30:57.000000000 +0000
@@ -4,13 +4,15 @@
 
 "use strict";
 
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 exports.items = [{
+  item: "command",
+  runAt: "client",
   name: "scratchpad",
   buttonId: "command-button-scratchpad",
   buttonClass: "command-button command-button-invertable",
-  tooltipText: gcli.lookup("scratchpadOpenTooltip"),
+  tooltipText: l10n.lookup("scratchpadOpenTooltip"),
   hidden: true,
   exec: function(args, context) {
     let Scratchpad = context.environment.chromeWindow.Scratchpad;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/DeveloperToolbar.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/DeveloperToolbar.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/DeveloperToolbar.jsm	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/DeveloperToolbar.jsm	2015-04-24 19:30:57.000000000 +0000
@@ -39,14 +39,12 @@
 
 const Telemetry = require("devtools/shared/telemetry");
 
-// This lazy getter is needed to prevent a require loop
-XPCOMUtils.defineLazyGetter(this, "gcli", () => {
+XPCOMUtils.defineLazyGetter(this, "gcliInit", function() {
   try {
-    require("devtools/commandline/commands-index");
-    return require("gcli/index");
+    return require("devtools/commandline/commands-index");
   }
   catch (ex) {
-    console.error(ex);
+    console.log(ex);
   }
 });
 
@@ -62,7 +60,7 @@
   enumerable: true
 });
 
-const promise = Cu.import('resource://gre/modules/Promise.jsm', {}).Promise;
+const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 
 /**
  * A collection of utilities to help working with commands
@@ -71,13 +69,22 @@
   /**
    * Utility to ensure that things are loaded in the correct order
    */
-  createRequisition: function(environment) {
-    return gcli.load().then(() => {
-      return gcli.createRequisition({ environment: environment });
+  createRequisition: function(target, options) {
+    return gcliInit.getSystem(target).then(system => {
+      var Requisition = require("gcli/cli").Requisition;
+      return new Requisition(system, options);
     });
   },
 
   /**
+   * Destroy the remote side of the requisition as well as the local side
+   */
+  destroyRequisition: function(requisition, target) {
+    requisition.destroy();
+    gcliInit.releaseSystem(target);
+  },
+
+  /**
    * Read a toolbarSpec from preferences
    * @param pref The name of the preference to read
    */
@@ -105,12 +112,6 @@
           throw new Error("No command '" + typed + "'");
         }
 
-        // Do not build a button for a non-remote safe command in a non-local target.
-        if (!target.isLocalTab && !command.isRemoteSafe) {
-          requisition.clear();
-          return;
-        }
-
         if (command.buttonId != null) {
           button.id = command.buttonId;
           if (command.buttonClass != null) {
@@ -192,17 +193,17 @@
    * @param targetContainer An object containing a 'target' property which
    * reflects the current debug target
    */
-  createEnvironment: function(container, targetProperty='target') {
+  createEnvironment: function(container, targetProperty="target") {
     if (!container[targetProperty].toString ||
         !/TabTarget/.test(container[targetProperty].toString())) {
-      throw new Error('Missing target');
+      throw new Error("Missing target");
     }
 
     return {
       get target() {
         if (!container[targetProperty].toString ||
             !/TabTarget/.test(container[targetProperty].toString())) {
-          throw new Error('Removed target');
+          throw new Error("Removed target");
         }
 
         return container[targetProperty];
@@ -213,15 +214,17 @@
       },
 
       get chromeDocument() {
-        return this.chromeWindow.document;
+        return this.target.tab.ownerDocument.defaultView.document;
       },
 
       get window() {
-        return this.chromeWindow.gBrowser.selectedBrowser.contentWindow;
+        // throw new Error("environment.window is not available in runAt:client commands");
+        return this.chromeWindow.gBrowser.contentWindowAsCPOW;
       },
 
       get document() {
-        return this.window.document;
+        // throw new Error("environment.document is not available in runAt:client commands");
+        return this.chromeWindow.gBrowser.contentDocumentAsCPOW;
       }
     };
   },
@@ -255,6 +258,8 @@
 {
   this._chromeWindow = aChromeWindow;
 
+  this.target = null; // Will be setup when show() is called
+
   this._element = aToolbarElement;
   this._element.hidden = true;
   this._doc = this._element.ownerDocument;
@@ -292,20 +297,10 @@
 DeveloperToolbar.prototype.NOTIFICATIONS = NOTIFICATIONS;
 
 /**
- * target is dynamic because the selectedTab changes
- */
-Object.defineProperty(DeveloperToolbar.prototype, "target", {
-  get: function() {
-    return TargetFactory.forTab(this._chromeWindow.gBrowser.selectedTab);
-  },
-  enumerable: true
-});
-
-/**
  * Is the toolbar open?
  */
-Object.defineProperty(DeveloperToolbar.prototype, 'visible', {
-  get: function DT_visible() {
+Object.defineProperty(DeveloperToolbar.prototype, "visible", {
+  get: function() {
     return !this._element.hidden;
   },
   enumerable: true
@@ -316,8 +311,8 @@
 /**
  * Getter for a unique ID.
  */
-Object.defineProperty(DeveloperToolbar.prototype, 'sequenceId', {
-  get: function DT_visible() {
+Object.defineProperty(DeveloperToolbar.prototype, "sequenceId", {
+  get: function() {
     return _gSequenceId++;
   },
   enumerable: true
@@ -408,57 +403,84 @@
 
       this._doc.getElementById("Tools:DevToolbar").setAttribute("checked", "true");
 
-      return gcli.load().then(() => {
-        this.display = gcli.createDisplay({
-          contentDocument: this._chromeWindow.gBrowser.contentDocumentAsCPOW,
-          chromeDocument: this._doc,
-          chromeWindow: this._chromeWindow,
-          hintElement: this.tooltipPanel.hintElement,
-          inputElement: this._input,
-          completeElement: this._doc.querySelector(".gclitoolbar-complete-node"),
-          backgroundElement: this._doc.querySelector(".gclitoolbar-stack-node"),
-          outputDocument: this.outputPanel.document,
-          environment: CommandUtils.createEnvironment(this, "target"),
-          tooltipClass: "gcliterm-tooltip",
-          eval: null,
-          scratchpad: null
-        });
-
-        this.display.focusManager.addMonitoredElement(this.outputPanel._frame);
-        this.display.focusManager.addMonitoredElement(this._element);
+      this.target = TargetFactory.forTab(this._chromeWindow.gBrowser.selectedTab);
+      const options = {
+        environment: CommandUtils.createEnvironment(this, "target"),
+        document: this.outputPanel.document,
+      };
+      return CommandUtils.createRequisition(this.target, options).then(requisition => {
+        this.requisition = requisition;
+
+        return this.requisition.update(this._input.value).then(() => {
+          const Inputter = require('gcli/mozui/inputter').Inputter;
+          const Completer = require('gcli/mozui/completer').Completer;
+          const Tooltip = require('gcli/mozui/tooltip').Tooltip;
+          const FocusManager = require('gcli/ui/focus').FocusManager;
+
+          this.onOutput = this.requisition.commandOutputManager.onOutput;
+
+          this.focusManager = new FocusManager(this._doc, requisition.system.settings);
+
+          this.inputter = new Inputter({
+            requisition: this.requisition,
+            focusManager: this.focusManager,
+            element: this._input,
+          });
+
+          this.completer = new Completer({
+            requisition: this.requisition,
+            inputter: this.inputter,
+            backgroundElement: this._doc.querySelector(".gclitoolbar-stack-node"),
+            element: this._doc.querySelector(".gclitoolbar-complete-node"),
+          });
+
+          this.tooltip = new Tooltip({
+            requisition: this.requisition,
+            focusManager: this.focusManager,
+            inputter: this.inputter,
+            element: this.tooltipPanel.hintElement,
+          });
+
+          this.inputter.tooltip = this.tooltip;
+
+          this.focusManager.addMonitoredElement(this.outputPanel._frame);
+          this.focusManager.addMonitoredElement(this._element);
+
+          this.focusManager.onVisibilityChange.add(this.outputPanel._visibilityChanged,
+                                                   this.outputPanel);
+          this.focusManager.onVisibilityChange.add(this.tooltipPanel._visibilityChanged,
+                                                   this.tooltipPanel);
+          this.onOutput.add(this.outputPanel._outputChanged, this.outputPanel);
+
+          let tabbrowser = this._chromeWindow.gBrowser;
+          tabbrowser.tabContainer.addEventListener("TabSelect", this, false);
+          tabbrowser.tabContainer.addEventListener("TabClose", this, false);
+          tabbrowser.addEventListener("load", this, true);
+          tabbrowser.addEventListener("beforeunload", this, true);
+
+          this._initErrorsCount(tabbrowser.selectedTab);
+          this._devtoolsUnloaded = this._devtoolsUnloaded.bind(this);
+          this._devtoolsLoaded = this._devtoolsLoaded.bind(this);
+          Services.obs.addObserver(this._devtoolsUnloaded, "devtools-unloaded", false);
+          Services.obs.addObserver(this._devtoolsLoaded, "devtools-loaded", false);
 
-        this.display.onVisibilityChange.add(this.outputPanel._visibilityChanged,
-                                            this.outputPanel);
-        this.display.onVisibilityChange.add(this.tooltipPanel._visibilityChanged,
-                                            this.tooltipPanel);
-        this.display.onOutput.add(this.outputPanel._outputChanged, this.outputPanel);
-
-        let tabbrowser = this._chromeWindow.gBrowser;
-        tabbrowser.tabContainer.addEventListener("TabSelect", this, false);
-        tabbrowser.tabContainer.addEventListener("TabClose", this, false);
-        tabbrowser.addEventListener("load", this, true);
-        tabbrowser.addEventListener("beforeunload", this, true);
-
-        this._initErrorsCount(tabbrowser.selectedTab);
-        this._devtoolsUnloaded = this._devtoolsUnloaded.bind(this);
-        this._devtoolsLoaded = this._devtoolsLoaded.bind(this);
-        Services.obs.addObserver(this._devtoolsUnloaded, "devtools-unloaded", false);
-        Services.obs.addObserver(this._devtoolsLoaded, "devtools-loaded", false);
+          this._element.hidden = false;
 
-        this._element.hidden = false;
-
-        if (focus) {
-          this._input.focus();
-        }
+          if (focus) {
+            this._input.focus();
+          }
 
-        this._notify(NOTIFICATIONS.SHOW);
+          this._notify(NOTIFICATIONS.SHOW);
 
-        if (!DeveloperToolbar.introShownThisSession) {
-          this.display.maybeShowIntro();
-          DeveloperToolbar.introShownThisSession = true;
-        }
+          if (!DeveloperToolbar.introShownThisSession) {
+            let intro = require("gcli/ui/intro");
+            intro.maybeShowIntro(this.requisition.commandOutputManager,
+                                 this.requisition.conversionContext);
+            DeveloperToolbar.introShownThisSession = true;
+          }
 
-        this._showPromise = null;
+          this._showPromise = null;
+        });
       });
     });
   });
@@ -585,26 +607,26 @@
   Services.obs.removeObserver(this._devtoolsLoaded, "devtools-loaded");
   Array.prototype.forEach.call(tabbrowser.tabs, this._stopErrorsCount, this);
 
-  this.display.focusManager.removeMonitoredElement(this.outputPanel._frame);
-  this.display.focusManager.removeMonitoredElement(this._element);
+  this.focusManager.removeMonitoredElement(this.outputPanel._frame);
+  this.focusManager.removeMonitoredElement(this._element);
+
+  this.focusManager.onVisibilityChange.remove(this.outputPanel._visibilityChanged,
+                                              this.outputPanel);
+  this.focusManager.onVisibilityChange.remove(this.tooltipPanel._visibilityChanged,
+                                              this.tooltipPanel);
+  this.onOutput.remove(this.outputPanel._outputChanged, this.outputPanel);
+
+  this.tooltip.destroy();
+  this.completer.destroy();
+  this.inputter.destroy();
+  this.focusManager.destroy();
 
-  this.display.onVisibilityChange.remove(this.outputPanel._visibilityChanged, this.outputPanel);
-  this.display.onVisibilityChange.remove(this.tooltipPanel._visibilityChanged, this.tooltipPanel);
-  this.display.onOutput.remove(this.outputPanel._outputChanged, this.outputPanel);
-  this.display.destroy();
   this.outputPanel.destroy();
   this.tooltipPanel.destroy();
   delete this._input;
 
-  // We could "delete this.display" etc if we have hard-to-track-down memory
-  // leaks as a belt-and-braces approach, however this prevents our DOM node
-  // hunter from looking in all the nooks and crannies, so it's better if we
-  // can be leak-free without
-  /*
-  delete this.display;
-  delete this.outputPanel;
-  delete this.tooltipPanel;
-  */
+  CommandUtils.destroyRequisition(this.requisition, this.target);
+  this.target = undefined;
 };
 
 /**
@@ -623,8 +645,9 @@
 DeveloperToolbar.prototype.handleEvent = function(ev) {
   if (ev.type == "TabSelect" || ev.type == "load") {
     if (this.visible) {
-      this.display.reattach({
-        contentDocument: this._chromeWindow.gBrowser.contentDocumentAsCPOW
+      this.target = TargetFactory.forTab(this._chromeWindow.gBrowser.selectedTab);
+      gcliInit.getSystem(this.target).then(system => {
+        this.requisition.system = system;
       });
 
       if (ev.type == "TabSelect") {
@@ -751,7 +774,7 @@
  * Creating a OutputPanel is asynchronous
  */
 function OutputPanel() {
-  throw new Error('Use OutputPanel.create()');
+  throw new Error("Use OutputPanel.create()");
 }
 
 /**
@@ -838,8 +861,8 @@
     this._copyTheme();
 
     this._div = this.document.getElementById("gcli-output-root");
-    this._div.classList.add('gcli-row-out');
-    this._div.setAttribute('aria-live', 'assertive');
+    this._div.classList.add("gcli-row-out");
+    this._div.setAttribute("aria-live", "assertive");
 
     let styles = this._toolbar.ownerDocument.defaultView
                     .getComputedStyle(this._toolbar);
@@ -992,8 +1015,8 @@
   }
 
   if (this.displayedOutput.data != null) {
-    let context = this._devtoolbar.display.requisition.conversionContext;
-    this.displayedOutput.convert('dom', context).then(node => {
+    let context = this._devtoolbar.requisition.conversionContext;
+    this.displayedOutput.convert("dom", context).then(node => {
       if (node == null) {
         return;
       }
@@ -1002,9 +1025,9 @@
         this._div.removeChild(this._div.firstChild);
       }
 
-      var links = node.querySelectorAll('*[href]');
+      var links = node.querySelectorAll("*[href]");
       for (var i = 0; i < links.length; i++) {
-        links[i].setAttribute('target', '_blank');
+        links[i].setAttribute("target", "_blank");
       }
 
       this._div.appendChild(node);
@@ -1071,7 +1094,7 @@
  * Creating a TooltipPanel is asynchronous
  */
 function TooltipPanel() {
-  throw new Error('Use TooltipPanel.create()');
+  throw new Error("Use TooltipPanel.create()");
 }
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/inplace-editor.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/inplace-editor.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/inplace-editor.js	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/inplace-editor.js	2015-04-24 19:30:57.000000000 +0000
@@ -882,6 +882,14 @@
       increment *= smallIncrement;
     }
 
+    // Use default cursor movement rather than providing auto-suggestions.
+    if (aEvent.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_HOME
+        || aEvent.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_END
+        || aEvent.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_PAGE_UP
+        || aEvent.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_PAGE_DOWN) {
+      this._preventSuggestions = true;
+    }
+
     let cycling = false;
     if (increment && this._incrementValue(increment) ) {
       this._updateSize();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser_filter-editor-08.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser_filter-editor-08.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser_filter-editor-08.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser_filter-editor-08.js	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,82 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests the Filter Editor Widget inputs increase/decrease value using
+// arrow keys, applying multiplier using alt/shift on number-type filters
+
+const TEST_URI = "chrome://browser/content/devtools/filter-frame.xhtml";
+const {CSSFilterEditorWidget} = require("devtools/shared/widgets/FilterWidget");
+
+const FAST_VALUE_MULTIPLIER = 10;
+const SLOW_VALUE_MULTIPLIER = 0.1;
+const DEFAULT_VALUE_MULTIPLIER = 1;
+
+add_task(function*() {
+  yield promiseTab("about:blank");
+  let [host, win, doc] = yield createHost("bottom", TEST_URI);
+
+  const container = doc.querySelector("#container");
+  const initialValue = "blur(2px)";
+  let widget = new CSSFilterEditorWidget(container, initialValue);
+
+  let value = 2;
+
+  triggerKey = triggerKey.bind(widget);
+
+  info("Test simple arrow keys");
+  triggerKey(40);
+
+  value -= DEFAULT_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), `${value}px`,
+     "Should decrease value using down arrow");
+
+  triggerKey(38);
+
+  value += DEFAULT_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), `${value}px`,
+     "Should decrease value using down arrow");
+
+  info("Test shift key multiplier");
+  triggerKey(38, "shiftKey");
+
+  value += FAST_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), `${value}px`,
+     "Should increase value by fast multiplier using up arrow");
+
+  triggerKey(40, "shiftKey");
+
+  value -= FAST_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), `${value}px`,
+     "Should decrease value by fast multiplier using down arrow");
+
+  info("Test alt key multiplier");
+  triggerKey(38, "altKey");
+
+  value += SLOW_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), `${value}px`,
+     "Should increase value by slow multiplier using up arrow");
+
+  triggerKey(40, "altKey");
+
+  value -= SLOW_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), `${value}px`,
+     "Should decrease value by slow multiplier using down arrow");
+
+  triggerKey = null;
+});
+
+// Triggers the specified keyCode and modifier key on
+// first filter's input
+function triggerKey(key, modifier) {
+  const filter = this.el.querySelector(".filters").children[0];
+  const input = filter.querySelector("input");
+
+  this._keyDown({
+    target: input,
+    keyCode: key,
+    [modifier]: true,
+    preventDefault: function() {}
+  });
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser_filter-editor-09.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser_filter-editor-09.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser_filter-editor-09.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser_filter-editor-09.js	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,123 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests the Filter Editor Widget inputs increase/decrease value when cursor is
+// on a number using arrow keys, applying multiplier using alt/shift on strings
+
+const TEST_URI = "chrome://browser/content/devtools/filter-frame.xhtml";
+const {CSSFilterEditorWidget} = require("devtools/shared/widgets/FilterWidget");
+
+const FAST_VALUE_MULTIPLIER = 10;
+const SLOW_VALUE_MULTIPLIER = 0.1;
+const DEFAULT_VALUE_MULTIPLIER = 1;
+
+add_task(function*() {
+  yield promiseTab("about:blank");
+  let [host, win, doc] = yield createHost("bottom", TEST_URI);
+
+  const container = doc.querySelector("#container");
+  const initialValue = "drop-shadow(rgb(0, 0, 0) 1px 1px 0px)";
+  let widget = new CSSFilterEditorWidget(container, initialValue);
+  widget.el.querySelector("input").setSelectionRange(13, 13);
+
+  let value = 1;
+
+  triggerKey = triggerKey.bind(widget);
+
+  info("Test simple arrow keys");
+  triggerKey(40);
+
+  value -= DEFAULT_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should decrease value using down arrow");
+
+  triggerKey(38);
+
+  value += DEFAULT_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should decrease value using down arrow");
+
+  info("Test shift key multiplier");
+  triggerKey(38, "shiftKey");
+
+  value += FAST_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should increase value by fast multiplier using up arrow");
+
+  triggerKey(40, "shiftKey");
+
+  value -= FAST_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should decrease value by fast multiplier using down arrow");
+
+  info("Test alt key multiplier");
+  triggerKey(38, "altKey");
+
+  value += SLOW_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should increase value by slow multiplier using up arrow");
+
+  triggerKey(40, "altKey");
+
+  value -= SLOW_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should decrease value by slow multiplier using down arrow");
+
+  triggerKey(40, "shiftKey");
+
+  value -= FAST_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should decrease to negative");
+
+  triggerKey(40);
+
+  value -= DEFAULT_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should decrease negative numbers correctly");
+
+  triggerKey(38);
+
+  value += DEFAULT_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should increase negative values correctly");
+
+  triggerKey(40, "altKey");
+  triggerKey(40, "altKey");
+
+  value -= SLOW_VALUE_MULTIPLIER * 2;
+  is(widget.getValueAt(0), val(value),
+     "Should decrease float numbers correctly");
+
+  triggerKey(38, "altKey");
+
+  value += SLOW_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should increase float numbers correctly");
+
+  triggerKey = null;
+});
+
+// Triggers the specified keyCode and modifier key on
+// first filter's input
+function triggerKey(key, modifier) {
+  const filter = this.el.querySelector(".filters").children[0];
+  const input = filter.querySelector("input");
+
+  this._keyDown({
+    target: input,
+    keyCode: key,
+    [modifier]: true,
+    preventDefault: function() {}
+  });
+}
+
+function val(value) {
+  let v = value.toFixed(1);
+
+  if (v.indexOf(".0") > -1) {
+    v = v.slice(0, -2);
+  }
+  return `rgb(0, 0, 0) ${v}px 1px 0px`;
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser_filter-editor-10.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser_filter-editor-10.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser_filter-editor-10.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser_filter-editor-10.js	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,87 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests the Filter Editor Widget inputs increase/decrease value when cursor is
+// on a number using arrow keys if cursor is behind/mid/after the number strings
+
+const TEST_URI = "chrome://browser/content/devtools/filter-frame.xhtml";
+const {CSSFilterEditorWidget} = require("devtools/shared/widgets/FilterWidget");
+
+const FAST_VALUE_MULTIPLIER = 10;
+const SLOW_VALUE_MULTIPLIER = 0.1;
+const DEFAULT_VALUE_MULTIPLIER = 1;
+
+add_task(function*() {
+  yield promiseTab("about:blank");
+  let [host, win, doc] = yield createHost("bottom", TEST_URI);
+
+  const container = doc.querySelector("#container");
+  const initialValue = "drop-shadow(rgb(0, 0, 0) 10px 1px 0px)";
+  let widget = new CSSFilterEditorWidget(container, initialValue);
+  const input = widget.el.querySelector("input");
+
+  let value = 10;
+
+  triggerKey = triggerKey.bind(widget);
+
+  info("Test increment/decrement of string-type numbers without selection");
+
+  input.setSelectionRange(14, 14);
+  triggerKey(40);
+
+  value -= DEFAULT_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should work with cursor in the middle of number");
+
+  input.setSelectionRange(13, 13);
+  triggerKey(38);
+
+  value += DEFAULT_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should work with cursor before the number");
+
+  input.setSelectionRange(15, 15);
+  triggerKey(40);
+
+  value -= DEFAULT_VALUE_MULTIPLIER;
+  is(widget.getValueAt(0), val(value),
+     "Should work with cursor after the number");
+
+  info("Test increment/decrement of string-type numbers with a selection");
+
+  input.setSelectionRange(13, 15);
+  triggerKey(38);
+  input.setSelectionRange(13, 18);
+  triggerKey(38);
+
+  value += DEFAULT_VALUE_MULTIPLIER * 2;
+  is(widget.getValueAt(0), val(value),
+     "Should work if a there is a selection, starting with the number");
+
+  triggerKey = null;
+});
+
+// Triggers the specified keyCode and modifier key on
+// first filter's input
+function triggerKey(key, modifier) {
+  const filter = this.el.querySelector(".filters").children[0];
+  const input = filter.querySelector("input");
+
+  this._keyDown({
+    target: input,
+    keyCode: key,
+    [modifier]: true,
+    preventDefault: function() {}
+  });
+}
+
+function val(value) {
+  let v = value.toFixed(1);
+
+  if (v.indexOf(".0") > -1) {
+    v = v.slice(0, -2);
+  }
+  return `rgb(0, 0, 0) ${v}px 1px 0px`;
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser.ini	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser.ini	2015-04-24 19:30:57.000000000 +0000
@@ -27,6 +27,9 @@
 [browser_filter-editor-05.js]
 [browser_filter-editor-06.js]
 [browser_filter-editor-07.js]
+[browser_filter-editor-08.js]
+[browser_filter-editor-09.js]
+[browser_filter-editor-10.js]
 [browser_flame-graph-01.js]
 [browser_flame-graph-02.js]
 [browser_flame-graph-03a.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js	2015-04-24 19:30:57.000000000 +0000
@@ -15,20 +15,24 @@
   info("inspector opened");
 
   info("testing the eyedropper button");
-  testButton(toolbox, Telemetry);
+  yield testButton(toolbox, Telemetry);
 
   stopRecordingTelemetryLogs(Telemetry);
   yield gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
 });
 
-function testButton(toolbox, Telemetry) {
+function* testButton(toolbox, Telemetry) {
   let button = toolbox.doc.querySelector("#command-button-eyedropper");
   ok(button, "Captain, we have the eyedropper button");
 
+  let clicked = toolbox._requisition.commandOutputManager.onOutput.once();
+
   info("clicking the button to open the eyedropper");
   button.click();
 
+  yield clicked;
+
   checkResults("_EYEDROPPER_", Telemetry);
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser_toolbar_tooltip.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser_toolbar_tooltip.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/test/browser_toolbar_tooltip.js	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/test/browser_toolbar_tooltip.js	2015-04-24 19:30:57.000000000 +0000
@@ -33,25 +33,25 @@
 add_task(function* testDimensions() {
   let tooltipPanel = DeveloperToolbar.tooltipPanel;
 
-  DeveloperToolbar.display.focusManager.helpRequest();
-  yield DeveloperToolbar.display.inputter.setInput('help help');
+  DeveloperToolbar.focusManager.helpRequest();
+  yield DeveloperToolbar.inputter.setInput('help help');
 
-  DeveloperToolbar.display.inputter.setCursor({ start: 'help help'.length });
+  DeveloperToolbar.inputter.setCursor({ start: 'help help'.length });
   is(tooltipPanel._dimensions.start, 'help '.length,
           'search param start, when cursor at end');
   ok(getLeftMargin() > 30, 'tooltip offset, when cursor at end')
 
-  DeveloperToolbar.display.inputter.setCursor({ start: 'help'.length });
+  DeveloperToolbar.inputter.setCursor({ start: 'help'.length });
   is(tooltipPanel._dimensions.start, 0,
           'search param start, when cursor at end of command');
   ok(getLeftMargin() > 9, 'tooltip offset, when cursor at end of command')
 
-  DeveloperToolbar.display.inputter.setCursor({ start: 'help help'.length - 1 });
+  DeveloperToolbar.inputter.setCursor({ start: 'help help'.length - 1 });
   is(tooltipPanel._dimensions.start, 'help '.length,
           'search param start, when cursor at penultimate position');
   ok(getLeftMargin() > 30, 'tooltip offset, when cursor at penultimate position')
 
-  DeveloperToolbar.display.inputter.setCursor({ start: 0 });
+  DeveloperToolbar.inputter.setCursor({ start: 0 });
   is(tooltipPanel._dimensions.start, 0,
           'search param start, when cursor at start');
   ok(getLeftMargin() > 9, 'tooltip offset, when cursor at start')
@@ -63,19 +63,36 @@
 
   Services.prefs.setCharPref(PREF_DEVTOOLS_THEME, "dark");
 
-  yield DeveloperToolbar.display.inputter.setInput("");
-  yield DeveloperToolbar.display.inputter.setInput("help help");
+  yield DeveloperToolbar.inputter.setInput("");
+  yield DeveloperToolbar.inputter.setInput("help help");
   is(tooltipPanel.document.documentElement.getAttribute("devtoolstheme"),
      "dark", "Tooltip panel has correct theme");
 
   Services.prefs.setCharPref(PREF_DEVTOOLS_THEME, "light");
 
-  yield DeveloperToolbar.display.inputter.setInput("");
-  yield DeveloperToolbar.display.inputter.setInput("help help");
+  yield DeveloperToolbar.inputter.setInput("");
+  yield DeveloperToolbar.inputter.setInput("help help");
   is(tooltipPanel.document.documentElement.getAttribute("devtoolstheme"),
      "light", "Tooltip panel has correct theme");
 });
 
+
+add_task(function* hideToolbar() {
+  info("Ending browser_toolbar_tooltip.js");
+  yield DeveloperToolbar.inputter.setInput('');
+
+  ok(DeveloperToolbar.visible, "DeveloperToolbar is visible in hideToolbar");
+
+  info("Hide toolbar");
+  let hidePromise = observeOnce(DeveloperToolbar.NOTIFICATIONS.HIDE);
+  document.getElementById("Tools:DevToolbar").doCommand();
+  yield hidePromise;
+
+  ok(!DeveloperToolbar.visible, "DeveloperToolbar is not visible in hideToolbar");
+
+  info("Done test");
+});
+
 function getLeftMargin() {
   let style = DeveloperToolbar.tooltipPanel._panel.style.marginLeft;
   return parseInt(style.slice(0, -2), 10);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/widgets/FilterWidget.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/widgets/FilterWidget.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/widgets/FilterWidget.js	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/widgets/FilterWidget.js	2015-04-24 19:30:57.000000000 +0000
@@ -113,6 +113,7 @@
   this._mouseMove = this._mouseMove.bind(this);
   this._mouseUp = this._mouseUp.bind(this);
   this._mouseDown = this._mouseDown.bind(this);
+  this._keyDown = this._keyDown.bind(this);
   this._input = this._input.bind(this);
 
   this._initMarkup();
@@ -195,6 +196,7 @@
     this.addButton.addEventListener("click", this._addButtonClick);
     this.list.addEventListener("click", this._removeButtonClick);
     this.list.addEventListener("mousedown", this._mouseDown);
+    this.list.addEventListener("keydown", this._keyDown);
 
     // These events are event delegators for
     // drag-drop re-ordering and label-dragging
@@ -205,9 +207,77 @@
     this.list.addEventListener("input", this._input);
   },
 
+  _getFilterElementIndex: function(el) {
+    return [...this.list.children].indexOf(el);
+  },
+
+  _keyDown: function(e) {
+    if (e.target.tagName.toLowerCase() !== "input" ||
+       (e.keyCode !== 40 && e.keyCode !== 38)) {
+      return;
+    }
+    let input = e.target;
+
+    const direction = e.keyCode === 40 ? -1 : 1;
+
+    let multiplier = DEFAULT_VALUE_MULTIPLIER;
+    if (e.altKey) {
+      multiplier = SLOW_VALUE_MULTIPLIER;
+    } else if (e.shiftKey) {
+      multiplier = FAST_VALUE_MULTIPLIER;
+    }
+
+    const filterEl = e.target.closest(".filter");
+    const index = this._getFilterElementIndex(filterEl);
+    const filter = this.filters[index];
+
+    // Filters that have units are number-type filters. For them,
+    // the value can be incremented/decremented simply.
+    // For other types of filters (e.g. drop-shadow) we need to check
+    // if the keypress happened close to a number first.
+    if (filter.unit) {
+      let startValue = parseFloat(e.target.value);
+      let value = startValue + direction * multiplier;
+
+      const [min, max] = this._definition(filter.name).range;
+      value = value < min ? min :
+              value > max ? max : value;
+
+      input.value = fixFloat(value);
+
+      this.updateValueAt(index, value);
+    } else {
+      let selectionStart = input.selectionStart;
+      let num = getNeighbourNumber(input.value, selectionStart);
+      if (!num) {
+        return;
+      }
+
+      let {start, end, value} = num;
+
+      let split = input.value.split("");
+      let computed = fixFloat(value + direction * multiplier),
+          dotIndex = computed.indexOf(".0");
+      if (dotIndex > -1) {
+        computed = computed.slice(0, -2);
+
+        selectionStart = selectionStart > start + dotIndex ?
+                                          start + dotIndex :
+                                          selectionStart;
+      }
+      split.splice(start, end - start, computed);
+
+      value = split.join("");
+      input.value = value;
+      this.updateValueAt(index, value);
+      input.setSelectionRange(selectionStart, selectionStart);
+    }
+    e.preventDefault();
+  },
+
   _input: function(e) {
     let filterEl = e.target.closest(".filter"),
-        index = [...this.list.children].indexOf(filterEl),
+        index = this._getFilterElementIndex(filterEl),
         filter = this.filters[index],
         def = this._definition(filter.name);
 
@@ -231,7 +301,7 @@
     } else if (e.target.classList.contains("devtools-draglabel")) {
       let label = e.target,
           input = filterEl.querySelector("input"),
-          index = [...this.list.children].indexOf(filterEl);
+          index = this._getFilterElementIndex(filterEl);
 
       this._dragging = {
         index, label, input,
@@ -273,7 +343,7 @@
     }
 
     let filterEl = e.target.closest(".filter");
-    let index = [...this.list.children].indexOf(filterEl);
+    let index = this._getFilterElementIndex(filterEl);
     this.removeAt(index);
   },
 
@@ -622,6 +692,7 @@
     this.addButton.removeEventListener("click", this._addButtonClick);
     this.list.removeEventListener("click", this._removeButtonClick);
     this.list.removeEventListener("mousedown", this._mouseDown);
+    this.list.removeEventListener("keydown", this._keyDown);
 
     // These events are used for drag drop re-ordering
     this.win.removeEventListener("mousemove", this._mouseMove);
@@ -718,3 +789,40 @@
 
   return filters;
 }
+
+/**
+  * Finds neighbour number characters of an index in a string
+  * the numbers may be floats (containing dots)
+  * It's assumed that the value given to this function is a valid number
+  *
+  * @param {String} string
+  *        The string containing numbers
+  * @param {Number} index
+  *        The index to look for neighbours for
+  * @return {Object}
+  *         returns null if no number is found
+  *         value: The number found
+  *         start: The number's starting index
+  *         end: The number's ending index
+  */
+function getNeighbourNumber(string, index) {
+  if (!/\d/.test(string)) {
+    return null;
+  }
+
+  let left = /-?[0-9.]*$/.exec(string.slice(0, index)),
+      right = /-?[0-9.]*/.exec(string.slice(index));
+
+  left = left ? left[0] : "";
+  right = right ? right[0] : "";
+
+  if (!right && !left) {
+    return null;
+  }
+
+  return {
+    value: fixFloat(left + right, true),
+    start: index - left.length,
+    end: index + right.length
+  };
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/widgets/Tooltip.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/widgets/Tooltip.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/shared/widgets/Tooltip.js	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/shared/widgets/Tooltip.js	2015-04-24 19:30:57.000000000 +0000
@@ -453,8 +453,6 @@
     if (res && res.then) {
       return res.then(arg => {
         return arg instanceof Ci.nsIDOMNode ? arg : target;
-      }, () => {
-        return false;
       });
     } else {
       let newTarget = res instanceof Ci.nsIDOMNode ? res : target;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/sourceeditor/editor.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/sourceeditor/editor.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/sourceeditor/editor.js	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/sourceeditor/editor.js	2015-04-24 19:30:57.000000000 +0000
@@ -220,6 +220,11 @@
     cm.replaceSelection(" ".repeat(num), "end", "+input");
   };
 
+  // Allow add-ons to inject scripts for their editor instances
+  if (!this.config.externalScripts) {
+    this.config.externalScripts = [];
+  }
+
   events.decorate(this);
 }
 
@@ -258,9 +263,11 @@
       if (!this.config.themeSwitching)
         win.document.documentElement.setAttribute("force-theme", "light");
 
-      CM_SCRIPTS.forEach((url) =>
-        Services.scriptloader.loadSubScript(url, win, "utf8"));
-
+      let scriptsToInject = CM_SCRIPTS.concat(this.config.externalScripts);
+      scriptsToInject.forEach((url) => {
+        if (url.startsWith("chrome://"))
+          Services.scriptloader.loadSubScript(url, win, "utf8");
+      });
       // Replace the propertyKeywords, colorKeywords and valueKeywords
       // properties of the CSS MIME type with the values provided by Gecko.
       let cssSpec = win.CodeMirror.resolveMode("text/css");
@@ -335,6 +342,11 @@
       this._prefObserver.on(ENABLE_CODE_FOLDING, this.reloadPreferences);
 
       this.reloadPreferences();
+
+      win.editor = this;
+      let editorReadyEvent = new win.CustomEvent("editorReady");
+      win.dispatchEvent(editorReadyEvent);
+
       def.resolve();
     };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/sourceeditor/test/browser_editor_script_injection.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/sourceeditor/test/browser_editor_script_injection.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/sourceeditor/test/browser_editor_script_injection.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/sourceeditor/test/browser_editor_script_injection.js	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,26 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test the externalScripts option, which allows custom language modes or
+// other scripts to be injected into the editor window.  See Bug 1089428.
+
+"use strict";
+
+add_task(function*() {
+  yield runTest();
+});
+
+function* runTest() {
+  const baseURL = "chrome://mochitests/content/browser/browser/devtools/sourceeditor/test"
+  const injectedText = "Script successfully injected !";
+
+  let {ed, win} = yield setup(null, {
+    mode: "ruby",
+    externalScripts: [`${baseURL}/cm_script_injection_test.js`,
+                      `${baseURL}/cm_mode_ruby.js`]
+  });
+
+  is(ed.getText(), injectedText, "The text has been injected");
+  is(ed.getOption("mode"), "ruby", "The ruby mode is correctly set");
+  teardown(ed, win);
+}
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/sourceeditor/test/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/sourceeditor/test/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/sourceeditor/test/browser.ini	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/sourceeditor/test/browser.ini	2015-04-24 19:30:57.000000000 +0000
@@ -9,6 +9,8 @@
   cm_mode_test.css
   cm_mode_test.js
   cm_multi_test.js
+  cm_mode_ruby.js
+  cm_script_injection_test.js
   cm_search_test.js
   cm_sublime_test.js
   cm_test.js
@@ -31,6 +33,7 @@
 [browser_editor_markers.js]
 [browser_editor_movelines.js]
 [browser_editor_prefs.js]
+[browser_editor_script_injection.js]
 [browser_editor_addons.js]
 [browser_codemirror.js]
 [browser_css_autocompletion.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/sourceeditor/test/cm_mode_ruby.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/sourceeditor/test/cm_mode_ruby.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/sourceeditor/test/cm_mode_ruby.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/sourceeditor/test/cm_mode_ruby.js	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,285 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("ruby", function(config) {
+  function wordObj(words) {
+    var o = {};
+    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
+    return o;
+  }
+  var keywords = wordObj([
+    "alias", "and", "BEGIN", "begin", "break", "case", "class", "def", "defined?", "do", "else",
+    "elsif", "END", "end", "ensure", "false", "for", "if", "in", "module", "next", "not", "or",
+    "redo", "rescue", "retry", "return", "self", "super", "then", "true", "undef", "unless",
+    "until", "when", "while", "yield", "nil", "raise", "throw", "catch", "fail", "loop", "callcc",
+    "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
+    "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
+  ]);
+  var indentWords = wordObj(["def", "class", "case", "for", "while", "module", "then",
+                             "catch", "loop", "proc", "begin"]);
+  var dedentWords = wordObj(["end", "until"]);
+  var matching = {"[": "]", "{": "}", "(": ")"};
+  var curPunc;
+
+  function chain(newtok, stream, state) {
+    state.tokenize.push(newtok);
+    return newtok(stream, state);
+  }
+
+  function tokenBase(stream, state) {
+    curPunc = null;
+    if (stream.sol() && stream.match("=begin") && stream.eol()) {
+      state.tokenize.push(readBlockComment);
+      return "comment";
+    }
+    if (stream.eatSpace()) return null;
+    var ch = stream.next(), m;
+    if (ch == "`" || ch == "'" || ch == '"') {
+      return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
+    } else if (ch == "/") {
+      var currentIndex = stream.current().length;
+      if (stream.skipTo("/")) {
+        var search_till = stream.current().length;
+        stream.backUp(stream.current().length - currentIndex);
+        var balance = 0;  // balance brackets
+        while (stream.current().length < search_till) {
+          var chchr = stream.next();
+          if (chchr == "(") balance += 1;
+          else if (chchr == ")") balance -= 1;
+          if (balance < 0) break;
+        }
+        stream.backUp(stream.current().length - currentIndex);
+        if (balance == 0)
+          return chain(readQuoted(ch, "string-2", true), stream, state);
+      }
+      return "operator";
+    } else if (ch == "%") {
+      var style = "string", embed = true;
+      if (stream.eat("s")) style = "atom";
+      else if (stream.eat(/[WQ]/)) style = "string";
+      else if (stream.eat(/[r]/)) style = "string-2";
+      else if (stream.eat(/[wxq]/)) { style = "string"; embed = false; }
+      var delim = stream.eat(/[^\w\s=]/);
+      if (!delim) return "operator";
+      if (matching.propertyIsEnumerable(delim)) delim = matching[delim];
+      return chain(readQuoted(delim, style, embed, true), stream, state);
+    } else if (ch == "#") {
+      stream.skipToEnd();
+      return "comment";
+    } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
+      return chain(readHereDoc(m[1]), stream, state);
+    } else if (ch == "0") {
+      if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);
+      else if (stream.eat("b")) stream.eatWhile(/[01]/);
+      else stream.eatWhile(/[0-7]/);
+      return "number";
+    } else if (/\d/.test(ch)) {
+      stream.match(/^[\d_]*(?:\.[\d_]+)?(?:[eE][+\-]?[\d_]+)?/);
+      return "number";
+    } else if (ch == "?") {
+      while (stream.match(/^\\[CM]-/)) {}
+      if (stream.eat("\\")) stream.eatWhile(/\w/);
+      else stream.next();
+      return "string";
+    } else if (ch == ":") {
+      if (stream.eat("'")) return chain(readQuoted("'", "atom", false), stream, state);
+      if (stream.eat('"')) return chain(readQuoted('"', "atom", true), stream, state);
+
+      // :> :>> :< :<< are valid symbols
+      if (stream.eat(/[\<\>]/)) {
+        stream.eat(/[\<\>]/);
+        return "atom";
+      }
+
+      // :+ :- :/ :* :| :& :! are valid symbols
+      if (stream.eat(/[\+\-\*\/\&\|\:\!]/)) {
+        return "atom";
+      }
+
+      // Symbols can't start by a digit
+      if (stream.eat(/[a-zA-Z$@_\xa1-\uffff]/)) {
+        stream.eatWhile(/[\w$\xa1-\uffff]/);
+        // Only one ? ! = is allowed and only as the last character
+        stream.eat(/[\?\!\=]/);
+        return "atom";
+      }
+      return "operator";
+    } else if (ch == "@" && stream.match(/^@?[a-zA-Z_\xa1-\uffff]/)) {
+      stream.eat("@");
+      stream.eatWhile(/[\w\xa1-\uffff]/);
+      return "variable-2";
+    } else if (ch == "$") {
+      if (stream.eat(/[a-zA-Z_]/)) {
+        stream.eatWhile(/[\w]/);
+      } else if (stream.eat(/\d/)) {
+        stream.eat(/\d/);
+      } else {
+        stream.next(); // Must be a special global like $: or $!
+      }
+      return "variable-3";
+    } else if (/[a-zA-Z_\xa1-\uffff]/.test(ch)) {
+      stream.eatWhile(/[\w\xa1-\uffff]/);
+      stream.eat(/[\?\!]/);
+      if (stream.eat(":")) return "atom";
+      return "ident";
+    } else if (ch == "|" && (state.varList || state.lastTok == "{" || state.lastTok == "do")) {
+      curPunc = "|";
+      return null;
+    } else if (/[\(\)\[\]{}\\;]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    } else if (ch == "-" && stream.eat(">")) {
+      return "arrow";
+    } else if (/[=+\-\/*:\.^%<>~|]/.test(ch)) {
+      var more = stream.eatWhile(/[=+\-\/*:\.^%<>~|]/);
+      if (ch == "." && !more) curPunc = ".";
+      return "operator";
+    } else {
+      return null;
+    }
+  }
+
+  function tokenBaseUntilBrace(depth) {
+    if (!depth) depth = 1;
+    return function(stream, state) {
+      if (stream.peek() == "}") {
+        if (depth == 1) {
+          state.tokenize.pop();
+          return state.tokenize[state.tokenize.length-1](stream, state);
+        } else {
+          state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth - 1);
+        }
+      } else if (stream.peek() == "{") {
+        state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth + 1);
+      }
+      return tokenBase(stream, state);
+    };
+  }
+  function tokenBaseOnce() {
+    var alreadyCalled = false;
+    return function(stream, state) {
+      if (alreadyCalled) {
+        state.tokenize.pop();
+        return state.tokenize[state.tokenize.length-1](stream, state);
+      }
+      alreadyCalled = true;
+      return tokenBase(stream, state);
+    };
+  }
+  function readQuoted(quote, style, embed, unescaped) {
+    return function(stream, state) {
+      var escaped = false, ch;
+
+      if (state.context.type === 'read-quoted-paused') {
+        state.context = state.context.prev;
+        stream.eat("}");
+      }
+
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && (unescaped || !escaped)) {
+          state.tokenize.pop();
+          break;
+        }
+        if (embed && ch == "#" && !escaped) {
+          if (stream.eat("{")) {
+            if (quote == "}") {
+              state.context = {prev: state.context, type: 'read-quoted-paused'};
+            }
+            state.tokenize.push(tokenBaseUntilBrace());
+            break;
+          } else if (/[@\$]/.test(stream.peek())) {
+            state.tokenize.push(tokenBaseOnce());
+            break;
+          }
+        }
+        escaped = !escaped && ch == "\\";
+      }
+      return style;
+    };
+  }
+  function readHereDoc(phrase) {
+    return function(stream, state) {
+      if (stream.match(phrase)) state.tokenize.pop();
+      else stream.skipToEnd();
+      return "string";
+    };
+  }
+  function readBlockComment(stream, state) {
+    if (stream.sol() && stream.match("=end") && stream.eol())
+      state.tokenize.pop();
+    stream.skipToEnd();
+    return "comment";
+  }
+
+  return {
+    startState: function() {
+      return {tokenize: [tokenBase],
+              indented: 0,
+              context: {type: "top", indented: -config.indentUnit},
+              continuedLine: false,
+              lastTok: null,
+              varList: false};
+    },
+
+    token: function(stream, state) {
+      if (stream.sol()) state.indented = stream.indentation();
+      var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype;
+      var thisTok = curPunc;
+      if (style == "ident") {
+        var word = stream.current();
+        style = state.lastTok == "." ? "property"
+          : keywords.propertyIsEnumerable(stream.current()) ? "keyword"
+          : /^[A-Z]/.test(word) ? "tag"
+          : (state.lastTok == "def" || state.lastTok == "class" || state.varList) ? "def"
+          : "variable";
+        if (style == "keyword") {
+          thisTok = word;
+          if (indentWords.propertyIsEnumerable(word)) kwtype = "indent";
+          else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
+          else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
+            kwtype = "indent";
+          else if (word == "do" && state.context.indented < state.indented)
+            kwtype = "indent";
+        }
+      }
+      if (curPunc || (style && style != "comment")) state.lastTok = thisTok;
+      if (curPunc == "|") state.varList = !state.varList;
+
+      if (kwtype == "indent" || /[\(\[\{]/.test(curPunc))
+        state.context = {prev: state.context, type: curPunc || style, indented: state.indented};
+      else if ((kwtype == "dedent" || /[\)\]\}]/.test(curPunc)) && state.context.prev)
+        state.context = state.context.prev;
+
+      if (stream.eol())
+        state.continuedLine = (curPunc == "\\" || style == "operator");
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize[state.tokenize.length-1] != tokenBase) return 0;
+      var firstChar = textAfter && textAfter.charAt(0);
+      var ct = state.context;
+      var closing = ct.type == matching[firstChar] ||
+        ct.type == "keyword" && /^(?:end|until|else|elsif|when|rescue)\b/.test(textAfter);
+      return ct.indented + (closing ? 0 : config.indentUnit) +
+        (state.continuedLine ? config.indentUnit : 0);
+    },
+
+    electricChars: "}de", // enD and rescuE
+    lineComment: "#"
+  };
+});
+
+CodeMirror.defineMIME("text/x-ruby", "ruby");
+
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/sourceeditor/test/cm_script_injection_test.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/sourceeditor/test/cm_script_injection_test.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/sourceeditor/test/cm_script_injection_test.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/sourceeditor/test/cm_script_injection_test.js	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,3 @@
+window.addEventListener("editorReady", function(event) {
+  editor.setText("Script successfully injected !");
+});
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/styleeditor-commands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/styleeditor-commands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/styleeditor-commands.js	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/styleeditor-commands.js	2015-04-24 19:30:57.000000000 +0000
@@ -4,12 +4,30 @@
 
 "use strict";
 
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
+/**
+ * The `edit` command opens the toolbox to the style editor, with a given
+ * stylesheet open.
+ *
+ * This command is tricky. The 'edit' command uses the toolbox, so it's
+ * clearly runAt:client, but it uses the 'resource' type which accesses the
+ * DOM, so it must also be runAt:server.
+ *
+ * Our solution is to have the command technically be runAt:server, but to not
+ * actually do anything other than basically `return args;`, and have the
+ * converter (all converters are runAt:client) do the actual work of opening
+ * a toolbox.
+ *
+ * For alternative solutions that we considered, see the comment on commit
+ * 2645af7.
+ */
 exports.items = [{
+  item: "command",
+  runAt: "server",
   name: "edit",
-  description: gcli.lookup("editDesc"),
-  manual: gcli.lookup("editManual2"),
+  description: l10n.lookup("editDesc"),
+  manual: l10n.lookup("editManual2"),
   params: [
      {
        name: 'resource',
@@ -17,7 +35,7 @@
          name: 'resource',
          include: 'text/css'
        },
-       description: gcli.lookup("editResourceDesc")
+       description: l10n.lookup("editResourceDesc")
      },
      {
        name: "line",
@@ -27,15 +45,23 @@
          min: 1,
          step: 10
        },
-       description: gcli.lookup("editLineToJumpToDesc")
+       description: l10n.lookup("editLineToJumpToDesc")
      }
    ],
+   returnType: "editArgs",
+   exec: args => {
+     return { href: args.resource.name, line: args.line };
+   }
+}, {
+  item: "converter",
+  from: "editArgs",
+  to: "dom",
    exec: function(args, context) {
      let target = context.environment.target;
      let gDevTools = require("resource:///modules/devtools/gDevTools.jsm").gDevTools;
      return gDevTools.showToolbox(target, "styleeditor").then(function(toolbox) {
        let styleEditor = toolbox.getCurrentPanel();
-       styleEditor.selectStyleSheet(args.resource.element, args.line);
+       styleEditor.selectStyleSheet(args.href, args.line);
        return null;
      });
    }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/styleeditor-panel.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/styleeditor-panel.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/styleeditor-panel.js	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/styleeditor-panel.js	2015-04-24 19:30:57.000000000 +0000
@@ -61,9 +61,9 @@
 
     // Initialize the UI
     this.UI = new StyleEditorUI(this._debuggee, this.target, this._panelDoc);
+    this.UI.on("error", this._showError);
     yield this.UI.initialize();
 
-    this.UI.on("error", this._showError);
     this.isReady = true;
 
     return this;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/StyleEditorUI.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/StyleEditorUI.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/StyleEditorUI.jsm	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/StyleEditorUI.jsm	2015-04-24 19:30:57.000000000 +0000
@@ -239,7 +239,11 @@
     this._clear();
 
     for (let sheet of styleSheets) {
-      yield this._addStyleSheet(sheet);
+      try {
+        yield this._addStyleSheet(sheet);
+      } catch (e) {
+        this.emit("error", { key: LOAD_ERROR });
+      }
     }
 
     this._root.classList.remove("loading");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/browser.ini	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/browser.ini	2015-04-24 19:30:57.000000000 +0000
@@ -18,6 +18,7 @@
   media-rules.css
   media-rules-sourcemaps.html
   minified.html
+  missing.html
   nostyle.html
   pretty.css
   resources_inpage.jsi
@@ -66,6 +67,7 @@
 [browser_styleeditor_loading.js]
 [browser_styleeditor_media_sidebar.js]
 [browser_styleeditor_media_sidebar_sourcemaps.js]
+[browser_styleeditor_missing_stylesheet.js]
 [browser_styleeditor_navigate.js]
 [browser_styleeditor_new.js]
 [browser_styleeditor_nostyle.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_cmd_edit.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_cmd_edit.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_cmd_edit.js	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_cmd_edit.js	2015-04-24 19:30:57.000000000 +0000
@@ -176,14 +176,6 @@
       setup: "edit css#style2",
       check: {
         input: "edit css#style2",
-        args: {
-          resource: {
-            value: function(resource) {
-              let style2 = options.window.document.getElementById("style2");
-              return resource.element.ownerNode == style2;
-            }
-          }
-        }
       },
       exec: { output: "" }
     },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_missing_stylesheet.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_missing_stylesheet.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_missing_stylesheet.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_missing_stylesheet.js	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,30 @@
+"use strict";
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Checks that the style editor manages to finalize its stylesheet loading phase
+// even if one stylesheet is missing, and that an error message is displayed.
+
+const TESTCASE_URI = TEST_BASE + "missing.html";
+
+add_task(function* () {
+  let { ui, toolbox, panel } = yield openStyleEditorForURL(TESTCASE_URI);
+
+  // Note that we're not testing for a specific number of stylesheet editors
+  // below because the test-page is loaded with chrome:// URL and, right now,
+  // that means UA stylesheets are shown. So we avoid hardcoding the number of
+  // stylesheets here.
+  ok(ui.editors.length, "The UI contains style sheets.");
+
+  let rootEl = panel.panelWindow.document.getElementById("style-editor-chrome");
+  ok(!rootEl.classList.contains("loading"), "The loading indicator is hidden");
+
+  let notifBox = toolbox.getNotificationBox();
+  let notif = notifBox.currentNotification;
+  ok(notif, "The notification box contains a message");
+  ok(notif.label.indexOf("Style sheet could not be loaded") !== -1,
+    "The error message is the correct one");
+  ok(notif.label.indexOf("missing-stylesheet.css") !== -1,
+    "The error message contains the missing stylesheet's URL");
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_opentab.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_opentab.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_opentab.js	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_opentab.js	2015-04-24 19:30:57.000000000 +0000
@@ -5,11 +5,9 @@
 // A test to check the 'Open Link in new tab' functionality in the
 // context menu item for stylesheets (bug 992947).
 const TESTCASE_URI = TEST_BASE_HTTPS + "simple.html";
-waitForExplicitFinish();
 
 add_task(function*() {
-  let panel = yield addTabAndOpenStyleEditors(2, null, TESTCASE_URI);
-  let ui = panel.UI;
+  let { ui } = yield openStyleEditorForURL(TESTCASE_URI);
 
   yield rightClickStyleSheet(ui, ui.editors[0]);
   is(ui._openLinkNewTabItem.getAttribute("disabled"), "false", "The menu item is not disabled");
@@ -73,7 +71,7 @@
   EventUtils.synthesizeMouseAtCenter(
     editor.summary.querySelector(".stylesheet-name"),
     {button: 2, type: "contextmenu"},
-    gPanelWindow);
+    ui._window);
 
   return defer.promise;
 }
@@ -91,7 +89,7 @@
   EventUtils.synthesizeMouseAtCenter(
     editor.summary.querySelector(".stylesheet-name"),
     {button: 2, type: "contextmenu"},
-    gPanelWindow);
+    ui._window);
 
   return defer.promise;
 }
@@ -109,7 +107,7 @@
   EventUtils.synthesizeMouseAtCenter(
     ui._panelDoc.querySelector("#splitview-tpl-summary-stylesheet"),
     {button: 2, type: "contextmenu"},
-    gPanelWindow);
+    ui._window);
 
   return defer.promise;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/head.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/head.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/head.js	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/head.js	2015-04-24 19:30:57.000000000 +0000
@@ -12,7 +12,6 @@
 let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 
-let gPanelWindow;
 
 
 // Import the GCLI test helper
@@ -64,7 +63,6 @@
 
 function* cleanup()
 {
-  gPanelWindow = null;
   while (gBrowser.tabs.length > 1) {
     let target = TargetFactory.forTab(gBrowser.selectedTab);
     yield gDevTools.closeToolbox(target);
@@ -87,56 +85,6 @@
   return { tab, toolbox, panel, ui };
 });
 
-function addTabAndOpenStyleEditors(count, callback, uri) {
-  let deferred = promise.defer();
-  let currentCount = 0;
-  let panel;
-  addTabAndCheckOnStyleEditorAdded(p => panel = p, function (editor) {
-    currentCount++;
-    info(currentCount + " of " + count + " editors opened: "
-         + editor.styleSheet.href);
-    if (currentCount == count) {
-      if (callback) {
-        callback(panel);
-      }
-      deferred.resolve(panel);
-    }
-  });
-
-  if (uri) {
-    content.location = uri;
-  }
-  return deferred.promise;
-}
-
-function addTabAndCheckOnStyleEditorAdded(callbackOnce, callbackOnAdded) {
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
-    gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
-    openStyleEditorInWindow(window, function (panel) {
-      // Execute the individual callback with the panel argument.
-      callbackOnce(panel);
-      // Report editors that already opened while loading.
-      for (let editor of panel.UI.editors) {
-        callbackOnAdded(editor);
-      }
-      // Report new editors added afterwards.
-      panel.UI.on("editor-added", (event, editor) => callbackOnAdded(editor));
-    });
-  }, true);
-}
-
-function openStyleEditorInWindow(win, callback) {
-  let target = TargetFactory.forTab(win.gBrowser.selectedTab);
-  win.gDevTools.showToolbox(target, "styleeditor").then(function(toolbox) {
-    let panel = toolbox.getCurrentPanel();
-    gPanelWindow = panel._panelWin;
-
-    panel.UI._alwaysDisableAnimations = true;
-    callback(panel);
-  });
-}
-
 /**
  * Loads shared/frame-script-utils.js in the specified tab.
  *
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/missing.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/missing.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleeditor/test/missing.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleeditor/test/missing.html	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>missing stylesheet testcase</title>
+  <link rel="stylesheet" charset="utf-8" type="text/css" media="screen" href="missing-stylesheet.css"/>
+  <link rel="stylesheet" charset="utf-8" type="text/css" media="screen" href="simple.css"/>
+</head>
+<body>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleinspector/computedview.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleinspector/computedview.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleinspector/computedview.xhtml	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleinspector/computedview.xhtml	2015-04-24 19:30:57.000000000 +0000
@@ -54,7 +54,7 @@
         <div class="devtools-searchbox">
           <input id="computedview-searchbox"
                  class="devtools-searchinput devtools-rule-searchbox"
-                 type="search" placeholder="&userStylesSearch;"/>
+                 type="search" placeholder="&filterStylesPlaceholder;"/>
           <button id="computedview-searchinput-clear" class="devtools-searchinput-clear"></button>
         </div>
         <xul:checkbox id="browser-style-checkbox"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleinspector/cssruleview.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleinspector/cssruleview.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleinspector/cssruleview.xhtml	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleinspector/cssruleview.xhtml	2015-04-24 19:30:57.000000000 +0000
@@ -42,7 +42,7 @@
         <div class="devtools-searchbox">
           <input id="ruleview-searchbox"
                  class="devtools-searchinput devtools-rule-searchbox"
-                 type="search" placeholder="&userStylesSearch;"/>
+                 type="search" placeholder="&filterStylesPlaceholder;"/>
           <button id="ruleview-searchinput-clear" class="devtools-searchinput-clear"></button>
         </div>
       </div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleinspector/rule-view.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleinspector/rule-view.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleinspector/rule-view.js	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleinspector/rule-view.js	2015-04-24 19:30:57.000000000 +0000
@@ -2895,7 +2895,7 @@
       let outputParser = this.ruleEditor.ruleView._outputParser;
       let frag = outputParser.parseCssProperty(
         computed.name, computed.value, {
-          colorSwatchClass: "ruleview-colorswatch",
+          colorSwatchClass: "ruleview-swatch ruleview-colorswatch",
           urlClass: "theme-link",
           baseURI: this.sheetURI
         }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_01.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_01.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_01.js	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_01.js	2015-04-24 19:30:57.000000000 +0000
@@ -42,6 +42,10 @@
   ["VK_BACK_SPACE", "di", -1, 0],
   ["VK_BACK_SPACE", "d", -1, 0],
   ["VK_BACK_SPACE", "", -1, 0],
+  ["VK_HOME", "", -1, 0],
+  ["VK_END", "", -1, 0],
+  ["VK_PAGE_UP", "", -1, 0],
+  ["VK_PAGE_DOWN", "", -1, 0],
   ["f", "fill", 0, MAX_ENTRIES],
   ["i", "fill", 0, 4],
   ["VK_LEFT", "fill", -1, 0],
@@ -76,8 +80,8 @@
 
   let onSuggest;
 
-  if (/(left|right|back_space|escape)/ig.test(key)) {
-    info("Adding event listener for left|right|back_space|escape keys");
+  if (/(left|right|back_space|escape|home|end|page_up|page_down)/ig.test(key)) {
+    info("Adding event listener for left|right|back_space|escape|home|end|page_up|page_down keys");
     onSuggest = once(editor.input, "keypress");
   } else {
     info("Waiting for after-suggest event on the editor");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/tilt/tilt-commands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/tilt/tilt-commands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/tilt/tilt-commands.js	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/tilt/tilt-commands.js	2015-04-24 19:30:57.000000000 +0000
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 // Fetch TiltManager using the current loader, but don't save a
 // reference to it, because it might change with a tool reload.
@@ -19,18 +19,18 @@
 exports.items = [
 {
   name: 'tilt',
-  description: gcli.lookup("tiltDesc"),
-  manual: gcli.lookup("tiltManual"),
+  description: l10n.lookup("tiltDesc"),
+  manual: l10n.lookup("tiltManual"),
   hidden: true
 },
 {
   name: 'tilt open',
-  description: gcli.lookup("tiltOpenDesc"),
-  manual: gcli.lookup("tiltOpenManual"),
+  description: l10n.lookup("tiltOpenDesc"),
+  manual: l10n.lookup("tiltOpenManual"),
   hidden: true,
   exec: function(args, context) {
     if (isMultiProcess(context)) {
-      return gcli.lookupFormat("notAvailableInE10S", [this.name]);
+      return l10n.lookupFormat("notAvailableInE10S", [this.name]);
     }
 
     let chromeWindow = context.environment.chromeDocument.defaultView;
@@ -44,7 +44,7 @@
   name: "tilt toggle",
   buttonId: "command-button-tilt",
   buttonClass: "command-button command-button-invertable",
-  tooltipText: gcli.lookup("tiltToggleTooltip"),
+  tooltipText: l10n.lookup("tiltToggleTooltip"),
   hidden: true,
   state: {
     isChecked: function(aTarget) {
@@ -66,7 +66,7 @@
   },
   exec: function(args, context) {
     if (isMultiProcess(context)) {
-      return gcli.lookupFormat("notAvailableInE10S", [this.name]);
+      return l10n.lookupFormat("notAvailableInE10S", [this.name]);
     }
 
     let chromeWindow = context.environment.chromeDocument.defaultView;
@@ -76,28 +76,28 @@
 },
 {
   name: 'tilt translate',
-  description: gcli.lookup("tiltTranslateDesc"),
-  manual: gcli.lookup("tiltTranslateManual"),
+  description: l10n.lookup("tiltTranslateDesc"),
+  manual: l10n.lookup("tiltTranslateManual"),
   hidden: true,
   params: [
     {
       name: "x",
       type: "number",
       defaultValue: 0,
-      description: gcli.lookup("tiltTranslateXDesc"),
-      manual: gcli.lookup("tiltTranslateXManual")
+      description: l10n.lookup("tiltTranslateXDesc"),
+      manual: l10n.lookup("tiltTranslateXManual")
     },
     {
       name: "y",
       type: "number",
       defaultValue: 0,
-      description: gcli.lookup("tiltTranslateYDesc"),
-      manual: gcli.lookup("tiltTranslateYManual")
+      description: l10n.lookup("tiltTranslateYDesc"),
+      manual: l10n.lookup("tiltTranslateYManual")
     }
   ],
   exec: function(args, context) {
     if (isMultiProcess(context)) {
-      return gcli.lookupFormat("notAvailableInE10S", [this.name]);
+      return l10n.lookupFormat("notAvailableInE10S", [this.name]);
     }
 
     let chromeWindow = context.environment.chromeDocument.defaultView;
@@ -109,35 +109,35 @@
 },
 {
   name: 'tilt rotate',
-  description: gcli.lookup("tiltRotateDesc"),
-  manual: gcli.lookup("tiltRotateManual"),
+  description: l10n.lookup("tiltRotateDesc"),
+  manual: l10n.lookup("tiltRotateManual"),
   hidden: true,
   params: [
     {
       name: "x",
       type: { name: 'number', min: -360, max: 360, step: 10 },
       defaultValue: 0,
-      description: gcli.lookup("tiltRotateXDesc"),
-      manual: gcli.lookup("tiltRotateXManual")
+      description: l10n.lookup("tiltRotateXDesc"),
+      manual: l10n.lookup("tiltRotateXManual")
     },
     {
       name: "y",
       type: { name: 'number', min: -360, max: 360, step: 10 },
       defaultValue: 0,
-      description: gcli.lookup("tiltRotateYDesc"),
-      manual: gcli.lookup("tiltRotateYManual")
+      description: l10n.lookup("tiltRotateYDesc"),
+      manual: l10n.lookup("tiltRotateYManual")
     },
     {
       name: "z",
       type: { name: 'number', min: -360, max: 360, step: 10 },
       defaultValue: 0,
-      description: gcli.lookup("tiltRotateZDesc"),
-      manual: gcli.lookup("tiltRotateZManual")
+      description: l10n.lookup("tiltRotateZDesc"),
+      manual: l10n.lookup("tiltRotateZManual")
     }
   ],
   exec: function(args, context) {
     if (isMultiProcess(context)) {
-      return gcli.lookupFormat("notAvailableInE10S", [this.name]);
+      return l10n.lookupFormat("notAvailableInE10S", [this.name]);
     }
 
     let chromeWindow = context.environment.chromeDocument.defaultView;
@@ -149,20 +149,20 @@
 },
 {
   name: 'tilt zoom',
-  description: gcli.lookup("tiltZoomDesc"),
-  manual: gcli.lookup("tiltZoomManual"),
+  description: l10n.lookup("tiltZoomDesc"),
+  manual: l10n.lookup("tiltZoomManual"),
   hidden: true,
   params: [
     {
       name: "zoom",
       type: { name: 'number' },
-      description: gcli.lookup("tiltZoomAmountDesc"),
-      manual: gcli.lookup("tiltZoomAmountManual")
+      description: l10n.lookup("tiltZoomAmountDesc"),
+      manual: l10n.lookup("tiltZoomAmountManual")
     }
   ],
   exec: function(args, context) {
     if (isMultiProcess(context)) {
-      return gcli.lookupFormat("notAvailableInE10S", [this.name]);
+      return l10n.lookupFormat("notAvailableInE10S", [this.name]);
     }
 
     let chromeWindow = context.environment.chromeDocument.defaultView;
@@ -175,12 +175,12 @@
 },
 {
   name: 'tilt reset',
-  description: gcli.lookup("tiltResetDesc"),
-  manual: gcli.lookup("tiltResetManual"),
+  description: l10n.lookup("tiltResetDesc"),
+  manual: l10n.lookup("tiltResetManual"),
   hidden: true,
   exec: function(args, context) {
     if (isMultiProcess(context)) {
-      return gcli.lookupFormat("notAvailableInE10S", [this.name]);
+      return l10n.lookupFormat("notAvailableInE10S", [this.name]);
     }
 
     let chromeWindow = context.environment.chromeDocument.defaultView;
@@ -193,12 +193,12 @@
 },
 {
   name: 'tilt close',
-  description: gcli.lookup("tiltCloseDesc"),
-  manual: gcli.lookup("tiltCloseManual"),
+  description: l10n.lookup("tiltCloseDesc"),
+  manual: l10n.lookup("tiltCloseManual"),
   hidden: true,
   exec: function(args, context) {
     if (isMultiProcess(context)) {
-      return gcli.lookupFormat("notAvailableInE10S", [this.name]);
+      return l10n.lookupFormat("notAvailableInE10S", [this.name]);
     }
 
     let chromeWindow = context.environment.chromeDocument.defaultView;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/webconsole/console-commands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/webconsole/console-commands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/webconsole/console-commands.js	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/webconsole/console-commands.js	2015-04-24 19:30:57.000000000 +0000
@@ -4,16 +4,18 @@
 
 "use strict";
 
-const gcli = require("gcli/index");
-const { gDevTools } = require("resource:///modules/devtools/gDevTools.jsm");
+const l10n = require("gcli/l10n");
+loader.lazyGetter(this, "gDevTools", () => require("resource:///modules/devtools/gDevTools.jsm").gDevTools);
 
 exports.items = [
   {
+    item: "command",
+    runAt: "client",
     name: 'splitconsole',
     hidden: true,
     buttonId: "command-button-splitconsole",
     buttonClass: "command-button command-button-invertable",
-    tooltipText: gcli.lookup("splitconsoleTooltip"),
+    tooltipText: l10n.lookup("splitconsoleTooltip"),
     isRemoteSafe: true,
     state: {
       isChecked: function(target) {
@@ -51,12 +53,14 @@
   },
   {
     name: "console",
-    description: gcli.lookup("consoleDesc"),
-    manual: gcli.lookup("consoleManual")
+    description: l10n.lookup("consoleDesc"),
+    manual: l10n.lookup("consoleManual")
   },
   {
+    item: "command",
+    runAt: "client",
     name: "console clear",
-    description: gcli.lookup("consoleclearDesc"),
+    description: l10n.lookup("consoleclearDesc"),
     exec: function(args, context) {
       let toolbox = gDevTools.getToolbox(context.environment.target);
       if (toolbox == null) {
@@ -72,17 +76,24 @@
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "console close",
-    description: gcli.lookup("consolecloseDesc"),
+    description: l10n.lookup("consolecloseDesc"),
     exec: function(args, context) {
-      return gDevTools.closeToolbox(context.environment.target);
+      return gDevTools.closeToolbox(context.environment.target)
+                      .then(() => {}); // Don't return a value to GCLI
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "console open",
-    description: gcli.lookup("consoleopenDesc"),
+    description: l10n.lookup("consoleopenDesc"),
     exec: function(args, context) {
-      return gDevTools.showToolbox(context.environment.target, "webconsole");
+      const target = context.environment.target;
+      return gDevTools.showToolbox(target, "webconsole")
+                      .then(() => {}); // Don't return a value to GCLI
     }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/webconsole/console-output.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/webconsole/console-output.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/webconsole/console-output.js	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/webconsole/console-output.js	2015-04-24 19:30:57.000000000 +0000
@@ -7,6 +7,8 @@
 
 const {Cc, Ci, Cu} = require("chrome");
 
+const { Services } = require("resource://gre/modules/Services.jsm");
+
 loader.lazyImporter(this, "VariablesView", "resource:///modules/devtools/VariablesView.jsm");
 loader.lazyImporter(this, "escapeHTML", "resource:///modules/devtools/VariablesView.jsm");
 loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/webide/content/prefs.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/webide/content/prefs.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/webide/content/prefs.xhtml	2015-04-22 13:05:30.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/webide/content/prefs.xhtml	2015-04-24 19:30:58.000000000 +0000
@@ -47,7 +47,7 @@
         </label>
       </li>
       <li>
-        <label title="&prefs_options_templatesurl_tooltip;">
+        <label class="text-input" title="&prefs_options_templatesurl_tooltip;">
           <span>&prefs_options_templatesurl;</span>
           <input data-pref="devtools.webide.templatesURL"/>
         </label>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/webide/themes/deck.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/webide/themes/deck.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/devtools/webide/themes/deck.css	2015-04-22 13:05:30.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/devtools/webide/themes/deck.css	2015-04-24 19:30:58.000000000 +0000
@@ -18,6 +18,15 @@
   background-image: linear-gradient(#fff, #ededed 100px);
 }
 
+.text-input {
+  display: flex;
+}
+
+.text-input input {
+  flex: 0.5;
+  margin-left: 5px;
+}
+
 h1 {
   font-size: 2.5em;
   font-weight: lighter;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/extensions/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/extensions/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/extensions/Makefile.in	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/extensions/Makefile.in	2015-04-24 19:30:58.000000000 +0000
@@ -2,10 +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/.
 
-ifdef MOZ_METRO
-GENERATED_DIRS = $(DIST)/bin/metro/chrome
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 exclude_files = \
@@ -34,27 +30,3 @@
           $(FINAL_TARGET)/chrome
 	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest chrome/shumway.manifest')
 endif
-
-ifdef MOZ_METRO
-ifdef NIGHTLY_BUILD
-$(DIST)/bin/metro/chrome/pdfjs.manifest: $(GLOBAL_DEPS)
-	printf 'manifest pdfjs/chrome.manifest' > $@
-
-libs:: $(DIST)/bin/metro/chrome/pdfjs.manifest
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py \
-	  $(srcdir)/pdfjs \
-          $(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \
-          $(DIST)/bin/metro/chrome
-	$(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest 'manifest chrome/pdfjs.manifest')
-
-$(DIST)/bin/metro/chrome/shumway.manifest: $(GLOBAL_DEPS)
-	printf 'manifest shumway/chrome.manifest' > $@
-
-libs:: $(DIST)/bin/metro/chrome/shumway.manifest
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py \
-	  $(srcdir)/shumway \
-          $(foreach exclude,$(exclude_files), -X $(srcdir)/shumway/$(exclude)) \
-          $(DIST)/bin/metro/chrome
-	$(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest 'manifest chrome/shumway.manifest')
-endif
-endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/extensions/pdfjs/test/browser_pdfjs_navigation.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/extensions/pdfjs/test/browser_pdfjs_navigation.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/extensions/pdfjs/test/browser_pdfjs_navigation.js	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/extensions/pdfjs/test/browser_pdfjs_navigation.js	2015-04-24 19:30:58.000000000 +0000
@@ -189,11 +189,11 @@
     setZoomToPageFit(document).then(function () {
       runNextTest(document, window, finish);
     }, function () {
-      ok(false, "Current scale has been ste to 'page-fit'");
+      ok(false, "Current scale has been set to 'page-fit'");
       finish();
     });
   }, function () {
-    ok(false, "Outline items have ben found");
+    ok(false, "Outline items have been found");
     finish();
   });
 }
@@ -267,14 +267,16 @@
  */
 function waitForOutlineItems(document) {
   var deferred = Promise.defer();
-  var timeout = setTimeout(() => deferred.reject(), 10000);
-  var interval = setInterval(function () {
-    if (document.querySelectorAll(".outlineItem").length == PDF_OUTLINE_ITEMS) {
-      clearInterval(interval);
-      clearTimeout(timeout);
+  document.addEventListener("outlineloaded", function outlineLoaded(evt) {
+    document.removeEventListener("outlineloaded", outlineLoaded);
+    var outlineCount = evt.detail.outlineCount;
+
+    if (document.querySelectorAll(".outlineItem").length === outlineCount) {
       deferred.resolve();
+    } else {
+      deferred.reject();
     }
-  }, 500);
+  });
 
   return deferred.promise;
 }
@@ -289,11 +291,10 @@
 function setZoomToPageFit(document) {
   var deferred = Promise.defer();
   document.addEventListener("pagerendered", function onZoom(e) {
-    document.removeEventListener("pagerendered", onZoom), false;
+    document.removeEventListener("pagerendered", onZoom);
     document.querySelector("#viewer").click();
     deferred.resolve();
-
-  }, false);
+  });
 
   var select = document.querySelector("select#scaleSelect");
   select.selectedIndex = 2;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/installer/package-manifest.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/installer/package-manifest.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/installer/package-manifest.in	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/installer/package-manifest.in	2015-04-24 19:30:59.000000000 +0000
@@ -218,6 +218,7 @@
 @RESPATH@/components/dom_offline.xpt
 @RESPATH@/components/dom_json.xpt
 @RESPATH@/components/dom_power.xpt
+@RESPATH@/components/dom_push.xpt
 @RESPATH@/components/dom_quota.xpt
 @RESPATH@/components/dom_range.xpt
 @RESPATH@/components/dom_security.xpt
@@ -558,7 +559,7 @@
 @RESPATH@/components/AlarmsManager.manifest
 @RESPATH@/components/Push.js
 @RESPATH@/components/Push.manifest
-@RESPATH@/components/PushServiceLauncher.js
+@RESPATH@/components/PushNotificationService.js
 
 @RESPATH@/components/SlowScriptDebug.manifest
 @RESPATH@/components/SlowScriptDebug.js
@@ -885,36 +886,6 @@
 @RESPATH@/webapprt/modules/WebRTCHandler.jsm
 #endif
 
-#ifdef MOZ_METRO
-@RESPATH@/components/MetroUIUtils.js
-@RESPATH@/components/MetroUIUtils.manifest
-[metro]
-; gre resources
-@BINPATH@/CommandExecuteHandler@BIN_SUFFIX@
-@RESPATH@/resources.pri
-@RESPATH@/VisualElementsManifest.xml
-@RESPATH@/tileresources
-; app dir resources
-@RESPATH@/metro/chrome.manifest
-@RESPATH@/metro/searchplugins
-@RESPATH@/metro/metroapp.ini
-@RESPATH@/metro/chrome/browser@JAREXT@
-@RESPATH@/metro/chrome/browser.manifest
-@RESPATH@/metro/chrome/chrome@JAREXT@
-@RESPATH@/metro/chrome/chrome.manifest
-@RESPATH@/metro/chrome/@AB_CD@@JAREXT@
-@RESPATH@/metro/chrome/@AB_CD@.manifest
-#ifdef NIGHTLY_BUILD
-@RESPATH@/metro/chrome/shumway.manifest
-@RESPATH@/metro/chrome/shumway/*
-@RESPATH@/metro/chrome/pdfjs.manifest
-@RESPATH@/metro/chrome/pdfjs/*
-#endif
-@RESPATH@/metro/components
-@RESPATH@/metro/defaults
-@RESPATH@/metro/modules
-#endif
-
 @RESPATH@/components/DataStore.manifest
 @RESPATH@/components/DataStoreImpl.js
 @RESPATH@/components/dom_datastore.xpt
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/installer/windows/nsis/defines.nsi.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/installer/windows/nsis/defines.nsi.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/installer/windows/nsis/defines.nsi.in	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/installer/windows/nsis/defines.nsi.in	2015-04-24 19:30:59.000000000 +0000
@@ -74,10 +74,6 @@
 !define MOZ_MAINTENANCE_SERVICE
 #endif
 
-#ifdef MOZ_METRO
-!define MOZ_METRO
-#endif
-
 # File details shared by both the installer and uninstaller
 VIProductVersion "1.0.0.0"
 VIAddVersionKey "ProductName"     "${BrandShortName}"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/installer/windows/nsis/installer.nsi thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/installer/windows/nsis/installer.nsi
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/installer/windows/nsis/installer.nsi	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/installer/windows/nsis/installer.nsi	2015-04-24 19:30:59.000000000 +0000
@@ -100,9 +100,6 @@
 !insertmacro RegCleanAppHandler
 !insertmacro RegCleanMain
 !insertmacro RegCleanUninstall
-!ifdef MOZ_METRO
-!insertmacro RemoveDEHRegistrationIfMatching
-!endif
 !insertmacro RemovePrecompleteEntries
 !insertmacro SetAppLSPCategories
 !insertmacro SetBrandNameVars
@@ -340,9 +337,6 @@
   SetShellVarContext current  ; Set SHCTX to HKCU
   ${RegCleanMain} "Software\Mozilla"
   ${RegCleanUninstall}
-!ifdef MOZ_METRO
-  ${ResetWin8PromptKeys} "HKCU" ""
-!endif
   ${UpdateProtocolHandlers}
 
   ClearErrors
@@ -428,24 +422,12 @@
     ${Else}
       WriteRegDWORD HKCU "$0" "IconsVisible" 0
     ${EndIf}
-!ifdef MOZ_METRO
-    ${CleanupMetroBrowserHandlerValues} ${DELEGATE_EXECUTE_HANDLER_ID} \
-                                        "FirefoxURL" \
-                                        "FirefoxHTML"
-    ${AddMetroBrowserHandlerValues} ${DELEGATE_EXECUTE_HANDLER_ID} \
-                                    "$INSTDIR\CommandExecuteHandler.exe" \
-                                    $AppUserModelID \
-                                    "FirefoxURL" \
-                                    "FirefoxHTML"
-!else
-  ; The metro browser is not enabled by the mozconfig.
   ${If} ${AtLeastWin8}
     ${RemoveDEHRegistration} ${DELEGATE_EXECUTE_HANDLER_ID} \
                              $AppUserModelID \
                              "FirefoxURL" \
                              "FirefoxHTML"
   ${EndIf}
-!endif
   ${EndIf}
 
 !ifdef MOZ_MAINTENANCE_SERVICE
@@ -815,21 +797,7 @@
   ${If} ${Errors}
     StrCpy $1 "0"
     StrCpy $2 "0"
-!ifdef MOZ_METRO
-    ; Check to see if this install location is currently set as the
-    ; default browser.
-    AppAssocReg::QueryAppIsDefaultAll "${AppRegName}" "effective"
-    Pop $1
-    ; Check for a last run type to see if metro was the last browser
-    ; front end in use.
-    ReadRegDWORD $2 HKCU "Software\Mozilla\Firefox" "MetroLastAHE"
-!endif
     ${If} $1 == "1"
-    ${AndIf} $2 == "1" ; 1 equals AHE_IMMERSIVE
-      ; Launch into metro
-      Exec "$\"$INSTDIR\CommandExecuteHandler.exe$\" --launchmetro"
-    ${Else}
-      ; Launch into desktop
       Exec "$\"$INSTDIR\${FileMainEXE}$\""
     ${EndIf}
   ${Else}
@@ -850,20 +818,7 @@
   SetOutPath "$1"
   StrCpy $2 "0"
   StrCpy $3 "0"
-!ifdef MOZ_METRO
-  ; Check to see if this install location is currently set as the
-  ; default browser.
-  AppAssocReg::QueryAppIsDefaultAll "${AppRegName}" "effective"
-  Pop $2
-  ; Check for a last run type to see if metro was the last browser
-  ; front end in use.
-  ReadRegDWORD $3 HKCU "Software\Mozilla\Firefox" "MetroLastAHE"
-!endif
   ${If} $2 == "1"
-  ${AndIf} $3 == "1" ; 1 equals AHE_IMMERSIVE
-    ; Launch into metro
-    Exec "$\"$1\CommandExecuteHandler.exe$\" --launchmetro"
-  ${Else}
     ; Launch into desktop
     Exec "$\"$0$\""
   ${EndIf}
@@ -950,15 +905,7 @@
     Abort
   ${EndIf}
   ${MUI_INSTALLOPTIONS_READ} $AddDesktopSC "shortcuts.ini" "Field 2" "State"
-
-  ; If we have a Metro browser and are Win8, then we don't have a Field 3
-!ifdef MOZ_METRO
-  ${Unless} ${AtLeastWin8}
-!endif
-    ${MUI_INSTALLOPTIONS_READ} $AddStartMenuSC "shortcuts.ini" "Field 3" "State"
-!ifdef MOZ_METRO
-  ${EndIf}
-!endif
+  ${MUI_INSTALLOPTIONS_READ} $AddStartMenuSC "shortcuts.ini" "Field 3" "State"
 
   ; Don't install the quick launch shortcut on Windows 7
   ${Unless} ${AtLeastWin7}
@@ -1237,21 +1184,13 @@
   WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" State  "1"
   WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Flags  "GROUP"
 
-  ; Don't offer to install the start menu shortcut on Windows 8
-  ; for Metro builds.
-!ifdef MOZ_METRO
-  ${Unless} ${AtLeastWin8}
-!endif
-    WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Type   "checkbox"
-    WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Text   "$(ICONS_STARTMENU)"
-    WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Left   "0"
-    WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Top    "40"
-    WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Bottom "50"
-    WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" State  "1"
-!ifdef MOZ_METRO
-  ${EndIf}
-!endif
+  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Type   "checkbox"
+  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Text   "$(ICONS_STARTMENU)"
+  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Left   "0"
+  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Right  "-1"
+  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Top    "40"
+  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Bottom "50"
+  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" State  "1"
 
   ; Don't offer to install the quick launch shortcut on Windows 7
   ${Unless} ${AtLeastWin7}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/installer/windows/nsis/shared.nsh thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/installer/windows/nsis/shared.nsh
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/installer/windows/nsis/shared.nsh	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/installer/windows/nsis/shared.nsh	2015-04-24 19:30:59.000000000 +0000
@@ -23,39 +23,6 @@
   !define HKEY_USERS              0x80000003
 !endif
 
-; Does metro registration for the command execute handler
-Function RegisterCEH
-!ifdef MOZ_METRO
-  ${If} ${AtLeastWin8}
-    ${CleanupMetroBrowserHandlerValues} ${DELEGATE_EXECUTE_HANDLER_ID} \
-                                        "FirefoxURL" \
-                                        "FirefoxHTML"
-    ${AddMetroBrowserHandlerValues} ${DELEGATE_EXECUTE_HANDLER_ID} \
-                                    "$INSTDIR\CommandExecuteHandler.exe" \
-                                    $AppUserModelID \
-                                    "FirefoxURL" \
-                                    "FirefoxHTML"
-  ${EndIf}
-!endif
-FunctionEnd
-
-; If we're in Win8 make sure we have a start menu shortcut and that it has
-; the correct AppuserModelID so that the Metro browser has a Metro tile.
-Function RegisterStartMenuTile
-!ifdef MOZ_METRO
-  ${If} ${AtLeastWin8}
-    CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"
-    ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"
-      ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \
-                                             "$INSTDIR"
-      ${If} "$AppUserModelID" != ""
-        ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" "$AppUserModelID" "true"
-      ${EndIf}
-    ${EndIf}
-  ${EndIf}
-!endif
-FunctionEnd
-
 !macro PostUpdate
 
   ; PostUpdate is called from both session 0 and from the user session
@@ -76,10 +43,6 @@
     ${If} ${FileExists} "$0"
       ${GetLongPath} "$0" $0
     ${EndIf}
-    ${If} "$0" == "$INSTDIR"
-      ; Win8 specific registration
-      Call RegisterStartMenuTile
-    ${EndIf}
   ${EndIf}
 
   ${CreateShortcutsLog}
@@ -223,28 +186,12 @@
 !endif
 
 ; Register the DEH
-!ifdef MOZ_METRO
-  ${If} ${AtLeastWin8}
-  ${AndIf} $9 != 0 ; We're not running in session 0
-    ; If RegisterCEH is called too close to changing the shortcut AppUserModelID
-    ; and if the tile image is not already in cache.  Then Windows won't refresh
-    ; the tile image on the start screen.  So wait before calling RegisterCEH.
-    ; We only need to do this when the DEH doesn't already exist.
-    ReadRegStr $0 HKCU "Software\Classes\FirefoxURL\shell\open\command" "DelegateExecute"
-    ${If} $0 != ${DELEGATE_EXECUTE_HANDLER_ID}
-      Sleep 3000
-    ${EndIf}
-    Call RegisterCEH
-  ${EndIf}
-!else
-  ; The metro browser is not enabled by the mozconfig.
-  ${If} ${AtLeastWin8}
-    ${RemoveDEHRegistration} ${DELEGATE_EXECUTE_HANDLER_ID} \
-                             $AppUserModelID \
-                             "FirefoxURL" \
-                             "FirefoxHTML"
-  ${EndIf}
-!endif
+${If} ${AtLeastWin8}
+  ${RemoveDEHRegistration} ${DELEGATE_EXECUTE_HANDLER_ID} \
+                           $AppUserModelID \
+                           "FirefoxURL" \
+                           "FirefoxHTML"
+${EndIf}
 !macroend
 !define PostUpdate "!insertmacro PostUpdate"
 
@@ -456,8 +403,6 @@
 
   ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \
                                  "true"
-  Call RegisterCEH
-
   ; An empty string is used for the 4th & 5th params because the following
   ; protocol handlers already have a display name and the additional keys
   ; required for a protocol handler.
@@ -889,18 +834,6 @@
 !macroend
 !define ResetWin8PromptKeys "!insertmacro ResetWin8PromptKeys"
 
-!ifdef MOZ_METRO
-; Resets Win8+ Metro specific splash screen info. Relies
-; on AppUserModelID.
-!macro ResetWin8MetroSplash
-  ${If} ${AtLeastWin8}
-  ${AndIf} "$AppUserModelID" != ""
-    DeleteRegKey HKCR "Local Settings\Software\Microsoft\Windows\CurrentVersion\AppModel\SystemAppData\DefaultBrowser_NOPUBLISHERID\SplashScreen\DefaultBrowser_NOPUBLISHERID!$AppUserModelID"
-  ${EndIf}
-!macroend
-!define ResetWin8MetroSplash "!insertmacro ResetWin8MetroSplash"
-!endif
-
 ; Adds SE_RESTORE_NAME privs
 !macro AcquireSERestoreName
   StrCpy $R1 0
@@ -1655,7 +1588,6 @@
     ${SetStartMenuInternet} "HKCU"
     ${FixShellIconHandler} "HKCU"
     ${FixClassKeys} ; Does not use SHCTX
-    Call RegisterStartMenuTile
   ${EndIf}
 
   ${SetHandlers}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/installer/windows/nsis/uninstaller.nsi thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/installer/windows/nsis/uninstaller.nsi
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/installer/windows/nsis/uninstaller.nsi	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/installer/windows/nsis/uninstaller.nsi	2015-04-24 19:30:59.000000000 +0000
@@ -84,9 +84,6 @@
 !insertmacro RegCleanAppHandler
 !insertmacro RegCleanMain
 !insertmacro RegCleanUninstall
-!ifdef MOZ_METRO
-!insertmacro RemoveDEHRegistrationIfMatching
-!endif
 !insertmacro SetAppLSPCategories
 !insertmacro SetBrandNameVars
 !insertmacro UpdateShortcutAppModelIDs
@@ -108,9 +105,6 @@
 !insertmacro un.RegCleanMain
 !insertmacro un.RegCleanUninstall
 !insertmacro un.RegCleanProtocolHandler
-!ifdef MOZ_METRO
-!insertmacro un.RemoveDEHRegistrationIfMatching
-!endif
 !insertmacro un.RemoveQuotesFromPath
 !insertmacro un.RemovePrecompleteEntries
 !insertmacro un.SetAppLSPCategories
@@ -284,23 +278,12 @@
     ${un.SetAppLSPCategories}
   ${EndIf}
 
-!ifdef MOZ_METRO
-  ${If} ${AtLeastWin8}
-    ${un.CleanupMetroBrowserHandlerValues} ${DELEGATE_EXECUTE_HANDLER_ID} \
-                                           "FirefoxURL" \
-                                           "FirefoxHTML"
-  ${EndIf}
-  ${ResetWin8PromptKeys} "HKCU" ""
-  ${ResetWin8MetroSplash}
-!else
-  ; The metro browser is not enabled by the mozconfig.
   ${If} ${AtLeastWin8}
     ${RemoveDEHRegistration} ${DELEGATE_EXECUTE_HANDLER_ID} \
                              $AppUserModelID \
                              "FirefoxURL" \
                              "FirefoxHTML"
   ${EndIf}
-!endif
 
   ${un.RegCleanAppHandler} "FirefoxURL"
   ${un.RegCleanAppHandler} "FirefoxHTML"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd	2015-04-24 19:30:59.000000000 +0000
@@ -25,6 +25,8 @@
 
 <!ENTITY helpSafeMode.label       "Restart with Add-ons Disabled…">
 <!ENTITY helpSafeMode.accesskey   "R">
+<!ENTITY helpSafeMode.stop.label       "Restart with Add-ons Enabled">
+<!ENTITY helpSafeMode.stop.accesskey   "R">
 
 <!ENTITY healthReport2.label      "&brandShorterName; Health Report">
 <!ENTITY healthReport2.accesskey  "e">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/browser.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/browser.dtd	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/browser.dtd	2015-04-24 19:30:59.000000000 +0000
@@ -812,8 +812,6 @@
 
 <!ENTITY appMenuSidebars.label         "Sidebars">
 
-<!ENTITY switchToMetroCmd2.label       "Relaunch in &brandShortName; for Windows 8 Touch">
-
 <!-- LOCALIZATION NOTE: (panicButton.view.mainTimeframeDesc, panicButton.view.5min, panicButton.view.2hr, panicButton.view.day):
      The .mainTimeframeDesc string combined with any of the 3 others is meant to form a complete sentence, e.g. "Forget the last: Five minutes".
      Please ensure that this remains the case in the translation. -->
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/browser.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/browser.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/browser.properties	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/browser.properties	2015-04-24 19:30:59.000000000 +0000
@@ -398,6 +398,7 @@
 safebrowsing.reportedAttackSite=Reported Attack Site!
 safebrowsing.notAnAttackButton.label=This isn't an attack site…
 safebrowsing.notAnAttackButton.accessKey=A
+safebrowsing.reportedUnwantedSite=Reported Unwanted Software Site!
 
 # Ctrl-Tab
 # LOCALIZATION NOTE (ctrlTab.listAllTabs.label): #1 represents the number
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties	2015-04-24 19:30:59.000000000 +0000
@@ -33,10 +33,6 @@
 # LOCALIZATION NOTE(add-ons-button.tooltiptext3): %S is the keyboard shortcut
 add-ons-button.tooltiptext3 = Manage your add-ons (%S)
 
-switch-to-metro-button2.label = Windows 8 Touch
-# LOCALIZATION NOTE(switch-to-metro-button2.tooltiptext): %S is the brand short name
-switch-to-metro-button2.tooltiptext = Relaunch in %S for Windows 8 Touch
-
 preferences-button.label = Preferences
 preferences-button.tooltiptext2 = Open preferences
 preferences-button.tooltiptext.withshortcut = Open preferences (%S)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties	2015-04-24 19:30:59.000000000 +0000
@@ -82,6 +82,10 @@
 # the screenshot command.
 screenshotGroupOptions=Options
 
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the advanced options of
+# the screenshot command.
+screenshotAdvancedOptions=Advanced Options
+
 # LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
 # the 'delay' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
@@ -132,6 +136,25 @@
 # LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
 screenshotTooltip=Take a fullpage screenshot
 
+# LOCALIZATION NOTE (screenshotImgurDesc) A very short string to describe
+# the 'imgur' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotImgurDesc=Upload to imgur.com
+
+# LOCALIZATION NOTE (screenshotImgurManual) A fuller description of the
+# 'imgur' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotImgurManual=Use if you want to upload to imgur.com instead of saving to disk
+
+# LOCALIZATION NOTE (screenshotImgurError) Text displayed to user upon
+# encountering error while uploading the screenshot to imgur.com.
+screenshotImgurError=Could not reach imgur API
+
+# LOCALIZATION NOTE (screenshotImgurUploading) Text displayed to user when the
+# screenshot is successfully sent to Imgur but the program is waiting on a response.
+# The argument (%1$S) is a new image URL at Imgur.
+screenshotImgurUploaded=Uploaded to %1$S
+
 # LOCALIZATION NOTE (highlightDesc) A very short description of the
 # 'highlight' command. See highlightManual for a fuller description of what
 # it does. This string is designed to be shown in a menu alongside the
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/devtools/gcli.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/devtools/gcli.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/devtools/gcli.properties	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/devtools/gcli.properties	2015-04-24 19:30:59.000000000 +0000
@@ -51,7 +51,7 @@
 
 # LOCALIZATION NOTE: The error message when the user types a command that
 # isn't registered
-cliUnknownCommand=Invalid Command
+cliUnknownCommand2=Invalid Command: '%1$S'.
 
 # LOCALIZATION NOTE: A parameter should have a value, but doesn't
 cliIncompleteParam=Value required for '%1$S'.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd	2015-04-24 19:30:59.000000000 +0000
@@ -13,9 +13,9 @@
   -  should be displayed or not. -->
 <!ENTITY browserStylesLabel    "Browser styles">
 
-<!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
+<!-- LOCALIZATION NOTE (filterStylesPlaceholder): This is the placeholder that goes in
   -  the search box when no search term has been entered. -->
-<!ENTITY userStylesSearch      "Filter Styles">
+<!ENTITY filterStylesPlaceholder      "Filter Styles">
 
 <!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.properties	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.properties	2015-04-24 19:30:59.000000000 +0000
@@ -71,11 +71,6 @@
 # This is the tooltip of the pick button in the toolbox toolbar
 pickButton.tooltip=Pick an element from the page
 
-# LOCALIZATION NOTE (sidebar.showAllTabs.label)
-# This is the label shown in the show all tabs button in the tabbed side
-# bar, when there's no enough space to show all tabs at once
-sidebar.showAllTabs.label=…
-
 # LOCALIZATION NOTE (sidebar.showAllTabs.tooltip)
 # This is the tooltip shown when hover over the '…' button in the tabbed side
 # bar, when there's no enough space to show all tabs at once
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd	2015-04-24 19:30:59.000000000 +0000
@@ -74,13 +74,8 @@
 <!ENTITY updateTab.label                 "Update">
 
 <!ENTITY updateApp.label                 "&brandShortName; updates:">
-<!-- Note either updateAuto1 is used or (updateAutoMetro and updateAutoDesktop),
-     so re-using accesss key in updateAuto1 is OK. updateAutoDesktop can be found
-     in preferences.properties -->
 <!ENTITY updateAuto1.label               "Automatically install updates (recommended: improved security)">
 <!ENTITY updateAuto1.accesskey           "A">
-<!ENTITY updateAutoMetro.label           "Automatically update from desktop and Windows 8 style &brandShortName;">
-<!ENTITY updateAutoMetro.accesskey       "s">
 <!ENTITY updateCheck.label               "Check for updates, but let me choose whether to install them">
 <!ENTITY updateCheck.accesskey           "C">
 <!ENTITY updateManual.label              "Never check for updates (not recommended: security risk)">
@@ -89,8 +84,6 @@
 <!ENTITY updateAutoAddonWarn.label       "Warn me if this will disable any of my add-ons">
 <!ENTITY updateAutoAddonWarn.accesskey   "W">
 
-<!ENTITY updateAutoMetroWarn.label       "(Windows 8 style &brandShortName; does not check add-on compatibility)">
-
 <!ENTITY updateHistory.label             "Show Update History">
 <!ENTITY updateHistory.accesskey         "p">
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/preferences/preferences.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/preferences/preferences.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/preferences/preferences.properties	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/preferences/preferences.properties	2015-04-24 19:30:59.000000000 +0000
@@ -136,11 +136,6 @@
 #   %2$S = unit (MB, KB, etc.)
 actualAppCacheSize=Your application cache is currently using %1$S %2$S of disk space
 
-###Preferences::Advanced::Update
-#LOCALIZATION NOTE: The next string is for updating in Windows 8 only instead of updateAuto1.label.  %S = brandShortName
-updateAutoDesktop.label=Automatically install updates from desktop %S
-updateAutoDesktop.accessKey=A
-
 syncUnlink.title=Do you want to unlink your device?
 syncUnlink.label=This device will no longer be associated with your Sync account. All of your personal data, both on this device and in your Sync account, will remain intact.
 syncUnlinkConfirm.label=Unlink
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-04-24 19:30:59.000000000 +0000
@@ -12,6 +12,11 @@
 <!ENTITY safeb.blocked.malwarePage.shortDesc "This web page at <span id='malware_sitename'/> has been reported as an attack page and has been blocked based on your security preferences.">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.</p><p>Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.</p>">
 
+<!ENTITY safeb.blocked.unwantedPage.title "Reported Unwanted Software Page!">
+<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.unwantedPage.shortDesc "This web page at <span id='unwanted_sitename'/> has been reported to contain unwanted software and has been blocked based on your security preferences.">
+<!ENTITY safeb.blocked.unwantedPage.longDesc "<p>Unwanted software pages try to install software that can be deceptive and affect your system in unexpected ways.</p>">
+
 <!ENTITY safeb.blocked.phishingPage.title "Reported Web Forgery!">
 <!-- Localization note (safeb.blocked.phishing.shortDesc) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.phishingPage.shortDesc "This web page at <span id='phishing_sitename'/> has been reported as a web forgery and has been blocked based on your security preferences.">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/syncSetup.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/syncSetup.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/browser/syncSetup.dtd	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/browser/syncSetup.dtd	2015-04-24 19:30:59.000000000 +0000
@@ -33,8 +33,6 @@
 <!ENTITY setup.choosePassword.accesskey  "P">
 <!ENTITY setup.confirmPassword.label     "Confirm Password">
 <!ENTITY setup.confirmPassword.accesskey "m">
-<!ENTITY setup.setupMetro.label     "Sync with Windows 8 style &brandShortName;">
-<!ENTITY setup.setupMetro.accesskey "S">
 
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2015-04-24 19:30:59.000000000 +0000
@@ -30,6 +30,7 @@
 externalProtocolChkMsg=Remember my choice for all links of this type.
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
+unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
 cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd	2015-04-24 19:30:59.000000000 +0000
@@ -164,6 +164,11 @@
 <p>Website owners who believe their site has been reported as an attack site in error may <a href='http://www.stopbadware.org/home/reviewinfo' >request a review</a>.</p>
 ">
 
+<!ENTITY unwantedBlocked.title "Suspected Unwanted Software Site!">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Unwanted software pages try to install software that can be deceptive and affect your system in unexpected ways.</p>
+">
+
 <!ENTITY phishingBlocked.title "Suspected Web Forgery!">
 <!ENTITY phishingBlocked.longDesc "
 <p>Entering any personal information on this page may result in identity theft or other fraud.</p>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/profile/bookmarks.inc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/profile/bookmarks.inc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/profile/bookmarks.inc	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/profile/bookmarks.inc	2015-04-24 19:30:59.000000000 +0000
@@ -37,9 +37,4 @@
 # link title for https://www.mozilla.org/en-US/about/
 #define firefox_about About Us
 
-# LOCALIZATION NOTE (firefox_feedback):
-# link title for browser feedback page
-# currently used by Metro only: https://input.mozilla.org/feedback/metrofirefox
-#define firefox_feedback Give Feedback
-
 #unfilter emptyLines
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/searchplugins/bingmetrofx.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/searchplugins/bingmetrofx.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/searchplugins/bingmetrofx.xml	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/searchplugins/bingmetrofx.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-    <ShortName>Bing</ShortName>
-    <Description>Bing. Search by Microsoft.</Description>
-    <InputEncoding>UTF-8</InputEncoding>
-    <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAEACADaCwAAJgAAACAgAAABAAgAlAIAAAAMAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIAgAAAJCRaDYAAAAJcEhZcwAACxMAAAsTAQCanBgAAApPaUNDUFBob3Rvc2hvcCBJQ0MgcHJvZmlsZQAAeNqdU2dUU+kWPffe9EJLiICUS29SFQggUkKLgBSRJiohCRBKiCGh2RVRwRFFRQQbyKCIA46OgIwVUSwMigrYB+Qhoo6Do4iKyvvhe6Nr1rz35s3+tdc+56zznbPPB8AIDJZIM1E1gAypQh4R4IPHxMbh5C5AgQokcAAQCLNkIXP9IwEA+H48PCsiwAe+AAF40wsIAMBNm8AwHIf/D+pCmVwBgIQBwHSROEsIgBQAQHqOQqYAQEYBgJ2YJlMAoAQAYMtjYuMAUC0AYCd/5tMAgJ34mXsBAFuUIRUBoJEAIBNliEQAaDsArM9WikUAWDAAFGZLxDkA2C0AMElXZkgAsLcAwM4QC7IACAwAMFGIhSkABHsAYMgjI3gAhJkAFEbyVzzxK64Q5yoAAHiZsjy5JDlFgVsILXEHV1cuHijOSRcrFDZhAmGaQC7CeZkZMoE0D+DzzAAAoJEVEeCD8/14zg6uzs42jrYOXy3qvwb/ImJi4/7lz6twQAAA4XR+0f4sL7MagDsGgG3+oiXuBGheC6B194tmsg9AtQCg6dpX83D4fjw8RaGQudnZ5eTk2ErEQlthyld9/mfCX8BX/Wz5fjz89/XgvuIkgTJdgUcE+ODCzPRMpRzPkgmEYtzmj0f8twv//B3TIsRJYrlYKhTjURJxjkSajPMypSKJQpIpxSXS/2Ti3yz7Az7fNQCwaj4Be5EtqF1jA/ZLJxBYdMDi9wAA8rtvwdQoCAOAaIPhz3f/7z/9R6AlAIBmSZJxAABeRCQuVMqzP8cIAABEoIEqsEEb9MEYLMAGHMEF3MEL/GA2hEIkxMJCEEIKZIAccmAprIJCKIbNsB0qYC/UQB00wFFohpNwDi7CVbgOPXAP+mEInsEovIEJBEHICBNhIdqIAWKKWCOOCBeZhfghwUgEEoskIMmIFFEiS5E1SDFSilQgVUgd8j1yAjmHXEa6kTvIADKC/Ia8RzGUgbJRPdQMtUO5qDcahEaiC9BkdDGajxagm9BytBo9jDah59CraA/ajz5DxzDA6BgHM8RsMC7Gw0KxOCwJk2PLsSKsDKvGGrBWrAO7ifVjz7F3BBKBRcAJNgR3QiBhHkFIWExYTthIqCAcJDQR2gk3CQOEUcInIpOoS7QmuhH5xBhiMjGHWEgsI9YSjxMvEHuIQ8Q3JBKJQzInuZACSbGkVNIS0kbSblIj6SypmzRIGiOTydpka7IHOZQsICvIheSd5MPkM+Qb5CHyWwqdYkBxpPhT4ihSympKGeUQ5TTlBmWYMkFVo5pS3aihVBE1j1pCraG2Uq9Rh6gTNHWaOc2DFklLpa2ildMaaBdo92mv6HS6Ed2VHk6X0FfSy+lH6JfoA/R3DA2GFYPHiGcoGZsYBxhnGXcYr5hMphnTixnHVDA3MeuY55kPmW9VWCq2KnwVkcoKlUqVJpUbKi9Uqaqmqt6qC1XzVctUj6leU32uRlUzU+OpCdSWq1WqnVDrUxtTZ6k7qIeqZ6hvVD+kfln9iQZZw0zDT0OkUaCxX+O8xiALYxmzeCwhaw2rhnWBNcQmsc3ZfHYqu5j9HbuLPaqpoTlDM0ozV7NS85RmPwfjmHH4nHROCecop5fzforeFO8p4ikbpjRMuTFlXGuqlpeWWKtIq1GrR+u9Nq7tp52mvUW7WfuBDkHHSidcJ0dnj84FnedT2VPdpwqnFk09OvWuLqprpRuhu0R3v26n7pievl6Ankxvp955vef6HH0v/VT9bfqn9UcMWAazDCQG2wzOGDzFNXFvPB0vx9vxUUNdw0BDpWGVYZfhhJG50Tyj1UaNRg+MacZc4yTjbcZtxqMmBiYhJktN6k3umlJNuaYppjtMO0zHzczNos3WmTWbPTHXMueb55vXm9+3YFp4Wiy2qLa4ZUmy5FqmWe62vG6FWjlZpVhVWl2zRq2drSXWu627pxGnuU6TTque1mfDsPG2ybaptxmw5dgG2662bbZ9YWdiF2e3xa7D7pO9k326fY39PQcNh9kOqx1aHX5ztHIUOlY63prOnO4/fcX0lukvZ1jPEM/YM+O2E8spxGmdU5vTR2cXZ7lzg/OIi4lLgssulz4umxvG3ci95Ep09XFd4XrS9Z2bs5vC7ajbr+427mnuh9yfzDSfKZ5ZM3PQw8hD4FHl0T8Ln5Uwa9+sfk9DT4FntecjL2MvkVet17C3pXeq92HvFz72PnKf4z7jPDfeMt5ZX8w3wLfIt8tPw2+eX4XfQ38j/2T/ev/RAKeAJQFnA4mBQYFbAvv4enwhv44/Ottl9rLZ7UGMoLlBFUGPgq2C5cGtIWjI7JCtIffnmM6RzmkOhVB+6NbQB2HmYYvDfgwnhYeFV4Y/jnCIWBrRMZc1d9HcQ3PfRPpElkTem2cxTzmvLUo1Kj6qLmo82je6NLo/xi5mWczVWJ1YSWxLHDkuKq42bmy+3/zt84fineIL43sXmC/IXXB5oc7C9IWnFqkuEiw6lkBMiE44lPBBECqoFowl8hN3JY4KecIdwmciL9E20YjYQ1wqHk7ySCpNepLskbw1eSTFM6Us5bmEJ6mQvEwNTN2bOp4WmnYgbTI9Or0xg5KRkHFCqiFNk7Zn6mfmZnbLrGWFsv7Fbou3Lx6VB8lrs5CsBVktCrZCpuhUWijXKgeyZ2VXZr/Nico5lqueK83tzLPK25A3nO+f/+0SwhLhkralhktXLR1Y5r2sajmyPHF52wrjFQUrhlYGrDy4irYqbdVPq+1Xl65+vSZ6TWuBXsHKgsG1AWvrC1UK5YV969zX7V1PWC9Z37Vh+oadGz4ViYquFNsXlxV/2CjceOUbh2/Kv5nclLSpq8S5ZM9m0mbp5t4tnlsOlqqX5pcObg3Z2rQN31a07fX2Rdsvl80o27uDtkO5o788uLxlp8nOzTs/VKRU9FT6VDbu0t21Ydf4btHuG3u89jTs1dtbvPf9Psm+21UBVU3VZtVl+0n7s/c/romq6fiW+21drU5tce3HA9ID/QcjDrbXudTVHdI9VFKP1ivrRw7HH77+ne93LQ02DVWNnMbiI3BEeeTp9wnf9x4NOtp2jHus4QfTH3YdZx0vakKa8ppGm1Oa+1tiW7pPzD7R1ureevxH2x8PnDQ8WXlK81TJadrpgtOTZ/LPjJ2VnX1+LvncYNuitnvnY87fag9v77oQdOHSRf+L5zu8O85c8rh08rLb5RNXuFearzpfbep06jz+k9NPx7ucu5quuVxrue56vbV7ZvfpG543zt30vXnxFv/W1Z45Pd2983pv98X39d8W3X5yJ/3Oy7vZdyfurbxPvF/0QO1B2UPdh9U/W/7c2O/cf2rAd6Dz0dxH9waFg8/+kfWPD0MFj5mPy4YNhuueOD45OeI/cv3p/KdDz2TPJp4X/qL+y64XFi9++NXr187RmNGhl/KXk79tfKX96sDrGa/bxsLGHr7JeDMxXvRW++3Bd9x3He+j3w9P5Hwgfyj/aPmx9VPQp/uTGZOT/wQDmPP8YzMt2wAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAABBUlEQVR42mL8v4OBJMAEZ/0nTgMLnLXtitKRO9JmCi9cNR/wsP8mrOHfP8YbL4RvvBBWFXuvI/WGsJMYSHUSMujbY8LN/ttM4bmO1BtW5n+ENdipPmndbrHjqiIn6x9DuZc2yk8tlZ7hc5Kx/AtzxecMDAzff7Mcuys9/7gOAT8wMjAUOZ9x0XhI2A98HL+Eub/vuSG/8ozGmy+cEEF+zp/YNYjxfvPTv9O63fLpBx6ICCvz32DD24EGt7Fo4Gb/zcX2Z84RPbiIqfyLZJtL4rzfsDvJUf3R91+sC09o//7LJMn/NdXmkqHsSyzeQ0t8j9/znn8s7ql9Dy34cWogIbUSCQADAJ+jWQrH9LCsAAAAAElFTkSuQmCCiVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAACW0lEQVR4nGP8v5OBpoCJtsbTwQIWTKGUxe5mCi9M5V/oSL9mZf5HoQWMmHEQOD0AwuBg/WMo+8pB/ZGZwguyLcDiAzj48Zvl+D2pTz/YKLGAcBxcfSZCtulEWUAhGDQW3HstcOOF8P//jKRagC+SkQE/58/0pa7c7L9N5V+aKTw3kH3FxvKXmhYI83y3VXl64Jbs3htye2/IsbH8NZB9Zabw3FT+JR/nTypYwMDAEGBw+8AtWQj71x/mU/clT92XZGT8ry7+zlzxhbnic0n+LxRZIC/8yUju5blH4siC//8z3nghfOOF8MLj2jKCnydH7EXTRVoqCjC4g0f2yXteTEHSLNCVft0WcNhM4QXxiYmEIIIATcm3mpJvn37gmX7Q8OozYYLqycloTz/wLDulRYzpDMT4QFf6NZz95gvnyjMa+27I/SM6xxGwQJj7R6rtJQYGhk8/2NaeU9t+RfH3X2ZcihWEP5Fmgazg53qfY9zsv1ed0dh4UeXbL5yKudl/R5tdd9O6T4IFGhJvyz1OHbkts/qc2qfv7LiUMTIwOGk8irW4yo8jP2O3wEzxubHcy7I1Dq+/cOIymoGBQVn0Q5rtRTXx93jUYLFAX+b1sw88p+5L4tHGy/Er2uy6m9YDRsb/eJRht8BS+emCY7q4NDAyMLhpPYixuMbD/gu/0VD1WBtezz7w9O81vvNKEE1cTfxdmu0lZdEPxBiNzwIGBoa//xhXndFYfU4NUsnwcf6Ms7jmpPGQ1BoHpwUQcOOF0OT9RoayryJNr3Oz/ybRcCIsoBwMmkp/8FoAADmgy6ulKggYAAAAAElFTkSuQmCC</Image>
-    <Image width="74" height="74">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEoAAABKCAYAAAAc0MJxAAAEJGlDQ1BJQ0MgUHJvZmlsZQAAOBGFVd9v21QUPolvUqQWPyBYR4eKxa9VU1u5GxqtxgZJk6XtShal6dgqJOQ6N4mpGwfb6baqT3uBNwb8AUDZAw9IPCENBmJ72fbAtElThyqqSUh76MQPISbtBVXhu3ZiJ1PEXPX6yznfOec7517bRD1fabWaGVWIlquunc8klZOnFpSeTYrSs9RLA9Sr6U4tkcvNEi7BFffO6+EdigjL7ZHu/k72I796i9zRiSJPwG4VHX0Z+AxRzNRrtksUvwf7+Gm3BtzzHPDTNgQCqwKXfZwSeNHHJz1OIT8JjtAq6xWtCLwGPLzYZi+3YV8DGMiT4VVuG7oiZpGzrZJhcs/hL49xtzH/Dy6bdfTsXYNY+5yluWO4D4neK/ZUvok/17X0HPBLsF+vuUlhfwX4j/rSfAJ4H1H0qZJ9dN7nR19frRTeBt4Fe9FwpwtN+2p1MXscGLHR9SXrmMgjONd1ZxKzpBeA71b4tNhj6JGoyFNp4GHgwUp9qplfmnFW5oTdy7NamcwCI49kv6fN5IAHgD+0rbyoBc3SOjczohbyS1drbq6pQdqumllRC/0ymTtej8gpbbuVwpQfyw66dqEZyxZKxtHpJn+tZnpnEdrYBbueF9qQn93S7HQGGHnYP7w6L+YGHNtd1FJitqPAR+hERCNOFi1i1alKO6RQnjKUxL1GNjwlMsiEhcPLYTEiT9ISbN15OY/jx4SMshe9LaJRpTvHr3C/ybFYP1PZAfwfYrPsMBtnE6SwN9ib7AhLwTrBDgUKcm06FSrTfSj187xPdVQWOk5Q8vxAfSiIUc7Z7xr6zY/+hpqwSyv0I0/QMTRb7RMgBxNodTfSPqdraz/sDjzKBrv4zu2+a2t0/HHzjd2Lbcc2sG7GtsL42K+xLfxtUgI7YHqKlqHK8HbCCXgjHT1cAdMlDetv4FnQ2lLasaOl6vmB0CMmwT/IPszSueHQqv6i/qluqF+oF9TfO2qEGTumJH0qfSv9KH0nfS/9TIp0Wboi/SRdlb6RLgU5u++9nyXYe69fYRPdil1o1WufNSdTTsp75BfllPy8/LI8G7AUuV8ek6fkvfDsCfbNDP0dvRh0CrNqTbV7LfEEGDQPJQadBtfGVMWEq3QWWdufk6ZSNsjG2PQjp3ZcnOWWing6noonSInvi0/Ex+IzAreevPhe+CawpgP1/pMTMDo64G0sTCXIM+KdOnFWRfQKdJvQzV1+Bt8OokmrdtY2yhVX2a+qrykJfMq4Ml3VR4cVzTQVz+UoNne4vcKLoyS+gyKO6EHe+75Fdt0Mbe5bRIf/wjvrVmhbqBN97RD1vxrahvBOfOYzoosH9bq94uejSOQGkVM6sN/7HelL4t10t9F4gPdVzydEOx83Gv+uNxo7XyL/FtFl8z9ZAHF4bBsrEwAABh1JREFUeAHtm1tMXEUYx//Lci13uS63Xa6lgoBQDNACkaQJNWmtDxpE+2AaEzW13h580sSmLzVqjMbEW2zQNsbaxNq+SGmsaJXSWgQboFxaLoFlodx22eW6C86cdpuFLDLdc9mzyUwyOWfP+c7MfL/zzew338zROH4MWQNPWxLw21KCCwgEOChGQ+CgOChGAoxi3KI4KEYCjGLcojgoRgKMYtyilAQ1MaeFeVHLWKVvivlL0eyW4TB88lsOtieYUW6YQlWmBfroFSmKVk0ZkoCi2qytaXDTFCXkE1cAXaQVjxmmUZVhRmHSIvw0vj2llAzUxlc/Zg7Dzx00A2FByyjRT2F3+gzK9TZsC/Q9aLKBcgVnXQpEc69OyP7aVXx04AbydUuuIqo/V/xfz+7ww4Jd8WpFvwjfa7FolT0rgINi5MZBcVCMBBjFuEVxUIwEGMW4RfkKKIdDg1Uy/VF7UsQz3wrCi6dzkBY9f3eKYyBTnAD1TXG8DkqrXcOenDv48s+se1McB/KTZwg0OqGeQ2yoYyvOitz3Oiiq5YH8GZz6exk2Mie0O7RoH44V8mfNQGb8rBC6qSbQMmKXFYHirhJVgAomXW1vnhFn2gzr2kg7YP9ElJC/uwokRNhQlk7iXSR0U6RbhMZPuS6qClCUzrOFUzjbkSpY1DpaLj/GLaEkbEMzCd0EL6P0XuimgoRugmQe11QDKpqMRY/nmNDUneyCZvNT62IgLvXohOyvdaAwZQa7iLVVp1tBy5I6qQYUVay+eAIXCagH7VB0XLs+FCvkT5vXkBVvRgUJSVdnWWCQKCStKlA0zl5qmMDVwXiPDYKGpPvGo4Tc0Ho3JE3HtWcKJ5EQ7rmlqc4zry82eQzJ3YM0JP1Tux6dphB3t5mvqQ5UAVmIyEmYZVZAKUHVgaKK1xWPKqU/cz2qBFWdacN7T3Ti4aRpZkXkFlTVYO5Ulk6RKzNsJPejezwI3/+TiL9uxXt18qxKUE5g9LgjYQlHa4dgtIzidHssLnQlYdGufLNV2fVcQTnPkyLseL3KhG+f/xcp0VbnZcWOyr8aD1Wjcatz3ZE4dS0N07ZgD0vx/DHVg6JeelNvOBpa0zBmDvVcU5FPqhpUy2AIvr6ix8BkhEg1xT+uSlA3xoLwRUsquowPiddQohIUB1WdbUIR8b7dpVtTgfiqJZnM9eLc3fbqNUVBPVk4jCOVJmxcSjBa/EkX0+H3vkRZfKWy9AkUJC2IAq0YqEPl/XiuZL2nPbOgxTet8filKxmOVek9FV2kDYcrB0goeV4UJPqw7KD8/FbxVk0v9uZa7jfWtqzByetxONueiiUSS5I6BfnbUVcyROJb0wggixdSJFlBBZMGv1N78/4bXbZrcLojGj+0pQkLCVIosLGMioxxvFo5Iir2tLFM+ls2UDSmfXxftzAFoc7ieeIsnpTRWaTe+pGqAexMFTcWuYMkG6j48Hkc399DFjVXcJE4iydaU4mzGLZZG0RdDwmwo37nIOqKZkDXCOVKkluUPsaCD/f3oedOII42ZsrqLFYRV+Pw7lFFFkklBZWfPI2DJaN4tzFdVmcxLWYOr5Fu9miye39MDquSDFRR6iQCyILk2+cekaOdQpnbAldwsHQIT5NupvS+dUlAbY9dIAN1KKas4gL4mxGmDmpNrhGv7BpDdIjnKymblc9yXSPVV+r0W5j3f01By+0ElnqZZdLjzKSbDaLAy/vSJQPl1Px8VwQ+/yMLCyvijDWUfO3wQtkgnsozK7rHwKnHxqPkoGgFo2Z/HGvKQA/5NuZBk4Z8M7NnhxEvV5gQGeydbuauzbKAohXRXXQN12LIdh4DVhnncXSLz5vVg8RJ9d72HneQ6DXZQDkrpKsoxy5k/q/DGU68+EPlA9hHu5nzQZUdZQdF9V1a0eDjyzo0dqasU5/+xdfmjeCl8nHyBdbquntq+6EIKKfSl2+H4oNLWbAsBCE3cRZvkG6WHae+buZsr+tRUVC0YhqDahsJQU22VbXdzBWQ81xxUM6Kfe0ofVjR1wgwtpeD4qAYCTCKcYvioBgJMIpxi+KgGAkwinGL4qAYCTCKcYvioBgJMIr9BxXt0eTNXoXQAAAAAElFTkSuQmCC</Image>
-    <Url type="application/x-suggestions+json" template="http://api.bing.com/osjson.aspx">
-        <Param name="query" value="{searchTerms}"/>
-        <Param name="form" value="OSDJAS"/>
-        <Param name="language" value="{moz:locale}"/>
-    </Url>
-    <Url type="text/html" method="GET" template="http://www.bing.com/search">
-        <Param name="q" value="{searchTerms}"/>
-        <MozParam name="pc" condition="pref" pref="ms-pc-metro"/>
-        <Param name="form" value="MOZWSB"/>
-    </Url>
-    <SearchForm>http://www.bing.com/search</SearchForm>
-</SearchPlugin>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/searchplugins/googlemetrofx.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/searchplugins/googlemetrofx.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/searchplugins/googlemetrofx.xml	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/searchplugins/googlemetrofx.xml	1970-01-01 00:00:00.000000000 +0000
@@ -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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Google</ShortName>
-<Description>Google Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAB9AQAAJgAAACAgAAAAAAAA8gIAAKMBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAFESURBVDjLpZNJSwNBEIXnt4lE4kHxovgT9BDwJHqPy0HEEOJBiAuCRg+KUdC4QS4KrpC4gCBGE3NQ48JsnZ6eZ3UOM6gjaePhQU93v6+qq2q0pqgeJj2S8EdJT1hr0OxBtKCD5iEd8QxDYpvhvOBAuMDKURX9C9aPu4GA1GEVkzvMg10UBfYveWAWgYAP00V01fa+R9M2bA51wJvhIn3qR+ybt3D3JNQBE5sMjCIOLFpoHzOwdsLRO22qA6R6kiZiWwxUvy/PUQZIhYZ1vFM9cvcOOsYNdcBgysISdSJBnZjJMlR0Fw8vAp0xoz5gao/h+NZBy4i/10XGwrPA+hmvDyhVRG2Avu/LwcrkFADZa16L1h330w1RNgc3DiJzCpPYRm1bpveXX11clQR28xwblHpk1vq1iP/5mcoS0CoXDZiL0vsJ+dzfl+3T/VYAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAK5SURBVFjDxVfrSxRRFJ9/Jta/oyWjF5XQm6D6EkHRgygIIgjUTcueVgqVWSRRkppEUQYWWB8ye1iGWilWlo/Ude489s7M6Zw7D9dlt53dmd29cFiWvXvO77x+51xpaaUsoSxBaUWZQ4ECy5xji2xKZDyCMlMEw6lCNiOSgwZKJK1SkcKeSealfP64t0mBjl4Ow39MkDUL0p2RSROOtqhZdeUEYM1pBl39XCg/fEeFtWcY7G9W4csvUxjlBkCsQ4Nt9QyWVfvT6RsAKXw3aoDGATZeYIt+W1kjw7cJG0RctWDTRebbKd8A6h5pwsDb70ba3w/eUr3wt/cmwgfw6Yft4TNMQaY7o1P2ncm4FT4ANQH/jQBJ2xv7kqIXEADDql8eS3+n8bku7oxNm+EDIM/dU92upb3T/NJGeaNbDx/AsbsLRUY5Xn92caWXY5d8RV6gWllxSg4fAEnTC90DQW13BLlgXR2D3dcUeDVkwOthA1bXspxILWcm3HdThcfvufB26LcJpkOEAz9NKI/lzqpSEC7feol5EWnpSeSlIxCALUkApmULdjUqxQVAQnl3D/X/yQda4QBEq2TYc12By091MQ17Bg3R88nHKlQbVmHvj89awNBLYrwT9zXY2aBAxTkGFdiSxP/Jp6FLDw+AS7GfsdJTJ2EqSO5khD43nGfBARy/ZxOQgZHe7GPM1jzUvChUtmnBAXQPcKGMJp3fdFGq6NByEhiAO4b/YptFfQJwNyQ/bZkVQGcf90Ja25ndIyrKBOa/f8wIpwi3X1G8UcxNu7ozUS7tiH0jBswwS3RIaF1w6LYKU/ML2+8sGnjygQswtKrVIy/Qd9qQP6LnO64q4fPAKpxyZIymHo1jWk6p1ag2BsdNwQMHcC+M5kHFJX+YlPxpVlbCx2mZ5DzPI04k4kUwHHdskU3pH76iftG8yWlkAAAAAElFTkSuQmCC</Image>
-<Image width="74" height="74">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEoAAABKCAYAAAAc0MJxAAAAA3NCSVQICAjb4U/gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAv/SURBVHhe7VwJjBTHFf093XPusrssLJcNhMscWgLEhlgGG1sCB0wcxyBHIsIJVhykHEKgRCJICRFS5ChyrCAnIcg5UOxISGDF8kEc7CQgO9rEDtbG2MYxRzjE2lwB9pydmZ7u/Ffd08dM99IL3bsLmidmp6equvrXm/9//fpVg7T0x5d08gJKJePSeDM/WHA08AXX+zbx7lVA6qtfZ12ZDHxZeWdffZXg7sMNibSiSoKoGGlmIRDjFwsAGfjSfLP+2kAbLrOK7ZaAVFEPOKXga+OfCUddBVGSXetRZ4EvHS1NmJ+t4vL6sntc1Sw8fy7ks85hOFvg2vnqH0BZJZylINFZ4qjTne0A3a71qLPAl46WJszPVnF5fdk9rmp84Jf5TNf3XYU/qkQFRJWogKgSFRBVogKiSlRAVIkKCEfAiXgJMYPJnXlpvDnKLXCZT8Bp3eMbkBp1pWqdYxVNl6jIYqhFYmk4GkYT3CIQPOCMcX1cJkrF+R7JfKb1aOvCAuKoWKnMVW1/KBR6B48oneuK/J7PcykX16VjdGujRFNH412mhhqihCxRQjFv8YVNVJzbpuJEh07rtOutImk8LEnizq1HO2UwMKSJUlldenISjRwm0QNzFVrSHKfJTVbDa0auQLT9ryq9+p5O8RgTILrkP9ajbRlKGJJEQYt68jrVpojW3Zeih27nr99E2yWNPvpEE2YzdYxMYxtsTSmHxjZ5htfyaWFe/Ah+xiutRXq2hXVUkyidgCY5xmOJZstYwpAjCn6os1eiu6crtHVV2jKpliMqa0Gejp/TSea2uBf+qXm8TN/7fIKmjLIe4MK2fQX69QGVhqV4mCx6kjkHQbKhRiZMmcw3x4WFIUWUICmr0+qFKfrWkqRoA+x8I0c7mKT6tEQKs2QoAYvOfiWvsnkWdNr6cJKWNns7ql3/ZJL/UmT/Buklfpxj0AKmTJZotowlBCXKfVcEwOM6e4kenp9wkdR6UqUdf8tTYy3PUsyDczLDdZLNqi4l0ZY/5uidk/giK7H6ToVWzJWpO2cWRIjIicqzVsy6JUbfeYC/dge27cuz2UhiOveDzDYFsjbvZibsWMGFTStkGl4jiQkiSkRKFETPqUTf/6KbpPYejU5d1NjczII+AL+FPp76M09pHoDTfnwxaxWHGVEiUqJy7GcWz1Rowgg3IyeZJCiAK7PoAyhchs1wL89qOdZOLyxpjgntRNwUFSIjCpaS5VBg9Z08FZWhi32WjyV5AmSB2JeYLC8kFYlmjoP5mQURIDKiMLBRdTGaeUulffXhlrzB7ZPs8F/9tzdRwMSRxhIoKkRGFISeMCImHHI56tllxcQ6LDhk5vs0B6UwZy808ewZpT+PVKMaWHgvjG9kAnkdhxgmKODPiqxQR8563xMhRwKROvO4hzYBdZkY1ST7pwHoqcjtsdTxwsVOTUToUSEyoiBzZ68/E4tukzn6Nj8EAXcIIi51e/d58qIRSkSFyLqG0J9c9icKWQOVVaQ/sx/g1R5B7eGPkTEwCyJApESduKDS+XZvU5l9q0Jj6mPBI2puJvxeptK+XuLZsCenE1JPUSGyrhECKOyw9/zLP2TeuDxJXbxYDqJVaALTu22MW2TEar85oLHPMwsiQoTfAYl80QtMVDcPxgsLpym0YKrCg736rAUzbaqTaFoZUd/dVaAC18n9Ds76h0iJggYgnvrBnh6zpBLb1qSpgRe1WTYdP83C0uQKa97WVe4of/PuPH3Qpov8eNSIlCggxWN765hKP9/nnwt5YUOGpoyW6H9dCCgNcovskJCT6sgS9bKz/uVXUjRrnC3ut5/N0z+OweSMLGfUGLDEXTtrxLLZSdqyMiXaeOHvR1R6/m2Vjp7TBFkITO+ZKdOjd9kp4w7u56vP5EV/aS4WmweAeFx0ibsBTQX35CWRjdy0IkWLZtiDDwrEXQ/+rFeYYoIXwtZ2FCAedxMQhVKxRcUm1cPOu5ZN5nNz4rRgkkwTm5AmQRuJzrbrYmbzMqcNf8jRoTM6ZRKlSodc4nE3CVFWPWuXxnU5nq00bHiiip+PNEl9Wqd9m2pFOzd0mr8lS6PqZQeJdp/G46Ijyn3XAAED5RCL0qwZ2LqCOdalJbF5+chnK/NXJQyE0/bDoBDlBFK5IAAvhAfIf3tDohVzFOrg9SM0cqAx6EQ5gS25s1fgBrzxw5UJmjdB4hkPpA4sWUOKKJHFfLfvlMLTjyZp7d0Kx1xGvDVQGDJEQUGMNArRa4f6JuvxxQr9am1ChAsISgdCuQaFKAwMyoBQAVE3Nhu6eAmDsAFnDzbtzrHG9D36eRNj9Pz6pFgMo4+ouRrQgBMTcYE1IM8hgcLqMywj0dwJMk3nuGnCyBiN4kVvIzvz2nSMEjLOIvg5dhs4sLH2mQK1XeY1H5N2Q8dRGmtOVuxfSqwJMn3hdg40JyscGlydiGDQac2OAp3twLLGEohhymSJZstYwpAgCpE4gkqY2soFCVq7KEnDOF5yojevU8vRIr17WqMzlzRq41kPp166OAxAMg4JwK/fm6Cv3dv3kudKt05fZrIwDjslbMpkiWbLWMKgEyUxO1084NmsQU98KVORmXznhEo738zTwf9qbIY6xRVsbRmBqMRxgtjO4uAKJtuZlWjGWEnMeBle+vjhtfeL9KMXcbqllFEwZbJEs2UsIShR7rvCAgbHGgEt2r62xkUSZqkNz/XQN3Zm6cOPNfZJvGzheqzfsOPLfAnCRCDK7eGmMPCTF3V6aFuv0Dw/3N/M60axEYpBhovQiYIGdOWIVs1P0sbl7pRKN5vSI093U+upIo2oZYctMgD+GmKBmyA5B2375u/z9Eqrf/iweLokclphI3SiENvMGCfTxrJjPsCG57LU3qOLKT0APRWAtkH7nnhZpZd9yLpjEs+s/jvv14xQiYLTzrPz3vxgJUkH2ScdbiuK44PXA5hiQ4boyT+pdOx8pRmOwdlPlgOyhIlQiUKS/9PjFZoyuvJgxv4PCiKYDGRqV0GM2cJy58m9lVqF9aLrGGdICLVLmB3OQ3kBZ6KCHBwLCpB+gh18eQTfzVE+1oAhfB8uhK5RzaxRXoDgYVoDNBNR/rl2d69HziLcMD+EiFC7hF/AmUsvTBopi9MoYQLkl69y3vxIC/Brh/4jVKIgtN9i9r5mhQoc34SVR0I/cY4XxtTbTGGH5uAJlJsFISJUouIcF7We8p62PzNRoVnjFF7pmwXXCYQAk5sksXlawm/fKIoFN5x92AiVKKj8/sP+TPxkdUr8wgC/WbkevcIiG4Svv9+2scNtGr3YWnTs0ISLUIlC6uT4uSK9/r73wYzGmhjtXFdDjRyVY4mDAfeHMTTFhHElS7RxmUIzzZ3jKxzEbt6tipAh7NmuhFCJgpDY4v7p3iyd7/Bek41tiNGe9TW0ZqGRDcCOLzQMhzCQWyrnDS4N0z2OTiNXjv3Ap1YnaOUdhjbBJ677XUEcBAkz/ChHJNkDHEht4IXs9sdqOVIuv88GMpP7D6u0/0OVTnNMdKFDFwOOmREjSMLgm+piPGtKtGy2Qktno85Qm5ZjyBaoHCYYR6hvyA1QlcnCgHEGavmcq69bsOLHb1qQh8ILm6Fp1p7hTHiG14ZYQJdwoVOnX7xeoAP/0USiTmiSEOcGJAr3FDWJetiscKbpsXuS4idoJW24Frx3RhOHOFqOauLg6011SEOXdDGVwxyHZ2Sa9ymF7pomi/UgcuTYJa4kT6fL3WyKnUTHeeH79nGNDp3WhD/CsWvMnMaPjRxyicfdwESV6hEg4gfW8CfIMMTlmDg7Bd/iTNRhIlRZE5Hg6+W2+DE2zC7B5oXwCNlPG/YzjcdFR5T7rggBBcCuSorjHPzAB4k4OGuxXZUzfviIyLqb/VMp8QbTgsbht3u4F0QOFgaMKCdAGgYt8eBBABaxOBiLl8ib8wvRdRgpmbAwKETdiKgSFRBVogKiSlRAVIkKiCpRAeEgCgFWCbh2vvoH70ndWWrEB3aJo64iJHDETx51FviyMtIyP1vF5fVl97iq8YFf5jNFZC6uyoFS80azqfhrw9HAF1zv28S7V4E+4ydnXZkMfFl5Z199leDuww38h6Uq/R+mjexaMP/pdwAAAABJRU5ErkJggg==</Image>
-<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=metrofirefox&amp;q={searchTerms}"/>
-<Url type="text/html" method="GET" template="https://www.google.com/search">
-  <Param name="q" value="{searchTerms}"/>
-  <Param name="ie" value="utf-8"/>
-  <Param name="oe" value="utf-8"/>
-  <Param name="client" value="metrofirefox"/>
-</Url>
-<SearchForm>https://www.google.com/</SearchForm>
-</SearchPlugin>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/searchplugins/metrolist.txt thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/searchplugins/metrolist.txt
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/searchplugins/metrolist.txt	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/searchplugins/metrolist.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-bingmetrofx
-googlemetrofx
-wikipediametrofx
-yahoometrofx
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/searchplugins/wikipediametrofx.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/searchplugins/wikipediametrofx.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/searchplugins/wikipediametrofx.xml	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/searchplugins/wikipediametrofx.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Wikipedia (en)</ShortName>
-<Description>Wikipedia, the free encyclopedia</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAA4AQAAJgAAACAgAAAAAAAAJAMAAGQBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAEFSURBVDjLxZPRDYJAEESJoQjpgBoM/9IBtoAl4KcUQQlSAjYgJWAH0gPmyNtkzEEuxkQTPzawc3Ozc3MQTc/JfVPR/wW6a+eKQ+Hyfe54B2wvrfXVqXLDfTCMd3j0VHksrTcH9bl2aZq+BCgEwCCPj9E4TdPYGj0C9CYAKdkmBrIIxiIYbvpbb2sSl8AiA+ywAbJE5YLpCImLU/WRDyIAWRgu4k1s4v50ODru4haYSCk4ntkuM0wcMAINXiPKTJQ9CfgB40phBr8DyFjGKkKEhYhCY4iCDgpAYAM2EZBlhJnsZxQUYBNkSkfBvjDd0ttPeR0mxREQ+OhfYOJ6EmL+l/qzn2kGli9cAF3BOfkAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAIKSURBVFjD7ZdBSgNRDIYLguAB7FLwAkXwBl0JgiDYjQcY8ARduBJKu3I5C0EoWDxAT9AL9AK9QBeCIHQlCM/3DZOSmeZNZ2r1bQyEGV7yXv7kJZlJq6XIOXfs+crzwPPTnvnR863n05ZFufDD/T595Q4eauM37u/pWYwfeX53cegcABcuHg0AkEQE8AKAu4gAXv8BrAEMh0PXbrddt9t1vV4v406nk62laeqm02n2LjKYIuK5WCyyfeiLDF32yLn6TJ5mBFarlev3+9nBMMqsabkYhmezWcEd2ctTE/tYBwhgt14BhtmAV2VaLpdrAHioCW+VdwWy9IMAUBQjJcQFTwGqvcTD+Xy+oc8askZJyAYrnKEokCeWLpQkSSZvBIANYgSDVVEQQJaeyHQu1QIgiQNb6AmrTtaQ9+RFSLa1D4iXgfsrVITloeSFFZlaAEjAUMaXo2DJWQtVRe1OKF5aJUkf0NdglXO5VzQGoI2USwwD3LEl590CtdO3QBoT5WSFV+Q63Oha17ITgMlkslGSGBWPdeNiDR2SL1B6zQFINmOAkFOW5eTSURCdvX6OdUlapaWjsKX0dgOg26/VWHSUKhrPz35ISKwq76R9Wx+kKgC1f0o5mISsypUG3kPj2L/lDzKYvEUwzoh2JtPRdQQAo1jD6afne88H1oTMeH6ZK+x7PB/lQ/CJtvkNEgDh1dr/bVYAAAAASUVORK5CYII=</Image>
-<Image width="74" height="74">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEoAAABKCAIAAACTslUmAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3NpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NDkxMSwgMjAxMy8xMC8yOS0xMTo0NzoxNiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo5ZWJkNTlmMy02ZDIzLTRjZWUtOWQyOS01OWY4ODY2OTRmNzMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTA2MTE5RkU5QjQwMTFFM0IwODREMENBREVCMTMxOUIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTA2MTE5RkQ5QjQwMTFFM0IwODREMENBREVCMTMxOUIiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MGIwYjJiY2EtNDlhOS00ZTNmLThiMzAtYTViMGFjZTQ3OTVjIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjllYmQ1OWYzLTZkMjMtNGNlZS05ZDI5LTU5Zjg4NjY5NGY3MyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PpbYde4AAATqSURBVHja7JpZKG1fHMeveYhMIXPodAxRElFmXlAyTw+eSBGivBiSPFCmPDhekJDiAZEiUaIQh8wiccpM5lm43+6u9d+dc/a5HMf/urf1e1p7re9e+/ux9t6/39qH0tvb249/N5R//NNB8SgexaN4FI/iUTyKR/EoHsWjeBSP4lE8ikfxKN47Q/X9Uk9Pz+fnZx6PZ2VlZWBgoKmp+fj4eHNzc3d3d3V1tb6+fnZ2trCw0NfXV1hYaGdn5+zsbGRkBBnOury8PDk52djY2NvbGxoagj4uLs7W1tbBwQFT6erqYqr9/f3Nzc2dnZ3+/v6Hh4fY2Fh7e3s+n49JtLW1b29vce7i4qKSktL09PR7Tb+9O3A9gHHNo6KiEhAQAJcjIyMeHh5SNUD18fERiUQrKytoSAqA4efnt7u7yyUwMzNLTEx8v+cP4DGxvLwcGBgodtXMzEwxGVYyJCSErcnIyBDTYFXZmo6ODjEB/lj+/v7MqIaGxuDg4EfdfhiPCdxUxJaamtrT05OkBub09PSIrKWlRVLT3t7OjHZ1dUm9EBEMDAzI4VNOPKFQ+N/bSVl5bW1NqkwgEBAZ7lhJQXp6OoZSUlK4LlRRUQFBaGiofD7lxEOw76usrCwumaWlJZGNjo6yhy4uLlR+xfX1NdfpTk5OOHF+fv7/xhsbGyO+8WDgFSpV1tTUxLWAzNJVVlZyXWJychICd3d3uU3Kjyf2BFZVVUnVvLy8GBsbE9nExATTjzSAQ0NDQxnz456U+6lTAB57ZSwsLLhk1dXVRIbXPdMZExODw7a2Nq6zGH4TE5PPOPwUHt6NSMrEemdnp1TZ/f09+xUK3+hBA2ldxuT5+fnQ1NfX/zE8REFBAfHt5ubGJSstLSWyhISE+Ph4NIaHh7n0SImoAVRVVVG+/Em8w8NDdu5GuSRVhioMdtlKX19fGdM2NzdDk5eX90l7n8VjijViOioqikuWm5vLruBQo8qY08bGBrKDg4M/jzczM8NeFtTEUmXHx8eob0ihg+qZa8KpqSlowsPDP+9NAXgIdg2dk5PDJSsuLiaysLAw2QUDNh/fBa+7u5u9LeBK8bW1tex1XlpaktRgu4AhV1dXhRhTDB7C1NSU+AaGpABbPuzr2HgRERGSsuzsbAxhy/e98MrLy4lvbAslBWlpaRhCNkOlQpSrq6tsDXYeKND19fUV5UpheOfn5+rq6sR3T08Pe/To6Aidjo6OaCclJXG9aRsbG9FZU1Pz7fAQqampXNVzdHQ0yYpzc3PsW3RjY4PIzM3N0YNi6DviIZWxfc/OzjL9W1tbOAwICCBKtNlFDNM5Pj4udVP/XfAQ5NsBAumeDbO9vU1k2DdIpkrm48rnU/kX4g0ODop9pzo9PUUjOTlZTOnl5UVkhYWFuCHRCA4OVqwfBeMh7O3tie+ysrLIyEg0kBXEZKiniQyPHMDQEAqF3x2voaFB7DtaSUmJVKWLiwtb5u3trXAzisfDXk5HR4eYRpZ7fX39ba2D6O3t/QvwENjIENOtra0ylDwej5FZW1t/hZMvwROJRIxpPp8vWwl4RllXV/fX4CGCgoJgemRk5PcOfsXd3d1X2FD9op9mioqKUIIxkLJDIBBgy6+lpfUVNpTe6L+KUzyKR/EoHsWjeBSP4lE8ikfxKB7Fo3gUj+JRvHfFTwEGAAgMbrUkfQalAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET" template="http://en.wikipedia.org/w/api.php">
-  <Param name="action" value="opensearch"/>
-  <Param name="search" value="{searchTerms}"/>
-</Url>
-<Url type="text/html" method="GET" template="http://en.wikipedia.org/wiki/Special:Search">
-  <Param name="search" value="{searchTerms}"/>
-  <Param name="sourceid" value="Mozilla-search"/>
-</Url>
-<SearchForm>http://en.wikipedia.org/wiki/Special:Search</SearchForm>
-</SearchPlugin>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/searchplugins/yahoometrofx.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/searchplugins/yahoometrofx.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/en-US/searchplugins/yahoometrofx.xml	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/en-US/searchplugins/yahoometrofx.xml	1970-01-01 00:00:00.000000000 +0000
@@ -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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAEACAA8DQAAJgAAACAgAAABAAgAowsAAGINAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAAJcEhZcwAACxMAAAsTAQCanBgAAApPaUNDUFBob3Rvc2hvcCBJQ0MgcHJvZmlsZQAAeNqdU2dUU+kWPffe9EJLiICUS29SFQggUkKLgBSRJiohCRBKiCGh2RVRwRFFRQQbyKCIA46OgIwVUSwMigrYB+Qhoo6Do4iKyvvhe6Nr1rz35s3+tdc+56zznbPPB8AIDJZIM1E1gAypQh4R4IPHxMbh5C5AgQokcAAQCLNkIXP9IwEA+H48PCsiwAe+AAF40wsIAMBNm8AwHIf/D+pCmVwBgIQBwHSROEsIgBQAQHqOQqYAQEYBgJ2YJlMAoAQAYMtjYuMAUC0AYCd/5tMAgJ34mXsBAFuUIRUBoJEAIBNliEQAaDsArM9WikUAWDAAFGZLxDkA2C0AMElXZkgAsLcAwM4QC7IACAwAMFGIhSkABHsAYMgjI3gAhJkAFEbyVzzxK64Q5yoAAHiZsjy5JDlFgVsILXEHV1cuHijOSRcrFDZhAmGaQC7CeZkZMoE0D+DzzAAAoJEVEeCD8/14zg6uzs42jrYOXy3qvwb/ImJi4/7lz6twQAAA4XR+0f4sL7MagDsGgG3+oiXuBGheC6B194tmsg9AtQCg6dpX83D4fjw8RaGQudnZ5eTk2ErEQlthyld9/mfCX8BX/Wz5fjz89/XgvuIkgTJdgUcE+ODCzPRMpRzPkgmEYtzmj0f8twv//B3TIsRJYrlYKhTjURJxjkSajPMypSKJQpIpxSXS/2Ti3yz7Az7fNQCwaj4Be5EtqF1jA/ZLJxBYdMDi9wAA8rtvwdQoCAOAaIPhz3f/7z/9R6AlAIBmSZJxAABeRCQuVMqzP8cIAABEoIEqsEEb9MEYLMAGHMEF3MEL/GA2hEIkxMJCEEIKZIAccmAprIJCKIbNsB0qYC/UQB00wFFohpNwDi7CVbgOPXAP+mEInsEovIEJBEHICBNhIdqIAWKKWCOOCBeZhfghwUgEEoskIMmIFFEiS5E1SDFSilQgVUgd8j1yAjmHXEa6kTvIADKC/Ia8RzGUgbJRPdQMtUO5qDcahEaiC9BkdDGajxagm9BytBo9jDah59CraA/ajz5DxzDA6BgHM8RsMC7Gw0KxOCwJk2PLsSKsDKvGGrBWrAO7ifVjz7F3BBKBRcAJNgR3QiBhHkFIWExYTthIqCAcJDQR2gk3CQOEUcInIpOoS7QmuhH5xBhiMjGHWEgsI9YSjxMvEHuIQ8Q3JBKJQzInuZACSbGkVNIS0kbSblIj6SypmzRIGiOTydpka7IHOZQsICvIheSd5MPkM+Qb5CHyWwqdYkBxpPhT4ihSympKGeUQ5TTlBmWYMkFVo5pS3aihVBE1j1pCraG2Uq9Rh6gTNHWaOc2DFklLpa2ildMaaBdo92mv6HS6Ed2VHk6X0FfSy+lH6JfoA/R3DA2GFYPHiGcoGZsYBxhnGXcYr5hMphnTixnHVDA3MeuY55kPmW9VWCq2KnwVkcoKlUqVJpUbKi9Uqaqmqt6qC1XzVctUj6leU32uRlUzU+OpCdSWq1WqnVDrUxtTZ6k7qIeqZ6hvVD+kfln9iQZZw0zDT0OkUaCxX+O8xiALYxmzeCwhaw2rhnWBNcQmsc3ZfHYqu5j9HbuLPaqpoTlDM0ozV7NS85RmPwfjmHH4nHROCecop5fzforeFO8p4ikbpjRMuTFlXGuqlpeWWKtIq1GrR+u9Nq7tp52mvUW7WfuBDkHHSidcJ0dnj84FnedT2VPdpwqnFk09OvWuLqprpRuhu0R3v26n7pievl6Ankxvp955vef6HH0v/VT9bfqn9UcMWAazDCQG2wzOGDzFNXFvPB0vx9vxUUNdw0BDpWGVYZfhhJG50Tyj1UaNRg+MacZc4yTjbcZtxqMmBiYhJktN6k3umlJNuaYppjtMO0zHzczNos3WmTWbPTHXMueb55vXm9+3YFp4Wiy2qLa4ZUmy5FqmWe62vG6FWjlZpVhVWl2zRq2drSXWu627pxGnuU6TTque1mfDsPG2ybaptxmw5dgG2662bbZ9YWdiF2e3xa7D7pO9k326fY39PQcNh9kOqx1aHX5ztHIUOlY63prOnO4/fcX0lukvZ1jPEM/YM+O2E8spxGmdU5vTR2cXZ7lzg/OIi4lLgssulz4umxvG3ci95Ep09XFd4XrS9Z2bs5vC7ajbr+427mnuh9yfzDSfKZ5ZM3PQw8hD4FHl0T8Ln5Uwa9+sfk9DT4FntecjL2MvkVet17C3pXeq92HvFz72PnKf4z7jPDfeMt5ZX8w3wLfIt8tPw2+eX4XfQ38j/2T/ev/RAKeAJQFnA4mBQYFbAvv4enwhv44/Ottl9rLZ7UGMoLlBFUGPgq2C5cGtIWjI7JCtIffnmM6RzmkOhVB+6NbQB2HmYYvDfgwnhYeFV4Y/jnCIWBrRMZc1d9HcQ3PfRPpElkTem2cxTzmvLUo1Kj6qLmo82je6NLo/xi5mWczVWJ1YSWxLHDkuKq42bmy+3/zt84fineIL43sXmC/IXXB5oc7C9IWnFqkuEiw6lkBMiE44lPBBECqoFowl8hN3JY4KecIdwmciL9E20YjYQ1wqHk7ySCpNepLskbw1eSTFM6Us5bmEJ6mQvEwNTN2bOp4WmnYgbTI9Or0xg5KRkHFCqiFNk7Zn6mfmZnbLrGWFsv7Fbou3Lx6VB8lrs5CsBVktCrZCpuhUWijXKgeyZ2VXZr/Nico5lqueK83tzLPK25A3nO+f/+0SwhLhkralhktXLR1Y5r2sajmyPHF52wrjFQUrhlYGrDy4irYqbdVPq+1Xl65+vSZ6TWuBXsHKgsG1AWvrC1UK5YV969zX7V1PWC9Z37Vh+oadGz4ViYquFNsXlxV/2CjceOUbh2/Kv5nclLSpq8S5ZM9m0mbp5t4tnlsOlqqX5pcObg3Z2rQN31a07fX2Rdsvl80o27uDtkO5o788uLxlp8nOzTs/VKRU9FT6VDbu0t21Ydf4btHuG3u89jTs1dtbvPf9Psm+21UBVU3VZtVl+0n7s/c/romq6fiW+21drU5tce3HA9ID/QcjDrbXudTVHdI9VFKP1ivrRw7HH77+ne93LQ02DVWNnMbiI3BEeeTp9wnf9x4NOtp2jHus4QfTH3YdZx0vakKa8ppGm1Oa+1tiW7pPzD7R1ureevxH2x8PnDQ8WXlK81TJadrpgtOTZ/LPjJ2VnX1+LvncYNuitnvnY87fag9v77oQdOHSRf+L5zu8O85c8rh08rLb5RNXuFearzpfbep06jz+k9NPx7ucu5quuVxrue56vbV7ZvfpG543zt30vXnxFv/W1Z45Pd2983pv98X39d8W3X5yJ/3Oy7vZdyfurbxPvF/0QO1B2UPdh9U/W/7c2O/cf2rAd6Dz0dxH9waFg8/+kfWPD0MFj5mPy4YNhuueOD45OeI/cv3p/KdDz2TPJp4X/qL+y64XFi9++NXr187RmNGhl/KXk79tfKX96sDrGa/bxsLGHr7JeDMxXvRW++3Bd9x3He+j3w9P5Hwgfyj/aPmx9VPQp/uTGZOT/wQDmPP8YzMt2wAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAACZ0lEQVR42mzSP4icZRTF4ee+38xOkp2sG5cQxVJIIaaKkICxTkqJjQhpJFYiop2F1YKFQqoUVpEoCBYSS7dfOxVFWGIsokUE/0TEye7OzPe977XYNWk83b0cDoffvXHWGxkKYjt0N1fi+FaJIzNIFSJ0kDXn0z5nF1O9Sp5PzaizamLD2NELo5W4sOwXqqX/04o1R2wg9PYs/GXUmTjqpGNxwvWdFzz19Akvjj+XUkYTggylFLfml93due+tZ7+y577BrkJnbNWke8yHmzvgi/4lq+WU1XjCsThl2p1ya3GZ4KNrt03KuhXH0SkkkbTOL5+u2PnuZ/D8axtGMTaKsbOvrINP3v/W3Y9XhCJjQCrUWRedVpaq3nvn7oHXrz8jD8PfvnEGbL0716LXytIoxqizkups4R/VwhB7hpi7sXkbXNo86bkrazK5sXnbEHND7BvMLcykOotz3vlxvZw+faRb08VEiVC64rPdSw/pZ/Ly9EutNi3TkHOLOvN3u3OnHNx7MFio5qq5Ifdce/WHhwEfXPnekPuq/UPPQhrAKOV0MFdyRFQFRefr7Z9wRrb0zfYd1aCpGmr2BvtSTkcp1wZLnX0tx4oQjeHX+UF97P75QGspM7VMqTfopVwb0aY1F4ZWlFK1SCVDHQKUEvphj0ztkEdrvZoLtOkoNS2XlkHJIlroIky7Jw8atDSJdQ/aPTUdtJBaLqVmlJpqQataCZKhY/L4HwcEI/Qbv1v8tivbIdVG1UtNnPVmFmPEoT9l/Dc9Ujp42Mx4uGl6I5pmgdjGzaLbopsdJqZHWZnqtKkXcZU8D/8OAPAMQ4kD8KK1AAAAAElFTkSuQmCCiVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAEJGlDQ1BJQ0MgUHJvZmlsZQAAOBGFVd9v21QUPolvUqQWPyBYR4eKxa9VU1u5GxqtxgZJk6XtShal6dgqJOQ6N4mpGwfb6baqT3uBNwb8AUDZAw9IPCENBmJ72fbAtElThyqqSUh76MQPISbtBVXhu3ZiJ1PEXPX6yznfOec7517bRD1fabWaGVWIlquunc8klZOnFpSeTYrSs9RLA9Sr6U4tkcvNEi7BFffO6+EdigjL7ZHu/k72I796i9zRiSJPwG4VHX0Z+AxRzNRrtksUvwf7+Gm3BtzzHPDTNgQCqwKXfZwSeNHHJz1OIT8JjtAq6xWtCLwGPLzYZi+3YV8DGMiT4VVuG7oiZpGzrZJhcs/hL49xtzH/Dy6bdfTsXYNY+5yluWO4D4neK/ZUvok/17X0HPBLsF+vuUlhfwX4j/rSfAJ4H1H0qZJ9dN7nR19frRTeBt4Fe9FwpwtN+2p1MXscGLHR9SXrmMgjONd1ZxKzpBeA71b4tNhj6JGoyFNp4GHgwUp9qplfmnFW5oTdy7NamcwCI49kv6fN5IAHgD+0rbyoBc3SOjczohbyS1drbq6pQdqumllRC/0ymTtej8gpbbuVwpQfyw66dqEZyxZKxtHpJn+tZnpnEdrYBbueF9qQn93S7HQGGHnYP7w6L+YGHNtd1FJitqPAR+hERCNOFi1i1alKO6RQnjKUxL1GNjwlMsiEhcPLYTEiT9ISbN15OY/jx4SMshe9LaJRpTvHr3C/ybFYP1PZAfwfYrPsMBtnE6SwN9ib7AhLwTrBDgUKcm06FSrTfSj187xPdVQWOk5Q8vxAfSiIUc7Z7xr6zY/+hpqwSyv0I0/QMTRb7RMgBxNodTfSPqdraz/sDjzKBrv4zu2+a2t0/HHzjd2Lbcc2sG7GtsL42K+xLfxtUgI7YHqKlqHK8HbCCXgjHT1cAdMlDetv4FnQ2lLasaOl6vmB0CMmwT/IPszSueHQqv6i/qluqF+oF9TfO2qEGTumJH0qfSv9KH0nfS/9TIp0Wboi/SRdlb6RLgU5u++9nyXYe69fYRPdil1o1WufNSdTTsp75BfllPy8/LI8G7AUuV8ek6fkvfDsCfbNDP0dvRh0CrNqTbV7LfEEGDQPJQadBtfGVMWEq3QWWdufk6ZSNsjG2PQjp3ZcnOWWing6noonSInvi0/Ex+IzAreevPhe+CawpgP1/pMTMDo64G0sTCXIM+KdOnFWRfQKdJvQzV1+Bt8OokmrdtY2yhVX2a+qrykJfMq4Ml3VR4cVzTQVz+UoNne4vcKLoyS+gyKO6EHe+75Fdt0Mbe5bRIf/wjvrVmhbqBN97RD1vxrahvBOfOYzoosH9bq94uejSOQGkVM6sN/7HelL4t10t9F4gPdVzydEOx83Gv+uNxo7XyL/FtFl8z9ZAHF4bBsrEwAAAAlwSFlzAAALEwAACxMBAJqcGAAAByVJREFUWAm1l1uIldcVx9d3ruMZZzRaay+pCjFJH6LSRqxQqA1NH0pBiH3Qp774kEAg4EOkxKdQSCjUFvpm6YsNVNoSaGjFtmga2yZgCIIawdv04g2kM7Uz6lzO+c758v/t/9lzTB/61Oxhn7332muv9V+3vb8pnooDVRkzZ4oY/LmK6mQZa05frX6yFJ9Ae7x4qd2IuV1FFM9WMfhaI9Z+pQBAL+aiEZ0QgNBm2YuZmxHF9VZMXqmivFaLweUyuteWYvHGVPWr2f+F7YvF/ola9DZGVJsHUXs8YvBEK1ZrXt9URDwqxY1BdGMQvWjGqkgA+iLUtazHuADUoowHYugKTilaR7SIpZjWqOMRfY090RbasS4JglpFtzWIcqwZa+pSqnWVcLLXijXpZCFpvbgb/VhMe8huMLPylWkci8/oSD8xJq7hj4WUWvXrlbqVrUyKtBYdpX3Bh9YbzsdErwRgbZKyFP+KdqxPssu4l2hDAOOxIj6bCHigKWRNCcpMCHHHB4TJLc+TXxKHnC51Ct+Qgxl/TZ0qE5Be/EdWTwjqQuJJAPIB8qAZk4kZoXJnvHH+27Hq0+0YX12PH+w7E3/8zbWkitN2M8pS7kCKZ761OV55c2fcm+nG7J1e7N/+e3m2nbyKQcAhnHWZLC86B1rxiFRvSIkIgJHFVWzZ+qk4fG5HEr4wV8buVb+Vuv5QeVZsi/HeW//eHZ1HbNfLT5+Jc2dndBav9KXugfqc+pLsv6Xxvk6kVheumnpDnXlTVMZWfHh+Li6cdOKvmGzEC69+WTskzwr1SfUJ9ZWp7z/0pWXlF9+ejQtnUdCWnAxQ+al5Tdz80lIVEP8x9eZQWCQwOTAhNc34Re+rUW8U0S+r2Ns8nWzBKgONBOeX3V3RaCpPRN7XeFcO7yYl+InML2U3VdBVHszHzbSXYLBJkuTSQzBuphoYZ7X/u8O30gFAHHxzi+Yop8ETcfDXW5JyKMd/fFuO9l3mYuwLAl5gbMg8QuKdYQg4Zjcxo7HikMeIn37vcizes9Ide9bGhs9NLPN9YX0ndnzHpbZ4vx9HXr6kc6Sobo2hIkuzOnIh0xMFRlvc0waWL+p3UePCQ/Myjjx/JSnl59CJbUkJgl75g+ZD/D978Yrc7EuMPe4ESo6OYsaasiiX7tADAyny5cGtyMHsDxzFnP0Tx6Z0SfsW27B1PHZ+c13seGZdbNo2Lo6Iu7e7cfznfxc/8ggNQBhZI9dSs2c5k+rFaHBXmZhd32xTGdlZPvzDvefj9XddlgeObYVpuf1o3zkpyrEnCJwBDjlmr9i7XP3jgrYkDamhEqRA8UOBxZ53tcOtBbgyzr53M65f8DU6sVZ1o067cfFBvP+XGzrDOa5s+JkTShIc+dBtlLOLlRpqAUDc+yqQMnViNq81edDVnPixno/vP/dXjn2svbbnPa1RiqXEHVkYQ06RWygnFEtpbZDLAJws2X1OHgfCv+hiRkZU8Y+pmbjwzjTE1D48PR1TV+5IMErgsjex2A8TJrqCHH9Cw6U0BGBkPUWrKTZnPq4L9WqIOFvEO8ml+vbRvyUB/Jw6OiUa9GydM58qQl6lTrNHyiENrwyTkOvXLziVkMlOOsesVKyIFtZB1zfDAGvdyj4xtkD7yHQ8Ynn4hCrwvYA+DOJCSlXAZl3MjNQobNzVPK7gJm0AiPsQyEg0c6s1cbEB5X08AmDz1TTLucApzHHyJgADvUqVysJMKOSicLRQl+emOIvbnaw+ot2pSTzl5zzJVjPaZ6ix7zCSN4E1shOAWnqbyYH8bOqd1h9AGJ0qtl6LRBubcBKxbo6xh60kWlbLjgG4NJ2ETkwqbl7SeUXVSCq+BF1C2bWEgEO4CxBGvOydGmu3ooXv7AEogLFqn2JtWKO8yc9xAmDxjhGiWMOQXe63zCvHtIjOpGOIwvGJlhRQepyzaiu0MQ4MnFhuT7CiJQC+sUg4jtOYO+1IH9OdCwgBSmOkP2r60CarHeXMjxw3PGyvOBnN670EgOPOc1yEYgDYCxbqTPDXki1srChi4R6lpQ+uDmVFDtkA5GH1qJEvQFgacqCFT37pyP+Y+DMJs0Y54NgbiIVn61jhEUrNARuNIi3vOQf8iUeQuNzILe4b/jFZ7RDYJhTbVRaJTxyWh8PgO93hQJCBsSa2GQyyoLlBzWDxgnm9l0JgADgNgVxElCH22xs4NCsaieSUyzWXaSTLDAPlGQB0Kt6JaqpzYjkJQT9id60aNwqZjVqlz9Kqp+JcfDjOAqhirNoCI6MelpVPAjZ/CbFv45Y9YNcicqDMKm/Xo/FPJdMlqZ9SIK7qSrrci9mbl6q3/DGQ5f7XuK347rgKeuMgiicEfLPmT0rGY1K5SdI/ryritlMbJrr/PZ8+I8qf9PF8qhMrT39QHfHLkhj/fz/bi+eb83F/VxX1b6jWvt6KdTs/AvvCmqXE235jAAAAAElFTkSuQmCC</Image>
-<Image width="74" height="74">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEoAAABKCAIAAACTslUmAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2xpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGMkQ1NjY1OTQzMjA2ODExOEFCM0NBQTM2NzFDMUYwRiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoyNTI5NTE2NzcwQ0IxMUUzQUZGRUQxNzZFRDEwMkU1NiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoyNTI5NTE2NjcwQ0IxMUUzQUZGRUQxNzZFRDEwMkU1NiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NDY2MGVjYzAtNDBiNy00NzFlLTg0NTgtOTQzNTNmOWM4YzYyIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjkzMUIyODkyMTQ5QjExRTM5QkRGOUUwM0ZBM0MwMDNBIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+TXdjyQAADg1JREFUeNrsWnlwVdUZP+fc+/aXl7zkJUA2wp4gFBAsslWriIgL1BGpC6iAjKUqjksVGRHbWhlXUNqhWDqgDCCoCCi2YKWA7CJLIaQsIYSEJJDtLXnLXc7p9537kjIdhRn+tPfNm8fNveee8/2+9fd9A72RLiA/3g8jP+qPDc+GZ8Oz4dnwbHg2PBueDc+GZ8Oz4dnwbHg2PBueDc+GZ8P7P4En5JWQX0XgV7TfpILLC/hVqUjfZHCbmoJyvBBwF/5VKL7D5EpcBi9SeGhdCM4ZvAIXTP4Sk3LreFhj3ST4a1rHUbzLpUi4YfpPWIC7wVeFm/JL0r9CwP7pP0EGAYelFzDrMQhoPTcpfhmlqrCOd1BcxxjVOeNwjcLBbtzBiGLKzSgzAZRhPQWcsBrwUIaiELzgVKUmPMcV8BbI6uROShRQCrdwgUC4M74BR5ugDa5KibgimAl7EwUXSOScaagREAm2R6ggAYjA5Xqm4J8cZaIsDQ/fkYaBrVFVaAJhSrggFJEbCXgDBCIoK4pPOZ6KlgMRYTuucpQf3pPnocRcKEQ4UTtCZ8SFEPDakNtqguhEmAxE4WgfgnupICjhIBiYHVSHImiwq3DAEQgOnsHeRMGDmIJaBlWAZIQz+QpgNiixbADyXBJ7sC+VngaidvgNojEdQhhC+if6GihJY9LsinCgz6Bs4Jkq+ipX8SwC/6gmbAxPFR31AvohBoiLd6hqEieVwqIbCwc8xr25AggBo/R46UwUtAlQwIygHQVUyoQLfIrjQQiOye0YyqmaQpUWNgg1ZPSAZ5mXxB6GEDqHQJigPqIKXisilaJVIxB2jKCvwTKnS6j1JHaKNBrEUIVDbkesTdE/pYfo6D3S+0FZ4BroOGh5lBtsCo8wyMDtpSNx/MUjhWjPCHDLlAYEa4iU4AmiaeDnxEAXR2/GVxhTNWKcEy26SIKfSAM7FHAZWCkMBXVKlBI6Fo+B8GPMckv8gO+p7Ml5Iwb2Ld63/6wDHQIeqg5Kq0XzzaNKf/3M8DMHmuvaWpMgvTA8xGUyzBcKZXGix0TKSRyoFAwXOEfRhB4lKZMYLoqxBxHVRlONItrKUlHRplJFhfMpOJQJLmAy5ia0WSTraNgpSFGn7KygPxpJVdPmpOCZ4OWwCfgtNTM8zhtGl8UuJmIp3Qk3MfmAb8EGipCOpLZ7InomeiPDEElyI6Kn8jp7Hn5pWNWx5jX/3N+fFEA0NfDWLFdg0fZ7Y63h12dvNSgvzM5IhvUITwS4h1MDtg75MhxuEo0ZeiqlABAKltV8HnfI6zE11hbTYiJaT9oG5xbff9cQVwbVEmLHhtP76s5ki4zOwq9R5uBaOWkeWFA89/khoWJP7ZmooZmFvf1mQlm/tOKTf3xXIAJB6qriLVPuHPzK6tvffmzrwiWbS0QXVDVYVVCJzcoaVh6XKSVtRi5Ax16qPjVjU/25xrmrbwvRQCuJwqM60vbK+6Phlft6rzjb1hpSM9fVTvvt2nHNPK5RDWLrLImMe7JsdfW0bteELtI4Bic1mkSypF/G6nPT73lm4G5xhhLnH5dPevWTcd1GBZQCR9HQ7N99NHbxBw/4nO5K1uIg+mna/OCkwR+fmRIq8X7010NLXt61ZM7upfO/vdAUfferO15/584oTTSTJLhaKN8P0tecaHUJnyJTtwqBT6ykgqGL1rNQEZlSqKwN8NRHnBdJYs5dm5YenDJn3thZ81YHhT66b69bJ/f74PfbDzQ2gLuPm1rqcKnDx3cd0KnoeENtHg2A1hRqONyqaXLMQLI8YCRx7vKw8AXNS9mH3z7Ua1DGxL7L9lScU8FviTGoe8HG09MGDJk6/trFBxO1vxg+5LXV41fO/2bmi591FsFc6nEQ8q+9dev3Ht2x6sSfdj7AkvSF2RtB6tx8cF5yYPvZIPHIygKlM10/TOmcl2MthdS/+VDV1nXlk+YOuMZRXEsib24Y39ocXvTSnhzhzSP+iS/237h8/5lTjdPeGB4hCSy/kFgTWGOFZmCugDMoBDtLxCFHsIoDtU9PGNNnUGhS8fLd/z5XSvJ706wykne08vzdob8UlAbmvXZbioi5K29paml8e/bOHiKUr2SpyCLULOoZRArW7zr++Yq9971w7dBu3cI03qVnTkNduNVMOjBLXSI6F1cmZZD4g8T56sNboSrNWXLr4+NH5vfInn//5gbSliLa9YN7FBXlLXhk77qFB2+bXFpEQjFuQImgmDTNusq2ShqupZEqEa4hzfWnIoJq+V1zbprZ9fCR0ydrwj1F0KS6gVSHdiM5p5rDhw+cGji+cGIZBF1g1RsHm6iWRd3cNLFSWFmeCi91f/pmBVyOmVSWEHphj+D+L09D0lKZ5EPtecRyQ9KRWr73A9Uhl/orohfem/XFEwtvv/mhnjs2HVm/uaKQZp0XLY+8c111TX25qA1+pD69iNw+8SdL1m5zCFWLo9/PfGvEHXVlblMB/aVUPSfXn9DNLqUZhaWBb9af1aiuCp8kSxgYVJKt6mORzmOy+92Yb9C2+pMJRaZBivxKYEWlSIlcXAEPhypaXBrMI5mGYuz64qwiiQfWFytBtgfaFaxnMgOW5orAikXHq07UwJ33HturERYVySF5xUNGlrz14Df1pGVLU9XOzRXTFwzyEDcUb8ifWEP8zJuheoJOb6bbE/C7fSqSA6G7fErQ59KJxiW9kBQH0g9UbVM3gHOq8DojTkWhVvlLs0qUG6JJqBBUwAGJmkimikjAyWjtoZYAcVrUl4r/hXA564H+QB85wl1B6ndvqsnpknm2NtxZ+KpI4+jpI2G/68YWLBp1b0ToyQjp1CVnWK+uK09+5/WpINrCGVt3pE53YgHIZ0ADfqoU3PVIv/rK+PnKtv4ju7qEUzIfNAywHx1SD2Wdiz2abp7adZESd0mf3DhNgQAmsEhuCAVqkALCtHHdm+EEzDXl4YDXd+Fc4kxVxIco0pSvo8LRK1oPMiysBBbn4W6vBxTqdHNnK433YDmTZw/Zt+XE9r2VdSeTiVP6xiVHTaJNnX+dxjQTqZko6h7sQToV82AJze5OQgW9/WCi85XRLQuOFfQI9srpVEUbHVzBRkKIRhLJFd5ho/se+rpm/aHyltaWCTMHhIQ3QpE9M+pE6oeGNFPE+PkvS0Dsv68s7zc8LxEHbhCxakBa5kuwXTm1SJYMvFhRoa64mUeltaRpwvRBXp/n3V/t/Hj9sfVrjny85sCyLftWLdw//O4+w3nPhtowlelSAHNmaCBgiYoKGZyV9MheuHJXrDW+vOKBEMk4SuqrefgoawCus/ToxFg4/s6z21LEnD/5q6xOrllP33xEVLeINmTBQiSJfphcGFxY9OjLN23+8PCexqpYzNjx2RkXdh603R6kwz+ti8s5p4E1C5XGie50qU6VRE3e0xt6avGwqqq6o5V1pSTkRCrlA1WsnX/kvqdGTH1uaG1tC8SY2+9Apol8nuuCe/0YTCWDsutWxO65Ztkf1o5bvXfKtq9Phpt0f476s591j0a0J8uW1TRH+tO8Tz8vz/9N9qy3bsjt6//zqzsbqlog7LIC3uen3fLs26O+Xlf+3JRNXUjGiX0NB/aczSb+joiTJDZtOqtO0Mv8rySLiBpca2LG2n33lg3uPtr3Lmh6xB09D2+rrq5vySQZJjUVYkJOAD42aFQnI0WaGuIFfTJP7GtuCke91Am2S7JUXsDfe0gO0Ktzla0RkYpS7e4xpf2vLzQMQ1Wdx/bWbfhbucqUztwLWTAhNCDKY2/oM+PFUUA1q043g5fldHF2Lw59uab8/cW7oZsaXFDwSc2jG94//MSMT7vT7B+CcDl4sj3HepIg5oTpZcW981a98m1DrLWFxP3EkwNFiaHnMekbQNjPk0gGcQH+ZhHPJ1ngNgYGD3BqNcFTdSwe5K4c4jOpAd1MI4m1sRT0HJASgZFnE7didUbU6seNGhKD+lmaGSooytRV1tbQdrzuQozqhSJgUCMrkPH4gqEHtlSvWXk8RD1XBU9mIeunkcQTJJ4vshWEg20y9KMC+1EnFxr24EhV2vM4ml6VrTq2yEiXoP/CRg2IoS4DnlsLiGznMeHhAuzTgKPiHEMWJliTZKbBdfgbsqgbCgAebUKSgypTRRqC1BeiGaZskb/3c7nY41ZzyqG/cIS4TxAfQ3NB0jA4g6wN0cWw6UaZZCssN8SeUnaASCK4pJxgEBMJr8LR4YHWmFYFk9MXSUcYMF1BoX/HIp8mjRyWCDcEP3PLt2hHS8OF7iCsG82TdMa4+kmZ9BVV9hcKVbiBEavJZoOZQuOqoeC0xZRzEKhQijUdgZYVvY7LPh08DXt5jHgDEDEVGlkFx0bYg6O8OETQwbwUq7OJTbdMSUDN5RDAQf8rCvYfMtvJoYOw2mh+lfDANEp6bABNMrTLwCmYUOS4AdMiVeQoxkFUydIhojRsOEDBUhEOsDQgYsAarbkVxz4dfoSOLsstrcHeTA6fQFrdcvU0YwS1Mg0JLJeTI5zgQJ3B0MDGGSypIH5rmnQ18DjOm+SgDmcCaAcrhFAalAtRwUUKZUPDUdmJI/szMYSQcGD5UxUcA2KWwvkSeDVVpd+3zwJN5FMyP1mNNpZaOEmGPbXmDtjJCQV/GYcLBfeCTXAugdHxw5/LQZdDLmsyKbUgB0eXPE7/ochBE7eGbh0rUd1SCWBOKrFZRUko8g7r2AhHcAi3vXDJ2AM3thRs2YB2HIcs3JCOZaY9lir2EN6GZ8Oz4dnwbHg2PBueDc+GZ8Oz4dnwbHg2PBueDc+GZ8Oz4f2IP/8RYAA9J6w+Uu7YgQAAAABJRU5ErkJggg==</Image>
-<Url type="application/x-suggestions+json" method="GET"
-     template="http://ff.search.yahoo.com/gossip?output=fxjson&amp;command={searchTerms}" />
-<Url type="text/html" method="GET" template="http://search.yahoo.com/search">
-  <Param name="p" value="{searchTerms}"/>
-  <Param name="ei" value="UTF-8"/>
-  <MozParam name="fr" condition="pref" pref="yahoo-fr-metro" />
-</Url>
-<SearchForm>http://search.yahoo.com/</SearchForm>
-</SearchPlugin>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/filter.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/filter.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/filter.py	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/filter.py	2015-04-24 19:30:59.000000000 +0000
@@ -20,8 +20,7 @@
     if mod == "extensions/spellcheck":
       return "ignore"
     # browser
-    if (re.match(r"searchplugins\/.+\.xml", path) or
-        path == "searchplugins/metrolist.txt"):
+    if (re.match(r"searchplugins\/.+\.xml", path):
       return "ignore"
     return "error"
   if mod == "extensions/spellcheck":
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/locales/Makefile.in	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/locales/Makefile.in	2015-04-24 19:30:59.000000000 +0000
@@ -71,14 +71,8 @@
     $(NULL)
 endif
 
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt))
-else
 SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg
-endif
 SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
-# metro build call a searchplugins target for search engine plugins
-.PHONY: searchplugins
 SEARCHPLUGINS_TARGET := libs searchplugins
 SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
 # Some locale-specific search plugins may have preprocessor directives, but the
@@ -88,12 +82,7 @@
 
 # Required for l10n.mk - defines a list of app sub dirs that should
 # be included in langpack xpis.
-ifdef MOZ_METRO
-# metro build, include both app folders
-DIST_SUBDIRS = browser metro
-else
 DIST_SUBDIRS = $(DIST_SUBDIR)
-endif
 
 include $(topsrcdir)/config/rules.mk
 
@@ -138,9 +127,6 @@
 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
-ifdef MOZ_METRO
-	@$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$*
-endif
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/appbar.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/appbar.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/appbar.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/appbar.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,323 +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/. */
-"use strict";
-
-var Appbar = {
-  get starButton()    { return document.getElementById('star-button'); },
-  get pinButton()     { return document.getElementById('pin-button'); },
-  get menuButton()    { return document.getElementById('menu-button'); },
-
-  // track selected/active richgrid/tilegroup - the context for contextual action buttons
-  activeTileset: null,
-
-  init: function Appbar_init() {
-    // fired from appbar bindings
-    Elements.contextappbar.addEventListener('MozAppbarShowing', this, false);
-    Elements.contextappbar.addEventListener('MozAppbarDismissing', this, false);
-
-    // fired when a context sensitive item (bookmarks) changes state
-    window.addEventListener('MozContextActionsChange', this, false);
-
-    // browser events we need to update button state on
-    Elements.browsers.addEventListener('URLChanged', this, true);
-    Elements.tabList.addEventListener('TabSelect', this, true);
-
-    // tilegroup selection events for all modules get bubbled up
-    window.addEventListener("selectionchange", this, false);
-    Services.obs.addObserver(this, "metro_on_async_tile_created", false);
-
-    // gather appbar telemetry data
-    try {
-      UITelemetry.addSimpleMeasureFunction("metro-appbar",
-                                           this.getAppbarMeasures.bind(this));
-    } catch (ex) {
-      // swallow exception that occurs if metro-appbar measure is already set up
-    }
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "metro_on_async_tile_created":
-        this._updatePinButton();
-        break;
-    }
-  },
-
-  handleEvent: function Appbar_handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case 'URLChanged':
-      case 'TabSelect':
-        this.update();
-        this.flushActiveTileset(aEvent.lastTab);
-        break;
-
-      case 'MozAppbarShowing':
-        this.update();
-        break;
-
-      case 'MozAppbarDismissing':
-        if (this.activeTileset && ('isBound' in this.activeTileset)) {
-          this.activeTileset.clearSelection();
-        }
-        this._clearContextualActions();
-        this.activeTileset = null;
-        break;
-
-      case 'MozContextActionsChange':
-        let actions = aEvent.actions;
-        let setName = aEvent.target.contextSetName;
-        // could transition in old, new buttons?
-        this.showContextualActions(actions, setName);
-        break;
-
-      case "selectionchange":
-        let nodeName = aEvent.target.nodeName;
-        if ('richgrid' === nodeName) {
-          this._onTileSelectionChanged(aEvent);
-        }
-        break;
-    }
-  },
-
-  flushActiveTileset: function flushActiveTileset(aTab) {
-    try {
-      let tab = aTab || Browser.selectedTab;
-      // Switching away from or loading a site into a startui tab that has actions
-      // pending, we consider this confirmation that the user wants to flush changes.
-      if (this.activeTileset && tab && tab.browser && tab.browser.currentURI.spec == kStartURI) {
-        ContextUI.dismiss();
-      }
-    } catch (ex) {}
-  },
-
-  shutdown: function shutdown() {
-    this.flushActiveTileset();
-  },
-
-  /*
-   * Called from various places when the visible content
-   * has changed such that button states may need to be
-   * updated.
-   */
-  update: function update() {
-    this._updatePinButton();
-    this._updateStarButton();
-  },
-
-  onPinButton: function() {
-    if (this.pinButton.checked) {
-      Browser.pinSite();
-    } else {
-      Browser.unpinSite();
-    }
-  },
-
-  onStarButton: function(aValue) {
-    if (aValue === undefined) {
-      aValue = this.starButton.checked;
-    }
-
-    if (aValue) {
-      Browser.starSite(function () {
-        Appbar._updateStarButton();
-      });
-    } else {
-      Browser.unstarSite(function () {
-        Appbar._updateStarButton();
-      });
-    }
-  },
-
-  onMenuButton: function(aEvent) {
-      let typesArray = [];
-
-      if (BrowserUI.isPrivateBrowsingEnabled) {
-        typesArray.push("private-browsing");
-      }
-      if (!BrowserUI.isStartTabVisible) {
-        typesArray.push("find-in-page");
-        if (ContextCommands.getPageSource())
-          typesArray.push("view-page-source");
-      }
-      if (ContextCommands.getStoreLink())
-        typesArray.push("ms-meta-data");
-      if (ConsolePanelView.enabled)
-        typesArray.push("open-error-console");
-      if (!Services.metro.immersive)
-        typesArray.push("open-jsshell");
-
-      typesArray.push("view-on-desktop");
-
-      var x = this.menuButton.getBoundingClientRect().left;
-      var y = Elements.toolbar.getBoundingClientRect().top;
-      ContextMenuUI.showContextMenu({
-        json: {
-          types: typesArray,
-          string: '',
-          xPos: x,
-          yPos: y,
-          leftAligned: true,
-          bottomAligned: true
-      }
-
-      });
-  },
-
-  onViewOnDesktop: function() {
-    let appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"].
-      getService(Components.interfaces.nsIAppStartup);
-
-    Services.prefs.setBoolPref('browser.sessionstore.resume_session_once', true);
-    this._incrementCountableEvent("switch-to-desktop-button");
-    appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit |
-                    Components.interfaces.nsIAppStartup.eRestart);
-  },
-
-  onAutocompleteCloseButton: function () {
-    Elements.autocomplete.closePopup();
-  },
-
-  dispatchContextualAction: function(aActionName){
-    let activeTileset = this.activeTileset;
-    if (activeTileset && ('isBound' in this.activeTileset)) {
-      // fire event on the richgrid, others can listen
-      // but we keep coupling loose so grid doesn't need to know about appbar
-      let event = document.createEvent("Events");
-      event.action = aActionName;
-      event.initEvent("context-action", true, true); // is cancelable
-      activeTileset.dispatchEvent(event);
-      if (!event.defaultPrevented) {
-        activeTileset.clearSelection();
-        Elements.contextappbar.dismiss();
-      }
-    }
-  },
-
-  showContextualActions: function(aVerbs, aSetName) {
-    // When the appbar is not visible, we want the icons to refresh right away
-    let immediate = !Elements.contextappbar.isShowing;
-
-    if (aVerbs.length) {
-      Elements.contextappbar.show();
-    }
-
-    // Look up all of the buttons for the verbs that should be visible.
-    let idsToVisibleVerbs = new Map();
-    for (let verb of aVerbs) {
-      let id = verb + "-selected-button";
-      if (!document.getElementById(id)) {
-        throw new Error("Appbar.showContextualActions: no button for " + verb);
-      }
-      idsToVisibleVerbs.set(id, verb);
-    }
-
-    // Sort buttons into 2 buckets - needing showing and needing hiding.
-    let toHide = [], toShow = [];
-    let buttons = Elements.contextappbar.getElementsByTagName("toolbarbutton");
-    for (let button of buttons) {
-      let verb = idsToVisibleVerbs.get(button.id);
-      if (verb != undefined) {
-        // Button should be visible, and may or may not be showing.
-        this._updateContextualActionLabel(button, verb, aSetName);
-        if (button.hidden) {
-          toShow.push(button);
-        }
-      } else if (!button.hidden) {
-        // Button is visible, but shouldn't be.
-        toHide.push(button);
-      }
-    }
-
-    if (immediate) {
-      toShow.forEach(function(element) {
-        element.removeAttribute("fade");
-        element.hidden = false;
-      });
-      toHide.forEach(function(element) {
-        element.setAttribute("fade", true);
-        element.hidden = true;
-      });
-      return;
-    }
-
-    return Task.spawn(function() {
-      if (toHide.length) {
-        yield Util.transitionElementVisibility(toHide, false);
-      }
-      if (toShow.length) {
-        yield Util.transitionElementVisibility(toShow, true);
-      }
-    });
-  },
-
-  _clearContextualActions: function() {
-    this.showContextualActions([]);
-  },
-
-  _updateContextualActionLabel: function(aButton, aVerb, aSetName) {
-    // True if the action's label string contains the set name and
-    // thus has to be selected based on the list passed in.
-    let usesSetName = aButton.hasAttribute("label-uses-set-name");
-    let name = "contextAppbar2." + aVerb + (usesSetName ? "." + aSetName : "");
-    aButton.label = Strings.browser.GetStringFromName(name);
-  },
-
-  _onTileSelectionChanged: function _onTileSelectionChanged(aEvent){
-    let activeTileset = aEvent.target;
-
-    // deselect tiles in other tile groups,
-    // ensure previousyl-activeTileset is bound before calling methods on it
-    if (this.activeTileset &&
-          ('isBound' in this.activeTileset) &&
-          this.activeTileset !== activeTileset) {
-      this.activeTileset.clearSelection();
-    }
-    // keep track of which view is the target/scope for the contextual actions
-    this.activeTileset = activeTileset;
-
-    // ask the view for the list verbs/action-names it thinks are
-    // appropriate for the tiles selected
-    let contextActions = activeTileset.contextActions;
-    let verbs = [v for (v of contextActions)];
-
-    // fire event with these verbs as payload
-    let event = document.createEvent("Events");
-    event.actions = verbs;
-    event.initEvent("MozContextActionsChange", true, false);
-    activeTileset.dispatchEvent(event);
-
-    if (verbs.length) {
-      Elements.contextappbar.show(); // should be no-op if we're already showing
-    } else {
-      Elements.contextappbar.dismiss();
-    }
-  },
-
-  // track certain appbar events and interactions for the UITelemetry probe
-  _countableEvents: {},
-
-  _incrementCountableEvent: function(aName) {
-    if (!(aName in this._countableEvents)) {
-      this._countableEvents[aName] = 0;
-    }
-    this._countableEvents[aName]++;
-  },
-
-  getAppbarMeasures: function() {
-    return {
-      countableEvents: this._countableEvents
-    };
-  },
-
-  _updatePinButton: function() {
-    this.pinButton.checked = Browser.isSitePinned();
-  },
-
-  _updateStarButton: function() {
-    Browser.isSiteStarredAsync(function (isStarred) {
-      this.starButton.checked = isStarred;
-    }.bind(this));
-  },
-
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/apzc.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/apzc.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/apzc.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/apzc.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,153 +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/. */
-
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
-let Cr = Components.results;
-
-/**
- * Misc. front end utilities for apzc management.
- * the pref: layers.async-pan-zoom.enabled is true.
- */
-
-var APZCObserver = {
-  _debugEvents: false,
-  _enabled: false,
-
-  get enabled() {
-    return this._enabled;
-  },
-
-  init: function() {
-    this._enabled = Services.prefs.getBoolPref(kAsyncPanZoomEnabled);
-    if (!this._enabled) {
-      return;
-    }
-
-    let os = Services.obs;
-    os.addObserver(this, "apzc-transform-begin", false);
-
-    Elements.tabList.addEventListener("TabSelect", this, true);
-    Elements.browsers.addEventListener("pageshow", this, true);
-    messageManager.addMessageListener("Content:ZoomToRect", this);
-  },
-
-  shutdown: function shutdown() {
-    if (!this._enabled) {
-      return;
-    }
-
-    let os = Services.obs;
-    os.removeObserver(this, "apzc-transform-begin");
-
-    Elements.tabList.removeEventListener("TabSelect", this, true);
-    Elements.browsers.removeEventListener("pageshow", this, true);
-    messageManager.removeMessageListener("Content:ZoomToRect", this);
-  },
-
-  handleEvent: function APZC_handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case 'TabSelect':
-        this._resetDisplayPort();
-        break;
-
-      case 'pageshow':
-        if (aEvent.target != Browser.selectedBrowser.contentDocument) {
-          break;
-        }
-        this._resetDisplayPort();
-        break;
-    }
-  },
-
-  observe: function ao_observe(aSubject, aTopic, aData) {
-    if (aTopic == "apzc-transform-begin") {
-      // When we're panning, hide the main scrollbars by setting imprecise
-      // input (which sets a property on the browser which hides the scrollbar
-      // via CSS).  This reduces jittering from left to right. We may be able
-      // to get rid of this once we implement axis locking in /gfx APZC.
-      if (InputSourceHelper.isPrecise) {
-        InputSourceHelper._imprecise();
-      }
-    }
-  },
-
-  receiveMessage: function(aMessage) {
-    let json = aMessage.json;
-    let browser = aMessage.target;
-    switch (aMessage.name) {
-      case "Content:ZoomToRect": {
-        let { presShellId, viewId } = json;
-        let rect = Rect.fromRect(json.rect);
-        if (this.isRectZoomedIn(rect, browser.contentViewportBounds)) {
-          // If we're already zoomed in, zoom out instead.
-          rect = new Rect(0,0,0,0);
-        }
-        let data = [rect.x, rect.y, rect.width, rect.height, presShellId, viewId].join(",");
-        Services.obs.notifyObservers(null, "apzc-zoom-to-rect", data);
-      }
-    }
-  },
-
-  /**
-   * Check to see if the area of the rect visible in the viewport is
-   * approximately the max area of the rect we can show.
-   * Based on code from BrowserElementPanning.js
-   */
-  isRectZoomedIn: function (aRect, aViewport) {
-    let overlap = aViewport.intersect(aRect);
-    let overlapArea = overlap.width * overlap.height;
-    let availHeight = Math.min(aRect.width * aViewport.height / aViewport.width, aRect.height);
-    let showing = overlapArea / (aRect.width * availHeight);
-    let ratioW = (aRect.width / aViewport.width);
-    let ratioH = (aRect.height / aViewport.height);
-
-    return (showing > 0.9 && (ratioW > 0.9 || ratioH > 0.9));
-  },
-
-  _resetDisplayPort: function () {
-    // Start off with something reasonable. The apzc will handle these
-    // calculations once scrolling starts.
-    let doc = Browser.selectedBrowser.contentDocument.documentElement;
-    // While running tests, sometimes this can be null. If we don't have a
-    // root document, there's no point in setting a scrollable display port.
-    if (!doc) {
-      return;
-    }
-    let win = Browser.selectedBrowser.contentWindow;
-    let factor = 0.2;
-    let portX = 0;
-    let portY = 0;
-    let portWidth = ContentAreaObserver.width;
-    let portHeight = ContentAreaObserver.height;
-
-    if (portWidth < doc.scrollWidth) {
-      portWidth += ContentAreaObserver.width * factor;
-      if (portWidth > doc.scrollWidth) {
-        portWidth = doc.scrollWidth;
-      }
-    }
-    if (portHeight < doc.scrollHeight) {
-      portHeight += ContentAreaObserver.height * factor;
-      if (portHeight > doc.scrollHeight) {
-        portHeight = doc.scrollHeight;
-      }
-    }
-    if (win.scrollX > 0) {
-      portX -= ContentAreaObserver.width * factor;
-    }
-    if (win.scrollY > 0) {
-      portY -= ContentAreaObserver.height * factor;
-    }
-    let cwu = Browser.selectedBrowser.contentWindow
-                      .QueryInterface(Ci.nsIInterfaceRequestor)
-                      .getInterface(Ci.nsIDOMWindowUtils);
-    cwu.setDisplayPortForElement(portX, portY,
-                                 portWidth, portHeight,
-                                 Browser.selectedBrowser.contentDocument.documentElement,
-                                 0);
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/appbar.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/appbar.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/appbar.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/appbar.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <binding id="appbarBinding">
-    <content>
-      <xul:toolbar anonid="toolbar"><children/></xul:toolbar>
-    </content>
-
-    <implementation implements="nsIDOMEventListener">
-      <field name="sticky">false</field>
-      <field name="_toolbar" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "toolbar");</field>
-
-      <property name="isShowing" readonly="true">
-        <getter>
-          <![CDATA[
-            return this.getAttribute("visible") == "true";
-          ]]>
-        </getter>
-      </property>
-
-      <method name="_fire">
-        <parameter name="aName"/>
-        <body>
-          <![CDATA[
-            let event = document.createEvent("Events");
-            event.initEvent(aName, true, false);
-            this.dispatchEvent(event);
-          ]]>
-        </body>
-      </method>
-
-      <method name="dismiss">
-        <body>
-          <![CDATA[
-            if (!this.isShowing)
-              return;
-
-            let self = this;
-            this.setAttribute("hiding", "true");
-            this.addEventListener("transitionend", function appbar_transitionend() {
-              self.removeEventListener("transitionend", appbar_transitionend, false);
-              self.removeAttribute("hiding");
-            }, false);
-
-            this._fire("MozAppbarDismissing");
-            this.removeAttribute("visible");
-          ]]>
-        </body>
-      </method>
-
-      <method name="show">
-        <body>
-          <![CDATA[
-            if (this.isShowing)
-              return;
-
-            this._fire("MozAppbarShowing");
-            this.setAttribute("visible", "true");
-          ]]>
-        </body>
-      </method>
-
-      <method name="toggle">
-        <body>
-          <![CDATA[
-            if (this.getAttribute("visible") === "true") {
-              this.dismiss();
-            } else {
-              this.show();
-            }
-          ]]>
-        </body>
-      </method>
-    </implementation>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/bindings.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/bindings.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/bindings.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/bindings.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,356 +0,0 @@
-<?xml version="1.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/. -->
-
-
-<!DOCTYPE bindings [
-<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-%browserDTD;
-]>
-
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:svg="http://www.w3.org/2000/svg"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="richlistbox-batch" extends="chrome://global/content/bindings/richlistbox.xml#richlistbox">
-    <handlers>
-      <handler event="scroll">
-        <![CDATA[
-          // if there no more items to insert, just return early
-          if (this._items.length == 0)
-            return;
-
-          if (this._contentScrollHeight == -1) {
-            this._contentScrollHeight = this.scrollBoxObject.scrolledHeight;
-          }
-
-          let y = this.scrollBoxObject.positionY;
-          let scrollRatio = (y + this._childrenHeight) / this._contentScrollHeight;
-
-          // If we're scrolled 80% to the bottom of the list, append the next
-          // set of items
-          if (scrollRatio > 0.8)
-            this._insertItems();
-        ]]>
-      </handler>
-    </handlers>
-    <implementation>
-      <!-- Number of elements to add to the list initially. If there are more
-           than this many elements to display, only add them to the list once
-           the user has scrolled towards them. This is a performance
-           optimization to avoid locking up while attempting to append hundreds
-           of nodes to our richlistbox.
-      -->
-      <property name="batchSize" readonly="true" onget="return this.getAttribute('batch')"/>
-
-      <field name="_childrenHeight">this.scrollBoxObject.height;</field>
-      <field name="_items">[]</field>
-
-      <method name="setItems">
-        <parameter name="aItems"/>
-        <body><![CDATA[
-          this._items = aItems;
-          this._insertItems();
-        ]]></body>
-      </method>
-
-      <method name="_insertItems">
-        <body><![CDATA[
-          let items = this._items.splice(0, this.batchSize);
-          if (!items.length)
-            return; // no items to insert
-
-          let count = items.length;
-          for (let i = 0; i<count; i++)
-            this.appendChild(items[i]);
-
-
-          // make sure we recalculate the scrollHeight of the content
-          this._contentScrollHeight = -1;
-        ]]></body>
-      </method>
-    </implementation>
-  </binding>
-
-  <binding id="richlistbox-contextmenu" extends="chrome://global/content/bindings/richlistbox.xml#richlistbox">
-    <handlers>
-      <handler event="click" phase="bubble">
-        <![CDATA[
-          ContextMenuUI.hide();
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="richlistitem" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
-    <handlers>
-      <handler event="mousedown" phase="capturing">
-        <![CDATA[
-          // We'll get this if the user is interacting via the mouse
-          let domUtils = Components.classes["@mozilla.org/inspector/dom-utils;1"].
-                                           getService(Ci.inIDOMUtils);
-          domUtils.setContentState(this, 0x00000001);
-        ]]>
-      </handler>
-      <handler event="click" phase="capturing">
-        <![CDATA[
-          // allow normal mouse event processing
-          if (!InputSourceHelper || InputSourceHelper.isPrecise)
-            return;
-          // trap this here, we'll rely on tap events
-          // event.stopPropagation();
-        ]]>
-      </handler>
-      <handler event="touchstart" phase="capturing">
-        <![CDATA[
-          // touch input event
-          let domUtils = Components.classes["@mozilla.org/inspector/dom-utils;1"].
-                                           getService(Ci.inIDOMUtils);
-          domUtils.setContentState(this, 0x00000001);
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="menulist" display="xul:box" extends="chrome://global/content/bindings/menulist.xml#menulist">
-    <handlers>
-      <handler event="mousedown" phase="capturing">
-        <![CDATA[
-          // Stop the normal menupopup from appearing
-          event.stopPropagation();
-        ]]>
-      </handler>
-
-      <handler event="click" button="0">
-        <![CDATA[
-          if (this.disabled || this.itemCount == 0)
-            return;
-
-          this.focus();
-          MenuControlUI.show(this);
-        ]]>
-      </handler>
-
-      <handler event="command" phase="capturing">
-        <![CDATA[
-          // The dropmark (button) fires a command event too. Don't forward that.
-          // Just forward the menuitem command events, which the toolkit version does.
-          if (event.target.parentNode.parentNode != this)
-            event.stopPropagation();
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="chrome-select-option">
-    <content orient="horizontal" flex="1">
-      <xul:image class="chrome-select-option-image" anonid="check"/>
-      <xul:label anonid="label" xbl:inherits="value=label"/>
-    </content>
-
-    <implementation>
-      <property name="selected">
-        <getter>
-          <![CDATA[
-            return this.hasAttribute("selected");
-          ]]>
-        </getter>
-        <setter>
-          <![CDATA[
-            if (val)
-              this.setAttribute("selected", "true");
-            else
-              this.removeAttribute("selected");
-            return val;
-          ]]>
-        </setter>
-      </property>
-    </implementation>
-  </binding>
-
-  <binding id="select-button" extends="xul:box">
-    <content>
-      <svg:svg width="11px" version="1.1" xmlns="http://www.w3.org/2000/svg" style="position: absolute; top: -moz-calc(50% - 2px); left: 4px;">
-        <svg:polyline points="1 1 5 6 9 1" stroke="#414141" stroke-width="2" stroke-linecap="round" fill="transparent" stroke-linejoin="round"/>
-      </svg:svg>
-    </content>
-  </binding>
-
-  <binding id="textbox" extends="chrome://global/content/bindings/textbox.xml#textbox">
-    <handlers>
-      <handler event="contextmenu" phase="capturing">
-        <![CDATA[
-          let box = this.inputField.parentNode;
-          box.showContextMenu(this, event, false);
-        ]]>
-      </handler>
-      <handler event="click" phase="capturing">
-        <![CDATA[
-        if (event.mozInputSource == Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH) {
-          if (typeof SelectionHelperUI != 'undefined') {
-            SelectionHelperUI.attachEditSession(ChromeSelectionHandler,
-                event.clientX, event.clientY, this);
-          } else {
-            // If we don't have access to SelectionHelperUI then we are using this
-            // binding for browser content (e.g. about:config)
-            Services.obs.notifyObservers(event, "attach_edit_session_to_content", "");
-          }
-        }
-      ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="search-textbox" extends="chrome://global/content/bindings/textbox.xml#search-textbox">
-    <implementation>
-      <field name="_searchClear">
-        <![CDATA[
-          document.getAnonymousElementByAttribute(this, "class", "textbox-search-clear");
-        ]]>
-      </field>
-    </implementation>
-
-    <handlers>
-      <handler event="contextmenu" phase="capturing">
-        <![CDATA[
-          let box = this.inputField.parentNode;
-          box.showContextMenu(this, event, false);
-        ]]>
-      </handler>
-
-      <handler event="text" phase="bubbling"><![CDATA[
-        // Listen for composition update, some VKB that does suggestions does not
-        // update directly the content of the field but in this case we want to
-        // search as soon as something is entered in the field
-        let evt = document.createEvent("Event");
-        evt.initEvent("input", true, false);
-        this.dispatchEvent(evt);
-      ]]></handler>
-
-      <handler event="click" phase="bubbling"><![CDATA[
-        // bug 629661. To reset the autosuggestions mechanism of Android, the
-        // textfield need to reset the IME state
-        if (event.originalTarget == this._searchClear) {
-          setTimeout(function(self) {
-            try {
-              let imeEditor = self.inputField.QueryInterface(Ci.nsIDOMNSEditableElement)
-                                             .editor
-                                             .QueryInterface(Ci.nsIEditorIMESupport);
-              if (imeEditor.composing)
-                imeEditor.forceCompositionEnd();
-            } catch(e) {}
-          }, 0, this);
-        }
-      ]]></handler>
-    </handlers>
-  </binding>
-
-  <binding id="input-box" extends="xul:box">
-    <implementation>
-      <method name="showContextMenu">
-        <parameter name="aTextbox"/>
-        <parameter name="aEvent"/>
-        <parameter name="aIgnoreReadOnly"/>
-        <body><![CDATA[
-          let selectionStart = aTextbox.selectionStart;
-          let selectionEnd = aTextbox.selectionEnd;
-
-          let json = { types: ["input-text"], string: "" };
-          if (selectionStart != selectionEnd) {
-            json.types.push("cut");
-            json.types.push("copy");
-          }
-
-          if (selectionStart > 0 || selectionEnd < aTextbox.textLength)
-            json.types.push("select-all");
-
-          let clipboard = Components.classes["@mozilla.org/widget/clipboard;1"].
-                                            getService(Ci.nsIClipboard);
-          let flavors = ["text/unicode"];
-          let hasData = clipboard.hasDataMatchingFlavors(flavors, flavors.length, Ci.nsIClipboard.kGlobalClipboard);
-
-          if (hasData && (!aTextbox.readOnly || aIgnoreReadOnly)) {
-            json.types.push("paste");
-            if (aTextbox.type == "url") {
-              json.types.push("paste-url");
-            }
-          }
-          json.xPos = aEvent.clientX;
-          json.yPos = aEvent.clientY;
-          json.source = aEvent.mozInputSource;
-          ContextMenuUI.showContextMenu({ target: aTextbox, json: json });
-        ]]></body>
-      </method>
-    </implementation>
-    <handlers>
-      <handler event="click" phase="capturing">
-        <![CDATA[
-          if (event.mozInputSource == Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH) {
-            if (typeof SelectionHelperUI != 'undefined') {
-              SelectionHelperUI.attachEditSession(ChromeSelectionHandler,
-                  event.clientX, event.clientY, event.target);
-            } else {
-              // If we don't have access to SelectionHelperUI then we are using this
-              // binding for browser content (e.g. about:config)
-              Services.obs.notifyObservers(event, "attach_edit_session_to_content", "");
-            }
-          }
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="line-wrap-label" extends="chrome://global/content/bindings/text.xml#text-label">
-    <implementation>
-      <constructor>
-        <![CDATA[
-          if (this.hasAttribute("value")) {
-            this.textContent = this.getAttribute("value");
-            this.removeAttribute("value");
-          }
-        ]]>
-      </constructor>
-      <property name="value">
-        <getter>
-          <![CDATA[
-            return this.textContent;
-          ]]>
-        </getter>
-        <setter>
-          <![CDATA[
-            return (this.textContent = val);
-          ]]>
-        </setter>
-      </property>
-    </implementation>
-  </binding>
-  <binding id="line-wrap-text-link" extends="chrome://global/content/bindings/text.xml#text-link">
-    <implementation>
-      <constructor>
-        <![CDATA[
-          if (this.hasAttribute("value")) {
-            this.textContent = this.getAttribute("value");
-            this.removeAttribute("value");
-          }
-        ]]>
-      </constructor>
-      <property name="value">
-        <getter>
-          <![CDATA[
-            return this.textContent;
-          ]]>
-        </getter>
-        <setter>
-          <![CDATA[
-            return (this.textContent = val);
-          ]]>
-        </setter>
-      </property>
-    </implementation>
-  </binding>
-
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/browser.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/browser.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/browser.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/browser.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,764 +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/. */
-
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/FormData.jsm");
-Cu.import("resource://gre/modules/ScrollPosition.jsm");
-Cu.import("resource://gre/modules/Timer.jsm", this);
-
-let WebProgressListener = {
-  _lastLocation: null,
-  _firstPaint: false,
-
-  init: function() {
-    let flags = Ci.nsIWebProgress.NOTIFY_LOCATION |
-                Ci.nsIWebProgress.NOTIFY_SECURITY |
-                Ci.nsIWebProgress.NOTIFY_STATE_WINDOW |
-                Ci.nsIWebProgress.NOTIFY_STATE_NETWORK |
-                Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT;
-
-    let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebProgress);
-    webProgress.addProgressListener(this, flags);
-  },
-
-  onStateChange: function onStateChange(aWebProgress, aRequest, aStateFlags, aStatus) {
-    if (content != aWebProgress.DOMWindow)
-      return;
-
-    sendAsyncMessage("Content:StateChange", {
-      contentWindowId: this.contentWindowId,
-      stateFlags: aStateFlags,
-      status: aStatus
-    });
-  },
-
-  onLocationChange: function onLocationChange(aWebProgress, aRequest, aLocationURI, aFlags) {
-    if (content != aWebProgress.DOMWindow)
-      return;
-
-    let spec = aLocationURI ? aLocationURI.spec : "";
-    let location = spec.split("#")[0];
-
-    let charset = content.document.characterSet;
-
-    sendAsyncMessage("Content:LocationChange", {
-      contentWindowId: this.contentWindowId,
-      documentURI:     aWebProgress.DOMWindow.document.documentURIObject.spec,
-      location:        spec,
-      canGoBack:       docShell.canGoBack,
-      canGoForward:    docShell.canGoForward,
-      charset:         charset.toString()
-    });
-
-    this._firstPaint = false;
-    let self = this;
-
-    // Keep track of hash changes
-    this.hashChanged = (location == this._lastLocation);
-    this._lastLocation = location;
-
-    // When a new page is loaded fire a message for the first paint
-    addEventListener("MozAfterPaint", function(aEvent) {
-      removeEventListener("MozAfterPaint", arguments.callee, true);
-
-      self._firstPaint = true;
-      let scrollOffset = ContentScroll.getScrollOffset(content);
-      sendAsyncMessage("Browser:FirstPaint", scrollOffset);
-    }, true);
-  },
-
-  onStatusChange: function onStatusChange(aWebProgress, aRequest, aStatus, aMessage) {
-  },
-
-  onSecurityChange: function onSecurityChange(aWebProgress, aRequest, aState) {
-    if (content != aWebProgress.DOMWindow)
-      return;
-
-    let serialization = SecurityUI.getSSLStatusAsString();
-
-    sendAsyncMessage("Content:SecurityChange", {
-      contentWindowId: this.contentWindowId,
-      SSLStatusAsString: serialization,
-      state: aState
-    });
-  },
-
-  get contentWindowId() {
-    return content.QueryInterface(Ci.nsIInterfaceRequestor)
-                  .getInterface(Ci.nsIDOMWindowUtils)
-                  .currentInnerWindowID;
-  },
-
-  QueryInterface: function QueryInterface(aIID) {
-    if (aIID.equals(Ci.nsIWebProgressListener) ||
-        aIID.equals(Ci.nsISupportsWeakReference) ||
-        aIID.equals(Ci.nsISupports)) {
-        return this;
-    }
-
-    throw Components.results.NS_ERROR_NO_INTERFACE;
-  }
-};
-
-WebProgressListener.init();
-
-
-let SecurityUI = {
-  getSSLStatusAsString: function() {
-    let status = docShell.securityUI.QueryInterface(Ci.nsISSLStatusProvider).SSLStatus;
-
-    if (status) {
-      let serhelper = Cc["@mozilla.org/network/serialization-helper;1"]
-                      .getService(Ci.nsISerializationHelper);
-
-      status.QueryInterface(Ci.nsISerializable);
-      return serhelper.serializeToString(status);
-    }
-
-    return null;
-  }
-};
-
-let WebNavigation =  {
-  _webNavigation: docShell.QueryInterface(Ci.nsIWebNavigation),
-  _timer: null,
-
-  init: function() {
-    addMessageListener("WebNavigation:GoBack", this);
-    addMessageListener("WebNavigation:GoForward", this);
-    addMessageListener("WebNavigation:GotoIndex", this);
-    addMessageListener("WebNavigation:LoadURI", this);
-    addMessageListener("WebNavigation:Reload", this);
-    addMessageListener("WebNavigation:Stop", this);
-  },
-
-  receiveMessage: function(message) {
-    switch (message.name) {
-      case "WebNavigation:GoBack":
-        this.goBack();
-        break;
-      case "WebNavigation:GoForward":
-        this.goForward();
-        break;
-      case "WebNavigation:GotoIndex":
-        this.gotoIndex(message);
-        break;
-      case "WebNavigation:LoadURI":
-        this.loadURI(message);
-        break;
-      case "WebNavigation:Reload":
-        this.reload(message);
-        break;
-      case "WebNavigation:Stop":
-        this.stop(message);
-        break;
-    }
-  },
-
-  goBack: function() {
-    if (this._webNavigation.canGoBack)
-      this._webNavigation.goBack();
-  },
-
-  goForward: function() {
-    if (this._webNavigation.canGoForward)
-      this._webNavigation.goForward();
-  },
-
-  gotoIndex: function(message) {
-    this._webNavigation.gotoIndex(message.index);
-  },
-
-  loadURI: function(message) {
-    let flags = message.json.flags || this._webNavigation.LOAD_FLAGS_NONE;
-    this._webNavigation.loadURI(message.json.uri, flags, null, null, null);
-
-    let tabData = message.json;
-    if (tabData.entries) {
-      // We are going to load from history so kill the current load. We do not
-      // want the load added to the history anyway. We reload after resetting history
-      this._webNavigation.stop(this._webNavigation.STOP_ALL);
-      this._restoreHistory(tabData, 0);
-    }
-  },
-
-  reload: function(message) {
-    let flags = message.json.flags || this._webNavigation.LOAD_FLAGS_NONE;
-    this._webNavigation.reload(flags);
-  },
-
-  stop: function(message) {
-    let flags = message.json.flags || this._webNavigation.STOP_ALL;
-    this._webNavigation.stop(flags);
-  },
-
-  _restoreHistory: function _restoreHistory(aTabData, aCount) {
-    // We need to wait for the sessionHistory to be initialized and there
-    // is no good way to do this. We'll try a wait loop like desktop
-    try {
-      if (!this._webNavigation.sessionHistory)
-        throw new Error();
-    } catch (ex) {
-      if (aCount < 10) {
-        let self = this;
-        this._timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-        this._timer.initWithCallback(function(aTimer) {
-          self._timer = null;
-          self._restoreHistory(aTabData, aCount + 1);
-        }, 100, Ci.nsITimer.TYPE_ONE_SHOT);
-        return;
-      }
-    }
-
-    let history = this._webNavigation.sessionHistory;
-    if (history.count > 0)
-      history.PurgeHistory(history.count);
-    history.QueryInterface(Ci.nsISHistoryInternal);
-
-    // helper hashes for ensuring unique frame IDs and unique document
-    // identifiers.
-    let idMap = { used: {} };
-    let docIdentMap = {};
-
-    for (let i = 0; i < aTabData.entries.length; i++) {
-      if (!aTabData.entries[i].url)
-        continue;
-      history.addEntry(this._deserializeHistoryEntry(aTabData.entries[i], idMap, docIdentMap), true);
-    }
-
-    // We need to force set the active history item and cause it to reload since
-    // we stop the load above
-    let activeIndex = (aTabData.index || aTabData.entries.length) - 1;
-    history.getEntryAtIndex(activeIndex, true);
-    history.QueryInterface(Ci.nsISHistory).reloadCurrentEntry();
-  },
-
-  _deserializeHistoryEntry: function _deserializeHistoryEntry(aEntry, aIdMap, aDocIdentMap) {
-    let shEntry = Cc["@mozilla.org/browser/session-history-entry;1"].createInstance(Ci.nsISHEntry);
-
-    shEntry.setURI(Services.io.newURI(aEntry.url, null, null));
-    shEntry.setTitle(aEntry.title || aEntry.url);
-    if (aEntry.subframe)
-      shEntry.setIsSubFrame(aEntry.subframe || false);
-    shEntry.loadType = Ci.nsIDocShellLoadInfo.loadHistory;
-    if (aEntry.contentType)
-      shEntry.contentType = aEntry.contentType;
-    if (aEntry.referrer)
-      shEntry.referrerURI = Services.io.newURI(aEntry.referrer, null, null);
-
-    if (aEntry.cacheKey) {
-      let cacheKey = Cc["@mozilla.org/supports-PRUint32;1"].createInstance(Ci.nsISupportsPRUint32);
-      cacheKey.data = aEntry.cacheKey;
-      shEntry.cacheKey = cacheKey;
-    }
-
-    if (aEntry.ID) {
-      // get a new unique ID for this frame (since the one from the last
-      // start might already be in use)
-      let id = aIdMap[aEntry.ID] || 0;
-      if (!id) {
-        for (id = Date.now(); id in aIdMap.used; id++);
-        aIdMap[aEntry.ID] = id;
-        aIdMap.used[id] = true;
-      }
-      shEntry.ID = id;
-    }
-
-    if (aEntry.docshellID)
-      shEntry.docshellID = aEntry.docshellID;
-
-    if (aEntry.structuredCloneState && aEntry.structuredCloneVersion) {
-      shEntry.stateData =
-        Cc["@mozilla.org/docshell/structured-clone-container;1"].
-        createInstance(Ci.nsIStructuredCloneContainer);
-
-      shEntry.stateData.initFromBase64(aEntry.structuredCloneState, aEntry.structuredCloneVersion);
-    }
-
-    if (aEntry.scroll) {
-      let scrollPos = aEntry.scroll.split(",");
-      scrollPos = [parseInt(scrollPos[0]) || 0, parseInt(scrollPos[1]) || 0];
-      shEntry.setScrollPosition(scrollPos[0], scrollPos[1]);
-    }
-
-    let childDocIdents = {};
-    if (aEntry.docIdentifier) {
-      // If we have a serialized document identifier, try to find an SHEntry
-      // which matches that doc identifier and adopt that SHEntry's
-      // BFCacheEntry.  If we don't find a match, insert shEntry as the match
-      // for the document identifier.
-      let matchingEntry = aDocIdentMap[aEntry.docIdentifier];
-      if (!matchingEntry) {
-        matchingEntry = {shEntry: shEntry, childDocIdents: childDocIdents};
-        aDocIdentMap[aEntry.docIdentifier] = matchingEntry;
-      } else {
-        shEntry.adoptBFCacheEntry(matchingEntry.shEntry);
-        childDocIdents = matchingEntry.childDocIdents;
-      }
-    }
-
-    if (aEntry.owner_b64) {
-      let ownerInput = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(Ci.nsIStringInputStream);
-      let binaryData = atob(aEntry.owner_b64);
-      ownerInput.setData(binaryData, binaryData.length);
-      let binaryStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(Ci.nsIObjectInputStream);
-      binaryStream.setInputStream(ownerInput);
-      try { // Catch possible deserialization exceptions
-        shEntry.owner = binaryStream.readObject(true);
-      } catch (ex) { dump(ex); }
-    }
-
-    if (aEntry.children && shEntry instanceof Ci.nsISHContainer) {
-      for (let i = 0; i < aEntry.children.length; i++) {
-        if (!aEntry.children[i].url)
-          continue;
-
-        // We're getting sessionrestore.js files with a cycle in the
-        // doc-identifier graph, likely due to bug 698656.  (That is, we have
-        // an entry where doc identifier A is an ancestor of doc identifier B,
-        // and another entry where doc identifier B is an ancestor of A.)
-        //
-        // If we were to respect these doc identifiers, we'd create a cycle in
-        // the SHEntries themselves, which causes the docshell to loop forever
-        // when it looks for the root SHEntry.
-        //
-        // So as a hack to fix this, we restrict the scope of a doc identifier
-        // to be a node's siblings and cousins, and pass childDocIdents, not
-        // aDocIdents, to _deserializeHistoryEntry.  That is, we say that two
-        // SHEntries with the same doc identifier have the same document iff
-        // they have the same parent or their parents have the same document.
-
-        shEntry.AddChild(this._deserializeHistoryEntry(aEntry.children[i], aIdMap, childDocIdents), i);
-      }
-    }
-    
-    return shEntry;
-  },
-
-  sendHistory: function sendHistory() {
-    // We need to package up the session history and send it to the sessionstore
-    let entries = [];
-    let history = docShell.QueryInterface(Ci.nsIWebNavigation).sessionHistory;
-    for (let i = 0; i < history.count; i++) {
-      let entry = this._serializeHistoryEntry(history.getEntryAtIndex(i, false));
-
-      // If someone directly navigates to one of these URLs and they switch to Desktop,
-      // we need to make the page load-able.
-      if (entry.url == "about:home" || entry.url == "about:start") {
-        entry.url = "about:newtab";
-      }
-      entries.push(entry);
-    }
-    let index = history.index + 1;
-    sendAsyncMessage("Content:SessionHistory", { entries: entries, index: index });
-  },
-
-  _serializeHistoryEntry: function _serializeHistoryEntry(aEntry) {
-    let entry = { url: aEntry.URI.spec };
-
-    if (Util.isURLEmpty(entry.url)) {
-      entry.title = Util.getEmptyURLTabTitle();
-    } else {
-      entry.title = aEntry.title;
-    }
-
-    if (!(aEntry instanceof Ci.nsISHEntry))
-      return entry;
-
-    let cacheKey = aEntry.cacheKey;
-    if (cacheKey && cacheKey instanceof Ci.nsISupportsPRUint32 && cacheKey.data != 0)
-      entry.cacheKey = cacheKey.data;
-
-    entry.ID = aEntry.ID;
-    entry.docshellID = aEntry.docshellID;
-
-    if (aEntry.referrerURI)
-      entry.referrer = aEntry.referrerURI.spec;
-
-    if (aEntry.contentType)
-      entry.contentType = aEntry.contentType;
-
-    let x = {}, y = {};
-    aEntry.getScrollPosition(x, y);
-    if (x.value != 0 || y.value != 0)
-      entry.scroll = x.value + "," + y.value;
-
-    if (aEntry.owner) {
-      try {
-        let binaryStream = Cc["@mozilla.org/binaryoutputstream;1"].createInstance(Ci.nsIObjectOutputStream);
-        let pipe = Cc["@mozilla.org/pipe;1"].createInstance(Ci.nsIPipe);
-        pipe.init(false, false, 0, 0xffffffff, null);
-        binaryStream.setOutputStream(pipe.outputStream);
-        binaryStream.writeCompoundObject(aEntry.owner, Ci.nsISupports, true);
-        binaryStream.close();
-
-        // Now we want to read the data from the pipe's input end and encode it.
-        let scriptableStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(Ci.nsIBinaryInputStream);
-        scriptableStream.setInputStream(pipe.inputStream);
-        let ownerBytes = scriptableStream.readByteArray(scriptableStream.available());
-        // We can stop doing base64 encoding once our serialization into JSON
-        // is guaranteed to handle all chars in strings, including embedded
-        // nulls.
-        entry.owner_b64 = btoa(String.fromCharCode.apply(null, ownerBytes));
-      } catch (e) { dump(e); }
-    }
-
-    entry.docIdentifier = aEntry.BFCacheEntry.ID;
-
-    if (aEntry.stateData != null) {
-      entry.structuredCloneState = aEntry.stateData.getDataAsBase64();
-      entry.structuredCloneVersion = aEntry.stateData.formatVersion;
-    }
-
-    if (!(aEntry instanceof Ci.nsISHContainer))
-      return entry;
-
-    if (aEntry.childCount > 0) {
-      entry.children = [];
-      for (let i = 0; i < aEntry.childCount; i++) {
-        let child = aEntry.GetChildAt(i);
-        if (child)
-          entry.children.push(this._serializeHistoryEntry(child));
-        else // to maintain the correct frame order, insert a dummy entry 
-          entry.children.push({ url: "about:blank" });
-
-        // don't try to restore framesets containing wyciwyg URLs (cf. bug 424689 and bug 450595)
-        if (/^wyciwyg:\/\//.test(entry.children[i].url)) {
-          delete entry.children;
-          break;
-        }
-      }
-    }
-
-    return entry;
-  }
-};
-
-WebNavigation.init();
-
-
-let DOMEvents =  {
-  _timeout: null,
-  _sessionEvents: new Set(),
-  _sessionEventMap: {"SessionStore:collectFormdata" : FormData.collect,
-                     "SessionStore:collectScrollPosition" : ScrollPosition.collect},
-
-  init: function() {
-    addEventListener("DOMContentLoaded", this, false);
-    addEventListener("DOMTitleChanged", this, false);
-    addEventListener("DOMLinkAdded", this, false);
-    addEventListener("DOMWillOpenModalDialog", this, false);
-    addEventListener("DOMModalDialogClosed", this, true);
-    addEventListener("DOMWindowClose", this, false);
-    addEventListener("DOMPopupBlocked", this, false);
-    addEventListener("pageshow", this, false);
-    addEventListener("pagehide", this, false);
-
-    addEventListener("input", this, true);
-    addEventListener("change", this, true);
-    addEventListener("scroll", this, true);
-    addMessageListener("SessionStore:restoreSessionTabData", this);
-  },
-
-  receiveMessage: function(message) {
-    switch (message.name) {
-      case "SessionStore:restoreSessionTabData":
-        if (message.json.formdata)
-          FormData.restore(content, message.json.formdata);
-        if (message.json.scroll)
-          ScrollPosition.restore(content, message.json.scroll.scroll);
-        break;
-    }
-  },
-
-  handleEvent: function(aEvent) {
-    let document = content.document;
-    switch (aEvent.type) {
-      case "DOMContentLoaded":
-        if (document.documentURIObject.spec == "about:blank")
-          return;
-
-        sendAsyncMessage("DOMContentLoaded", { });
-
-        // Send the session history now too
-        WebNavigation.sendHistory();
-        break;
-
-      case "pageshow":
-      case "pagehide": {
-        if (aEvent.target.defaultView != content)
-          break;
-
-        let util = aEvent.target.defaultView.QueryInterface(Ci.nsIInterfaceRequestor)
-                                            .getInterface(Ci.nsIDOMWindowUtils);
-
-        let json = {
-          contentWindowWidth: content.innerWidth,
-          contentWindowHeight: content.innerHeight,
-          windowId: util.outerWindowID,
-          persisted: aEvent.persisted
-        };
-
-        // Clear onload focus to prevent the VKB to be shown unexpectingly
-        // but only if the location has really changed and not only the
-        // fragment identifier
-        let contentWindowID = content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
-        if (!WebProgressListener.hashChanged && contentWindowID == util.currentInnerWindowID) {
-          let focusManager = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
-          focusManager.clearFocus(content);
-        }
-
-        sendAsyncMessage(aEvent.type, json);
-        break;
-      }
-
-      case "DOMPopupBlocked": {
-        let util = aEvent.requestingWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                                          .getInterface(Ci.nsIDOMWindowUtils);
-        let json = {
-          windowId: util.outerWindowID,
-          popupWindowURI: {
-            spec: aEvent.popupWindowURI.spec,
-            charset: aEvent.popupWindowURI.originCharset
-          },
-          popupWindowFeatures: aEvent.popupWindowFeatures,
-          popupWindowName: aEvent.popupWindowName
-        };
-
-        sendAsyncMessage("DOMPopupBlocked", json);
-        break;
-      }
-
-      case "DOMTitleChanged":
-        sendAsyncMessage("DOMTitleChanged", { title: document.title });
-        break;
-
-      case "DOMLinkAdded":
-        let target = aEvent.originalTarget;
-        if (!target.href || target.disabled)
-          return;
-
-        let json = {
-          windowId: target.ownerDocument.defaultView.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID,
-          href: target.href,
-          charset: document.characterSet,
-          title: target.title,
-          rel: target.rel,
-          type: target.type
-        };
-        
-        // rel=icon can also have a sizes attribute
-        if (target.hasAttribute("sizes"))
-          json.sizes = target.getAttribute("sizes");
-
-        sendAsyncMessage("DOMLinkAdded", json);
-        break;
-
-      case "DOMWillOpenModalDialog":
-      case "DOMModalDialogClosed":
-      case "DOMWindowClose":
-        let retvals = sendSyncMessage(aEvent.type, { });
-        for (let i in retvals) {
-          if (retvals[i].preventDefault) {
-            aEvent.preventDefault();
-            break;
-          }
-        }
-        break;
-      case "input":
-      case "change":
-        this._sessionEvents.add("SessionStore:collectFormdata");
-        this._sendUpdates();
-        break;
-      case "scroll":
-        this._sessionEvents.add("SessionStore:collectScrollPosition");
-        this._sendUpdates();
-        break;
-    }
-  },
-
-  _sendUpdates: function() {
-    if (!this._timeout) {
-      // Wait a little before sending the message to batch multiple changes.
-      this._timeout = setTimeout(function() {
-        for (let eventType of this._sessionEvents) {
-          sendAsyncMessage(eventType, {
-            data: this._sessionEventMap[eventType](content)
-          });
-        }
-        this._sessionEvents.clear();
-        clearTimeout(this._timeout);
-        this._timeout = null;
-      }.bind(this), 1000);
-    }
-  }
-};
-
-DOMEvents.init();
-
-let ContentScroll =  {
-  // The most recent offset set by APZC for the root scroll frame
-  _scrollOffset: { x: 0, y: 0 },
-
-  init: function() {
-    addMessageListener("Content:SetWindowSize", this);
-
-    addEventListener("pagehide", this, false);
-    addEventListener("MozScrolledAreaChanged", this, false);
-  },
-
-  getScrollOffset: function(aWindow) {
-    let cwu = aWindow.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-    let scrollX = {}, scrollY = {};
-    cwu.getScrollXY(false, scrollX, scrollY);
-    return { x: scrollX.value, y: scrollY.value };
-  },
-
-  getScrollOffsetForElement: function(aElement) {
-    if (aElement.parentNode == aElement.ownerDocument)
-      return this.getScrollOffset(aElement.ownerDocument.defaultView);
-    return { x: aElement.scrollLeft, y: aElement.scrollTop };
-  },
-
-  receiveMessage: function(aMessage) {
-    let json = aMessage.json;
-    switch (aMessage.name) {
-      case "Content:SetWindowSize": {
-        let cwu = content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-        cwu.setCSSViewport(json.width, json.height);
-        sendAsyncMessage("Content:SetWindowSize:Complete", {});
-        break;
-      }
-    }
-  },
-
-  handleEvent: function(aEvent) {
-    switch (aEvent.type) {
-      case "pagehide":
-        this._scrollOffset = { x: 0, y: 0 };
-        break;
-
-      case "MozScrolledAreaChanged": {
-        let doc = aEvent.originalTarget;
-        if (content != doc.defaultView) // We are only interested in root scroll pane changes
-          return;
-
-        sendAsyncMessage("MozScrolledAreaChanged", {
-          width: aEvent.width,
-          height: aEvent.height,
-          left: aEvent.x + content.scrollX
-        });
-
-        // Send event only after painting to make sure content views in the parent process have
-        // been updated.
-        addEventListener("MozAfterPaint", function afterPaint() {
-          removeEventListener("MozAfterPaint", afterPaint, false);
-          sendAsyncMessage("Content:UpdateDisplayPort");
-        }, false);
-
-        break;
-      }
-    }
-  }
-};
-this.ContentScroll = ContentScroll;
-
-ContentScroll.init();
-
-let ContentActive =  {
-  init: function() {
-    addMessageListener("Content:Activate", this);
-    addMessageListener("Content:Deactivate", this);
-  },
-
-  receiveMessage: function(aMessage) {
-    let json = aMessage.json;
-    switch (aMessage.name) {
-      case "Content:Deactivate":
-        docShell.isActive = false;
-        let cwu = content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-        if (json.keepviewport)
-          break;
-        cwu.setDisplayPortForElement(0, 0, 0, 0, content.document.documentElement, 0);
-        break;
-
-      case "Content:Activate":
-        docShell.isActive = true;
-        break;
-    }
-  }
-};
-
-ContentActive.init();
-
-/**
- * Helper class for IndexedDB, child part. Listens using
- * the observer service for events regarding IndexedDB
- * prompts, and sends messages to the parent to actually
- * show the prompts.
- */
-let IndexedDB = {
-  _permissionsPrompt: "indexedDB-permissions-prompt",
-  _permissionsResponse: "indexedDB-permissions-response",
-
-  waitingObservers: [],
-
-  init: function IndexedDBPromptHelper_init() {
-    let os = Services.obs;
-    os.addObserver(this, this._permissionsPrompt, false);
-    addMessageListener("IndexedDB:Response", this);
-  },
-
-  observe: function IndexedDBPromptHelper_observe(aSubject, aTopic, aData) {
-    if (aTopic != this._permissionsPrompt) {
-      throw new Error("Unexpected topic!");
-    }
-
-    let requestor = aSubject.QueryInterface(Ci.nsIInterfaceRequestor);
-    let observer = requestor.getInterface(Ci.nsIObserver);
-
-    let contentWindow = requestor.getInterface(Ci.nsIDOMWindow);
-    let contentDocument = contentWindow.document;
-
-    // Remote to parent
-    sendAsyncMessage("IndexedDB:Prompt", {
-      topic: aTopic,
-      host: contentDocument.documentURIObject.asciiHost,
-      location: contentDocument.location.toString(),
-      data: aData,
-      observerId: this.addWaitingObserver(observer)
-    });
-  },
-
-  receiveMessage: function(aMessage) {
-    let payload = aMessage.json;
-    switch (aMessage.name) {
-      case "IndexedDB:Response":
-        let observer = this.getAndRemoveWaitingObserver(payload.observerId);
-        observer.observe(null, payload.responseTopic, payload.permission);
-    }
-  },
-
-  addWaitingObserver: function(aObserver) {
-    let observerId = 0;
-    while (observerId in this.waitingObservers)
-      observerId++;
-    this.waitingObservers[observerId] = aObserver;
-    return observerId;
-  },
-
-  getAndRemoveWaitingObserver: function(aObserverId) {
-    let observer = this.waitingObservers[aObserverId];
-    delete this.waitingObservers[aObserverId];
-    return observer;
-  }
-};
-
-IndexedDB.init();
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/browser.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/browser.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/browser.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/browser.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,1304 +0,0 @@
-<?xml version="1.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/. -->
-
-<!DOCTYPE bindings [
-  <!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
-  %findBarDTD;
-]>
-
-<bindings id="browser-bindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="local-browser" extends="chrome://global/content/bindings/browser.xml#browser">
-    <implementation type="application/javascript"
-      implements="nsIObserver, nsIDOMEventListener, nsIMessageListener">
-
-      <constructor>
-        <![CDATA[
-          this._frameLoader =
-            this.QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader;
-          this._contentViewManager = null;
-            // TODO: rip out all the code dealing with _contentViewManager because it is
-            // obsolete and dead code. The nsIContentViewManager interface that it used
-            // to point to is being removed in bug 936690.
-
-          let prefService =
-            Components.classes["@mozilla.org/preferences-service;1"]
-                      .getService(Components.interfaces.nsIPrefBranch);
-          this._cacheRatioWidth =
-            Math.max(1, prefService.getIntPref("toolkit.browser.cacheRatioWidth") / 1000);
-          this._cacheRatioHeight =
-            Math.max(1, prefService.getIntPref("toolkit.browser.cacheRatioHeight") / 1000);
-
-          if (this._contentViewPrototype) {
-            this._contentViewPrototype.kDieTime = prefService.getIntPref("toolkit.browser.contentViewExpire");
-          }
-
-          this.messageManager.loadFrameScript("chrome://browser/content/bindings/browser.js", true);
-          this.messageManager.addMessageListener("DOMTitleChanged", this._messageListenerLocal);
-          this.messageManager.addMessageListener("DOMLinkAdded", this._messageListenerLocal);
-          this.messageManager.addMessageListener("pageshow", this._messageListenerLocal);
-          this.messageManager.addMessageListener("pagehide", this._messageListenerLocal);
-          this.messageManager.addMessageListener("DOMPopupBlocked", this._messageListenerLocal);
-          this.messageManager.addMessageListener("MozScrolledAreaChanged", this._messageListenerLocal);
-          this.messageManager.addMessageListener("Content:UpdateDisplayPort", this._messageListenerLocal);
-
-          this._webProgress._init();
-
-          // Remove event listeners added by toolkit <browser> binding.
-          this.removeEventListener("pageshow", this.onPageShow, true);
-          this.removeEventListener("pagehide", this.onPageHide, true);
-          this.removeEventListener("DOMPopupBlocked", this.onPopupBlocked, true);
-
-          this.setAttribute("autoscrollpopup", "autoscrollerid");
-        ]]>
-      </constructor>
-
-      <field name="_searchEngines">[]</field>
-      <property name="searchEngines"
-                onget="return this._searchEngines"
-                readonly="true"/>
-
-      <field name="_documentURI">null</field>
-      <property name="documentURI"
-                onget="return this._documentURI ? this._ios.newURI(this._documentURI, null, null) : null"
-                readonly="true"/>
-
-      <field name="contentWindowId">null</field>
-
-      <field name="_contentTitle">null</field>
-
-      <field name="_ios">
-         Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
-      </field>
-
-      <!--
-        * Point Conversion Routines - browsers may be shifted by UI such that
-        * a client point in an event does not coincide with a css position.
-        * Examples include the notification bar, which pushes the browser down,
-        * or deck movement when forms are positioned above the keyboard.
-        *
-        * Client to browser conversion:
-        *
-        * ptClientToBrowser
-        *  Convert client coordinates in device pixels to page-relative
-        *  coordinates in CSS pixels.
-        *
-        * @param aClientX, aClientY - client coordinates to convert.
-        * @param aIgnoreScroll ignore root frame scroll.
-        * @param aIgnoreScale ignore current scale factor.
-        * @return { x: converted x coordinate, y: converted y coordinate }
-        *
-        * rectClientToBrowser
-        *  Convert a client Rect() in device pixels to page-relative
-        *  coordinates in CSS pixels.
-        *
-        * @param aRect - client Rect to convert.
-        * @param aIgnoreScroll ignore root frame scroll.
-        * @param aIgnoreScale ignore current scale factor.
-        * @return converted Rect()
-        *
-        * ctobx, ctoby
-        *  Convert individual x and y coordinates.
-        *
-        * @param aX or aY - browser coordinate
-        * @param aIgnoreScroll ignore root frame scroll.
-        * @param aIgnoreScale ignore current scale factor.
-        * @return converted coordinate
-        *
-        * Browser to client conversion:
-        *
-        * ptBrowserToClient
-        *  Convert browser coordinates in css pixels to client (screen) coordinates
-        *  in device pixels. Useful in positioning UI elements at event targets.
-        *
-        * @param aBrowserX, aBrowserY - browser coordinates to convert.
-        * @param aIgnoreScroll ignore root frame scroll.
-        * @param aIgnoreScale ignore current scale factor.
-        * @return { x: converted x coordinate, y: converted y coordinate }
-        *
-        * msgBrowserToClient
-        *  Converts a message manager message with coordinates stored in
-        *  aMessage.json.xPos, aMessage.json.yPos.
-        *
-        * @param aMessage - message manager message
-        * @param aIgnoreScroll ignore root frame scroll.
-        * @param aIgnoreScale ignore current scale factor.
-        * @return { x: converted x coordinate, y: converted y coordinate }
-        *
-        * rectBrowserToClient
-        *  Converts a rect (left, top, right, bottom).
-        *
-        * @param aRect - rect to convert
-        * @param aIgnoreScroll ignore root frame scroll.
-        * @param aIgnoreScale ignore current scale factor.
-        * @return { left:, top:, right:, bottom: }
-        *
-        * btocx, btocy
-        *  Convert individual x and y coordinates.
-        *
-        * @param aX or aY - client coordinate
-        * @param aIgnoreScroll ignore root frame scroll.
-        * @param aIgnoreScale ignore current scale factor.
-        * @return converted coordinate
-      -->
-      <method name="ptClientToBrowser">
-        <parameter name="aClientX"/>
-        <parameter name="aClientY"/>
-        <parameter name="aIgnoreScroll"/>
-        <parameter name="aIgnoreScale"/>
-        <body>
-          <![CDATA[
-            let ignoreScroll = aIgnoreScroll || false;
-            let ignoreScale = aIgnoreScale || false;
-
-            let bcr = this.getBoundingClientRect();
-
-            let scrollX = 0;
-            let scrollY = 0;
-            if (!ignoreScroll) {
-              let scroll = this.getRootView().getPosition();
-              scrollX = scroll.x;
-              scrollY = scroll.y;
-            }
-
-            let scale = 1;
-            if (!ignoreScale) {
-              scale = this.scale;
-            }
-
-            return {
-              x: (aClientX - bcr.left) / scale + scrollX,
-              y: (aClientY - bcr.top) / scale + scrollY
-            };
-          ]]>
-        </body>
-      </method>
-
-      <method name="rectClientToBrowser">
-        <parameter name="aClientRect"/>
-        <parameter name="aIgnoreScroll"/>
-        <parameter name="aIgnoreScale"/>
-        <body>
-          <![CDATA[
-            let ignoreScroll = aIgnoreScroll || false;
-            let ignoreScale = aIgnoreScale || false;
-
-            let scrollX = 0;
-            let scrollY = 0;
-            if (!ignoreScroll) {
-              let scroll = this.getRootView().getPosition();
-              scrollX = scroll.x;
-              scrollY = scroll.y;
-            }
-
-            let scale = 1;
-            if (!ignoreScale) {
-              scale = this.scale;
-            }
-
-            let bcr = this.getBoundingClientRect();
-            let clientRect = Rect.fromRect(aClientRect);
-            return new Rect(
-              (clientRect.x - bcr.left) / scale + scrollX,
-              (clientRect.y - bcr.top) / scale + scrollY,
-              clientRect.width / scale,
-              clientRect.height / scale
-            );
-          ]]>
-        </body>
-      </method>
-
-      <method name="ctobx">
-        <parameter name="aX"/>
-        <parameter name="aIgnoreScroll"/>
-        <parameter name="aIgnoreScale"/>
-        <body>
-          <![CDATA[
-            let y = 0;
-            let result = this.ptClientToBrowser(aX, y, aIgnoreScroll, aIgnoreScale);
-            return result.x;
-          ]]>
-        </body>
-      </method>
-
-      <method name="ctoby">
-        <parameter name="aY"/>
-        <parameter name="aIgnoreScroll"/>
-        <parameter name="aIgnoreScale"/>
-        <body>
-          <![CDATA[
-            let x = 0;
-            let result = this.ptClientToBrowser(x, aY, aIgnoreScroll, aIgnoreScale);
-            return result.y;
-          ]]>
-        </body>
-      </method>
-
-      <method name="ptBrowserToClient">
-        <parameter name="aBrowserX"/>
-        <parameter name="aBrowserY"/>
-        <parameter name="aIgnoreScroll"/>
-        <parameter name="aIgnoreScale"/>
-        <body>
-          <![CDATA[
-            let ignoreScroll = aIgnoreScroll || false;
-            let ignoreScale = aIgnoreScale || false;
-
-            let bcr = this.getBoundingClientRect();
-
-            let scrollX = 0;
-            let scrollY = 0;
-            if (!ignoreScroll) {
-              let scroll = this.getRootView().getPosition();
-              scrollX = scroll.x;
-              scrollY = scroll.y;
-            }
-
-            let scale = 1;
-            if (!ignoreScale) {
-              scale = this.scale;
-            }
-
-            return {
-              x: (aBrowserX * scale - scrollX + bcr.left),
-              y: (aBrowserY * scale - scrollY + bcr.top)
-            };
-          ]]>
-        </body>
-      </method>
-
-      <method name="msgBrowserToClient">
-        <parameter name="aMessage"/>
-        <parameter name="aIgnoreScroll"/>
-        <parameter name="aIgnoreScale"/>
-        <body>
-          <![CDATA[
-            let x = aMessage.json.xPos;
-            let y = aMessage.json.yPos;
-            return this.ptBrowserToClient(x, y, aIgnoreScroll, aIgnoreScale);
-          ]]>
-        </body>
-      </method>
-
-      <method name="rectBrowserToClient">
-        <parameter name="aRect"/>
-        <parameter name="aIgnoreScroll"/>
-        <parameter name="aIgnoreScale"/>
-        <body>
-          <![CDATA[
-            let left = aRect.left;
-            let top = aRect.top;
-            let right = aRect.right;
-            let bottom = aRect.bottom;
-            let a = this.ptBrowserToClient(left, top, aIgnoreScroll, aIgnoreScale);
-            let b = this.ptBrowserToClient(right, bottom, aIgnoreScroll, aIgnoreScale);
-            return {
-              left: a.x,
-              top: a.y,
-              right: b.x,
-              bottom: b.y
-            };
-          ]]>
-        </body>
-      </method>
-
-      <method name="btocx">
-        <parameter name="aX"/>
-        <parameter name="aIgnoreScroll"/>
-        <parameter name="aIgnoreScale"/>
-        <body>
-          <![CDATA[
-            let y = 0;
-            let result = this.ptBrowserToClient(aX, y, aIgnoreScroll, aIgnoreScale);
-            return result.x;
-          ]]>
-        </body>
-      </method>
-
-      <method name="btocy">
-        <parameter name="aY"/>
-        <parameter name="aIgnoreScroll"/>
-        <parameter name="aIgnoreScale"/>
-        <body>
-          <![CDATA[
-            let x = 0;
-            let result = this.ptBrowserToClient(x, aY, aIgnoreScroll, aIgnoreScale);
-            return result.y;
-          ]]>
-        </body>
-      </method>
-
-      <property name="scale">
-        <getter><![CDATA[
-          let cwu = this.contentDocument
-                        .defaultView
-                        .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                        .getInterface(Components.interfaces.nsIDOMWindowUtils);
-          let res = {};
-          cwu.getResolution(res);
-          return res.value;
-        ]]></getter>
-      </property>
-
-      <field name="_messageListenerLocal"><![CDATA[
-        ({
-          self: this,
-          receiveMessage: function receiveMessage(aMessage) {
-            let self = this.self;
-            let json = aMessage.json;
-
-            switch (aMessage.name) {
-              case "DOMPopupBlocked":
-                self.onPopupBlocked(aMessage);
-                break;
-
-              case "pageshow":
-                self.onPageShow(aMessage);
-
-                if (!self.mIconURL && self._documentURI) {
-                  let iconURL = null;
-                  if (self.shouldLoadFavicon()) {
-                    // Use documentURI in the favicon construction so that we
-                    // do the right thing with about:-style error pages.  Bug 515188
-                    iconURL = self.documentURI.prePath + "/favicon.ico";
-                  }
-                  self.loadFavicon(iconURL, null);
-                }
-                break;
-
-              case "pagehide":
-                self.onPageHide(aMessage);
-                break;
-
-              case "DOMTitleChanged":
-                self._contentTitle = json.title;
-                break;
-
-              case "DOMLinkAdded":
-                // ignore results from subdocuments
-                if (json.windowId != self.contentWindowId)
-                  return;
-
-                let linkType = self._getLinkType(json);
-                switch(linkType) {
-                  case "icon":
-                    self.loadFavicon(json.href, json.charset);
-                    break;
-                  case "search":
-                    self._searchEngines.push({ title: json.title, href: json.href });
-                    break;
-                }
-                break;
-
-              case "MozScrolledAreaChanged": {
-                self._contentDocumentWidth = json.width;
-                self._contentDocumentHeight = json.height;
-                self._contentDocumentLeft = (json.left < 0) ? json.left : 0;
-
-                // Recalculate whether the visible area is actually in bounds
-                let view = self.getRootView();
-                view.scrollBy(0, 0);
-                break;
-              }
-
-              case "Content:UpdateDisplayPort": {
-                // Recalculate whether the visible area is actually in bounds
-                let view = self.getRootView();
-                view.scrollBy(0, 0);
-                view._updateCacheViewport();
-                break;
-              }
-            }
-          }
-        })
-      ]]></field>
-
-      <method name="loadFavicon">
-        <parameter name="aURL"/>
-        <parameter name="aCharset"/>
-        <body><![CDATA[
-            try { // newURI call is throwing for chrome URI
-              let iconURI = this._ios.newURI(aURL, aCharset, null);
-              if (gFaviconService.isFailedFavicon(iconURI))
-                return;
-
-              gFaviconService.setAndFetchFaviconForPage(this.currentURI, iconURI, true,
-                                                        gFaviconService.FAVICON_LOAD_NON_PRIVATE);
-              this.mIconURL = iconURI.spec;
-            } catch (e) {
-              this.mIconURL = null;
-            }
-        ]]></body>
-      </method>
-
-      <method name="shouldLoadFavicon">
-        <body><![CDATA[
-          let docURI = this.documentURI;
-          return (docURI && ("schemeIs" in docURI) &&
-                  (docURI.schemeIs("http") || docURI.schemeIs("https")));
-        ]]></body>
-      </method>
-
-      <method name="_getLinkType">
-        <parameter name="aLink" />
-        <body><![CDATA[
-          let type = "";
-          if (/\bicon\b/i.test(aLink.rel)) {
-            type = "icon";
-          }
-          else if (/\bsearch\b/i.test(aLink.rel) && aLink.type && aLink.title) {
-            let linkType = aLink.type.replace(/^\s+|\s*(?:;.*)?$/g, "").toLowerCase();
-            if (linkType == "application/opensearchdescription+xml" && /^(?:https?|ftp):/i.test(aLink.href)) {
-              type = "search";
-            }
-          }
-
-          return type;
-        ]]></body>
-      </method>
-
-      <field name="_webProgress"><![CDATA[
-        ({
-          _browser: this,
-
-          _init: function() {
-            this._browser.messageManager.addMessageListener("Content:StateChange", this);
-            this._browser.messageManager.addMessageListener("Content:LocationChange", this);
-            this._browser.messageManager.addMessageListener("Content:SecurityChange", this);
-          },
-
-          receiveMessage: function(aMessage) {
-            let json = aMessage.json;
-            switch (aMessage.name) {
-              case "Content:StateChange":
-                this._browser.updateWindowId(json.contentWindowId);
-                break;
-
-              case "Content:LocationChange":
-                try {
-                  let locationURI = this._browser._ios.newURI(json.location, null, null);
-                  this._browser.webNavigation._currentURI = locationURI;
-                  this._browser.webNavigation.canGoBack = json.canGoBack;
-                  this._browser.webNavigation.canGoForward = json.canGoForward;
-                  this._browser._charset = json.charset;
-                } catch(e) {}
-
-                if (this._browser.updateWindowId(json.contentWindowId)) {
-                  this._browser._documentURI = json.documentURI;
-                  this._browser._searchEngines = [];
-                }
-                break;
-
-              case "Content:SecurityChange":
-                let serhelper = Components.classes["@mozilla.org/network/serialization-helper;1"]
-                                .getService(Components.interfaces.nsISerializationHelper);
-                let SSLStatus = json.SSLStatusAsString ? serhelper.deserializeObject(json.SSLStatusAsString) : null;
-                if (SSLStatus) {
-                  SSLStatus.QueryInterface(Components.interfaces.nsISSLStatus);
-                  // We must check the Extended Validation (EV) state here, on the chrome
-                  // process, because NSS is needed for that determination.
-                  if (SSLStatus && SSLStatus.isExtendedValidation) {
-                      json.state |= Components.interfaces.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL;
-                  }
-                }
-
-                let data = this._getIdentityData(SSLStatus);
-                this._browser.updateWindowId(json.contentWindowId);
-                break;
-            }
-          },
-
-          /**
-           * Helper to parse out the important parts of the SSL cert for use in constructing
-           * identity UI strings
-           */
-          _getIdentityData: function(status) {
-            let result = {};
-
-            if (status) {
-              let cert = status.serverCert;
-
-              // Human readable name of Subject
-              result.subjectOrg = cert.organization;
-
-              // SubjectName fields, broken up for individual access
-              if (cert.subjectName) {
-                result.subjectNameFields = {};
-                cert.subjectName.split(",").forEach(function(v) {
-                  var field = v.split("=");
-                  if (field[1])
-                    this[field[0]] = field[1];
-                }, result.subjectNameFields);
-
-                // Call out city, state, and country specifically
-                result.city = result.subjectNameFields.L;
-                result.state = result.subjectNameFields.ST;
-                result.country = result.subjectNameFields.C;
-              }
-
-              // Human readable name of Certificate Authority
-              result.caOrg =  cert.issuerOrganization || cert.issuerCommonName;
-
-              if (!this._overrideService)
-                this._overrideService = Components.classes["@mozilla.org/security/certoverride;1"]
-                                        .getService(Components.interfaces.nsICertOverrideService);
-
-              // Check whether this site is a security exception.
-              let currentURI = this._browser.webNavigation._currentURI;
-	      if (currentURI) {
-                result.isException = this._overrideService.hasMatchingOverride(currentURI.asciiHost, currentURI.port, cert, {}, {});
-              } else {
-	        result.isException = false;
-	      }
-            }
-
-            return result;
-          }
-        })
-      ]]></field>
-
-      <property name="webProgress"
-                readonly="true"
-                onget="return null"/>
-
-      <method name="onPageShow">
-        <parameter name="aMessage"/>
-        <body>
-          <![CDATA[
-            this.attachFormFill();
-            if (this.pageReport) {
-              var json = aMessage.json;
-              var i = 0;
-              while (i < this.pageReport.length) {
-                // Filter out irrelevant reports.
-                if (this.pageReport[i].requestingWindowId == json.windowId)
-                  i++;
-                else
-                  this.pageReport.splice(i, 1);
-              }
-              if (this.pageReport.length == 0) {
-                this.pageReport = null;
-                this.updatePageReport();
-              }
-            }
-         ]]>
-        </body>
-      </method>
-
-      <method name="onPageHide">
-        <parameter name="aMessage"/>
-        <body>
-          <![CDATA[
-            if (this.pageReport) {
-              this.pageReport = null;
-              this.updatePageReport();
-            }
-            // Delete the feeds cache if we're hiding the topmost page
-            // (as opposed to one of its iframes).
-            if (this.feeds && aMessage.target == this)
-              this.feeds = null;
-
-            this._contentWindowWidth = aMessage.json.contentWindowWidth;
-            this._contentWindowHeight = aMessage.json.contentWindowHeight;
-         ]]>
-        </body>
-      </method>
-
-      <method name="onPopupBlocked">
-        <parameter name="aMessage"/>
-        <body>
-          <![CDATA[
-            if (!this.pageReport) {
-              this.pageReport = [];
-            }
-
-            let json = aMessage.json;
-            // XXX Replacing requestingWindow && requestingDocument affects
-            // http://mxr.mozilla.org/mozilla-central/source/browser/base/content/browser.js#500
-            var obj = {
-              requestingWindowId: json.windowId,
-              popupWindowURI: this._ios.newURI(json.popupWindowURI.spec, json.popupWindowURI.charset, null),
-              popupWindowFeatures: json.popupWindowFeatures,
-              popupWindowName: json.popupWindowName
-            };
-
-            this.pageReport.push(obj);
-            this.pageReport.reported = false;
-            this.updatePageReport();
-          ]]>
-        </body>
-      </method>
-
-      <field name="_frameLoader">null</field>
-      <field name="_contentViewManager">null</field>
-
-      <!--
-       * Returns the current content viewport bounds in browser coordinates
-       * taking into account zoom and scroll.
-       *
-       * @return Rect()
-      -->
-      <property name="contentViewportBounds">
-        <getter><![CDATA[
-          return this.rectClientToBrowser(this.getBoundingClientRect());
-        ]]></getter>
-      </property>
-
-      <!-- Dimensions of content window -->
-      <field name="_contentWindowWidth">0</field>
-      <field name="_contentWindowHeight">0</field>
-      <property name="contentWindowWidth"
-                onget="return this._contentWindowWidth;"
-                readonly="true"/>
-      <property name="contentWindowHeight"
-                onget="return this._contentWindowHeight;"
-                readonly="true"/>
-
-      <!-- Dimensions of content document -->
-      <field name="_contentDocumentWidth">0</field>
-      <field name="_contentDocumentHeight">0</field>
-      <property name="contentDocumentWidth"
-                onget="return this._contentDocumentWidth;"
-                readonly="true"/>
-      <property name="contentDocumentHeight"
-                onget="return this._contentDocumentHeight;"
-                readonly="true"/>
-
-      <!-- If this attribute is negative this indicate the document is rtl and
-           some operations like panning or calculating the cache area should
-           take it into account. This is useless for non-remote browser -->
-      <field name="_contentDocumentLeft">0</field>
-
-      <!-- These counters are used to update the cached viewport after they reach a certain
-           threshold when scrolling -->
-      <field name="_cacheRatioWidth">1</field>
-      <field name="_cacheRatioHeight">1</field>
-
-      <!-- Used in remote tabs only. -->
-      <method name="_updateCSSViewport">
-        <body/>
-      </method>
-
-      <!-- Sets size of CSS viewport, which affects how page is layout. -->
-      <method name="setWindowSize">
-        <parameter name="width"/>
-        <parameter name="height"/>
-        <body>
-          <![CDATA[
-            this._contentWindowWidth = width;
-            this._contentWindowHeight = height;
-            this.messageManager.sendAsyncMessage("Content:SetWindowSize", {
-              width: width,
-              height: height
-            });
-
-            // If the window size is changing, make sure the displayport is in sync
-            this.getRootView()._updateCacheViewport();
-          ]]>
-        </body>
-      </method>
-
-      <method name="getRootView">
-        <body>
-          <![CDATA[
-            return this._contentView;
-          ]]>
-        </body>
-      </method>
-
-      <field name="_contentViewPrototype"><![CDATA[
-        ({
-          _scrollbox: null,
-
-          init: function(aElement) {
-            this._scrollbox = aElement.scrollBoxObject;
-          },
-
-          isRoot: function() {
-            return false;
-          },
-
-          scrollBy: function(x, y) {
-            this._scrollbox.scrollBy(x,y);
-          },
-
-          scrollTo: function(x, y) {
-            this._scrollbox.scrollTo(x,y);
-          },
-
-          getPosition: function() {
-            let x = {}, y = {};
-            this._scrollbox.getPosition(x, y);
-            return { x: x.value, y: y.value };
-          }
-        })
-        ]]>
-      </field>
-
-      <method name="getViewAt">
-        <parameter name="x"/>
-        <parameter name="y"/>
-        <body>
-          <![CDATA[
-            let cwu = this.contentDocument.defaultView.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                                                      .getInterface(Components.interfaces.nsIDOMWindowUtils);
-            let elt = cwu.elementFromPoint(x, y, false, false);
-
-            while (elt && !elt.scrollBoxObject)
-              elt = elt.parentNode;
- 
-            if (!elt)
-              return this._contentView;
-
-            let cv = Object.create(this._contentViewPrototype);
-            cv.init(elt);
-            return cv;
-          ]]>
-        </body>
-      </method>
-
-      <field name="_contentView"><![CDATA[
-        ({
-          self: this,
-
-          _updateCacheViewport: function() {
-          },
-
-          isRoot: function() {
-            return true;
-          },
-
-          scrollBy: function(x, y) {
-            let self = this.self;
-            self.contentWindow.scrollBy(x, y);
-          },
-
-          scrollTo: function(x, y) {
-            let self = this.self;
-            x = Math.floor(Math.max(0, Math.min(self.contentDocumentWidth,  x)));
-            y = Math.floor(Math.max(0, Math.min(self.contentDocumentHeight, y)));
-            self.contentWindow.scrollTo(x, y);
-          },
-
-          getPosition: function() {
-            let self = this.self;
-            let scrollX = {}, scrollY = {};
-            let cwu = self.contentWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                      getInterface(Components.interfaces.nsIDOMWindowUtils);
-            cwu.getScrollXY(false, scrollX, scrollY);
-            return { x: scrollX.value, y: scrollY.value };
-          },
-
-          toString: function() {
-            return "[View Local]";
-          }
-        })
-        ]]>
-      </field>
-
-      <method name="updateWindowId">
-         <parameter name="aNewId"/>
-         <body><![CDATA[
-            if (this.contentWindowId != aNewId) {
-               this.contentWindowId = aNewId;
-               return true;
-            }
-            return false;
-         ]]></body>
-      </method>
-
-      <field name="_active">false</field>
-      <property name="active" onget="return this._active;">
-        <setter><![CDATA[
-          // Do not change displayport on local tabs!
-          this._active = val;
-          this.docShellIsActive = this._active;
-        ]]></setter>
-      </property>
-    </implementation>
-  </binding>
-
-  <binding id="remote-browser" extends="#local-browser">
-    <implementation type="application/javascript" implements="nsIObserver, nsIDOMEventListener, nsIMessageListener">
-      <property name="autoscrollEnabled">
-        <getter>
-          <![CDATA[
-            throw "autoscrollEnabled: Supports Remote?";
-          ]]>
-        </getter>
-      </property>
-
-      <property name="docShell"
-                readonly="true">
-         <getter><![CDATA[
-            return {
-               forcedCharset : this._charset,
-               parentCharset : "",
-               parentCharsetSource : 0
-            }
-         ]]></getter>
-      </property>
-
-      <field name="_contentTitle">null</field>
-
-      <property name="contentTitle"
-                onget="return this._contentTitle;"
-                readonly="true"/>
-
-      <field name="_remoteWebNavigation">null</field>
-      <property name="webNavigation" readonly="true">
-        <getter>
-          <![CDATA[
-            if (!this._remoteWebNavigation) {
-              let jsm = "resource://gre/modules/RemoteWebNavigation.jsm";
-              let RemoteWebNavigation = Components.utils.import(jsm, {}).RemoteWebNavigation;
-              this._remoteWebNavigation = new RemoteWebNavigation(this);
-            }
-            return this._remoteWebNavigation;
-          ]]>
-        </getter>
-      </property>
-
-      <property name="contentWindow"
-                readonly="true"
-                onget="return null"/>
-
-      <property name="sessionHistory"
-                onget="return null"
-                readonly="true"/>
-
-      <property name="markupDocumentViewer"
-                onget="return null"
-                readonly="true"/>
-
-      <property name="contentViewerEdit"
-                onget="return null"
-                readonly="true"/>
-
-      <property name="contentViewerFile"
-                onget="return null"
-                readonly="true"/>
-
-      <field name="_charset"></field>
-
-      <constructor>
-        <![CDATA[
-          this.messageManager.addMessageListener("scroll", this._messageListenerRemote);
-        ]]>
-      </constructor>
-
-      <field name="scrollSync">true</field>
-
-      <field name="_messageListenerRemote"><![CDATA[
-        ({
-          self: this,
-          receiveMessage: function receiveMessage(aMessage) {
-            let self = this.self;
-            let json = aMessage.json;
-
-            switch (aMessage.name) {
-              case "scroll":
-	        if (!json.isRoot)
-		  return;
-                if (!self.scrollSync)
-                  return;
-                this.doScroll(json.scrollOffset.x, json.scrollOffset.y, 0);
-                break;
-           }
-         },
-
-         doScroll: function doScroll(aX, aY, aCount) {
-            let self = this.self;
-
-            // Use floor so that we always guarantee top-left corner of content is visible.
-            let view = self.getRootView();
-            view.scrollTo(Math.floor(aX * self.scale), Math.floor(aY * self.scale));
-
-            let position = view.getPosition();
-            if ((position.x != aX * self.scale || position.y != aY * self.scale) && aCount < 3) {
-              setTimeout((function() {
-                 this.doScroll(aX, aY, ++aCount);
-              }).bind(this), 0);
-            }
-         }
-       })
-      ]]></field>
-
-      <!-- Keep a store of temporary content views. -->
-      <field name="_contentViews">({})</field>
-
-      <!-- There is a point before a page has loaded where a root content view
-           may not exist. We use this so that we don't have to worry about doing
-           an if check every time we want to scroll. -->
-      <field name="_contentNoop"><![CDATA[
-        ({
-          _updateCacheViewport: function() {},
-          _getViewportSize: function() {},
-
-          isRoot: function() {
-            return true;
-          },
-
-          _scale: 1,
-          _setScale: function(scale) {},
-          scrollBy: function(x, y) {},
-          scrollTo: function(x, y) {},
-          getPosition: function() {
-            return { x: 0, y: 0 };
-          }
-        })
-      ]]></field>
-
-      <field name="_contentViewPrototype"><![CDATA[
-        ({
-          self: this,
-          _id: null,
-          _contentView: null,
-          _timeout: null,
-          _pixelsPannedSinceRefresh: { x: 0, y: 0 },
-          _lastPanTime: 0,
-
-          kDieTime: 3000,
-
-          /** 
-           * Die if we haven't panned in a while.
-           *
-           * Since we keep a map of active content views, we need to regularly
-           * check if they are necessary so that every single thing the user
-           * pans is not kept in memory forever.
-           */
-          _dieIfOld: function() {
-            if (Date.now() - this._lastPanTime >= this.kDieTime)
-              this._die();
-            else
-              // This doesn't need to be exact, just be sure to clean up at some point.
-              this._timeout = setTimeout(this._dieIfOld.bind(this), this.kDieTime);
-          },
-
-          /** Cleanup after ourselves. */
-          _die: function() {
-            let timeout = this._timeout;
-            if (timeout) {
-              clearTimeout(timeout);
-              this._timeout = null;
-            }
-
-            if (this._contentView && Math.abs(this._pixelsPannedSinceRefresh) > 0)
-              this._updateCacheViewport();
-
-            // We expect contentViews to contain our ID. If not, something bad
-            // happened.
-            delete this.self._contentViews[this._id];
-          },
-
-          /**
-           * Given the cache size and the viewport size, this determines where the cache
-           * should start relative to the scroll position. This adjusts the position based
-           * on which direction the user is panning, so that we use our cache as
-           * effectively as possible.
-           *
-           * @param aDirection Negative means user is panning to the left or above
-           *                   Zero means user did not pan
-           *                   Positive means user is panning to the right or below
-           * @param aViewportSize The width or height of the viewport
-           * @param aCacheSize The width or height of the displayport
-           */
-          _getRelativeCacheStart: function(aDirection, aViewportSize, aCacheSize) {
-            // Remember that this is relative to the viewport scroll position.
-            // Let's assume we are thinking about the y-axis.
-            // The extreme cases:
-            // |0| would mean that there is no content available above
-            // |aViewportSize - aCacheSize| would mean no content available below
-            //
-            // Taking the average of the extremes puts equal amounts of cache on the
-            // top and bottom of the viewport. If we think of this like a weighted
-            // average, .5 is the sweet spot where equals amounts of content are
-            // above and below the visible area.
-            //
-            // This weight is therefore how much of the cache is above (or to the
-            // left) the visible area.
-            let cachedAbove = .5;
-
-            // If panning down, leave only 25% of the non-visible cache above.
-            if (aDirection > 0)
-              cachedAbove = .25;
-
-            // If panning up, Leave 75% of the non-visible cache above.
-            if (aDirection < 0)
-              cachedAbove = .75;
-
-            return (aViewportSize - aCacheSize) * cachedAbove;
-          },
-
-          /** Determine size of the pixel cache. */
-          _getCacheSize: function(viewportSize) {
-            let self = this.self;
-            let contentView = this._contentView;
-
-            let cacheWidth = self._cacheRatioWidth * viewportSize.width;
-            let cacheHeight = self._cacheRatioHeight * viewportSize.height;
-            let contentSize = this._getContentSize();
-            let contentWidth = contentSize.width;
-            let contentHeight = contentSize.height;
-
-            // There are common cases, such as long skinny pages, where our cache size is
-            // bigger than our content size. In those cases, we take that sliver of leftover
-            // space and apply it to the other dimension.
-            if (contentWidth < cacheWidth) {
-              cacheHeight += (cacheWidth - contentWidth) * cacheHeight / cacheWidth;
-              cacheWidth = contentWidth;
-            } else if (contentHeight < cacheHeight) {
-              cacheWidth += (cacheHeight - contentHeight) * cacheWidth / cacheHeight;
-              cacheHeight = contentHeight;
-            }
-
-            return { width: cacheWidth, height: cacheHeight };
-          },
-
-          _sendDisplayportUpdate: function(scrollX, scrollY) {
-            let self = this.self;
-            if (!self.active)
-               return;
-
-            let contentView = this._contentView;
-            let viewportSize = this._getViewportSize();
-            let cacheSize = this._getCacheSize(viewportSize);
-            let cacheX = this._getRelativeCacheStart(this._pixelsPannedSinceRefresh.x, viewportSize.width, cacheSize.width) + contentView.scrollX;
-            let cacheY = this._getRelativeCacheStart(this._pixelsPannedSinceRefresh.y, viewportSize.height, cacheSize.height) + contentView.scrollY;
-            let contentSize = this._getContentSize();
-
-            // Use our pixels efficiently and don't try to cache things outside of content
-            // boundaries (The left bound can be negative because of RTL).
-
-            let rootScale = self.scale;
-            let leftBound = self._contentDocumentLeft * rootScale;
-            let bounds = new Rect(leftBound, 0, contentSize.width, contentSize.height);
-            let displayport = new Rect(cacheX, cacheY, cacheSize.width, cacheSize.height);
-            displayport.translateInside(bounds);
-
-            self.messageManager.sendAsyncMessage("Content:SetCacheViewport", {
-              scrollX: Math.round(scrollX) / rootScale,
-              scrollY: Math.round(scrollY) / rootScale,
-              x: Math.round(displayport.x) / rootScale,
-              y: Math.round(displayport.y) / rootScale,
-              w: Math.round(displayport.width) / rootScale,
-              h: Math.round(displayport.height) / rootScale,
-              scale: rootScale,
-              id: contentView.id
-            });
-
-            this._pixelsPannedSinceRefresh.x = 0;
-            this._pixelsPannedSinceRefresh.y = 0;
-          },
-
-          _updateCSSViewport: function() {
-            let contentView = this._contentView;
-            this._sendDisplayportUpdate(contentView.scrollX,
-                                        contentView.scrollY);
-          },
-
-          /**
-           * The cache viewport is what parts of content is cached in the parent process for
-           * fast scrolling. This syncs that up with the current projection viewport.
-           */
-          _updateCacheViewport: function() {
-            // Do not update scroll values for content.
-            if (this.isRoot())
-              this._sendDisplayportUpdate(-1, -1);
-            else {
-              let contentView = this._contentView;
-              this._sendDisplayportUpdate(contentView.scrollX,
-                                          contentView.scrollY);
-            }
-          },
-
-          _getContentSize: function() {
-            let self = this.self;
-            return { width: this._contentView.contentWidth,
-                     height: this._contentView.contentHeight };
-          },
-
-          _getViewportSize: function() {
-            let self = this.self;
-            if (this.isRoot()) {
-              let bcr = self.getBoundingClientRect();
-              return { width: bcr.width, height: bcr.height };
-            } else {
-              return { width: this._contentView.viewportWidth,
-                       height: this._contentView.viewportHeight };
-            }
-          },
-
-          init: function(contentView) {
-            let self = this.self;
-
-            this._contentView = contentView;
-            this._id = contentView.id;
-            this._scale = 1;
-            self._contentViews[this._id] = this;
-
-            if (!this.isRoot()) {
-              // Non-root content views are short lived.
-              this._timeout = setTimeout(this._dieIfOld.bind(this), this.kDieTime);
-              // This iframe may not have a display port yet, so build up a cache
-              // immediately.
-              this._updateCacheViewport();
-            }
-          },
-
-          isRoot: function() {
-            return this.self._contentViewManager.rootContentView == this._contentView;
-          },
-
-          scrollBy: function(x, y) {
-            let self = this.self;
-
-            // Bounding content rectangle is in device pixels
-            let contentView = this._contentView;
-            let viewportSize = this._getViewportSize();
-            let contentSize = this._getContentSize();
-            // Calculate document dimensions in device pixels
-            let scrollRangeX = contentSize.width - viewportSize.width;
-            let scrollRangeY = contentSize.height - viewportSize.height;
-
-            let leftOffset = self._contentDocumentLeft * this._scale;
-            x = Math.floor(Math.max(leftOffset, Math.min(scrollRangeX + leftOffset, contentView.scrollX + x))) - contentView.scrollX;
-            y = Math.floor(Math.max(0, Math.min(scrollRangeY, contentView.scrollY + y))) - contentView.scrollY;
-
-            if (x == 0 && y == 0)
-              return;
-
-            contentView.scrollBy(x, y);
-
-            this._lastPanTime = Date.now();
-
-            this._pixelsPannedSinceRefresh.x += x;
-            this._pixelsPannedSinceRefresh.y += y;
-            if (Math.abs(this._pixelsPannedSinceRefresh.x) > 20 ||
-                Math.abs(this._pixelsPannedSinceRefresh.y) > 20)
-              this._updateCacheViewport();
-          },
-
-          scrollTo: function(x, y) {
-            let contentView = this._contentView;
-            this.scrollBy(x - contentView.scrollX, y - contentView.scrollY);
-          },
-
-          _setScale: function _setScale(scale) {
-            this._scale = scale;
-            this._contentView.setScale(scale, scale);
-          },
-
-          getPosition: function() {
-            let contentView = this._contentView;
-            return { x: contentView.scrollX, y: contentView.scrollY };
-          }
-        })
-        ]]>
-      </field>
-
-      <!-- The ratio of CSS pixels to device pixels. -->
-      <property name="scale">
-        <getter><![CDATA[
-          return this.getRootView()._scale;
-        ]]></getter>
-        <setter><![CDATA[
-          if (val <= 0 || val == this.scale)
-            return;
-
-          let rootView = this.getRootView();
-          rootView._setScale(val);
-
-          return val;
-        ]]></setter>
-      </property>
-
-      <method name="_getView">
-        <parameter name="contentView"/>
-        <body>
-          <![CDATA[
-            if (!contentView) return null;
-
-            // See if we have cached it.
-            let id = contentView.id;
-            let jsContentView = this._contentViews[id];
-            if (jsContentView) {
-              // Content view may have changed if it became inactive for a
-              // little while.
-              jsContentView._contentView = contentView;
-              return jsContentView;
-            }
-
-            // Not cached. Create it.
-            jsContentView = Object.create(this._contentViewPrototype);
-            jsContentView.init(contentView);
-            return jsContentView;
-          ]]>
-        </body>
-      </method>
-
-      <!-- Get root content view. -->
-      <method name="getRootView">
-        <body>
-          <![CDATA[
-            let contentView = this._contentViewManager.rootContentView;
-            return this._getView(contentView) || this._contentNoop;
-          ]]>
-        </body>
-      </method>
-
-      <!-- Get contentView for position (x, y) relative to the browser element -->
-      <method name="getViewAt">
-        <parameter name="x"/>
-        <parameter name="y"/>
-        <body>
-          <![CDATA[
-            let manager = this._contentViewManager;
-            let contentView = manager.getContentViewsIn(x, y, 0, 0, 0, 0)[0] ||
-                              manager.rootContentView;
-            return this._getView(contentView);
-          ]]>
-        </body>
-      </method>
-
-      <!-- Synchronize the CSS viewport with the projection viewport. -->
-      <method name="_updateCSSViewport">
-        <body>
-          <![CDATA[
-            let rootView = this.getRootView();
-            rootView._updateCSSViewport();
-          ]]>
-        </body>
-      </method>
-
-      <property name="active" onget="return this._active;">
-        <setter><![CDATA[
-            this._active = val;
-            let keepVisible = false;
-            this.messageManager.sendAsyncMessage((val ? "Content:Activate" : "Content:Deactivate"), { keepviewport: keepVisible });
-            if (val)
-              this.getRootView()._updateCacheViewport();
-         ]]></setter>
-      </property>
-
-      <field name="_remoteFinder">null</field>
-      <property name="finder" readonly="true">
-        <getter><![CDATA[
-          if (!this._remoteFinder) {
-            let jsm = "resource://gre/modules/RemoteFinder.jsm";
-            let RemoteFinder = Cu.import(jsm, {}).RemoteFinder;
-            this._remoteFinder = new RemoteFinder(this);
-          }
-          return this._remoteFinder;
-        ]]></getter>
-      </property>
-    </implementation>
-
-  </binding>
-
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/circularprogress.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/circularprogress.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/circularprogress.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/circularprogress.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-<?xml version="1.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/. -->
-
-<bindings xmlns="http://www.mozilla.org/xbl"
-          xmlns:xbl="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:html="http://www.w3.org/1999/xhtml">
-  <binding id="circular-progress-indicator">
-    <resources>
-      <stylesheet src="chrome://browser/skin/circularprogress.css"/>
-    </resources>
-
-    <content>
-      <xul:stack>
-        <xul:toolbarbutton anonid="progressButton"
-                           class="circularprogressindicator-progressButton"/>
-        <html:div anonid="progressTrack"
-                  xbl:inherits="progress"
-                  class="circularprogressindicator-progressTrack">
-        </html:div>
-        <html:canvas anonid="progressRing"
-                     xbl:inherits="progress"
-                     class="circularprogressindicator-progressRing"
-                     width="40"
-                     height="40">
-        </html:canvas>
-        <html:div anonid="progressNotification"
-                  xbl:inherits="progress"
-                  class="circularprogressindicator-progressNotification">
-        </html:div>
-      </xul:stack>
-    </content>
-
-    <implementation>
-      <field name="_progressCanvas">
-        document.getAnonymousElementByAttribute(this, "anonid", "progressRing");
-      </field>
-      <field name="_progressNotification">
-        document.getAnonymousElementByAttribute(this, "anonid",
-            "progressNotification");
-      </field>
-      <field name="_progressCircleCtx">null</field>
-      <field name="_img">null</field>
-      <constructor>
-        <![CDATA[
-          this._progressCircleCtx = this._progressCanvas.getContext('2d');
-        ]]>
-      </constructor>
-      <method name="updateProgress">
-        <parameter name="percentComplete"/>
-        <body>
-          <![CDATA[
-            const PROGRESS_RING_IMG = "chrome://browser/skin/images/progresscircle.png";
-
-            // show ring background even if % is 0.
-            this.setAttribute("progress", percentComplete);
-
-            let startAngle = 1.5 * Math.PI;
-            let endAngle = startAngle + (2 * Math.PI * (percentComplete / 100));
-
-            if (!this._img) {
-              this._img = new Image();
-              this._img.onload = () => {
-                this.updateProgress(this.getAttribute("progress"))
-              }
-              this._img.src = PROGRESS_RING_IMG;
-            }
-            else if (this._img.complete) {
-              let ctx = this._progressCircleCtx;
-              ctx.clearRect(0, 0,
-                this._progressCanvas.width, this._progressCanvas.height);
-
-              // Save the state, so we can undo the clipping
-              ctx.save();
-
-              ctx.beginPath();
-              let center = this._progressCanvas.width / 2;
-              ctx.arc(center, center, center, startAngle, endAngle, false);
-              ctx.lineTo(center, center);
-              ctx.closePath();
-              ctx.clip();
-
-              // Draw circle image.
-              ctx.translate(center, center);
-              ctx.rotate(endAngle);
-              ctx.drawImage(this._img, -center, -center);
-
-              ctx.restore();
-            } else {
-              //  Image is still loading
-            }
-            return [startAngle, endAngle];
-          ]]>
-        </body>
-      </method>
-      <method name="reset">
-        <body>
-          <![CDATA[
-            if(this._img && !this._img.complete) {
-              // cancel any pending updateProgress
-              this._img.onload = () => {};
-            }
-            this._progressCircleCtx.clearRect(0, 0,
-              this._progressCanvas.width, this._progressCanvas.height);
-            this.removeAttribute("progress");
-          ]]>
-        </body>
-      </method>
-      <method name="notify">
-        <body>
-          <![CDATA[
-            this.addEventListener("transitionend", this._onNotificationEnd);
-
-            this._progressNotification.classList.add(
-                "progressNotification-active");
-          ]]>
-        </body>
-      </method>
-      <method name="_onNotificationEnd">
-        <body>
-          <![CDATA[
-            this.removeEventListener("transitionend", this._onNotificationEnd);
-
-            this._progressNotification.classList.remove(
-                "progressNotification-active");
-          ]]>
-        </body>
-      </method>
-    </implementation>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/console.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/console.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/console.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/console.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.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/. -->
-
-<!DOCTYPE bindings [
-<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-%browserDTD;
-]>
-
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <binding id="error" extends="chrome://browser/content/bindings/bindings.xml#richlistitem">
-    <content orient="vertical">
-      <xul:hbox class="console-row-internal-box" flex="1">
-        <xul:vbox class="console-row-content" flex="1">
-          <xul:hbox class="console-row-msg" align="start">
-            <xul:label class="label title" xbl:inherits="value=typetext"/>
-            <xul:description class="console-error-msg title" xbl:inherits="xbl:text=msg" flex="1"/>
-          </xul:hbox>
-          <xul:hbox class="console-row-file" xbl:inherits="hidden=hideSource">
-            <xul:label class="label title" value="&consoleErrFile.label;"/>
-            <xul:label class="title" xbl:inherits="value=href" crop="right"/>
-            <xul:spacer flex="1"/>
-            <xul:hbox class="lineNumberRow" xbl:inherits="line">
-              <xul:label class="label title" value="&consoleErrLine.label;"/>
-              <xul:label class="label title" xbl:inherits="value=line"/>
-            </xul:hbox>
-          </xul:hbox>
-          <xul:vbox class="console-row-code" xbl:inherits="hidden=hideCode">
-            <xul:label class="monospace console-code" xbl:inherits="value=code" crop="end"/>
-          </xul:vbox>
-        </xul:vbox>
-      </xul:hbox>
-    </content>
-  </binding>
-  <binding id="message" extends="chrome://browser/content/bindings/bindings.xml#richlistitem">
-    <content>
-      <xul:hbox class="console-internal-box" flex="1">
-        <xul:vbox class="console-row-content" flex="1">
-          <xul:vbox class="console-row-msg" flex="1">
-            <xul:description class="console-msg-text title" xbl:inherits="xbl:text=msg"/>
-          </xul:vbox>
-        </xul:vbox>
-      </xul:hbox>
-    </content>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/cssthrobber.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/cssthrobber.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/cssthrobber.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/cssthrobber.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<?xml version="1.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/. -->
-
-<!-- When not in use, make sure you disable this or it will run continuously
-     in the background sucking up cpu. -->
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <binding id="cssthrobberBinding" extends="xul:box">
-    <content>
-      <html:div anonid="container" id="container" class="progressContainer">
-        <html:div class="progressBall" />
-        <html:div class="progressBall" />
-        <html:div class="progressBall" />
-        <html:div class="progressBall" />
-        <html:div class="progressBall" />
-      </html:div>
-    </content>
-    <implementation>
-      <field name="container" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "container");</field>
-      <property name="enabled">
-        <setter>
-          <![CDATA[
-            if (val) {
-              this.container.setAttribute("enabled", true);
-            } else {
-              this.container.removeAttribute("enabled");
-            }
-            return val;
-          ]]>
-        </setter>
-      </property>
-    </implementation>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/dialog.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/dialog.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/dialog.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/dialog.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.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/. -->
-
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="dialog">
-    <content xbl:inherits="orient, closebutton" flex="1">
-      <children/>
-    </content>
-
-    <implementation implements="nsIDOMEventListener">
-      <field name="arguments"/>
-      <field name="parent"/>
-      <property name="_scrollbox" readonly="true" onget="return this.getElementsByTagName('scrollbox')[0];"/>
-
-      <constructor><![CDATA[
-        this._closed = false;
-        if (this.hasAttribute("script")) {
-          try {
-            Services.scriptloader.loadSubScript(this.getAttribute("script"), this);
-          } catch(e) {
-            throw("Dialog : Unable to load script : " + this.getAttribute("script") + "\n");
-          }
-        }
-        window.addEventListener("unload", this, true);
-
-        let scrollbox = this._scrollbox;
-        if (scrollbox) {
-          window.addEventListener("resize", this, true);
-          scrollbox.addEventListener("overflow", this, true);
-        }
-        setTimeout(this.load.bind(this), 0);
-      ]]></constructor>
-
-      <method name="handleEvent">
-        <parameter name="aEvent"/>
-        <body><![CDATA[
-          switch(aEvent.type) {
-            case "unload":
-              if (aEvent.originalTarget == document)
-                this._removeDialog();
-              break;
-
-            case "resize":
-            case "overflow":
-              let scrollbox = this._scrollbox;
-              let style = document.defaultView.getComputedStyle(scrollbox, null);
-              let newHeight =  Math.ceil(scrollbox.firstChild.getBoundingClientRect().height) + 
-                               parseInt(style.marginTop) +
-                               parseInt(style.marginBottom);
-              scrollbox.style.minHeight = Math.min(window.innerHeight / 2, newHeight) + "px";
-              break;
-          }
-        ]]></body>
-      </method>
-
-      <method name="load">
-        <body><![CDATA[
-          if (this.hasAttribute("onload")) {
-            let func = new Function(this.getAttribute("onload"));
-            func.call(this);
-          }
-        ]]></body>
-      </method>
-
-      <method name="close">
-        <body><![CDATA[
-          if (this.hasAttribute("onclose")) {
-            let func = new Function(this.getAttribute("onclose"));
-            func.call(this);
-          }
-          this._removeDialog();
-        ]]></body>
-      </method>
-
-      <method name="_removeDialog">
-        <body><![CDATA[
-          window.removeEventListener("unload", this, true);
-          let scrollbox = this._scrollbox;
-          if (scrollbox) {
-            window.removeEventListener("resize", this, true);
-            scrollbox.removeEventListener("overflow", this, true);
-          }
-
-          this.parentNode.parentNode.removeChild(this.parentNode);
-          this._closed = true;
-
-          // emit DOMModalDialogClosed event
-          let event = document.createEvent("Events");
-          event.initEvent("DOMModalDialogClosed", true, false);
-          let dispatcher = this.parent || getBrowser();
-          dispatcher.dispatchEvent(event);
-        ]]></body>
-      </method>
-      
-      <method name="waitForClose">
-        <body><![CDATA[
-          while (!this._closed)
-            Services.tm.currentThread.processNextEvent(true);
-        ]]></body>
-      </method>
-    </implementation>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/flyoutpanel.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/flyoutpanel.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/flyoutpanel.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/flyoutpanel.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:xbl="http://www.mozilla.org/xbl">
-
-  <binding id="flyoutpanelBinding" extends="xul:box">
-    <resources>
-      <stylesheet src="chrome://browser/skin/flyoutpanel.css"/>
-    </resources>
-
-    <content>
-      <xul:vbox class="flyoutpanel-wrapper">
-        <xul:hbox class="flyoutpanel-header" align="top">
-          <xul:toolbarbutton class="flyout-close-button"
-                             command="cmd_flyout_back"
-                             xbl:inherits="command"/>
-          <xul:label class="flyout-header-label" xbl:inherits="value=headertext"/>
-        </xul:hbox>
-        <xul:scrollbox class="flyoutpanel-contents" observes="bcast_preciseInput" flex="1" orient="vertical">
-          <children/>
-        </xul:scrollbox>
-      </xul:vbox>
-    </content>
-
-    <implementation>
-      <constructor>
-        <![CDATA[
-            this.setAttribute("isSlidOut", true);
-        ]]>
-      </constructor>
-      <method name="_onAfterSlideOut">
-        <body>
-          <![CDATA[
-            this.removeAttribute("isSlidingOut");
-            this.setAttribute("isSlidOut", true);
-            this.removeAttribute("visible");
-            this.removeEventListener("transitionend", this._onAfterSlideOut);
-          ]]>
-        </body>
-      </method>
-
-      <method name="_onAfterSlideIn">
-        <body>
-          <![CDATA[
-            this.removeAttribute("isSlidingIn");
-            this.setAttribute("isSlidIn", true);
-            this.removeEventListener("transitionend", this._onAfterSlideIn);
-          ]]>
-        </body>
-      </method>
-
-      <method name="hide">
-        <body>
-          <![CDATA[
-            if (this.hasAttribute("isSlidingOut")
-             || this.hasAttribute("isSlidOut")) {
-              return;
-            }
-
-            if (this.hasAttribute("isSlidingIn")) {
-              this._onAfterSlideIn();
-            }
-
-            this.addEventListener("transitionend", this._onAfterSlideOut);
-            this.classList.remove("flyoutpanel-slide-in");
-            this.setAttribute("isSlidingOut", true);
-            this.removeAttribute("isSlidIn");
-
-            let event = document.createEvent("Events");
-            event.initEvent("MozFlyoutPanelHiding", true, false);
-            this.dispatchEvent(event);
-          ]]>
-        </body>
-      </method>
-
-      <method name="show">
-        <body>
-          <![CDATA[
-            if (this.hasAttribute("isSlidingIn")
-             || this.hasAttribute("isSlidIn")) {
-              return;
-            }
-
-            if (this.hasAttribute("isSlidingOut")) {
-              this._onAfterSlideOut();
-            }
-
-            let event = document.createEvent("Events");
-            event.initEvent("MozFlyoutPanelShowing", true, false);
-            this.dispatchEvent(event);
-            this.classList.add("flyoutpanel-slide-in");
-
-            this.setAttribute("isSlidingIn", true);
-            this.setAttribute("visible", true);
-            this.removeAttribute("isSlidOut");
-          ]]>
-        </body>
-      </method>
-
-      <field name="anonScrollBox" readonly="true"><![CDATA[
-        // Expose the anyonymous scrollbox so ScrollUtils.getScrollboxFromElement can find it.
-        document.getAnonymousElementByAttribute(this, "class", "flyoutpanel-contents");
-      ]]></field>
-    </implementation>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/grid.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/grid.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/grid.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/grid.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,1125 +0,0 @@
-<?xml version="1.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/. -->
-
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="richgrid"
-           extends="chrome://global/content/bindings/general.xml#basecontrol">
-
-    <content>
-      <html:div id="grid-div" anonid="grid" class="richgrid-grid" xbl:inherits="compact">
-        <children/>
-      </html:div>
-    </content>
-
-    <implementation implements="nsIDOMXULSelectControlElement">
-      <property name="_grid" readonly="true" onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'grid');"/>
-
-      <property name="isBound" readonly="true" onget="return !!this._grid"/>
-      <property name="isArranging" readonly="true" onget="return !!this._scheduledArrangeItemsTimerId"/>
-
-      <field name="controller">null</field>
-
-      <!-- collection of child items excluding empty tiles -->
-      <property name="items" readonly="true" onget="return this.querySelectorAll('richgriditem[value]');"/>
-      <property name="itemCount" readonly="true" onget="return this.items.length;"/>
-
-      <method name="isItem">
-        <parameter name="anItem"/>
-        <body>
-          <![CDATA[
-            // only non-empty child nodes are considered items
-            return anItem && anItem.hasAttribute("value") &&
-                   anItem.parentNode == this;
-          ]]>
-        </body>
-      </method>
-
-      <!-- nsIDOMXULMultiSelectControlElement (not fully implemented) -->
-
-      <method name="clearSelection">
-        <body>
-          <![CDATA[
-            // 'selection' and 'selected' are confusingly overloaded here
-            // as richgrid is adopting multi-select behavior, but select/selected are already being
-            // used to describe triggering the default action of a tile
-            if (this._selectedItem){
-              this._selectedItem.removeAttribute("selected");
-              this._selectedItem = null;
-            }
-
-            for (let childItem of this.selectedItems) {
-              childItem.removeAttribute("selected");
-            }
-          ]]>
-        </body>
-      </method>
-
-      <method name="toggleItemSelection">
-        <parameter name="anItem"/>
-        <body>
-          <![CDATA[
-            if (!this.isItem(anItem))
-              return;
-
-            let wasSelected = anItem.selected;
-            if ("single" == this.getAttribute("seltype")) {
-              this.clearSelection();
-            }
-            this._selectedItem = wasSelected ? null : anItem;
-            if (wasSelected)
-              anItem.removeAttribute("selected");
-            else
-              anItem.setAttribute("selected", true);
-            this._fireEvent("selectionchange");
-          ]]>
-        </body>
-      </method>
-
-      <method name="selectItem">
-        <parameter name="anItem"/>
-        <body>
-          <![CDATA[
-            if (!this.isItem(anItem))
-              return;
-            let wasSelected = anItem.selected,
-                isSingleMode = ("single" == this.getAttribute("seltype"));
-            if (isSingleMode) {
-              this.clearSelection();
-            }
-            this._selectedItem = anItem;
-            if (wasSelected) {
-              return;
-            }
-            anItem.setAttribute("selected", true);
-            if (isSingleMode) {
-              this._fireEvent("select");
-            } else {
-              this._fireEvent("selectionchange");
-            }
-          ]]>
-        </body>
-      </method>
-
-      <method name="selectNone">
-        <body>
-          <![CDATA[
-            let selectedCount = this.selectedItems.length;
-            this.clearSelection();
-            if (selectedCount && "single" != this.getAttribute("seltype")) {
-              this._fireEvent("selectionchange");
-            }
-          ]]>
-        </body>
-      </method>
-
-      <method name="handleItemClick">
-        <parameter name="aItem"/>
-        <parameter name="aEvent"/>
-        <body>
-          <![CDATA[
-            if (!(this.isBound && this.isItem(aItem)))
-              return;
-
-            if ("single" == this.getAttribute("seltype")) {
-              // we'll republish this as a selectionchange event on the grid
-              aEvent.stopPropagation();
-              this.selectItem(aItem);
-            }
-
-            if (this.controller && this.controller.handleItemClick)
-              this.controller.handleItemClick(aItem, aEvent);
-          ]]>
-        </body>
-      </method>
-
-      <method name="handleItemContextMenu">
-        <parameter name="aItem"/>
-        <parameter name="aEvent"/>
-        <body>
-          <![CDATA[
-            if (!this.isBound || this.noContext || !this.isItem(aItem))
-              return;
-            // we'll republish this as a selectionchange event on the grid
-            aEvent.stopPropagation();
-            this.toggleItemSelection(aItem);
-          ]]>
-        </body>
-      </method>
-
-      <property name="contextSetName" readonly="true"
-                onget="return this.getAttribute('set-name');"/>
-
-      <property name="contextActions">
-        <getter>
-          <![CDATA[
-            // return the subset of verbs that apply to all selected tiles
-            let tileNodes = this.selectedItems;
-            if (!tileNodes.length) {
-              return new Set();
-            }
-
-            // given one or more sets of values,
-            // return a set with only those values present in each
-            let initialItem = tileNodes[0];
-
-            let verbSet = new Set(initialItem.contextActions);
-            for (let i=1; i<tileNodes.length; i++){
-              let set = tileNodes[i].contextActions;
-              for (let item of verbSet) {
-                if (!set.has(item)){
-                  verbSet.delete(item);
-                }
-              }
-            }
-            // add the clear-selection button if more than one tiles are selected
-            if (tileNodes.length > 1) {
-              verbSet.add('clear');
-            }
-            // returns Set
-            return verbSet;
-          ]]>
-        </getter>
-      </property>
-
-    <!-- nsIDOMXULSelectControlElement -->
-
-      <field name="_selectedItem">null</field>
-      <property name="selectedItem" onget="return this._selectedItem;">
-        <setter>
-          <![CDATA[
-            this.selectItem(val);
-          ]]>
-        </setter>
-      </property>
-
-      <!-- partial implementation of multiple selection interface -->
-      <property name="selectedItems">
-        <getter>
-          <![CDATA[
-            return this.querySelectorAll("richgriditem[value][selected]");
-          ]]>
-        </getter>
-      </property>
-
-      <property name="selectedIndex">
-        <getter>
-          <![CDATA[
-            return this.getIndexOfItem(this._selectedItem);
-          ]]>
-        </getter>
-        <setter>
-          <![CDATA[
-            if (val >= 0) {
-              let selected = this.getItemAtIndex(val);
-              this.selectItem(selected);
-            } else {
-              this.selectNone();
-            }
-          ]]>
-        </setter>
-      </property>
-
-      <method name="appendItem">
-        <parameter name="aLabel"/>
-        <parameter name="aValue"/>
-        <parameter name="aSkipArrange"/>
-        <body>
-          <![CDATA[
-            let item = this.nextSlot();
-            item.setAttribute("value", aValue);
-            item.setAttribute("label", aLabel);
-
-            if (!aSkipArrange)
-              this.arrangeItems();
-            return item;
-          ]]>
-        </body>
-      </method>
-
-      <method name="_slotValues">
-        <body><![CDATA[
-          return Array.map(this.children, (cnode) => cnode.getAttribute("value"));
-        ]]></body>
-      </method>
-
-      <property name="minSlots" readonly="true"
-                onget="return this.getAttribute('minSlots') || 3;"/>
-
-      <method name="clearAll">
-        <parameter name="aSkipArrange"/>
-        <body>
-          <![CDATA[
-            const ELEMENT_NODE_TYPE = Components.interfaces.nsIDOMNode.ELEMENT_NODE;
-            let slotCount = this.minSlots;
-            let childIndex = 0;
-            let child = this.firstChild;
-            while (child) {
-              // remove excess elements and non-element nodes
-              if (child.nodeType !== ELEMENT_NODE_TYPE || childIndex+1 > slotCount) {
-                let orphanNode = child;
-                child = orphanNode.nextSibling;
-                this.removeChild(orphanNode);
-                continue;
-              }
-              if (child.hasAttribute("value")) {
-                this._releaseSlot(child);
-              }
-              child = child.nextSibling;
-              childIndex++;
-            }
-            // create our quota of item slots
-            for (let count = this.childElementCount; count < slotCount; count++) {
-              this.appendChild( this._createItemElement() );
-            }
-
-            if (!aSkipArrange)
-              this.arrangeItems();
-          ]]>
-        </body>
-      </method>
-
-      <method name="_slotAt">
-        <parameter name="anIndex"/>
-        <body>
-          <![CDATA[
-            // backfill with new slots as necessary
-            let count = Math.max(1+anIndex, this.minSlots) - this.childElementCount;
-            for (; count > 0; count--) {
-              this.appendChild( this._createItemElement() );
-            }
-            return this.children[anIndex];
-          ]]>
-        </body>
-      </method>
-
-      <method name="nextSlot">
-        <body>
-          <![CDATA[
-            if (!this.itemCount) {
-              return this._slotAt(0);
-            }
-            let lastItem = this.items[this.itemCount-1];
-            let nextIndex = 1 + Array.indexOf(this.children, lastItem);
-            return this._slotAt(nextIndex);
-          ]]>
-        </body>
-      </method>
-
-      <method name="_releaseSlot">
-        <parameter name="anItem"/>
-        <body>
-          <![CDATA[
-            // Flush out data and state attributes so we can recycle this slot/element
-            let exclude = { value: 1, tiletype: 1 };
-            let attrNames = [attr.name for (attr of anItem.attributes)];
-            for (let attrName of attrNames) {
-              if (!(attrName in exclude))
-                anItem.removeAttribute(attrName);
-            }
-            // clear out inline styles
-            anItem.removeAttribute("style");
-            // finally clear the value, which should apply the richgrid-empty-item binding
-            anItem.removeAttribute("value");
-          ]]>
-        </body>
-      </method>
-
-      <method name="insertItemAt">
-        <parameter name="anIndex"/>
-        <parameter name="aLabel"/>
-        <parameter name="aValue"/>
-        <parameter name="aSkipArrange"/>
-        <body>
-          <![CDATA[
-            anIndex = Math.min(this.itemCount, anIndex);
-            let insertedItem;
-            let existing = this.getItemAtIndex(anIndex);
-            if (existing) {
-              // use an empty slot if we have one, otherwise insert it
-              let childIndex = Array.indexOf(this.children, existing);
-              if (childIndex > 0 && !this.children[childIndex-1].hasAttribute("value")) {
-                insertedItem = this.children[childIndex-1];
-              } else {
-                insertedItem = this.insertBefore(this._createItemElement(),existing);
-              }
-            }
-            if (!insertedItem) {
-              insertedItem = this._slotAt(anIndex);
-            }
-            insertedItem.setAttribute("value", aValue);
-            insertedItem.setAttribute("label", aLabel);
-            if (!aSkipArrange)
-              this.arrangeItems();
-            return insertedItem;
-          ]]>
-        </body>
-      </method>
-
-      <method name="removeItemAt">
-        <parameter name="anIndex"/>
-        <parameter name="aSkipArrange"/>
-        <body>
-          <![CDATA[
-            let item = this.getItemAtIndex(anIndex);
-            if (!item)
-              return null;
-            return this.removeItem(item, aSkipArrange);
-          ]]>
-        </body>
-      </method>
-
-      <method name="removeItem">
-        <parameter name="aItem"/>
-        <parameter name="aSkipArrange"/>
-        <body>
-          <![CDATA[
-            if (!this.isItem(aItem))
-              return null;
-
-            let removal = this.removeChild(aItem);
-            // replace the slot if necessary
-            if (this.childElementCount < this.minSlots) {
-              this.nextSlot();
-            }
-
-            if (removal && !aSkipArrange)
-                this.arrangeItems();
-
-            // note that after removal the node is unbound
-            // so none of the richgriditem binding methods & properties are available
-            return removal;
-          ]]>
-        </body>
-      </method>
-
-      <method name="getIndexOfItem">
-        <parameter name="anItem"/>
-        <body>
-          <![CDATA[
-            if (!this.isItem(anItem))
-              return -1;
-
-            return Array.indexOf(this.items, anItem);
-          ]]>
-        </body>
-      </method>
-
-      <method name="getItemAtIndex">
-        <parameter name="anIndex"/>
-        <body>
-          <![CDATA[
-            if (!this._isIndexInBounds(anIndex))
-              return null;
-            return this.items.item(anIndex);
-          ]]>
-        </body>
-      </method>
-
-      <method name="getItemsByUrl">
-        <parameter name="aUrl"/>
-        <body>
-          <![CDATA[
-            return this.querySelectorAll('richgriditem[value="'+aUrl+'"]');
-          ]]>
-        </body>
-      </method>
-
-    <!-- Interface for offsetting selection and checking bounds -->
-
-      <property name="isSelectionAtStart" readonly="true"
-                onget="return this.selectedIndex == 0;"/>
-
-      <property name="isSelectionAtEnd" readonly="true"
-                onget="return this.selectedIndex == (this.itemCount - 1);"/>
-
-      <property name="isSelectionInStartRow" readonly="true">
-        <getter>
-          <![CDATA[
-            return this.selectedIndex < this.columnCount;
-          ]]>
-        </getter>
-      </property>
-
-      <property name="isSelectionInEndRow" readonly="true">
-        <getter>
-          <![CDATA[
-            let lowerBound = (this.rowCount - 1) * this.columnCount;
-            let higherBound = this.rowCount * this.columnCount;
-
-            return this.selectedIndex >= lowerBound &&
-                   this.selectedIndex < higherBound;
-          ]]>
-        </getter>
-      </property>
-
-      <method name="offsetSelection">
-        <parameter name="aOffset"/>
-        <body>
-          <![CDATA[
-            let newIndex = this.selectedIndex + aOffset;
-            if (this._isIndexInBounds(newIndex))
-              this.selectedIndex = newIndex;
-          ]]>
-        </body>
-      </method>
-
-      <method name="offsetSelectionByRow">
-        <parameter name="aRowOffset"/>
-        <body>
-          <![CDATA[
-            let newIndex = this.selectedIndex + (this.columnCount * aRowOffset);
-            if (this._isIndexInBounds(newIndex))
-              this.selectedIndex -= this.columnCount;
-          ]]>
-        </body>
-      </method>
-
-      <!-- Interface for grid layout management -->
-
-      <field name="_rowCount">0</field>
-      <property name="rowCount" readonly="true" onget="return this._rowCount;"/>
-      <field name="_columnCount">0</field>
-      <property name="columnCount" readonly="true" onget="return this._columnCount;"/>
-      <property name="_containerSize">
-        <getter><![CDATA[
-            // return the rect that represents our bounding box
-            let containerNode = this.hasAttribute("flex") ? this : this.parentNode;
-            let rect = containerNode.getBoundingClientRect();
-            // return falsy if the container has no height
-            return rect.height ? {
-              width: rect.width,
-              height: rect.height
-            } : null;
-        ]]></getter>
-      </property>
-
-      <property name="_itemSize">
-        <getter><![CDATA[
-            // return the dimensions that represent an item in the grid
-
-            // grab tile/item dimensions
-            this._tileSizes = this._getTileSizes();
-
-            let type = this.getAttribute("tiletype") || "default";
-            let dims = this._tileSizes && this._tileSizes[type];
-            if (!dims) {
-              throw new Error("Missing tile sizes for '" + type + "' type");
-            }
-            return dims;
-        ]]></getter>
-      </property>
-
-      <!-- do conditions allow layout/arrange of the grid? -->
-      <property name="_canLayout" readonly="true">
-        <getter>
-          <![CDATA[
-            if (!(this._grid && this._grid.style)) {
-               return false;
-            }
-
-            let gridItemSize = this._itemSize;
-
-            // If we don't have valid item dimensions we can't arrange yet
-            if (!(gridItemSize && gridItemSize.height)) {
-              return false;
-            }
-
-            let container = this._containerSize;
-            // If we don't have valid container dimensions we can't arrange yet
-            if (!(container && container.height)) {
-              return false;
-            }
-            return true;
-          ]]>
-        </getter>
-      </property>
-
-      <field name="_scheduledArrangeItemsTimerId">null</field>
-      <field name="_scheduledArrangeItemsTries">0</field>
-      <field name="_maxArrangeItemsRetries">5</field>
-
-      <method name="_scheduleArrangeItems">
-        <parameter name="aTime"/>
-        <body>
-          <![CDATA[
-              // cap the number of times we reschedule calling arrangeItems
-              if (
-                  !this._scheduledArrangeItemsTimerId &&
-                  this._maxArrangeItemsRetries > this._scheduledArrangeItemsTries
-              ) {
-                this._scheduledArrangeItemsTimerId = setTimeout(this.arrangeItems.bind(this), aTime || 0);
-                // track how many times we've attempted arrangeItems
-                this._scheduledArrangeItemsTries++;
-              }
-          ]]>
-        </body>
-      </method>
-
-      <method name="arrangeItems">
-        <body>
-          <![CDATA[
-            if (this.hasAttribute("deferlayout")) {
-              return;
-            }
-            if (!this._canLayout) {
-              // try again later
-              this._scheduleArrangeItems();
-              return;
-            }
-
-            let itemDims = this._itemSize;
-            let containerDims = this._containerSize;
-            let slotsCount = this.childElementCount;
-
-            // reset the flags
-            if (this._scheduledArrangeItemsTimerId) {
-              clearTimeout(this._scheduledArrangeItemsTimerId);
-              delete this._scheduledArrangeItemsTimerId;
-            }
-            this._scheduledArrangeItemsTries = 0;
-
-            // clear explicit width and columns before calculating from avail. height again
-            let gridStyle = this._grid.style;
-            gridStyle.removeProperty("min-width");
-            gridStyle.removeProperty("-moz-column-count");
-
-            if (this.hasAttribute("vertical")) {
-              this._columnCount = Math.floor(containerDims.width / itemDims.width) || 1;
-              this._rowCount = Math.floor(slotsCount / this._columnCount);
-            } else {
-              // rows attribute is fixed number of rows
-              let maxRows = Math.floor(containerDims.height / itemDims.height);
-              this._rowCount = this.getAttribute("rows") ?
-                                  // fit indicated rows when possible
-                                  Math.min(maxRows, this.getAttribute("rows")) :
-                                  // at least 1 row
-                                  Math.min(maxRows, slotsCount) || 1;
-
-              // columns attribute is min number of cols
-              this._columnCount = Math.ceil(slotsCount / this._rowCount) || 1;
-              if (this.getAttribute("columns")) {
-                this._columnCount = Math.max(this._columnCount, this.getAttribute("columns"));
-              }
-            }
-
-            // width is typically auto, cap max columns by truncating items collection
-            // or, setting max-width style property with overflow hidden
-            if (this._columnCount) {
-              gridStyle.MozColumnCount = this._columnCount;
-            }
-            this._fireEvent("arranged");
-          ]]>
-        </body>
-      </method>
-      <method name="arrangeItemsNow">
-        <body>
-          <![CDATA[
-            this.removeAttribute("deferlayout");
-            // cancel any scheduled arrangeItems and reset flags
-            if (this._scheduledArrangeItemsTimerId) {
-              clearTimeout(this._scheduledArrangeItemsTimerId);
-              delete this._scheduledArrangeItemsTimerId;
-            }
-            this._scheduledArrangeItemsTries = 0;
-            // pass over any params
-            return this.arrangeItems.apply(this, arguments);
-          ]]>
-        </body>
-      </method>
-
-      <!-- Inteface to suppress selection events -->
-      <property name="suppressOnSelect"
-                  onget="return this.getAttribute('suppressonselect') == 'true';"
-                  onset="this.setAttribute('suppressonselect', val);"/>
-      <property name="noContext"
-                  onget="return this.hasAttribute('nocontext');"
-                  onset="if (val) this.setAttribute('nocontext', true); else this.removeAttribute('nocontext');"/>
-      <property name="crossSlideBoundary"
-          onget="return this.hasAttribute('crossslideboundary')? this.getAttribute('crossslideboundary') : Infinity;"/>
-
-    <!-- Internal methods -->
-      <field name="_xslideHandler"/>
-      <constructor>
-        <![CDATA[
-          // create our quota of item slots
-          for (let count = this.childElementCount, slotCount = this.minSlots;
-              count < slotCount; count++) {
-            this.appendChild( this._createItemElement() );
-          }
-          if (this.controller && this.controller.gridBoundCallback != undefined)
-            this.controller.gridBoundCallback();
-          // XXX This event was never actually implemented (bug 223411).
-          let event = document.createEvent("Events");
-          event.initEvent("contentgenerated", true, true);
-          this.dispatchEvent(event);
-        ]]>
-      </constructor>
-
-      <destructor>
-        <![CDATA[
-          this.disableCrossSlide();
-        ]]>
-      </destructor>
-      <method name="enableCrossSlide">
-        <body>
-          <![CDATA[
-            // set up cross-slide gesture handling for multiple-selection grids
-            if (!this._xslideHandler &&
-                "undefined" !== typeof CrossSlide && !this.noContext) {
-              this._xslideHandler = new CrossSlide.Handler(this, {
-                    REARRANGESTART: this.crossSlideBoundary
-              });
-            }
-          ]]>
-        </body>
-      </method>
-
-      <method name="disableCrossSlide">
-        <body>
-          <![CDATA[
-            if (this._xslideHandler) {
-              this.removeEventListener("touchstart", this._xslideHandler);
-              this.removeEventListener("touchmove", this._xslideHandler);
-              this.removeEventListener("touchend", this._xslideHandler);
-              this._xslideHandler = null;
-            }
-          ]]>
-        </body>
-      </method>
-
-      <property name="tileWidth" readonly="true" onget="return this._itemSize.width"/>
-      <property name="tileHeight" readonly="true" onget="return this._itemSize.height"/>
-      <field name="_tileStyleSheetName">"tiles.css"</field>
-      <method name="_getTileSizes">
-        <body>
-          <![CDATA[
-            // Tile sizes are constants, this avoids the need to measure a rendered item before grid layout
-            // The defines.inc used by the theme CSS is the single source of truth for these values
-            // This method locates and parses out (just) those dimensions from the stylesheet
-
-            let typeSizes = this.ownerDocument.defaultView._richgridTileSizes;
-            if (typeSizes && typeSizes["default"]) {
-              return typeSizes;
-            }
-
-            // cache sizes on the global window object, for reuse between bound nodes
-            typeSizes = this.ownerDocument.defaultView._richgridTileSizes = {};
-
-            let sheets = this.ownerDocument.styleSheets;
-            // The (first matching) rules that will give us tile type => width/height values
-            // The keys in this object are string-matched against the selectorText
-            // of rules in our stylesheet. Quoted values in a selector will always use " not '
-            let typeSelectors = {
-              'richgriditem' : "default",
-              'richgriditem[tiletype="thumbnail"]': "thumbnail",
-              'richgriditem[search]': "search",
-              'richgriditem[compact]': "compact"
-            };
-            let rules, sheet;
-            for (let i=0; (sheet=sheets[i]); i++) {
-              if (sheet.href && sheet.href.endsWith( this._tileStyleSheetName )) {
-                rules = sheet.cssRules;
-                break;
-              }
-            }
-            if (rules) {
-              // walk the stylesheet rules until we've matched all our selectors
-              for (let i=0, rule;(rule=rules[i]); i++) {
-                let type = rule.selectorText && typeSelectors[rule.selectorText];
-                if (type) {
-                  let sizes = typeSizes[type] = {};
-                  typeSelectors[type] = null;
-                  delete typeSelectors[type];
-                  // we assume px unit for tile dimension values
-                  sizes.width =  parseInt(rule.style.getPropertyValue("width"));
-                  sizes.height = parseInt(rule.style.getPropertyValue("height"));
-                }
-                if (!Object.keys(typeSelectors).length)
-                  break;
-              }
-            } else {
-              throw new Error("Failed to find stylesheet to parse out richgriditem dimensions\n");
-            }
-            return typeSizes;
-          ]]>
-        </body>
-      </method>
-
-      <method name="_isIndexInBounds">
-        <parameter name="anIndex"/>
-        <body>
-          <![CDATA[
-            return anIndex >= 0 && anIndex < this.itemCount;
-          ]]>
-        </body>
-      </method>
-
-      <method name="_createItemElement">
-        <parameter name="aLabel"/>
-        <parameter name="aValue"/>
-        <body>
-          <![CDATA[
-            let item = this.ownerDocument.createElement("richgriditem");
-            if (aValue) {
-              item.setAttribute("value", aValue);
-            }
-            if (aLabel) {
-              item.setAttribute("label", aLabel);
-            }
-            if (this.hasAttribute("tiletype")) {
-              item.setAttribute("tiletype", this.getAttribute("tiletype"));
-            }
-            return item;
-          ]]>
-        </body>
-      </method>
-
-      <method name="_fireEvent">
-        <parameter name="aType"/>
-        <body>
-          <![CDATA[
-            switch (aType) {
-              case "select" :
-              case "selectionchange" :
-                if (this.suppressOnSelect)
-                  return;
-                break;
-              case "arranged" :
-                break;
-            }
-
-            let event = document.createEvent("Events");
-            event.initEvent(aType, true, true);
-            this.dispatchEvent(event);
-          ]]>
-        </body>
-      </method>
-
-      <method name="bendItem">
-        <parameter name="aItem"/>
-        <parameter name="aEvent"/>
-        <body><![CDATA[
-          // apply the transform to the contentBox element of the item
-          let bendNode = this.isItem(aItem) ? aItem._contentBox : null;
-          if (!bendNode || aItem.hasAttribute("bending"))
-            return;
-
-          let event = aEvent;
-          let rect = bendNode.getBoundingClientRect();
-          let angle;
-          let x = (event.clientX - rect.left) / rect.width;
-          let y = (event.clientY - rect.top) / rect.height;
-          let perspective = '450px';
-          // scaling factors for the angle of deflection,
-          //   based on the aspect-ratio of the tile
-          let aspectRatio = rect.width/rect.height;
-          let deflectX = 10 * Math.ceil(1/aspectRatio);
-          let deflectY = 10 * Math.ceil(aspectRatio);
-
-          if (Math.abs(x - .5) < .1 && Math.abs(y - .5) < .1) {
-            bendNode.style.transform = "perspective("+perspective+") translateZ(-10px)";
-          }
-          else if (x > y) {
-            if (1 - y > x) {
-              angle = Math.ceil((.5 - y) * deflectY);
-              bendNode.style.transform = "perspective("+perspective+") rotateX(" + angle + "deg)";
-              bendNode.style.transformOrigin = "center bottom";
-            } else {
-              angle = Math.ceil((x - .5) * deflectX);
-              bendNode.style.transform = "perspective("+perspective+") rotateY(" + angle + "deg)";
-              bendNode.style.transformOrigin = "left center";
-            }
-          } else {
-            if (1 - y < x) {
-              angle = -Math.ceil((y - .5) * deflectY);
-              bendNode.style.transform = "perspective("+perspective+") rotateX(" + angle + "deg)";
-              bendNode.style.transformOrigin = "center top";
-            } else {
-              angle = -Math.ceil((.5 - x) * deflectX);
-              bendNode.style.transform = "perspective("+perspective+") rotateY(" + angle + "deg)";
-              bendNode.style.transformOrigin = "right center";
-            }
-          }
-          // mark when bend effect is applied
-          aItem.setAttribute("bending", true);
-        ]]></body>
-      </method>
-
-      <method name="unbendItem">
-        <parameter name="aItem"/>
-        <body><![CDATA[
-          // clear the 'bend' transform on the contentBox element of the item
-          let bendNode = 'richgriditem' == aItem.nodeName && aItem._contentBox;
-          if (bendNode && aItem.hasAttribute("bending")) {
-            bendNode.style.removeProperty('transform');
-            bendNode.style.removeProperty('transformOrigin');
-            aItem.removeAttribute("bending");
-          }
-        ]]></body>
-      </method>
-    </implementation>
-    <handlers>
-      <!--  item bend effect handlers -->
-      <handler event="mousedown" button="0" phase="capturing" action="this.bendItem(event.target, event)"/>
-      <handler event="touchstart" action="this.bendItem(event.target, event.touches[0])"/>
-      <handler event="mouseup" button="0" action="this.unbendItem(event.target)"/>
-      <handler event="mouseout" button="0" action="this.unbendItem(event.target)"/>
-      <handler event="touchend" action="this.unbendItem(event.target)"/>
-      <handler event="touchcancel" action="this.unbendItem(event.target)"/>
-      <!--  /item bend effect handler -->
-
-      <handler event="context-action">
-        <![CDATA[
-          // context-action is an event fired by the appbar typically
-          // which directs us to do something to the selected tiles
-          switch (event.action) {
-            case "clear":
-              this.selectNone();
-              break;
-            default:
-              if (this.controller && this.controller.doActionOnSelectedTiles) {
-                this.controller.doActionOnSelectedTiles(event.action, event);
-              }
-          }
-        ]]>
-      </handler>
-      <handler event="MozCrossSliding">
-        <![CDATA[
-          // MozCrossSliding is swipe gesture across a tile
-          // The tile should follow the drag to reinforce the gesture
-          // (with inertia/speedbump behavior)
-          let state = event.crossSlidingState;
-          let thresholds = this._xslideHandler.thresholds;
-          let transformValue;
-          switch (state) {
-            case "cancelled":
-              this.unbendItem(event.target);
-              event.target.removeAttribute('crosssliding');
-              // hopefully nothing else is transform-ing the tile
-              event.target.style.removeProperty('transform');
-              break;
-            case "dragging":
-            case "selecting":
-              // remove bend/depress effect when a cross-slide begins
-              this.unbendItem(event.target);
-
-              event.target.setAttribute("crosssliding", true);
-              // just track the mouse in the initial phases of the drag gesture
-              transformValue = (event.direction=='x') ?
-                                      'translateX('+event.delta+'px)' :
-                                      'translateY('+event.delta+'px)';
-              event.target.style.transform = transformValue;
-              break;
-            case "selectSpeedBumping":
-            case "speedBumping":
-              event.target.setAttribute('crosssliding', true);
-              // in speed-bump phase, we add inertia to the drag
-              let offset = CrossSlide.speedbump(
-                event.delta,
-                thresholds.SPEEDBUMPSTART,
-                thresholds.SPEEDBUMPEND
-              );
-              transformValue = (event.direction=='x') ?
-                                      'translateX('+offset+'px)' :
-                                      'translateY('+offset+'px)';
-              event.target.style.transform = transformValue;
-              break;
-            // "rearranging" case not used or implemented here
-            case "completed":
-              event.target.removeAttribute('crosssliding');
-              event.target.style.removeProperty('transform');
-              break;
-          }
-        ]]>
-      </handler>
-      <handler event="MozCrossSlideSelect">
-        <![CDATA[
-          if (this.noContext)
-            return;
-          this.toggleItemSelection(event.target);
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="richgrid-item">
-    <content>
-      <html:div anonid="anon-tile" class="tile-content" xbl:inherits="customImage">
-        <html:div class="tile-start-container" xbl:inherits="customImage">
-          <html:div class="tile-icon-box" anonid="anon-tile-icon-box"><xul:image anonid="anon-tile-icon" xbl:inherits="src=iconURI"/></html:div>
-        </html:div>
-        <html:div anonid="anon-tile-label" class="tile-desc" xbl:inherits="xbl:text=label"/>
-      </html:div>
-    </content>
-
-    <implementation>
-      <property name="isBound" readonly="true" onget="return !!this._icon"/>
-      <constructor>
-        <![CDATA[
-            this.refresh();
-        ]]>
-      </constructor>
-      <property name="_contentBox" onget="return document.getAnonymousElementByAttribute(this, 'class', 'tile-content');"/>
-      <property name="_textbox" onget="return document.getAnonymousElementByAttribute(this, 'class', 'tile-desc');"/>
-      <property name="_top" onget="return document.getAnonymousElementByAttribute(this, 'class', 'tile-start-container');"/>
-      <property name="_icon" onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'anon-tile-icon');"/>
-      <property name="_iconBox" onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'anon-tile-icon-box');"/>
-      <property name="_label" onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'anon-tile-label');"/>
-      <property name="iconSrc"
-                onset="this._icon.src = val; this.setAttribute('iconURI', val);"
-                onget="return this._icon.src;" />
-
-      <property name="selected"
-                onget="return this.hasAttribute('selected');"
-                onset="if (val) this.setAttribute('selected', val); else this.removeAttribute('selected');" />
-      <property name="url"
-                onget="return this.getAttribute('value')"
-                onset="this.setAttribute('value', val);"/>
-      <property name="label"
-                onget="return this._label.getAttribute('value')"
-                onset="this.setAttribute('label', val); this._label.setAttribute('value', val);"/>
-      <property name="pinned"
-                onget="return this.hasAttribute('pinned')"
-                onset="if (val) { this.setAttribute('pinned', val) } else this.removeAttribute('pinned');"/>
-
-      <method name="refresh">
-        <body>
-          <![CDATA[
-            // Prevent an exception in case binding is not done yet.
-            if (!this.isBound)
-              return;
-
-            // Seed the binding properties from bound-node attribute values
-            // Usage: node.refresh()
-            //        - reinitializes all binding properties from their associated attributes
-
-            this.iconSrc = this.getAttribute('iconURI');
-            this.color = this.getAttribute("customColor");
-            this.label = this.getAttribute('label');
-            // url getter just looks directly at attribute
-            // selected getter just looks directly at attribute
-            // pinned getter just looks directly at attribute
-            // value getter just looks directly at attribute
-            this._contextActions = null;
-            this.refreshBackgroundImage();
-          ]]>
-        </body>
-      </method>
-
-      <property name="control">
-        <getter><![CDATA[
-          let parent = this.parentNode;
-          while (parent && parent != this.ownerDocument.documentElement) {
-            if (parent instanceof Components.interfaces.nsIDOMXULSelectControlElement)
-              return parent;
-            parent = parent.parentNode;
-          }
-          return null;
-        ]]></getter>
-      </property>
-
-      <property name="color" onget="return this.getAttribute('customColor');">
-        <setter><![CDATA[
-          if (val) {
-            this.setAttribute("customColor", val);
-            this._contentBox.style.backgroundColor = val;
-
-            // overridden in tiles.css for non-thumbnail types
-            this._label.style.backgroundColor = val.replace(/rgb\(([^\)]+)\)/, 'rgba($1, 0.8)');
-
-            // Small icons get a border+background-color treatment.
-            // See tiles.css for large icon overrides
-            this._iconBox.style.borderColor = val.replace(/rgb\(([^\)]+)\)/, 'rgba($1, 0.6)');
-            this._iconBox.style.backgroundColor = this.hasAttribute("tintColor") ?
-                                                    this.getAttribute("tintColor") : "#fff";
-          } else {
-            this.removeAttribute("customColor");
-            this._contentBox.style.removeProperty("background-color");
-            this._label.style.removeProperty("background-color");
-            this._iconBox.style.removeProperty("border-color");
-            this._iconBox.style.removeProperty("background-color");
-          }
-        ]]></setter>
-      </property>
-
-      <property name="backgroundImage" onget="return this.getAttribute('customImage');">
-        <setter><![CDATA[
-          if (val) {
-            this.setAttribute("customImage", val);
-            this._top.style.backgroundImage = val;
-          } else {
-            this.removeAttribute("customImage");
-            this._top.style.removeProperty("background-image");
-          }
-        ]]></setter>
-      </property>
-
-      <method name="refreshBackgroundImage">
-        <body><![CDATA[
-          if (!this.isBound)
-            return;
-          if (this.backgroundImage) {
-            this._top.style.removeProperty("background-image");
-            this._top.style.setProperty("background-image", this.backgroundImage);
-          }
-        ]]></body>
-      </method>
-
-      <field name="_contextActions">null</field>
-      <property name="contextActions">
-        <getter>
-          <![CDATA[
-            if (!this._contextActions) {
-              this._contextActions = new Set();
-              let actionSet = this._contextActions;
-              let actions = this.getAttribute("data-contextactions");
-              if (actions) {
-                actions.split(/[,\s]+/).forEach(function(verb){
-                  actionSet.add(verb);
-                });
-              }
-            }
-            return this._contextActions;
-          ]]>
-        </getter>
-      </property>
-    </implementation>
-
-    <handlers>
-      <handler event="click" button="0">
-        <![CDATA[
-          // left-click/touch handler
-          this.control.handleItemClick(this, event);
-          // Stop this from bubbling, when the richgrid container
-          // receives click events, we blur the nav bar.
-          event.stopPropagation();
-        ]]>
-      </handler>
-
-      <handler event="contextmenu">
-        <![CDATA[
-          // fires for right-click, long-click and (keyboard) contextmenu input
-          // toggle the selected state of tiles in a grid
-          let gridParent = this.control;
-          if (!this.isBound || !gridParent)
-            return;
-          gridParent.handleItemContextMenu(this, event);
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="richgrid-empty-item">
-    <content>
-      <html:div anonid="anon-tile" class="tile-content"></html:div>
-    </content>
-  </binding>
-
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/notification.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/notification.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/notification.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/notification.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-<?xml version="1.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/. -->
-
-<!DOCTYPE bindings [
-<!ENTITY % notificationDTD SYSTEM "chrome://global/locale/notification.dtd">
-%notificationDTD;
-]>
-
-<bindings id="notificationBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xbl="http://www.mozilla.org/xbl"
-          xmlns:html="http://www.w3.org/1999/xhtml"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="notificationbox" extends="chrome://global/content/bindings/notification.xml#notificationbox">
-    <content>
-      <xul:stack xbl:inherits="hidden=notificationshidden"
-                 class="notificationbox-stack">
-        <xul:spacer/>
-        <children includes="notification"/>
-      </xul:stack>
-      <html:div anonid="layer1" class="notification-layer"></html:div>
-      <html:div anonid="layer2" class="notification-layer"></html:div>
-      <children/>
-    </content>
-
-    <implementation>
-      <constructor>
-        <![CDATA[
-          this.addEventListener("AlertActive", this.handleEvent, true);
-          this.addEventListener("AlertClose", this.handleEvent, true);
-          this.setAttribute("count", 0);
-        ]]>
-      </constructor>
-      <destructor>
-        <![CDATA[
-          this.removeEventListener("AlertActive", this.handleEvent, true);
-          this.removeEventListener("AlertClose", this.handleEvent, true);
-        ]]>
-      </destructor>
-      <method name="adoptNotification">
-        <parameter name="aItem"/>
-        <body>
-          <![CDATA[
-            // insert an existing notification element
-            // XXX: borrows code from appendNotification in toolkit/content/widgets/notification.xml
-            // if this sticks around, we'll want to refactor both to eliminate duplication
-
-            let priority = aItem.priority;
-            // check for where the notification should be inserted according to
-            // priority. If two are equal, the existing one appears on top.
-            let notifications = this.allNotifications;
-            let insertPos = null;
-            for (let n = notifications.length - 1; n >= 0; n--) {
-              if (notifications[n].priority < priority)
-                break;
-              insertPos = notifications[n];
-            }
-            if (!insertPos) {
-              aItem.style.position = "fixed";
-              aItem.style.top = "100%";
-              aItem.style.marginTop = "-15px";
-              aItem.style.opacity = "0";
-            }
-            let label = aItem.label;
-            this.insertBefore(aItem, insertPos);
-            aItem.label = label;
-
-            if (!insertPos)
-              this._showNotification(aItem, true, true);
-
-            // Fire event for accessibility APIs
-            var event = document.createEvent("Events");
-            event.initEvent("AlertActive", true, true);
-            aItem.dispatchEvent(event);
-
-            return aItem;
-          ]]>
-        </body>
-      </method>
-      <method name="removeNotification">
-        <parameter name="aItem"/>
-        <parameter name="aSkipAnimation"/>
-        <body>
-          <![CDATA[
-            if (aItem == this.currentNotification)
-              this.removeCurrentNotification(aSkipAnimation);
-            else if (aItem != this._closedNotification)
-              this._removeNotificationElement(aItem);
-
-            // Fire notification closed event.
-            let event = new Event('AlertClose');
-            event.notification = aItem;
-            this.dispatchEvent(event);
-
-            return aItem;
-          ]]>
-        </body>
-      </method>
-      <method name="handleEvent">
-        <parameter name="aEvent"/>
-        <body>
-          <![CDATA[
-            switch (aEvent.type) {
-              case "AlertActive":
-              case "AlertClose":
-                this.setAttribute("count", this.allNotifications.length);
-                break;
-            }
-          ]]>
-        </body>
-      </method>
-    </implementation>
-  </binding>
-
-  <binding id="notification" role="xul:alert" extends="chrome://global/content/bindings/notification.xml#notification">
-    <implementation>
-      <property name="_messageContainer" onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'messageText');"/>
-      <property name="label">
-        <getter><![CDATA[
-          if (this._messageContainer.childElementCount) {
-            // return a document fragment when our label is a complex value containing elements
-            // by cloning childNodes into a document fragment, the returned value
-            // is *not* live and will survive unbinding of this notification
-            let frag = this.ownerDocument.createDocumentFragment();
-            let containerNode = this._messageContainer;
-            for(let cnode of containerNode.childNodes) {
-              frag.appendChild(cnode.cloneNode(true));
-            }
-            return frag;
-          } else {
-            return String.trim(this._messageContainer.textContent) ||
-                   this.getAttribute("label");
-          }
-        ]]></getter>
-        <setter><![CDATA[
-            // accept a string or node (e.g. document fragment, element or text node) as label value
-            if (val && "object" == typeof val && ('nodeType' in val)) {
-              let containerNode = this._messageContainer;
-              let cnode;
-              while((cnode = containerNode.firstChild)) {
-                cnode.remove();
-              }
-              if (val.ownerDocument !== this.ownerDocument) {
-                val = this.ownerDocument.importNode(val, true);
-              }
-              return containerNode.appendChild(val);
-            } else {
-              return (this._messageContainer.textContent = val);
-            }
-        ]]></setter>
-      </property>
-    </implementation>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/popup.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/popup.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/popup.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/popup.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <binding id="element-popup">
-
-    <implementation implements="nsIPopupBoxObject">
-      <method name="showPopup">
-        <parameter name="srcConent"/>
-        <parameter name="xpos"/>
-        <parameter name="ypos"/>
-        <parameter name="popupType"/>
-        <parameter name="anchorAlignment"/>
-        <parameter name="popupAlignment"/>
-        <body>
-          <![CDATA[
-            this.style.visibility = 'visible';
-            this.style.left = xpos + "px";
-            this.style.top = ypos + "px";
-          ]]>
-        </body>
-      </method>
-
-      <method name="hidePopup">
-        <body>
-          <![CDATA[
-            this.style.visibility = 'hidden';
-            let event = document.createEvent("Events");
-            event.initEvent("popuphidden", true, false);
-            let dispatcher = this;
-            dispatcher.dispatchEvent(event);
-          ]]>
-        </body>
-      </method>
-    </implementation>
-  </binding>
-</bindings>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/selectionoverlay.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/selectionoverlay.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/selectionoverlay.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/selectionoverlay.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml">
-  <binding id="selection-binding">  
-    <content>
-      <html:div flex="1" class="selection-overlay-inner window-width window-height" anonid="selection-overlay-inner">
-        <xul:stack>
-          <html:div anonid="selection-overlay-debug" class="window-width window-height"/>
-          <xul:toolbarbutton anonid="selectionhandle-mark1" class="selectionhandle" label="^" left="10" top="10" hidden="true"/>
-          <xul:toolbarbutton anonid="selectionhandle-mark2" class="selectionhandle" label="^" left="10" top="10" hidden="true"/>
-          <xul:toolbarbutton anonid="selectionhandle-mark3" class="selectionhandle" label="^" left="10" top="10" hidden="true"/>
-        </xul:stack>
-      </html:div>
-    </content>
-
-    <implementation implements="nsIDOMEventListener">
-      <field name="_selectionOverlay" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "selection-overlay-inner").parentNode;</field>
-      <field name="_selectionDebugOverlay" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "selection-overlay-debug");</field>
-
-      <property name="enabled">
-        <setter>
-          <![CDATA[
-            if (val) {
-              this._selectionOverlay.setAttribute("class", "selection-overlay window-width window-height");
-            } else {
-              this._selectionOverlay.setAttribute("class", "selection-overlay-hidden");
-            }
-            return val;
-          ]]>
-        </setter>
-        <getter>
-          <![CDATA[
-          return (this._selectionOverlay.getAttribute("class") == "selection-overlay");
-        ]]>
-        </getter>
-      </property>
-
-      <property name="displayDebugLayer">
-        <setter>
-          <![CDATA[
-            if (val) {
-              this._selectionDebugOverlay.style.display = "block";
-              this._debugLayerVisible = true;
-            } else {
-              this._selectionDebugOverlay.style.display = "none";
-              this._debugLayerVisible = false;
-              while(this._selectionDebugOverlay.hasChildNodes()) this._selectionDebugOverlay.removeChild(this._selectionDebugOverlay.firstChild);
-            }
-            return this._debugLayerVisible;
-          ]]>
-        </setter>
-        <getter>
-          <![CDATA[
-          if (this._debugLayerVisible == "undefined")
-            this._debugLayerVisible = false;
-          return this._debugLayerVisible;
-        ]]>
-        </getter>
-      </property>
-
-      <method name="getMarker">
-        <parameter name="aMarkerId"/>
-        <body>
-          <![CDATA[
-            return document.getAnonymousElementByAttribute(this, "anonid", aMarkerId);
-          ]]>
-        </body>
-      </method>
-
-      <method name="addDebugRect">
-        <parameter name="aLeft"/>
-        <parameter name="aTop"/>
-        <parameter name="aRight"/>
-        <parameter name="aBottom"/>
-        <parameter name="aColor"/>
-        <parameter name="aFill"/>
-        <parameter name="aId"/>
-        <body>
-          <![CDATA[
-            let e = document.createElement("div");
-            this._selectionDebugOverlay.appendChild(e);
-            e.style.position = "fixed";
-            e.style.left = aLeft +"px";
-            e.style.top = aTop +"px";
-            e.style.right = aRight +"px";
-            e.style.bottom = aBottom +"px";
-            e.style.maxWidth = (aRight - aLeft) +"px";
-            e.style.width = (aRight - aLeft) +"px";
-            e.style.maxHeight = (aBottom - aTop) +"px";
-            e.style.height = (aBottom - aTop) +"px";
-            e.style.pointerEvents = "none";
-            if (aFill == undefined) {
-              e.style.backgroundColor = aColor;
-            } else {
-              if (aFill) {
-                e.style.backgroundColor = aColor;
-              } else {
-                e.style.border = "2px solid " + aColor;
-              }
-            }
-            e.style.opacity = "0.5";
-          ]]>
-        </body>
-      </method>
-    </implementation>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/tabprompts.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/tabprompts.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/tabprompts.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/tabprompts.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.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/. -->
-
-<bindings
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-   xmlns:xbl="http://www.mozilla.org/xbl">
-
-  <binding id="tabmodalprompt"
-           extends="chrome://global/content/tabprompts.xml#tabmodalprompt">
-
-    <implementation>
-      <method name="metroInit">
-        <parameter name="args"/>
-        <parameter name="linkedTab"/>
-        <parameter name="onCloseCallback"/>
-        <body>
-          <![CDATA[
-            this.init(args, linkedTab, onCloseCallback);
-
-            this.ui.infoTitle.removeAttribute("hidden");
-
-            let infoContainer = document.getAnonymousElementByAttribute(this, "anonid", "infoContainer");
-            infoContainer.setAttribute("align", "start");
-            infoContainer.classList.add("infoContainer");
-          ]]>
-        </body>
-      </method>
-
-
-      <method name="onResize">
-        <body>
-          <![CDATA[
-            // Overwrite base onResize method. It's no-op for metro.
-          ]]>
-        </body>
-      </method>
-
-    </implementation>
-
-  </binding>
-
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/tabs.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/tabs.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/tabs.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/tabs.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,208 +0,0 @@
-<?xml version="1.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/. -->
-
-<!DOCTYPE bindings [
-<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-%browserDTD;
-]>
-
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="documenttab">
-    <content>
-      <xul:stack class="documenttab-container">
-        <html:canvas anonid="thumbnail-canvas" class="documenttab-thumbnail" />
-        <xul:image anonid="favicon" class="documenttab-favicon" width="26" height="26"/>
-
-        <xul:label anonid="title" class="documenttab-title" bottom="0" start="0" end="0" crop="end"/>
-        <xul:box anonid="selection" class="documenttab-crop"/>
-        <xul:box anonid="selection" class="documenttab-selection"/>
-        <xul:button anonid="close" class="documenttab-close" end="0" top="0"
-                    onclick="event.stopPropagation(); document.getBindingParent(this)._onClose()"
-                    label="&closetab.label;"/>
-      </xul:stack>
-    </content>
-
-    <handlers>
-      <handler event="click" button="0" clickcount="1" action="this._onClick()"/>
-      <handler event="click" button="1" clickcount="1" action="event.stopPropagation(); this._onClose()"/>
-      <handler event="dblclick" action="this._onDoubleClick(); event.stopPropagation();"/>
-    </handlers>
-
-    <implementation>
-      <field name="thumbnailCanvas" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "thumbnail-canvas");</field>
-      <field name="_close" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "close");</field>
-      <field name="_title" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "title");</field>
-      <field name="_favicon" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "favicon");</field>
-      <field name="_container" readonly="true">this.parentNode;</field>
-
-      <constructor>
-        <![CDATA[
-          this.thumbnailCanvas.mozOpaque = true;
-          this.thumbnailCanvas.mozImageSmoothingEnabled = true;
-        ]]>
-      </constructor>
-
-      <method name="_onClick">
-        <body>
-          <![CDATA[
-            this._container.selectedTab = this;
-            let selectFn = new Function("event", this._container.parentNode.getAttribute("onselect"));
-            selectFn.call(this);
-          ]]>
-        </body>
-      </method>
-
-      <method name="_onDoubleClick">
-        <body>
-          <![CDATA[
-            this._container.selectedTab = this;
-            let selectFn = new Function("event", this._container.parentNode.getAttribute("ondbltap"));
-            selectFn.call(this);
-          ]]>
-        </body>
-      </method>
-
-      <method name="_onClose">
-        <body>
-          <![CDATA[
-            let callbackFunc = this._container.parentNode.getAttribute("onclosetab");
-            let closeFn = new Function("event", callbackFunc);
-            closeFn.call(this);
-          ]]>
-        </body>
-      </method>
-
-      <method name="updateTitle">
-        <parameter name="title"/>
-        <body>
-          <![CDATA[
-            this._title.value = title;
-          ]]>
-        </body>
-      </method>
-
-      <method name="updateFavicon">
-        <parameter name="src"/>
-        <body>
-          <![CDATA[
-            this._favicon.src = src;
-          ]]>
-        </body>
-      </method>
-
-    </implementation>
-  </binding>
-
-  <binding id="tablist">
-    <content>
-      <xul:arrowscrollbox anonid="tabs-scrollbox" class="tabs-scrollbox" flex="1" orient="horizontal"
-        clicktoscroll="true" />
-    </content>
-
-    <handlers>
-      <handler event="dblclick" action="this._onDoubleClick();"/>
-    </handlers>
-
-    <implementation implements="nsIDOMEventListener">
-      <constructor>
-        <![CDATA[
-          window.addEventListener("MozContextUITabsShow", this, true);
-        ]]>
-      </constructor>
-
-      <destructor>
-        <![CDATA[
-          window.removeEventListener("MozContextUITabsShow", this, true);
-        ]]>
-      </destructor>
-
-      <method name="handleEvent">
-        <parameter name="event"/>
-        <body>
-          <![CDATA[
-            switch (event.type) {
-              case "MozContextUITabsShow":
-                this.strip.ensureElementIsVisible(this.selectedTab, false);
-                break;
-            }
-          ]]>
-        </body>
-      </method>
-
-      <field name="strip">document.getAnonymousElementByAttribute(this, "anonid", "tabs-scrollbox");</field>
-      <field name="_selectedTab">null</field>
-
-      <!-- Used by the chrome input handler -->
-      <property name="anonScrollBox"
-                readonly="true"
-                onget="return this.strip;"/>
-
-      <property name="selectedTab" onget="return this._selectedTab;">
-        <setter>
-          <![CDATA[
-            if (this._selectedTab)
-              this._selectedTab.removeAttribute("selected");
-
-            if (val)
-              val.setAttribute("selected", "true");
-
-            this._selectedTab = val;
-            this.strip.ensureElementIsVisible(val);
-          ]]>
-        </setter>
-      </property>
-
-      <method name="addTab">
-        <parameter name="aIndex"/>
-        <body>
-          <![CDATA[
-            let tab = document.createElement("documenttab");
-            if (aIndex >= 0) {
-              let child = this.strip.children[aIndex];
-              this.strip.insertBefore(tab, child);
-            } else {
-              this.strip.appendChild(tab);
-            }
-            return tab;
-          ]]>
-        </body>
-      </method>
-
-      <method name="removeTab">
-        <parameter name="aTab"/>
-        <body>
-          <![CDATA[
-            this.strip.removeChild(aTab);
-          ]]>
-        </body>
-      </method>
-
-      <method name="_onDoubleTap">
-        <body>
-          <![CDATA[
-            new Function("event", this.getAttribute("ondoubletap")).call();
-          ]]>
-        </body>
-      </method>
-
-      <method name="_onDoubleClick">
-        <body>
-          <![CDATA[
-            // ignore mouse events if we're interacting with touch input
-            if (!InputSourceHelper.isPrecise)
-              return;
-            new Function("event", this.getAttribute("ondoubletap")).call();
-          ]]>
-        </body>
-      </method>
-
-    </implementation>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/toggleswitch.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/toggleswitch.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/toggleswitch.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/toggleswitch.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-<?xml version="1.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/. -->
-
-<!DOCTYPE bindings [
-  <!ENTITY % checkboxDTD SYSTEM "chrome://browser/locale/checkbox.dtd">
-  %checkboxDTD;
-]>
-
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="checkbox-toggleswitch" display="xul:box" extends="chrome://global/content/bindings/checkbox.xml#checkbox-baseline">
-    <content>
-      <xul:hbox>
-        <xul:description anonid="offlabel" class="offlabel" value="&checkbox.off.label;" xbl:inherits="value=offlabel"/>
-        <xul:description anonid="onlabel" class="onlabel" value="&checkbox.on.label;" xbl:inherits="value=onlabel"/>
-        <xul:radiogroup anonid="group" xbl:inherits="disabled">
-          <xul:radio type="toggle" anonid="off" class="checkbox-radio-off"/>
-          <xul:radio type="toggle" anonid="on" class="checkbox-radio-on"/>
-        </xul:radiogroup>
-      </xul:hbox>
-    </content>
-    <implementation>
-      <constructor><![CDATA[
-        this.setChecked(this.checked);
-      ]]></constructor>
-
-      <field name="_group">
-        document.getAnonymousElementByAttribute(this, "anonid", "group");
-      </field>
-
-      <field name="_on">
-        document.getAnonymousElementByAttribute(this, "anonid", "on");
-      </field>
-
-      <field name="_onlabel">
-        document.getAnonymousElementByAttribute(this, "anonid", "onlabel");
-      </field>
-
-      <field name="_off">
-        document.getAnonymousElementByAttribute(this, "anonid", "off");
-      </field>
-
-      <field name="_offlabel">
-        document.getAnonymousElementByAttribute(this, "anonid", "offlabel");
-      </field>
-
-      <property name="onlabel"
-        onget="return this._onlabel.value"
-        onset="this._offlabel.value=val"/>
-
-      <property name="offlabel"
-        onget="return this._offlabel.value"
-        onset="this._offlabel.value=val"/>
-
-      <method name="setChecked">
-        <parameter name="aValue"/>
-        <body>
-        <![CDATA[
-          let change = (aValue != this.checked);
-
-          if (aValue) {
-            this.setAttribute("checked", "true");
-            this._group.selectedItem = this._on;
-          } else {
-            this.removeAttribute("checked");
-            this._group.selectedItem = this._off;
-          }
-
-          if (change) {
-            this.fireEvent("CheckboxStateChange");
-            this.fireEvent("command");
-          }
-
-          return aValue;
-        ]]>
-        </body>
-      </method>
-
-      <method name="fireEvent">
-        <parameter name="aName"/>
-        <body>
-          <![CDATA[
-            var event = document.createEvent("Events");
-            event.initEvent(aName, true, true);
-            this.dispatchEvent(event);
-          ]]>
-        </body>
-      </method>
-
-      <method name="_onClickOrTap">
-        <parameter name="aEvent"/>
-        <body>
-          <![CDATA[
-            aEvent.stopPropagation();
-            this.setChecked(!this.checked);
-          ]]>
-        </body>
-      </method>
-    </implementation>
-    <handlers>
-      <handler event="click" button="0" phase="capturing">
-        <![CDATA[
-          this._onClickOrTap(event);
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="setting-fulltoggle-bool" extends="chrome://mozapps/content/extensions/setting.xml#setting-bool">
-    <implementation>
-      <constructor>
-        <![CDATA[
-          this.input.classList.add("toggleswitch");
-        ]]>
-      </constructor>
-    </implementation>
-  </binding>
-
-  <binding id="setting-fulltoggle-boolint" extends="chrome://mozapps/content/extensions/setting.xml#setting-boolint">
-    <implementation>
-      <constructor>
-        <![CDATA[
-          this.input.classList.add("toggleswitch");
-        ]]>
-      </constructor>
-    </implementation>
-  </binding>
-
-  <binding id="setting-fulltoggle-localized-bool" extends="chrome://mozapps/content/extensions/setting.xml#setting-localized-bool">
-    <implementation>
-      <constructor>
-        <![CDATA[
-          this.input.classList.add("toggleswitch");
-        ]]>
-      </constructor>
-    </implementation>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/urlbar.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/urlbar.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings/urlbar.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings/urlbar.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,937 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<!DOCTYPE bindings [
-<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-%browserDTD;
-]>
-
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="urlbar" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete">
-    <implementation implements="nsIObserver">
-      <constructor>
-        <![CDATA[
-          this._mayFormat = Services.prefs.getBoolPref("browser.urlbar.formatting.enabled");
-          this._mayTrimURLs = Services.prefs.getBoolPref("browser.urlbar.trimURLs");
-          this._maySelectAll = Services.prefs.getBoolPref("browser.urlbar.doubleClickSelectsAll");
-
-          Services.prefs.addObserver("browser.urlbar.formatting.enabled", this, false);
-          Services.prefs.addObserver("browser.urlbar.trimURLs", this, false);
-          Services.prefs.addObserver("browser.urlbar.doubleClickSelectsAll", this, false);
-
-          this.inputField.controllers.insertControllerAt(0, this._copyCutValueController);
-
-          this.minResultsForPopup = 0;
-          this.popup._input = this;
-        ]]>
-      </constructor>
-
-      <destructor>
-        <![CDATA[
-          Services.prefs.removeObserver("browser.urlbar.formatting.enabled", this);
-          Services.prefs.removeObserver("browser.urlbar.trimURLs", this);
-          Services.prefs.removeObserver("browser.urlbar.doubleClickSelectsAll", this);
-        ]]>
-      </destructor>
-
-      <field name="_mayFormat"/>
-      <field name="_mayTrimURLs"/>
-      <field name="_maySelectAll"/>
-      <field name="_lastKnownGoodURL"/>
-
-      <method name="openPopup">
-        <body>
-          <![CDATA[
-            this.popup.openAutocompletePopup(this, null);
-          ]]>
-        </body>
-      </method>
-
-      <method name="closePopup">
-        <body>
-          <![CDATA[
-            this.popup.closePopup(this, null);
-          ]]>
-        </body>
-      </method>
-
-      <!-- URI Display: Domain Highlighting -->
-
-      <method name="_clearFormatting">
-        <body>
-          <![CDATA[
-            let controller = this.editor.selectionController;
-            let selection = controller.getSelection(controller.SELECTION_URLSECONDARY);
-            selection.removeAllRanges();
-          ]]>
-        </body>
-      </method>
-
-      <method name="formatValue">
-        <body>
-          <![CDATA[
-            if (!this._mayFormat || this.isEditing)
-              return;
-
-            let controller = this.editor.selectionController;
-            let selection = controller.getSelection(controller.SELECTION_URLSECONDARY);
-            selection.removeAllRanges();
-
-            let textNode = this.editor.rootElement.firstChild;
-            let value = textNode.textContent;
-
-            let protocol = value.match(/^[a-z\d.+\-]+:(?=[^\d])/);
-            if (protocol &&
-                ["http:", "https:", "ftp:"].indexOf(protocol[0]) == -1)
-              return;
-            let matchedURL = value.match(/^((?:[a-z]+:\/\/)?(?:[^\/]+@)?)(.+?)(?::\d+)?(?:\/|$)/);
-            if (!matchedURL)
-              return;
-
-            let [, preDomain, domain] = matchedURL;
-            let baseDomain = domain;
-            let subDomain = "";
-            // getBaseDomainFromHost doesn't recognize IPv6 literals in brackets as IPs (bug 667159)
-            if (domain[0] != "[") {
-              try {
-                baseDomain = Services.eTLD.getBaseDomainFromHost(domain);
-                if (!domain.endsWith(baseDomain)) {
-                  // getBaseDomainFromHost converts its resultant to ACE.
-                  let IDNService = Cc["@mozilla.org/network/idn-service;1"]
-                                   .getService(Ci.nsIIDNService);
-                  baseDomain = IDNService.convertACEtoUTF8(baseDomain);
-                }
-              } catch (e) {}
-            }
-            if (baseDomain != domain) {
-              subDomain = domain.slice(0, -baseDomain.length);
-            }
-
-            let rangeLength = preDomain.length + subDomain.length;
-            if (rangeLength) {
-              let range = document.createRange();
-              range.setStart(textNode, 0);
-              range.setEnd(textNode, rangeLength);
-              selection.addRange(range);
-            }
-
-            let startRest = preDomain.length + domain.length;
-            if (startRest < value.length) {
-              let range = document.createRange();
-              range.setStart(textNode, startRest);
-              range.setEnd(textNode, value.length);
-              selection.addRange(range);
-            }
-          ]]>
-        </body>
-      </method>
-
-      <!-- URI Display: Scheme and Trailing Slash Triming -->
-
-      <method name="_trimURL">
-        <parameter name="aURL"/>
-        <body>
-          <![CDATA[
-            // This function must not modify the given URL such that calling
-            // nsIURIFixup::createFixupURI with the rfdesult will produce a different URI.
-            return aURL /* remove single trailing slash for http/https/ftp URLs */
-               .replace(/^((?:http|https|ftp):\/\/[^/]+)\/$/, "$1")
-                /* remove http:// unless the host starts with "ftp\d*\." or contains "@" */
-               .replace(/^http:\/\/((?!ftp\d*\.)[^\/@]+(?:\/|$))/, "$1");
-          ]]>
-        </body>
-      </method>
-
-      <method name="_getSelectedValueForClipboard">
-        <body>
-          <![CDATA[
-            // Grab the actual input field's value, not our value, which could include moz-action:
-            let inputVal = this.inputField.value;
-            let selectedVal = inputVal.substring(this.selectionStart, this.selectionEnd);
-
-            // If the selection doesn't start at the beginning or doesn't span the full domain or
-            // the URL bar is modified, nothing else to do here.
-            if (this.selectionStart > 0 || this.valueIsTyped)
-              return selectedVal;
-
-            // The selection doesn't span the full domain if it doesn't contain a slash and is
-            // followed by some character other than a slash.
-            if (!selectedVal.contains("/")) {
-              let remainder = inputVal.replace(selectedVal, "");
-              if (remainder != "" && remainder[0] != "/")
-                return selectedVal;
-            }
-
-            let uriFixup = Cc["@mozilla.org/docshell/urifixup;1"].getService(Ci.nsIURIFixup);
-
-            let uri;
-            try {
-              uri = uriFixup.createFixupURI(inputVal, Ci.nsIURIFixup.FIXUP_FLAG_NONE);
-            } catch (e) {}
-            if (!uri)
-              return selectedVal;
-
-            // Only copy exposable URIs
-            try {
-              uri = uriFixup.createExposableURI(uri);
-            } catch (ex) {}
-
-            // If the entire URL is selected, just use the actual loaded URI.
-            if (inputVal == selectedVal) {
-              // ... but only if  isn't a javascript: or data: URI, since those
-              // are hard to read when encoded
-              if (!uri.schemeIs("javascript") && !uri.schemeIs("data")) {
-                // Parentheses are known to confuse third-party applications (bug 458565).
-                selectedVal = uri.spec.replace(/[()]/g, function (c) escape(c));
-              }
-
-              return selectedVal;
-            }
-
-            // Just the beginning of the URL is selected, check for a trimmed value
-            let spec = uri.spec;
-            let trimmedSpec = this._trimURL(spec);
-            if (spec != trimmedSpec) {
-              // Prepend the portion that trimURL removed from the beginning.
-              // This assumes trimURL will only truncate the URL at
-              // the beginning or end (or both).
-              let trimmedSegments = spec.split(trimmedSpec);
-              selectedVal = trimmedSegments[0] + selectedVal;
-            }
-
-            return selectedVal;
-          ]]>
-        </body>
-      </method>
-
-      <field name="_copyCutValueController">
-        <![CDATA[
-          ({
-            urlbar: this,
-            doCommand: function(aCommand) {
-              let urlbar = this.urlbar;
-              let val = urlbar._getSelectedValueForClipboard();
-              if (!val)
-                return;
-
-              if (aCommand == "cmd_cut" && this.isCommandEnabled(aCommand)) {
-                let start = urlbar.selectionStart;
-                let end = urlbar.selectionEnd;
-                urlbar.inputField.value = urlbar.inputField.value.substring(0, start) +
-                                          urlbar.inputField.value.substring(end);
-                urlbar.selectionStart = urlbar.selectionEnd = start;
-              }
-
-              Cc["@mozilla.org/widget/clipboardhelper;1"]
-                .getService(Ci.nsIClipboardHelper)
-                .copyString(val, document);
-            },
-
-            supportsCommand: function(aCommand) {
-              switch (aCommand) {
-                case "cmd_copy":
-                case "cmd_cut":
-                  return true;
-              }
-              return false;
-            },
-
-            isCommandEnabled: function(aCommand) {
-              let urlbar = this.urlbar;
-              return this.supportsCommand(aCommand) &&
-                     (aCommand != "cmd_cut" || !urlbar.readOnly) &&
-                     urlbar.selectionStart < urlbar.selectionEnd;
-            },
-
-            onEvent: function(aEventName) {}
-          })
-        ]]>
-      </field>
-
-      <method name="trimValue">
-        <parameter name="aURL"/>
-        <body>
-          <![CDATA[
-            return (this._mayTrimURLs) ? this._trimURL(aURL) : aURL;
-          ]]>
-        </body>
-      </method>
-
-      <!-- URI Editing -->
-
-      <property name="isEditing" readonly="true">
-        <getter>
-          <![CDATA[
-            return Elements.urlbarState.hasAttribute("editing");
-          ]]>
-        </getter>
-      </property>
-
-      <method name="beginEditing">
-        <parameter name="aShouldDismiss"/>
-        <body>
-          <![CDATA[
-            if (this.isEditing)
-              return;
-
-            Elements.urlbarState.setAttribute("editing", true);
-            this._lastKnownGoodURL = this.value;
-
-            if (!this.focused) {
-              this.focus();
-              // If we force focus, ensure we're visible.
-              if (ContextUI.displayNavbar()) {
-                // If we forced visibility, ensure we're positioned above keyboard.
-                // (Previous "blur" may have forced us down behind it.)
-                ContentAreaObserver.updateAppBarPosition();
-              }
-            }
-
-            this._clearFormatting();
-            this.select();
-
-            if (aShouldDismiss)
-              ContextUI.dismissTabs();
-
-            if (!InputSourceHelper.isPrecise) {
-              let inputRectangle = this.inputField.getBoundingClientRect();
-              SelectionHelperUI.attachEditSession(ChromeSelectionHandler,
-                  inputRectangle.left, inputRectangle.top, this);
-            }
-          ]]>
-        </body>
-      </method>
-
-      <method name="endEditing">
-        <parameter name="aShouldRevert"/>
-        <body>
-          <![CDATA[
-            if (!this.isEditing)
-              return;
-
-            Elements.urlbarState.removeAttribute("editing");
-            this.closePopup();
-            this.formatValue();
-
-            if (this.focused)
-              this.blur();
-
-            if (aShouldRevert)
-              this.value = this._lastKnownGoodURL;
-          ]]>
-        </body>
-      </method>
-
-      <!-- URI Submission -->
-
-      <method name="_canonizeURL">
-        <parameter name="aURL"/>
-        <parameter name="aTriggeringEvent"/>
-        <body>
-          <![CDATA[
-            if (!aURL)
-              return "";
-
-            // Only add the suffix when the URL bar value isn't already "URL-like",
-            // and only if we get a keyboard event, to match user expectations.
-            if (/^\s*[^.:\/\s]+(?:\/.*|\s*)$/i.test(aURL)) {
-              let accel = aTriggeringEvent.ctrlKey;
-              let shift = aTriggeringEvent.shiftKey;
-              let suffix = "";
-
-              switch (true) {
-                case (accel && shift):
-                  suffix = ".org/";
-                  break;
-                case (shift):
-                  suffix = ".net/";
-                  break;
-                case (accel):
-                  try {
-                    suffix = gPrefService.getCharPref("browser.fixup.alternate.suffix");
-                    if (suffix.charAt(suffix.length - 1) != "/")
-                      suffix += "/";
-                  } catch(e) {
-                    suffix = ".com/";
-                  }
-                  break;
-              }
-
-              if (suffix) {
-                // trim leading/trailing spaces (bug 233205)
-                aURL = aURL.trim();
-
-                // Tack www. and suffix on.  If user has appended directories, insert
-                // suffix before them (bug 279035).  Be careful not to get two slashes.
-                let firstSlash = aURL.indexOf("/");
-                if (firstSlash >= 0) {
-                  aURL = aURL.substring(0, firstSlash) + suffix + aURL.substring(firstSlash + 1);
-                } else {
-                  aURL = aURL + suffix;
-                }
-                aURL = "http://www." + aURL;
-              }
-            }
-
-            return aURL;
-          ]]>
-        </body>
-      </method>
-
-      <method name="submitURL">
-        <parameter name="aEvent"/>
-        <body>
-          <![CDATA[
-            // If the address was typed in by a user, tidy it up
-            if (aEvent instanceof KeyEvent)
-              this.value = this._canonizeURL(this.value, aEvent);
-
-            this.endEditing();
-            BrowserUI.goToURI(this.value);
-
-            return true;
-          ]]>
-        </body>
-      </method>
-
-      <method name="submitSearch">
-        <parameter name="anEngineName"/>
-        <body>
-          <![CDATA[
-            this.endEditing();
-            BrowserUI.doOpenSearch(anEngineName);
-
-            return true;
-          ]]>
-        </body>
-      </method>
-
-      <!-- nsIObserver -->
-
-      <method name="observe">
-        <parameter name="aSubject"/>
-        <parameter name="aTopic"/>
-        <parameter name="aData"/>
-        <body>
-          <![CDATA[
-            if (aTopic != "nsPref:changed")
-              return;
-
-            switch (aData) {
-              case "browser.urlbar.formatting.enabled":
-                this._mayFormat = Services.prefs.getBoolPref(aData);
-                if (!this._mayFormat) this._clearFormatting();
-                break;
-              case "browser.urlbar.trimURLs":
-                this._mayTrimURLs = Services.prefs.getBoolPref(aData);
-                break;
-              case "browser.urlbar.doubleClickSelectsAll":
-                this._maySelectAll = Services.prefs.getBoolPref(aData);
-                break;
-            }
-          ]]>
-        </body>
-      </method>
-    </implementation>
-
-    <handlers>
-      <!-- Entering editing mode -->
-
-      <handler event="focus" phase="capturing">
-        <![CDATA[
-          this.beginEditing();
-        ]]>
-      </handler>
-
-      <handler event="input" phase="capturing">
-        <![CDATA[
-          // Ensures that paste-and-go actually brings the URL bar into editing mode
-          // and displays the half-height autocomplete popup.
-          this.beginEditing();
-          this.openPopup();
-        ]]>
-      </handler>
-
-      <handler event="click" phase="capturing">
-        <![CDATA[
-          // workaround for bug 925457: taping browser chrome resets last tap
-          // co-ordinates to 'undefined' so that we know not to shift the
-          // browser when the keyboard is up in SelectionHandler's
-          // _calcNewContentPosition().
-          Browser.selectedTab.browser.messageManager.sendAsyncMessage(
-              "Browser:ResetLastPos", {
-                xPos: null,
-                yPos: null
-              });
-          this.beginEditing(true);
-        ]]>
-      </handler>
-
-      <!-- Editing mode behaviors -->
-
-      <handler event="dblclick" phase="capturing">
-        <![CDATA[
-            if (this._maySelectAll) this.select();
-        ]]>
-      </handler>
-
-      <handler event="contextmenu" phase="capturing">
-        <![CDATA[
-          let box = this.inputField.parentNode;
-          box.showContextMenu(this, event, true);
-        ]]>
-      </handler>
-
-      <!-- Leaving editing mode -->
-
-      <handler event="blur" phase="capturing">
-        <![CDATA[
-          this.endEditing();
-        ]]>
-      </handler>
-
-      <handler event="keypress" phase="capturing" keycode="VK_RETURN"
-               modifiers="accel shift any">
-        <![CDATA[
-          if (this.popup.submitSelected())
-            return;
-
-          if (this.submitURL(event))
-            return;
-        ]]>
-      </handler>
-
-      <handler event="keypress" phase="capturing" keycode="VK_UP">
-        <![CDATA[
-          if (!this.popup.hasSelection) {
-            // Treat the first up as a down key to trick handleKeyNavigation() to start
-            // keyboard navigation on autocomplete popup.
-            this.mController.handleKeyNavigation(KeyEvent.DOM_VK_DOWN);
-            event.preventDefault();
-          }
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-  <binding id="urlbar-autocomplete">
-    <content class="meta-section-container" pack="end">
-      <xul:vbox class="meta-section" anonid="results-container" flex="2">
-        <xul:label class="meta-section-title"
-                   value="&autocompleteResultsHeader.label;"/>
-        <richgrid anonid="results" rows="3" minSlots="8"
-                  seltype="single" nocontext="true" deferlayout="true"/>
-      </xul:vbox>
-
-      <xul:vbox class="meta-section" flex="1">
-        <xul:label anonid="searches-header" class="meta-section-title"/>
-        <richgrid anonid="searches" rows="3" flex="1" search="true"
-                  seltype="single" nocontext="true" deferlayout="true"/>
-      </xul:vbox>
-    </content>
-
-    <implementation implements="nsIAutoCompletePopup, nsIObserver">
-      <constructor>
-        <![CDATA[
-          this.hidden = true;
-          Services.obs.addObserver(this, "browser-search-engine-modified", false);
-
-          this._results.controller = this;
-          this._searches.controller = this;
-        ]]>
-      </constructor>
-
-      <destructor>
-        <![CDATA[
-          Services.obs.removeObserver(this, "browser-search-engine-modified");
-        ]]>
-      </destructor>
-
-      <!-- nsIAutocompleteInput -->
-
-      <field name="_input">null</field>
-
-      <property name="input" readonly="true" onget="return this._input;"/>
-      <property name="matchCount" readonly="true" onget="return this.input.controller.matchCount;"/>
-      <property name="popupOpen" readonly="true" onget="return !this.hidden"/>
-      <property name="overrideValue" readonly="true" onget="return null;"/>
-
-      <property name="selectedItem">
-        <getter>
-          <![CDATA[
-            return this._isGridBound(this._results) ? this._results.selectedItem : null;
-          ]]>
-        </getter>
-        <setter>
-          <![CDATA[
-            if (this._isGridBound(this._results)) {
-              this._results.selectedItem = val;
-            }
-          ]]>
-        </setter>
-      </property>
-
-      <property name="selectedIndex">
-        <getter>
-          <![CDATA[
-            return this._isGridBound(this._results) ? this._results.selectedIndex : -1;
-          ]]>
-        </getter>
-        <setter>
-          <![CDATA[
-            if (this._isGridBound(this._results)) {
-              this._results.selectedIndex = val;
-            }
-          ]]>
-        </setter>
-      </property>
-
-      <property name="hasSelection">
-        <getter>
-          <![CDATA[
-            if (!this._isGridBound(this._results) ||
-              !this._isGridBound(this._searches))
-              return false;
-
-            return (this._results.selectedIndex >= 0 ||
-              this._searches.selectedIndex >= 0);
-          ]]>
-        </getter>
-      </property>
-
-      <method name="openAutocompletePopup">
-        <parameter name="aInput"/>
-        <parameter name="aElement"/>
-        <body>
-          <![CDATA[
-            if (this.popupOpen)
-              return;
-
-            ContextUI.dismissContextAppbar();
-
-            this._input = aInput;
-            this._grid = this._results;
-
-            this.clearSelection();
-            this.invalidate();
-
-            let viewstate = this.getAttribute("viewstate");
-            switch (viewstate) {
-              case "portrait":
-              case "snapped":
-                this._results.setAttribute("vertical", true);
-                break;
-              default:
-                this._results.removeAttribute("vertical");
-                break;
-            }
-
-            this._results.arrangeItemsNow();
-            this._searches.arrangeItemsNow();
-
-            this.hidden = false;
-            Elements.urlbarState.setAttribute("autocomplete", "true");
-          ]]>
-        </body>
-      </method>
-
-      <method name="closePopup">
-        <body>
-          <![CDATA[
-            if (!this.popupOpen)
-              return;
-
-            this.input.controller.stopSearch();
-            this.hidden = true;
-            Elements.urlbarState.removeAttribute("autocomplete");
-          ]]>
-        </body>
-      </method>
-
-      <!-- Updating grid content -->
-
-      <field name="_grid">null</field>
-
-      <field name="_results" readonly="true">document.getAnonymousElementByAttribute(this, 'anonid', 'results');</field>
-      <field name="_resultsContainer" readonly="true">document.getAnonymousElementByAttribute(this, 'anonid', 'results-container');</field>
-
-      <field name="_searchesHeader" readonly="true">document.getAnonymousElementByAttribute(this, 'anonid', 'searches-header');</field>
-      <field name="_searches" readonly="true">document.getAnonymousElementByAttribute(this, 'anonid', 'searches');</field>
-
-      <property name="_otherGrid" readonly="true">
-        <getter>
-          <![CDATA[
-            if (this._grid == null)
-              return null;
-
-            return (this._grid == this._results) ? this._searches : this._results;
-          ]]>
-        </getter>
-      </property>
-
-      <method name="_isGridBound">
-        <parameter name="aGrid"/>
-        <body>
-          <![CDATA[
-            return aGrid && aGrid.isBound;
-          ]]>
-        </body>
-      </method>
-
-      <method name="invalidate">
-        <body>
-          <![CDATA[
-            if (!this.popupOpen)
-              return;
-
-            this.updateSearchEngineHeader();
-            this.updateResults();
-          ]]>
-        </body>
-      </method>
-
-      <!-- Updating grid content: results -->
-
-      <method name="updateResults">
-        <body>
-          <![CDATA[
-            if (!this._isGridBound(this._results))
-              return;
-
-            if (!this.input)
-              return;
-
-            let haveNoResults = (this.matchCount == 0);
-
-            if (haveNoResults) {
-              this._results.clearAll();
-              this.setAttribute("nomatch", true);
-              this._resultsContainer.removeAttribute("flex");
-              return;
-            }
-
-            this.removeAttribute("nomatch");
-            this._resultsContainer.setAttribute("flex", 1);
-
-            let controller = this.input.controller;
-            let lastMatch = this.matchCount - 1;
-            let iterCount = Math.max(this._results.itemCount, this.matchCount);
-
-            // Swap out existing items for new search hit results
-            for (let i = 0; i < iterCount; i++) {
-              let item = this._results._slotAt(i);
-              if (i > lastMatch) {
-                item.removeAttribute("value");
-                item.removeAttribute("autocomplete");
-                continue;
-              }
-
-              let value = controller.getValueAt(i);
-              let label = controller.getCommentAt(i) || value;
-              let iconURI = controller.getImageAt(i);
-
-              item.setAttribute("autocomplete", true);
-              item.setAttribute("label", label);
-              item.setAttribute("value", value);
-              item.setAttribute("iconURI", iconURI);
-              let xpFaviconURI = Services.io.newURI(iconURI.replace("moz-anno:favicon:",""), null, null);
-              Task.spawn(function() {
-                let colorInfo = yield ColorUtils.getForegroundAndBackgroundIconColors(xpFaviconURI);
-                if ( !(colorInfo && colorInfo.background && colorInfo.foreground) 
-                     || (item.getAttribute("iconURI") != iconURI) ) {
-                  return;
-                }
-                let { background, foreground } = colorInfo;
-                item.style.color = foreground; //color text
-                item.setAttribute("customColor", background);
-                // when bound, use the setter to propogate the color change through the tile
-                if ('color' in item) {
-                  item.color = background;
-                }
-              }).then(null, err => Components.utils.reportError(err));
-            }
-
-            this._results.arrangeItems();
-          ]]>
-        </body>
-      </method>
-
-      <!-- Updating grid content: search engines -->
-
-      <field name="_engines">[]</field>
-
-      <method name="_initSearchEngines">
-        <body>
-          <![CDATA[
-            Services.search.init(this.updateSearchEngineGrid.bind(this));
-          ]]>
-        </body>
-      </method>
-
-      <method name="updateSearchEngineGrid">
-        <body>
-          <![CDATA[
-            if (!this._isGridBound(this._searches))
-              return;
-
-            this._engines = Services.search.getVisibleEngines();
-
-            while (this._searches.itemCount > 0)
-              this._searches.removeItemAt(0, true);
-
-            this._engines.forEach(function (anEngine) {
-              let item = this._searches.appendItem("", anEngine.name, true);
-              item.setAttribute("autocomplete", "true");
-              item.setAttribute("search", "true");
-
-              let largeImage = anEngine.getIconURLBySize(74,74);
-              if (largeImage) {
-                item.setAttribute("iconsize", "large");
-                item.setAttribute("iconURI", largeImage);
-              } else if (anEngine.iconURI && anEngine.iconURI.spec) {
-                item.setAttribute("iconURI", anEngine.iconURI.spec);
-                item.setAttribute("customColor", "#fff");
-              }
-            }.bind(this));
-
-            this._searches.arrangeItems();
-          ]]>
-        </body>
-      </method>
-
-      <method name="updateSearchEngineHeader">
-        <body>
-          <![CDATA[
-            if (!this._isGridBound(this._searches))
-              return;
-
-            let searchString = this.input.controller.searchString;
-            let label = Strings.browser.formatStringFromName(
-                              "opensearch.search.header", [searchString], 1);
-
-            this._searchesHeader.value = label;
-          ]]>
-        </body>
-      </method>
-
-      <!-- Selecting results -->
-
-      <method name="selectBy">
-        <parameter name="aReverse"/>
-        <parameter name="aPage"/>
-        <body>
-          <![CDATA[
-            if (!this._isGridBound(this._results) ||
-                !this._isGridBound(this._searches))
-              return;
-
-            // Move between grids if we're at the edge of one.
-            if ((this._grid.isSelectionAtEnd && !aReverse) ||
-                (this._grid.isSelectionAtStart && aReverse)) {
-              let index = !aReverse ? 0 : this._otherGrid.itemCount - 1;
-              this._otherGrid.selectedIndex = index;
-            } else {
-              this._grid.offsetSelection(aReverse ? -1 : 1);
-            }
-          ]]>
-        </body>
-      </method>
-
-      <method name="clearSelection">
-        <body>
-          <![CDATA[
-            if (this._isGridBound(this._results))
-              this._results.clearSelection();
-
-            if (this._isGridBound(this._searches))
-              this._searches.clearSelection();
-          ]]>
-        </body>
-      </method>
-
-      <!-- Submitting selected results -->
-
-      <method name="submitSelected">
-        <body>
-          <![CDATA[
-            if (this._isGridBound(this._results) &&
-                this._results.selectedIndex >= 0) {
-              let url = this.input.controller.getValueAt(this._results.selectedIndex);
-              this.input.value = url;
-              return this.input.submitURL();
-            }
-
-            if (this._isGridBound(this._searches) &&
-                this._searches.selectedIndex >= 0) {
-              let engine = this._engines[this._searches.selectedIndex];
-              return this.input.submitSearch(engine.name);
-            }
-
-            return false;
-          ]]>
-        </body>
-      </method>
-
-      <method name="handleItemClick">
-        <parameter name="aItem"/>
-        <parameter name="aEvent"/>
-        <body>
-          <![CDATA[
-            this.submitSelected();
-          ]]>
-        </body>
-      </method>
-
-      <!-- nsIObserver -->
-
-      <method name="observe">
-        <parameter name="aSubject"/>
-        <parameter name="aTopic"/>
-        <parameter name="aData"/>
-        <body>
-          <![CDATA[
-            switch (aTopic) {
-              case "browser-search-engine-modified":
-                this.updateSearchEngineGrid();
-                break;
-            }
-          ]]>
-        </body>
-      </method>
-    </implementation>
-
-    <handlers>
-      <handler event="contentgenerated">
-        <![CDATA[
-          let grid = event.originalTarget;
-
-          if (grid == this._searches)
-            this._initSearchEngines();
-
-          if (grid == this._results)
-            this.updateResults();
-        ]]>
-      </handler>
-
-      <handler event="select">
-        <![CDATA[
-          let grid = event.originalTarget;
-
-          // If a selection was made on a different grid,
-          // remove selection from the current grid.
-          if (grid != this._grid) {
-            this._grid.clearSelection();
-            this._grid = this._otherGrid;
-          }
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bindings.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bindings.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,215 +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/. */
-
-browser[tabmodalPromptShowing] {
-  -moz-user-focus: none !important;
-}
-
-browser[remote="false"] {
-  -moz-binding: url("chrome://browser/content/bindings/browser.xml#local-browser");
-}
-
-browser[remote="true"] {
-  -moz-binding: url("chrome://browser/content/bindings/browser.xml#remote-browser");
-}
-
-#tabs {
-  -moz-binding: url("chrome://browser/content/bindings/tabs.xml#tablist");
-}
-
-documenttab {
-  -moz-binding: url("chrome://browser/content/bindings/tabs.xml#documenttab");
-}
-
-appbar {
-  -moz-binding: url('chrome://browser/content/bindings/appbar.xml#appbarBinding');
-}
-
-flyoutpanel {
-  -moz-binding: url('chrome://browser/content/bindings/flyoutpanel.xml#flyoutpanelBinding');
-}
-cssthrobber {
-  -moz-binding: url('chrome://browser/content/bindings/cssthrobber.xml#cssthrobberBinding');
-}
-label[linewrap] {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#line-wrap-label");
-}
-label[linewrap].text-link, label[onclick][linewrap] {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#line-wrap-text-link");
-}
-
-settings {
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#settings");
-}
-setting {
-  display: none;
-}
-autoscroller {
-  -moz-binding: url('chrome://browser/content/bindings/popup.xml#element-popup');
-}
-
-notificationbox {
-  -moz-binding: url('chrome://browser/content/bindings/notification.xml#notificationbox');
-}
-notification {
-  -moz-binding: url('chrome://browser/content/bindings/notification.xml#notification');
-}
-
-circularprogressindicator {
-  -moz-binding: url('chrome://browser/content/bindings/circularprogress.xml#circular-progress-indicator');
-}
-
-setting[type="bool"] {
-  display: -moz-box;
-  -moz-binding: url("chrome://browser/content/bindings/toggleswitch.xml#setting-fulltoggle-bool");
-}
-
-setting[type="bool"][localized="true"] {
-  display: -moz-box;
-  -moz-binding: url("chrome://browser/content/bindings/toggleswitch.xml#setting-fulltoggle-localized-bool");
-}
-
-setting[type="boolint"] {
-  display: -moz-box;
-  -moz-binding: url("chrome://browser/content/bindings/toggleswitch.xml#setting-fulltoggle-boolint");
-}
-
-setting[type="integer"] {
-  display: -moz-box;
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-integer");
-}
-
-setting[type="control"] {
-  display: -moz-box;
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-control");
-}
-
-setting[type="string"] {
-  display: -moz-box;
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-string");
-}
-
-setting[type="color"] {
-  display: -moz-box;
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-color");
-}
-
-setting[type="file"],
-setting[type="directory"] {
-  display: -moz-box;
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-path");
-}
-
-setting[type="radio"],
-setting[type="menulist"] {
-  display: -moz-box;
-  -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-multi");
-}
-
-#chrome-selection-overlay,
-#content-selection-overlay {
-  -moz-binding: url("chrome://browser/content/bindings/selectionoverlay.xml#selection-binding");
-}
-
-#urlbar-edit {
-  -moz-binding: url("chrome://browser/content/bindings/urlbar.xml#urlbar");
-}
-
-#urlbar-autocomplete {
-  -moz-binding: url("chrome://browser/content/bindings/urlbar.xml#urlbar-autocomplete");
-}
-
-richgrid {
-  -moz-binding: url("chrome://browser/content/bindings/grid.xml#richgrid");
-}
-
-richgriditem {
-  -moz-binding: url("chrome://browser/content/bindings/grid.xml#richgrid-empty-item");
-}
-richgriditem[value] {
-  -moz-binding: url("chrome://browser/content/bindings/grid.xml#richgrid-item");
-}
-
-placeitem {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#place-item");
-  background-color: transparent;
-}
-
-placeitem[type="folder"] {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#place-folder");
-}
-
-placelabel {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#place-label");
-}
-
-radio[type="toggle"] {
-  -moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
-}
-
-radiogroup {
-  -moz-binding: url("chrome://global/content/bindings/radio.xml#radiogroup");
-}
-
-checkbox.toggleswitch {
-  -moz-binding: url("chrome://browser/content/bindings/toggleswitch.xml#checkbox-toggleswitch");
-}
-
-menulist {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#menulist");
-}
-
-.chrome-select-option {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#chrome-select-option");
-}
-
-/* richlist defaults ------------------------------------------------------- */
-richlistbox[batch] {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#richlistbox-batch");
-}
-
-richlistbox[bindingType="contextmenu"] {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#richlistbox-contextmenu");
-}
-
-richlistitem {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#richlistitem");
-}
-
-richlistitem[type="error"],
-richlistitem[type="warning"] {
-  -moz-binding: url("chrome://browser/content/bindings/console.xml#error");
-}
-
-richlistitem[type="message"]{
-  -moz-binding: url("chrome://browser/content/bindings/console.xml#message");
-}
-
-dialog {
-  -moz-binding: url("chrome://browser/content/bindings/dialog.xml#dialog");
-}
-
-/* Do not allow these to inherit from the toolkit binding */
-dialog.content-dialog {
-  -moz-binding: none;
-}
-
-/* Disable context menus in textboxes */
-.textbox-input-box,
-.textbox-input-box[spellcheck="true"] {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#input-box");
-}
-
-textbox {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#textbox");
-}
-
-/* used in about:config */
-textbox[type="search"] {
-  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#search-textbox");
-}
-
-tabmodalprompt {
-  -moz-binding: url("chrome://browser/content/bindings/tabprompts.xml#tabmodalprompt");
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bookmarks.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bookmarks.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/bookmarks.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/bookmarks.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +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/. */
-
-'use strict';
-
-/**
- * Utility singleton for manipulating bookmarks.
- */
-var Bookmarks = {
-  get metroRoot() {
-    return PlacesUtils.annotations.getItemsWithAnnotation('metro/bookmarksRoot', {})[0];
-  },
-
-  logging: false,
-  log: function(msg) {
-    if (this.logging) {
-      Services.console.logStringMessage(msg);
-    }
-  },
-
-  addForURI: function bh_addForURI(aURI, aTitle, callback) {
-    this.isURIBookmarked(aURI, function (isBookmarked) {
-      if (isBookmarked)
-        return;
-
-      let bookmarkTitle = aTitle || aURI.spec;
-      let bookmarkService = PlacesUtils.bookmarks;
-      let bookmarkId = bookmarkService.insertBookmark(Bookmarks.metroRoot,
-                                                      aURI,
-                                                      bookmarkService.DEFAULT_INDEX,
-                                                      bookmarkTitle);
-
-      // XXX Used for browser-chrome tests
-      let event = document.createEvent("Events");
-      event.initEvent("BookmarkCreated", true, false);
-      window.dispatchEvent(event);
-
-      if (callback)
-        callback(bookmarkId);
-    });
-  },
-
-  _isMetroBookmark: function(aItemId) {
-    return PlacesUtils.bookmarks.getFolderIdForItem(aItemId) == Bookmarks.metroRoot;
-  },
-
-  isURIBookmarked: function bh_isURIBookmarked(aURI, callback) {
-    if (!callback)
-      return;
-    PlacesUtils.asyncGetBookmarkIds(aURI, aItemIds => {
-      callback(aItemIds && aItemIds.length > 0 && aItemIds.some(this._isMetroBookmark));
-    });
-  },
-
-  removeForURI: function bh_removeForURI(aURI, callback) {
-    // XXX blargle xpconnect! might not matter, but a method on
-    // nsINavBookmarksService that takes an array of items to
-    // delete would be faster. better yet, a method that takes a URI!
-    PlacesUtils.asyncGetBookmarkIds(aURI, (aItemIds) => {
-      aItemIds.forEach((aItemId) => {
-        if (this._isMetroBookmark(aItemId)) {
-          PlacesUtils.bookmarks.removeItem(aItemId);
-        }
-      });
-
-      if (callback)
-        callback();
-
-      // XXX Used for browser-chrome tests
-      let event = document.createEvent("Events");
-      event.initEvent("BookmarkRemoved", true, false);
-      window.dispatchEvent(event);
-    });
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/browser.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/browser.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/browser.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/browser.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,1639 +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/. */
-
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
-let Cr = Components.results;
-
-Cu.import("resource://gre/modules/PageThumbs.jsm");
-
-// Page for which the start UI is shown
-const kStartURI = "about:newtab";
-
-// allow panning after this timeout on pages with registered touch listeners
-const kTouchTimeout = 300;
-const kSetInactiveStateTimeout = 100;
-
-const kTabThumbnailDelayCapture = 500;
-
-const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-// See grid.xml, we use this to cache style info across loads of the startui.
-var _richgridTileSizes = {};
-
-// Override sizeToContent in the main window. It breaks things (bug 565887)
-window.sizeToContent = function() {
-  Cu.reportError("window.sizeToContent is not allowed in this window");
-}
-
-function getTabModalPromptBox(aWindow) {
-  let browser = Browser.getBrowserForWindow(aWindow);
-  return Browser.getTabModalPromptBox(browser);
-}
-
-/*
- * Returns the browser for the currently displayed tab.
- */
-function getBrowser() {
-  return Browser.selectedBrowser;
-}
-
-var Browser = {
-  _debugEvents: false,
-  _tabs: [],
-  _selectedTab: null,
-  _tabId: 0,
-  windowUtils: window.QueryInterface(Ci.nsIInterfaceRequestor)
-                     .getInterface(Ci.nsIDOMWindowUtils),
-
-  get defaultBrowserWidth() {
-    return window.innerWidth;
-  },
-
-  startup: function startup() {
-    var self = this;
-
-    try {
-      messageManager.loadFrameScript("chrome://browser/content/Util.js", true);
-      messageManager.loadFrameScript("chrome://browser/content/contenthandlers/Content.js", true);
-      messageManager.loadFrameScript("chrome://browser/content/contenthandlers/FormHelper.js", true);
-      messageManager.loadFrameScript("chrome://browser/content/library/SelectionPrototype.js", true);
-      messageManager.loadFrameScript("chrome://browser/content/contenthandlers/SelectionHandler.js", true);
-      messageManager.loadFrameScript("chrome://browser/content/contenthandlers/ContextMenuHandler.js", true);
-      messageManager.loadFrameScript("chrome://browser/content/contenthandlers/ConsoleAPIObserver.js", true);
-      messageManager.loadFrameScript("chrome://browser/content/contenthandlers/PluginHelper.js", true);
-    } catch (e) {
-      // XXX whatever is calling startup needs to dump errors!
-      dump("###########" + e + "\n");
-    }
-
-    if (!Services.metro) {
-      // Services.metro is only available on Windows Metro. We want to be able
-      // to test metro on other platforms, too, so we provide a minimal shim.
-      Services.metro = {
-        activationURI: "",
-        pinTileAsync: function () {},
-        unpinTileAsync: function () {}
-      };
-    }
-
-    /* handles dispatching clicks on browser into clicks in content or zooms */
-    Elements.browsers.customDragger = new Browser.MainDragger();
-
-    /* handles web progress management for open browsers */
-    Elements.browsers.webProgress = WebProgress.init();
-
-    // Call InputSourceHelper first so global listeners get called before
-    // we start processing input in TouchModule.
-    InputSourceHelper.init();
-    ClickEventHandler.init();
-
-    TouchModule.init();
-    GestureModule.init();
-    BrowserTouchHandler.init();
-    PopupBlockerObserver.init();
-    APZCObserver.init();
-
-    // Init the touch scrollbox
-    this.contentScrollbox = Elements.browsers;
-    this.contentScrollboxScroller = {
-      scrollBy: function(aDx, aDy) {
-        let view = getBrowser().getRootView();
-        view.scrollBy(aDx, aDy);
-      },
-
-      scrollTo: function(aX, aY) {
-        let view = getBrowser().getRootView();
-        view.scrollTo(aX, aY);
-      },
-
-      getPosition: function(aScrollX, aScrollY) {
-        let view = getBrowser().getRootView();
-        let scroll = view.getPosition();
-        aScrollX.value = scroll.x;
-        aScrollY.value = scroll.y;
-      }
-    };
-
-    ContentAreaObserver.init();
-
-    function fullscreenHandler() {
-      if (Browser.selectedBrowser.contentWindow.document.mozFullScreenElement)
-        Elements.stack.setAttribute("fullscreen", "true");
-      else
-        Elements.stack.removeAttribute("fullscreen");
-    }
-    window.addEventListener("mozfullscreenchange", fullscreenHandler, true);
-
-    BrowserUI.init();
-
-    window.controllers.appendController(this);
-    window.controllers.appendController(BrowserUI);
-
-    Services.obs.addObserver(SessionHistoryObserver, "browser:purge-session-history", false);
-
-    window.QueryInterface(Ci.nsIDOMChromeWindow).browserDOMWindow = new nsBrowserAccess();
-
-    Elements.browsers.addEventListener("DOMUpdatePageReport", PopupBlockerObserver.onUpdatePageReport, false);
-
-    // Make sure we're online before attempting to load
-    Util.forceOnline();
-
-    // If this is an intial window launch the commandline handler passes us the default
-    // page as an argument.
-    let commandURL = null;
-    try {
-      let argsObj = window.arguments[0].wrappedJSObject;
-      if (argsObj && argsObj.pageloadURL) {
-        // Talos tp-cmdline parameter
-        commandURL = argsObj.pageloadURL;
-      } else if (window.arguments && window.arguments[0]) {
-        // BrowserCLH paramerter
-        commandURL = window.arguments[0];
-      }
-    } catch (ex) {
-      Util.dumpLn(ex);
-    }
-
-    messageManager.addMessageListener("DOMLinkAdded", this);
-    messageManager.addMessageListener("Browser:FormSubmit", this);
-    messageManager.addMessageListener("Browser:CanUnload:Return", this);
-    messageManager.addMessageListener("scroll", this);
-    messageManager.addMessageListener("Browser:CertException", this);
-    messageManager.addMessageListener("Browser:BlockedSite", this);
-
-    Task.spawn(function() {
-      // Activation URIs come from protocol activations, secondary tiles, and file activations
-      let activationURI = yield this.getShortcutOrURI(Services.metro.activationURI);
-
-      let self = this;
-      function loadStartupURI() {
-        if (activationURI) {
-          let webNav = Ci.nsIWebNavigation;
-          let flags = webNav.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP |
-                      webNav.LOAD_FLAGS_FIXUP_SCHEME_TYPOS;
-          self.addTab(activationURI, true, null, { flags: flags });
-        } else {
-          let uri = commandURL || Browser.getHomePage();
-          self.addTab(uri, true);
-        }
-      }
-
-      // Should we restore the previous session (crash or some other event)
-      let ss = Cc["@mozilla.org/browser/sessionstore;1"]
-               .getService(Ci.nsISessionStore);
-      let shouldRestore = ss.shouldRestore();
-      if (shouldRestore) {
-        let bringFront = false;
-        // First open any commandline URLs, except the homepage
-        if (activationURI && activationURI != kStartURI) {
-          this.addTab(activationURI, true, null, { flags: Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP });
-        } else if (commandURL && commandURL != kStartURI) {
-          this.addTab(commandURL, true);
-        } else {
-          bringFront = true;
-          // Initial window resizes call functions that assume a tab is in the tab list
-          // and restored tabs are added too late. We add a dummy to to satisfy the resize
-          // code and then remove the dummy after the session has been restored.
-          let dummy = this.addTab("about:blank", true);
-          let dummyCleanup = {
-            observe: function(aSubject, aTopic, aData) {
-              Services.obs.removeObserver(dummyCleanup, "sessionstore-windows-restored");
-              if (aData == "fail")
-                loadStartupURI();
-              dummy.chromeTab.ignoreUndo = true;
-              Browser.closeTab(dummy, { forceClose: true });
-            }
-          };
-          Services.obs.addObserver(dummyCleanup, "sessionstore-windows-restored", false);
-        }
-        ss.restoreLastSession(bringFront);
-      } else {
-        loadStartupURI();
-      }
-
-      // Notify about our input type
-      InputSourceHelper.fireUpdate();
-
-      // Broadcast a UIReady message so add-ons know we are finished with startup
-      let event = document.createEvent("Events");
-      event.initEvent("UIReady", true, false);
-      window.dispatchEvent(event);
-    }.bind(this));
-  },
-
-  shutdown: function shutdown() {
-    APZCObserver.shutdown();
-    BrowserUI.uninit();
-    ClickEventHandler.uninit();
-    ContentAreaObserver.shutdown();
-    Appbar.shutdown();
-
-    messageManager.removeMessageListener("Browser:FormSubmit", this);
-    messageManager.removeMessageListener("scroll", this);
-    messageManager.removeMessageListener("Browser:CertException", this);
-    messageManager.removeMessageListener("Browser:BlockedSite", this);
-
-    Services.obs.removeObserver(SessionHistoryObserver, "browser:purge-session-history");
-
-    window.controllers.removeController(this);
-    window.controllers.removeController(BrowserUI);
-  },
-
-  getHomePage: function getHomePage(aOptions) {
-    aOptions = aOptions || { useDefault: false };
-
-    let url = kStartURI;
-    try {
-      let prefs = aOptions.useDefault ? Services.prefs.getDefaultBranch(null) : Services.prefs;
-      url = prefs.getComplexValue("browser.startup.homepage", Ci.nsIPrefLocalizedString).data;
-    }
-    catch(e) { }
-
-    return url;
-  },
-
-  get browsers() {
-    return this._tabs.map(function(tab) { return tab.browser; });
-  },
-
-  /**
-   * Load a URI in the current tab, or a new tab if necessary.
-   * @param aURI String
-   * @param aParams Object with optional properties that will be passed to loadURIWithFlags:
-   *    flags, referrerURI, charset, postData.
-   */
-  loadURI: function loadURI(aURI, aParams) {
-    let browser = this.selectedBrowser;
-
-    // We need to keep about: pages opening in new "local" tabs. We also want to spawn
-    // new "remote" tabs if opening web pages from a "local" about: page.
-    dump("loadURI=" + aURI + "\ncurrentURI=" + browser.currentURI.spec + "\n");
-
-    let params = aParams || {};
-    try {
-      let flags = params.flags || Ci.nsIWebNavigation.LOAD_FLAGS_NONE;
-      let postData = ("postData" in params && params.postData) ? params.postData.value : null;
-      let referrerURI = "referrerURI" in params ? params.referrerURI : null;
-      let charset = "charset" in params ? params.charset : null;
-      dump("loading tab: " + aURI + "\n");
-      browser.loadURIWithFlags(aURI, flags, referrerURI, charset, postData);
-    } catch(e) {
-      dump("Error: " + e + "\n");
-    }
-  },
-
-  /**
-   * Determine if the given URL is a shortcut/keyword and, if so, expand it
-   * @param aURL String
-   * @param aPostDataRef Out param contains any required post data for a search
-   * @return {Promise}
-   * @result the expanded shortcut, or the original URL if not a shortcut
-   */
-  getShortcutOrURI: function getShortcutOrURI(aURL, aPostDataRef) {
-    return Task.spawn(function() {
-      if (!aURL)
-        throw new Task.Result(aURL);
-
-      let shortcutURL = null;
-      let keyword = aURL;
-      let param = "";
-
-      let offset = aURL.indexOf(" ");
-      if (offset > 0) {
-        keyword = aURL.substr(0, offset);
-        param = aURL.substr(offset + 1);
-      }
-
-      if (!aPostDataRef)
-        aPostDataRef = {};
-
-      let engine = Services.search.getEngineByAlias(keyword);
-      if (engine) {
-        let submission = engine.getSubmission(param);
-        aPostDataRef.value = submission.postData;
-        throw new Task.Result(submission.uri.spec);
-      }
-
-      try {
-        [shortcutURL, aPostDataRef.value] = PlacesUtils.getURLAndPostDataForKeyword(keyword);
-      } catch (e) {}
-
-      if (!shortcutURL)
-        throw new Task.Result(aURL);
-
-      let postData = "";
-      if (aPostDataRef.value)
-        postData = unescape(aPostDataRef.value);
-
-      if (/%s/i.test(shortcutURL) || /%s/i.test(postData)) {
-        let charset = "";
-        const re = /^(.*)\&mozcharset=([a-zA-Z][_\-a-zA-Z0-9]+)\s*$/;
-        let matches = shortcutURL.match(re);
-        if (matches)
-          [, shortcutURL, charset] = matches;
-        else {
-          // Try to get the saved character-set.
-          try {
-            // makeURI throws if URI is invalid.
-            // Will return an empty string if character-set is not found.
-            charset = yield PlacesUtils.getCharsetForURI(Util.makeURI(shortcutURL));
-          } catch (e) { dump("--- error " + e + "\n"); }
-        }
-
-        let encodedParam = "";
-        if (charset)
-          encodedParam = escape(convertFromUnicode(charset, param));
-        else // Default charset is UTF-8
-          encodedParam = encodeURIComponent(param);
-
-        shortcutURL = shortcutURL.replace(/%s/g, encodedParam).replace(/%S/g, param);
-
-        if (/%s/i.test(postData)) // POST keyword
-          aPostDataRef.value = getPostDataStream(postData, param, encodedParam, "application/x-www-form-urlencoded");
-      } else if (param) {
-        // This keyword doesn't take a parameter, but one was provided. Just return
-        // the original URL.
-        aPostDataRef.value = null;
-
-        throw new Task.Result(aURL);
-      }
-
-      throw new Task.Result(shortcutURL);
-    });
-  },
-
-  /**
-   * Return the currently active <browser> object
-   */
-  get selectedBrowser() {
-    return (this._selectedTab && this._selectedTab.browser);
-  },
-
-  get tabs() {
-    return this._tabs;
-  },
-
-  getTabModalPromptBox: function(aBrowser) {
-    let browser = (aBrowser || getBrowser());
-    let stack = browser.parentNode;
-    let self = this;
-
-    let promptBox = {
-      appendPrompt : function(args, onCloseCallback) {
-          let newPrompt = document.createElementNS(XUL_NS, "tabmodalprompt");
-          newPrompt.setAttribute("promptType", args.promptType);
-          stack.appendChild(newPrompt);
-          browser.setAttribute("tabmodalPromptShowing", true);
-          newPrompt.clientTop; // style flush to assure binding is attached
-
-          let tab = self.getTabForBrowser(browser);
-          tab = tab.chromeTab;
-
-          newPrompt.metroInit(args, tab, onCloseCallback);
-          return newPrompt;
-      },
-
-      removePrompt : function(aPrompt) {
-          stack.removeChild(aPrompt);
-
-          let prompts = this.listPrompts();
-          if (prompts.length) {
-          let prompt = prompts[prompts.length - 1];
-              prompt.Dialog.setDefaultFocus();
-          } else {
-              browser.removeAttribute("tabmodalPromptShowing");
-              browser.focus();
-          }
-      },
-
-      listPrompts : function(aPrompt) {
-          let els = stack.getElementsByTagNameNS(XUL_NS, "tabmodalprompt");
-          // NodeList --> real JS array
-          let prompts = Array.slice(els);
-          return prompts;
-      },
-    };
-
-    return promptBox;
-  },
-
-  getBrowserForWindowId: function getBrowserForWindowId(aWindowId) {
-    for (let i = 0; i < this.browsers.length; i++) {
-      if (this.browsers[i].contentWindowId == aWindowId)
-        return this.browsers[i];
-    }
-    return null;
-  },
-
-  getBrowserForWindow: function(aWindow) {
-    let windowID = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                          .getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
-    return this.getBrowserForWindowId(windowID);
-  },
-
-  getTabForBrowser: function getTabForBrowser(aBrowser) {
-    let tabs = this._tabs;
-    for (let i = 0; i < tabs.length; i++) {
-      if (tabs[i].browser == aBrowser)
-        return tabs[i];
-    }
-    return null;
-  },
-
-  getTabAtIndex: function getTabAtIndex(index) {
-    if (index >= this._tabs.length || index < 0)
-      return null;
-    return this._tabs[index];
-  },
-
-  getTabFromChrome: function getTabFromChrome(chromeTab) {
-    for (var t = 0; t < this._tabs.length; t++) {
-      if (this._tabs[t].chromeTab == chromeTab)
-        return this._tabs[t];
-    }
-    return null;
-  },
-
-  createTabId: function createTabId() {
-    return this._tabId++;
-  },
-
-  /**
-   * Create a new tab and add it to the tab list.
-   *
-   * If you are opening a new foreground tab in response to a user action, use
-   * BrowserUI.addAndShowTab which will also show the tab strip.
-   *
-   * @param aURI String specifying the URL to load.
-   * @param aBringFront Boolean (optional) Open the new tab in the foreground?
-   * @param aOwner Tab object (optional) The "parent" of the new tab.
-   *   This is the tab responsible for opening the new tab.  When the new tab
-   *   is closed, we will return to a parent or "sibling" tab if possible.
-   * @param aParams Object (optional) with optional properties:
-   *   index: Number specifying where in the tab list to insert the new tab.
-   *   private: If true, the new tab should be have Private Browsing active.
-   *   flags, postData, charset, referrerURI: See loadURIWithFlags.
-   */
-  addTab: function browser_addTab(aURI, aBringFront, aOwner, aParams) {
-    let params = aParams || {};
-
-    if (aOwner && !('index' in params)) {
-      // Position the new tab to the right of its owner...
-      params.index = this._tabs.indexOf(aOwner) + 1;
-      // ...and to the right of any siblings.
-      while (this._tabs[params.index] && this._tabs[params.index].owner == aOwner) {
-        params.index++;
-      }
-    }
-
-    let newTab = new Tab(aURI, params, aOwner);
-
-    if (params.index >= 0) {
-      this._tabs.splice(params.index, 0, newTab);
-    } else {
-      this._tabs.push(newTab);
-    }
-
-    if (aBringFront)
-      this.selectedTab = newTab;
-
-    this._announceNewTab(newTab);
-    return newTab;
-  },
-
-  closeTab: function closeTab(aTab, aOptions) {
-    let tab = aTab instanceof XULElement ? this.getTabFromChrome(aTab) : aTab;
-    if (!tab) {
-      return;
-    }
-
-    if (aOptions && "forceClose" in aOptions && aOptions.forceClose) {
-      this._doCloseTab(tab);
-      return;
-    }
-
-    tab.browser.messageManager.sendAsyncMessage("Browser:CanUnload", {});
-  },
-
-  savePage: function() {
-    ContentAreaUtils.saveDocument(this.selectedBrowser.contentWindow.document);
-  },
-
-  /*
-   * helper for addTab related methods. Fires events related to
-   * new tab creation.
-   */
-  _announceNewTab: function (aTab) {
-    let event = document.createEvent("UIEvents");
-    event.initUIEvent("TabOpen", true, false, window, 0);
-    aTab.chromeTab.dispatchEvent(event);
-    aTab.browser.messageManager.sendAsyncMessage("Browser:TabOpen");
-  },
-
-  _doCloseTab: function _doCloseTab(aTab) {
-    if (this._tabs.length === 1) {
-      Browser.addTab(this.getHomePage());
-    }
-
-    let nextTab = this.getNextTab(aTab);
-
-    // Tabs owned by the closed tab are now orphaned.
-    this._tabs.forEach(function(item, index, array) {
-      if (item.owner == aTab)
-        item.owner = null;
-    });
-
-    // tray tab
-    let event = document.createEvent("Events");
-    event.initEvent("TabClose", true, false);
-    aTab.chromeTab.dispatchEvent(event);
-
-    // tab window
-    event = document.createEvent("Events");
-    event.initEvent("TabClose", true, false);
-    aTab.browser.contentWindow.dispatchEvent(event);
-
-    aTab.browser.messageManager.sendAsyncMessage("Browser:TabClose");
-
-    let container = aTab.chromeTab.parentNode;
-    aTab.destroy();
-    this._tabs.splice(this._tabs.indexOf(aTab), 1);
-
-    this.selectedTab = nextTab;
-
-    event = document.createEvent("Events");
-    event.initEvent("TabRemove", true, false);
-    container.dispatchEvent(event);
-  },
-
-  getNextTab: function getNextTab(aTab) {
-    let tabIndex = this._tabs.indexOf(aTab);
-    if (tabIndex == -1)
-      return null;
-
-    if (this._selectedTab == aTab || this._selectedTab.chromeTab.hasAttribute("closing")) {
-      let nextTabIndex = tabIndex + 1;
-      let nextTab = null;
-
-      while (nextTabIndex < this._tabs.length && (!nextTab || nextTab.chromeTab.hasAttribute("closing"))) {
-        nextTab = this.getTabAtIndex(nextTabIndex);
-        nextTabIndex++;
-      }
-
-      nextTabIndex = tabIndex - 1;
-      while (nextTabIndex >= 0 && (!nextTab || nextTab.chromeTab.hasAttribute("closing"))) {
-        nextTab = this.getTabAtIndex(nextTabIndex);
-        nextTabIndex--;
-      }
-
-      if (!nextTab || nextTab.chromeTab.hasAttribute("closing"))
-        return null;
-
-      // If the next tab is not a sibling, switch back to the parent.
-      if (aTab.owner && nextTab.owner != aTab.owner)
-        nextTab = aTab.owner;
-
-      if (!nextTab)
-        return null;
-
-      return nextTab;
-    }
-
-    return this._selectedTab;
-  },
-
-  get selectedTab() {
-    return this._selectedTab;
-  },
-
-  set selectedTab(tab) {
-    if (tab instanceof XULElement)
-      tab = this.getTabFromChrome(tab);
-
-    if (!tab)
-      return;
-
-    if (this._selectedTab == tab) {
-      // Deck does not update its selectedIndex when children
-      // are removed. See bug 602708
-      Elements.browsers.selectedPanel = tab.notification;
-      return;
-    }
-
-    let isFirstTab = this._selectedTab == null;
-    let lastTab = this._selectedTab;
-    let browser = tab.browser;
-
-    this._selectedTab = tab;
-
-    if (lastTab)
-      lastTab.active = false;
-
-    if (tab)
-      tab.active = true;
-
-    BrowserUI.update();
-
-    if (isFirstTab) {
-      BrowserUI._titleChanged(browser);
-    } else {
-      // Update all of our UI to reflect the new tab's location
-      BrowserUI.updateURI();
-
-      let event = document.createEvent("Events");
-      event.initEvent("TabSelect", true, false);
-      event.lastTab = lastTab;
-      tab.chromeTab.dispatchEvent(event);
-    }
-
-    tab.lastSelected = Date.now();
-  },
-
-  supportsCommand: function(cmd) {
-    return false;
-  },
-
-  isCommandEnabled: function(cmd) {
-    return false;
-  },
-
-  doCommand: function(cmd) {
-  },
-
-  getNotificationBox: function getNotificationBox(aBrowser) {
-    let browser = aBrowser || this.selectedBrowser;
-    return browser.parentNode.parentNode;
-  },
-
-  /**
-   * Handle cert exception message from content.
-   */
-  _handleCertException: function _handleCertException(aMessage) {
-    let json = aMessage.json;
-    if (json.action == "leave") {
-      // Get the start page from the *default* pref branch, not the user's
-      let url = Browser.getHomePage({ useDefault: true });
-      this.loadURI(url);
-    } else {
-      // Handle setting an cert exception and reloading the page
-      try {
-        // Add a new SSL exception for this URL
-        let uri = Services.io.newURI(json.url, null, null);
-        let sslExceptions = new SSLExceptions();
-
-        if (json.action == "permanent")
-          sslExceptions.addPermanentException(uri, window);
-        else
-          sslExceptions.addTemporaryException(uri, window);
-      } catch (e) {
-        dump("EXCEPTION handle content command: " + e + "\n" );
-      }
-
-      // Automatically reload after the exception was added
-      aMessage.target.reload();
-    }
-  },
-
-  /**
-   * Handle blocked site message from content.
-   */
-  _handleBlockedSite: function _handleBlockedSite(aMessage) {
-    let formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
-    let json = aMessage.json;
-    switch (json.action) {
-      case "leave": {
-        // Get the start page from the *default* pref branch, not the user's
-        let url = Browser.getHomePage({ useDefault: true });
-        this.loadURI(url);
-        break;
-      }
-      case "report-malware": {
-        // Get the stop badware "why is this blocked" report url, append the current url, and go there.
-        try {
-          let reportURL = formatter.formatURLPref("browser.safebrowsing.malware.reportURL");
-          reportURL += json.url;
-          this.loadURI(reportURL);
-        } catch (e) {
-          Cu.reportError("Couldn't get malware report URL: " + e);
-        }
-        break;
-      }
-      case "report-phishing": {
-        // It's a phishing site, just link to the generic information page
-        let url = Services.urlFormatter.formatURLPref("app.support.baseURL");
-        this.loadURI(url + "phishing-malware");
-        break;
-      }
-    }
-  },
-
-  pinSite: function browser_pinSite() {
-    // Get a path to our app tile
-    var file = Components.classes["@mozilla.org/file/directory_service;1"].
-           getService(Components.interfaces.nsIProperties).
-           get("CurProcD", Components.interfaces.nsIFile);
-    // Get rid of the current working directory's metro subidr
-    file = file.parent;
-    file.append("tileresources");
-    file.append("VisualElements_logo.png");
-    var ios = Components.classes["@mozilla.org/network/io-service;1"].
-              getService(Components.interfaces.nsIIOService);
-    var uriSpec = ios.newFileURI(file).spec;
-    Services.metro.pinTileAsync(this._currentPageTileID,
-                                Browser.selectedBrowser.contentTitle, // short name
-                                Browser.selectedBrowser.contentTitle, // display name
-                                "-url " + Browser.selectedBrowser.currentURI.spec,
-                            uriSpec, uriSpec);
-  },
-
-  get _currentPageTileID() {
-    // We use a unique ID per URL, so just use an MD5 hash of the URL as the ID.
-    let hasher = Cc["@mozilla.org/security/hash;1"].
-                 createInstance(Ci.nsICryptoHash);
-    hasher.init(Ci.nsICryptoHash.MD5);
-    let stringStream = Cc["@mozilla.org/io/string-input-stream;1"].
-                       createInstance(Ci.nsIStringInputStream);
-    stringStream.data = Browser.selectedBrowser.currentURI.spec;
-    hasher.updateFromStream(stringStream, -1);
-    let hashASCII = hasher.finish(true);
-    // Replace '/' with a valid filesystem character
-    return ("FFTileID_" + hashASCII).replace(/\//g, '_');
-  },
-
-  unpinSite: function browser_unpinSite() {
-    if (!Services.metro.immersive)
-      return;
-
-    Services.metro.unpinTileAsync(this._currentPageTileID);
-  },
-
-  isSitePinned: function browser_isSitePinned() {
-    if (!Services.metro.immersive)
-      return false;
-
-    return Services.metro.isTilePinned(this._currentPageTileID);
-  },
-
-  starSite: function browser_starSite(callback) {
-    let uri = this.selectedBrowser.currentURI;
-    let title = this.selectedBrowser.contentTitle;
-
-    Bookmarks.addForURI(uri, title, callback);
-  },
-
-  unstarSite: function browser_unstarSite(callback) {
-    let uri = this.selectedBrowser.currentURI;
-    Bookmarks.removeForURI(uri, callback);
-  },
-
-  isSiteStarredAsync: function browser_isSiteStarredAsync(callback) {
-    let uri = this.selectedBrowser.currentURI;
-    Bookmarks.isURIBookmarked(uri, callback);
-  },
-
-  /**
-   * Convenience function for getting the scrollbox position off of a
-   * scrollBoxObject interface.  Returns the actual values instead of the
-   * wrapping objects.
-   *
-   * @param scroller a scrollBoxObject on which to call scroller.getPosition()
-   */
-  getScrollboxPosition: function getScrollboxPosition(scroller) {
-    let x = {};
-    let y = {};
-    scroller.getPosition(x, y);
-    return new Point(x.value, y.value);
-  },
-
-  forceChromeReflow: function forceChromeReflow() {
-    let dummy = getComputedStyle(document.documentElement, "").width;
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    let json = aMessage.json;
-    let browser = aMessage.target;
-
-    switch (aMessage.name) {
-      case "DOMLinkAdded": {
-        // checks for an icon to use for a web app
-        // apple-touch-icon size is 57px and default size is 16px
-        let rel = json.rel.toLowerCase().split(" ");
-        if (rel.indexOf("icon") != -1) {
-          // We use the sizes attribute if available
-          // see http://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#rel-icon
-          let size = 16;
-          if (json.sizes) {
-            let sizes = json.sizes.toLowerCase().split(" ");
-            sizes.forEach(function(item) {
-              if (item != "any") {
-                let [w, h] = item.split("x");
-                size = Math.max(Math.min(w, h), size);
-              }
-            });
-          }
-          if (size > browser.appIcon.size) {
-            browser.appIcon.href = json.href;
-            browser.appIcon.size = size;
-          }
-        }
-        else if ((rel.indexOf("apple-touch-icon") != -1) && (browser.appIcon.size < 57)) {
-          // XXX should we support apple-touch-icon-precomposed ?
-          // see http://developer.apple.com/safari/library/documentation/appleapplications/reference/safariwebcontent/configuringwebapplications/configuringwebapplications.html
-          browser.appIcon.href = json.href;
-          browser.appIcon.size = 57;
-        }
-        break;
-      }
-      case "Browser:FormSubmit":
-        browser.lastLocation = null;
-        break;
-
-      case "Browser:CanUnload:Return": {
-        if (json.permit) {
-          let tab = this.getTabForBrowser(browser);
-          BrowserUI.animateClosingTab(tab);
-        }
-        break;
-      }
-      case "Browser:CertException":
-        this._handleCertException(aMessage);
-        break;
-      case "Browser:BlockedSite":
-        this._handleBlockedSite(aMessage);
-        break;
-    }
-  },
-};
-
-Browser.MainDragger = function MainDragger() {
-  this._horizontalScrollbar = document.getElementById("horizontal-scroller");
-  this._verticalScrollbar = document.getElementById("vertical-scroller");
-  this._scrollScales = { x: 0, y: 0 };
-
-  Elements.browsers.addEventListener("PanBegin", this, false);
-  Elements.browsers.addEventListener("PanFinished", this, false);
-};
-
-Browser.MainDragger.prototype = {
-  isDraggable: function isDraggable(target, scroller) {
-    return { x: true, y: true };
-  },
-
-  dragStart: function dragStart(clientX, clientY, target, scroller) {
-    let browser = getBrowser();
-    let bcr = browser.getBoundingClientRect();
-    this._contentView = browser.getViewAt(clientX - bcr.left, clientY - bcr.top);
-  },
-
-  dragStop: function dragStop(dx, dy, scroller) {
-    if (this._contentView && this._contentView._updateCacheViewport)
-      this._contentView._updateCacheViewport();
-    this._contentView = null;
-  },
-
-  dragMove: function dragMove(dx, dy, scroller, aIsKinetic) {
-    let doffset = new Point(dx, dy);
-
-    this._panContent(doffset);
-
-    if (aIsKinetic && doffset.x != 0)
-      return false;
-
-    this._updateScrollbars();
-
-    return !doffset.equals(dx, dy);
-  },
-
-  handleEvent: function handleEvent(aEvent) {
-    let browser = getBrowser();
-    switch (aEvent.type) {
-      case "PanBegin": {
-        let width = ContentAreaObserver.width, height = ContentAreaObserver.height;
-        let contentWidth = browser.contentDocumentWidth * browser.scale;
-        let contentHeight = browser.contentDocumentHeight * browser.scale;
-
-        // Allow a small margin on both sides to prevent adding scrollbars
-        // on small viewport approximation
-        const ALLOWED_MARGIN = 5;
-        const SCROLL_CORNER_SIZE = 8;
-        this._scrollScales = {
-          x: (width + ALLOWED_MARGIN) < contentWidth ? (width - SCROLL_CORNER_SIZE) / contentWidth : 0,
-          y: (height + ALLOWED_MARGIN) < contentHeight ? (height - SCROLL_CORNER_SIZE) / contentHeight : 0
-        }
-
-        this._showScrollbars();
-        break;
-      }
-      case "PanFinished":
-        this._hideScrollbars();
-
-        // Update the scroll position of the content
-        browser._updateCSSViewport();
-        break;
-    }
-  },
-
-  _panContent: function md_panContent(aOffset) {
-    if (this._contentView && !this._contentView.isRoot()) {
-      this._panContentView(this._contentView, aOffset);
-      // XXX we may need to have "escape borders" for iframe panning
-      // XXX does not deal with scrollables within scrollables
-    }
-    // Do content panning
-    this._panContentView(getBrowser().getRootView(), aOffset);
-  },
-
-  /** Pan scroller by the given amount. Updates doffset with leftovers. */
-  _panContentView: function _panContentView(contentView, doffset) {
-    let pos0 = contentView.getPosition();
-    contentView.scrollBy(doffset.x, doffset.y);
-    let pos1 = contentView.getPosition();
-    doffset.subtract(pos1.x - pos0.x, pos1.y - pos0.y);
-  },
-
-  _updateScrollbars: function _updateScrollbars() {
-    let scaleX = this._scrollScales.x, scaleY = this._scrollScales.y;
-    let contentScroll = Browser.getScrollboxPosition(Browser.contentScrollboxScroller);
-
-    if (scaleX)
-      this._horizontalScrollbar.style.MozTransform =
-        "translateX(" + Math.round(contentScroll.x * scaleX) + "px)";
-
-    if (scaleY) {
-      let y = Math.round(contentScroll.y * scaleY);
-      let x = 0;
-
-      this._verticalScrollbar.style.MozTransform =
-        "translate(" + x + "px," + y + "px)";
-    }
-  },
-
-  _showScrollbars: function _showScrollbars() {
-    this._updateScrollbars();
-    let scaleX = this._scrollScales.x, scaleY = this._scrollScales.y;
-    if (scaleX) {
-      this._horizontalScrollbar.width = ContentAreaObserver.width * scaleX;
-      this._horizontalScrollbar.setAttribute("panning", "true");
-    }
-
-    if (scaleY) {
-      this._verticalScrollbar.height = ContentAreaObserver.height * scaleY;
-      this._verticalScrollbar.setAttribute("panning", "true");
-    }
-  },
-
-  _hideScrollbars: function _hideScrollbars() {
-    this._scrollScales.x = 0;
-    this._scrollScales.y = 0;
-    this._horizontalScrollbar.removeAttribute("panning");
-    this._verticalScrollbar.removeAttribute("panning");
-    this._horizontalScrollbar.removeAttribute("width");
-    this._verticalScrollbar.removeAttribute("height");
-    this._horizontalScrollbar.style.MozTransform = "";
-    this._verticalScrollbar.style.MozTransform = "";
-  }
-};
-
-
-function nsBrowserAccess() { }
-
-nsBrowserAccess.prototype = {
-  QueryInterface: function(aIID) {
-    if (aIID.equals(Ci.nsIBrowserDOMWindow) || aIID.equals(Ci.nsISupports))
-      return this;
-    throw Cr.NS_NOINTERFACE;
-  },
-
-  _getOpenAction: function _getOpenAction(aURI, aOpener, aWhere, aContext) {
-    let where = aWhere;
-    /*
-     * aWhere:
-     * OPEN_DEFAULTWINDOW: default action
-     * OPEN_CURRENTWINDOW: current window/tab
-     * OPEN_NEWWINDOW: not allowed, converted to newtab below
-     * OPEN_NEWTAB: open a new tab
-     * OPEN_SWITCHTAB: open in an existing tab if it matches, otherwise open
-     * a new tab. afaict we always open these in the current tab.
-     */
-    if (where == Ci.nsIBrowserDOMWindow.OPEN_DEFAULTWINDOW) {
-      // query standard browser prefs indicating what to do for default action
-      switch (aContext) {
-        // indicates this is an open request from a 3rd party app.
-        case Ci.nsIBrowserDOMWindow.OPEN_EXTERNAL :
-          where = Services.prefs.getIntPref("browser.link.open_external");
-          break;
-        // internal request
-        default :
-          where = Services.prefs.getIntPref("browser.link.open_newwindow");
-      }
-    }
-    if (where == Ci.nsIBrowserDOMWindow.OPEN_NEWWINDOW) {
-      Util.dumpLn("Invalid request - we can't open links in new windows.");
-      where = Ci.nsIBrowserDOMWindow.OPEN_NEWTAB;
-    }
-    return where;
-  },
-
-  _getBrowser: function _getBrowser(aURI, aOpener, aWhere, aContext) {
-    let isExternal = (aContext == Ci.nsIBrowserDOMWindow.OPEN_EXTERNAL);
-    // We don't allow externals apps opening chrome docs
-    if (isExternal && aURI && aURI.schemeIs("chrome"))
-      return null;
-
-    let location;
-    let browser;
-    let loadflags = isExternal ?
-                      Ci.nsIWebNavigation.LOAD_FLAGS_FROM_EXTERNAL :
-                      Ci.nsIWebNavigation.LOAD_FLAGS_NONE;
-    let openAction = this._getOpenAction(aURI, aOpener, aWhere, aContext);
-
-    if (openAction == Ci.nsIBrowserDOMWindow.OPEN_NEWTAB) {
-      let owner = isExternal ? null : Browser.selectedTab;
-      let tab = BrowserUI.openLinkInNewTab("about:blank", true, owner);
-      browser = tab.browser;
-    } else {
-      browser = Browser.selectedBrowser;
-    }
-
-    try {
-      let referrer;
-      if (aURI && browser) {
-        if (aOpener) {
-          location = aOpener.location;
-          referrer = Services.io.newURI(location, null, null);
-        }
-        browser.loadURIWithFlags(aURI.spec, loadflags, referrer, null, null);
-      }
-      browser.focus();
-    } catch(e) { }
-
-    return browser;
-  },
-
-  openURI: function browser_openURI(aURI, aOpener, aWhere, aContext) {
-    let browser = this._getBrowser(aURI, aOpener, aWhere, aContext);
-    return browser ? browser.contentWindow : null;
-  },
-
-  openURIInFrame: function browser_openURIInFrame(aURI, aParams, aWhere, aContext) {
-    let browser = this._getBrowser(aURI, null, aWhere, aContext);
-    return browser ? browser.QueryInterface(Ci.nsIFrameLoaderOwner) : null;
-  },
-
-  isTabContentWindow: function(aWindow) {
-    return Browser.browsers.some(function (browser) browser.contentWindow == aWindow);
-  },
-};
-
-/**
- * Handler for blocked popups, triggered by DOMUpdatePageReport events in browser.xml
- */
-var PopupBlockerObserver = {
-  init: function init() {
-    Elements.browsers.addEventListener("mousedown", this, true);
-  },
-
-  handleEvent: function handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "mousedown":
-        let box = Browser.getNotificationBox();
-        let notification = box.getNotificationWithValue("popup-blocked");
-        if (notification && !notification.contains(aEvent.target))
-          box.removeNotification(notification);
-        break;
-    }
-  },
-
-  onUpdatePageReport: function onUpdatePageReport(aEvent) {
-    var cBrowser = Browser.selectedBrowser;
-    if (aEvent.originalTarget != cBrowser)
-      return;
-
-    if (!cBrowser.pageReport)
-      return;
-
-    let result = Services.perms.testExactPermission(Browser.selectedBrowser.currentURI, "popup");
-    if (result == Ci.nsIPermissionManager.DENY_ACTION)
-      return;
-
-    // Only show the notification again if we've not already shown it. Since
-    // notifications are per-browser, we don't need to worry about re-adding
-    // it.
-    if (!cBrowser.pageReport.reported) {
-      if (Services.prefs.getBoolPref("privacy.popups.showBrowserMessage")) {
-        var brandShortName = Strings.brand.GetStringFromName("brandShortName");
-        var popupCount = cBrowser.pageReport.length;
-
-        let strings = Strings.browser;
-        let message = PluralForm.get(popupCount, strings.GetStringFromName("popupWarning.message"))
-                                .replace("#1", brandShortName)
-                                .replace("#2", popupCount);
-
-        var notificationBox = Browser.getNotificationBox();
-        var notification = notificationBox.getNotificationWithValue("popup-blocked");
-        if (notification) {
-          notification.label = message;
-        }
-        else {
-          var buttons = [
-            {
-              isDefault: false,
-              label: strings.GetStringFromName("popupButtonAllowOnce2"),
-              accessKey: "",
-              callback: function() { PopupBlockerObserver.showPopupsForSite(); }
-            },
-            {
-              label: strings.GetStringFromName("popupButtonAlwaysAllow3"),
-              accessKey: "",
-              callback: function() { PopupBlockerObserver.allowPopupsForSite(true); }
-            },
-            {
-              label: strings.GetStringFromName("popupButtonNeverWarn3"),
-              accessKey: "",
-              callback: function() { PopupBlockerObserver.allowPopupsForSite(false); }
-            }
-          ];
-
-          const priority = notificationBox.PRIORITY_WARNING_MEDIUM;
-          notificationBox.appendNotification(message, "popup-blocked",
-                                             "chrome://browser/skin/images/infobar-popup.png",
-                                             priority, buttons);
-        }
-      }
-      // Record the fact that we've reported this blocked popup, so we don't
-      // show it again.
-      cBrowser.pageReport.reported = true;
-    }
-  },
-
-  allowPopupsForSite: function allowPopupsForSite(aAllow) {
-    var currentURI = Browser.selectedBrowser.currentURI;
-    Services.perms.add(currentURI, "popup", aAllow
-                       ?  Ci.nsIPermissionManager.ALLOW_ACTION
-                       :  Ci.nsIPermissionManager.DENY_ACTION);
-
-    Browser.getNotificationBox().removeCurrentNotification();
-  },
-
-  showPopupsForSite: function showPopupsForSite() {
-    let uri = Browser.selectedBrowser.currentURI;
-    let pageReport = Browser.selectedBrowser.pageReport;
-    if (pageReport) {
-      for (let i = 0; i < pageReport.length; ++i) {
-        var popupURIspec = pageReport[i].popupWindowURI.spec;
-
-        // Sometimes the popup URI that we get back from the pageReport
-        // isn't useful (for instance, netscape.com's popup URI ends up
-        // being "http://www.netscape.com", which isn't really the URI of
-        // the popup they're trying to show).  This isn't going to be
-        // useful to the user, so we won't create a menu item for it.
-        if (popupURIspec == "" || !Util.isURLMemorable(popupURIspec) || popupURIspec == uri.spec)
-          continue;
-
-        let popupFeatures = pageReport[i].popupWindowFeatures;
-        let popupName = pageReport[i].popupWindowName;
-
-        Browser.addTab(popupURIspec, false, Browser.selectedTab);
-      }
-    }
-  }
-};
-
-var SessionHistoryObserver = {
-  observe: function sho_observe(aSubject, aTopic, aData) {
-    if (aTopic != "browser:purge-session-history")
-      return;
-
-    let newTab = Browser.addTab("about:start", true);
-    let tab = Browser._tabs[0];
-    while(tab != newTab) {
-      Browser.closeTab(tab, { forceClose: true } );
-      tab = Browser._tabs[0];
-    }
-
-    PlacesUtils.history.removeAllPages();
-
-    // Clear undo history of the URL bar
-    BrowserUI._edit.editor.transactionManager.clear();
-  }
-};
-
-function getNotificationBox(aBrowser) {
-  return Browser.getNotificationBox(aBrowser);
-}
-
-function showDownloadManager(aWindowContext, aID, aReason) {
-  // TODO: Bug 883962: Toggle the downloads infobar as our current "download manager".
-}
-
-function Tab(aURI, aParams, aOwner) {
-  this._id = null;
-  this._browser = null;
-  this._notification = null;
-  this._loading = false;
-  this._progressActive = false;
-  this._progressCount = 0;
-  this._chromeTab = null;
-  this._eventDeferred = null;
-  this._updateThumbnailTimeout = null;
-
-  this._private = false;
-  if ("private" in aParams) {
-    this._private = aParams.private;
-  } else if (aOwner) {
-    this._private = aOwner._private;
-  }
-
-  this.owner = aOwner || null;
-
-  // Set to 0 since new tabs that have not been viewed yet are good tabs to
-  // toss if app needs more memory.
-  this.lastSelected = 0;
-
-  // aParams is an object that contains some properties for the initial tab
-  // loading like flags, a referrerURI, a charset or even a postData.
-  this.create(aURI, aParams || {}, aOwner);
-
-  // default tabs to inactive (i.e. no display port)
-  this.active = false;
-}
-
-Tab.prototype = {
-  get browser() {
-    return this._browser;
-  },
-
-  get notification() {
-    return this._notification;
-  },
-
-  get chromeTab() {
-    return this._chromeTab;
-  },
-
-  get isPrivate() {
-    return this._private;
-  },
-
-  get pageShowPromise() {
-    return this._eventDeferred ? this._eventDeferred.promise : null;
-  },
-
-  startLoading: function startLoading() {
-    if (this._loading) {
-      let stack = new Error().stack;
-      throw "Already Loading!\n" + stack;
-    }
-    this._loading = true;
-  },
-
-  endLoading: function endLoading() {
-    this._loading = false;
-    this.updateFavicon();
-  },
-
-  isLoading: function isLoading() {
-    return this._loading;
-  },
-
-  create: function create(aURI, aParams, aOwner) {
-    this._eventDeferred = Promise.defer();
-
-    this._chromeTab = Elements.tabList.addTab(aParams.index);
-    if (this.isPrivate) {
-      this._chromeTab.setAttribute("private", "true");
-    }
-
-    this._id = Browser.createTabId();
-    let browser = this._createBrowser(aURI, null);
-
-    let self = this;
-    function onPageShowEvent(aEvent) {
-      browser.removeEventListener("pageshow", onPageShowEvent);
-      if (self._eventDeferred) {
-        self._eventDeferred.resolve(self);
-      }
-      self._eventDeferred = null;
-    }
-    browser.addEventListener("pageshow", onPageShowEvent, true);
-    browser.addEventListener("DOMWindowCreated", this, false);
-    browser.addEventListener("StartUIChange", this, false);
-    Elements.browsers.addEventListener("SizeChanged", this, false);
-
-    browser.messageManager.addMessageListener("Content:StateChange", this);
-
-    if (aOwner)
-      this._copyHistoryFrom(aOwner);
-    this._loadUsingParams(browser, aURI, aParams);
-  },
-
-  updateViewport: function (aEvent) {
-    // <meta name=viewport> is not yet supported; just use the browser size.
-    let browser = this.browser;
-
-    // On the start page we add padding to keep the browser above the navbar.
-    let paddingBottom = parseInt(getComputedStyle(browser).paddingBottom, 10);
-    let height = browser.clientHeight - paddingBottom;
-
-    browser.setWindowSize(browser.clientWidth, height);
-  },
-
-  handleEvent: function (aEvent) {
-    switch (aEvent.type) {
-      case "DOMWindowCreated":
-      case "StartUIChange":
-        this.updateViewport();
-        break;
-      case "SizeChanged":
-        this.updateViewport();
-        this._delayUpdateThumbnail();
-        break;
-      case "AlertClose": {
-        if (this == Browser.selectedTab) {
-          this.updateViewport();
-        }
-        break;
-      }
-    }
-  },
-
-  receiveMessage: function(aMessage) {
-    switch (aMessage.name) {
-      case "Content:StateChange":
-        // update the thumbnail now...
-        this.updateThumbnail();
-        // ...and in a little while to capture page after load.
-        if (aMessage.json.stateFlags & Ci.nsIWebProgressListener.STATE_STOP) {
-          this._delayUpdateThumbnail();
-        }
-        break;
-    }
-  },
-
-  _delayUpdateThumbnail: function() {
-    clearTimeout(this._updateThumbnailTimeout);
-    this._updateThumbnailTimeout = setTimeout(() => {
-      this.updateThumbnail();
-    }, kTabThumbnailDelayCapture);
-  },
-
-  destroy: function destroy() {
-    this._browser.messageManager.removeMessageListener("Content:StateChange", this);
-    this._browser.removeEventListener("DOMWindowCreated", this, false);
-    this._browser.removeEventListener("StartUIChange", this, false);
-    Elements.browsers.removeEventListener("SizeChanged", this, false);
-    clearTimeout(this._updateThumbnailTimeout);
-
-    Elements.tabList.removeTab(this._chromeTab);
-    this._chromeTab = null;
-    this._destroyBrowser();
-  },
-
-  resurrect: function resurrect() {
-    let dead = this._browser;
-    let active = this.active;
-
-    // Hold onto the session store data
-    let session = { data: dead.__SS_data, extra: dead.__SS_extdata };
-
-    // We need this data to correctly create and position the new browser
-    // If this browser is already a zombie, fallback to the session data
-    let currentURL = dead.__SS_restore ? session.data.entries[0].url : dead.currentURI.spec;
-    let sibling = dead.nextSibling;
-
-    // Destory and re-create the browser
-    this._destroyBrowser();
-    let browser = this._createBrowser(currentURL, sibling);
-    if (active)
-      this.active = true;
-
-    // Reattach session store data and flag this browser so it is restored on select
-    browser.__SS_data = session.data;
-    browser.__SS_extdata = session.extra;
-    browser.__SS_restore = true;
-  },
-
-  _copyHistoryFrom: function _copyHistoryFrom(tab) {
-    let otherHistory = tab._browser._webNavigation.sessionHistory;
-    let history = this._browser._webNavigation.sessionHistory;
-
-    // Ensure that history is initialized
-    history.QueryInterface(Ci.nsISHistoryInternal);
-
-    for (let i = 0, length = otherHistory.index; i <= length; i++)
-      history.addEntry(otherHistory.getEntryAtIndex(i, false), true);
-  },
-
-  _loadUsingParams: function _loadUsingParams(aBrowser, aURI, aParams) {
-    let flags = aParams.flags || Ci.nsIWebNavigation.LOAD_FLAGS_NONE;
-    let postData = ("postData" in aParams && aParams.postData) ? aParams.postData.value : null;
-    let referrerURI = "referrerURI" in aParams ? aParams.referrerURI : null;
-    let charset = "charset" in aParams ? aParams.charset : null;
-    aBrowser.loadURIWithFlags(aURI, flags, referrerURI, charset, postData);
-  },
-
-  _createBrowser: function _createBrowser(aURI, aInsertBefore) {
-    if (this._browser)
-      throw "Browser already exists";
-
-    // Create a notification box around the browser. Note this includes
-    // the input overlay we use to shade content from input events when
-    // we're intercepting touch input.
-    let notification = this._notification = document.createElement("notificationbox");
-
-    let browser = this._browser = document.createElement("browser");
-    browser.id = "browser-" + this._id;
-    this._chromeTab.linkedBrowser = browser;
-
-    browser.setAttribute("type", "content-targetable");
-
-    let useRemote = Services.appinfo.browserTabsRemoteAutostart;
-    let useLocal = Util.isLocalScheme(aURI);
-    browser.setAttribute("remote", (!useLocal && useRemote) ? "true" : "false");
-
-    // Append the browser to the document, which should start the page load
-    let stack = document.createElementNS(XUL_NS, "stack");
-    stack.className = "browserStack";
-    stack.appendChild(browser);
-    stack.setAttribute("flex", "1");
-    notification.appendChild(stack);
-    Elements.browsers.insertBefore(notification, aInsertBefore);
-
-    notification.dir = "reverse";
-    notification.addEventListener("AlertClose", this);
-
-     // let the content area manager know about this browser.
-    ContentAreaObserver.onBrowserCreated(browser);
-
-    if (this.isPrivate) {
-      let ctx = browser.docShell.QueryInterface(Ci.nsILoadContext);
-      ctx.usePrivateBrowsing = true;
-    }
-
-    // stop about:blank from loading
-    browser.stop();
-
-    return browser;
-  },
-
-  _destroyBrowser: function _destroyBrowser() {
-    if (this._browser) {
-      let notification = this._notification;
-      notification.removeEventListener("AlertClose", this);
-      let browser = this._browser;
-      browser.active = false;
-
-      this._notification = null;
-      this._browser = null;
-      this._loading = false;
-
-      Elements.browsers.removeChild(notification);
-    }
-  },
-
-  updateThumbnail: function updateThumbnail() {
-    if (!this.isPrivate) {
-      PageThumbs.captureToCanvas(this.browser.contentWindow, this._chromeTab.thumbnailCanvas);
-    }
-  },
-
-  updateFavicon: function updateFavicon() {
-    this._chromeTab.updateFavicon(this._browser.mIconURL);
-  },
-
-  set active(aActive) {
-    if (!this._browser)
-      return;
-
-    let notification = this._notification;
-    let browser = this._browser;
-
-    if (aActive) {
-      notification.classList.add("active-tab-notificationbox");
-      browser.setAttribute("type", "content-primary");
-      Elements.browsers.selectedPanel = notification;
-      browser.active = true;
-      Elements.tabList.selectedTab = this._chromeTab;
-      browser.focus();
-    } else {
-      notification.classList.remove("active-tab-notificationbox");
-      browser.messageManager.sendAsyncMessage("Browser:Blur", { });
-      browser.setAttribute("type", "content-targetable");
-      browser.active = false;
-    }
-  },
-
-  get active() {
-    if (!this._browser)
-      return false;
-    return this._browser.getAttribute("type") == "content-primary";
-  },
-
-  toString: function() {
-    return "[Tab " + (this._browser ? this._browser.currentURI.spec : "(no browser)") + "]";
-  }
-};
-
-// Helper used to hide IPC / non-IPC differences for rendering to a canvas
-function rendererFactory(aBrowser, aCanvas) {
-  let wrapper = {};
-
-  if (aBrowser.contentWindow) {
-    let ctx = aCanvas.getContext("2d");
-    let draw = function(browser, aLeft, aTop, aWidth, aHeight, aColor, aFlags) {
-      ctx.drawWindow(browser.contentWindow, aLeft, aTop, aWidth, aHeight, aColor, aFlags);
-      let e = document.createEvent("HTMLEvents");
-      e.initEvent("MozAsyncCanvasRender", true, true);
-      aCanvas.dispatchEvent(e);
-    };
-    wrapper.checkBrowser = function(browser) {
-      return browser.contentWindow;
-    };
-    wrapper.drawContent = function(callback) {
-      callback(ctx, draw);
-    };
-  }
-  else {
-    let ctx = aCanvas.MozGetIPCContext("2d");
-    let draw = function(browser, aLeft, aTop, aWidth, aHeight, aColor, aFlags) {
-      ctx.asyncDrawXULElement(browser, aLeft, aTop, aWidth, aHeight, aColor, aFlags);
-    };
-    wrapper.checkBrowser = function(browser) {
-      return !browser.contentWindow;
-    };
-    wrapper.drawContent = function(callback) {
-      callback(ctx, draw);
-    };
-  }
-
-  return wrapper;
-};
-
-// Based on ClickEventHandler from /browser/base/content/content.js
-let ClickEventHandler = {
-  init: function () {
-    gEventListenerService.addSystemEventListener(Elements.browsers, "click", this, true);
-  },
-
-  uninit: function () {
-    gEventListenerService.removeSystemEventListener(Elements.browsers, "click", this, true);
-  },
-
-  handleEvent: function (aEvent) {
-    if (!aEvent.isTrusted || aEvent.defaultPrevented) {
-      return;
-    }
-    let [href, node] = this._hrefAndLinkNodeForClickEvent(aEvent);
-    if (href && (aEvent.button == 1 || aEvent.ctrlKey)) {
-      // Open link in a new tab for middle-click or ctrl-click
-      BrowserUI.openLinkInNewTab(href, aEvent.shiftKey, Browser.selectedTab);
-    }
-  },
-
-  /**
-   * Extracts linkNode and href for the current click target.
-   *
-   * @param event
-   *        The click event.
-   * @return [href, linkNode].
-   *
-   * @note linkNode will be null if the click wasn't on an anchor
-   *       element (or XLink).
-   */
-  _hrefAndLinkNodeForClickEvent: function(event) {
-    function isHTMLLink(aNode) {
-      return ((aNode instanceof content.HTMLAnchorElement && aNode.href) ||
-              (aNode instanceof content.HTMLAreaElement && aNode.href) ||
-              aNode instanceof content.HTMLLinkElement);
-    }
-
-    let node = event.target;
-    while (node && !isHTMLLink(node)) {
-      node = node.parentNode;
-    }
-
-    if (node)
-      return [node.href, node];
-
-    // If there is no linkNode, try simple XLink.
-    let href, baseURI;
-    node = event.target;
-    while (node && !href) {
-      if (node.nodeType == content.Node.ELEMENT_NODE) {
-        href = node.getAttributeNS("http://www.w3.org/1999/xlink", "href");
-        if (href)
-          baseURI = node.ownerDocument.baseURIObject;
-      }
-      node = node.parentNode;
-    }
-
-    // In case of XLink, we don't return the node we got href from since
-    // callers expect <a>-like elements.
-    // Note: makeURI() will throw if aUri is not a valid URI.
-    return [href ? Services.io.newURI(href, null, baseURI).spec : null, null];
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/browser-scripts.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/browser-scripts.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/browser-scripts.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/browser-scripts.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +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/. */
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-/*
- * JS modules
- */
-
-XPCOMUtils.defineLazyModuleGetter(this, "Downloads",
-                                  "resource://gre/modules/Downloads.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "FormHistory",
-                                  "resource://gre/modules/FormHistory.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-                                  "resource://gre/modules/FileUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
-                                  "resource://gre/modules/PageThumbs.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
-                                  "resource://gre/modules/PluralForm.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
-                                  "resource://gre/modules/PlacesUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
-                                  "resource://gre/modules/NetUtil.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "DownloadUtils",
-                                  "resource://gre/modules/DownloadUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "NewTabUtils",
-                                  "resource://gre/modules/NewTabUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "Promise",
-                                  "resource://gre/modules/Promise.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "ColorUtils",
-                                  "resource:///modules/colorUtils.jsm");
-
-#ifdef NIGHTLY_BUILD
-XPCOMUtils.defineLazyModuleGetter(this, "ShumwayUtils",
-                                  "resource://shumway/ShumwayUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PdfJs",
-                                  "resource://pdf.js/PdfJs.jsm");
-#endif
-
-XPCOMUtils.defineLazyModuleGetter(this, "Task",
-                                  "resource://gre/modules/Task.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "OS",
-                                  "resource://gre/modules/osfile.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "UITelemetry",
-                                  "resource://gre/modules/UITelemetry.jsm");
-
-#ifdef MOZ_UPDATER
-XPCOMUtils.defineLazyModuleGetter(this, "AddonManager",
-                                  "resource://gre/modules/AddonManager.jsm");
-#endif
-
-/*
- * Services
- */
-
-XPCOMUtils.defineLazyServiceGetter(this, "StyleSheetSvc",
-                                   "@mozilla.org/content/style-sheet-service;1",
-                                   "nsIStyleSheetService");
-XPCOMUtils.defineLazyServiceGetter(window, "gHistSvc",
-                                   "@mozilla.org/browser/nav-history-service;1",
-                                   "nsINavHistoryService",
-                                   "nsIBrowserHistory");
-XPCOMUtils.defineLazyServiceGetter(window, "gURIFixup",
-                                   "@mozilla.org/docshell/urifixup;1",
-                                   "nsIURIFixup");
-XPCOMUtils.defineLazyServiceGetter(window, "gFaviconService",
-                                   "@mozilla.org/browser/favicon-service;1",
-                                   "nsIFaviconService");
-XPCOMUtils.defineLazyServiceGetter(window, "gFocusManager",
-                                   "@mozilla.org/focus-manager;1",
-                                   "nsIFocusManager");
-XPCOMUtils.defineLazyServiceGetter(window, "gEventListenerService",
-                                   "@mozilla.org/eventlistenerservice;1",
-                                   "nsIEventListenerService");
-#ifdef MOZ_CRASHREPORTER
-XPCOMUtils.defineLazyServiceGetter(this, "CrashReporter",
-                                   "@mozilla.org/xre/app-info;1",
-                                   "nsICrashReporter");
-#endif
-
-/*
- * window.Rect is used by
- * http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-Rect
- * so it is not possible to set a lazy getter for Geometry.jsm.
- */
-Cu.import("resource://gre/modules/Geometry.jsm");
-/*
- * Browser scripts
- */
-let ScriptContexts = {};
-[
-  ["ContentAreaObserver", "chrome://browser/content/ContentAreaObserver.js"],
-  ["WebProgress", "chrome://browser/content/WebProgress.js"],
-  ["FindHelperUI", "chrome://browser/content/helperui/FindHelperUI.js"],
-  ["FormHelperUI", "chrome://browser/content/helperui/FormHelperUI.js"],
-  ["BrowserTouchHandler", "chrome://browser/content/BrowserTouchHandler.js"],
-  ["AlertsHelper", "chrome://browser/content/helperui/AlertsHelper.js"],
-  ["AutofillMenuUI", "chrome://browser/content/helperui/MenuUI.js"],
-  ["ContextMenuUI", "chrome://browser/content/helperui/MenuUI.js"],
-  ["MenuControlUI", "chrome://browser/content/helperui/MenuUI.js"],
-  ["MenuPopup", "chrome://browser/content/helperui/MenuUI.js"],
-  ["IndexedDB", "chrome://browser/content/helperui/IndexedDB.js"],
-  ["OfflineApps", "chrome://browser/content/helperui/OfflineApps.js"],
-  ["SelectHelperUI", "chrome://browser/content/helperui/SelectHelperUI.js"],
-  ["SelectionHelperUI", "chrome://browser/content/helperui/SelectionHelperUI.js"],
-  ["SelectionPrototype", "chrome://browser/content/library/SelectionPrototype.js"],
-  ["ChromeSelectionHandler", "chrome://browser/content/helperui/ChromeSelectionHandler.js"],
-  ["CommandUpdater", "chrome://browser/content/commandUtil.js"],
-  ["ContextCommands", "chrome://browser/content/ContextCommands.js"],
-  ["Bookmarks", "chrome://browser/content/bookmarks.js"],
-  ["MetroDownloadsView", "chrome://browser/content/downloads.js"],
-  ["ConsolePanelView", "chrome://browser/content/console.js"],
-  ["Site", "chrome://browser/content/Site.js"],
-  ["TopSites", "chrome://browser/content/TopSites.js"],
-  ["Sanitizer", "chrome://browser/content/sanitize.js"],
-  ["SanitizeUI", "chrome://browser/content/sanitizeUI.js"],
-  ["SSLExceptions", "chrome://browser/content/exceptions.js"],
-  ["ItemPinHelper", "chrome://browser/content/helperui/ItemPinHelper.js"],
-  ["NavButtonSlider", "chrome://browser/content/NavButtonSlider.js"],
-  ["ContextUI", "chrome://browser/content/ContextUI.js"],
-  ["FlyoutPanelsUI", "chrome://browser/content/flyoutpanels/FlyoutPanelsUI.js"],
-  ["SettingsCharm", "chrome://browser/content/flyoutpanels/SettingsCharm.js"],
-  ["APZCObserver", "chrome://browser/content/apzc.js"],
-].forEach(function (aScript) {
-  let [name, script] = aScript;
-  XPCOMUtils.defineLazyGetter(window, name, function() {
-    let sandbox;
-    if (script in ScriptContexts) {
-      sandbox = ScriptContexts[script];
-    } else {
-      sandbox = ScriptContexts[script] = {};
-      Services.scriptloader.loadSubScript(script, sandbox);
-    }
-    return sandbox[name];
-  });
-});
-#ifdef MOZ_SERVICES_SYNC
-XPCOMUtils.defineLazyGetter(this, "Weave", function() {
-  Components.utils.import("resource://services-sync/main.js");
-  return Weave;
-});
-#endif
-
-/*
- * Delay load some global scripts using a custom namespace
- */
-XPCOMUtils.defineLazyGetter(this, "GlobalOverlay", function() {
-  let GlobalOverlay = {};
-  Services.scriptloader.loadSubScript("chrome://global/content/globalOverlay.js", GlobalOverlay);
-  return GlobalOverlay;
-});
-
-XPCOMUtils.defineLazyGetter(this, "ContentAreaUtils", function() {
-  let ContentAreaUtils = {};
-  Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", ContentAreaUtils);
-  return ContentAreaUtils;
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/BrowserTouchHandler.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/BrowserTouchHandler.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/BrowserTouchHandler.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/BrowserTouchHandler.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-/*
- * BrowserTouchHandler
- *
- * Receives touch events from our input event capturing in input.js
- * and relays appropriate events to content. Also handles requests
- * from content for UI.
- */
-
-const BrowserTouchHandler = {
-  _debugEvents: false,
-
-  init: function init() {
-    // Misc. events we catch during the bubbling phase
-    document.addEventListener("PopupChanged", this, false);
-    document.addEventListener("CancelTouchSequence", this, false);
-
-    // Messages sent from content.js
-    messageManager.addMessageListener("Content:ContextMenu", this);
-    messageManager.addMessageListener("Content:SelectionCaret", this);
-  },
-
-  // Content forwarding the contextmenu command
-  _onContentContextMenu: function _onContentContextMenu(aMessage) {
-    // Note, target here is the target of the message manager message,
-    // usually the browser.
-    // Touch input selection handling
-    if (!InputSourceHelper.isPrecise &&
-        !SelectionHelperUI.isActive &&
-        SelectionHelperUI.canHandleContextMenuMsg(aMessage)) {
-      SelectionHelperUI.openEditSession(aMessage.target,
-                                        aMessage.json.xPos,
-                                        aMessage.json.yPos);
-      return;
-    }
-
-    // Check to see if we have context menu item(s) that apply to what
-    // was clicked on.
-    let contextInfo = { name: aMessage.name,
-                        json: aMessage.json,
-                        target: aMessage.target };
-    if (ContextMenuUI.showContextMenu(contextInfo)) {
-      let event = document.createEvent("Events");
-      event.initEvent("CancelTouchSequence", true, false);
-      document.dispatchEvent(event);
-    } else {
-      // Send the MozEdgeUIGesture to input.js to
-      // toggle the context ui.
-      let event = document.createEvent("Events");
-      event.initEvent("MozEdgeUICompleted", true, false);
-      window.dispatchEvent(event);
-    }
-  },
-
-  /*
-   * Called when Content wants to initiate selection management
-   * due to a tap in a form input.
-   */
-  _onCaretSelectionStarted: function _onCaretSelectionStarted(aMessage) {
-    SelectionHelperUI.attachToCaret(aMessage.target,
-                                    aMessage.json.xPos,
-                                    aMessage.json.yPos);
-  },
-
-  /*
-   * Events
-   */
-
-  handleEvent: function handleEvent(aEvent) {
-    // ignore content events we generate
-    if (aEvent.target == document)
-      return;
-
-    if (this._debugEvents)
-      Util.dumpLn("BrowserTouchHandler:", aEvent.type);
-
-    switch (aEvent.type) {
-      case "PopupChanged":
-      case "CancelTouchSequence":
-        if (!aEvent.detail)
-          ContextMenuUI.reset();
-        break;
-    }
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    if (this._debugEvents) Util.dumpLn("BrowserTouchHandler:", aMessage.name);
-    switch (aMessage.name) {
-      // Content forwarding the contextmenu command
-      case "Content:ContextMenu":
-        this._onContentContextMenu(aMessage);
-        break;
-      case "Content:SelectionCaret":
-        this._onCaretSelectionStarted(aMessage);
-        break;
-    }
-  },
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/browser-ui.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/browser-ui.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/browser-ui.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/browser-ui.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,1402 +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/devtools/dbg-server.jsm")
-Cu.import("resource://gre/modules/WindowsPrefSync.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent",
-                                  "resource://gre/modules/LoginManagerParent.jsm");
-
-/**
- * Constants
- */
-
-// Devtools Messages
-const debugServerStateChanged = "devtools.debugger.remote-enabled";
-const debugServerPortChanged = "devtools.debugger.remote-port";
-
-// delay when showing the tab bar briefly after a new foreground tab opens
-const kForegroundTabAnimationDelay = 1000;
-// delay when showing the tab bar after opening a new background tab opens
-const kBackgroundTabAnimationDelay = 3000;
-// delay before closing tab bar after closing or selecting a tab
-const kChangeTabAnimationDelay = 500;
-
-/**
- * Cache of commonly used elements.
- */
-
-let Elements = {};
-[
-  ["contentShowing",     "bcast_contentShowing"],
-  ["urlbarState",        "bcast_urlbarState"],
-  ["loadingState",       "bcast_loadingState"],
-  ["windowState",        "bcast_windowState"],
-  ["chromeState",        "bcast_chromeState"],
-  ["mainKeyset",         "mainKeyset"],
-  ["stack",              "stack"],
-  ["tabList",            "tabs"],
-  ["tabs",               "tabs-container"],
-  ["controls",           "browser-controls"],
-  ["panelUI",            "panel-container"],
-  ["tray",               "tray"],
-  ["toolbar",            "toolbar"],
-  ["browsers",           "browsers"],
-  ["navbar",             "navbar"],
-  ["autocomplete",       "urlbar-autocomplete"],
-  ["contextappbar",      "contextappbar"],
-  ["findbar",            "findbar"],
-  ["contentViewport",    "content-viewport"],
-  ["progress",           "progress-control"],
-  ["progressContainer",  "progress-container"],
-  ["feedbackLabel",  "feedback-label"],
-].forEach(function (aElementGlobal) {
-  let [name, id] = aElementGlobal;
-  XPCOMUtils.defineLazyGetter(Elements, name, function() {
-    return document.getElementById(id);
-  });
-});
-
-/**
- * Cache of commonly used string bundles.
- */
-
-var Strings = {};
-[
-  ["browser",    "chrome://browser/locale/browser.properties"],
-  ["brand",      "chrome://branding/locale/brand.properties"]
-].forEach(function (aStringBundle) {
-  let [name, bundle] = aStringBundle;
-  XPCOMUtils.defineLazyGetter(Strings, name, function() {
-    return Services.strings.createBundle(bundle);
-  });
-});
-
-var BrowserUI = {
-  get _edit() { return document.getElementById("urlbar-edit"); },
-  get _back() { return document.getElementById("cmd_back"); },
-  get _forward() { return document.getElementById("cmd_forward"); },
-
-  lastKnownGoodURL: "", // used when the user wants to escape unfinished url entry
-  ready: false, // used for tests to determine when delayed initialization is done
-
-  init: function() {
-    // start the debugger now so we can use it on the startup code as well
-    if (Services.prefs.getBoolPref(debugServerStateChanged)) {
-      this.runDebugServer();
-    }
-    Services.prefs.addObserver(debugServerStateChanged, this, false);
-    Services.prefs.addObserver(debugServerPortChanged, this, false);
-    Services.prefs.addObserver("app.crashreporter.autosubmit", this, false);
-    Services.prefs.addObserver("metro.private_browsing.enabled", this, false);
-    this.updatePrivateBrowsingUI();
-
-    Services.obs.addObserver(this, "handle-xul-text-link", false);
-
-    // listen content messages
-    messageManager.addMessageListener("DOMTitleChanged", this);
-    messageManager.addMessageListener("DOMWillOpenModalDialog", this);
-    messageManager.addMessageListener("DOMWindowClose", this);
-
-    messageManager.addMessageListener("Browser:OpenURI", this);
-    messageManager.addMessageListener("Browser:SaveAs:Return", this);
-    messageManager.addMessageListener("Content:StateChange", this);
-
-    // listening escape to dismiss dialog on VK_ESCAPE
-    window.addEventListener("keypress", this, true);
-
-    window.addEventListener("MozPrecisePointer", this, true);
-    window.addEventListener("MozImprecisePointer", this, true);
-
-    window.addEventListener("AppCommand", this, true);
-
-    Services.prefs.addObserver("browser.cache.disk_cache_ssl", this, false);
-
-    // Init core UI modules
-    ContextUI.init();
-    PanelUI.init();
-    FlyoutPanelsUI.init();
-    PageThumbs.init();
-    NewTabUtils.init();
-    SettingsCharm.init();
-    NavButtonSlider.init();
-    SelectionHelperUI.init();
-#ifdef NIGHTLY_BUILD
-    ShumwayUtils.init();
-#endif
-
-    // We can delay some initialization until after startup.  We wait until
-    // the first page is shown, then dispatch a UIReadyDelayed event.
-    messageManager.addMessageListener("pageshow", function onPageShow() {
-      if (getBrowser().currentURI.spec == "about:blank")
-        return;
-
-      messageManager.removeMessageListener("pageshow", onPageShow);
-
-      setTimeout(function() {
-        let event = document.createEvent("Events");
-        event.initEvent("UIReadyDelayed", true, false);
-        window.dispatchEvent(event);
-        BrowserUI.ready = true;
-      }, 0);
-    });
-
-    // Only load IndexedDB.js when we actually need it. A general fix will happen in bug 647079.
-    messageManager.addMessageListener("IndexedDB:Prompt", function(aMessage) {
-      return IndexedDB.receiveMessage(aMessage);
-    });
-
-    // hook up telemetry ping for UI data
-    try {
-      UITelemetry.addSimpleMeasureFunction("metro-ui",
-                                           BrowserUI._getMeasures.bind(BrowserUI));
-    } catch (ex) {
-      // swallow exception that occurs if metro-appbar measure is already set up
-      dump("Failed to addSimpleMeasureFunction in browser-ui: " + ex.message + "\n");
-    }
-
-    // Delay the panel UI and Sync initialization
-    window.addEventListener("UIReadyDelayed", function delayedInit(aEvent) {
-      Util.dumpLn("* delay load started...");
-      window.removeEventListener("UIReadyDelayed",  delayedInit, false);
-
-      messageManager.addMessageListener("Browser:MozApplicationManifest", OfflineApps);
-
-      try {
-        MetroDownloadsView.init();
-        DialogUI.init();
-        FormHelperUI.init();
-        FindHelperUI.init();
-        LoginManagerParent.init();
-#ifdef NIGHTLY_BUILD
-        PdfJs.init();
-#endif
-      } catch(ex) {
-        Util.dumpLn("Exception in delay load module:", ex.message);
-      }
-
-      BrowserUI._initFirstRunContent();
-
-      // check for left over crash reports and submit them if found.
-      BrowserUI.startupCrashCheck();
-
-      Util.dumpLn("* delay load complete.");
-    }, false);
-
-#ifndef MOZ_OFFICIAL_BRANDING
-    setTimeout(function() {
-      let startup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup).getStartupInfo();
-      for (let name in startup) {
-        if (name != "process")
-          Services.console.logStringMessage("[timing] " + name + ": " + (startup[name] - startup.process) + "ms");
-      }
-    }, 3000);
-#endif
-  },
-
-  uninit: function() {
-    messageManager.removeMessageListener("DOMTitleChanged", this);
-    messageManager.removeMessageListener("DOMWillOpenModalDialog", this);
-    messageManager.removeMessageListener("DOMWindowClose", this);
-
-    messageManager.removeMessageListener("Browser:OpenURI", this);
-    messageManager.removeMessageListener("Browser:SaveAs:Return", this);
-    messageManager.removeMessageListener("Content:StateChange", this);
-
-    messageManager.removeMessageListener("Browser:MozApplicationManifest", OfflineApps);
-
-    Services.prefs.removeObserver(debugServerStateChanged, this);
-    Services.prefs.removeObserver(debugServerPortChanged, this);
-    Services.prefs.removeObserver("app.crashreporter.autosubmit", this);
-    Services.prefs.removeObserver("metro.private_browsing.enabled", this);
-
-    Services.obs.removeObserver(this, "handle-xul-text-link");
-
-    PanelUI.uninit();
-    FlyoutPanelsUI.uninit();
-    MetroDownloadsView.uninit();
-    SettingsCharm.uninit();
-    PageThumbs.uninit();
-    if (WindowsPrefSync) {
-      WindowsPrefSync.uninit();
-    }
-    this.stopDebugServer();
-  },
-
-  /************************************
-   * Devtools Debugger
-   */
-  runDebugServer: function runDebugServer(aPort) {
-    let port = aPort || Services.prefs.getIntPref(debugServerPortChanged);
-    if (!DebuggerServer.initialized) {
-      DebuggerServer.init();
-      DebuggerServer.addBrowserActors();
-      DebuggerServer.addActors('chrome://browser/content/dbg-metro-actors.js');
-    }
-    let listener = DebuggerServer.createListener();
-    listener.portOrPath = port;
-    listener.open();
-  },
-
-  stopDebugServer: function stopDebugServer() {
-    if (DebuggerServer.initialized) {
-      DebuggerServer.destroy();
-    }
-  },
-
-  // If the server is not on, port changes have nothing to effect. The new value
-  //    will be picked up if the server is started.
-  // To be consistent with desktop fx, if the port is changed while the server
-  //    is running, restart server.
-  changeDebugPort:function changeDebugPort(aPort) {
-    if (DebuggerServer.initialized) {
-      this.stopDebugServer();
-      this.runDebugServer(aPort);
-    }
-  },
-
-  /*********************************
-   * Content visibility
-   */
-
-  get isContentShowing() {
-    return Elements.contentShowing.getAttribute("disabled") != true;
-  },
-
-  showContent: function showContent(aURI) {
-    ContextUI.dismissTabs();
-    ContextUI.dismissContextAppbar();
-    FlyoutPanelsUI.hide();
-    PanelUI.hide();
-  },
-
-  /*********************************
-   * Crash reporting
-   */
-
-  get CrashSubmit() {
-    delete this.CrashSubmit;
-    Cu.import("resource://gre/modules/CrashSubmit.jsm", this);
-    return this.CrashSubmit;
-  },
-
-  get lastCrashID() {
-    return Cc["@mozilla.org/xre/runtime;1"].getService(Ci.nsIXULRuntime).lastRunCrashID;
-  },
-
-  startupCrashCheck: function startupCrashCheck() {
-#ifdef MOZ_CRASHREPORTER
-    if (!CrashReporter.enabled) {
-      return;
-    }
-
-    // Ensure that CrashReporter state matches pref
-    CrashReporter.submitReports = Services.prefs.getBoolPref("app.crashreporter.autosubmit");
-
-    BrowserUI.submitLastCrashReportOrShowPrompt();
-#endif
-  },
-
-
-  /*********************************
-   * Navigation
-   */
-
-  // BrowserUI update bit flags
-  NO_STARTUI_VISIBILITY:  1, // don't change the start ui visibility
-
-  /*
-   * Updates the overall state of startui visibility and the toolbar, but not
-   * the URL bar.
-   */
-  update: function(aFlags) {
-    let flags = aFlags || 0;
-    if (!(flags & this.NO_STARTUI_VISIBILITY)) {
-      let uri = this.getDisplayURI(Browser.selectedBrowser);
-      this.updateStartURIAttributes(uri);
-    }
-    this._updateButtons();
-    this._updateToolbar();
-  },
-
-  /* Updates the URL bar. */
-  updateURI: function(aOptions) {
-    let uri = this.getDisplayURI(Browser.selectedBrowser);
-    let cleanURI = Util.isURLEmpty(uri) ? "" : uri;
-    this._edit.value = cleanURI;
-  },
-
-  get isStartTabVisible() {
-    return this.isStartURI();
-  },
-
-  isStartURI: function isStartURI(aURI) {
-    aURI = aURI || Browser.selectedBrowser.currentURI.spec;
-    return aURI.startsWith(kStartURI) || aURI == "about:start" || aURI == "about:home";
-  },
-
-  updateStartURIAttributes: function (aURI) {
-    let wasStart = Elements.windowState.hasAttribute("startpage");
-    aURI = aURI || Browser.selectedBrowser.currentURI.spec;
-    if (this.isStartURI(aURI)) {
-      ContextUI.displayNavbar();
-      Elements.windowState.setAttribute("startpage", "true");
-    } else if (aURI != "about:blank") { // about:blank is loaded briefly for new tabs; ignore it
-      Elements.windowState.removeAttribute("startpage");
-    }
-
-    let isStart = Elements.windowState.hasAttribute("startpage");
-    if (wasStart != isStart) {
-      let event = document.createEvent("Events");
-      event.initEvent("StartUIChange", true, true);
-      Browser.selectedBrowser.dispatchEvent(event);
-    }
-  },
-
-  getDisplayURI: function(browser) {
-    let uri = browser.currentURI;
-    let spec = uri.spec;
-
-    try {
-      spec = gURIFixup.createExposableURI(uri).spec;
-    } catch (ex) {}
-
-    try {
-      let charset = browser.characterSet;
-      let textToSubURI = Cc["@mozilla.org/intl/texttosuburi;1"].
-                         getService(Ci.nsITextToSubURI);
-      spec = textToSubURI.unEscapeNonAsciiURI(charset, spec);
-    } catch (ex) {}
-
-    return spec;
-  },
-
-  goToURI: function(aURI) {
-    aURI = aURI || this._edit.value;
-    if (!aURI)
-      return;
-
-    this._edit.value = aURI;
-
-    // Make sure we're online before attempting to load
-    Util.forceOnline();
-
-    BrowserUI.showContent(aURI);
-    Browser.selectedBrowser.focus();
-
-    Task.spawn(function() {
-      let postData = {};
-      let webNav = Ci.nsIWebNavigation;
-      let flags = webNav.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP |
-                  webNav.LOAD_FLAGS_FIXUP_SCHEME_TYPOS;
-      aURI = yield Browser.getShortcutOrURI(aURI, postData);
-      Browser.loadURI(aURI, { flags: flags, postData: postData });
-
-      // Delay doing the fixup so the raw URI is passed to loadURIWithFlags
-      // and the proper third-party fixup can be done
-      let fixupFlags = Ci.nsIURIFixup.FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP |
-                       Ci.nsIURIFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS;
-      let uri = gURIFixup.createFixupURI(aURI, fixupFlags);
-      gHistSvc.markPageAsTyped(uri);
-
-      BrowserUI._titleChanged(Browser.selectedBrowser);
-    });
-  },
-
-  doOpenSearch: function doOpenSearch(aName) {
-    // save the current value of the urlbar
-    let searchValue = this._edit.value;
-    let engine = Services.search.getEngineByName(aName);
-    let submission = engine.getSubmission(searchValue, null);
-
-    this._edit.value = submission.uri.spec;
-
-    // Make sure we're online before attempting to load
-    Util.forceOnline();
-
-    BrowserUI.showContent();
-    Browser.selectedBrowser.focus();
-
-    Task.spawn(function () {
-      Browser.loadURI(submission.uri.spec, { postData: submission.postData });
-
-      // loadURI may open a new tab, so get the selectedBrowser afterward.
-      Browser.selectedBrowser.userTypedValue = submission.uri.spec;
-      BrowserUI._titleChanged(Browser.selectedBrowser);
-    });
-  },
-
-  /*********************************
-   * Tab management
-   */
-
-  /**
-   * Open a new tab in the foreground in response to a user action.
-   * See Browser.addTab for more documentation.
-   */
-  addAndShowTab: function (aURI, aOwner, aParams) {
-    ContextUI.peekTabs(kForegroundTabAnimationDelay);
-    return Browser.addTab(aURI || kStartURI, true, aOwner, aParams);
-  },
-
-  addAndShowPrivateTab: function (aURI, aOwner) {
-    return this.addAndShowTab(aURI, aOwner, { private: true });
-  },
-
-  get isPrivateBrowsingEnabled() {
-    return Services.prefs.getBoolPref("metro.private_browsing.enabled");
-  },
-
-  updatePrivateBrowsingUI: function () {
-    let command = document.getElementById("cmd_newPrivateTab");
-    if (this.isPrivateBrowsingEnabled) {
-      command.removeAttribute("disabled");
-    } else {
-      command.setAttribute("disabled", "true");
-    }
-  },
-
-  /**
-   * Open a new tab in response to clicking a link in an existing tab.
-   * See Browser.addTab for more documentation.
-   */
-  openLinkInNewTab: function (aURI, aBringFront, aOwner) {
-    ContextUI.peekTabs(aBringFront ? kForegroundTabAnimationDelay
-                                   : kBackgroundTabAnimationDelay);
-    let params = null;
-    if (aOwner) {
-      params = {
-        referrerURI: aOwner.browser.documentURI,
-        charset: aOwner.browser.characterSet,
-      };
-    }
-    let tab = Browser.addTab(aURI, aBringFront, aOwner, params);
-    Elements.tabList.strip.ensureElementIsVisible(tab.chromeTab);
-    return tab;
-  },
-
-  setOnTabAnimationEnd: function setOnTabAnimationEnd(aCallback) {
-    Elements.tabs.addEventListener("animationend", function onAnimationEnd() {
-      Elements.tabs.removeEventListener("animationend", onAnimationEnd);
-      aCallback();
-    });
-  },
-
-  closeTab: function closeTab(aTab) {
-    // If no tab is passed in, assume the current tab
-    let tab = aTab || Browser.selectedTab;
-    Browser.closeTab(tab);
-  },
-
-  animateClosingTab: function animateClosingTab(tabToClose) {
-    tabToClose.chromeTab.setAttribute("closing", "true");
-
-    let wasCollapsed = !ContextUI.tabbarVisible;
-    if (wasCollapsed) {
-      ContextUI.displayTabs();
-    }
-
-    this.setOnTabAnimationEnd(function() {
-      Browser.closeTab(tabToClose, { forceClose: true } );
-      if (wasCollapsed)
-        ContextUI.dismissTabsWithDelay(kChangeTabAnimationDelay);
-    });
-  },
-
-  /**
-    * Re-open a closed tab.
-    * @param aIndex
-    *        The index of the tab (via nsSessionStore.getClosedTabData)
-    * @returns a reference to the reopened tab.
-    */
-  undoCloseTab: function undoCloseTab(aIndex) {
-    var tab = null;
-    aIndex = aIndex || 0;
-    var ss = Cc["@mozilla.org/browser/sessionstore;1"].
-                getService(Ci.nsISessionStore);
-    if (ss.getClosedTabCount(window) > (aIndex)) {
-      tab = ss.undoCloseTab(window, aIndex);
-    }
-    return tab;
-  },
-
-  // Useful for when we've received an event to close a particular DOM window.
-  // Since we don't have windows, we want to close the corresponding tab.
-  closeTabForBrowser: function closeTabForBrowser(aBrowser) {
-    // Find the relevant tab, and close it.
-    let browsers = Browser.browsers;
-    for (let i = 0; i < browsers.length; i++) {
-      if (browsers[i] == aBrowser) {
-        Browser.closeTab(Browser.getTabAtIndex(i));
-        return { preventDefault: true };
-      }
-    }
-
-    return {};
-  },
-
-  selectTab: function selectTab(aTab) {
-    Browser.selectedTab = aTab;
-  },
-
-  selectTabAndDismiss: function selectTabAndDismiss(aTab) {
-    this.selectTab(aTab);
-    ContextUI.dismissTabsWithDelay(kChangeTabAnimationDelay);
-  },
-
-  selectTabAtIndex: function selectTabAtIndex(aIndex) {
-    // count backwards for aIndex < 0
-    if (aIndex < 0)
-      aIndex += Browser._tabs.length;
-
-    if (aIndex >= 0 && aIndex < Browser._tabs.length)
-      Browser.selectedTab = Browser._tabs[aIndex];
-  },
-
-  selectNextTab: function selectNextTab() {
-    if (Browser._tabs.length == 1 || !Browser.selectedTab) {
-     return;
-    }
-
-    let tabIndex = Browser._tabs.indexOf(Browser.selectedTab) + 1;
-    if (tabIndex >= Browser._tabs.length) {
-      tabIndex = 0;
-    }
-
-    Browser.selectedTab = Browser._tabs[tabIndex];
-  },
-
-  selectPreviousTab: function selectPreviousTab() {
-    if (Browser._tabs.length == 1 || !Browser.selectedTab) {
-      return;
-    }
-
-    let tabIndex = Browser._tabs.indexOf(Browser.selectedTab) - 1;
-    if (tabIndex < 0) {
-      tabIndex = Browser._tabs.length - 1;
-    }
-
-    Browser.selectedTab = Browser._tabs[tabIndex];
-  },
-
-  // Used for when we're about to open a modal dialog,
-  // and want to ensure the opening tab is in front.
-  selectTabForBrowser: function selectTabForBrowser(aBrowser) {
-    for (let i = 0; i < Browser.tabs.length; i++) {
-      if (Browser._tabs[i].browser == aBrowser) {
-        Browser.selectedTab = Browser.tabs[i];
-        break;
-      }
-    }
-  },
-
-  updateUIFocus: function _updateUIFocus() {
-    if (Elements.contentShowing.getAttribute("disabled") == "true" && Browser.selectedBrowser)
-      Browser.selectedBrowser.messageManager.sendAsyncMessage("Browser:Blur", { });
-  },
-
-  blurFocusedElement: function blurFocusedElement() {
-    let focusedElement = document.commandDispatcher.focusedElement;
-    if (focusedElement)
-      focusedElement.blur();
-  },
-
-  blurNavBar: function blurNavBar() {
-    if (this._edit.focused) {
-      this._edit.blur();
-
-      // Advanced notice to CAO, so we can shuffle the nav bar in advance
-      // of the keyboard transition.
-      ContentAreaObserver.navBarWillBlur();
-
-      return true;
-    }
-    return false;
-  },
-
-  observe: function BrowserUI_observe(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "handle-xul-text-link":
-        let handled = aSubject.QueryInterface(Ci.nsISupportsPRBool);
-        if (!handled.data) {
-          this.addAndShowTab(aData, Browser.selectedTab);
-          handled.data = true;
-        }
-        break;
-      case "nsPref:changed":
-        switch (aData) {
-          case "browser.cache.disk_cache_ssl":
-            this._sslDiskCacheEnabled = Services.prefs.getBoolPref(aData);
-            break;
-          case debugServerStateChanged:
-            if (Services.prefs.getBoolPref(aData)) {
-              this.runDebugServer();
-            } else {
-              this.stopDebugServer();
-            }
-            break;
-          case debugServerPortChanged:
-            this.changeDebugPort(Services.prefs.getIntPref(aData));
-            break;
-          case "app.crashreporter.autosubmit":
-#ifdef MOZ_CRASHREPORTER
-            CrashReporter.submitReports = Services.prefs.getBoolPref(aData);
-
-            // The user explicitly set the autosubmit option, so there is no
-            // need to prompt them about crash reporting in the future
-            Services.prefs.setBoolPref("app.crashreporter.prompted", true);
-
-            BrowserUI.submitLastCrashReportOrShowPrompt;
-#endif
-            break;
-          case "metro.private_browsing.enabled":
-            this.updatePrivateBrowsingUI();
-            break;
-        }
-        break;
-    }
-  },
-
-  submitLastCrashReportOrShowPrompt: function() {
-#ifdef MOZ_CRASHREPORTER
-    let lastCrashID = this.lastCrashID;
-    if (lastCrashID && lastCrashID.length) {
-      if (Services.prefs.getBoolPref("app.crashreporter.autosubmit")) {
-        Util.dumpLn("Submitting last crash id:", lastCrashID);
-        let params = {};
-        if (!Services.prefs.getBoolPref("app.crashreporter.submitURLs")) {
-          params['extraExtraKeyVals'] = { URL: '' };
-        }
-        try {
-          this.CrashSubmit.submit(lastCrashID, params);
-        } catch (ex) {
-          Util.dumpLn(ex);
-        }
-      } else if (!Services.prefs.getBoolPref("app.crashreporter.prompted")) {
-        BrowserUI.addAndShowTab("about:crashprompt", null);
-      }
-    }
-#endif
-  },
-
-
-
-  /*********************************
-   * Internal utils
-   */
-
-  _titleChanged: function(aBrowser) {
-    let url = this.getDisplayURI(aBrowser);
-
-    let tabCaption;
-    if (aBrowser.contentTitle) {
-      tabCaption = aBrowser.contentTitle;
-    } else if (!Util.isURLEmpty(aBrowser.userTypedValue)) {
-      tabCaption = aBrowser.userTypedValue;
-    } else if (!Util.isURLEmpty(url)) {
-      tabCaption = url;
-    } else {
-      tabCaption = Util.getEmptyURLTabTitle();
-    }
-
-    let tab = Browser.getTabForBrowser(aBrowser);
-    if (tab)
-      tab.chromeTab.updateTitle(tabCaption);
-  },
-
-  _updateButtons: function _updateButtons() {
-    let browser = Browser.selectedBrowser;
-    if (!browser) {
-      return;
-    }
-    if (browser.canGoBack) {
-      this._back.removeAttribute("disabled");
-    } else {
-      this._back.setAttribute("disabled", true);
-    }
-    if (browser.canGoForward) {
-      this._forward.removeAttribute("disabled");
-    } else {
-      this._forward.setAttribute("disabled", true);
-    }
-  },
-
-  _updateToolbar: function _updateToolbar() {
-    if (Browser.selectedTab.isLoading()) {
-      Elements.loadingState.setAttribute("loading", true);
-    } else {
-      Elements.loadingState.removeAttribute("loading");
-    }
-  },
-
-  _closeOrQuit: function _closeOrQuit() {
-    // Close active dialog, if we have one. If not then close the application.
-    if (!BrowserUI.isContentShowing()) {
-      BrowserUI.showContent();
-    } else {
-      // Check to see if we should really close the window
-      if (Browser.closing()) {
-        window.close();
-        let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
-        appStartup.quit(Ci.nsIAppStartup.eForceQuit);
-      }
-    }
-  },
-
-  _onPreciseInput: function _onPreciseInput() {
-    document.getElementById("bcast_preciseInput").setAttribute("input", "precise");
-    let uri = Util.makeURI("chrome://browser/content/cursor.css");
-    if (StyleSheetSvc.sheetRegistered(uri, Ci.nsIStyleSheetService.AGENT_SHEET)) {
-      StyleSheetSvc.unregisterSheet(uri,
-                                    Ci.nsIStyleSheetService.AGENT_SHEET);
-    }
-  },
-
-  _onImpreciseInput: function _onImpreciseInput() {
-    document.getElementById("bcast_preciseInput").setAttribute("input", "imprecise");
-    let uri = Util.makeURI("chrome://browser/content/cursor.css");
-    if (!StyleSheetSvc.sheetRegistered(uri, Ci.nsIStyleSheetService.AGENT_SHEET)) {
-      StyleSheetSvc.loadAndRegisterSheet(uri,
-                                         Ci.nsIStyleSheetService.AGENT_SHEET);
-    }
-  },
-
-  _getMeasures: function() {
-    let dimensions = {
-      "window-width": ContentAreaObserver.width,
-      "window-height": ContentAreaObserver.height
-    };
-    return dimensions;
-  },
-
-  /*********************************
-   * Event handling
-   */
-
-  handleEvent: function handleEvent(aEvent) {
-    var target = aEvent.target;
-    switch (aEvent.type) {
-      // Window events
-      case "keypress":
-        if (aEvent.keyCode == aEvent.DOM_VK_ESCAPE)
-          this.handleEscape(aEvent);
-        break;
-      case "MozPrecisePointer":
-        this._onPreciseInput();
-        break;
-      case "MozImprecisePointer":
-        this._onImpreciseInput();
-        break;
-      case "AppCommand":
-        this.handleAppCommandEvent(aEvent);
-        break;
-    }
-  },
-
-  // Checks if various different parts of the UI is visible and closes
-  // them one at a time.
-  handleEscape: function (aEvent) {
-    aEvent.stopPropagation();
-    aEvent.preventDefault();
-
-    if (this._edit.popupOpen) {
-      this._edit.endEditing(true);
-      return;
-    }
-
-    // Check open popups
-    if (DialogUI._popup) {
-      DialogUI._hidePopup();
-      return;
-    }
-
-    // Check open panel
-    if (PanelUI.isVisible) {
-      PanelUI.hide();
-      return;
-    }
-
-    // Check content helper
-    if (FindHelperUI.isActive) {
-      FindHelperUI.hide();
-      return;
-    }
-
-    if (Browser.selectedTab.isLoading()) {
-      Browser.selectedBrowser.stop();
-      return;
-    }
-
-    if (ContextUI.dismiss()) {
-      return;
-    }
-  },
-
-  handleBackspace: function handleBackspace() {
-    switch (Services.prefs.getIntPref("browser.backspace_action")) {
-      case 0:
-        CommandUpdater.doCommand("cmd_back");
-        break;
-      case 1:
-        CommandUpdater.doCommand("cmd_scrollPageUp");
-        break;
-    }
-  },
-
-  handleShiftBackspace: function handleShiftBackspace() {
-    switch (Services.prefs.getIntPref("browser.backspace_action")) {
-      case 0:
-        CommandUpdater.doCommand("cmd_forward");
-        break;
-      case 1:
-        CommandUpdater.doCommand("cmd_scrollPageDown");
-        break;
-    }
-  },
-
-  openFile: function() {
-    try {
-      const nsIFilePicker = Ci.nsIFilePicker;
-      let fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-      let self = this;
-      let fpCallback = function fpCallback_done(aResult) {
-        if (aResult == nsIFilePicker.returnOK) {
-          self.goToURI(fp.fileURL.spec);
-        }
-      };
-
-      let windowTitle = Strings.browser.GetStringFromName("browserForOpenLocation");
-      fp.init(window, windowTitle, nsIFilePicker.modeOpen);
-      fp.appendFilters(nsIFilePicker.filterAll | nsIFilePicker.filterText |
-                       nsIFilePicker.filterImages | nsIFilePicker.filterXML |
-                       nsIFilePicker.filterHTML);
-      fp.open(fpCallback);
-    } catch (ex) {
-      dump ('BrowserUI openFile exception: ' + ex + '\n');
-    }
-  },
-
-  savePage: function() {
-    Browser.savePage();
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    let browser = aMessage.target;
-    let json = aMessage.json;
-    switch (aMessage.name) {
-      case "DOMTitleChanged":
-        this._titleChanged(browser);
-        break;
-      case "DOMWillOpenModalDialog":
-        this.selectTabForBrowser(browser);
-        break;
-      case "DOMWindowClose":
-        return this.closeTabForBrowser(browser);
-        break;
-      // XXX this and content's sender are a little warped
-      case "Browser:OpenURI":
-        let referrerURI = null;
-        if (json.referrer)
-          referrerURI = Services.io.newURI(json.referrer, null, null);
-        this.goToURI(json.uri);
-        break;
-      case "Content:StateChange": {
-        let tab = Browser.selectedTab;
-        if (this.shouldCaptureThumbnails(tab)) {
-          PageThumbs.captureAndStore(tab.browser);
-          let currPage = tab.browser.currentURI.spec;
-          Services.obs.notifyObservers(null, "Metro:RefreshTopsiteThumbnail", currPage);
-        }
-        break;
-      }
-    }
-
-    return {};
-  },
-
-  shouldCaptureThumbnails: function shouldCaptureThumbnails(aTab) {
-    // Capture only if it's the currently selected tab.
-    if (aTab != Browser.selectedTab) {
-      return false;
-    }
-    // Skip private tabs
-    if (aTab.isPrivate) {
-      return false;
-    }
-    // FIXME Bug 720575 - Don't capture thumbnails for SVG or XML documents as
-    //       that currently regresses Talos SVG tests.
-    let browser = aTab.browser;
-    let doc = browser.contentDocument;
-    if (doc instanceof SVGDocument || doc instanceof XMLDocument) {
-      return false;
-    }
-
-    // Don't capture pages in snapped mode, this produces 2/3 black
-    // thumbs or stretched out ones
-    //   Ci.nsIWinMetroUtils.snapped is inaccessible on
-    //   desktop/nonwindows systems
-    if(Elements.windowState.getAttribute("viewstate") == "snapped") {
-      return false;
-    }
-    // There's no point in taking screenshot of loading pages.
-    if (browser.docShell.busyFlags != Ci.nsIDocShell.BUSY_FLAGS_NONE) {
-      return false;
-    }
-
-    // Don't take screenshots of about: pages.
-    if (browser.currentURI.schemeIs("about")) {
-      return false;
-    }
-
-    // No valid document channel. We shouldn't take a screenshot.
-    let channel = browser.docShell.currentDocumentChannel;
-    if (!channel) {
-      return false;
-    }
-
-    // Don't take screenshots of internally redirecting about: pages.
-    // This includes error pages.
-    let uri = channel.originalURI;
-    if (uri.schemeIs("about")) {
-      return false;
-    }
-
-    // http checks
-    let httpChannel;
-    try {
-      httpChannel = channel.QueryInterface(Ci.nsIHttpChannel);
-    } catch (e) { /* Not an HTTP channel. */ }
-
-    if (httpChannel) {
-      // Continue only if we have a 2xx status code.
-      try {
-        if (Math.floor(httpChannel.responseStatus / 100) != 2) {
-          return false;
-        }
-      } catch (e) {
-        // Can't get response information from the httpChannel
-        // because mResponseHead is not available.
-        return false;
-      }
-
-      // Cache-Control: no-store.
-      if (httpChannel.isNoStoreResponse()) {
-        return false;
-      }
-
-      // Don't capture HTTPS pages unless the user enabled it.
-      if (uri.schemeIs("https") && !this.sslDiskCacheEnabled) {
-        return false;
-      }
-    }
-
-    return true;
-  },
-
-  _sslDiskCacheEnabled: null,
-
-  get sslDiskCacheEnabled() {
-    if (this._sslDiskCacheEnabled === null) {
-      this._sslDiskCacheEnabled = Services.prefs.getBoolPref("browser.cache.disk_cache_ssl");
-    }
-    return this._sslDiskCacheEnabled;
-  },
-
-  supportsCommand : function(cmd) {
-    var isSupported = false;
-    switch (cmd) {
-      case "cmd_back":
-      case "cmd_forward":
-      case "cmd_reload":
-      case "cmd_forceReload":
-      case "cmd_stop":
-      case "cmd_go":
-      case "cmd_home":
-      case "cmd_openLocation":
-      case "cmd_addBookmark":
-      case "cmd_bookmarks":
-      case "cmd_history":
-      case "cmd_remoteTabs":
-      case "cmd_quit":
-      case "cmd_close":
-      case "cmd_newTab":
-      case "cmd_newTabKey":
-      case "cmd_closeTab":
-      case "cmd_undoCloseTab":
-      case "cmd_actions":
-      case "cmd_panel":
-      case "cmd_reportingCrashesSubmitURLs":
-      case "cmd_flyout_back":
-      case "cmd_sanitize":
-      case "cmd_volumeLeft":
-      case "cmd_volumeRight":
-      case "cmd_openFile":
-      case "cmd_savePage":
-        isSupported = true;
-        break;
-      default:
-        isSupported = false;
-        break;
-    }
-    return isSupported;
-  },
-
-  isCommandEnabled : function(cmd) {
-    let elem = document.getElementById(cmd);
-    if (elem && elem.getAttribute("disabled") == "true")
-      return false;
-    return true;
-  },
-
-  doCommand : function(cmd) {
-    if (!this.isCommandEnabled(cmd))
-      return;
-    let browser = getBrowser();
-    switch (cmd) {
-      case "cmd_back":
-        browser.goBack();
-        break;
-      case "cmd_forward":
-        browser.goForward();
-        break;
-      case "cmd_reload":
-        browser.reload();
-        break;
-      case "cmd_forceReload":
-      {
-        // Simulate a new page
-        browser.lastLocation = null;
-
-        const reloadFlags = Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY |
-                            Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE;
-        browser.reloadWithFlags(reloadFlags);
-        break;
-      }
-      case "cmd_stop":
-        browser.stop();
-        break;
-      case "cmd_go":
-        this.goToURI();
-        break;
-      case "cmd_home":
-        this.goToURI(Browser.getHomePage());
-        break;
-      case "cmd_openLocation":
-        ContextUI.displayNavbar();
-        this._edit.beginEditing(true);
-        this._edit.select();
-        break;
-      case "cmd_addBookmark":
-        ContextUI.displayNavbar();
-        Appbar.onStarButton(true);
-        break;
-      case "cmd_bookmarks":
-        PanelUI.show("bookmarks-container");
-        break;
-      case "cmd_history":
-        PanelUI.show("history-container");
-        break;
-      case "cmd_remoteTabs":
-#ifdef MOZ_SERVICES_SYNC
-        if (Weave.Status.checkSetup() == Weave.CLIENT_NOT_CONFIGURED) {
-          FlyoutPanelsUI.show('SyncFlyoutPanel');
-        } else {
-          PanelUI.show("remotetabs-container");
-        }
-#endif
-        break;
-      case "cmd_quit":
-        // Only close one window
-        this._closeOrQuit();
-        break;
-      case "cmd_close":
-        this._closeOrQuit();
-        break;
-      case "cmd_newTab":
-        this.addAndShowTab();
-        break;
-      case "cmd_newTabKey":
-        this.addAndShowTab();
-        // Make sure navbar is displayed before setting focus on url bar. Bug 907244
-        ContextUI.displayNavbar();
-        this._edit.beginEditing(false);
-        break;
-      case "cmd_closeTab":
-        this.closeTab();
-        break;
-      case "cmd_undoCloseTab":
-        this.undoCloseTab();
-        break;
-      case "cmd_sanitize":
-        this.confirmSanitizeDialog();
-        break;
-      case "cmd_flyout_back":
-        FlyoutPanelsUI.onBackButton();
-        break;
-      case "cmd_reportingCrashesSubmitURLs":
-        let urlCheckbox = document.getElementById("prefs-reporting-submitURLs");
-        Services.prefs.setBoolPref('app.crashreporter.submitURLs', urlCheckbox.checked);
-        break;
-      case "cmd_panel":
-        PanelUI.toggle();
-        break;
-      case "cmd_openFile":
-        this.openFile();
-        break;
-      case "cmd_savePage":
-        this.savePage();
-        break;
-    }
-  },
-
-  handleAppCommandEvent: function (aEvent) {
-    switch (aEvent.command) {
-      case "Back":
-        this.doCommand("cmd_back");
-        break;
-      case "Forward":
-        this.doCommand("cmd_forward");
-        break;
-      case "Reload":
-        this.doCommand("cmd_reload");
-        break;
-      case "Stop":
-        this.doCommand("cmd_stop");
-        break;
-      case "Home":
-        this.doCommand("cmd_home");
-        break;
-      case "New":
-        this.doCommand("cmd_newTab");
-        break;
-      case "Close":
-        this.doCommand("cmd_closeTab");
-        break;
-      case "Find":
-        FindHelperUI.show();
-        break;
-      case "Open":
-        this.doCommand("cmd_openFile");
-        break;
-      case "Save":
-        this.doCommand("cmd_savePage");
-        break;
-      case "Search":
-        this.doCommand("cmd_openLocation");
-        break;
-      default:
-        return;
-    }
-    aEvent.stopPropagation();
-    aEvent.preventDefault();
-  },
-
-  confirmSanitizeDialog: function () {
-    let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
-    let title = bundle.GetStringFromName("clearPrivateData.title2");
-    let message = bundle.GetStringFromName("clearPrivateData.message3");
-    let clearbutton = bundle.GetStringFromName("clearPrivateData.clearButton");
-
-    let prefsClearButton = document.getElementById("prefs-clear-data");
-    prefsClearButton.disabled = true;
-
-    let buttonPressed = Services.prompt.confirmEx(
-                          null,
-                          title,
-                          message,
-                          Ci.nsIPrompt.BUTTON_POS_0 * Ci.nsIPrompt.BUTTON_TITLE_IS_STRING +
-                          Ci.nsIPrompt.BUTTON_POS_1 * Ci.nsIPrompt.BUTTON_TITLE_CANCEL,
-                          clearbutton,
-                          null,
-                          null,
-                          null,
-                          { value: false });
-
-    // Clicking 'Clear' will call onSanitize().
-    if (buttonPressed === 0) {
-      SanitizeUI.onSanitize();
-    }
-
-    prefsClearButton.disabled = false;
-  },
-
-  _initFirstRunContent: function () {
-    let dismissed = Services.prefs.getBoolPref("browser.firstrun-content.dismissed");
-    let firstRunCount = Services.prefs.getIntPref("browser.firstrun.count");
-
-    if (!dismissed && firstRunCount > 0) {
-      document.loadOverlay("chrome://browser/content/FirstRunContentOverlay.xul", null);
-    }
-  },
-
-  firstRunContentDismiss: function() {
-    let firstRunElements = Elements.stack.querySelectorAll(".firstrun-content");
-    for (let node of firstRunElements) {
-      node.parentNode.removeChild(node);
-    }
-
-    Services.prefs.setBoolPref("browser.firstrun-content.dismissed", true);
-  },
-};
-
-var PanelUI = {
-  get _panels() { return document.getElementById("panel-items"); },
-
-  get isVisible() {
-    return !Elements.panelUI.hidden;
-  },
-
-  views: {
-    "console-container": "ConsolePanelView",
-  },
-
-  init: function() {
-    // Perform core init soon
-    setTimeout(function () {
-      for each (let viewName in this.views) {
-        let view = window[viewName];
-        if (view.init)
-          view.init();
-      }
-    }.bind(this), 0);
-
-    // Lazily run other initialization tasks when the views are shown
-    this._panels.addEventListener("ToolPanelShown", function(aEvent) {
-      let viewName = this.views[this._panels.selectedPanel.id];
-      let view = window[viewName];
-      if (view.show)
-        view.show();
-    }.bind(this), true);
-  },
-
-  uninit: function() {
-    for each (let viewName in this.views) {
-      let view = window[viewName];
-      if (view.uninit)
-        view.uninit();
-    }
-  },
-
-  switchPane: function switchPane(aPanelId) {
-    BrowserUI.blurFocusedElement();
-
-    let panel = aPanelId ? document.getElementById(aPanelId) : this._panels.selectedPanel;
-    let oldPanel = this._panels.selectedPanel;
-
-    if (oldPanel != panel) {
-      this._panels.selectedPanel = panel;
-
-      this._fire("ToolPanelHidden", oldPanel);
-    }
-
-    this._fire("ToolPanelShown", panel);
-  },
-
-  isPaneVisible: function isPaneVisible(aPanelId) {
-    return this.isVisible && this._panels.selectedPanel.id == aPanelId;
-  },
-
-  show: function show(aPanelId) {
-    Elements.panelUI.hidden = false;
-    Elements.contentShowing.setAttribute("disabled", "true");
-
-    this.switchPane(aPanelId);
-  },
-
-  hide: function hide() {
-    if (!this.isVisible)
-      return;
-
-    Elements.panelUI.hidden = true;
-    Elements.contentShowing.removeAttribute("disabled");
-    BrowserUI.blurFocusedElement();
-
-    this._fire("ToolPanelHidden", this._panels);
-  },
-
-  toggle: function toggle() {
-    if (this.isVisible) {
-      this.hide();
-    } else {
-      this.show();
-    }
-  },
-
-  _fire: function _fire(aName, anElement) {
-    let event = document.createEvent("Events");
-    event.initEvent(aName, true, true);
-    anElement.dispatchEvent(event);
-  }
-};
-
-var DialogUI = {
-  _popup: null,
-
-  init: function() {
-    window.addEventListener("mousedown", this, true);
-  },
-
-  /*******************************************
-   * Popups
-   */
-
-  pushPopup: function pushPopup(aPanel, aElements, aParent) {
-    this._hidePopup();
-    this._popup =  { "panel": aPanel,
-                     "elements": (aElements instanceof Array) ? aElements : [aElements] };
-    this._dispatchPopupChanged(true, aPanel);
-  },
-
-  popPopup: function popPopup(aPanel) {
-    if (!this._popup || aPanel != this._popup.panel)
-      return;
-    this._popup = null;
-    this._dispatchPopupChanged(false, aPanel);
-  },
-
-  _hidePopup: function _hidePopup() {
-    if (!this._popup)
-      return;
-    let panel = this._popup.panel;
-    if (panel.hide)
-      panel.hide();
-  },
-
-  /*******************************************
-   * Events
-   */
-
-  handleEvent: function (aEvent) {
-    switch (aEvent.type) {
-      case "mousedown":
-        if (!this._isEventInsidePopup(aEvent))
-          this._hidePopup();
-        break;
-      default:
-        break;
-    }
-  },
-
-  _dispatchPopupChanged: function _dispatchPopupChanged(aVisible, aElement) {
-    let event = document.createEvent("UIEvents");
-    event.initUIEvent("PopupChanged", true, true, window, aVisible);
-    aElement.dispatchEvent(event);
-  },
-
-  _isEventInsidePopup: function _isEventInsidePopup(aEvent) {
-    if (!this._popup)
-      return false;
-    let elements = this._popup.elements;
-    let targetNode = aEvent.target;
-    while (targetNode && elements.indexOf(targetNode) == -1) {
-      if (targetNode instanceof Element && targetNode.hasAttribute("for"))
-        targetNode = document.getElementById(targetNode.getAttribute("for"));
-      else
-        targetNode = targetNode.parentNode;
-    }
-    return targetNode ? true : false;
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/browser.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/browser.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/browser.xul	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/browser.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,1396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://browser/skin/platform.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/browser.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/bindings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/cssthrobber.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/tiles.css" type="text/css"?>
-<?xml-stylesheet href="chrome://branding/content/metro-about.css" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
-<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-%browserDTD;
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % prefsDTD SYSTEM "chrome://browser/locale/preferences.dtd">
-%prefsDTD;
-<!ENTITY % aboutPanelDTD SYSTEM "chrome://browser/locale/aboutPanel.dtd">
-%aboutPanelDTD;
-<!ENTITY % searchPanelDTD SYSTEM "chrome://browser/locale/searchPanel.dtd">
-%searchPanelDTD;
-#ifdef MOZ_SERVICES_SYNC
-<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
-%syncBrandDTD;
-<!ENTITY % syncDTD SYSTEM "chrome://browser/locale/sync.dtd">
-%syncDTD;
-#endif
-<!ENTITY % baseMenuOverlayDTD SYSTEM "chrome://browser/locale/baseMenuOverlay.dtd">
-%baseMenuOverlayDTD;
-]>
-
-<window id="main-window"
-        onload="Browser.startup();"
-        onunload="Browser.shutdown();"
-        windowtype="navigator:browser"
-        chromedir="&locale.dir;"
-        title="&brandShortName;"
-        width="1366"
-        height="768"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:svg="http://www.w3.org/2000/svg"
-        xmlns:html="http://www.w3.org/1999/xhtml">
-
-  <script type="application/javascript"
-          src="chrome://browser/content/browser.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/browser-scripts.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/browser-ui.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/Util.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/input.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/appbar.js"/>
-  <broadcasterset id="broadcasterset">
-    <broadcaster id="bcast_contentShowing"
-                 disabled="false"/>
-    <broadcaster id="bcast_urlbarState"
-                 mode="editing"/>
-    <broadcaster id="bcast_preciseInput"
-                 input="precise"/>
-    <broadcaster id="bcast_windowState"
-                 viewstate=""/>
-    <broadcaster id="bcast_loadingState"
-                 loading="false"/>
-    <broadcaster id="bcast_chromeState"
-                 navbar="visible"/>
-  </broadcasterset>
-
-  <observerset id="observerset">
-    <observes id="observe_contentShowing"
-              element="bcast_contentShowing"
-              attribute="disabled"
-              onbroadcast="BrowserUI.updateUIFocus();"/>
-  </observerset>
-
-  <commandset id="mainCommandSet">
-    <!-- basic navigation -->
-    <command id="cmd_back"
-             disabled="true"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_forward"
-             disabled="true"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_handleBackspace"
-             oncommand="BrowserUI.handleBackspace();" />
-    <command id="cmd_handleShiftBackspace"
-             oncommand="BrowserUI.handleShiftBackspace();" />
-    <command id="cmd_reload"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_forceReload"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_stop"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_go"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_openLocation"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_home"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_openFile"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_savePage"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-
-    <!-- tabs -->
-    <command id="cmd_newTab"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_newTabKey"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_closeTab"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_undoCloseTab"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-#ifdef MOZ_SERVICES_SYNC
-    <command id="cmd_remoteTabs"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-#endif
-    <command id="cmd_newPrivateTab"
-             oncommand="BrowserUI.addAndShowPrivateTab();"/>
-
-    <!-- misc -->
-    <command id="cmd_close"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_quit"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_actions"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_panel"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_flyout_back"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_addBookmark"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_bookmarks"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_history"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_sanitize"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_contextUI"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_reportingCrashesSubmitURLs"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-
-    <!-- scrolling -->
-    <command id="cmd_scrollPageUp"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_scrollPageDown"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-
-    <!-- editing -->
-    <command id="cmd_cut"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_copy"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_copylink"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_paste"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_delete"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_selectAll"
-             oncommand="CommandUpdater.doCommand(this.id);"/>
-
-    <!-- find -->
-    <command id="cmd_findPrevious"
-             oncommand="FindHelperUI.goToPrevious();"/>
-    <command id="cmd_findNext"
-             oncommand="FindHelperUI.goToNext();"/>
-    <command id="cmd_findClose"
-             oncommand="FindHelperUI.hide();"/>
-    <command id="cmd_find"
-             oncommand="FindHelperUI.show();"/>
-  </commandset>
-
-  <keyset id="mainKeyset">
-    <!-- basic navigation -->
-    <key id="key_back"
-         keycode="VK_LEFT"
-         command="cmd_back"
-         modifiers="alt"/>
-    <key id="key_forward"
-         keycode="VK_RIGHT"
-         command="cmd_forward"
-         modifiers="alt"/>
-    <key id="key_backspace"
-         keycode="VK_BACK"
-         command="cmd_handleBackspace"/>
-    <key id="key_shift_backspace"
-         keycode="VK_BACK"
-         command="cmd_handleShiftBackspace"
-         modifiers="shift"/>
-    <key id="key_reload"
-         keycode="VK_F5"
-         command="cmd_reload"/>
-    <key id="key_reload2"
-         key="&reload.key;"
-         modifiers="accel"
-         command="cmd_reload"/>
-    <key id="key_forceReload"
-         keycode="VK_F5"
-         modifiers="shift"
-         command="cmd_forceReload"/>
-    <key id="key_forceReload2"
-         key="&reload.key;"
-         modifiers="accel,shift"
-         command="cmd_forceReload"/>
-    <key id="key_focusURL"
-         key="&focusURL.key;"
-         modifiers="accel"
-         command="cmd_openLocation"/>
-    <key id="key_focusURL2"
-         key="&urlbar.accesskey;"
-         modifiers="alt"
-         command="cmd_openLocation"/>
-    <key id="key_home"
-         keycode="VK_HOME"
-         modifiers="accel"
-         command="cmd_home"/>
-    <key id="key_open"
-         key="&openFile.key;"
-         modifiers="accel"
-         command="cmd_openFile"/>
-    <key id="key_save"
-         key="&savePage.key;"
-         modifiers="accel"
-         command="cmd_savePage"/>
-
-    <!-- misc -->
-    <key id="key_find"
-         key="&find.key;"
-         modifiers="accel"
-         command="cmd_find"/>
-    <key id="key_find"
-         key="/"
-         command="cmd_find"/>
-    <key id="key_findNext"
-         keycode="VK_F3"
-         command="cmd_findNext"/>
-    <key id="key_findNext2"
-         key="&findNext.key;"
-         modifiers="accel"
-         command="cmd_findNext"/>
-    <key id="key_findPrevious"
-         keycode="VK_F3"
-         modifiers="shift"
-         command="cmd_findPrevious"/>
-    <key id="key_findPrevious2"
-         key="&findNext.key;"
-         modifiers="accel,shift"
-         command="cmd_findPrevious"/>
-    <key id="key_quit"
-         key="&quit.key;"
-         modifiers="accel"
-         command="cmd_quit"/>
-    <key id="key_addBoomkark"
-         key="&addBookmark.key;"
-         modifiers="accel"
-         command="cmd_addBookmark"/>
-
-    <!-- development/testing -->
-    <key id="key_console"
-         key="&jsConsole.key;"
-         modifiers="accel,shift"
-         oncommand="PanelUI.show('console-container')"/>
-    <key id="key_options"
-         key="&optionsFlyout.key;"
-         modifiers="accel,shift"
-         oncommand="FlyoutPanelsUI.show('PrefsFlyoutPanel')" />
-    <key id="key_options"
-         key="&aboutFlyout.key;"
-         modifiers="accel,shift"
-         oncommand="FlyoutPanelsUI.show('AboutFlyoutPanel')" />
-<!--
-Temporarily disabled until we can have sync prefs together with the
-Desktop browser's sync prefs.
-#ifdef MOZ_SERVICES_SYNC
-    <key id="key_options"
-         key="&syncFlyout.key;"
-         modifiers="accel,shift"
-         oncommand="FlyoutPanelsUI.show('SyncFlyoutPanel')" />
-#endif
--->
-
-    <!-- manage tabs -->
-    <key id="key_newTab"
-         key="&newTab.key;"
-         modifiers="accel"
-         command="cmd_newTabKey"/>
-    <key id="key_newTab2"
-         key="&newTab2.key;"
-         modifiers="accel"
-         command="cmd_newTabKey"/>
-    <key id="key_closeTab"
-         key="&closeTab.key;"
-         modifiers="accel"
-         command="cmd_closeTab"/>
-    <key id="key_closeTab2"
-         keycode="VK_F4"
-         modifiers="accel"
-         command="cmd_closeTab"/>
-    <key id="key_undoCloseTab"
-         key="&newTab.key;"
-         modifiers="accel,shift"
-         command="cmd_undoCloseTab"/>
-    <key id="key_newPrivateTab"
-         key="&newPrivateTab.key;"
-         modifiers="accel,shift"
-         command="cmd_newPrivateTab"/>
-
-    <!-- tab selection -->
-    <key id="key_nextTab"
-         oncommand="BrowserUI.selectNextTab();"
-         keycode="VK_TAB"
-         modifiers="accel"/>
-    <key id="key_nextTab2"
-         oncommand="BrowserUI.selectNextTab();"
-         keycode="VK_PAGE_DOWN"
-         modifiers="accel"/>
-    <key id="key_prevTab"
-         oncommand="BrowserUI.selectPreviousTab();"
-         keycode="VK_TAB"
-         modifiers="accel,shift"/>
-    <key id="key_prevTab2"
-         oncommand="BrowserUI.selectPreviousTab();"
-         keycode="VK_PAGE_UP"
-         modifiers="accel"/>
-    <key id="key_selectTab1"
-         oncommand="BrowserUI.selectTabAtIndex(0);"
-         key="1"
-         modifiers="accel"/>
-    <key id="key_selectTab2"
-         oncommand="BrowserUI.selectTabAtIndex(1);"
-         key="2"
-         modifiers="accel"/>
-    <key id="key_selectTab3"
-         oncommand="BrowserUI.selectTabAtIndex(2);"
-         key="3"
-         modifiers="accel"/>
-    <key id="key_selectTab4"
-         oncommand="BrowserUI.selectTabAtIndex(3);"
-         key="4"
-         modifiers="accel"/>
-    <key id="key_selectTab5"
-         oncommand="BrowserUI.selectTabAtIndex(4);"
-         key="5"
-         modifiers="accel"/>
-    <key id="key_selectTab6"
-         oncommand="BrowserUI.selectTabAtIndex(5);"
-         key="6"
-         modifiers="accel"/>
-    <key id="key_selectTab7"
-         oncommand="BrowserUI.selectTabAtIndex(6);"
-         key="7"
-         modifiers="accel"/>
-    <key id="key_selectTab8"
-         oncommand="BrowserUI.selectTabAtIndex(7);"
-         key="8"
-         modifiers="accel"/>
-    <key id="key_selectLastTab"
-         oncommand="BrowserUI.selectTabAtIndex(-1);"
-         key="9"
-         modifiers="accel"/>
-  </keyset>
-
-  <stack id="stack"
-         flex="1">
-    <observes element="bcast_urlbarState"
-              attribute="*"/>
-    <observes element="bcast_windowState"
-              attribute="*"/>
-    <!-- Page Area -->
-    <vbox id="page">
-      <vbox id="tray"
-            class="tray-toolbar"
-            observes="bcast_windowState" >
-        <!-- Tabs -->
-        <hbox id="tabs-container"
-              observes="bcast_windowState">
-          <box id="tabs"
-               flex="1"
-               observes="bcast_preciseInput"
-               onselect="BrowserUI.selectTabAndDismiss(this);"
-               onclosetab="BrowserUI.closeTab(this);"/>
-          <vbox id="tabs-controls">
-            <toolbarbutton id="newtab-button"
-                           command="cmd_newTab"
-                           label="&newtab.label;"/>
-          </vbox>
-        </hbox>
-      </vbox> <!-- end tray -->
-
-      <!-- Content viewport -->
-      <stack id="content-viewport">
-        <observes element="bcast_windowState"
-                  attribute="startpage"/>
-        <observes element="bcast_chromeState"
-                  attribute="navbar"/>
-        <deck id="browsers"
-              flex="1"
-              observes="bcast_preciseInput"/>
-        <box id="vertical-scroller"
-             class="scroller"
-             orient="vertical"
-             end="0"
-             top="0"/>
-        <box id="horizontal-scroller"
-             class="scroller"
-             orient="horizontal"
-             left="0"
-             bottom="0"/>
-
-        <!-- Content touch selection overlay -->
-        <box class="selection-overlay-hidden"
-             id="content-selection-overlay"/>
-
-        <!-- Overlay to dim screen when autocomplete shows up -->
-        <hbox id="autocomplete-overlay"
-              onclick="ContextUI.dismiss()"/>
-      </stack>
-    </vbox>
-
-    <html:div id="overlay-back"
-              class="overlay-button"
-              observes="cmd_back">
-    </html:div>
-    <html:div id="overlay-plus"
-              class="overlay-button"
-              observes="cmd_back">
-    </html:div>
-
-    <!-- Navigation bar -->
-    <appbar id="navbar"
-            mousethrough="never"
-            visible="true">
-      <hbox id="progress-container"
-            layer="true"
-            observes="bcast_windowState">
-        <hbox id="progress-control" />
-      </hbox>
-
-      <vbox id="toolbar-overlay"
-            flex="1">
-        <!-- Autocomplete -->
-        <scrollbox id="urlbar-autocomplete-scroll"
-                   flex="1"
-                   observes="bcast_urlbarState">
-          <hbox id="urlbar-autocomplete"
-                observes="bcast_windowState"/>
-        </scrollbox>
-
-        <!-- Main toolbar -->
-        <toolbar id="toolbar"
-                 flex="1"
-                 observes="bcast_windowState">
-          <toolbarbutton id="back-button"
-                         class="appbar-primary"
-                         command="cmd_back"/>
-          <toolbarbutton id="forward-button"
-                         class="appbar-primary"
-                         command="cmd_forward"/>
-
-            <hbox id="urlbar"
-                  flex="1">
-            <observes element="bcast_urlbarState"
-                      attribute="*"/>
-            <observes element="bcast_loadingState"
-                      attribute="*"/>
-            <box id="identity-box"
-                 align="center"
-                 role="button">
-              <image id="identity-icon"/>
-            </box>
-
-            <textbox id="urlbar-edit"
-                     type="url"
-                     flex="1"
-                     autocompletesearch="history"
-                     autocompletepopup="urlbar-autocomplete"
-                     completeselectedindex="true"
-                     placeholder="&urlbar.emptytext;"
-                     tabscrolling="true" />
-
-            <toolbarbutton id="go-button"
-                           class="urlbar-button"
-                           command="cmd_go"/>
-            <toolbarbutton id="reload-button"
-                           class="urlbar-button"
-                           oncommand="CommandUpdater.doCommand(
-                                        event.shiftKey ? 'cmd_forceReload'
-                                                       : 'cmd_reload');"/>
-            <toolbarbutton id="stop-button"
-                           class="urlbar-button"
-                           command="cmd_stop"/>
-          </hbox>
-
-          <stack id="toolbar-contextual">
-            <observes element="bcast_windowState"
-                      attribute="*"/>
-            <observes element="bcast_urlbarState"
-                      attribute="*"/>
-            <hbox id="toolbar-context-page" pack="end">
-              <circularprogressindicator id="download-progress"
-                                         class="appbar-primary"
-                                         oncommand="MetroDownloadsView.onDownloadButton()"/>
-              <toolbarbutton id="star-button"
-                             class="appbar-primary hide-on-start"
-                             type="checkbox"
-                             oncommand="Appbar.onStarButton()"/>
-              <toolbarbutton id="pin-button"
-                             class="appbar-primary hide-on-start"
-                             type="checkbox"
-                             oncommand="Appbar.onPinButton()"/>
-              <toolbarbutton id="menu-button"
-                             class="appbar-primary"
-                             oncommand="Appbar.onMenuButton(event)"/>
-            </hbox>
-
-            <hbox id="toolbar-context-autocomplete"
-                  pack="end">
-              <toolbarbutton id="close-button"
-                             class="appbar-primary"
-                             oncommand="Appbar.onAutocompleteCloseButton()"/>
-            </hbox>
-          </stack>
-        </toolbar>
-      </vbox>
-    </appbar>
-
-    <vbox id="panel-container"
-          class="window-width window-height meta"
-          hidden="true"
-          observes="bcast_windowState">
-      <hbox id="panel-header">
-        <toolbarbutton id="panel-close-button"
-                       class="appbar-primary"
-                       command="cmd_panel"/>
-      </hbox>
-
-      <deck id="panel-items"
-            selectedIndex="0"
-            flex="1" >
-        <scrollbox id="bookmarks-container"
-                   flex="1">
-          <richgrid id="bookmarks-list"
-                    class="canSnapTiles"
-                    set-name="bookmarks"
-                    seltype="multiple"
-                    flex="1"/>
-        </scrollbox>
-        <scrollbox id="history-container"
-                   flex="1">
-          <richgrid id="history-list"
-                    class="canSnapTiles"
-                    set-name="recentHistory"
-                    seltype="multiple"
-                    flex="1"/>
-        </scrollbox>
-        <scrollbox id="remotetabs-container"
-                   flex="1">
-          <richgrid id="remotetabs-list"
-                    class="canSnapTiles"
-                    set-name="remoteTabs"
-                    seltype="single"
-                    flex="1"/>
-        </scrollbox>
-        <vbox id="console-container"
-              flex="1">
-          <vbox id="console-header"
-                class="panel-list">
-            <label class="panel-header"
-                   value="&consoleHeader.label;"/>
-            <hbox align="center">
-              <label value="&consoleCodeEval.label;"
-                     control="console-eval-textbox"/>
-              <textbox id="console-eval-textbox"
-                       class="toolbar search-bar"
-                       value=""
-                       flex="1"
-                       onkeypress="ConsolePanelView.onEvalKeyPress(event)"/>
-              <button id="console-button-eval"
-                      class="show-text"
-                      label="&consoleEvaluate.label;"
-                      oncommand="ConsolePanelView.evaluateTypein()"/>
-            </hbox>
-            <hbox align="center"
-                  pack="end">
-              <checkbox id="console-follow-checkbox" label="&consoleFollowCheckbox.label;" checked="true"/>
-              <spacer flex="1"/>
-              <radiogroup id="console-filter" orient="horizontal"
-                          oncommand="ConsolePanelView.changeMode();">
-                <radio id="console-filter-all"
-                       value="all"
-                       selected="true"
-                       label="&consoleAll.label;"/>
-                <radio id="console-filter-messages"
-                       value="message"
-                       label="&consoleMessages.label;" />
-                <radio id="console-filter-warnings"
-                       value="warning"
-                       label="&consoleWarnings.label;"/>
-                <radio id="console-filter-errors"
-                       value="error"
-                       label="&consoleErrors.label;"/>
-              </radiogroup>
-              <button id="console-clear"
-                      class="show-text"
-                      label="&consoleClear.label;"
-                      oncommand="ConsolePanelView.clearConsole();"/>
-              <button id="console-copy"
-                      class="show-text"
-                      label="&consoleCopyAll.label;"
-                      oncommand="ConsolePanelView.copyAll();"/>
-            </hbox>
-          </vbox>
-
-          <richlistbox id="console-box"
-                       class="panel-list console-box"
-                       flex="1"
-                       onkeypress="ConsolePanelView.onConsoleBoxKeyPress(event)"
-                       oncontextmenu="ConsolePanelView.onContextMenu(event);"/>
-        </vbox>
-      </deck>
-    </vbox>
-
-    <!-- Find bar -->
-    <appbar id="findbar"
-            class="window-width"
-            pack="start">
-      <textbox id="findbar-textbox"
-               type="search"
-               oncommand="FindHelperUI.search(this.value)"
-               oninput="FindHelperUI.updateCommands(this.value); "/>
-
-      <toolbarbutton id="findbar-previous-button"
-                     class="appbar-secondary"
-                     command="cmd_findPrevious"/>
-      <toolbarbutton id="findbar-next-button"
-                     class="appbar-secondary"
-                     command="cmd_findNext"/>
-
-      <spacer flex="1"/>
-
-      <toolbarbutton id="findbar-close-button"
-                     class="appbar-secondary"
-                     command="cmd_findClose"/>
-    </appbar>
-
-    <!-- Context button bar -->
-    <appbar id="contextappbar">
-      <toolbar id="contextualactions-tray"
-               labelled="true"
-               flex="1">
-        <toolbarbutton id="pin-selected-button"
-                       class="appbar-primary"
-                       label-uses-set-name="true"
-                       hidden="true"
-                       fade="true"
-                       oncommand="Appbar.dispatchContextualAction('pin')"/>
-        <toolbarbutton id="unpin-selected-button"
-                       class="appbar-primary"
-                       label-uses-set-name="true"
-                       hidden="true"
-                       fade="true"
-                       oncommand="Appbar.dispatchContextualAction('unpin')"/>
-        <toolbarbutton id="hide-selected-button"
-                       class="appbar-primary"
-                       label-uses-set-name="true"
-                       hidden="true"
-                       fade="true"
-                       oncommand="Appbar.dispatchContextualAction('unpin')"/>
-        <toolbarbutton id="delete-selected-button"
-                       class="appbar-primary"
-                       hidden="true"
-                       fade="true"
-                       oncommand="Appbar.dispatchContextualAction('delete')"/>
-        <toolbarbutton id="restore-selected-button"
-                       class="appbar-primary"
-                       hidden="true"
-                       fade="true"
-                       oncommand="Appbar.dispatchContextualAction('restore')"/>
-        <toolbarbutton id="clear-selected-button"
-                       class="appbar-primary"
-                       hidden="true"
-                       fade="true"
-                       oncommand="Appbar.dispatchContextualAction('clear')"/>
-      </toolbar>
-    </appbar>
-    <autoscroller class="autoscroller"
-                  id="autoscrollerid"/>
-    <flyoutpanel id="about-flyoutpanel"
-                 class="flyout-narrow"
-                 headertext="&aboutHeader.title;">
-      <label align="start">
-        <html:img src="chrome://branding/content/metro-about-wordmark.png"
-                  alt="&aboutHeader.product.label;"/>
-      </label>
-      <label value="&aboutHeader.company.label;"
-             linewrap="true"/>
-#expand <label id="about-version-label">__MOZ_APP_VERSION__</label>
-      <vbox id="updateBox">
-#ifdef MOZ_UPDATER
-      <deck id="updateDeck"
-            orient="vertical">
-          <hbox id="updateButtonBox"
-                align="center">
-            <button id="updateButton"
-                    align="start"
-                    oncommand="FlyoutPanelsUI.AboutFlyoutPanel.appUpdater.buttonOnCommand();"/>
-            <spacer flex="1"/>
-          </hbox>
-          <hbox id="checkingForUpdates"
-                align="center">
-            <image class="update-throbber"/>
-            <description flex="1">
-              &update.checkingForUpdates;
-            </description>
-          </hbox>
-          <hbox id="checkingAddonCompat"
-                align="center">
-            <image class="update-throbber"/>
-            <description flex="1">
-              &update.checkingAddonCompat;
-            </description>
-          </hbox>
-          <hbox id="downloading"
-                align="center">
-            <image class="update-throbber"/>
-            <description flex="1">
-              &update.downloading.start;
-              <html:span id="downloadStatus">
-              </html:span>
-              &update.downloading.end;
-            </description>
-          </hbox>
-          <hbox id="applying"
-                align="center">
-            <image class="update-throbber"/>
-            <description flex="1">
-              &update.applying;
-            </description>
-          </hbox>
-          <hbox id="downloadFailed"
-                align="center">
-            <label>
-              &update.failed.start;
-            </label>
-            <label id="failedLink"
-                   class="text-link">
-              &update.failed.linkText;
-            </label>
-            <label>
-              &update.failed.end;
-            </label>
-          </hbox>
-          <hbox id="adminDisabled"
-                align="center">
-            <label linewrap="true">
-              &update.adminDisabled;
-            </label>
-          </hbox>
-          <hbox id="noUpdatesFound"
-                align="center">
-            <label linewrap="true">
-              &update.noUpdatesFound;
-            </label>
-          </hbox>
-          <hbox id="otherInstanceHandlingUpdates"
-                align="center">
-            <label linewrap="true">
-              &update.otherInstanceHandlingUpdates;
-            </label>
-          </hbox>
-          <hbox id="manualUpdate"
-                align="center">
-            <label>
-              &update.manual.start;
-            </label>
-            <label id="manualLink"
-                   linewrap="true"
-                   class="text-link"/>
-            <label>
-              &update.manual.end;
-            </label>
-          </hbox>
-        </deck>
-#endif
-      </vbox>
-#if MOZ_UPDATE_CHANNEL != release
-#ifdef MOZ_UPDATER
-      <description id="currentChannelText"
-                   class="text-blurb">
-        &channel.description.start;
-        <label id="currentChannel" linewrap="true"/>
-        &channel.description.end;
-      </description>
-#endif
-#endif
-      <label id="about-policy-label"
-             linewrap="true"
-             onclick="FlyoutPanelsUI.AboutFlyoutPanel.onPolicyClick(event);"
-             class="text-link"
-             value="&aboutHeader.policy.label;"/>
-      <spacer class="flyoutpanel-hack"/>
-    </flyoutpanel>
-#ifdef MOZ_SERVICES_SYNC
-<flyoutpanel id="sync-flyoutpanel"
-             class="flyout-narrow"
-             headertext="&sync.flyout.title;">
-      <vbox id="sync-presetup-container"
-               collapsed="true">
-        <description>&sync.flyout.presetup.description1;</description>
-        <separator />
-        <hbox onclick="FlyoutPanelsUI.SyncFlyoutPanel.startEasySetup();"
-              align="center"
-              class="text-link">
-          <image src="chrome://browser/skin/images/plus-34.png" />
-          <separator />
-          <label value="&sync.flyout.presetup.setup.label;"
-                 linewrap="true"
-                 class="text-link" />
-          <spacer flex="1" />
-        </hbox>
-      </vbox>
-      <vbox id="sync-setup-container"
-            collapsed="true">
-        <description>&sync.flyout.setup.description1;</description>
-        <description>&sync.flyout.setup.description2;</description>
-        <separator />
-        <vbox flex="1"
-              pack="center"
-              align="start">
-          <textbox id="sync-setup-code1"
-                   class="syncJPAKECode"
-                   placeholder="...."
-                   disabled="true" />
-          <textbox id="sync-setup-code2"
-                   class="syncJPAKECode"
-                   placeholder="...."
-                   disabled="true" />
-          <hbox>
-            <textbox id="sync-setup-code3"
-                     class="syncJPAKECode"
-                     placeholder="...."
-                     disabled="true" />
-            <vbox flex="1"
-                  pack="center"
-                  align="center">
-              <cssthrobber id='sync-setup-throbber'
-                           flex='1'
-                           class='syncThrobber'
-                           collapsed='true'
-                           disabled='true' />
-            </vbox>
-          </hbox>
-        </vbox>
-        <separator />
-        <description class="text-link"
-                     flex="1"
-                     onclick="FlyoutPanelsUI.SyncFlyoutPanel.abortEasySetup();
-                              FlyoutPanelsUI.SyncFlyoutPanel.showManualSetup()">
-          &sync.flyout.setup.manual.label_2;
-        </description>
-        <separator />
-        <description>
-          &sync.flyout.setup.description3;
-        </description>
-        <description>
-          &sync.flyout.setup.description4_2;
-        </description>
-        <description class="syncInstructionText">
-          &sync.flyout.setup.description5_2;
-        </description>
-        <description class="syncInstructionText">
-          &sync.flyout.setup.description6_2;
-        </description>
-      </vbox>
-
-      <vbox id="sync-manualsetup-container"
-            collapsed="true">
-        <description>
-          &sync.flyout.manualsetup.description1_2;
-        </description>
-        <separator/>
-        <textbox id="sync-manualsetup-account"
-                 placeholder="&sync.flyout.manualsetup.account.placeholder;"
-                 oninput="FlyoutPanelsUI.SyncFlyoutPanel.updateManualSetupConnectButtonState();"/>
-        <textbox id="sync-manualsetup-password"
-                 placeholder="&sync.flyout.manualsetup.password.placeholder;"
-                 type="password"
-                 oninput="FlyoutPanelsUI.SyncFlyoutPanel.updateManualSetupConnectButtonState();"/>
-        <textbox id="sync-manualsetup-syncKey"
-                 placeholder="&sync.flyout.manualsetup.recoveryKey.placeholder;"
-                 oninput="FlyoutPanelsUI.SyncFlyoutPanel.updateManualSetupConnectButtonState();"/>
-        <description id="sync-manualsetup-failure"
-                     class="syncErrorText"
-                     collapsed="true" />
-        <separator />
-        <hbox>
-          <button id="sync-manualsetup-connect"
-                  class="syncButton"
-                  oncommand="FlyoutPanelsUI.SyncFlyoutPanel.manualSetupConnect();"
-                  label="&sync.flyout.manualsetup.connect.label;"
-                  disabled="true" />
-          <spacer flex="1" />
-        </hbox>
-      </vbox>
-
-      <vbox id="sync-setupsuccess-container"
-            collapsed="true">
-        <description>
-          &sync.flyout.setupsuccess.description1;
-        </description>
-        <description>
-          &sync.flyout.setupsuccess.description2;
-        </description>
-      </vbox>
-
-      <vbox id="sync-setupfailure-container"
-            collapsed="true">
-        <description>
-          &sync.flyout.setupfailure.description;
-        </description>
-        <hbox>
-          <button class="syncButton"
-                  oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onCancelButton();"
-                  label="&sync.flyout.setupfailure.cancelButton;" />
-          <button class="syncButton"
-                  oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onTryAgainButton();"
-                  label="&sync.flyout.setupfailure.tryAgainButton;" />
-        </hbox>
-      </vbox>
-
-      <vbox id="sync-connected-container"
-            collapsed="true">
-        <description id="sync-connected-account"
-                     class="syncHeader" />
-        <separator />
-        <hbox>
-          <vbox>
-            <description id="sync-connected-device"
-                         class="syncHeader" />
-            <description id="sync-connected-lastSynced"
-                         class="syncSecondaryText" />
-          </vbox>
-          <cssthrobber id="sync-connected-throbber"
-                       class="syncThrobber"
-                       collapsed="true"
-                       disabled="true" />
-        </hbox>
-        <label id="sync-disconnect-label"
-               class="text-link"
-               onclick="FlyoutPanelsUI.SyncFlyoutPanel.onDisconnectLink();">
-          &sync.flyout.connected.disconnect;
-        </label>
-        <separator />
-        <vbox id="sync-disconnect-warning" collapsed="true">
-          <description class="syncHeader">
-            &sync.flyout.connected.disconnectWarningHeader;
-          </description>
-          <description class="syncSecondaryText">
-            &sync.flyout.connected.disconnectWarning;
-          </description>
-          <hbox>
-            <separator />
-            <button label="&sync.flyout.connected.cancel;"
-                    oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onDisconnectCancel();" />
-            <button label="&sync.flyout.connected.disconnect;"
-                    oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onDisconnectButton();" />
-
-          </hbox>
-          <separator />
-        </vbox>
-        <hbox onclick="FlyoutPanelsUI.SyncFlyoutPanel.onPairDeviceLink();"
-              class="text-link">
-          <image src="chrome://browser/skin/images/plus-24.png" />
-          <separator />
-          <label>
-            &sync.flyout.connected.pair;
-          </label>
-        </hbox>
-      </vbox>
-
-      <vbox id="sync-pair-container"
-            collapsed="true">
-        <description>
-          &sync.flyout.pairNewDevice.description;
-        </description>
-        <separator />
-        <hbox>
-          <vbox>
-            <textbox id="sync-pair-entry1"
-                     class="syncJPAKECode"
-                     maxlength="4"
-                     oninput="FlyoutPanelsUI.SyncFlyoutPanel.updatePairButtonState();" />
-            <textbox id="sync-pair-entry2"
-                     class="syncJPAKECode"
-                     maxlength="4"
-                     oninput="FlyoutPanelsUI.SyncFlyoutPanel.updatePairButtonState();" />
-            <textbox id="sync-pair-entry3"
-                     class="syncJPAKECode"
-                     maxlength="4"
-                     oninput="FlyoutPanelsUI.SyncFlyoutPanel.updatePairButtonState();" />
-          </vbox>
-          <spacer flex="1" />
-        </hbox>
-        <description id="sync-pair-failure"
-                     class="syncErrorText"
-                     collapsed="true">
-          &sync.flyout.pairNewDevice.failure;
-        </description>
-        <hbox>
-          <button id="sync-pair-button"
-                  label="&sync.flyout.pairNewDevice.pair;"
-                  oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onPairButton();"
-                  disabled="true" />
-          <spacer flex="1" />
-        </hbox>
-        <description>
-          &sync.flyout.pairNewDevice.note1;
-        </description>
-        <description>
-          &sync.flyout.pairNewDevice.note2_2;
-        </description>
-        <description class="syncInstructionText">
-          &sync.flyout.pairNewDevice.note3_2;
-        </description>
-        <description class="syncInstructionText">
-          &sync.flyout.pairNewDevice.note4;
-        </description>
-      </vbox>
-
-      <vbox id="sync-pair-success-container"
-            collapsed="true">
-        <description>
-          &sync.flyout.pairSuccess.description1;
-        </description>
-        <description>
-          &sync.flyout.pairSuccess.description2;
-        </description>
-      </vbox>
-
-    </flyoutpanel>
-#endif
-
-    <flyoutpanel id="prefs-flyoutpanel"
-                 class="flyout-narrow"
-                 headertext="&optionsHeader.title;">
-      <settings id="prefs-privdata"
-                label="&clearPrivateData.title;">
-        <description>
-          &clearPrivateData.label;
-        </description>
-
-        <checkbox id="prefs-privdata-history"
-                  itemName="history"
-                  label="&clearPrivateData.history;"
-                  checked="true" />
-
-        <checkbox id="prefs-privdata-other"
-                  label="&clearPrivateData.otherdata;"/>
-        <hbox id="prefs-privdata-subitems" >
-          <checkbox class="privdata-subitem-item"
-                    checked="true"
-                    itemName="downloads"
-                    label="&clearPrivateData.downloadHist;"/>
-          <checkbox class="privdata-subitem-item"
-                    checked="true"
-                    itemName="formdata"
-                    label="&clearPrivateData.formSearchHist;"/>
-          <checkbox class="privdata-subitem-item"
-                    checked="true"
-                    itemName="cookies"
-                    label="&clearPrivateData.cookies;"/>
-          <checkbox class="privdata-subitem-item"
-                    checked="true"
-                    itemName="passwords"
-                    label="&clearPrivateData.passwords;"/>
-          <checkbox class="privdata-subitem-item"
-                    checked="true"
-                    itemName="cache"
-                    label="&clearPrivateData.cache;"/>
-          <checkbox class="privdata-subitem-item"
-                    checked="true"
-                    itemName="offlineApps"
-                    label="&clearPrivateData.offline;"/>
-          <checkbox class="privdata-subitem-item"
-                    checked="true"
-                    itemName="siteSettings"
-                    label="&clearPrivateData.sitePref;"/>
-          <checkbox class="privdata-subitem-item"
-                    checked="true"
-                    itemName="sessions"
-                    label="&clearPrivateData.logins;"/>
-        </hbox>
-
-        <hbox align="center">
-          <button id="prefs-clear-data"
-                  label="&clearPrivateData.button;"
-                  command="cmd_sanitize"
-                  flex="1" />
-          <deck id="clear-notification"
-                flex="2"
-                selectedIndex="0"
-                align="center">
-            <spacer id="clear-notification-empty"/>
-            <hbox id="clear-notification-clearing"
-                  align="center">
-              <cssthrobber id="clearprivacythrobber"/>
-            </hbox>
-            <description id="clear-notification-done">
-              &clearPrivateData.done;
-            </description>
-          </deck>
-        </hbox>
-      </settings>
-      <setting pref="signon.rememberSignons"
-               title="&optionsHeader.privacy.passwords.label;"
-               type="bool"/>
-      <setting pref="browser.display.overlaynavbuttons"
-               title="&optionsHeader.displayOverlayButtons.label;"
-               type="bool"/>
-      <settings id="prefs-reporting"
-                label="&optionsHeader.reporting.title;">
-        <setting pref="app.crashreporter.autosubmit"
-                 type="bool"
-                 title="&optionsHeader.reporting.crashes.label;" />
-        <checkbox id="prefs-reporting-submitURLs"
-                  cropped="end"
-                  label="&optionsHeader.reporting.crashes.submitURLs;"
-                  command="cmd_reportingCrashesSubmitURLs"/>
-      </settings>
-      <settings id="prefs-telemetry"
-                label="&optionsHeader.telemetry.title;">
-        <setting
-#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
-          pref="toolkit.telemetry.enabledPreRelease"
-#else
-          pref="toolkit.telemetry.enabled"
-#endif
-          type="bool"
-          title="&optionsHeader.telemetry.label;"/>
-      </settings>
-      <settings id="prefs-dnt"
-                label="&doNotTrack.title;">
-        <setting id="prefs-dnt-value"
-                 pref="privacy.donottrackheader.value"
-                 type="radio" >
-          <radiogroup id="prefs-dnt-options">
-            <radio id="prefs-dnt-notrack"
-                   class="flyoutpanel-hack"
-                   label="&doNotTrack.options.doNotTrack;"
-                   value="1"/>
-            <radio id="prefs-dnt-oktrack"
-                   class="flyoutpanel-hack"
-                   label="&doNotTrack.options.doTrack;"
-                   value="0"/>
-            <radio id="prefs-dnt-nopref"
-                   class="flyoutpanel-hack"
-                   label="&doNotTrack.options.default;"
-                   value="-1"/>
-          </radiogroup>
-        </setting>
-        <label class="text-link"
-               href="https://www.mozilla.org/dnt">
-          &doNotTrack.learnMoreLink;
-        </label>
-      </settings>
-    </flyoutpanel>
-    <flyoutpanel id="search-flyoutpanel"
-                 class="flyout-narrow"
-                 headertext="&searchFlyoutHeader.title;">
-      <settings id="search-options"
-                label="&searchSetting.title;">
-      </settings>
-    </flyoutpanel>
-
-    <!-- Chrome touch selection overlay -->
-    <box class="selection-overlay-hidden"
-         id="chrome-selection-overlay"/>
-
-    <box onclick="event.stopPropagation();"
-         id="context-container"
-         class="menu-container"
-         hidden="true">
-      <vbox id="context-popup"
-            class="menu-popup">
-        <richlistbox id="context-commands"
-                     bindingType="contextmenu"
-                     flex="1">
-          <!-- priority="low" items are hidden by default when a context is
-               being displayed for two or more media types. (e.g.
-               a linked image) -->
-          <!-- content types preceeded by '!' act as exclusion rules, the menu
-               item will not be displayed if the content type is present. -->
-          <!-- Note the order of richlistitem here is important as it is
-               reflected in the menu itself. -->
-          <!-- ux spec:
-               https://bug782810.bugzilla.mozilla.org/attachment.cgi?id=714804 -->
-
-          <!-- Text related -->
-          <!-- for text inputs, this will cut selected text -->
-          <richlistitem id="context-cut"
-                        type="cut"
-                        onclick="ContextCommands.cut();">
-            <label value="&contextTextCut.label;"/>
-          </richlistitem>
-          <!-- for text inputs, this will copy selected text -->
-          <richlistitem id="context-copy"
-                        type="copy"
-                        onclick="ContextCommands.copy();">
-            <label value="&contextTextCopy.label;"/>
-          </richlistitem>
-          <!-- Search Bing for "(text..)", displayed on selected content text
-              only -->
-          <richlistitem id="context-search"
-                        type="selected-text,!input-text"
-                        onclick="ContextCommands.searchText(this);">
-            <label id="context-search-label" value=""/>
-          </richlistitem>
-          <!-- only displayed in inputs with text that do not have selection -->
-          <richlistitem id="context-select"
-                        type="selectable"
-                        onclick="ContextCommands.select();">
-            <label value="&contextTextSelect.label;"/>
-          </richlistitem>
-          <!-- only displayed in inputs with text that do not have selection -->
-          <richlistitem id="context-select-all"
-                        type="selectable"
-                        onclick="ContextCommands.selectAll();">
-            <label value="&contextTextSelectAll.label;"/>
-          </richlistitem>
-          <!-- only displayed if there is text on the clipboard -->
-          <richlistitem id="context-paste"
-                        type="paste"
-                        onclick="ContextCommands.paste();">
-            <label value="&contextTextPaste.label;"/>
-          </richlistitem>
-          <!-- only display if there is text on the clipboard and the target
-               is the urlbar -->
-          <richlistitem id="context-paste-n-go"
-                        type="paste-url"
-                        onclick="ContextCommands.pasteAndGo();">
-            <label value="&contextTextPasteAndGo.label;"/>
-          </richlistitem>
-
-          <!-- Image related -->
-          <!-- save image to user pictures library -->
-          <richlistitem id="context-save-image-lib"
-                        type="image"
-                        onclick="ContextCommands.saveImageToLib();">
-            <label value="&contextSaveImageLib.label;"/>
-          </richlistitem>
-          <!-- copy image data to clipboard -->
-          <richlistitem id="context-copy-image"
-                        type="image"
-                        onclick="ContextCommands.copyImage();">
-            <label value="&contextCopyImage.label;"/>
-          </richlistitem>
-          <!-- copy the uri of the image src -->
-          <richlistitem id="context-copy-image-loc"
-                        type="image"
-                        onclick="ContextCommands.copyImageSrc();">
-            <label value="&contextCopyImageLocation.label;"/>
-          </richlistitem>
-          <!-- open the uri of the image src in a new tab -->
-          <richlistitem id="context-open-image-tab"
-                        type="image"
-                        priority="low"
-                        onclick="ContextCommands.openImageInNewTab();">
-            <label value="&contextOpenImageTab.label;"/>
-          </richlistitem>
-
-          <!-- Video related -->
-          <!-- save video to user videos library -->
-          <richlistitem id="context-save-video-lib"
-                        type="video"
-                        onclick="ContextCommands.saveVideoToLib();">
-            <label value="&contextSaveVideoLib.label;"/>
-          </richlistitem>
-          <!-- copy the uri of the video src -->
-          <richlistitem id="context-copy-video-loc"
-                        type="video"
-                        onclick="ContextCommands.copyVideoSrc();">
-            <label value="&contextCopyVideoLocation.label;"/>
-          </richlistitem>
-          <!-- open the uri of the video src in a new tab -->
-          <richlistitem id="context-open-video-tab"
-                        type="video"
-                        priority="low"
-                        onclick="ContextCommands.openVideoInNewTab();">
-            <label value="&contextOpenVideoTab.label;"/>
-          </richlistitem>
-
-          <!-- Link related -->
-          <!-- all of these apply to underlying link href values -->
-          <richlistitem id="context-open-in-new-tab"
-                        type="link"
-                        onclick="ContextCommands.openLinkInNewTab();">
-            <label value="&contextOpenLinkTab.label;"/>
-          </richlistitem>
-          <richlistitem id="context-copy-link"
-                        type="link"
-                        onclick="ContextCommands.copyLink();">
-            <label value="&contextCopyLinkHref.label;"/>
-          </richlistitem>
-          <richlistitem id="context-bookmark-link"
-                        type="link"
-                        priority="low"
-                        onclick="ContextCommands.bookmarkLink();">
-            <label value="&contextBookmarkLinkHref.label;"/>
-          </richlistitem>
-
-          <!-- App bar: 'more' button context menu -->
-          <!-- developer buttons - shown in metrodesktop mode only -->
-          <richlistitem id="context-error-console"
-                        type="open-error-console"
-                        onclick="ContextCommands.errorConsole();">
-            <label value="&appbarErrorConsole.label;"/>
-          </richlistitem>
-          <richlistitem id="context-jsshell"
-                        type="open-jsshell"
-                        onclick="ContextCommands.jsShell();">
-            <label value="&appbarJSShell.label;"/>
-          </richlistitem>
-
-          <!-- standard buttons -->
-          <richlistitem id="context-newprivatetab"
-                        type="private-browsing"
-                        onclick="BrowserUI.addAndShowPrivateTab()">
-            <label value="&newPrivateTab.label;"/>
-          </richlistitem>
-          <richlistitem id="context-findinpage"
-                        type="find-in-page"
-                        onclick="ContextCommands.findInPage();">
-            <label value="&appbarFindInPage2.label;"/>
-          </richlistitem>
-          <richlistitem id="context-viewondesktop"
-                        type="view-on-desktop"
-                        onclick="ContextCommands.viewOnDesktop();">
-            <label value="&appbarRelaunchInDesktop.label;"/>
-          </richlistitem>
-          <richlistitem id="context-msmetadata"
-                        type="ms-meta-data"
-                        onclick="ContextCommands.openWindowsStoreLink();">
-            <label value="&appbarMSMetaData2.label;"/>
-          </richlistitem>
-          <richlistitem id="context-viewpagesource"
-                        type="view-page-source"
-                        onclick="ContextCommands.viewPageSource();">
-            <label value="&appbarViewPageSource.label;"/>
-          </richlistitem>
-        </richlistbox>
-      </vbox>
-    </box>
-
-    <vbox id="select-container"
-          class="menu-container"
-          hidden="true">
-      <vbox id="select-popup"
-            class="select-popup">
-        <richlistbox id="select-commands"
-                     flex="1"/>
-      </vbox>
-    </vbox>
-
-    <box id="menucontrol-container"
-         class="menu-container"
-         hidden="true">
-      <vbox id="menucontrol-popup"
-            class="menu-popup">
-        <richlistbox id="menupopup-commands"
-                     onclick="if (event.target != this) MenuControlUI.selectByIndex(this.selectedIndex);"
-                     flex="1"/>
-      </vbox>
-    </box>
-
-    <box id="autofill-container"
-         class="menu-container"
-         hidden="true">
-      <vbox id="autofill-popup"
-            class="menu-popup">
-        <richlistbox id="menupopup-commands"
-                     onclick="if (event.target != this) AutofillMenuUI.selectByIndex(this.selectedIndex);"
-                     flex="1"/>
-      </vbox>
-    </box>
-  </stack>
-</window>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/commandUtil.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/commandUtil.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/commandUtil.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/commandUtil.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +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/. */
-
-
-/**
- * Command Updater
- */
-var CommandUpdater = {
-  /**
-   * Gets a controller that can handle a particular command.
-   * @param   command
-   *          A command to locate a controller for, preferring controllers that
-   *          show the command as enabled.
-   * @returns In this order of precedence:
-   *            - the first controller supporting the specified command
-   *              associated with the focused element that advertises the
-   *              command as ENABLED
-   *            - the first controller supporting the specified command
-   *              associated with the global window that advertises the
-   *              command as ENABLED
-   *            - the first controller supporting the specified command
-   *              associated with the focused element
-   *            - the first controller supporting the specified command
-   *              associated with the global window
-   */
-  _getControllerForCommand: function(command) {
-    try {
-      var controller = top.document.commandDispatcher.getControllerForCommand(command);
-      if (controller && controller.isCommandEnabled(command))
-        return controller;
-    }
-    catch(e) {
-    }
-    var controllerCount = window.controllers.getControllerCount();
-    for (var i = 0; i < controllerCount; ++i) {
-      var current = window.controllers.getControllerAt(i);
-      try {
-        if (current.supportsCommand(command) && current.isCommandEnabled(command))
-          return current;
-      }
-      catch (e) {
-      }
-    }
-    return controller || window.controllers.getControllerForCommand(command);
-  },
-
-  /**
-   * Updates the state of a XUL <command> element for the specified command
-   * depending on its state.
-   * @param   command
-   *          The name of the command to update the XUL <command> element for
-   */
-  updateCommand: function(command) {
-    var enabled = false;
-    try {
-      var controller = this._getControllerForCommand(command);
-      if (controller) {
-        enabled = controller.isCommandEnabled(command);
-      }
-    }
-    catch(ex) { }
-
-    this.enableCommand(command, enabled);
-  },
-
-  /**
-   * Updates the state of a XUL <command> element for the specified command
-   * depending on its state.
-   * @param   command
-   *          The name of the command to update the XUL <command> element for
-   */
-  updateCommands: function(_commands) {
-    var commands = _commands.split(",");
-    for (var command in commands) {
-      this.updateCommand(commands[command]);
-    }
-  },
-
-  /**
-   * Enables or disables a XUL <command> element.
-   * @param   command
-   *          The name of the command to enable or disable
-   * @param   enabled
-   *          true if the command should be enabled, false otherwise.
-   */
-  enableCommand: function(command, enabled) {
-    var element = document.getElementById(command);
-    if (!element)
-      return;
-    if (enabled)
-      element.removeAttribute("disabled");
-    else
-      element.setAttribute("disabled", "true");
-  },
-
-  /**
-   * Performs the action associated with a specified command using the most
-   * relevant controller.
-   * @param   command
-   *          The command to perform.
-   */
-  doCommand: function(command) {
-    var controller = this._getControllerForCommand(command);
-    if (!controller)
-      return;
-    controller.doCommand(command);
-  },
-
-  /**
-   * Changes the label attribute for the specified command.
-   * @param   command
-   *          The command to update.
-   * @param   labelAttribute
-   *          The label value to use.
-   */
-  setMenuValue: function(command, labelAttribute) {
-    var commandNode = top.document.getElementById(command);
-    if (commandNode)
-    {
-      var label = commandNode.getAttribute(labelAttribute);
-      if ( label )
-        commandNode.setAttribute('label', label);
-    }
-  },
-
-  /**
-   * Changes the accesskey attribute for the specified command.
-   * @param   command
-   *          The command to update.
-   * @param   valueAttribute
-   *          The value attribute to use.
-   */
-  setAccessKey: function(command, valueAttribute) {
-    var commandNode = top.document.getElementById(command);
-    if (commandNode)
-    {
-      var value = commandNode.getAttribute(valueAttribute);
-      if ( value )
-        commandNode.setAttribute('accesskey', value);
-    }
-  },
-
-  /**
-   * Inform all the controllers attached to a node that an event has occurred
-   * (e.g. the tree controllers need to be informed of blur events so that they can change some of the
-   * menu items back to their default values)
-   * @param   node
-   *          The node receiving the event
-   * @param   event
-   *          The event.
-   */
-  onEvent: function(node, event) {
-    var numControllers = node.controllers.getControllerCount();
-    var controller;
-
-    for ( var controllerIndex = 0; controllerIndex < numControllers; controllerIndex++ )
-    {
-      controller = node.controllers.getControllerAt(controllerIndex);
-      if ( controller )
-        controller.onEvent(event);
-    }
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/console.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/console.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/console.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/console.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,352 +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/. */
-
-let ConsolePanelView = {
-  _list: null,
-  _inited: false,
-  _evalTextbox: null,
-  _evalFrame: null,
-  _evalCode: "",
-  _bundle: null,
-  _showChromeErrors: -1,
-  _enabledPref: "devtools.errorconsole.enabled",
-
-  get enabled() {
-    return Services.prefs.getBoolPref(this._enabledPref);
-  },
-
-  get follow() {
-    return document.getElementById("console-follow-checkbox").checked;
-  },
-
-  init: function cv_init() {
-    if (this._list)
-      return;
-
-    this._list = document.getElementById("console-box");
-    this._evalTextbox = document.getElementById("console-eval-textbox");
-    this._bundle = Strings.browser;
-
-    this._count = 0;
-    this.limit = 250;
-    this.fieldMaxLength = 140;
-
-    try {
-      // update users using the legacy pref
-      if (Services.prefs.getBoolPref("browser.console.showInPanel")) {
-        Services.prefs.setBoolPref(this._enabledPref, true);
-        Services.prefs.clearUserPref("browser.console.showInPanel");
-      }
-    } catch(ex) {
-      // likely don't have an old pref
-    }
-    Services.prefs.addObserver(this._enabledPref, this, false);
-  },
-
-  show: function show() {
-    if (this._inited)
-      return;
-    this._inited = true;
-
-    this.init(); // In case the panel is selected before init has been called.
-
-    Services.console.registerListener(this);
-
-    this.appendInitialItems();
-
-    // Delay creation of the iframe for startup performance
-    this._evalFrame = document.createElement("iframe");
-    this._evalFrame.id = "console-evaluator";
-    this._evalFrame.collapsed = true;
-    document.getElementById("console-container").appendChild(this._evalFrame);
-
-    this._evalFrame.addEventListener("load", this.loadOrDisplayResult.bind(this), true);
-  },
-
-  uninit: function cv_uninit() {
-    if (this._inited)
-      Services.console.unregisterListener(this);
-
-    Services.prefs.removeObserver(this._enabledPref, this, false);
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    if (aTopic == "nsPref:changed") {
-      // We may choose to create a new menu in v2
-      }
-    else
-      this.appendItem(aSubject);
-  },
-
-  showChromeErrors: function() {
-    if (this._showChromeErrors != -1)
-      return this._showChromeErrors;
-
-    try {
-      let pref = Services.prefs;
-      return this._showChromeErrors = pref.getBoolPref("javascript.options.showInConsole");
-    }
-    catch(ex) {
-      return this._showChromeErrors = false;
-    }
-  },
-
-  appendItem: function cv_appendItem(aObject) {
-    let index = -1;
-    try {
-      // Try to QI it to a script error to get more info
-      let scriptError = aObject.QueryInterface(Ci.nsIScriptError);
-
-      // filter chrome urls
-      if (!this.showChromeErrors && scriptError.sourceName.substr(0, 9) == "chrome://")
-        return;
-      index = this.appendError(scriptError);
-    }
-    catch (ex) {
-      try {
-        // Try to QI it to a console message
-        let msg = aObject.QueryInterface(Ci.nsIConsoleMessage);
-
-        if (msg.message)
-          index = this.appendMessage(msg.message);
-        else // observed a null/"clear" message
-          this.clearConsole();
-      }
-      catch (ex2) {
-        // Give up and append the object itself as a string
-        index = this.appendMessage(aObject);
-      }
-    }
-    if (this.follow) {
-      this._list.ensureIndexIsVisible(index);
-    }
-  },
-
-  truncateIfNecessary: function (aString) {
-    if (!aString || aString.length <= this.fieldMaxLength) {
-      return aString;
-    }
-    let truncatedString = aString.substring(0, this.fieldMaxLength);
-    let Ci = Components.interfaces;
-    let ellipsis = Services.prefs.getComplexValue("intl.ellipsis",
-                                                  Ci.nsIPrefLocalizedString).data;
-    truncatedString = truncatedString + ellipsis;
-    return truncatedString;
-  },
-
-  appendError: function cv_appendError(aObject) {
-    let row = this.createConsoleRow();
-    let nsIScriptError = Ci.nsIScriptError;
-
-    // Is this error actually just a non-fatal warning?
-    let warning = aObject.flags & nsIScriptError.warningFlag != 0;
-
-    let typetext = warning ? "typeWarning" : "typeError";
-    row.setAttribute("typetext", this._bundle.GetStringFromName(typetext));
-    row.setAttribute("type", warning ? "warning" : "error");
-    row.setAttribute("msg", aObject.errorMessage);
-    row.setAttribute("category", aObject.category);
-    if (aObject.lineNumber || aObject.sourceName) {
-      row.setAttribute("href", aObject.sourceName);
-      row.setAttribute("line", aObject.lineNumber);
-    }
-    else {
-      row.setAttribute("hideSource", "true");
-    }
-    // hide code by default, otherwise initial item display will
-    // hang the browser.
-    row.setAttribute("hideCode", "true");
-    row.setAttribute("hideCaret", "true");
-
-    if (aObject.sourceLine) {
-      row.setAttribute("code", this.truncateIfNecessary(aObject.sourceLine.replace(/\s/g, " ")));
-      if (aObject.columnNumber) {
-        row.setAttribute("col", aObject.columnNumber);
-      }
-    }
-
-    let mode = document.getElementById("console-filter").value;
-    if (mode != "all" && mode != row.getAttribute("type")) {
-      row.collapsed = true;
-    }
-
-    row.setAttribute("onclick", "ConsolePanelView.onRowClick(this)");
-    this.appendConsoleRow(row);
-    return this._list.getIndexOfItem(row);
-  },
-
-  appendMessage: function cv_appendMessage (aMessage) {
-    let row = this.createConsoleRow();
-    row.setAttribute("type", "message");
-    row.setAttribute("msg", aMessage);
-
-    let mode = document.getElementById("console-filter").value;
-    if (mode != "all" && mode != "message")
-      row.collapsed = true;
-
-    this.appendConsoleRow(row);
-    return this._list.getIndexOfItem(row);
-  },
-
-  createConsoleRow: function cv_createConsoleRow() {
-    let row = document.createElement("richlistitem");
-    row.setAttribute("class", "console-row");
-    return row;
-  },
-
-  appendConsoleRow: function cv_appendConsoleRow(aRow) {
-    this._list.appendChild(aRow);
-    if (++this._count > this.limit) {
-      this.deleteFirst();
-    }
-  },
-
-  deleteFirst: function cv_deleteFirst() {
-    let node = this._list.firstChild;
-    this._list.removeChild(node);
-    --this._count;
-  },
-
-  appendInitialItems: function cv_appendInitialItems() {
-    this._list.collapsed = true;
-    let messages = Services.console.getMessageArray();
-
-    // In case getMessageArray returns 0-length array as null
-    if (!messages)
-      messages = [];
-
-    let limit = messages.length - this.limit;
-    if (limit < 0)
-      limit = 0;
-
-    // Checks if console ever been cleared
-    for (var i = messages.length - 1; i >= limit; --i) {
-      if (!messages[i].message) {
-        break;
-      }
-    }
-
-    // Populate with messages after latest "clear"
-    while (++i < messages.length) {
-      this.appendItem(messages[i]);
-    }
-    this._list.collapsed = false;
-  },
-
-  clearConsole: function cv_clearConsole() {
-    if (this._count == 0) // already clear
-      return;
-    this._count = 0;
-
-    let newRows = this._list.cloneNode(false);
-    this._list.parentNode.replaceChild(newRows, this._list);
-    this._list = newRows;
-    this.selectedItem = null;
-  },
-
-  copyAll: function () {
-    let mode = document.getElementById("console-filter").value;
-    let rows = this._list.childNodes;
-    let copyText = "";
-    for (let i=0; i < rows.length; i++) {
-      let row = rows[i];
-      if (mode == "all" || row.getAttribute ("type") == mode) {
-        let text = "* " + row.getAttribute("msg");
-        if (row.hasAttribute("href")) {
-          text += "\r\n " + row.getAttribute("href") + " line:" + row.getAttribute("line");
-        }
-        if (row.hasAttribute("code")) {
-          text += "\r\n " + row.getAttribute("code") + " col:" + row.getAttribute("col");
-        }
-        copyText += text + "\r\n";
-      }
-    }
-    let clip = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
-    clip.copyString(copyText, document);
-  },
-
-  changeMode: function cv_changeMode() {
-    let mode = document.getElementById("console-filter").value;
-    if (this._list.getAttribute("mode") != mode) {
-      let rows = this._list.childNodes;
-      for (let i=0; i < rows.length; i++) {
-        let row = rows[i];
-        if (mode == "all" || row.getAttribute ("type") == mode)
-          row.collapsed = false;
-        else
-          row.collapsed = true;
-      }
-      this._list.mode = mode;
-      this._list.scrollToIndex(0);
-    }
-  },
-
-  onContextMenu: function cv_onContextMenu(aEvent) {
-    let row = aEvent.target;
-    let text = ["msg", "href", "line", "code", "col"].map(function(attr) row.getAttribute(attr))
-               .filter(function(x) x).join("\r\n");
-
-    ContextMenuUI.showContextMenu({
-      target: row,
-      json: {
-        types: ["copy"],
-        string: text,
-        xPos: aEvent.clientX,
-        yPos: aEvent.clientY
-      }
-    });
-  },
-
-  onRowClick: function (aRow) {
-    if (aRow.hasAttribute("code")) {
-      aRow.setAttribute("hideCode", "false");
-    }
-    if (aRow.hasAttribute("col")) {
-      aRow.setAttribute("hideCaret", "false");
-    }
-  },
-
-  onEvalKeyPress: function cv_onEvalKeyPress(aEvent) {
-    if (aEvent.keyCode == 13)
-      this.evaluateTypein();
-  },
-
-  onConsoleBoxKeyPress: function cv_onConsoleBoxKeyPress(aEvent) {
-    if ((aEvent.charCode == 99 || aEvent.charCode == 67) && aEvent.ctrlKey && this._list && this._list.selectedItem) {
-      let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
-      clipboard.copyString(this._list.selectedItem.getAttribute("msg"), document);
-    }
-  },
-
-  evaluateTypein: function cv_evaluateTypein() {
-    this._evalCode = this._evalTextbox.value;
-    this.loadOrDisplayResult();
-  },
-
-  loadOrDisplayResult: function cv_loadOrDisplayResult() {
-    if (this._evalCode) {
-      this._evalFrame.contentWindow.location = "javascript: " + this._evalCode.replace(/%/g, "%25");
-      this._evalCode = "";
-      return;
-    }
-
-    let resultRange = this._evalFrame.contentDocument.createRange();
-    resultRange.selectNode(this._evalFrame.contentDocument.documentElement);
-    let result = resultRange.toString();
-    if (result)
-      Services.console.logStringMessage(result);
-      // or could use appendMessage which doesn't persist
-  },
-
-  repeatChar: function cv_repeatChar(aChar, aCol) {
-    if (--aCol <= 0)
-      return "";
-
-    for (let i = 2; i < aCol; i += i)
-      aChar += aChar;
-
-    return aChar + aChar.slice(0, aCol - aChar.length);
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/ContentAreaObserver.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/ContentAreaObserver.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/ContentAreaObserver.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/ContentAreaObserver.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,361 +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/. */
-
- /*
-  * ContentAreaObserver manages tracking the viewable area within the browser.
-  * It also handles certain tasks like positioning of input elements within
-  * content when the viewable area changes.
-  *
-  * ContentAreaObserver creates styles that content can apply and also fires
-  * events when things change. The 'width' and 'height' properties of the
-  * styles are updated whenever various parts of the UI are resized.
-  *
-  *  styles: window-width, window-height
-  *  events: SizeChanged
-  *
-  *  The innerWidth/innerHeight of the main chrome window.
-  *
-  *  styles: content-width, content-height
-  *  events: ContentSizeChanged
-  *
-  *  The area of the window dedicated to web content; this is equal to the
-  *  innerWidth/Height minus any toolbars or similar chrome.
-  *
-  *  styles: viewable-width, viewable-height
-  *  events: ViewableSizeChanged
-  *
-  *  The portion of the content area that is not obscured by the on-screen
-  *  keyboard.
-  *
-  * ContentAreaObserver also manages soft keyboard related events. Events
-  * fired include:
-  *
-  *  KeyboardChanged - fired after the visibility of the soft keyboard changes
-  *  and after any view related changes are made to accomidate view dim
-  *  changes as a result.
-  *
-  *  MozDeckOffsetChanging, MozDeckOffsetChanged - interim events fired when
-  *  the browser deck is being repositioned to move focused elements out of
-  *  the way of the keyboard.
-  */
-
-var ContentAreaObserver = {
-  styles: {},
-  _shiftAmount: 0,
-  _deckTransitioning: false,
-
-  /*
-   * Properties
-   */
-
-  get width() {
-    return window.innerWidth || 1366;
-  },
-
-  get height() {
-    return window.innerHeight || 768;
-  },
-
-  get contentHeight() {
-    return this._getContentHeightForWindow(this.height);
-  },
-
-  get viewableHeight() {
-    return this._getViewableHeightForContent(this.contentHeight);
-  },
-
-  get isKeyboardOpened() {
-    return Services.metro.keyboardVisible;
-  },
-
-  get isKeyboardTransitioning() {
-    return this._deckTransitioning;
-  },
-
-  get viewstate() {
-    if (this.width < Services.prefs.getIntPref("browser.ui.snapped.maxWidth")) {
-      return "snapped";
-    }
-    return (this.height > this.width) ? "portrait" : "landscape";
-  },
-
-  /*
-   * Public apis
-   */
-
-  init: function init() {
-    window.addEventListener("resize", this, false);
-
-    // Message manager msgs we listen for
-    messageManager.addMessageListener("Content:RepositionInfoResponse", this);
-
-    // Observer msgs we listen for
-    Services.obs.addObserver(this, "metro_softkeyboard_shown", false);
-    Services.obs.addObserver(this, "metro_softkeyboard_hidden", false);
-
-    // setup initial values for browser form repositioning
-    this.shiftBrowserDeck(0);
-
-    // initialize our custom width and height styles
-    this._initStyles();
-
-    // apply default styling
-    this.update();
-  },
-
-  shutdown: function shutdown() {
-    messageManager.removeMessageListener("Content:RepositionInfoResponse", this);
-    Services.obs.removeObserver(this, "metro_softkeyboard_shown");
-    Services.obs.removeObserver(this, "metro_softkeyboard_hidden");
-  },
-
-  update: function cao_update (width, height) {
-    let oldWidth = parseInt(this.styles["window-width"].width);
-    let oldHeight = parseInt(this.styles["window-height"].height);
-
-    let newWidth = width || this.width;
-    let newHeight = height || this.height;
-
-    if (newHeight == oldHeight && newWidth == oldWidth) {
-      return;
-    }
-
-    this.styles["window-width"].width = newWidth + "px";
-    this.styles["window-width"].maxWidth = newWidth + "px";
-    this.styles["window-height"].height = newHeight + "px";
-    this.styles["window-height"].maxHeight = newHeight + "px";
-
-    this._updateViewState();
-
-    this.updateContentArea(newWidth, this._getContentHeightForWindow(newHeight));
-    this._dispatchBrowserEvent("SizeChanged");
-  },
-
-  updateContentArea: function cao_updateContentArea (width, height) {
-    let oldHeight = parseInt(this.styles["content-height"].height);
-    let oldWidth = parseInt(this.styles["content-width"].width);
-
-    let newWidth = width || this.width;
-    let newHeight = height || this.contentHeight;
-
-    if (newHeight == oldHeight && newWidth == oldWidth) {
-      return;
-    }
-
-    this.styles["content-height"].height = newHeight + "px";
-    this.styles["content-height"].maxHeight = newHeight + "px";
-    this.styles["content-width"].width = newWidth + "px";
-    this.styles["content-width"].maxWidth = newWidth + "px";
-
-    this.updateViewableArea(newWidth, this._getViewableHeightForContent(newHeight));
-    this._dispatchBrowserEvent("ContentSizeChanged");
-  },
-
-  updateViewableArea: function cao_updateViewableArea (width, height) {
-    let oldHeight = parseInt(this.styles["viewable-height"].height);
-    let oldWidth = parseInt(this.styles["viewable-width"].width);
-
-    let newWidth = width || this.width;
-    let newHeight = height || this.viewableHeight;
-
-    if (newHeight == oldHeight && newWidth == oldWidth) {
-      return;
-    }
-
-    this.styles["viewable-height"].height = newHeight + "px";
-    this.styles["viewable-height"].maxHeight = newHeight + "px";
-    this.styles["viewable-width"].width = newWidth + "px";
-    this.styles["viewable-width"].maxWidth = newWidth + "px";
-
-    this.updateAppBarPosition();
-
-    // Update the back/tab button states. If the keyboard is up
-    // these are hidden.
-    BrowserUI._updateButtons();
-
-    this._dispatchBrowserEvent("ViewableSizeChanged");
-  },
-
-  updateAppBarPosition: function updateAppBarPosition(aForceDown) {
-    // Adjust the app and find bar position above the soft keyboard
-    let keyboardHeight = aForceDown ? 0 : Services.metro.keyboardHeight;
-    Elements.navbar.style.bottom = keyboardHeight + "px";
-    Elements.contextappbar.style.bottom = keyboardHeight + "px";
-    Elements.findbar.style.bottom = keyboardHeight + "px";
-  },
-
-  /*
-   * Called by BrowserUI right before we blur the nav bar edit. We use
-   * this to get a head start on shuffling app bars around before the
-   * soft keyboard transitions down.
-   */
-  navBarWillBlur: function navBarWillBlur() {
-    this.updateAppBarPosition(true);
-  },
-
-  onBrowserCreated: function onBrowserCreated(aBrowser) {
-    let notificationBox = aBrowser.parentNode.parentNode;
-    notificationBox.classList.add("content-width");
-    notificationBox.classList.add("content-height");
-  },
-
-  /*
-   * Event handling
-   */
-
-  _onKeyboardDisplayChanging: function _onKeyboardDisplayChanging(aNewState) {
-    if (aNewState) {
-      Elements.stack.setAttribute("keyboardVisible", true);
-    } else {
-      Elements.stack.removeAttribute("keyboardVisible");
-    }
-
-    this.updateViewableArea();
-
-    if (!aNewState) {
-      this.shiftBrowserDeck(0);
-      return;
-    }
-
-    // Request info about the target form element to see if we
-    // need to reposition the browser above the keyboard.
-    if (SelectionHelperUI.layerMode === 2 /*kContentLayer*/) {
-      Browser.selectedBrowser.messageManager.sendAsyncMessage("Browser:RepositionInfoRequest", {
-        viewHeight: this.viewableHeight,
-      });
-    }
-  },
-
-  _onRepositionResponse: function _onRepositionResponse(aJsonMsg) {
-    if (!aJsonMsg.reposition || !this.isKeyboardOpened) {
-      this.shiftBrowserDeck(0);
-      return;
-    }
-    this.shiftBrowserDeck(aJsonMsg.raiseContent);
-  },
-
-  observe: function cao_observe(aSubject, aTopic, aData) {
-    // Note these are fired before the transition starts. Also per MS specs
-    // we should not do anything "heavy" here. We have about 100ms before
-    // windows just ignores the event and starts the animation.
-    switch (aTopic) {
-      case "metro_softkeyboard_hidden":
-      case "metro_softkeyboard_shown":
-        // Mark that we are in a transition state. Auto-complete and other
-        // popups will wait for an event before displaying anything.
-        this._deckTransitioning = true;
-        // This also insures tap events are delivered before we fire
-        // this event. Form repositioning requires the selection handler
-        // be running before we send this.
-        let self = this;
-        let state = aTopic == "metro_softkeyboard_shown";
-        Util.executeSoon(function () {
-          self._onKeyboardDisplayChanging(state);
-        });
-        break;
-    }
-  },
-
-  handleEvent: function cao_handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case 'resize':
-        if (aEvent.target != window)
-          return;
-        ContentAreaObserver.update();
-        break;
-    }
-  },
-
-  receiveMessage: function sh_receiveMessage(aMessage) {
-    switch (aMessage.name) {
-      case "Content:RepositionInfoResponse":
-        this._onRepositionResponse(aMessage.json);
-        break;
-    }
-  },
-
-  /*
-   * Internal helpers
-   */
-
-  _updateViewState: function (aState) {
-    let oldViewstate = Elements.windowState.getAttribute("viewstate");
-    let viewstate = aState || this.viewstate;
-    if (viewstate != oldViewstate) {
-      Elements.windowState.setAttribute("viewstate", viewstate);
-      Services.obs.notifyObservers(null, "metro_viewstate_changed", viewstate);
-    }
-  },
-
-  shiftBrowserDeck: function (aAmount) {
-    if (aAmount == 0) {
-      this._deckTransitioning = false;
-      this._dispatchWindowEvent("KeyboardChanged", this.isKeyboardOpened);
-    }
-
-    if (this._shiftAmount == aAmount)
-      return;
-
-    this._shiftAmount = aAmount;
-    this._dispatchWindowEvent("MozDeckOffsetChanging", aAmount);
-
-    // Elements.browsers is the deck all browsers sit in
-    let self = this;
-    Elements.browsers.addEventListener("transitionend", function () {
-      Elements.browsers.removeEventListener("transitionend", arguments.callee, true);
-      self._deckTransitioning = false;
-      self._dispatchWindowEvent("MozDeckOffsetChanged", aAmount);
-      self._dispatchWindowEvent("KeyboardChanged", self.isKeyboardOpened);
-    }, true);
-
-    // selectAtPoint bug 858471
-    //Elements.browsers.style.transform = "translateY(" + (-1 * aAmount) + "px)";
-    Elements.browsers.style.marginTop = "" + (-1 * aAmount) + "px";
-  },
-
-  _dispatchWindowEvent: function _dispatchWindowEvent(aEventName, aDetail) {
-    let event = document.createEvent("UIEvents");
-    event.initUIEvent(aEventName, true, false, window, aDetail);
-    window.dispatchEvent(event);
-  },
-
-  _dispatchBrowserEvent: function (aName, aDetail) {
-    setTimeout(function() {
-      let event = document.createEvent("Events");
-      event.initEvent(aName, true, false);
-      Elements.browsers.dispatchEvent(event);
-    }, 0);
-  },
-
-  _initStyles: function _initStyles() {
-    let stylesheet = document.styleSheets[0];
-    for (let style of ["window-width", "window-height",
-                       "content-height", "content-width",
-                       "viewable-height", "viewable-width"]) {
-      let index = stylesheet.insertRule("." + style + " {}", stylesheet.cssRules.length);
-      this.styles[style] = stylesheet.cssRules[index].style;
-    }
-  },
-
-  _getContentHeightForWindow: function (windowHeight) {
-    return windowHeight;
-  },
-
-  _getViewableHeightForContent: function (contentHeight) {
-    let keyboardHeight = Services.metro.keyboardHeight;
-    return contentHeight - keyboardHeight;
-  },
-
-  _debugDumpDims: function _debugDumpDims() {
-    let width = parseInt(this.styles["window-width"].width);
-    let height = parseInt(this.styles["window-height"].height);
-    Util.dumpLn("window:", width, height);
-    width = parseInt(this.styles["content-width"].width);
-    height = parseInt(this.styles["content-height"].height);
-    Util.dumpLn("content:", width, height);
-    width = parseInt(this.styles["viewable-width"].width);
-    height = parseInt(this.styles["viewable-height"].height);
-    Util.dumpLn("viewable:", width, height);
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/ConsoleAPIObserver.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/ConsoleAPIObserver.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/ConsoleAPIObserver.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/ConsoleAPIObserver.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +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/. */
-
-let Ci = Components.interfaces;
-let Cc = Components.classes;
-
-dump("### ConsoleAPIObserver.js loaded\n");
-
-/*
- * ConsoleAPIObserver
- *
- */ 
-
-var ConsoleAPIObserver = {
-  init: function init() {
-    addMessageListener("Browser:TabOpen", this);
-    addMessageListener("Browser:TabClose", this);
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    let json = aMessage.json;
-    switch (aMessage.name) {
-      case "Browser:TabOpen":
-        Services.obs.addObserver(this, "console-api-log-event", false);
-        break;
-      case "Browser:TabClose":
-        Services.obs.removeObserver(this, "console-api-log-event");
-        break;
-    }
-  },
-
-  observe: function observe(aMessage, aTopic, aData) {
-    let contentWindowId = content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).outerWindowID;
-    aMessage = aMessage.wrappedJSObject;
-    if (aMessage.ID != contentWindowId)
-      return;
-
-    let mappedArguments = Array.map(aMessage.arguments, this.formatResult, this);
-    let joinedArguments = Array.join(mappedArguments, " ");
-
-    if (aMessage.level == "error" || aMessage.level == "warn") {
-      let flag = (aMessage.level == "error" ? Ci.nsIScriptError.errorFlag : Ci.nsIScriptError.warningFlag);
-      let consoleMsg = Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError);
-      consoleMsg.init(joinedArguments, null, null, 0, 0, flag, "content javascript");
-      Services.console.logMessage(consoleMsg);
-    } else if (aMessage.level == "trace") {
-      let bundle = Services.strings.createBundle("chrome://global/locale/headsUpDisplay.properties");
-      let args = aMessage.arguments;
-      let filename = this.abbreviateSourceURL(args[0].filename);
-      let functionName = args[0].functionName || bundle.GetStringFromName("stacktrace.anonymousFunction");
-      let lineNumber = args[0].lineNumber;
-
-      let body = bundle.formatStringFromName("stacktrace.outputMessage", [filename, functionName, lineNumber], 3);
-      body += "\n";
-      args.forEach(function(aFrame) {
-        body += aFrame.filename + " :: " + aFrame.functionName + " :: " + aFrame.lineNumber + "\n";
-      });
-
-      Services.console.logStringMessage(body);
-    } else {
-      Services.console.logStringMessage(joinedArguments);
-    }
-  },
-
-  getResultType: function getResultType(aResult) {
-    let type = aResult === null ? "null" : typeof aResult;
-    if (type == "object" && aResult.constructor && aResult.constructor.name)
-      type = aResult.constructor.name;
-    return type.toLowerCase();
-  },
-
-  formatResult: function formatResult(aResult) {
-    let output = "";
-    let type = this.getResultType(aResult);
-    switch (type) {
-      case "string":
-      case "boolean":
-      case "date":
-      case "error":
-      case "number":
-      case "regexp":
-        output = aResult.toString();
-        break;
-      case "null":
-      case "undefined":
-        output = type;
-        break;
-      default:
-        output = aResult.toString();
-        break;
-    }
-
-    return output;
-  },
-
-  abbreviateSourceURL: function abbreviateSourceURL(aSourceURL) {
-    // Remove any query parameters.
-    let hookIndex = aSourceURL.indexOf("?");
-    if (hookIndex > -1)
-      aSourceURL = aSourceURL.substring(0, hookIndex);
-
-    // Remove a trailing "/".
-    if (aSourceURL[aSourceURL.length - 1] == "/")
-      aSourceURL = aSourceURL.substring(0, aSourceURL.length - 1);
-
-    // Remove all but the last path component.
-    let slashIndex = aSourceURL.lastIndexOf("/");
-    if (slashIndex > -1)
-      aSourceURL = aSourceURL.substring(slashIndex + 1);
-
-    return aSourceURL;
-  }
-};
-this.ConsoleAPIObserver = ConsoleAPIObserver;
-
-ConsoleAPIObserver.init();
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/Content.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/Content.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/Content.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/Content.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,590 +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/. */
-
-// This stays here because otherwise it's hard to tell if there's a parsing error
-dump("### Content.js loaded\n");
-
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
-let Cr = Components.results;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyGetter(this, "Services", function() {
-  Cu.import("resource://gre/modules/Services.jsm");
-  return Services;
-});
-
-XPCOMUtils.defineLazyGetter(this, "Rect", function() {
-  Cu.import("resource://gre/modules/Geometry.jsm");
-  return Rect;
-});
-
-XPCOMUtils.defineLazyGetter(this, "Point", function() {
-  Cu.import("resource://gre/modules/Geometry.jsm");
-  return Point;
-});
-
-XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerContent",
-  "resource://gre/modules/LoginManagerContent.jsm");
-
-XPCOMUtils.defineLazyServiceGetter(this, "gFocusManager",
-  "@mozilla.org/focus-manager;1", "nsIFocusManager");
-
-XPCOMUtils.defineLazyServiceGetter(this, "gDOMUtils",
-  "@mozilla.org/inspector/dom-utils;1", "inIDOMUtils");
-
-this.XULDocument = Ci.nsIDOMXULDocument;
-this.HTMLHtmlElement = Ci.nsIDOMHTMLHtmlElement;
-this.HTMLIFrameElement = Ci.nsIDOMHTMLIFrameElement;
-this.HTMLFrameElement = Ci.nsIDOMHTMLFrameElement;
-this.HTMLFrameSetElement = Ci.nsIDOMHTMLFrameSetElement;
-this.HTMLSelectElement = Ci.nsIDOMHTMLSelectElement;
-this.HTMLOptionElement = Ci.nsIDOMHTMLOptionElement;
-
-const kReferenceDpi = 240; // standard "pixel" size used in some preferences
-
-const kStateActive = 0x00000001; // :active pseudoclass for elements
-
-const kZoomToElementMargin = 16; // in px
-
-/*
- * getBoundingContentRect
- *
- * @param aElement
- * @return Bounding content rect adjusted for scroll and frame offsets.
- */
-function getBoundingContentRect(aElement) {
-  if (!aElement)
-    return new Rect(0, 0, 0, 0);
-
-  let document = aElement.ownerDocument;
-  while(document.defaultView.frameElement)
-    document = document.defaultView.frameElement.ownerDocument;
-
-  let offset = ContentScroll.getScrollOffset(content);
-  offset = new Point(offset.x, offset.y);
-
-  let r = aElement.getBoundingClientRect();
-
-  // step out of iframes and frames, offsetting scroll values
-  let view = aElement.ownerDocument.defaultView;
-  for (let frame = view; frame != content; frame = frame.parent) {
-    // adjust client coordinates' origin to be top left of iframe viewport
-    let rect = frame.frameElement.getBoundingClientRect();
-    let left = frame.getComputedStyle(frame.frameElement, "").borderLeftWidth;
-    let top = frame.getComputedStyle(frame.frameElement, "").borderTopWidth;
-    offset.add(rect.left + parseInt(left), rect.top + parseInt(top));
-  }
-
-  return new Rect(r.left + offset.x, r.top + offset.y, r.width, r.height);
-}
-this.getBoundingContentRect = getBoundingContentRect;
-
-/*
- * getOverflowContentBoundingRect
- *
- * @param aElement
- * @return Bounding content rect adjusted for scroll and frame offsets.
- */
-
-function getOverflowContentBoundingRect(aElement) {
-  let r = getBoundingContentRect(aElement);
-
-  // If the overflow is hidden don't bother calculating it
-  let computedStyle = aElement.ownerDocument.defaultView.getComputedStyle(aElement);
-  let blockDisplays = ["block", "inline-block", "list-item"];
-  if ((blockDisplays.indexOf(computedStyle.getPropertyValue("display")) != -1 &&
-       computedStyle.getPropertyValue("overflow") == "hidden") ||
-      aElement instanceof HTMLSelectElement) {
-    return r;
-  }
-
-  for (let i = 0; i < aElement.childElementCount; i++) {
-    r = r.union(getBoundingContentRect(aElement.children[i]));
-  }
-
-  return r;
-}
-this.getOverflowContentBoundingRect = getOverflowContentBoundingRect;
-
-/*
- * Content
- *
- * Browser event receiver for content.
- */
-let Content = {
-  _debugEvents: false,
-
-  get formAssistant() {
-    delete this.formAssistant;
-    return this.formAssistant = new FormAssistant();
-  },
-
-  init: function init() {
-    // Asyncronous messages sent from the browser
-    addMessageListener("Browser:Blur", this);
-    addMessageListener("Browser:SaveAs", this);
-    addMessageListener("Browser:MozApplicationCache:Fetch", this);
-    addMessageListener("Browser:SetCharset", this);
-    addMessageListener("Browser:CanUnload", this);
-    addMessageListener("Browser:PanBegin", this);
-    addMessageListener("Gesture:SingleTap", this);
-    addMessageListener("Gesture:DoubleTap", this);
-
-    addEventListener("touchstart", this, false);
-    addEventListener("click", this, true);
-    addEventListener("keydown", this);
-    addEventListener("keyup", this);
-
-    // Synchronous events caught during the bubbling phase
-    addEventListener("MozApplicationManifest", this, false);
-    addEventListener("DOMContentLoaded", this, false);
-    addEventListener("DOMAutoComplete", this, false);
-    addEventListener("DOMFormHasPassword", this, false);
-    addEventListener("blur", this, false);
-    // Attach a listener to watch for "click" events bubbling up from error
-    // pages and other similar page. This lets us fix bugs like 401575 which
-    // require error page UI to do privileged things, without letting error
-    // pages have any privilege themselves.
-    addEventListener("click", this, false);
-
-    docShell.useGlobalHistory = true;
-  },
-
-  /*******************************************
-   * Events
-   */
-
-  handleEvent: function handleEvent(aEvent) {
-    if (this._debugEvents) Util.dumpLn("Content:", aEvent.type);
-    switch (aEvent.type) {
-      case "MozApplicationManifest": {
-        let doc = aEvent.originalTarget;
-        sendAsyncMessage("Browser:MozApplicationManifest", {
-          location: doc.documentURIObject.spec,
-          manifest: doc.documentElement.getAttribute("manifest"),
-          charset: doc.characterSet
-        });
-        break;
-      }
-
-      case "keyup":
-        // If after a key is pressed we still have no input, then close
-        // the autocomplete. Perhaps the user used backspace or delete.
-        // Allow down arrow to trigger autofill popup on empty input.
-        if ((!aEvent.target.value && aEvent.keyCode != aEvent.DOM_VK_DOWN)
-          || aEvent.keyCode == aEvent.DOM_VK_ESCAPE)
-          this.formAssistant.close();
-        else
-          this.formAssistant.open(aEvent.target, aEvent);
-        break;
-
-      case "click":
-        // Workaround for bug 925457: we sometimes don't recognize the
-        // correct tap target or are unable to identify if it's editable.
-        // Instead always save tap co-ordinates for the keyboard to look for
-        // when it is up.
-        SelectionHandler.onClickCoords(aEvent.clientX, aEvent.clientY);
-
-        if (aEvent.eventPhase == aEvent.BUBBLING_PHASE)
-          this._onClickBubble(aEvent);
-        else
-          this._onClickCapture(aEvent);
-        break;
-
-      case "DOMFormHasPassword":
-        LoginManagerContent.onFormPassword(aEvent);
-        break;
-
-      case "DOMContentLoaded":
-        this._maybeNotifyErrorPage();
-        break;
-
-      case "DOMAutoComplete":
-      case "blur":
-        LoginManagerContent.onUsernameInput(aEvent);
-        break;
-
-      case "touchstart":
-        this._onTouchStart(aEvent);
-        break;
-    }
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    if (this._debugEvents) Util.dumpLn("Content:", aMessage.name);
-    let json = aMessage.json;
-    let x = json.x;
-    let y = json.y;
-
-    switch (aMessage.name) {
-      case "Browser:Blur":
-        gFocusManager.clearFocus(content);
-        break;
-
-      case "Browser:CanUnload":
-        let canUnload = docShell.contentViewer.permitUnload();
-        sendSyncMessage("Browser:CanUnload:Return", { permit: canUnload });
-        break;
-
-      case "Browser:SaveAs":
-        break;
-
-      case "Browser:MozApplicationCache:Fetch": {
-        let currentURI = Services.io.newURI(json.location, json.charset, null);
-        let manifestURI = Services.io.newURI(json.manifest, json.charset, currentURI);
-        let updateService = Cc["@mozilla.org/offlinecacheupdate-service;1"]
-                            .getService(Ci.nsIOfflineCacheUpdateService);
-        updateService.scheduleUpdate(manifestURI, currentURI, content);
-        break;
-      }
-
-      case "Browser:SetCharset": {
-        docShell.gatherCharsetMenuTelemetry();
-        docShell.charset = json.charset;
-
-        let webNav = docShell.QueryInterface(Ci.nsIWebNavigation);
-        webNav.reload(Ci.nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
-        break;
-      }
-
-      case "Browser:PanBegin":
-        this._cancelTapHighlight();
-        break;
-
-      case "Gesture:SingleTap":
-        this._onSingleTap(json.x, json.y, json.modifiers);
-        break;
-
-      case "Gesture:DoubleTap":
-        this._onDoubleTap(json.x, json.y);
-        break;
-    }
-  },
-
-  /******************************************************
-   * Event handlers
-   */
-
-  _onTouchStart: function _onTouchStart(aEvent) {
-    let element = aEvent.target;
-
-    // There is no need to have a feedback for disabled element
-    let isDisabled = element instanceof HTMLOptionElement ?
-      (element.disabled || element.parentNode.disabled) : element.disabled;
-    if (isDisabled)
-      return;
-
-    // Set the target element to active
-    this._doTapHighlight(element);
-  },
-
-  _onClickCapture: function _onClickCapture(aEvent) {
-    let element = aEvent.target;
-
-    ContextMenuHandler.reset();
-
-    // Only show autocomplete after the item is clicked
-    if (!this.lastClickElement || this.lastClickElement != element) {
-      this.lastClickElement = element;
-      if (aEvent.mozInputSource == Ci.nsIDOMMouseEvent.MOZ_SOURCE_MOUSE &&
-          !(element instanceof HTMLSelectElement)) {
-        return;
-      }
-    }
-
-    this.formAssistant.focusSync = true;
-    this.formAssistant.open(element, aEvent);
-    this._cancelTapHighlight();
-    this.formAssistant.focusSync = false;
-
-    // A tap on a form input triggers touch input caret selection
-    if (Util.isEditable(element) &&
-        aEvent.mozInputSource == Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH) {
-      let { offsetX, offsetY } = Util.translateToTopLevelWindow(element);
-      sendAsyncMessage("Content:SelectionCaret", {
-        xPos: aEvent.clientX + offsetX,
-        yPos: aEvent.clientY + offsetY
-      });
-    } else {
-      SelectionHandler.closeSelection();
-    }
-  },
-
-  // Checks clicks we care about - events bubbling up from about pages.
-  _onClickBubble: function _onClickBubble(aEvent) {
-    // Don't trust synthetic events
-    if (!aEvent.isTrusted)
-      return;
-
-    let ot = aEvent.originalTarget;
-    let errorDoc = ot.ownerDocument;
-    if (!errorDoc)
-      return;
-
-    // If the event came from an ssl error page, it is probably either 
-    // "Add Exception…" or "Get me out of here!" button.
-    if (/^about:certerror\?e=nssBadCert/.test(errorDoc.documentURI)) {
-      let perm = errorDoc.getElementById("permanentExceptionButton");
-      let temp = errorDoc.getElementById("temporaryExceptionButton");
-      if (ot == temp || ot == perm) {
-        let action = (ot == perm ? "permanent" : "temporary");
-        sendAsyncMessage("Browser:CertException",
-                         { url: errorDoc.location.href, action: action });
-      } else if (ot == errorDoc.getElementById("getMeOutOfHereButton")) {
-        sendAsyncMessage("Browser:CertException",
-                         { url: errorDoc.location.href, action: "leave" });
-      }
-    } else if (/^about:blocked/.test(errorDoc.documentURI)) {
-      // The event came from a button on a malware/phishing block page
-      // First check whether it's malware or phishing, so that we can
-      // use the right strings/links.
-      let isMalware = /e=malwareBlocked/.test(errorDoc.documentURI);
-    
-      if (ot == errorDoc.getElementById("getMeOutButton")) {
-        sendAsyncMessage("Browser:BlockedSite",
-                         { url: errorDoc.location.href, action: "leave" });
-      } else if (ot == errorDoc.getElementById("reportButton")) {
-        // This is the "Why is this site blocked" button.  For malware,
-        // we can fetch a site-specific report, for phishing, we redirect
-        // to the generic page describing phishing protection.
-        let action = isMalware ? "report-malware" : "report-phishing";
-        sendAsyncMessage("Browser:BlockedSite",
-                         { url: errorDoc.location.href, action: action });
-      } else if (ot == errorDoc.getElementById("ignoreWarningButton")) {
-        // Allow users to override and continue through to the site,
-        // but add a notify bar as a reminder, so that they don't lose
-        // track after, e.g., tab switching.
-        let webNav = docShell.QueryInterface(Ci.nsIWebNavigation);
-        webNav.loadURI(content.location,
-                       Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CLASSIFIER,
-                       null, null, null);
-      }
-    }
-  },
-
-  _onSingleTap: function (aX, aY, aModifiers) {
-    let utils = Util.getWindowUtils(content);
-    for (let type of ["mousemove", "mousedown", "mouseup"]) {
-      utils.sendMouseEventToWindow(type, aX, aY, 0, 1, aModifiers, true, 1.0,
-          Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH);
-    }
-  },
-
-  _onDoubleTap: function (aX, aY) {
-    let { element } = Content.getCurrentWindowAndOffset(aX, aY);
-    while (element && !this._shouldZoomToElement(element)) {
-      element = element.parentNode;
-    }
-
-    if (!element) {
-      this._zoomOut();
-    } else {
-      this._zoomToElement(element);
-    }
-  },
-
-  /******************************************************
-   * Zoom utilities
-   */
-  _zoomOut: function() {
-    let rect = new Rect(0,0,0,0);
-    this._zoomToRect(rect);
-  },
-
-  _zoomToElement: function(aElement) {
-    let rect = getBoundingContentRect(aElement);
-    this._inflateRect(rect, kZoomToElementMargin);
-    this._zoomToRect(rect);
-  },
-
-  _inflateRect: function(aRect, aMargin) {
-    aRect.left -= aMargin;
-    aRect.top -= aMargin;
-    aRect.bottom += aMargin;
-    aRect.right += aMargin;
-  },
-
-  _zoomToRect: function (aRect) {
-    let utils = Util.getWindowUtils(content);
-    let viewId = utils.getViewId(content.document.documentElement);
-    let presShellId = {};
-    utils.getPresShellId(presShellId);
-    sendAsyncMessage("Content:ZoomToRect", {
-      rect: aRect,
-      presShellId: presShellId.value,
-      viewId: viewId,
-    });
-  },
-
-  _shouldZoomToElement: function(aElement) {
-    let win = aElement.ownerDocument.defaultView;
-    if (win.getComputedStyle(aElement, null).display == "inline") {
-      return false;
-    }
-    else if (aElement instanceof Ci.nsIDOMHTMLLIElement) {
-      return false;
-    }
-    else if (aElement instanceof Ci.nsIDOMHTMLQuoteElement) {
-      return false;
-    }
-    else {
-      return true;
-    }
-  },
-
-
-  /******************************************************
-   * General utilities
-   */
-
-  /*
-   * Retrieve the total offset from the window's origin to the sub frame
-   * element including frame and scroll offsets. The resulting offset is
-   * such that:
-   * sub frame coords + offset = root frame position
-   */
-  getCurrentWindowAndOffset: function(x, y) {
-    // If the element at the given point belongs to another document (such
-    // as an iframe's subdocument), the element in the calling document's
-    // DOM (e.g. the iframe) is returned.
-    let utils = Util.getWindowUtils(content);
-    let element = utils.elementFromPoint(x, y, true, false);
-    let offset = { x:0, y:0 };
-
-    while (element && (element instanceof HTMLIFrameElement ||
-                       element instanceof HTMLFrameElement)) {
-      // get the child frame position in client coordinates
-      let rect = element.getBoundingClientRect();
-
-      // calculate offsets for digging down into sub frames
-      // using elementFromPoint:
-
-      // Get the content scroll offset in the child frame
-      scrollOffset = ContentScroll.getScrollOffset(element.contentDocument.defaultView);
-      // subtract frame and scroll offset from our elementFromPoint coordinates
-      x -= rect.left + scrollOffset.x;
-      y -= rect.top + scrollOffset.y;
-
-      // calculate offsets we'll use to translate to client coords:
-
-      // add frame client offset to our total offset result
-      offset.x += rect.left;
-      offset.y += rect.top;
-
-      // get the frame's nsIDOMWindowUtils
-      utils = element.contentDocument
-                     .defaultView
-                     .QueryInterface(Ci.nsIInterfaceRequestor)
-                     .getInterface(Ci.nsIDOMWindowUtils);
-
-      // retrieve the target element in the sub frame at x, y
-      element = utils.elementFromPoint(x, y, true, false);
-    }
-
-    if (!element)
-      return {};
-
-    return {
-      element: element,
-      contentWindow: element.ownerDocument.defaultView,
-      offset: offset,
-      utils: utils
-    };
-  },
-
-
-  _maybeNotifyErrorPage: function _maybeNotifyErrorPage() {
-    // Notify browser that an error page is being shown instead
-    // of the target location. Necessary to get proper thumbnail
-    // updates on chrome for error pages.
-    if (content.location.href !== content.document.documentURI)
-      sendAsyncMessage("Browser:ErrorPage", null);
-  },
-
-  _highlightElement: null,
-
-  _doTapHighlight: function _doTapHighlight(aElement) {
-    gDOMUtils.setContentState(aElement, kStateActive);
-    this._highlightElement = aElement;
-  },
-
-  _cancelTapHighlight: function _cancelTapHighlight(aElement) {
-    gDOMUtils.setContentState(content.document.documentElement, kStateActive);
-    this._highlightElement = null;
-  },
-};
-
-Content.init();
-
-var FormSubmitObserver = {
-  init: function init(){
-    addMessageListener("Browser:TabOpen", this);
-    addMessageListener("Browser:TabClose", this);
-
-    addEventListener("pageshow", this, false);
-
-    Services.obs.addObserver(this, "invalidformsubmit", false);
-  },
-
-  handleEvent: function handleEvent(aEvent) {
-    let target = aEvent.originalTarget;
-    let isRootDocument = (target == content.document || target.ownerDocument == content.document);
-    if (!isRootDocument)
-      return;
-
-    // Reset invalid submit state on each pageshow
-    if (aEvent.type == "pageshow")
-      Content.formAssistant.invalidSubmit = false;
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    let json = aMessage.json;
-    switch (aMessage.name) {
-      case "Browser:TabOpen":
-        Services.obs.addObserver(this, "formsubmit", false);
-        break;
-      case "Browser:TabClose":
-        Services.obs.removeObserver(this, "formsubmit");
-        break;
-    }
-  },
-
-  notify: function notify(aFormElement, aWindow, aActionURI, aCancelSubmit) {
-    // Do not notify unless this is the window where the submit occurred
-    if (aWindow == content)
-      // We don't need to send any data along
-      sendAsyncMessage("Browser:FormSubmit", {});
-  },
-
-  notifyInvalidSubmit: function notifyInvalidSubmit(aFormElement, aInvalidElements) {
-    if (!aInvalidElements.length)
-      return;
-
-    let element = aInvalidElements.queryElementAt(0, Ci.nsISupports);
-    if (!(element instanceof HTMLInputElement ||
-          element instanceof HTMLTextAreaElement ||
-          element instanceof HTMLSelectElement ||
-          element instanceof HTMLButtonElement)) {
-      return;
-    }
-
-    Content.formAssistant.invalidSubmit = true;
-    Content.formAssistant.open(element);
-  },
-
-  QueryInterface : function(aIID) {
-    if (!aIID.equals(Ci.nsIFormSubmitObserver) &&
-        !aIID.equals(Ci.nsISupportsWeakReference) &&
-        !aIID.equals(Ci.nsISupports))
-      throw Cr.NS_ERROR_NO_INTERFACE;
-    return this;
-  }
-};
-this.Content = Content;
-
-FormSubmitObserver.init();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/ContextMenuHandler.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/ContextMenuHandler.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/ContextMenuHandler.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/ContextMenuHandler.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,448 +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/. */
-
-let Ci = Components.interfaces;
-let Cc = Components.classes;
-
-this.kXLinkNamespace = "http://www.w3.org/1999/xlink";
-
-dump("### ContextMenuHandler.js loaded\n");
-
-var ContextMenuHandler = {
-  _types: [],
-  _previousState: null,
-
-  init: function ch_init() {
-    // Events we catch from content during the bubbling phase
-    addEventListener("contextmenu", this, false);
-    addEventListener("pagehide", this, false);
-
-    // Messages we receive from browser
-    // Command sent over from browser that only we can handle.
-    addMessageListener("Browser:ContextCommand", this, false);
-
-    this.popupNode = null;
-  },
-
-  handleEvent: function ch_handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "contextmenu":
-        this._onContentContextMenu(aEvent);
-        break;
-      case "pagehide":
-        this.reset();
-        break;
-    }
-  },
-
-  receiveMessage: function ch_receiveMessage(aMessage) {
-    switch (aMessage.name) {
-      case "Browser:ContextCommand":
-        this._onContextCommand(aMessage);
-      break;
-    }
-  },
-
-  /*
-   * Handler for commands send over from browser's ContextCommands.js
-   * in response to certain context menu actions only we can handle.
-   */
-  _onContextCommand: function _onContextCommand(aMessage) {
-    let node = this.popupNode;
-    let command = aMessage.json.command;
-
-    switch (command) {
-      case "cut":
-        this._onCut();
-        break;
-
-      case "copy":
-        this._onCopy();
-        break;
-
-      case "paste":
-        this._onPaste();
-        break;
-
-      case "select-all":
-        this._onSelectAll();
-        break;
-
-      case "copy-image-contents":
-        this._onCopyImage();
-        break;
-    }
-  },
-
-  /******************************************************
-   * Event handlers
-   */
-
-  reset: function ch_reset() {
-    this.popupNode = null;
-    this._target = null;
-  },
-
-  // content contextmenu handler
-  _onContentContextMenu: function _onContentContextMenu(aEvent) {
-    if (aEvent.defaultPrevented)
-      return;
-
-    // Don't let these bubble up to input.js
-    aEvent.stopPropagation();
-    aEvent.preventDefault();
-
-    this._processPopupNode(aEvent.originalTarget, aEvent.clientX,
-                           aEvent.clientY, aEvent.mozInputSource);
-  },
-
-  /******************************************************
-   * ContextCommand handlers
-   */
-
-  _onSelectAll: function _onSelectAll() {
-    if (Util.isTextInput(this._target)) {
-      // select all text in the input control
-      this._target.select();
-    } else if (Util.isEditableContent(this._target)) {
-      this._target.ownerDocument.execCommand("selectAll", false);
-    } else {
-      // select the entire document
-      content.getSelection().selectAllChildren(content.document);
-    }
-    this.reset();
-  },
-
-  _onPaste: function _onPaste() {
-    // paste text if this is an input control
-    if (Util.isTextInput(this._target)) {
-      let edit = this._target.QueryInterface(Ci.nsIDOMNSEditableElement);
-      if (edit) {
-        edit.editor.paste(Ci.nsIClipboard.kGlobalClipboard);
-      } else {
-        Util.dumpLn("error: target element does not support nsIDOMNSEditableElement");
-      }
-    } else if (Util.isEditableContent(this._target)) {
-      try {
-        this._target.ownerDocument.execCommand("paste",
-                                               false,
-                                               Ci.nsIClipboard.kGlobalClipboard);
-      } catch (ex) {
-        dump("ContextMenuHandler: exception pasting into contentEditable: " + ex.message + "\n");
-      }
-    }
-    this.reset();
-  },
-
-  _onCopyImage: function _onCopyImage() {
-    Util.copyImageToClipboard(this._target);
-  },
-
-  _onCut: function _onCut() {
-    if (Util.isTextInput(this._target)) {
-      let edit = this._target.QueryInterface(Ci.nsIDOMNSEditableElement);
-      if (edit) {
-        edit.editor.cut();
-      } else {
-        Util.dumpLn("error: target element does not support nsIDOMNSEditableElement");
-      }
-    } else if (Util.isEditableContent(this._target)) {
-      try {
-        this._target.ownerDocument.execCommand("cut", false);
-      } catch (ex) {
-        dump("ContextMenuHandler: exception cutting from contentEditable: " + ex.message + "\n");
-      }
-    }
-    this.reset();
-  },
-
-  _onCopy: function _onCopy() {
-    if (Util.isTextInput(this._target)) {
-      let edit = this._target.QueryInterface(Ci.nsIDOMNSEditableElement);
-      if (edit) {
-        edit.editor.copy();
-      } else {
-        Util.dumpLn("error: target element does not support nsIDOMNSEditableElement");
-      }
-    } else if (Util.isEditableContent(this._target)) {
-      try {
-        this._target.ownerDocument.execCommand("copy", false);
-      } catch (ex) {
-        dump("ContextMenuHandler: exception copying from contentEditable: " +
-          ex.message + "\n");
-      }
-    } else {
-      let selectionText = this._previousState.string;
-
-      Cc["@mozilla.org/widget/clipboardhelper;1"]
-        .getService(Ci.nsIClipboardHelper).copyString(selectionText);
-    }
-    this.reset();
-  },
-
-  /******************************************************
-   * Utility routines
-   */
-
-  /*
-   * _processPopupNode - Generate and send a Content:ContextMenu message
-   * to browser detailing the underlying content types at this.popupNode.
-   * Note the event we receive targets the sub frame (if there is one) of
-   * the page.
-   */
-  _processPopupNode: function _processPopupNode(aPopupNode, aX, aY, aInputSrc) {
-    if (!aPopupNode)
-      return;
-
-    let { targetWindow: targetWindow,
-          offsetX: offsetX,
-          offsetY: offsetY } =
-      Util.translateToTopLevelWindow(aPopupNode);
-
-    let popupNode = this.popupNode = aPopupNode;
-    let imageUrl = "";
-
-    let state = {
-      types: [],
-      label: "",
-      linkURL: "",
-      linkTitle: "",
-      linkProtocol: null,
-      mediaURL: "",
-      contentType: "",
-      contentDisposition: "",
-      string: "",
-    };
-    let uniqueStateTypes = new Set();
-
-    // Do checks for nodes that never have children.
-    if (popupNode.nodeType == Ci.nsIDOMNode.ELEMENT_NODE) {
-      // See if the user clicked on an image.
-      if (popupNode instanceof Ci.nsIImageLoadingContent && popupNode.currentURI) {
-        uniqueStateTypes.add("image");
-        state.label = state.mediaURL = popupNode.currentURI.spec;
-        imageUrl = state.mediaURL;
-        this._target = popupNode;
-
-        // Retrieve the type of image from the cache since the url can fail to
-        // provide valuable informations
-        try {
-          let imageCache = Cc["@mozilla.org/image/cache;1"].getService(Ci.imgICache);
-          let props = imageCache.findEntryProperties(popupNode.currentURI,
-                                                     content.document.characterSet);
-          if (props) {
-            state.contentType = String(props.get("type", Ci.nsISupportsCString));
-            state.contentDisposition = String(props.get("content-disposition",
-                                                        Ci.nsISupportsCString));
-          }
-        } catch (ex) {
-          Util.dumpLn(ex.message);
-          // Failure to get type and content-disposition off the image is non-fatal
-        }
-      }
-    }
-
-    let elem = popupNode;
-    let isText = false;
-    let isEditableText = false;
-
-    while (elem) {
-      if (elem.nodeType == Ci.nsIDOMNode.ELEMENT_NODE) {
-        // is the target a link or a descendant of a link?
-        if (Util.isLink(elem)) {
-          // If this is an image that links to itself, don't include both link and
-          // image otpions.
-          if (imageUrl == this._getLinkURL(elem)) {
-            elem = elem.parentNode;
-            continue;
-          }
-
-          uniqueStateTypes.add("link");
-          state.label = state.linkURL = this._getLinkURL(elem);
-          linkUrl = state.linkURL;
-          state.linkTitle = popupNode.textContent || popupNode.title;
-          state.linkProtocol = this._getProtocol(this._getURI(state.linkURL));
-          // mark as text so we can pickup on selection below
-          isText = true;
-          break;
-        }
-        // is the target contentEditable (not just inheriting contentEditable)
-        // or the entire document in designer mode.
-        else if (elem.contentEditable == "true" ||
-                 Util.isOwnerDocumentInDesignMode(elem)) {
-          this._target = elem;
-          isEditableText = true;
-          isText = true;
-          uniqueStateTypes.add("input-text");
-
-          if (elem.textContent.length) {
-            uniqueStateTypes.add("selectable");
-          } else {
-            uniqueStateTypes.add("input-empty");
-          }
-          break;
-        }
-        // is the target a text input
-        else if (Util.isTextInput(elem)) {
-          this._target = elem;
-          isEditableText = true;
-          uniqueStateTypes.add("input-text");
-
-          let selectionStart = elem.selectionStart;
-          let selectionEnd = elem.selectionEnd;
-
-          // Don't include "copy" for password fields.
-          if (!(elem instanceof Ci.nsIDOMHTMLInputElement) || elem.mozIsTextField(true)) {
-            // If there is a selection add cut and copy
-            if (selectionStart != selectionEnd) {
-              uniqueStateTypes.add("cut");
-              uniqueStateTypes.add("copy");
-              state.string = elem.value.slice(selectionStart, selectionEnd);
-            } else if (elem.value && elem.textLength) {
-              // There is text and it is not selected so add selectable items
-              uniqueStateTypes.add("selectable");
-              state.string = elem.value;
-            }
-          }
-
-          if (!elem.textLength) {
-            uniqueStateTypes.add("input-empty");
-          }
-          break;
-        }
-        // is the target an element containing text content
-        else if (Util.isText(elem)) {
-          isText = true;
-        }
-        // is the target a media element
-        else if (elem instanceof Ci.nsIDOMHTMLMediaElement ||
-                   elem instanceof Ci.nsIDOMHTMLVideoElement) {
-          state.label = state.mediaURL = (elem.currentSrc || elem.src);
-          uniqueStateTypes.add((elem.paused || elem.ended) ?
-            "media-paused" : "media-playing");
-          if (elem instanceof Ci.nsIDOMHTMLVideoElement) {
-            uniqueStateTypes.add("video");
-          }
-        }
-      }
-
-      elem = elem.parentNode;
-    }
-
-    // Over arching text tests
-    if (isText) {
-      // If this is text and has a selection, we want to bring
-      // up the copy option on the context menu.
-      let selection = targetWindow.getSelection();
-      if (selection && this._tapInSelection(selection, aX, aY)) {
-        state.string = targetWindow.getSelection().toString();
-        uniqueStateTypes.add("copy");
-        uniqueStateTypes.add("selected-text");
-        if (isEditableText) {
-          uniqueStateTypes.add("cut");
-        }
-      } else {
-        // Add general content text if this isn't anything specific
-        if (!(
-            uniqueStateTypes.has("image") ||
-            uniqueStateTypes.has("media") ||
-            uniqueStateTypes.has("video") ||
-            uniqueStateTypes.has("link") ||
-            uniqueStateTypes.has("input-text")
-        )) {
-          uniqueStateTypes.add("content-text");
-        }
-      }
-    }
-
-    // Is paste applicable here?
-    if (isEditableText) {
-      let flavors = ["text/unicode"];
-      let cb = Cc["@mozilla.org/widget/clipboard;1"].getService(Ci.nsIClipboard);
-      let hasData = cb.hasDataMatchingFlavors(flavors,
-                                              flavors.length,
-                                              Ci.nsIClipboard.kGlobalClipboard);
-      // add paste if there's data
-      if (hasData && !elem.readOnly) {
-        uniqueStateTypes.add("paste");
-      }
-    }
-    // populate position and event source
-    state.xPos = offsetX + aX;
-    state.yPos = offsetY + aY;
-    state.source = aInputSrc;
-
-    for (let i = 0; i < this._types.length; i++)
-      if (this._types[i].handler(state, popupNode))
-        uniqueStateTypes.add(this._types[i].name);
-
-    state.types = [type for (type of uniqueStateTypes)];
-    this._previousState = state;
-
-    sendAsyncMessage("Content:ContextMenu", state);
-  },
-
-  _tapInSelection: function (aSelection, aX, aY) {
-    if (!aSelection || !aSelection.rangeCount) {
-      return false;
-    }
-    for (let idx = 0; idx < aSelection.rangeCount; idx++) {
-      let range = aSelection.getRangeAt(idx);
-      let rect = range.getBoundingClientRect();
-      if (Util.pointWithinDOMRect(aX, aY, rect)) {
-        return true;
-      }
-    }
-    return false;
-  },
-
-  _getLinkURL: function ch_getLinkURL(aLink) {
-    let href = aLink.href;
-    if (href)
-      return href;
-
-    href = aLink.getAttributeNS(kXLinkNamespace, "href");
-    if (!href || !href.match(/\S/)) {
-      // Without this we try to save as the current doc,
-      // for example, HTML case also throws if empty
-      throw "Empty href";
-    }
-
-    return Util.makeURLAbsolute(aLink.baseURI, href);
-  },
-
-  _getURI: function ch_getURI(aURL) {
-    try {
-      return Util.makeURI(aURL);
-    } catch (ex) { }
-
-    return null;
-  },
-
-  _getProtocol: function ch_getProtocol(aURI) {
-    if (aURI)
-      return aURI.scheme;
-    return null;
-  },
-
-  /**
-   * For add-ons to add new types and data to the ContextMenu message.
-   *
-   * @param aName A string to identify the new type.
-   * @param aHandler A function that takes a state object and a target element.
-   *    If aHandler returns true, then aName will be added to the list of types.
-   *    The function may also modify the state object.
-   */
-  registerType: function registerType(aName, aHandler) {
-    this._types.push({name: aName, handler: aHandler});
-  },
-
-  /** Remove all handlers registered for a given type. */
-  unregisterType: function unregisterType(aName) {
-    this._types = this._types.filter(function(type) type.name != aName);
-  }
-};
-this.ContextMenuHandler = ContextMenuHandler;
-
-ContextMenuHandler.init();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/FormHelper.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/FormHelper.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/FormHelper.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/FormHelper.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,751 +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/. */
-
-let Ci = Components.interfaces;
-let Cc = Components.classes;
-
-dump("### FormHelper.js loaded\n");
-
-let HTMLTextAreaElement = Ci.nsIDOMHTMLTextAreaElement;
-let HTMLInputElement = Ci.nsIDOMHTMLInputElement;
-let HTMLSelectElement = Ci.nsIDOMHTMLSelectElement;
-let HTMLIFrameElement = Ci.nsIDOMHTMLIFrameElement;
-let HTMLDocument = Ci.nsIDOMHTMLDocument;
-let HTMLHtmlElement = Ci.nsIDOMHTMLHtmlElement;
-let HTMLBodyElement = Ci.nsIDOMHTMLBodyElement;
-let HTMLLabelElement = Ci.nsIDOMHTMLLabelElement;
-let HTMLButtonElement = Ci.nsIDOMHTMLButtonElement;
-let HTMLOptGroupElement = Ci.nsIDOMHTMLOptGroupElement;
-let HTMLOptionElement = Ci.nsIDOMHTMLOptionElement;
-let XULMenuListElement = Ci.nsIDOMXULMenuListElement;
-
-/**
- * Responsible of navigation between forms fields and of the opening of the assistant
- */
-function FormAssistant() {
-  addMessageListener("FormAssist:Closed", this);
-  addMessageListener("FormAssist:ChoiceSelect", this);
-  addMessageListener("FormAssist:ChoiceChange", this);
-  addMessageListener("FormAssist:AutoComplete", this);
-  addMessageListener("FormAssist:Update", this);
-
-  /* Listen text events in order to update the autocomplete suggestions as soon
-   * a key is entered on device
-   */
-  addEventListener("text", this, false);
-  addEventListener("focus", this, true);
-  addEventListener("blur", this, true);
-  addEventListener("pageshow", this, false);
-  addEventListener("pagehide", this, false);
-  addEventListener("submit", this, false);
-}
-
-FormAssistant.prototype = {
-  _els: Cc["@mozilla.org/eventlistenerservice;1"].getService(Ci.nsIEventListenerService),
-  _open: false,
-  _focusSync: false,
-  _debugEvents: false,
-  _selectWrapper: null,
-  _currentElement: null,
-  invalidSubmit: false,
-
-  get focusSync() {
-    return this._focusSync;
-  },
-
-  set focusSync(aVal) {
-    this._focusSync = aVal;
-  },
-
-  get currentElement() {
-    return this._currentElement;
-  },
-
-  set currentElement(aElement) {
-    if (!aElement || !this._isVisibleElement(aElement)) {
-      return null;
-    }
-
-    this._currentElement = aElement;
-    gFocusManager.setFocus(this._currentElement, Ci.nsIFocusManager.FLAG_NOSCROLL);
-
-    // To ensure we get the current caret positionning of the focused
-    // element we need to delayed a bit the event
-    this._executeDelayed(function(self) {
-      // Bug 640870
-      // Sometimes the element inner frame get destroyed while the element
-      // receive the focus because the display is turned to 'none' for
-      // example, in this "fun" case just do nothing if the element is hidden
-      if (self._isVisibleElement(gFocusManager.focusedElement)) {
-        self._sendJsonMsgWrapper("FormAssist:Show");
-      }
-    });
-    return this._currentElement;
-  },
-
-  open: function formHelperOpen(aElement, aEvent) {
-    // If the click is on an option element we want to check if the parent
-    // is a valid target.
-    if (aElement instanceof HTMLOptionElement &&
-        aElement.parentNode instanceof HTMLSelectElement &&
-        !aElement.disabled) {
-      aElement = aElement.parentNode;
-    }
-
-    // Don't show the formhelper popup for multi-select boxes, except for touch.
-    if (aElement instanceof HTMLSelectElement && aEvent) {
-      if ((aElement.multiple || aElement.size > 1) &&
-          aEvent.mozInputSource != Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH) {
-        return false;
-      }
-      // Don't fire mouse events on selects; see bug 685197.
-      aEvent.preventDefault();
-      aEvent.stopPropagation();
-    }
-
-    // The form assistant will close if a click happen:
-    // * outside of the scope of the form helper
-    // * hover a button of type=[image|submit]
-    // * hover a disabled element
-    if (!this._isValidElement(aElement)) {
-      let passiveButtons = { button: true, checkbox: true, file: true, radio: true, reset: true };
-      if ((aElement instanceof HTMLInputElement || aElement instanceof HTMLButtonElement) &&
-          passiveButtons[aElement.type] && !aElement.disabled)
-        return false;
-      return this.close();
-    }
-
-    // Look for a top editable element
-    if (this._isEditable(aElement)) {
-      aElement = this._getTopLevelEditable(aElement);
-    }
-
-    // We only work with choice lists or elements with autocomplete suggestions
-    if (!this._isSelectElement(aElement) &&
-        !this._isAutocomplete(aElement)) {
-      return this.close();
-    }
-
-    // Don't re-open when navigating to avoid repopulating list when changing selection.
-    if (this._isAutocomplete(aElement) && this._open && Util.isNavigationKey(aEvent.keyCode)) {
-      return false;
-    }
-
-    // Enable the assistant
-    this.currentElement = aElement;
-    return this._open = true;
-  },
-
-  close: function close() {
-    if (this._open) {
-      this._currentElement = null;
-      sendAsyncMessage("FormAssist:Hide", { });
-      this._open = false;
-    }
-
-    return this._open;
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    if (this._debugEvents) Util.dumpLn(aMessage.name);
-
-    let currentElement = this.currentElement;
-    if ((!this._isAutocomplete(currentElement) &&
-         !getWrapperForElement(currentElement)) ||
-        !currentElement) {
-      return;
-    }
-
-    let json = aMessage.json;
-
-    switch (aMessage.name) {
-      case "FormAssist:ChoiceSelect": {
-        this._selectWrapper = getWrapperForElement(currentElement);
-        this._selectWrapper.select(json.index, json.selected);
-        break;
-      }
-
-      case "FormAssist:ChoiceChange": {
-        // ChoiceChange could happened once we have move to another element or
-        // to nothing, so we should keep the used wrapper in mind.
-        this._selectWrapper = getWrapperForElement(currentElement);
-        this._selectWrapper.fireOnChange();
-
-        // New elements can be shown when a select is updated so we need to
-        // reconstruct the inner elements array and to take care of possible
-        // focus change, this is why we use "self.currentElement" instead of
-        // using directly "currentElement".
-        this._executeDelayed(function(self) {
-          let currentElement = self.currentElement;
-          if (!currentElement)
-            return;
-          self._currentElement = currentElement;
-        });
-        break;
-      }
-
-      case "FormAssist:AutoComplete": {
-        try {
-          currentElement = currentElement.QueryInterface(Ci.nsIDOMNSEditableElement);
-          let imeEditor = currentElement.editor.QueryInterface(Ci.nsIEditorIMESupport);
-          if (imeEditor.composing)
-            imeEditor.forceCompositionEnd();
-        }
-        catch(e) {}
-
-        currentElement.value = json.value;
-
-        let event = currentElement.ownerDocument.createEvent("Events");
-        event.initEvent("DOMAutoComplete", true, true);
-        currentElement.dispatchEvent(event);
-        break;
-      }
-
-      case "FormAssist:Closed":
-        currentElement.blur();
-        this._open = false;
-        break;
-
-      case "FormAssist:Update":
-        this._sendJsonMsgWrapper("FormAssist:Show");
-        break;
-    }
-  },
-
-  handleEvent: function formHelperHandleEvent(aEvent) {
-    if (this._debugEvents) Util.dumpLn(aEvent.type, this.currentElement);
-    // focus changes should be taken into account only if the user has done a
-    // manual operation like manually clicking
-    let shouldIgnoreFocus = (aEvent.type == "focus" && !this._open && !this.focusSync);
-    if ((!this._open && aEvent.type != "focus") || shouldIgnoreFocus) {
-      return;
-    }
-
-    let currentElement = this.currentElement;
-    switch (aEvent.type) {
-      case "submit":
-        // submit is a final action and the form assistant should be closed
-        this.close();
-        break;
-
-      case "pagehide":
-      case "pageshow":
-        // When reacting to a page show/hide, if the focus is different this
-        // could mean the web page has dramatically changed because of
-        // an Ajax change based on fragment identifier
-        if (gFocusManager.focusedElement != currentElement)
-          this.close();
-        break;
-
-      case "focus":
-        let focusedElement =
-          gFocusManager.getFocusedElementForWindow(content, true, {}) ||
-          aEvent.target;
-
-        // If a body element is editable and the body is the child of an
-        // iframe we can assume this is an advanced HTML editor, so let's
-        // redirect the form helper selection to the iframe element
-        if (focusedElement && this._isEditable(focusedElement)) {
-          let editableElement = this._getTopLevelEditable(focusedElement);
-          if (this._isValidElement(editableElement)) {
-            this._executeDelayed(function(self) {
-              self.open(editableElement);
-            });
-          }
-          return;
-        }
-
-        // if an element is focused while we're closed but the element can be handle
-        // by the assistant, try to activate it (only during mouseup)
-        if (!currentElement) {
-          if (focusedElement && this._isValidElement(focusedElement)) {
-            this._executeDelayed(function(self) {
-              self.open(focusedElement);
-            });
-          }
-          return;
-        }
-
-        if (this._currentElement != focusedElement)
-          this.currentElement = focusedElement;
-        break;
-
-      case "blur":
-        content.setTimeout(function(self) {
-          if (!self._open)
-            return;
-
-          // If the blurring causes focus be in no other element,
-          // we should close the form assistant.
-          let focusedElement = gFocusManager.getFocusedElementForWindow(content, true, {});
-          if (!focusedElement)
-            self.close();
-        }, 0, this);
-        break;
-
-      case "text":
-        if (this._isAutocomplete(aEvent.target)) {
-          this._sendJsonMsgWrapper("FormAssist:AutoComplete");
-        }
-        break;
-    }
-  },
-
-  _executeDelayed: function formHelperExecuteSoon(aCallback) {
-    let self = this;
-    let timer = new Util.Timeout(function() {
-      aCallback(self);
-    });
-    timer.once(0);
-  },
-
-  _isEditable: function formHelperIsEditable(aElement) {
-    if (!aElement)
-      return false;
-    let canEdit = false;
-
-    if (aElement.isContentEditable || aElement.designMode == "on") {
-      canEdit = true;
-    } else if (aElement instanceof HTMLIFrameElement &&
-               (aElement.contentDocument.body.isContentEditable ||
-                aElement.contentDocument.designMode == "on")) {
-      canEdit = true;
-    } else {
-      canEdit = aElement.ownerDocument && aElement.ownerDocument.designMode == "on";
-    }
-
-    return canEdit;
-  },
-
-  _getTopLevelEditable: function formHelperGetTopLevelEditable(aElement) {
-    if (!(aElement instanceof HTMLIFrameElement)) {
-      let element = aElement;
-
-      // Retrieve the top element that is editable
-      if (element instanceof HTMLHtmlElement)
-        element = element.ownerDocument.body;
-      else if (element instanceof HTMLDocument)
-        element = element.body;
-
-      while (element && !this._isEditable(element))
-        element = element.parentNode;
-
-      // Return the container frame if we are into a nested editable frame
-      if (element && element instanceof HTMLBodyElement && element.ownerDocument.defaultView != content.document.defaultView)
-        return element.ownerDocument.defaultView.frameElement;
-    }
-
-    return aElement;
-  },
-
-  _isAutocomplete: function formHelperIsAutocomplete(aElement) {
-    if (aElement instanceof HTMLInputElement) {
-      if (aElement.getAttribute("type") == "password")
-        return false;
-
-      let autocomplete = aElement.getAttribute("autocomplete");
-      let allowedValues = ["off", "false", "disabled"];
-      if (allowedValues.indexOf(autocomplete) == -1)
-        return true;
-    }
-
-    return false;
-  },
-
-  /*
-   * This function is similar to getListSuggestions from
-   * components/satchel/src/nsInputListAutoComplete.js but sadly this one is
-   * used by the autocomplete.xml binding which is not in used in fennec
-   */
-  _getListSuggestions: function formHelperGetListSuggestions(aElement) {
-    if (!(aElement instanceof HTMLInputElement) || !aElement.list)
-      return [];
-
-    let suggestions = [];
-    let filter = !aElement.hasAttribute("mozNoFilter");
-    let lowerFieldValue = aElement.value.toLowerCase();
-
-    let options = aElement.list.options;
-    let length = options.length;
-    for (let i = 0; i < length; i++) {
-      let item = options.item(i);
-
-      let label = item.value;
-      if (item.label)
-        label = item.label;
-      else if (item.text)
-        label = item.text;
-
-      if (filter && label.toLowerCase().indexOf(lowerFieldValue) == -1)
-        continue;
-       suggestions.push({ label: label, value: item.value });
-    }
-
-    return suggestions;
-  },
-
-  _isValidElement: function formHelperIsValidElement(aElement) {
-    if (!aElement.getAttribute)
-      return false;
-
-    let formExceptions = { button: true, checkbox: true, file: true, image: true, radio: true, reset: true, submit: true };
-    if (aElement instanceof HTMLInputElement && formExceptions[aElement.type])
-      return false;
-
-    if (aElement instanceof HTMLButtonElement ||
-        (aElement.getAttribute("role") == "button" && aElement.hasAttribute("tabindex")))
-      return false;
-
-    return this._isNavigableElement(aElement) && this._isVisibleElement(aElement);
-  },
-
-  _isNavigableElement: function formHelperIsNavigableElement(aElement) {
-    if (aElement.disabled || aElement.getAttribute("tabindex") == "-1")
-      return false;
-
-    if (aElement.getAttribute("role") == "button" && aElement.hasAttribute("tabindex"))
-      return true;
-
-    if (this._isSelectElement(aElement) || aElement instanceof HTMLTextAreaElement)
-      return true;
-
-    if (aElement instanceof HTMLInputElement || aElement instanceof HTMLButtonElement)
-      return !(aElement.type == "hidden");
-
-    return this._isEditable(aElement);
-  },
-
-  _isVisibleElement: function formHelperIsVisibleElement(aElement) {
-    if (!aElement || !aElement.ownerDocument) {
-      return false;
-    }
-    let style = aElement.ownerDocument.defaultView.getComputedStyle(aElement, null);
-    if (!style)
-      return false;
-
-    let isVisible = (style.getPropertyValue("visibility") != "hidden");
-    let isOpaque = (style.getPropertyValue("opacity") != 0);
-
-    let rect = aElement.getBoundingClientRect();
-
-    // Since the only way to show a drop-down menu for a select when the form
-    // assistant is enabled is to return true here, a select is allowed to have
-    // an opacity to 0 in order to let web developpers add a custom design on
-    // top of it. This is less important to use the form assistant for the
-    // other types of fields because even if the form assistant won't fired,
-    // the focus will be in and a VKB will popup if needed
-    return isVisible && (isOpaque || this._isSelectElement(aElement)) && (rect.height != 0 || rect.width != 0);
-  },
-
-  _isSelectElement: function formHelperIsSelectElement(aElement) {
-    return (aElement instanceof HTMLSelectElement || aElement instanceof XULMenuListElement);
-  },
-
-  /** Caret is used to input text for this element. */
-  _getCaretRect: function _formHelperGetCaretRect() {
-    let element = this.currentElement;
-    let focusedElement = gFocusManager.getFocusedElementForWindow(content, true, {});
-    if (element && (element.mozIsTextField && element.mozIsTextField(false) ||
-        element instanceof HTMLTextAreaElement) && focusedElement == element && this._isVisibleElement(element)) {
-      let utils = Util.getWindowUtils(element.ownerDocument.defaultView);
-      let rect = utils.sendQueryContentEvent(utils.QUERY_CARET_RECT, element.selectionEnd, 0, 0, 0,
-                                             utils.QUERY_CONTENT_FLAG_USE_XP_LINE_BREAK);
-      if (rect) {
-        let scroll = ContentScroll.getScrollOffset(element.ownerDocument.defaultView);
-        return new Rect(scroll.x + rect.left, scroll.y + rect.top, rect.width, rect.height);
-      }
-    }
-
-    return new Rect(0, 0, 0, 0);
-  },
-
-  /** Gets a rect bounding important parts of the element that must be seen when assisting. */
-  _getRect: function _formHelperGetRect(aOptions={}) {
-    const kDistanceMax = 100;
-    let element = this.currentElement;
-    let elRect = getBoundingContentRect(element);
-
-    if (aOptions.alignToLabel) {
-      let labels = this._getLabels();
-      for (let i=0; i<labels.length; i++) {
-        let labelRect = labels[i].rect;
-        if (labelRect.left < elRect.left) {
-          let isClose = Math.abs(labelRect.left - elRect.left) - labelRect.width < kDistanceMax &&
-                        Math.abs(labelRect.top - elRect.top) - labelRect.height < kDistanceMax;
-          if (isClose) {
-            let width = labelRect.width + elRect.width + (elRect.left - labelRect.left - labelRect.width);
-            return new Rect(labelRect.left, labelRect.top, width, elRect.height).expandToIntegers();
-          }
-        }
-      }
-    }
-    return elRect;
-  },
-
-  _getLabels: function formHelperGetLabels() {
-    let associatedLabels = [];
-    if (!this.currentElement)
-      return associatedLabels;
-    let element = this.currentElement;
-    let labels = element.ownerDocument.getElementsByTagName("label");
-    for (let i=0; i<labels.length; i++) {
-      let label = labels[i];
-      if ((label.control == element || label.getAttribute("for") == element.id) && this._isVisibleElement(label)) {
-        associatedLabels.push({
-          rect: getBoundingContentRect(label),
-          title: label.textContent
-        });
-      }
-    }
-
-    return associatedLabels;
-  },
-
-  _sendJsonMsgWrapper: function (aMsg) {
-    let json = this._getJSON();
-    if (json) {
-      sendAsyncMessage(aMsg, json);
-    }
-  },
-
-  _getJSON: function() {
-    let element = this.currentElement;
-    if (!element) {
-      return null;
-    }
-    let choices = getListForElement(element);
-    let editable = (element instanceof HTMLInputElement && element.mozIsTextField(false)) || this._isEditable(element);
-
-    let labels = this._getLabels();
-    return {
-      current: {
-        id: element.id,
-        name: element.name,
-        title: labels.length ? labels[0].title : "",
-        value: element.value,
-        maxLength: element.maxLength,
-        type: (element.getAttribute("type") || "").toLowerCase(),
-        choices: choices,
-        isAutocomplete: this._isAutocomplete(element),
-        list: this._getListSuggestions(element),
-        rect: this._getRect(),
-        caretRect: this._getCaretRect(),
-        editable: editable
-      },
-    };
-  },
-
-  /**
-   * For each radio button group, remove all but the checked button
-   * if there is one, or the first button otherwise.
-   */
-  _filterRadioButtons: function(aNodes) {
-    // First pass: Find the checked or first element in each group.
-    let chosenRadios = {};
-    for (let i=0; i < aNodes.length; i++) {
-      let node = aNodes[i];
-      if (node.type == "radio" && (!chosenRadios.hasOwnProperty(node.name) || node.checked))
-        chosenRadios[node.name] = node;
-    }
-
-    // Second pass: Exclude all other radio buttons from the list.
-    let result = [];
-    for (let i=0; i < aNodes.length; i++) {
-      let node = aNodes[i];
-      if (node.type == "radio" && chosenRadios[node.name] != node)
-        continue;
-      result.push(node);
-    }
-    return result;
-  }
-};
-this.FormAssistant = FormAssistant;
-
-
-/******************************************************************************
- * The next classes wraps some forms elements such as different type of list to
- * abstract the difference between html and xul element while manipulating them
- *  - SelectWrapper   : <html:select>
- *  - MenulistWrapper : <xul:menulist>
- *****************************************************************************/
-
-function getWrapperForElement(aElement) {
-  let wrapper = null;
-  if (aElement instanceof HTMLSelectElement) {
-    wrapper = new SelectWrapper(aElement);
-  }
-  else if (aElement instanceof XULMenuListElement) {
-    wrapper = new MenulistWrapper(aElement);
-  }
-
-  return wrapper;
-}
-
-function getListForElement(aElement) {
-  let wrapper = getWrapperForElement(aElement);
-  if (!wrapper)
-    return null;
-
-  let optionIndex = 0;
-  let result = {
-    multiple: wrapper.getMultiple(),
-    choices: []
-  };
-
-  // Build up a flat JSON array of the choices. In HTML, it's possible for select element choices
-  // to be under a group header (but not recursively). We distinguish between headers and entries
-  // using the boolean "list.group".
-  // XXX If possible, this would be a great candidate for tracing.
-  let children = wrapper.getChildren();
-  for (let i = 0; i < children.length; i++) {
-    let child = children[i];
-    if (wrapper.isGroup(child)) {
-      // This is the group element. Add an entry in the choices that says that the following
-      // elements are a member of this group.
-      result.choices.push({ group: true,
-                            text: child.label || child.firstChild.data,
-                            disabled: child.disabled
-                          });
-      let subchildren = child.children;
-      for (let j = 0; j < subchildren.length; j++) {
-        let subchild = subchildren[j];
-        result.choices.push({
-          group: false,
-          inGroup: true,
-          text: wrapper.getText(subchild),
-          disabled: child.disabled || subchild.disabled,
-          selected: subchild.selected,
-          optionIndex: optionIndex++
-        });
-      }
-    }
-    else if (wrapper.isOption(child)) {
-      // This is a regular choice under no group.
-      result.choices.push({
-        group: false,
-        inGroup: false,
-        text: wrapper.getText(child),
-        disabled: child.disabled,
-        selected: child.selected,
-        optionIndex: optionIndex++
-      });
-    }
-  }
-
-  return result;
-}
-
-
-function SelectWrapper(aControl) {
-  this._control = aControl;
-}
-
-SelectWrapper.prototype = {
-  getSelectedIndex: function() {
-    return this._control.selectedIndex;
-  },
-
-  getMultiple: function() {
-    return this._control.multiple;
-  },
-
-  getOptions: function() {
-    return this._control.options;
-  },
-
-  getChildren: function() {
-    return this._control.children;
-  },
-
-  getText: function(aChild) {
-    return aChild.text;
-  },
-
-  isOption: function(aChild) {
-    return aChild instanceof HTMLOptionElement;
-  },
-
-  isGroup: function(aChild) {
-    return aChild instanceof HTMLOptGroupElement;
-  },
-
-  select: function(aIndex, aSelected) {
-    let options = this._control.options;
-    if (this.getMultiple())
-      options[aIndex].selected = aSelected;
-    else
-      options.selectedIndex = aIndex;
-  },
-
-  fireOnChange: function() {
-    let control = this._control;
-    let evt = this._control.ownerDocument.createEvent("Events");
-    evt.initEvent("change", true, true, this._control.ownerDocument.defaultView, 0,
-                  false, false,
-                  false, false, null);
-    content.setTimeout(function() {
-      control.dispatchEvent(evt);
-    }, 0);
-  }
-};
-this.SelectWrapper = SelectWrapper;
-
-
-// bug 559792
-// Use wrappedJSObject when control is in content for extra protection
-function MenulistWrapper(aControl) {
-  this._control = aControl;
-}
-
-MenulistWrapper.prototype = {
-  getSelectedIndex: function() {
-    let control = this._control.wrappedJSObject || this._control;
-    let result = control.selectedIndex;
-    return ((typeof result == "number" && !isNaN(result)) ? result : -1);
-  },
-
-  getMultiple: function() {
-    return false;
-  },
-
-  getOptions: function() {
-    let control = this._control.wrappedJSObject || this._control;
-    return control.menupopup.children;
-  },
-
-  getChildren: function() {
-    let control = this._control.wrappedJSObject || this._control;
-    return control.menupopup.children;
-  },
-
-  getText: function(aChild) {
-    return aChild.label;
-  },
-
-  isOption: function(aChild) {
-    return aChild instanceof Ci.nsIDOMXULSelectControlItemElement;
-  },
-
-  isGroup: function(aChild) {
-    return false;
-  },
-
-  select: function(aIndex, aSelected) {
-    let control = this._control.wrappedJSObject || this._control;
-    control.selectedIndex = aIndex;
-  },
-
-  fireOnChange: function() {
-    let control = this._control;
-    let evt = document.createEvent("XULCommandEvent");
-    evt.initCommandEvent("command", true, true, window, 0,
-                         false, false,
-                         false, false, null);
-    content.setTimeout(function() {
-      control.dispatchEvent(evt);
-    }, 0);
-  }
-};
-this.MenulistWrapper = MenulistWrapper;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/PluginHelper.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/PluginHelper.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/PluginHelper.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/PluginHelper.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +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/. */
-"use strict";
-
-dump("### PluginHelper.js loaded\n");
-
-/**
- * Handle events generated by plugin click-to-play code.
- *
- * This "PluginBindingAttached" fires when a "pluginProblem" XBL binding is
- * created.  This binding overlays plugin content when the plugin is missing,
- * blocked, click-to-play, or replaced by a "preview" extension plugin like
- * Shumway or PDF.js.
- */
-var PluginHelper = {
-  init: function () {
-    addEventListener("PluginBindingAttached", this, true, true);
-  },
-
-  handleEvent: function handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "PluginBindingAttached":
-        this.handlePluginBindingAttached(aEvent);
-        break;
-    }
-  },
-
-  getPluginMimeType: function (plugin) {
-    var tagMimetype = plugin.actualType;
-
-    if (tagMimetype == "") {
-      tagMimetype = plugin.type;
-    }
-    return tagMimetype;
-  },
-
-  handlePluginBindingAttached: function (aEvent) {
-    let plugin = aEvent.target;
-    let doc = plugin.ownerDocument;
-    let overlay = doc.getAnonymousElementByAttribute(plugin, "anonid", "main");
-    if (!overlay || overlay._bindingHandled) {
-      return;
-    }
-    overlay._bindingHandled = true;
-
-    let eventType = PluginHelper._getBindingType(plugin);
-    if (!eventType) {
-      return;
-    }
-
-    switch  (eventType) {
-      case "PluginPlayPreview": {
-        // Load the "preview" handler (an extension plugin like Shumway or PDF.js).
-        let previewContent = doc.getAnonymousElementByAttribute(plugin, "class", "previewPluginContent");
-        let pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-        let mimeType = PluginHelper.getPluginMimeType(plugin);
-        let playPreviewInfo = pluginHost.getPlayPreviewInfo(mimeType);
-
-        let iframe = previewContent.getElementsByClassName("previewPluginContentFrame")[0];
-        if (!iframe) {
-          // lazy initialization of the iframe
-          iframe = doc.createElementNS("http://www.w3.org/1999/xhtml", "iframe");
-          iframe.className = "previewPluginContentFrame";
-          previewContent.appendChild(iframe);
-        }
-        iframe.src = playPreviewInfo.redirectURL;
-        break;
-      }
-
-      case "PluginNotFound": {
-        // TODO: Display a message about missing plugins (bug 936907)
-        break;
-      }
-    }
-  },
-
-  // Helper to get the binding handler type from a plugin object
-  _getBindingType: function(plugin) {
-    if (!(plugin instanceof Ci.nsIObjectLoadingContent))
-      return null;
-
-    switch (plugin.pluginFallbackType) {
-      case Ci.nsIObjectLoadingContent.PLUGIN_UNSUPPORTED:
-        return "PluginNotFound";
-      case Ci.nsIObjectLoadingContent.PLUGIN_PLAY_PREVIEW:
-        return "PluginPlayPreview";
-      default:
-        // Metro Firefox does not yet support other fallback types.
-        return null;
-    }
-  },
-};
-
-PluginHelper.init();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/SelectionHandler.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/SelectionHandler.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/contenthandlers/SelectionHandler.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/contenthandlers/SelectionHandler.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,616 +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/. */
-
-let Ci = Components.interfaces;
-let Cc = Components.classes;
-
-dump("### SelectionHandler.js loaded\n");
-
-var SelectionHandler = {
-  init: function init() {
-    this.type = kContentSelector;
-    this.snap = true;
-    this.lastYPos = this.lastXPos = null;
-    addMessageListener("Browser:SelectionStart", this);
-    addMessageListener("Browser:SelectionAttach", this);
-    addMessageListener("Browser:SelectionEnd", this);
-    addMessageListener("Browser:SelectionMoveStart", this);
-    addMessageListener("Browser:SelectionMove", this);
-    addMessageListener("Browser:SelectionMoveEnd", this);
-    addMessageListener("Browser:SelectionUpdate", this);
-    addMessageListener("Browser:SelectionClose", this);
-    addMessageListener("Browser:SelectionCopy", this);
-    addMessageListener("Browser:SelectionDebug", this);
-    addMessageListener("Browser:CaretAttach", this);
-    addMessageListener("Browser:CaretMove", this);
-    addMessageListener("Browser:CaretUpdate", this);
-    addMessageListener("Browser:SelectionSwitchMode", this);
-    addMessageListener("Browser:RepositionInfoRequest", this);
-    addMessageListener("Browser:SelectionHandlerPing", this);
-    addMessageListener("Browser:ResetLastPos", this);
-  },
-
-  shutdown: function shutdown() {
-    removeMessageListener("Browser:SelectionStart", this);
-    removeMessageListener("Browser:SelectionAttach", this);
-    removeMessageListener("Browser:SelectionEnd", this);
-    removeMessageListener("Browser:SelectionMoveStart", this);
-    removeMessageListener("Browser:SelectionMove", this);
-    removeMessageListener("Browser:SelectionMoveEnd", this);
-    removeMessageListener("Browser:SelectionUpdate", this);
-    removeMessageListener("Browser:SelectionClose", this);
-    removeMessageListener("Browser:SelectionCopy", this);
-    removeMessageListener("Browser:SelectionDebug", this);
-    removeMessageListener("Browser:CaretAttach", this);
-    removeMessageListener("Browser:CaretMove", this);
-    removeMessageListener("Browser:CaretUpdate", this);
-    removeMessageListener("Browser:SelectionSwitchMode", this);
-    removeMessageListener("Browser:RepositionInfoRequest", this);
-    removeMessageListener("Browser:SelectionHandlerPing", this);
-    removeMessageListener("Browser:ResetLastPos", this);
-  },
-
-  sendAsync: function sendAsync(aMsg, aJson) {
-    sendAsyncMessage(aMsg, aJson);
-  },
-
-  /*************************************************
-   * Browser event handlers
-   */
-
-  /*
-   * Selection start event handler
-   */
-  _onSelectionStart: function _onSelectionStart(aJson) {
-    // Init content window information
-    if (!this._initTargetInfo(aJson.xPos, aJson.yPos)) {
-      this._onFail("failed to get target information");
-      return;
-    }
-
-    // for context menu select command, which doesn't trigger
-    // form input focus changes.
-    if (aJson.setFocus && this._targetIsEditable) {
-      this._targetElement.focus();
-    }
-
-    // Clear any existing selection from the document
-    let selection = this._contentWindow.getSelection();
-    selection.removeAllRanges();
-
-    // Set our initial selection, aX and aY should be in client coordinates.
-    let framePoint = this._clientPointToFramePoint({ xPos: aJson.xPos, yPos: aJson.yPos });
-    if (!this._domWinUtils.selectAtPoint(framePoint.xPos, framePoint.yPos,
-                                         Ci.nsIDOMWindowUtils.SELECT_WORDNOSPACE)) {
-      this._onFail("failed to set selection at point");
-      return;
-    }
-
-    // Update the position of our selection monocles
-    this._updateSelectionUI("start", true, true);
-  },
-
-  _onSelectionAttach: function _onSelectionAttach(aX, aY) {
-    // Init content window information
-    if (!this._initTargetInfo(aX, aY)) {
-      this._onFail("failed to get frame offset");
-      return;
-    }
-
-    // Update the position of our selection monocles
-    this._updateSelectionUI("start", true, true);
-  },
-
-  /*
-   * Switch selection modes. Currently we only support switching
-   * from "caret" to "selection".
-   */
-  _onSwitchMode: function _onSwitchMode(aMode, aMarker, aX, aY) {
-    if (aMode != "selection") {
-      this._onFail("unsupported mode switch");
-      return;
-    }
-    
-    // Sanity check to be sure we are initialized
-    if (!this._targetElement) {
-      this._onFail("not initialized");
-      return;
-    }
-
-    // Only use selectAtPoint for editable content and avoid that for inputs,
-    // as we can expand caret to selection manually more precisely. We can use
-    // selectAtPoint for inputs too though, but only once bug 881938 is fully
-    // resolved.
-    if(Util.isEditableContent(this._targetElement)) {
-      // Similar to _onSelectionStart - we need to create initial selection
-      // but without the initialization bits.
-      let framePoint = this._clientPointToFramePoint({ xPos: aX, yPos: aY });
-      if (!this._domWinUtils.selectAtPoint(framePoint.xPos, framePoint.yPos,
-                                           Ci.nsIDOMWindowUtils.SELECT_CHARACTER)) {
-        this._onFail("failed to set selection at point");
-        return;
-      }
-    } else if (this._targetElement.selectionStart == 0 || aMarker == "end") {
-      // Expand caret forward or backward depending on direction
-      this._targetElement.selectionEnd++;
-    } else {
-      this._targetElement.selectionStart--;
-    }
-
-    // We bail if things get out of sync here implying we missed a message.
-    this._selectionMoveActive = true;
-
-    // Update the position of the selection marker that is *not*
-    // being dragged.
-    this._updateSelectionUI("update", aMarker == "end", aMarker == "start");
-  },
-
-  /*
-   * Selection monocle start move event handler
-   */
-  _onSelectionMoveStart: function _onSelectionMoveStart(aMsg) {
-    if (!this._contentWindow) {
-      this._onFail("_onSelectionMoveStart was called without proper view set up");
-      return;
-    }
-
-    if (this._selectionMoveActive) {
-      this._onFail("mouse is already down on drag start?");
-      return;
-    }
-
-    // We bail if things get out of sync here implying we missed a message.
-    this._selectionMoveActive = true;
-
-    if (this._targetIsEditable) {
-      // If we're coming out of an out-of-bounds scroll, the node the user is
-      // trying to drag may be hidden (the monocle will be pegged to the edge
-      // of the edit). Make sure the node the user wants to move is visible
-      // and has focus.
-      this._updateInputFocus(aMsg.change);
-    }
-
-    // Update the position of our selection monocles
-    this._updateSelectionUI("update", true, true);
-  },
-  
-  /*
-   * Selection monocle move event handler
-   */
-  _onSelectionMove: function _onSelectionMove(aMsg) {
-    if (!this._contentWindow) {
-      this._onFail("_onSelectionMove was called without proper view set up");
-      return;
-    }
-
-    if (!this._selectionMoveActive) {
-      this._onFail("mouse isn't down for drag move?");
-      return;
-    }
-
-    this._handleSelectionPoint(aMsg, false);
-  },
-
-  /*
-   * Selection monocle move finished event handler
-   */
-  _onSelectionMoveEnd: function _onSelectionMoveComplete(aMsg) {
-    if (!this._contentWindow) {
-      this._onFail("_onSelectionMove was called without proper view set up");
-      return;
-    }
-
-    if (!this._selectionMoveActive) {
-      this._onFail("mouse isn't down for drag move?");
-      return;
-    }
-
-    this._handleSelectionPoint(aMsg, true);
-    this._selectionMoveActive = false;
-    
-    // _handleSelectionPoint may set a scroll timer, so this must
-    // be reset after the last call.
-    this._clearTimers();
-
-    // Update the position of our selection monocles
-    this._updateSelectionUI("end", true, true);
-  },
-
-   /*
-    * _onCaretAttach - called by SelectionHelperUI when the user taps in a
-    * form input. Initializes SelectionHandler, updates the location of the
-    * caret, and messages back with current monocle position information.
-    *
-    * @param aX, aY tap location in client coordinates.
-    */
-  _onCaretAttach: function _onCaretAttach(aX, aY) {
-    // Init content window information
-    if (!this._initTargetInfo(aX, aY)) {
-      this._onFail("failed to get target information");
-      return;
-    }
-
-    // This should never happen, but we check to make sure
-    if (!this._targetIsEditable) {
-      this._onFail("Coordiates didn't find a text input element.");
-      return;
-    }
-
-    // Locate and sanity check the caret position
-    let selection = this._getSelection();
-    if (!selection || !selection.isCollapsed) {
-      this._onFail("No selection or selection is not collapsed.");
-      return;
-    }
-
-    // Update the position of our selection monocles
-    this._updateSelectionUI("caret", false, false, true);
-  },
-
-  /*
-   * Selection copy event handler
-   *
-   * Check to see if the incoming click was on our selection rect.
-   * if it was, copy to the clipboard. Incoming coordinates are
-   * content values.
-   */
-  _onSelectionCopy: function _onSelectionCopy(aMsg) {
-    let tap = {
-      xPos: aMsg.xPos,
-      yPos: aMsg.yPos,
-    };
-
-    let tapInSelection = (tap.xPos > this._cache.selection.left &&
-                          tap.xPos < this._cache.selection.right) &&
-                         (tap.yPos > this._cache.selection.top &&
-                          tap.yPos < this._cache.selection.bottom);
-    // Util.dumpLn(tapInSelection,
-    //             tap.xPos, tap.yPos, "|", this._cache.selection.left,
-    //             this._cache.selection.right, this._cache.selection.top,
-    //             this._cache.selection.bottom);
-    let success = false;
-    let selectedText = this._getSelectedText();
-    if (tapInSelection && selectedText.length) {
-      let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"]
-                        .getService(Ci.nsIClipboardHelper);
-      clipboard.copyString(selectedText, this._contentWindow.document);
-      success = true;
-    }
-    sendSyncMessage("Content:SelectionCopied", { succeeded: success });
-  },
-
-  /*
-   * Selection close event handler
-   *
-   * @param aClearSelection requests that selection be cleared.
-   */
-  _onSelectionClose: function _onSelectionClose(aClearSelection) {
-    if (aClearSelection) {
-      this._clearSelection();
-    }
-    this.closeSelection();
-  },
-
-  /*
-   * Called any time SelectionHelperUI would like us to
-   * recalculate the selection bounds.
-   */
-  _onSelectionUpdate: function _onSelectionUpdate(aMsg) {
-    if (!this._contentWindow) {
-      this._onFail("_onSelectionUpdate was called without proper view set up");
-      return;
-    }
-
-    if (aMsg && aMsg.isInitiatedByAPZC) {
-      let {offset: offset} = Content.getCurrentWindowAndOffset(
-        this._targetCoordinates.x, this._targetCoordinates.y);
-      this._contentOffset = offset;
-    }
-
-    // Update the position of our selection monocles
-    this._updateSelectionUI("update", true, true);
-  },
-
-  /*
-   * Called if for any reason we fail during the selection
-   * process. Cancels the selection.
-   */
-  _onFail: function _onFail(aDbgMessage) {
-    if (aDbgMessage && aDbgMessage.length > 0)
-      Util.dumpLn(aDbgMessage);
-    this.sendAsync("Content:SelectionFail");
-    this._clearSelection();
-    this.closeSelection();
-  },
-
-  /*
-   * _repositionInfoRequest - fired at us by ContentAreaObserver when the
-   * soft keyboard is being displayed. CAO wants to make a decision about
-   * whether the browser deck needs repositioning.
-   */
-  _repositionInfoRequest: function _repositionInfoRequest(aJsonMsg) {
-    let result = this._calcNewContentPosition(aJsonMsg.viewHeight);
-
-    // no repositioning needed
-    if (result == 0) {
-      this.sendAsync("Content:RepositionInfoResponse", { reposition: false });
-      return;
-    }
-
-    this.sendAsync("Content:RepositionInfoResponse", {
-      reposition: true,
-      raiseContent: result,
-    });
-  },
-
-  _onPing: function _onPing(aId) {
-    this.sendAsync("Content:SelectionHandlerPong", { id: aId });
-  },
-
-  onClickCoords: function (xPos, yPos) {
-    this.lastXPos = xPos;
-    this.lastYPos = yPos;
-  },
-
-  /*************************************************
-   * Selection helpers
-   */
-
-  /*
-   * _clearSelection
-   *
-   * Clear existing selection if it exists and reset our internla state.
-   */
-  _clearSelection: function _clearSelection() {
-    this._clearTimers();
-    if (this._contentWindow) {
-      let selection = this._getSelection();
-      if (selection)
-        selection.removeAllRanges();
-    } else {
-      let selection = content.getSelection();
-      if (selection)
-        selection.removeAllRanges();
-    }
-  },
-
-  /*
-   * closeSelection
-   *
-   * Shuts SelectionHandler down.
-   */
-  closeSelection: function closeSelection() {
-    this._clearTimers();
-    this._cache = null;
-    this._contentWindow = null;
-    this._targetElement = null;
-    this._selectionMoveActive = false;
-    this._contentOffset = null;
-    this._domWinUtils = null;
-    this._targetIsEditable = false;
-    this._targetCoordinates = null;
-    sendSyncMessage("Content:HandlerShutdown", {});
-  },
-
-  /*
-   * Find content within frames - cache the target nsIDOMWindow,
-   * client coordinate offset, target element, and dom utils interface.
-   */
-  _initTargetInfo: function _initTargetInfo(aX, aY) {
-    // getCurrentWindowAndOffset takes client coordinates
-    let { element: element,
-          contentWindow: contentWindow,
-          offset: offset,
-          utils: utils } =
-      Content.getCurrentWindowAndOffset(aX, aY);
-    if (!contentWindow) {
-      return false;
-    }
-    this._targetElement = element;
-    this._contentWindow = contentWindow;
-    this._contentOffset = offset;
-    this._domWinUtils = utils;
-    this._targetIsEditable = Util.isEditable(this._targetElement);
-    this._targetCoordinates = {
-      x: aX,
-      y: aY
-    };
-
-    return true;
-  },
-
-  /*
-   * _calcNewContentPosition - calculates the distance the browser should be
-   * raised to move the focused form input out of the way of the soft
-   * keyboard.
-   *
-   * @param aNewViewHeight the new content view height
-   * @return 0 if no positioning is required or a positive val equal to the
-   * distance content should be raised to center the target element.
-   */
-  _calcNewContentPosition: function _calcNewContentPosition(aNewViewHeight) {
-    // We have no target element but the keyboard is up
-    // so lets not cover content that is below the keyboard
-    if (!this._cache || !this._cache.element) {
-      if (this.lastYPos != null && this.lastYPos > aNewViewHeight) {
-        return Services.metro.keyboardHeight;
-      }
-      return 0;
-    }
-
-    let position = Util.centerElementInView(aNewViewHeight, this._cache.element);
-    if (position !== undefined) {
-      return position;
-    }
-
-    // Special case: we are dealing with an input that is taller than the
-    // desired height of content. We need to center on the caret location.
-    let rect =
-      this._domWinUtils.sendQueryContentEvent(
-        this._domWinUtils.QUERY_CARET_RECT,
-        this._targetElement.selectionEnd,
-        0, 0, 0,
-        this._domWinUtils.QUERY_CONTENT_FLAG_USE_XP_LINE_BREAK);
-    if (!rect || !rect.succeeded) {
-      Util.dumpLn("no caret was present, unexpected.");
-      return 0;
-    }
-
-    // Note sendQueryContentEvent with QUERY_CARET_RECT is really buggy. If it
-    // can't find the exact location of the caret position it will "guess".
-    // Sometimes this can put the result in unexpected locations.
-    let caretLocation = Math.max(Math.min(Math.round(rect.top + (rect.height * .5)),
-                                          viewBottom), 0);
-
-    // Caret is above the bottom of the new view bounds, no need to shift.
-    if (caretLocation <= aNewViewHeight) {
-      return 0;
-    }
-
-    // distance from the top of the keyboard down to the caret location
-    return caretLocation - aNewViewHeight;
-  },
-
-  /*************************************************
-   * Events
-   */
-
-  /*
-   * Scroll + selection advancement timer when the monocle is
-   * outside the bounds of an input control.
-   */
-  scrollTimerCallback: function scrollTimerCallback() {
-    let result = SelectionHandler.updateTextEditSelection();
-    // Update monocle position and speed if we've dragged off to one side
-    if (result.trigger) {
-      SelectionHandler._updateSelectionUI("update", result.start, result.end);
-    }
-  },
-
-  receiveMessage: function sh_receiveMessage(aMessage) {
-    if (this._debugEvents && aMessage.name != "Browser:SelectionMove") {
-      Util.dumpLn("SelectionHandler:", aMessage.name);
-    }
-    let json = aMessage.json;
-    switch (aMessage.name) {
-      case "Browser:SelectionStart":
-        this._onSelectionStart(json);
-        break;
-
-      case "Browser:SelectionAttach":
-        this._onSelectionAttach(json.xPos, json.yPos);
-        break;
-
-      case "Browser:CaretAttach":
-        this._onCaretAttach(json.xPos, json.yPos);
-        break;
-
-      case "Browser:CaretMove":
-        this._onCaretMove(json.caret.xPos, json.caret.yPos);
-        break;
-
-      case "Browser:CaretUpdate":
-        this._onCaretPositionUpdate(json.caret.xPos, json.caret.yPos);
-        break;
-
-      case "Browser:SelectionSwitchMode":
-        this._onSwitchMode(json.newMode, json.change, json.xPos, json.yPos);
-        break;
-
-      case "Browser:SelectionClose":
-        this._onSelectionClose(json.clearSelection);
-        break;
-
-      case "Browser:SelectionMoveStart":
-        this._onSelectionMoveStart(json);
-        break;
-
-      case "Browser:SelectionMove":
-        this._onSelectionMove(json);
-        break;
-
-      case "Browser:SelectionMoveEnd":
-        this._onSelectionMoveEnd(json);
-        break;
-
-      case "Browser:SelectionCopy":
-        this._onSelectionCopy(json);
-        break;
-
-      case "Browser:SelectionDebug":
-        this._onSelectionDebug(json);
-        break;
-
-      case "Browser:SelectionUpdate":
-        this._onSelectionUpdate(json);
-        break;
-
-      case "Browser:RepositionInfoRequest":
-        // This message is sent simultaneously with a tap event.
-        // Wait a bit to make sure we have the most up-to-date tap co-ordinates
-        // before a call to _calcNewContentPosition() which accesses them.
-        content.setTimeout (function () {
-          SelectionHandler._repositionInfoRequest(json);
-        }, 50);
-        break;
-
-      case "Browser:SelectionHandlerPing":
-        this._onPing(json.id);
-        break;
-
-      case "Browser:ResetLastPos":
-        this.onClickCoords(json.xPos, json.yPos);
-        break;
-    }
-  },
-
-  /*************************************************
-   * Utilities
-   */
-
-  _getDocShell: function _getDocShell(aWindow) {
-    if (aWindow == null)
-      return null;
-    return aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                  .getInterface(Ci.nsIWebNavigation)
-                  .QueryInterface(Ci.nsIDocShell);
-  },
-
-  _getSelectedText: function _getSelectedText() {
-    let selection = this._getSelection();
-    if (selection)
-      return selection.toString();
-    return "";
-  },
-
-  _getSelection: function _getSelection() {
-    if (this._targetElement instanceof Ci.nsIDOMNSEditableElement) {
-      return this._targetElement
-                 .QueryInterface(Ci.nsIDOMNSEditableElement)
-                 .editor.selection;
-    } else if (this._contentWindow)
-      return this._contentWindow.getSelection();
-    return null;
-  },
-
-  _getSelectController: function _getSelectController() {
-    if (this._targetElement instanceof Ci.nsIDOMNSEditableElement) {
-      return this._targetElement
-                 .QueryInterface(Ci.nsIDOMNSEditableElement)
-                 .editor.selectionController;
-    } else {
-      let docShell = this._getDocShell(this._contentWindow);
-      if (docShell == null)
-        return null;
-      return docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                     .getInterface(Ci.nsISelectionDisplay)
-                     .QueryInterface(Ci.nsISelectionController);
-    }
-  },
-};
-this.SelectionHandler = SelectionHandler;
-
-SelectionHandler.__proto__ = new SelectionPrototype();
-SelectionHandler.init();
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/ContextCommands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/ContextCommands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/ContextCommands.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/ContextCommands.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,436 +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/. */
-
- /*
-  * context menu command handlers
-  */
-
-var ContextCommands = {
-  _picker: null,
-
-  get _ellipsis() {
-    delete this._ellipsis;
-    this._ellipsis = "\u2026";
-    try {
-      this._ellipsis = Services.prefs.getComplexValue("intl.ellipsis", Ci.nsIPrefLocalizedString).data;
-    } catch (ex) { }
-    return this._ellipsis;
-  },
-
-  get clipboard() {
-    return Cc["@mozilla.org/widget/clipboardhelper;1"]
-             .getService(Ci.nsIClipboardHelper);
-  },
-
-  get docRef() {
-    return Browser.selectedBrowser.contentWindow.document;
-  },
-
-  /*
-   * Context menu handlers
-   */
-
-  // Text specific
-
-  cut: function cc_cut() {
-    let target = ContextMenuUI.popupState.target;
-
-    if (!target) {
-      return;
-    }
-
-    if (target.localName === "browser") {
-      // content
-      if (ContextMenuUI.popupState.string) {
-        this.sendCommand("cut");
-
-        SelectionHelperUI.closeEditSession(true);
-      }
-    } else {
-      // chrome
-      CommandUpdater.doCommand("cmd_cut");
-    }
-
-    target.focus();
-  },
-
-  copy: function cc_copy() {
-    let target = ContextMenuUI.popupState.target;
-
-    if (!target) {
-      return;
-    }
-
-    if (target.localName == "browser") {
-      // content
-      if (ContextMenuUI.popupState.string) {
-        this.sendCommand("copy");
-      }
-    } else if (ContextMenuUI.popupState.string) {
-      this.clipboard.copyString(ContextMenuUI.popupState.string, this.docRef);
-    } else {
-      // chrome
-      CommandUpdater.doCommand("cmd_copy");
-    }
-
-    target.focus();
-  },
-
-  paste: function cc_paste() {
-    let target = ContextMenuUI.popupState.target;
-
-    if (!target) {
-      return;
-    }
-
-    if (target.localName == "browser") {
-      // content
-      let x = ContextMenuUI.popupState.x;
-      let y = ContextMenuUI.popupState.y;
-      let json = {x: x, y: y, command: "paste" };
-      target.messageManager.sendAsyncMessage("Browser:ContextCommand", json);
-    } else {
-      // chrome
-      CommandUpdater.doCommand("cmd_paste");
-      target.focus();
-    }
-    SelectionHelperUI.closeEditSession();
-  },
-
-  pasteAndGo: function cc_pasteAndGo() {
-    let target = ContextMenuUI.popupState.target;
-    target.editor.selectAll();
-    target.editor.paste(Ci.nsIClipboard.kGlobalClipboard);
-    BrowserUI.goToURI();
-  },
-
-  select: function cc_select() {
-    SelectionHelperUI.openEditSession(ContextMenuUI.popupState.target,
-                                      ContextMenuUI.popupState.xPos,
-                                      ContextMenuUI.popupState.yPos,
-                                      true);
-  },
-
-  selectAll: function cc_selectAll() {
-    let target = ContextMenuUI.popupState.target;
-    if (target.localName == "browser") {
-      // content
-      let x = ContextMenuUI.popupState.xPos;
-      let y = ContextMenuUI.popupState.yPos;
-      let json = {x: x, y: y, command: "select-all" };
-      target.messageManager.sendAsyncMessage("Browser:ContextCommand", json);
-      SelectionHelperUI.attachEditSession(target, x, y);
-    } else {
-      // chrome
-      target.editor.selectAll();
-      target.focus();
-    }
-  },
-
-  // called on display of the search text menu item
-  searchTextSetup: function cc_searchTextSetup(aRichListItem, aSearchString) {
-    let defaultURI;
-    let defaultName;
-    aSearchString = aSearchString.trim();
-    try {
-      let defaultPB = Services.prefs.getDefaultBranch(null);
-      const nsIPLS = Ci.nsIPrefLocalizedString;
-      defaultName = defaultPB.getComplexValue("browser.search.defaultenginename", nsIPLS).data;
-      let defaultEngine = Services.search.getEngineByName(defaultName);
-      defaultURI = defaultEngine.getSubmission(aSearchString).uri.spec;
-    } catch (ex) {
-      Cu.reportError(ex);
-      return false;
-    }
-    let displayString = aSearchString;
-    if (displayString.length > 15) {
-      displayString = displayString.substring(0, 15) + this._ellipsis;
-    }
-    // label child node
-    let label = Services.strings
-                        .createBundle("chrome://browser/locale/browser.properties")
-                        .formatStringFromName("browser.search.contextTextSearchLabel2",
-                                              [defaultName, displayString], 2);
-    aRichListItem.childNodes[0].setAttribute("value", label);
-    aRichListItem.setAttribute("searchString", defaultURI);
-    return true;
-  },
-
-  searchText: function cc_searchText(aRichListItem) {
-    let defaultURI = aRichListItem.getAttribute("searchString");
-    aRichListItem.childNodes[0].setAttribute("value", "");
-    aRichListItem.setAttribute("searchString", "");
-    BrowserUI.addAndShowTab(defaultURI, Browser.selectedTab);
-  },
-
-  // Link specific
-
-  openLinkInNewTab: function cc_openLinkInNewTab() {
-    let url = ContextMenuUI.popupState.linkURL;
-    BrowserUI.openLinkInNewTab(url, false, Browser.selectedTab);
-  },
-
-  copyLink: function cc_copyLink() {
-    this.clipboard.copyString(ContextMenuUI.popupState.linkURL,
-                              this.docRef);
-  },
-
-  bookmarkLink: function cc_bookmarkLink() {
-    let state = ContextMenuUI.popupState;
-    let uri = Util.makeURI(state.linkURL);
-    let title = state.linkTitle || state.linkURL;
-
-    try {
-      Bookmarks.addForURI(uri, title);
-    } catch (e) {
-      return;
-    }
-  },
-
-  // Image specific
-
-  saveImageToLib: function cc_saveImageToLib() {
-    this.saveToWinLibrary("Pict");
-  },
-
-  copyImage: function cc_copyImage() {
-    // copy to clibboard
-    this.sendCommand("copy-image-contents");
-  },
-
-  copyImageSrc: function cc_copyImageSrc() {
-    this.clipboard.copyString(ContextMenuUI.popupState.mediaURL,
-                              this.docRef);
-  },
-
-  openImageInNewTab: function cc_openImageInNewTab() {
-    BrowserUI.addAndShowTab(ContextMenuUI.popupState.mediaURL, Browser.selectedTab);
-  },
-
-  // Video specific
-
-  saveVideoToLib: function cc_saveVideoToLib() {
-    this.saveToWinLibrary("Vids");
-  },
-
-  copyVideoSrc: function cc_copyVideoSrc() {
-    this.clipboard.copyString(ContextMenuUI.popupState.mediaURL,
-                              this.docRef);
-  },
-
-  openVideoInNewTab: function cc_openVideoInNewTab() {
-    BrowserUI.addAndShowTab(ContextMenuUI.popupState.mediaURL, Browser.selectedTab);
-  },
-
-  // Bookmarks
-
-  editBookmark: function cc_editBookmark() {
-    let target = ContextMenuUI.popupState.target;
-    target.startEditing();
-  },
-
-  removeBookmark: function cc_removeBookmark() {
-    let target = ContextMenuUI.popupState.target;
-    target.remove();
-  },
-
-  // App bar
-
-  errorConsole: function cc_errorConsole() {
-    PanelUI.show("console-container");
-  },
-
-  jsShell: function cc_jsShell() {
-    // XXX for debugging, this only works when running on the desktop.
-    if (!Services.metro.immersive)
-      window.openDialog("chrome://browser/content/shell.xul", "_blank",
-                        "all=no,scrollbars=yes,resizable=yes,dialog=no");
-  },
-
-  findInPage: function cc_findInPage() {
-    FindHelperUI.show();
-  },
-
-  viewOnDesktop: function cc_viewOnDesktop() {
-    Appbar.onViewOnDesktop();
-  },
-
-  // Checks for MS app store specific meta data, and if present opens
-  // the Windows Store to the appropriate app
-  openWindowsStoreLink: function cc_openWindowsStoreLink() {
-    let storeLink = this.getStoreLink();
-    if (storeLink) {
-      Browser.selectedBrowser.contentWindow.document.location = storeLink;
-    }
-  },
-
-  getStoreLink: function cc_getStoreLink() {
-    let metaData = Browser.selectedBrowser.contentWindow.document.getElementsByTagName("meta");
-    let msApplicationName = metaData.namedItem("msApplication-PackageFamilyName");
-    if (msApplicationName) {
-      return "ms-windows-store:PDP?PFN=" + msApplicationName.getAttribute("content");
-    }
-    return null;
-  },
-
-  getPageSource: function cc_getPageSource() {
-    let uri = Services.io.newURI(Browser.selectedBrowser.currentURI.spec, null, null);
-    if (!uri.schemeIs("view-source")) {
-      return "view-source:" + Browser.selectedBrowser.currentURI.spec;
-    }
-    return null;
-  },
-
-  viewPageSource: function cc_viewPageSource() {
-    let uri = this.getPageSource();
-    if (uri) {
-      BrowserUI.addAndShowTab(uri, Browser.selectedTab);
-    }
-  },
-
-  /*
-   * Utilities
-   */
-
-  saveToWinLibrary: function cc_saveToWinLibrary(aType) {
-    let popupState = ContextMenuUI.popupState;
-    let browser = popupState.target;
-
-    // ContentAreaUtils internalSave relies on various desktop related prefs,
-    // values, and functionality. We want to be more direct by saving the
-    // image to the users Windows Library. If users want to specify the
-    // save location they can use the context menu option 'Save (type) To'.
-
-    let dirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
-                           .getService(Components.interfaces.nsIProperties);
-    let saveLocationPath = dirSvc.get(aType, Components.interfaces.nsIFile);
-
-    let fileInfo = new ContentAreaUtils.FileInfo();
-    ContentAreaUtils.initFileInfo(fileInfo, popupState.mediaURL,
-                                  browser.documentURI.originCharset,
-                                  null, null, null);
-    let filename =
-      ContentAreaUtils.getNormalizedLeafName(fileInfo.fileName, fileInfo.fileExt);
-    saveLocationPath.append(filename);
-
-    // Start the background save process
-    ContentAreaUtils.internalPersist({
-      sourceURI         : fileInfo.uri,
-      sourceDocument    : null,
-      sourceReferrer    : browser.documentURI,
-      targetContentType : popupState.contentType,
-      targetFile        : saveLocationPath,
-      sourceCacheKey    : null,
-      sourcePostData    : null,
-      bypassCache       : false,
-      initiatingWindow  : this.docRef.defaultView
-    });
-  },
-
-  sendCommand: function sendCommand(aCommand) {
-    // Send via message manager over to ContextMenuHandler
-    let browser = ContextMenuUI.popupState.target;
-    browser.messageManager.sendAsyncMessage("Browser:ContextCommand", { command: aCommand });
-  },
-
-  /*
-   * isAccessibleDirectory
-   *
-   * Test to see if the directory exists and is writable.
-   */
-  isAccessibleDirectory: function isAccessibleDirectory(aDirectory) {
-    return aDirectory && aDirectory.exists() && aDirectory.isDirectory() &&
-           aDirectory.isWritable();
-  },
-
-  /*
-   * saveFileAs
-   *
-   * Browse for a location and then save a file to the local system using
-   * standard download prefs.
-   *
-   * @param aFileUriString path to file
-   */
-  saveFileAs: function saveFileAs(aPopupState) {
-    let srcUri = null;
-    let mediaURL = aPopupState.mediaURL;
-    try {
-      srcUri = Util.makeURI(mediaURL, null, null);
-    } catch (ex) {
-      Util.dumpLn("could not parse:", mediaURL);
-      return;
-    }
-
-    let picker = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-    let windowTitle = Strings.browser.GetStringFromName("browserForSaveLocation");
-
-    picker.init(window, windowTitle, Ci.nsIFilePicker.modeSave);
-
-    // prefered filename
-    let fileName = mediaURL.substring(mediaURL.lastIndexOf("/") + 1);
-    if (fileName.length)
-      picker.defaultString = fileName;
-
-    // prefered file extension
-    let fileExtension = mediaURL.substring(mediaURL.lastIndexOf(".") + 1);
-    if (fileExtension.length)
-      picker.defaultExtension = fileExtension;
-    picker.appendFilters(Ci.nsIFilePicker.filterImages);
-
-    // prefered save location
-    Task.spawn(function() {
-      let preferredDir = yield Downloads.getPreferredDownloadsDirectory();
-      picker.displayDirectory = new FileUtils.File(preferredDir);
-
-      try {
-        let lastDir = Services.prefs.getComplexValue("browser.download.lastDir", Ci.nsILocalFile);
-        if (this.isAccessibleDirectory(lastDir))
-          picker.displayDirectory = lastDir;
-      }
-      catch (e) { }
-
-      this._picker = picker;
-      this._pickerUrl = mediaURL;
-      this._pickerContentDisp = aPopupState.contentDisposition;
-      this._contentType = aPopupState.contentType;
-      picker.open(ContextCommands);
-    }.bind(this));
-  },
-
-  /*
-   * Filepicker callback
-   */
-  done: function done(aSuccess) {
-    let picker = this._picker;
-    this._picker = null;
-
-    if (aSuccess == Ci.nsIFilePicker.returnCancel)
-      return;
-
-    let file = picker.file;
-    if (file == null)
-      return;
-
-    try {
-      if (file.exists())
-        file.remove(false);
-    } catch (e) {}
-
-    ContentAreaUtils.internalSave(this._pickerUrl, null, null,
-                                  this._pickerContentDisp,
-                                  this._contentType, false, "SaveImageTitle",
-                                  new AutoChosen(file, Util.makeURI(this._pickerUrl, null, null)),
-                                  getBrowser().documentURI, this.docRef, true, null);
-
-    var newDir = file.parent.QueryInterface(Ci.nsILocalFile);
-    Services.prefs.setComplexValue("browser.download.lastDir", Ci.nsILocalFile, newDir);
-  },
-};
-
-function AutoChosen(aFileAutoChosen, aUriAutoChosen) {
-  this.file = aFileAutoChosen;
-  this.uri  = aUriAutoChosen;
-}
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/ContextUI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/ContextUI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/ContextUI.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/ContextUI.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,399 +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/. */
-
-// Fired when the tabtray is displayed
-const kContextUITabsShowEvent = "MozContextUITabsShow";
-// add more as needed...
-
-/*
- * Manages context UI (navbar, tabbar, appbar) and track visibility. Also
- * tracks events that summon and hide the context UI.
- */
-var ContextUI = {
-  _expandable: true,
-  _hidingId: 0,
-
-  /*******************************************
-   * init
-   */
-
-  init: function init() {
-    Elements.browsers.addEventListener('URLChanged', this, true);
-    Elements.browsers.addEventListener("AlertActive", this, true);
-    Elements.browsers.addEventListener("AlertClose", this, true);
-    Elements.tabList.addEventListener('TabSelect', this, true);
-    Elements.panelUI.addEventListener('ToolPanelShown', this, false);
-    Elements.panelUI.addEventListener('ToolPanelHidden', this, false);
-
-    Elements.tray.addEventListener("mousemove", this, false);
-    Elements.tray.addEventListener("mouseleave", this, false);
-
-    window.addEventListener("touchstart", this, true);
-    window.addEventListener("mousedown", this, true);
-    window.addEventListener("MozEdgeUIStarted", this, true);
-    window.addEventListener("MozEdgeUICanceled", this, true);
-    window.addEventListener("MozEdgeUICompleted", this, true);
-    window.addEventListener("keypress", this, true);
-    window.addEventListener("KeyboardChanged", this, false);
-    window.addEventListener("MozFlyoutPanelShowing", this, false);
-
-    Elements.tray.addEventListener("transitionend", this, true);
-
-    Appbar.init();
-  },
-
-  /*******************************************
-   * Context UI state getters & setters
-   */
-
-  // any visiblilty
-  get isVisible() {
-    return this.navbarVisible || this.tabbarVisible || this.contextAppbarVisible;
-  },
-
-  // navbar visiblilty
-  get navbarVisible() {
-    return (Elements.navbar.hasAttribute("visible") ||
-            Elements.navbar.hasAttribute("startpage"));
-  },
-
-  // tabbar visiblilty
-  get tabbarVisible() {
-    return Elements.tray.hasAttribute("expanded");
-  },
-
-  // appbar visiblilty
-  get contextAppbarVisible() {
-    return Elements.contextappbar.isShowing;
-  },
-
-  // currently not in use, for the always show tabs feature
-  get isExpandable() { return this._expandable; },
-  set isExpandable(aFlag) {
-    this._expandable = aFlag;
-    if (!this._expandable)
-      this.dismiss();
-  },
-
-  /*******************************************
-   * Public api
-   */
-
-  /*
-   * Toggle the current nav UI state. Fires context ui events.
-   */
-  toggleNavUI: function () {
-    // The navbar is forced open when the start page is visible. appbar.js
-    // controls the "visible" property, and browser-ui controls the "startpage"
-    // property. Hence we rely on the tabbar for current toggle state.
-    if (this.tabbarVisible) {
-      this.dismiss();
-    } else {
-      this.displayNavUI();
-    }
-  },
-
-  /*
-   * Show the nav and tabs bar. Returns true if any non-visible UI
-   * was shown. Fires context ui events.
-   */
-  displayNavUI: function () {
-    let shown = false;
-
-    if (!this.navbarVisible) {
-      BrowserUI.updateURI();
-      this.displayNavbar();
-      shown = true;
-    }
-
-    if (!this.tabbarVisible) {
-      this.displayTabs();
-      shown = true;
-    }
-
-    if (shown) {
-      ContentAreaObserver.updateContentArea();
-    }
-
-    return shown;
-  },
-
-  /*
-   * Dismiss any context UI currently visible. Returns true if any
-   * visible UI was dismissed. Fires context ui events.
-   */
-  dismiss: function () {
-    let dismissed = false;
-
-    this._clearDelayedTimeout();
-
-    // No assurances this will hide the nav bar. It may have the
-    // 'startpage' property set. This removes the 'visible' property.
-    if (this.navbarVisible) {
-      BrowserUI.blurNavBar();
-      this.dismissNavbar();
-      dismissed = true;
-    }
-    if (this.tabbarVisible) {
-      this.dismissTabs();
-      dismissed = true;
-    }
-    if (Elements.contextappbar.isShowing) {
-      this.dismissContextAppbar();
-      dismissed = true;
-    }
-
-    if (dismissed) {
-      ContentAreaObserver.updateContentArea();
-    }
-
-    return dismissed;
-  },
-
-  /*
-   * Briefly show the tab bar and then hide it. Fires context ui events.
-   */
-  peekTabs: function peekTabs(aDelay) {
-    if (!this.tabbarVisible)
-      this.displayTabs();
-
-    ContextUI.dismissTabsWithDelay(aDelay);
-  },
-
-  /*
-   * Dismiss tab bar after a delay. Fires context ui events.
-   */
-  dismissTabsWithDelay: function (aDelay) {
-    aDelay = aDelay || kForegroundTabAnimationDelay;
-    this._clearDelayedTimeout();
-    this._lastTimeoutDelay = aDelay;
-    this._hidingId = setTimeout(function () {
-        ContextUI.dismissTabs();
-      }, aDelay);
-  },
-
-  /*
-   * Display the nav bar.
-   *
-   * @return false if we were already visible, and didn't do anything.
-   */
-  displayNavbar: function () {
-    if (Elements.chromeState.getAttribute("navbar") == "visible") {
-      return false;
-    }
-
-    Elements.navbar.show();
-    Elements.chromeState.setAttribute("navbar", "visible");
-    ContentAreaObserver.updateContentArea();
-    return true;
-  },
-
-  // Display the tab tray
-  displayTabs: function () {
-    this._clearDelayedTimeout();
-    this._setIsExpanded(true);
-  },
-
-  // Dismiss the navbar if visible.
-  dismissNavbar: function dismissNavbar() {
-    if (!BrowserUI.isStartTabVisible) {
-      Elements.autocomplete.closePopup();
-      Elements.navbar.dismiss();
-      Elements.chromeState.removeAttribute("navbar");
-      ContentAreaObserver.updateContentArea();
-    }
-  },
-
-  // Dismiss the tabstray if visible.
-  dismissTabs: function dimissTabs() {
-    this._clearDelayedTimeout();
-    this._setIsExpanded(false);
-  },
-
-  // Dismiss the appbar if visible.
-  dismissContextAppbar: function dismissContextAppbar() {
-    Elements.contextappbar.dismiss();
-  },
-
-  /*******************************************
-   * Internal utils
-   */
-
-  // tabtray state
-  _setIsExpanded: function _setIsExpanded(aFlag, setSilently) {
-    // if the tray can't be expanded, don't expand it.
-    if (!this.isExpandable || this.tabbarVisible == aFlag)
-      return;
-
-    if (aFlag)
-      Elements.tray.setAttribute("expanded", "true");
-    else
-      Elements.tray.removeAttribute("expanded");
-
-    if (!setSilently)
-      this._fire(kContextUITabsShowEvent);
-  },
-
-  _clearDelayedTimeout: function _clearDelayedTimeout() {
-    if (this._hidingId) {
-      clearTimeout(this._hidingId);
-      this._hidingId = 0;
-      this._delayedHide = false;
-    }
-  },
-
-  _resetDelayedTimeout: function () {
-    this._hidingId = setTimeout(function () {
-        ContextUI.dismissTabs();
-      }, this._lastTimeoutDelay);
-  },
-
-  /*******************************************
-   * Events
-   */
-
-  _onEdgeUIStarted: function(aEvent) {
-    this._hasEdgeSwipeStarted = true;
-    this._clearDelayedTimeout();
-    this.toggleNavUI();
-  },
-
-  _onEdgeUICanceled: function(aEvent) {
-    this._hasEdgeSwipeStarted = false;
-    this.dismiss();
-  },
-
-  _onEdgeUICompleted: function(aEvent) {
-    if (this._hasEdgeSwipeStarted) {
-      this._hasEdgeSwipeStarted = false;
-      return;
-    }
-
-    this._clearDelayedTimeout();
-    this.toggleNavUI();
-  },
-
-  onDownInput: function onDownInput(aEvent) {
-    if (!this.isVisible) {
-      return;
-    }
-
-    // Various ui element containers we do not update context ui for.
-    let whitelist = [
-      // Clicks on tab bar elements should not close the tab bar. the tabbar
-      // handles this.
-      Elements.tabs,
-      // Don't let a click on an infobar button dismiss the appbar or navbar.
-      // Note the notification box should always hover above these other two
-      // bars.
-      Browser.getNotificationBox()
-    ];
-
-    if (whitelist.some(elem => elem.contains(aEvent.target))) {
-      return;
-    }
-
-    // If a start tab is visible only dismiss the tab bar.
-    if (BrowserUI.isStartTabVisible) {
-      ContextUI.dismissTabs();
-      return;
-    }
-
-    // content, dismiss anything visible
-    if (aEvent.target.ownerDocument.defaultView.top == getBrowser().contentWindow) {
-      this.dismiss();
-      return;
-    }
-
-    // dismiss tabs and context app bar if visible
-    this.dismissTabs();
-    this.dismissContextAppbar();
-  },
-
-  onMouseMove: function (aEvent) {
-    if (this._hidingId) {
-      this._clearDelayedTimeout();
-      this._delayedHide = true;
-    }
-  },
-
-  onMouseLeave: function (aEvent) {
-    if (this._delayedHide) {
-      this._delayedHide = false;
-      this._resetDelayedTimeout();
-    }
-  },
-
-  handleEvent: function handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "URLChanged":
-        // "aEvent.detail" is a boolean value that indicates whether actual URL
-        // has changed ignoring URL fragment changes.
-        if (aEvent.target == Browser.selectedBrowser && aEvent.detail) {
-          this.displayNavbar();
-        }
-        break;
-      case "MozEdgeUIStarted":
-        this._onEdgeUIStarted(aEvent);
-        break;
-      case "MozEdgeUICanceled":
-        this._onEdgeUICanceled(aEvent);
-        break;
-      case "MozEdgeUICompleted":
-        this._onEdgeUICompleted(aEvent);
-        break;
-      case "keypress":
-        if (String.fromCharCode(aEvent.which) == "z" &&
-            aEvent.getModifierState("Win"))
-          this.toggleNavUI();
-        break;
-      case "transitionend":
-        setTimeout(function () {
-          ContentAreaObserver.updateContentArea();
-        }, 0);
-        break;
-      case "KeyboardChanged":
-        this.dismissTabs();
-        break;
-      case "mousedown":
-        if (aEvent.button != 0) {
-          break;
-        }
-        this.onDownInput(aEvent);
-        break;
-      case "mousemove":
-        this.onMouseMove(aEvent);
-        break;
-      case "mouseleave":
-        this.onMouseLeave(aEvent);
-        break;
-      case "touchstart":
-        this.onDownInput(aEvent);
-        break;
-      case "ToolPanelShown":
-      case "ToolPanelHidden":
-        this.dismiss();
-        break;
-      case "AlertActive":
-      case "AlertClose":
-      case "TabSelect":
-        ContentAreaObserver.updateContentArea();
-        break;
-      case "MozFlyoutPanelShowing":
-        if (BrowserUI.isStartTabVisible) {
-          this.dismissTabs();
-          this.dismissContextAppbar();
-        } else {
-          this.dismiss();
-        }
-        break;
-    }
-  },
-
-  _fire: function (name) {
-    let event = document.createEvent("Events");
-    event.initEvent(name, true, true);
-    window.dispatchEvent(event);
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/cursor.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/cursor.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/cursor.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/cursor.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +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/. */
-
-@namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@namespace html url(http://www.w3.org/1999/xhtml);
-
-/* For touch input, *all* select boxes use the SelectHelper popup. */
-select option, select optgroup {
-  pointer-events: none;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/dbg-metro-actors.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/dbg-metro-actors.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/dbg-metro-actors.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/dbg-metro-actors.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +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";
-const error = Components.utils.reportError;
-
-/* Metrofx specific actors, modelled from the android fennec actors */
-
-/** aConnection DebuggerServerConnection, the conection to the client.
- */
-function createRootActor(aConnection) {
-  let parameters = {
-    tabList: new MetroTabList(aConnection),
-    globalActorFactories: DebuggerServer.globalActorFactories,
-    onShutdown: sendShutdownEvent
-  };
-  return new RootActor(aConnection, parameters);
-}
-
-/** aConnection DebuggerServerConnection, the conection to the client.
- */
-function MetroTabList(aConnection) {
-  BrowserTabList.call(this, aConnection);
-}
-
-MetroTabList.prototype = Object.create(BrowserTabList.prototype);
-MetroTabList.prototype.constructor = MetroTabList;
-
-MetroTabList.prototype._getSelectedBrowser = function(aWindow) {
-  return aWindow.Browser.selectedBrowser;
-};
-
-MetroTabList.prototype._getChildren = function(aWindow) {
-  return aWindow.Browser.browsers;
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/downloads.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/downloads.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/downloads.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/downloads.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,656 +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/. */
-
-const URI_GENERIC_ICON_DOWNLOAD = "chrome://browser/skin/images/alert-downloads-30.png";
-
-var MetroDownloadsView = {
-  /**
-   * _downloadCount keeps track of the number of downloads that a single
-   * notification bar groups together. A download is grouped with other
-   * downloads if it starts before other downloads have completed.
-   */
-  _downloadCount: 0,
-  _downloadsInProgress: 0,
-  _lastDownload: null,
-  _inited: false,
-  _progressAlert: null,
-  _lastSec: Infinity,
-
-  _progressNotificationInfo: new Map(),
-  _runDownloadBooleanMap: new Map(),
-
-  get manager() {
-    return Cc["@mozilla.org/download-manager;1"]
-             .getService(Ci.nsIDownloadManager);
-  },
-
-  _getReferrerOrSource: function dh__getReferrerOrSource(aDownload) {
-    return aDownload.referrer.spec || aDownload.source.spec;
-  },
-
-  _getLocalFile: function dh__getLocalFile(aFileURI) {
-    // XXX it's possible that using a null char-set here is bad
-    let spec = ('string' == typeof aFileURI) ? aFileURI : aFileURI.spec;
-    let fileUrl;
-    try {
-      fileUrl = Services.io.newURI(spec, null, null).QueryInterface(Ci.nsIFileURL);
-    } catch (ex) {
-      Util.dumpLn("_getLocalFile: Caught exception creating newURI from file spec: "+aFileURI.spec+": " + ex.message);
-      return;
-    }
-    return fileUrl.file.clone().QueryInterface(Ci.nsILocalFile);
-  },
-
-  init: function dh_init() {
-    if (this._inited)
-      return;
-
-    this._inited = true;
-
-    Services.obs.addObserver(this, "dl-start", true);
-    Services.obs.addObserver(this, "dl-done", true);
-    Services.obs.addObserver(this, "dl-run", true);
-    Services.obs.addObserver(this, "dl-failed", true);
-
-
-    this._progress = new DownloadProgressListener(this);
-    this.manager.addListener(this._progress);
-
-    Elements.tabList.addEventListener("TabClose", this, false);
-
-    this._downloadProgressIndicator = document.getElementById("download-progress");
-
-    if (this.manager.activeDownloadCount) {
-      setTimeout (this._restartWithActiveDownloads.bind(this), 0);
-    }
-  },
-
-  uninit: function dh_uninit() {
-    if (this._inited) {
-      Services.obs.removeObserver(this, "dl-start");
-      Services.obs.removeObserver(this, "dl-done");
-      Services.obs.removeObserver(this, "dl-run");
-      Services.obs.removeObserver(this, "dl-failed");
-      if (Elements && Elements.tabList)
-        Elements.tabList.removeEventListener("TabClose", this);
-    }
-  },
-
-  get _notificationBox() {
-    return Browser.getNotificationBox(Browser.selectedBrowser);
-  },
-
-  get _notificationBoxes() {
-    let currentBox = this._notificationBox;
-    let boxes = [
-      currentBox
-    ];
-    for (let { linkedBrowser } of Elements.tabList.children) {
-      if (linkedBrowser !== Browser.selectedBrowser) {
-        let notificationBox = Browser.getNotificationBox(linkedBrowser);
-        if (notificationBox)
-          boxes.push(notificationBox);
-      }
-    }
-    return boxes;
-  },
-
-  get _progressNotification() {
-    let notn = this._getNotificationWithValue("download-progress");
-    let currentBox = this._notificationBox;
-    // move the progress notification if attached to a different browser
-    if (notn && notn.parentNode !== currentBox) {
-      notn.parentNode.removeNotification(notn);
-      currentBox.insertBefore(notn, currentBox.firstChild);
-    }
-    return notn;
-  },
-
-  _getNotificationWithValue: function(aValue) {
-    let notn;
-    let allNotificationBoxes = this._notificationBoxes;
-    for(let box of allNotificationBoxes) {
-      notn = box.getNotificationWithValue(aValue);
-      if (notn) {
-        break;
-      }
-    }
-    return notn;
-  },
-
-   _restartWithActiveDownloads: function() {
-    let activeDownloads = this.manager.activeDownloads;
-
-    while (activeDownloads.hasMoreElements()) {
-      let dl = activeDownloads.getNext();
-      switch (dl.state) {
-        case 0: // Downloading
-        case 5: // Queued
-          this.watchDownload(dl);
-          this.updateInfobar();
-          break;
-      }
-    }
-    if (this.manager.activeDownloadCount) {
-      ContextUI.displayNavbar();
-    }
-  },
-
-  openDownload: function dh_openDownload(aDownload) {
-    let fileURI = aDownload.target
-
-    if (!(fileURI && fileURI.spec)) {
-      Util.dumpLn("Cant open download "+id+", fileURI is invalid");
-      return;
-    }
-
-    let file = this._getLocalFile(fileURI);
-    try {
-      file && Services.metro.launchInDesktop(aDownload.target.spec, "");
-    } catch (ex) {
-      Util.dumpLn("Failed to open download, with id: "+id+", download target URI spec: " + fileURI.spec);
-      Util.dumpLn("Failed download source:"+(aDownload.source && aDownload.source.spec));
-    }
-  },
-
-  removeDownload: function dh_removeDownload(aDownload) {
-    // aDownload is the XUL element here,
-    // and .target currently returns the target attribute (string value)
-    let id = aDownload.getAttribute("downloadId");
-    let download = this.manager.getDownload(id);
-
-    if (download) {
-      this.manager.removeDownload(id);
-    }
-  },
-
-  cancelDownload: function dh_cancelDownload(aDownload) {
-    let fileURI = aDownload.target;
-    if (!(fileURI && fileURI.spec)) {
-      Util.dumpLn("Cant remove download file for: "+aDownload.id+", fileURI is invalid");
-    }
-
-    try {
-      let file = this._getLocalFile(fileURI);
-      if (file && file.exists())
-        file.remove(false);
-      this.manager.cancelDownload(aDownload.id);
-
-      // If cancelling was successful, stop tracking the download.
-      this._progressNotificationInfo.delete(aDownload.guid);
-      this._runDownloadBooleanMap.delete(aDownload.targetFile.path);
-      this._downloadCount--;
-      this._downloadsInProgress--;
-      let notn = this._progressNotification;
-      if (notn && this._downloadsInProgress <= 0) {
-        this._notificationBox.removeNotification(notn);
-      }
-    } catch (ex) {
-      Util.dumpLn("Failed to cancel download, with id: "+aDownload.id+", download target URI spec: " + fileURI.spec);
-      Util.dumpLn("Failed download source:"+(aDownload.source && aDownload.source.spec));
-    }
-  },
-
-  // Cancels all downloads.
-  cancelDownloads: function dh_cancelDownloads() {
-    for (let [guid, info] of this._progressNotificationInfo) {
-      this.cancelDownload(info.download);
-    }
-    this._downloadCount = 0;
-    this._progressNotificationInfo.clear();
-    this._runDownloadBooleanMap.clear();
-  },
-
-  pauseDownload: function dh_pauseDownload(aDownload) {
-    let id = aDownload.getAttribute("downloadId");
-    this.manager.pauseDownload(id);
-  },
-
-  resumeDownload: function dh_resumeDownload(aDownload) {
-    let id = aDownload.getAttribute("downloadId");
-    this.manager.resumeDownload(id);
-  },
-
-  showPage: function dh_showPage(aDownload) {
-    let id = aDownload.getAttribute("downloadId");
-    let download = this.manager.getDownload(id);
-    let uri = this._getReferrerOrSource(download);
-    if (uri)
-      BrowserUI.addAndShowTab(uri, Browser.selectedTab);
-  },
-
-  showAlert: function dh_showAlert(aName, aMessage, aTitle, aObserver) {
-    var notifier = Cc["@mozilla.org/alerts-service;1"]
-                     .getService(Ci.nsIAlertsService);
-
-    if (!aTitle)
-      aTitle = Strings.browser.GetStringFromName("alertDownloads");
-
-    notifier.showAlertNotification("", aTitle, aMessage, true, "", aObserver, aName);
-  },
-
-  showNotification: function dh_showNotification(title, msg, buttons, priority) {
-    let notification = this._notificationBox.appendNotification(msg,
-                                              title,
-                                              URI_GENERIC_ICON_DOWNLOAD,
-                                              priority,
-                                              buttons);
-    return notification;
-  },
-
-  _showDownloadFailedNotification: function (aDownload) {
-    let tryAgainButtonText =
-      Strings.browser.GetStringFromName("downloadTryAgain");
-    let cancelButtonText =
-      Strings.browser.GetStringFromName("downloadCancel");
-
-    let message = Strings.browser.formatStringFromName("alertDownloadFailed",
-      [aDownload.displayName], 1);
-
-    let buttons = [
-      {
-        isDefault: true,
-        label: tryAgainButtonText,
-        accessKey: "",
-        callback: function() {
-          MetroDownloadsView.manager.retryDownload(aDownload.id);
-        }
-      },
-      {
-        label: cancelButtonText,
-        accessKey: "",
-        callback: function() {
-          MetroDownloadsView.cancelDownload(aDownload);
-          MetroDownloadsView._downloadProgressIndicator.reset();
-        }
-      }
-    ];
-    this.showNotification("download-failed", message, buttons,
-      this._notificationBox.PRIORITY_WARNING_HIGH);
-  },
-
-  _showDownloadCompleteNotification: function () {
-    let message = "";
-    let showInFilesButtonText = Strings.browser.GetStringFromName("downloadShowInFiles");
-
-    let buttons = [
-      {
-        label: showInFilesButtonText,
-        accessKey: "",
-        callback: function() {
-          let fileURI = MetroDownloadsView._lastDownload.target;
-          let file = MetroDownloadsView._getLocalFile(fileURI);
-          file.reveal();
-          MetroDownloadsView._resetCompletedDownloads();
-        }
-      }
-    ];
-
-    if (this._downloadCount > 1) {
-      message = PluralForm.get(this._downloadCount,
-                               Strings.browser.GetStringFromName("alertMultipleDownloadsComplete"))
-                               .replace("#1", this._downloadCount)
-    } else {
-      let runButtonText =
-        Strings.browser.GetStringFromName("downloadOpen");
-      message = Strings.browser.formatStringFromName("alertDownloadsDone2",
-        [this._lastDownload.displayName], 1);
-
-      buttons.unshift({
-        isDefault: true,
-        label: runButtonText,
-        accessKey: "",
-        callback: function() {
-          MetroDownloadsView.openDownload(MetroDownloadsView._lastDownload);
-          MetroDownloadsView._resetCompletedDownloads();
-        }
-      });
-    }
-    this._removeNotification("download-complete");
-    this.showNotification("download-complete", message, buttons,
-      this._notificationBox.PRIORITY_WARNING_MEDIUM);
-  },
-
-  _showDownloadCompleteToast: function () {
-    let name = "DownloadComplete";
-    let msg = "";
-    let title = "";
-    let observer = null;
-    if (this._downloadCount > 1) {
-      title = PluralForm.get(this._downloadCount,
-                             Strings.browser.GetStringFromName("alertMultipleDownloadsComplete"))
-                             .replace("#1", this._downloadCount)
-      msg = PluralForm.get(2, Strings.browser.GetStringFromName("downloadShowInFiles"));
-
-      observer = {
-        observe: function (aSubject, aTopic, aData) {
-          switch (aTopic) {
-            case "alertclickcallback":
-              let fileURI = MetroDownloadsView._lastDownload.target;
-              let file = MetroDownloadsView._getLocalFile(fileURI);
-              file.reveal();
-              MetroDownloadsView._resetCompletedDownloads();
-              break;
-          }
-        }
-      }
-    } else {
-      title = Strings.browser.formatStringFromName("alertDownloadsDone",
-        [this._lastDownload.displayName], 1);
-      msg = Strings.browser.GetStringFromName("downloadOpenNow");
-      observer = {
-        observe: function (aSubject, aTopic, aData) {
-          switch (aTopic) {
-            case "alertclickcallback":
-              MetroDownloadsView.openDownload(MetroDownloadsView._lastDownload);
-              MetroDownloadsView._resetCompletedDownloads();
-              break;
-          }
-        }
-      }
-    }
-    this.showAlert(name, msg, title, observer);
-  },
-
-  _resetCompletedDownloads: function () {
-    this._progressNotificationInfo.clear();
-    this._downloadCount = 0;
-    this._lastDownload = null;
-    this._downloadProgressIndicator.reset();
-    this._removeNotification("download-complete");
-  },
-
-  _updateCircularProgressMeter: function dv_updateCircularProgressMeter() {
-    if (!this._progressNotificationInfo) {
-      return;
-    }
-
-    let totPercent = 0;
-    for (let [guid, info] of this._progressNotificationInfo) {
-      // info.download => nsIDownload
-      totPercent += info.download.percentComplete;
-    }
-
-    let percentComplete = totPercent / this._progressNotificationInfo.size;
-    this._downloadProgressIndicator.updateProgress(percentComplete);
-  },
-
-  _computeDownloadProgressString: function dv_computeDownloadProgressString() {
-    let totTransferred = 0, totSize = 0, totSecondsLeft = 0;
-    let guid, info;
-    for ([guid, info] of this._progressNotificationInfo) {
-      let size = info.download.size;
-      let amountTransferred = info.download.amountTransferred;
-      let speed = info.download.speed;
-
-      totTransferred += amountTransferred;
-      totSize += size;
-      totSecondsLeft += ((size - amountTransferred) / speed);
-    }
-
-    // Compute progress in bytes.
-    let amountTransferred = Util.getDownloadSize(totTransferred);
-    let size = Util.getDownloadSize(totSize);
-    let progress = amountTransferred + "/" + size;
-
-    // Compute progress in time.;
-    let [timeLeft, newLast] = DownloadUtils.getTimeLeft(totSecondsLeft, this._lastSec);
-    this._lastSec = newLast;
-
-    if (this._downloadCount == 1) {
-      return Strings.browser.GetStringFromName("alertDownloadsStart2")
-        .replace("#1", info.download.displayName)
-        .replace("#2", progress)
-        .replace("#3", timeLeft)
-    }
-
-    let numDownloads = this._downloadCount;
-    return PluralForm.get(numDownloads,
-                          Strings.browser.GetStringFromName("alertDownloadMultiple"))
-                          .replace("#1", numDownloads)
-                          .replace("#2", progress)
-                          .replace("#3", timeLeft);
-  },
-
-  _saveDownloadData: function dv_saveDownloadData(aDownload) {
-    if (!this._progressNotificationInfo.get(aDownload.guid)) {
-      this._progressNotificationInfo.set(aDownload.guid, {});
-    }
-    let infoObj = this._progressNotificationInfo.get(aDownload.guid);
-    infoObj.download = aDownload;
-    this._progressNotificationInfo.set(aDownload.guid, infoObj);
-  },
-
-  onDownloadButton: function dv_onDownloadButton() {
-    let progressNotification = this._getNotificationWithValue("download-progress");
-    let wasProgressVisible = (progressNotification &&
-                              progressNotification.parentNode == this._notificationBox);
-    let completeNotification = this._getNotificationWithValue("download-complete");
-    let wasCompleteVisible = (completeNotification &&
-                              completeNotification.parentNode == this._notificationBox);
-
-    this._removeNotification("download-complete");
-    this._removeNotification("download-progress");
-
-    if (this._downloadsInProgress && !wasProgressVisible) {
-      this.updateInfobar();
-    } else if (this._downloadCount && !wasCompleteVisible) {
-      this._showDownloadCompleteNotification();
-    }
-  },
-
-  _removeNotification: function (aValue) {
-    let notification = this._getNotificationWithValue(aValue);
-    return notification &&
-           notification.parentNode.removeNotification(notification);
-  },
-
-  updateInfobar: function dv_updateInfobar() {
-    let message = this._computeDownloadProgressString();
-    this._updateCircularProgressMeter();
-
-    let notn = this._progressNotification;
-    if (!notn) {
-      let cancelButtonText =
-              Strings.browser.GetStringFromName("downloadCancel");
-
-      let buttons = [
-        {
-          isDefault: false,
-          label: cancelButtonText,
-          accessKey: "",
-          callback: function() {
-            MetroDownloadsView.cancelDownloads();
-            MetroDownloadsView._downloadProgressIndicator.reset();
-          }
-        }
-      ];
-
-      notn = this.showNotification("download-progress", message, buttons,
-             this._notificationBox.PRIORITY_WARNING_LOW);
-
-      ContextUI.displayNavbar();
-    } else {
-      notn.label = message;
-    }
-  },
-
-  updateDownload: function dv_updateDownload(aDownload) {
-    this._saveDownloadData(aDownload);
-    let notn = this._progressNotification;
-    if (notn) {
-      notn.label =
-        this._computeDownloadProgressString(aDownload);
-    }
-    this._updateCircularProgressMeter();
-  },
-
-  watchDownload: function dv_watchDownload(aDownload) {
-    this._saveDownloadData(aDownload);
-    this._downloadCount++;
-    this._downloadsInProgress++;
-    if (!this._progressNotificationInfo.get(aDownload.guid)) {
-      this._progressNotificationInfo.set(aDownload.guid, {});
-    }
-    if (!this._progressAlert) {
-      this._progressAlert = new AlertDownloadProgressListener();
-      this.manager.addListener(this._progressAlert);
-    }
-  },
-
-  observe: function (aSubject, aTopic, aData) {
-    let message = "";
-    let msgTitle = "";
-
-    switch (aTopic) {
-      case "dl-run":
-        let file = aSubject.QueryInterface(Ci.nsIFile);
-        this._runDownloadBooleanMap.set(file.path, (aData == 'true'));
-        break;
-      case "dl-start":
-        let download = aSubject.QueryInterface(Ci.nsIDownload);
-        this.watchDownload(download);
-        this.updateInfobar();
-        break;
-      case "dl-done":
-        this._downloadsInProgress--;
-        download = aSubject.QueryInterface(Ci.nsIDownload);
-        this._lastDownload = download;
-        let runAfterDownload = this._runDownloadBooleanMap.get(download.targetFile.path);
-        if (runAfterDownload) {
-          this.openDownload(download);
-        }
-
-        this._runDownloadBooleanMap.delete(download.targetFile.path);
-        if (this._downloadsInProgress == 0) {
-          if (this._downloadCount > 1 || !runAfterDownload) {
-            this._showDownloadCompleteToast();
-            this._showDownloadCompleteNotification();
-          }
-          let notn = this._progressNotification;
-          if (notn)
-            this._notificationBox.removeNotification(notn);
-
-          ContextUI.displayNavbar();
-        }
-
-        this._downloadProgressIndicator.notify();
-        break;
-      case "dl-failed":
-        download = aSubject.QueryInterface(Ci.nsIDownload);
-        this._showDownloadFailedNotification(download);
-        break;
-    }
-  },
-
-  handleEvent: function(aEvent) {
-    switch (aEvent.type) {
-      case 'TabClose': {
-        let browser = aEvent.originalTarget.linkedBrowser;
-        let tab = Browser.getTabForBrowser(browser);
-        let notificationBox = Browser.getNotificationBox(browser);
-
-        // move any download-related notification before the tab and its notificationBox goes away
-        // The 3 possible values should be mutually exclusive
-        for(let name of ["download-progress",
-                        "save-download",
-                        "download-complete"]) {
-          let notn = notificationBox.getNotificationWithValue(name);
-          if (!notn) {
-            continue;
-          }
-
-          let nextTab = Browser.getNextTab(tab);
-          let nextBox = nextTab && Browser.getNotificationBox(nextTab.browser);
-          if (nextBox) {
-            // move notification to the next tab
-            nextBox.adoptNotification(notn);
-          } else {
-            // Alas, no browser to move the notifications to.
-          }
-        }
-        break;
-      }
-    }
-  },
-
-  QueryInterface: function (aIID) {
-    if (!aIID.equals(Ci.nsIObserver) &&
-        !aIID.equals(Ci.nsISupportsWeakReference) &&
-        !aIID.equals(Ci.nsISupports))
-      throw Components.results.NS_ERROR_NO_INTERFACE;
-    return this;
-  }
-};
-
-
-/**
- * Notifies Downloads object about updates in the state of various downloads.
- *
- * @param aDownloads An instance of Downloads.
- */
-function DownloadProgressListener(aDownloads) {
-  this._downloads = aDownloads;
-}
-
-DownloadProgressListener.prototype = {
-  _downloads: null,
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIDownloadProgressListener
-  onDownloadStateChange: function dPL_onDownloadStateChange(aState, aDownload) {
-    // TODO: Use DownloadProgressListener instead of observers in the Downloads object.
-    this._downloads.updateDownload(aDownload);
-  },
-
-  onProgressChange: function dPL_onProgressChange(aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress, aDownload) {
-    // TODO <jwilde>: Add more detailed progress information.
-    this._downloads.updateDownload(aDownload);
-  },
-
-  onStateChange: function(aWebProgress, aRequest, aState, aStatus, aDownload) { },
-  onSecurityChange: function(aWebProgress, aRequest, aState, aDownload) { },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDownloadProgressListener])
-};
-
-
-/**
- * Tracks download progress so that additional information can be displayed
- * about its download in alert popups.
- */
-function AlertDownloadProgressListener() { }
-
-AlertDownloadProgressListener.prototype = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIDownloadProgressListener
-  onProgressChange: function(aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress, aDownload) {
-    let strings = Strings.browser;
-    let availableSpace = -1;
-
-    try {
-      // diskSpaceAvailable is not implemented on all systems
-      let availableSpace = aDownload.targetFile.diskSpaceAvailable;
-    } catch(ex) { }
-
-    let contentLength = aDownload.size;
-    if (availableSpace > 0 && contentLength > 0 && contentLength > availableSpace) {
-      MetroDownloadsView.showAlert(aDownload.target.spec.replace("file:", "download:"),
-                                   strings.GetStringFromName("alertDownloadsNoSpace"),
-                                   strings.GetStringFromName("alertDownloadsSize"));
-      MetroDownloadsView.cancelDownload(aDownload);
-    }
-  },
-
-  onDownloadStateChange: function(aState, aDownload) { },
-  onStateChange: function(aWebProgress, aRequest, aState, aStatus, aDownload) { },
-  onSecurityChange: function(aWebProgress, aRequest, aState, aDownload) { },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDownloadProgressListener])
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/exceptions.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/exceptions.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/exceptions.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/exceptions.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +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/. */
-
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
-
-Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-
-/**
-  A class to add exceptions to override SSL certificate problems. The functionality
-  itself is borrowed from exceptionDialog.js.
-*/
-function SSLExceptions() {
-  this._overrideService = Cc["@mozilla.org/security/certoverride;1"]
-                          .getService(Ci.nsICertOverrideService);
-}
-
-
-SSLExceptions.prototype = {
-  _overrideService: null,
-  _sslStatus: null,
-
-  getInterface: function SSLE_getInterface(aIID) {
-    return this.QueryInterface(aIID);
-  },
-  QueryInterface: function SSLE_QueryInterface(aIID) {
-    if (aIID.equals(Ci.nsIBadCertListener2) ||
-        aIID.equals(Ci.nsISupports))
-      return this;
-
-    throw Components.results.NS_ERROR_NO_INTERFACE;
-  },
-
-  /**
-    To collect the SSL status we intercept the certificate error here
-    and store the status for later use.
-  */
-  notifyCertProblem: function SSLE_notifyCertProblem(socketInfo, sslStatus, targetHost) {
-    this._sslStatus = sslStatus.QueryInterface(Ci.nsISSLStatus);
-    return true; // suppress error UI
-  },
-
-  /**
-    Attempt to download the certificate for the location specified to get the SSLState
-    for the certificate and the errors.
-   */
-  _checkCert: function SSLE_checkCert(aURI) {
-    this._sslStatus = null;
-  
-    var req = new XMLHttpRequest();
-    try {
-      if(aURI) {
-        req.open("GET", aURI.prePath, false);
-        req.channel.notificationCallbacks = this;
-        req.send(null);
-      }
-    } catch (e) {
-      // We *expect* exceptions if there are problems with the certificate
-      // presented by the site.  Log it, just in case, but we can proceed here,
-      // with appropriate sanity checks
-      Components.utils.reportError("Attempted to connect to a site with a bad certificate in the add exception dialog. " +
-                                   "This results in a (mostly harmless) exception being thrown. " +
-                                   "Logged for information purposes only: " + e);
-    }
-
-    return this._sslStatus;
-  },
-
-  /**
-    Internal method to create an override.
-  */
-  _addOverride: function SSLE_addOverride(aURI, aWindow, temporary) {
-    var SSLStatus = this._checkCert(aURI);
-    var certificate = SSLStatus.serverCert;
-
-    var flags = 0;
-
-    // in private browsing do not store exceptions permanently ever
-    if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) {
-      temporary = true;
-    }
-
-    if(SSLStatus.isUntrusted)
-      flags |= this._overrideService.ERROR_UNTRUSTED;
-    if(SSLStatus.isDomainMismatch)
-      flags |= this._overrideService.ERROR_MISMATCH;
-    if(SSLStatus.isNotValidAtThisTime)
-      flags |= this._overrideService.ERROR_TIME;
-
-    this._overrideService.rememberValidityOverride(
-      aURI.asciiHost,
-      aURI.port,
-      certificate,
-      flags,
-      temporary);
-  },
-
-  /**
-    Creates a permanent exception to override all overridable errors for
-    the given URL.
-  */
-  addPermanentException: function SSLE_addPermanentException(aURI, aWindow) {
-    this._addOverride(aURI, aWindow, false);
-  },
-
-  /**
-    Creates a temporary exception to override all overridable errors for
-    the given URL.
-  */
-  addTemporaryException: function SSLE_addTemporaryException(aURI, aWindow) {
-    this._addOverride(aURI, aWindow, true);
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,615 +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/Services.jsm");
-let gAppUpdater;
-
-let AboutFlyoutPanel = {
-  init: function() {
-    if (this._isInitialized) {
-      Cu.reportError("Attempted to initialize AboutFlyoutPanel more than once");
-    }
-
-    this._isInitialized = true;
-
-    let self = this;
-    this._elements = {};
-    [
-      ['versionLabel', 'about-version-label'],
-      ['AboutFlyoutPanel',  'about-flyoutpanel'],
-    ].forEach(function(aElement) {
-      let [name, id] = aElement;
-      XPCOMUtils.defineLazyGetter(self._elements, name, function() {
-        return document.getElementById(id);
-      });
-    });
-
-    this._topmostElement = this._elements.AboutFlyoutPanel;
-
-    // Include the build ID if this is an "a#" (nightly or aurora) build
-    let version = Services.appinfo.version;
-    if (/a\d+$/.test(version)) {
-      let buildID = Services.appinfo.appBuildID;
-      let buildDate = buildID.slice(0,4) + "-" + buildID.slice(4,6) +
-                      "-" + buildID.slice(6,8);
-      this._elements.versionLabel.textContent +=" (" + buildDate + ")";
-    }
-
-    window.addEventListener('MozFlyoutPanelShowing', this, false);
-    window.addEventListener('MozFlyoutPanelHiding', this, false);
-
-#if MOZ_UPDATE_CHANNEL != release
-    let defaults = Services.prefs.getDefaultBranch("");
-    let channelLabel = document.getElementById("currentChannel");
-    channelLabel.value = defaults.getCharPref("app.update.channel");
-#endif
-  },
-
-  onPolicyClick: function(aEvent) {
-    if (aEvent.button != 0) {
-      return;
-    }
-    let url = Services.urlFormatter.formatURLPref("app.privacyURL");
-    BrowserUI.addAndShowTab(url, Browser.selectedTab);
-  },
-
-  handleEvent: function(aEvent) {
-    switch (aEvent.type) {
-      case 'MozFlyoutPanelShowing':
-#ifdef MOZ_UPDATER
-        this.appUpdater = new appUpdater();
-        gAppUpdater = this.appUpdater;
-#endif
-        break;
-      case 'MozFlyoutPanelHiding':
-#ifdef MOZ_UPDATER
-        onUnload();
-#endif
-        break;
-    }
-  }
-};
-
-#ifdef MOZ_UPDATER
-function onUnload(aEvent) {
-  if (!gAppUpdater) {
-    return;
-  }
-
-  if (gAppUpdater.isChecking)
-    gAppUpdater.checker.stopChecking(Components.interfaces.nsIUpdateChecker.CURRENT_CHECK);
-  // Safe to call even when there isn't a download in progress.
-  gAppUpdater.removeDownloadListener();
-  gAppUpdater = null;
-  AboutFlyoutPanel.appUpdater = null;
-}
-
-function appUpdater()
-{
-  this.updateDeck = document.getElementById("updateDeck");
-
-  XPCOMUtils.defineLazyServiceGetter(this, "aus",
-                                     "@mozilla.org/updates/update-service;1",
-                                     "nsIApplicationUpdateService");
-  XPCOMUtils.defineLazyServiceGetter(this, "checker",
-                                     "@mozilla.org/updates/update-checker;1",
-                                     "nsIUpdateChecker");
-  XPCOMUtils.defineLazyServiceGetter(this, "um",
-                                     "@mozilla.org/updates/update-manager;1",
-                                     "nsIUpdateManager");
-
-  this.bundle = Services.strings.
-                createBundle("chrome://browser/locale/browser.properties");
-
-  this.updateBtn = document.getElementById("updateButton");
-
-  // The button label value must be set so its height is correct.
-  this.setupUpdateButton("update.checkInsideButton");
-
-  let manualURL = Services.urlFormatter.formatURLPref("app.update.url.manual");
-  let manualLink = document.getElementById("manualLink");
-  manualLink.value = manualURL;
-  manualLink.href = manualURL;
-  document.getElementById("failedLink").href = manualURL;
-
-  if (this.updateDisabledAndLocked) {
-    this.selectPanel("adminDisabled");
-    return;
-  }
-
-  if (this.isPending || this.isApplied) {
-    this.setupUpdateButton("update.restart." +
-                           (this.isMajor ? "upgradeButton" : "updateButton"));
-    return;
-  }
-
-  if (this.aus.isOtherInstanceHandlingUpdates) {
-    this.selectPanel("otherInstanceHandlingUpdates");
-    return;
-  }
-
-  if (this.isDownloading) {
-    this.startDownload();
-    return;
-  }
-
-  if (this.updateEnabled && this.updateAuto) {
-    this.selectPanel("checkingForUpdates");
-    this.isChecking = true;
-    this.checker.checkForUpdates(this.updateCheckListener, true);
-    return;
-  }
-}
-
-appUpdater.prototype =
-{
-  // true when there is an update check in progress.
-  isChecking: false,
-
-  // true when there is an update already staged / ready to be applied.
-  get isPending() {
-    if (this.update) {
-      return this.update.state == "pending" ||
-             this.update.state == "pending-service";
-    }
-    return this.um.activeUpdate &&
-           (this.um.activeUpdate.state == "pending" ||
-            this.um.activeUpdate.state == "pending-service");
-  },
-
-  // true when there is an update already installed in the background.
-  get isApplied() {
-    if (this.update)
-      return this.update.state == "applied" ||
-             this.update.state == "applied-service";
-    return this.um.activeUpdate &&
-           (this.um.activeUpdate.state == "applied" ||
-            this.um.activeUpdate.state == "applied-service");
-  },
-
-  // true when there is an update download in progress.
-  get isDownloading() {
-    if (this.update)
-      return this.update.state == "downloading";
-    return this.um.activeUpdate &&
-           this.um.activeUpdate.state == "downloading";
-  },
-
-  // true when the update type is major.
-  get isMajor() {
-    if (this.update)
-      return this.update.type == "major";
-    return this.um.activeUpdate.type == "major";
-  },
-
-  // true when updating is disabled by an administrator.
-  get updateDisabledAndLocked() {
-    return !this.updateEnabled &&
-           Services.prefs.prefIsLocked("app.update.enabled");
-  },
-
-  // true when updating is enabled.
-  get updateEnabled() {
-    let updatesEnabled = true;
-    try {
-      updatesEnabled = Services.prefs.getBoolPref("app.update.metro.enabled");
-    }
-    catch (e) { }
-    if (!updatesEnabled) {
-      return false;
-    }
-
-    try {
-      updatesEnabled = Services.prefs.getBoolPref("app.update.enabled")
-    }
-    catch (e) { }
-
-    return updatesEnabled;
-  },
-
-  // true when updating in background is enabled.
-  get backgroundUpdateEnabled() {
-    return this.updateEnabled &&
-           gAppUpdater.aus.canStageUpdates;
-  },
-
-  // true when updating is automatic.
-  get updateAuto() {
-    try {
-      return Services.prefs.getBoolPref("app.update.auto");
-    }
-    catch (e) { }
-    return true; // Firefox default is true
-  },
-
-  /**
-   * Sets the deck's selected panel.
-   *
-   * @param  aChildID
-   *         The id of the deck's child to select.
-   */
-  selectPanel: function(aChildID) {
-    this.updateDeck.selectedPanel = document.getElementById(aChildID);
-    this.updateBtn.disabled = (aChildID != "updateButtonBox");
-  },
-
-  /**
-   * Sets the update button's label and accesskey.
-   *
-   * @param  aKeyPrefix
-   *         The prefix for the properties file entry to use for setting the
-   *         label and accesskey.
-   */
-  setupUpdateButton: function(aKeyPrefix) {
-    this.updateBtn.label = this.bundle.GetStringFromName(aKeyPrefix + ".label");
-    this.updateBtn.accessKey = this.bundle.GetStringFromName(aKeyPrefix + ".accesskey");
-    if (!document.commandDispatcher.focusedElement ||
-        document.commandDispatcher.focusedElement == this.updateBtn)
-      this.updateBtn.focus();
-  },
-
-  /**
-   * Handles oncommand for the update button.
-   */
-  buttonOnCommand: function() {
-    if (this.isPending || this.isApplied) {
-      // Notify all windows that an application quit has been requested.
-      let cancelQuit = Components.classes["@mozilla.org/supports-PRBool;1"].
-                       createInstance(Components.interfaces.nsISupportsPRBool);
-      Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
-
-      // Something aborted the quit process.
-      if (cancelQuit.data)
-        return;
-
-      let appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"].
-                       getService(Components.interfaces.nsIAppStartup);
-
-      // If already in safe mode restart in safe mode (bug 327119)
-      if (Services.appinfo.inSafeMode) {
-        appStartup.restartInSafeMode(Components.interfaces.nsIAppStartup.eAttemptQuit);
-        return;
-      }
-
-      Services.metro.updatePending = true;
-      appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit |
-                      Components.interfaces.nsIAppStartup.eRestartTouchEnvironment);
-      return;
-    }
-
-    // XXX We can't create dialogs in metro, and we currently don't support addons, so
-    // commenting this out for now.
-    /* const URI_UPDATE_PROMPT_DIALOG = "chrome://mozapps/content/update/updates.xul";
-    // Firefox no longer displays a license for updates and the licenseURL check
-    // is just in case a distibution does.
-    if (this.update && (this.update.billboardURL || this.update.licenseURL ||
-        this.addons.length != 0)) {
-      var ary = null;
-      ary = Components.classes["@mozilla.org/supports-array;1"].
-            createInstance(Components.interfaces.nsISupportsArray);
-      ary.AppendElement(this.update);
-      var openFeatures = "chrome,centerscreen,dialog=no,resizable=no,titlebar,toolbar=no";
-      Services.ww.openWindow(null, URI_UPDATE_PROMPT_DIALOG, "", openFeatures, ary);
-      window.close();
-      return;
-    }*/
-
-    this.selectPanel("checkingForUpdates");
-    this.isChecking = true;
-    this.checker.checkForUpdates(this.updateCheckListener, true);
-  },
-
-  /**
-   * Implements nsIUpdateCheckListener. The methods implemented by
-   * nsIUpdateCheckListener are in a different scope from nsIIncrementalDownload
-   * to make it clear which are used by each interface.
-   */
-  updateCheckListener: {
-    /**
-     * See nsIUpdateService.idl
-     */
-    onCheckComplete: function(aRequest, aUpdates, aUpdateCount) {
-      gAppUpdater.isChecking = false;
-      gAppUpdater.update = gAppUpdater.aus.
-                           selectUpdate(aUpdates, aUpdates.length);
-      if (!gAppUpdater.update) {
-        gAppUpdater.selectPanel("noUpdatesFound");
-        return;
-      }
-
-      if (!gAppUpdater.aus.canApplyUpdates) {
-        gAppUpdater.selectPanel("manualUpdate");
-        return;
-      }
-
-      // Firefox no longer displays a license for updates and the licenseURL
-      // check is just in case a distibution does.
-      if (gAppUpdater.update.billboardURL || gAppUpdater.update.licenseURL) {
-        gAppUpdater.selectPanel("updateButtonBox");
-        gAppUpdater.setupUpdateButton("update.openUpdateUI." +
-                                      (this.isMajor ? "upgradeButton"
-                                                    : "applyButton"));
-        return;
-      }
-
-      if (!gAppUpdater.update.appVersion ||
-          Services.vc.compare(gAppUpdater.update.appVersion,
-                              Services.appinfo.version) == 0) {
-        gAppUpdater.startDownload();
-        return;
-      }
-
-      gAppUpdater.checkAddonCompatibility();
-    },
-
-    /**
-     * See nsIUpdateService.idl
-     */
-    onError: function(aRequest, aUpdate) {
-      // Errors in the update check are treated as no updates found. If the
-      // update check fails repeatedly without a success the user will be
-      // notified with the normal app update user interface so this is safe.
-      gAppUpdater.isChecking = false;
-      gAppUpdater.selectPanel("noUpdatesFound");
-    },
-
-    /**
-     * See nsISupports.idl
-     */
-    QueryInterface: function(aIID) {
-      if (!aIID.equals(Components.interfaces.nsIUpdateCheckListener) &&
-          !aIID.equals(Components.interfaces.nsISupports))
-        throw Components.results.NS_ERROR_NO_INTERFACE;
-      return this;
-    }
-  },
-
-  /**
-   * Checks the compatibility of add-ons for the application update.
-   */
-  checkAddonCompatibility: function() {
-    try {
-      var hotfixID = Services.prefs.getCharPref(PREF_EM_HOTFIX_ID);
-    }
-    catch (e) { }
-
-    var self = this;
-    AddonManager.getAllAddons(function(aAddons) {
-      self.addons = [];
-      self.addonsCheckedCount = 0;
-      aAddons.forEach(function(aAddon) {
-        // Protect against code that overrides the add-ons manager and doesn't
-        // implement the isCompatibleWith or the findUpdates method.
-        if (!("isCompatibleWith" in aAddon) || !("findUpdates" in aAddon)) {
-          let errMsg = "Add-on doesn't implement either the isCompatibleWith " +
-                       "or the findUpdates method!";
-          if (aAddon.id)
-            errMsg += " Add-on ID: " + aAddon.id;
-          Components.utils.reportError(errMsg);
-          return;
-        }
-
-        // If an add-on isn't appDisabled and isn't userDisabled then it is
-        // either active now or the user expects it to be active after the
-        // restart. If that is the case and the add-on is not installed by the
-        // application and is not compatible with the new application version
-        // then the user should be warned that the add-on will become
-        // incompatible. If an addon's type equals plugin it is skipped since
-        // checking plugins compatibility information isn't supported and
-        // getting the scope property of a plugin breaks in some environments
-        // (see bug 566787). The hotfix add-on is also ignored as it shouldn't
-        // block the user from upgrading.
-        try {
-          if (aAddon.type != "plugin" && aAddon.id != hotfixID &&
-              !aAddon.appDisabled && !aAddon.userDisabled &&
-              aAddon.scope != AddonManager.SCOPE_APPLICATION &&
-              aAddon.isCompatible &&
-              !aAddon.isCompatibleWith(self.update.appVersion,
-                                       self.update.platformVersion))
-            self.addons.push(aAddon);
-        }
-        catch (e) {
-          Components.utils.reportError(e);
-        }
-      });
-      self.addonsTotalCount = self.addons.length;
-      if (self.addonsTotalCount == 0) {
-        self.startDownload();
-        return;
-      }
-
-      self.checkAddonsForUpdates();
-    });
-  },
-
-  /**
-   * Checks if there are updates for add-ons that are incompatible with the
-   * application update.
-   */
-  checkAddonsForUpdates: function() {
-    this.addons.forEach(function(aAddon) {
-      aAddon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_DETECTED,
-                         this.update.appVersion,
-                         this.update.platformVersion);
-    }, this);
-  },
-
-  /**
-   * See XPIProvider.jsm
-   */
-  onCompatibilityUpdateAvailable: function(aAddon) {
-    for (var i = 0; i < this.addons.length; ++i) {
-      if (this.addons[i].id == aAddon.id) {
-        this.addons.splice(i, 1);
-        break;
-      }
-    }
-  },
-
-  /**
-   * See XPIProvider.jsm
-   */
-  onUpdateAvailable: function(aAddon, aInstall) {
-    if (!Services.blocklist.isAddonBlocklisted(aAddon,
-                                               this.update.appVersion,
-                                               this.update.platformVersion)) {
-      // Compatibility or new version updates mean the same thing here.
-      this.onCompatibilityUpdateAvailable(aAddon);
-    }
-  },
-
-  /**
-   * See XPIProvider.jsm
-   */
-  onUpdateFinished: function(aAddon) {
-    ++this.addonsCheckedCount;
-
-    if (this.addonsCheckedCount < this.addonsTotalCount)
-      return;
-
-    if (this.addons.length == 0) {
-      // Compatibility updates or new version updates were found for all add-ons
-      this.startDownload();
-      return;
-    }
-
-    this.selectPanel("updateButtonBox");
-    this.setupUpdateButton("update.openUpdateUI." +
-                           (this.isMajor ? "upgradeButton" : "applyButton"));
-  },
-
-  /**
-   * Starts the download of an update mar.
-   */
-  startDownload: function() {
-    if (!this.update)
-      this.update = this.um.activeUpdate;
-    this.update.QueryInterface(Components.interfaces.nsIWritablePropertyBag);
-    this.update.setProperty("foregroundDownload", "true");
-
-    this.aus.pauseDownload();
-    let state = this.aus.downloadUpdate(this.update, false);
-    if (state == "failed") {
-      this.selectPanel("downloadFailed");
-      return;
-    }
-
-    this.setupDownloadingUI();
-  },
-
-  /**
-   * Switches to the UI responsible for tracking the download.
-   */
-  setupDownloadingUI: function() {
-    this.downloadStatus = document.getElementById("downloadStatus");
-    this.downloadStatus.textContent =
-      DownloadUtils.getTransferTotal(0, this.update.selectedPatch.size);
-    this.selectPanel("downloading");
-    this.aus.addDownloadListener(this);
-  },
-
-  removeDownloadListener: function() {
-    if (this.aus) {
-      this.aus.removeDownloadListener(this);
-    }
-  },
-
-  /**
-   * See nsIRequestObserver.idl
-   */
-  onStartRequest: function(aRequest, aContext) {
-  },
-
-  /**
-   * See nsIRequestObserver.idl
-   */
-  onStopRequest: function(aRequest, aContext, aStatusCode) {
-    switch (aStatusCode) {
-    case Components.results.NS_ERROR_UNEXPECTED:
-      if (this.update.selectedPatch.state == "download-failed" &&
-          (this.update.isCompleteUpdate || this.update.patchCount != 2)) {
-        // Verification error of complete patch, informational text is held in
-        // the update object.
-        this.removeDownloadListener();
-        this.selectPanel("downloadFailed");
-        break;
-      }
-      // Verification failed for a partial patch, complete patch is now
-      // downloading so return early and do NOT remove the download listener!
-      break;
-    case Components.results.NS_BINDING_ABORTED:
-      // Do not remove UI listener since the user may resume downloading again.
-      break;
-    case Components.results.NS_OK:
-      this.removeDownloadListener();
-      if (this.backgroundUpdateEnabled) {
-        this.selectPanel("applying");
-        let update = this.um.activeUpdate;
-        let self = this;
-        Services.obs.addObserver(function updateStaged(aSubject, aTopic, aData) {
-          // Update the UI when the background updater is finished
-          let status = aData;
-          if (status == "applied" || status == "applied-service" ||
-              status == "pending" || status == "pending-service") {
-            // If the update is successfully applied, or if the updater has
-            // fallen back to non-staged updates, show the Restart to Update
-            // button.
-            self.selectPanel("updateButtonBox");
-            self.setupUpdateButton("update.restart." +
-                                   (self.isMajor ? "upgradeButton" : "updateButton"));
-          } else if (status == "failed") {
-            // Background update has failed, let's show the UI responsible for
-            // prompting the user to update manually.
-            self.selectPanel("downloadFailed");
-          } else if (status == "downloading") {
-            // We've fallen back to downloading the full update because the
-            // partial update failed to get staged in the background.
-            // Therefore we need to keep our observer.
-            self.setupDownloadingUI();
-            return;
-          }
-          Services.obs.removeObserver(updateStaged, "update-staged");
-        }, "update-staged", false);
-      } else {
-        this.selectPanel("updateButtonBox");
-        this.setupUpdateButton("update.restart." +
-                               (this.isMajor ? "upgradeButton" : "updateButton"));
-      }
-      break;
-    default:
-      this.removeDownloadListener();
-      this.selectPanel("downloadFailed");
-      break;
-    }
-
-  },
-
-  /**
-   * See nsIProgressEventSink.idl
-   */
-  onStatus: function(aRequest, aContext, aStatus, aStatusArg) {
-  },
-
-  /**
-   * See nsIProgressEventSink.idl
-   */
-  onProgress: function(aRequest, aContext, aProgress, aProgressMax) {
-    this.downloadStatus.textContent =
-      DownloadUtils.getTransferTotal(aProgress, aProgressMax);
-  },
-
-  /**
-   * See nsISupports.idl
-   */
-  QueryInterface: function(aIID) {
-    if (!aIID.equals(Components.interfaces.nsIProgressEventSink) &&
-        !aIID.equals(Components.interfaces.nsIRequestObserver) &&
-        !aIID.equals(Components.interfaces.nsISupports))
-      throw Components.results.NS_ERROR_NO_INTERFACE;
-    return this;
-  }
-};
-#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/FlyoutPanelsUI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/FlyoutPanelsUI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/FlyoutPanelsUI.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/FlyoutPanelsUI.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +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';
-
-let FlyoutPanelsUI = {
-  _isInitialized: false,
-
-  init: function() {
-    if (this._isInitialized) {
-      Cu.reportError("Attempted to initialize FlyoutPanelsUI more than once");
-      return;
-    }
-
-    Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-    Cu.import("resource://gre/modules/Services.jsm");
-
-    this._isInitialized = true;
-    let scriptContexts = {};
-    let scripts =
-          [
-            ['AboutFlyoutPanel', 'chrome://browser/content/flyoutpanels/AboutFlyoutPanel.js'],
-            ['PrefsFlyoutPanel', 'chrome://browser/content/flyoutpanels/PrefsFlyoutPanel.js'],
-            ['SearchFlyoutPanel', 'chrome://browser/content/flyoutpanels/SearchFlyoutPanel.js'],
-#ifdef MOZ_SERVICES_SYNC
-            ['SyncFlyoutPanel', 'chrome://browser/content/flyoutpanels/SyncFlyoutPanel.js'],
-#endif
-          ];
-
-    scripts.forEach(function (aScript) {
-      let [name, script] = aScript;
-      XPCOMUtils.defineLazyGetter(FlyoutPanelsUI, name, function() {
-        let sandbox = {};
-        Services.scriptloader.loadSubScript(script, sandbox);
-        sandbox[name].init();
-        return sandbox[name];
-      });
-    });
-
-    Services.obs.addObserver(this, "metro_viewstate_changed", false);
-    window.addEventListener("TabOpen", this, false);
-  },
-
-  uninit: function () {
-    Services.obs.removeObserver(this, "metro_viewstate_changed");
-    window.removeEventListener("TabOpen", this, false);
-  },
-
-  show: function(aToShow) {
-    if (!this[aToShow]) {
-      throw("FlyoutPanelsUI asked to show '" + aToShow + "' which does not exist");
-    }
-
-    if (this._currentFlyout) {
-      if (this._currentFlyout == this[aToShow]) {
-        return;
-      } else {
-        this.hide();
-      }
-    }
-
-    this._currentFlyout = this[aToShow];
-    if (this._currentFlyout._show) {
-      this._currentFlyout._show();
-    } else {
-      this._currentFlyout._topmostElement.show();
-    }
-    DialogUI.pushPopup(this, this._currentFlyout._topmostElement);
-  },
-
-  onBackButton: function() {
-    if (this._currentFlyout._onBackButton) {
-      this._currentFlyout._onBackButton();
-    } else {
-      this.hide();
-      Services.metro.showSettingsFlyout();
-    }
-  },
-
-  get isVisible() {
-    return this._currentFlyout ? true : false;
-  },
-
-  handleEvent: function (aEvent) {
-    switch (aEvent.type) {
-      case "TabOpen":
-        this.hide()
-        break;
-    }
-  },
-
-  observe: function (aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "metro_viewstate_changed":
-        if (aData == "snapped") {
-          this.hide();
-        }
-        break;
-    }
-  },
-
-  dispatchEvent: function(aEvent) {
-    if (this._currentFlyout) {
-      this._currentFlyout._topmostElement.dispatchEvent(aEvent);
-    }
-  },
-
-  hide: function() {
-    if (this._currentFlyout) {
-      if (this._currentFlyout._hide) {
-        this._currentFlyout._hide();
-      } else {
-        this._currentFlyout._topmostElement.hide();
-      }
-      DialogUI.popPopup(this);
-      delete this._currentFlyout;
-    }
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/PrefsFlyoutPanel.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/PrefsFlyoutPanel.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/PrefsFlyoutPanel.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/PrefsFlyoutPanel.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +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';
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-let PrefsFlyoutPanel = {
-  _isInitialized: false,
-  _hasShown: false,
-  init: function pv_init() {
-    if (this._isInitialized) {
-      Cu.reportError("Attempting to re-initialize PreferencesPanelView");
-      return;
-    }
-
-    Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-    this._isInitialized = true;
-    let self = this;
-
-    this._elements = {};
-    [
-      ['PrefsFlyoutPanel',  'prefs-flyoutpanel'],
-    ].forEach(function(aElement) {
-      let [name, id] = aElement;
-      XPCOMUtils.defineLazyGetter(self._elements, name, function() {
-        return document.getElementById(id);
-      });
-    });
-
-    this.observe(null, null, "privacy.donottrackheader.value");
-    this._updateSubmitURLs();
-    this._topmostElement = this._elements.PrefsFlyoutPanel;
-  },
-
-  _show: function() {
-    if (!this._hasShown) {
-      SanitizeUI.init();
-      this._hasShown = true;
-
-      Services.prefs.addObserver("privacy.donottrackheader.value",
-                                 this,
-                                 false);
-      Services.prefs.addObserver("privacy.donottrackheader.enabled",
-                                 this,
-                                 false);
-      Services.prefs.addObserver("app.crashreporter.autosubmit",
-                                 this,
-                                 false);
-      Services.prefs.addObserver("app.crashreporter.submitURLs",
-                                 this,
-                                 false);
-    }
-
-    this._topmostElement.show();
-  },
-
-  observe: function(subject, topic, data) {
-    let value = -1;
-    try {
-      value = Services.prefs.getIntPref("privacy.donottrackheader.value");
-    } catch(e) {
-    }
-
-    let isEnabled = Services.prefs.getBoolPref("privacy.donottrackheader.enabled");
-
-    switch (data) {
-      case "privacy.donottrackheader.value":
-        // If the user has selected to explicitly tell sites that tracking
-        // is OK, or if the user has selected to explicitly tell sites that
-        // tracking is NOT OK, we must enable sending the dnt header
-        if (((1 == value) || (0 == value)) && !isEnabled) {
-          Services.prefs.setBoolPref('privacy.donottrackheader.enabled', true);
-        }
-
-        // If the user has made no selection about whether tracking
-        // is OK or not, we must diable the dnt header
-        if (((1 != value) && (0 != value)) && isEnabled) {
-          Services.prefs.setBoolPref('privacy.donottrackheader.enabled', false);
-        }
-        break;
-
-      case "privacy.donottrackheader.enabled":
-        // If someone or something modifies this pref, we should update the
-        // other pref as well so our UI doesn't give false information
-        if (((1 == value) || (0 == value)) && !isEnabled) {
-          Services.prefs.setIntPref('privacy.donottrackheader.value', -1);
-        }
-        break;
-
-      case "app.crashreporter.autosubmit":
-        let autosubmit = Services.prefs.getBoolPref("app.crashreporter.autosubmit");
-        let urlCheckbox = document.getElementById("prefs-reporting-submitURLs");
-        if (!autosubmit) {
-          // disables the submitURLs ui if no crashreports will be submited, but doesn't change the pref 
-          urlCheckbox.setAttribute("disabled", true);
-        }
-        else {
-          urlCheckbox.setAttribute("disabled", false);
-        }
-        break;
-
-      case "app.crashreporter.submitURLs":
-        this._updateSubmitURLs();
-        break;
-    }
-  },
-
-  _updateSubmitURLs: function() {
-    let submitURLs = Services.prefs.getBoolPref("app.crashreporter.submitURLs");
-    let urlCheckbox = document.getElementById("prefs-reporting-submitURLs");
-    if (submitURLs) {
-      urlCheckbox.checked = true; 
-    }
-    else {
-      urlCheckbox.checked = false;
-    }
-  },
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/SearchFlyoutPanel.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/SearchFlyoutPanel.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/SearchFlyoutPanel.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/SearchFlyoutPanel.js	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-
-"use strict";
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-let SearchFlyoutPanel = {
-  _isInitialized: false,
-  _hasShown: false,
-  init: function pv_init() {
-    if (this._isInitialized) {
-      Cu.reportError("Attempting to re-initialize PreferencesPanelView");
-      return;
-    }
-    this._topmostElement = document.getElementById("search-flyoutpanel");
-    this._isInitialized = true;
-  },
-
-  checked: function checked(aId) {
-    aId = aId.replace("search-", "");
-    Services.search.defaultEngine = this._engines[parseInt(aId)];
-    this.updateSearchEngines();
-  },
-
-  updateSearchEngines: function () {
-    // Clear the list
-    let setting = document.getElementById("search-options");
-    while(setting.hasChildNodes()) {
-      setting.removeChild(setting.firstChild);
-    }
-
-    // Build up the list and check the default
-    this._engines = Services.search.getVisibleEngines();
-    let defaultEngine = Services.search.defaultEngine;
-
-    this._engines.forEach(function (aEngine, aIndex) {
-      let radio = document.createElementNS(XUL_NS, "radio");
-      radio.setAttribute("id", "search-" + aIndex);
-      radio.setAttribute("label", aEngine.name);
-      radio.setAttribute("oncommand", "FlyoutPanelsUI.SearchFlyoutPanel.checked(this.id)");
-      if (defaultEngine == aEngine) {
-        radio.setAttribute("selected", true);
-      }
-      setting.appendChild(radio);
-    }.bind(this));
-  },
-
-  _show: function() {
-    if (!this._hasShown) {
-      this._hasShown = true;
-      this.updateSearchEngines();
-    }
-    this._topmostElement.show();
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/SettingsCharm.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/SettingsCharm.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/SettingsCharm.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/SettingsCharm.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-
-/**
- * Manage the contents of the Windows 8 "Settings" charm.
- */
-var SettingsCharm = {
-  _entries: new Map(),
-  _nextId: 0,
-
-  /**
-   * Add a new item to the "Settings" menu in the Windows 8 charms.
-   * @param aEntry Object with a "label" property (string that will appear in the UI)
-   *    and an "onselected" property (function to be called when the user chooses this entry)
-   */
-  addEntry: function addEntry(aEntry) {
-    try {
-      let id = Services.metro.addSettingsPanelEntry(aEntry.label);
-      this._entries.set(id, aEntry);
-    } catch (e) {
-      // addSettingsPanelEntry does not work on non-Metro platforms
-      Cu.reportError(e);
-    }
-  },
-
-  init: function SettingsCharm_init() {
-    Services.obs.addObserver(this, "metro-settings-entry-selected", false);
-
-    // Options
-    this.addEntry({
-        label: Strings.browser.GetStringFromName("optionsCharm"),
-        onselected: function() FlyoutPanelsUI.show('PrefsFlyoutPanel')
-    });
-
-    // Search providers
-    this.addEntry({
-        label: Strings.browser.GetStringFromName("searchCharm"),
-        onselected: function() FlyoutPanelsUI.show('SearchFlyoutPanel')
-    });
-
-/*
- * Temporarily disabled until we can have sync prefs together with the
- * Desktop browser's sync prefs.
-    // Sync
-    this.addEntry({
-        label: Strings.brand.GetStringFromName("syncBrandShortName"),
-        onselected: function() FlyoutPanelsUI.show('SyncFlyoutPanel')
-    });
-*/
-
-    // About
-    this.addEntry({
-        label: Strings.browser.GetStringFromName("aboutCharm1"),
-        onselected: function() FlyoutPanelsUI.show('AboutFlyoutPanel')
-    });
-
-    // Feedback
-    this.addEntry({
-        label: Strings.browser.GetStringFromName("feedbackCharm"),
-        onselected: function() {
-          let url = Services.urlFormatter.formatURLPref("app.support.inputURL");
-          BrowserUI.addAndShowTab(url, Browser.selectedTab);
-        }
-    });
-
-    // Help
-    this.addEntry({
-        label: Strings.browser.GetStringFromName("helpOnlineCharm"),
-        onselected: function() {
-          let url = Services.urlFormatter.formatURLPref("app.support.baseURL") +
-            "firefox-help";
-          BrowserUI.addAndShowTab(url, Browser.selectedTab);
-        }
-    });
-  },
-
-  observe: function SettingsCharm_observe(aSubject, aTopic, aData) {
-    if (aTopic == "metro-settings-entry-selected") {
-      let entry = this._entries.get(parseInt(aData, 10));
-      if (entry)
-        entry.onselected();
-    }
-  },
-
-  uninit: function SettingsCharm_uninit() {
-    Services.obs.removeObserver(this, "metro-settings-entry-selected");
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/SyncFlyoutPanel.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/SyncFlyoutPanel.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/flyoutpanels/SyncFlyoutPanel.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/flyoutpanels/SyncFlyoutPanel.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,367 +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";
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-let SyncFlyoutPanel = {
-  init: function() {
-    if (this._isInitialized) {
-      Cu.reportError("Attempted to initialize SyncFlyoutPanel more than once");
-      return;
-    }
-
-    this._isInitialized = true;
-    this._bundle = Services.strings.createBundle("chrome://browser/locale/sync.properties");
-    Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-    let self = this;
-
-    this._elements = {};
-    [
-      ['outer',                 'sync-flyoutpanel'],
-      ['preSetup',              'sync-presetup-container'],
-      ['easySetup',             'sync-setup-container'],
-      ['manualSetup',           'sync-manualsetup-container'],
-      ['setupSuccess',          'sync-setupsuccess-container'],
-      ['setupFailure',          'sync-setupfailure-container'],
-      ['connected',             'sync-connected-container'],
-      ['pairNewDevice',         'sync-pair-container'],
-      ['pairSuccess',           'sync-pair-success-container'],
-      ['setupCode1',            'sync-setup-code1'],
-      ['setupCode2',            'sync-setup-code2'],
-      ['setupCode3',            'sync-setup-code3'],
-      ['setupThrobber',         'sync-setup-throbber'],
-      ['account',               'sync-manualsetup-account'],
-      ['password',              'sync-manualsetup-password'],
-      ['syncKey',               'sync-manualsetup-syncKey'],
-      ['manualSetupConnect',    'sync-manualsetup-connect'],
-      ['manualSetupFailure',    'sync-manualsetup-failure'],
-      ['connectedAccount',      'sync-connected-account'],
-      ['deviceName',            'sync-connected-device'],
-      ['lastSync',              'sync-connected-lastSynced'],
-      ['connectedThrobber',     'sync-connected-throbber'],
-      ['disconnectLink',        'sync-disconnect-label'],
-      ['disconnectWarning',     'sync-disconnect-warning'],
-      ['pairCode1',             'sync-pair-entry1'],
-      ['pairCode2',             'sync-pair-entry2'],
-      ['pairCode3',             'sync-pair-entry3'],
-      ['pairButton',            'sync-pair-button'],
-      ['pairFailureMessage',    'sync-pair-failure'],
-    ].forEach(function (aContainer) {
-      let [name, id] = aContainer;
-      XPCOMUtils.defineLazyGetter(self._elements, name, function() {
-        return document.getElementById(id);
-      });
-    });
-
-    this._topmostElement = this._elements.outer;
-
-    let xps = Components.classes["@mozilla.org/weave/service;1"]
-              .getService(Components.interfaces.nsISupports)
-              .wrappedJSObject;
-
-    if (xps.ready) {
-      this._onServiceReady();
-    } else {
-      Services.obs.addObserver(this._onServiceReady.bind(this),
-                               "weave:service:ready",
-                               false);
-      xps.ensureLoaded();
-    }
-  },
-
-  _hide: function() {
-    this._elements.outer.hide();
-    this.showInitialScreen();
-  },
-
-  _hideVisibleContainer: function() {
-    if (this._currentlyVisibleContainer) {
-      this._currentlyVisibleContainer.collapsed = true;
-      delete this._currentlyVisibleContainer;
-      delete this._onBackButton;
-    }
-  },
-
-  _onServiceReady: function(aEvent) {
-    if (aEvent) {
-      Services.obs.removeObserver(this._onServiceReady, "weave:service:ready");
-    }
-
-    this.showInitialScreen();
-    Services.obs.addObserver(this._onSyncStart.bind(this), "weave:service:sync:start", false);
-    Services.obs.addObserver(this._onSyncEnd.bind(this), "weave:ui:sync:finish", false);
-    Services.obs.addObserver(this._onSyncEnd.bind(this), "weave:ui:sync:error", false);
-    Weave.Service.scheduler.scheduleNextSync(10*1000);
-  },
-
-  _onSyncStart: function() {
-    this._isSyncing = true;
-    this._updateConnectedPage();
-  },
-
-  _onSyncEnd: function() {
-    this._isSyncing = false;
-    this._updateConnectedPage();
-  },
-
-  showInitialScreen: function() {
-    if (Weave.Status.login == Weave.LOGIN_SUCCEEDED) {
-      this.showConnected();
-    } else {
-      this.showPreSetup();
-    }
-  },
-
-  abortEasySetup: function() {
-    if (this._setupJpake) {
-      this._setupJpake.abort();
-    }
-    this._cleanUpEasySetup();
-  },
-
-  _cleanUpEasySetup: function() {
-    this._elements.setupCode1.value = "";
-    this._elements.setupCode2.value = "";
-    this._elements.setupCode3.value = "";
-    delete this._setupJpake;
-    this._elements.setupThrobber.collapsed = true;
-    this._elements.setupThrobber.enabled = false;
-  },
-
-  _updateConnectedPage: function() {
-    // Show the day-of-week and time (HH:MM) of last sync
-    let lastSync = Weave.Svc.Prefs.get("lastSync");
-    let syncDate = '';
-    if (lastSync != null) {
-      syncDate = new Date(lastSync).toLocaleFormat("%A %I:%M %p");
-    }
-
-    let device = Weave.Service.clientsEngine.localName;
-    let account = Weave.Service.identity.account;
-    this._elements.deviceName.textContent =
-      this._bundle.formatStringFromName("sync.flyout.connected.device",
-                                        [device], 1);
-    this._elements.connectedAccount.textContent =
-      this._bundle.formatStringFromName("sync.flyout.connected.account",
-                                        [account], 1);
-    this._elements.lastSync.textContent =
-      this._bundle.formatStringFromName("sync.flyout.connected.lastSynced",
-                                        [syncDate], 1);
-
-    if (this._currentlyVisibleContainer == this._elements.connected
-     && this._isSyncing) {
-      this._elements.connectedThrobber.collapsed = false;
-      this._elements.connectedThrobber.enabled = true;
-    } else {
-      this._elements.connectedThrobber.collapsed = true;
-      this._elements.connectedThrobber.enabled = false;
-    }
-  },
-
-  showConnected: function() {
-    // Reset state of the connected screen
-    this._elements.disconnectWarning.collapsed = true;
-    this._elements.disconnectLink.collapsed = false;
-
-    this._updateConnectedPage();
-    this._showContainer(this._elements.connected);
-  },
-
-  startEasySetup: function() {
-    let self = this;
-
-    this._showContainer(this._elements.easySetup);
-
-    // Set up our back button to do the appropriate action
-    this._onBackButton = function() {
-      self.abortEasySetup();
-      self.showInitialScreen();
-    };
-
-    this._setupJpake = new Weave.JPAKEClient({
-      displayPIN: function displayPIN(aPin) {
-        self._elements.setupCode1.value = aPin.slice(0, 4);
-        self._elements.setupCode2.value = aPin.slice(4, 8);
-        self._elements.setupCode3.value = aPin.slice(8);
-      },
-
-      onPairingStart: function onPairingStart() {
-        self._elements.setupThrobber.collapsed = false;
-        self._elements.setupThrobber.enabled = true;
-      },
-
-      onComplete: function onComplete(aCredentials) {
-        Weave.Service.identity.account = aCredentials.account;
-        Weave.Service.identity.basicPassword = aCredentials.password;
-        Weave.Service.identity.syncKey = aCredentials.synckey;
-        Weave.Service.serverURL = aCredentials.serverURL;
-        Weave.Service.persistLogin();
-        Weave.Service.scheduler.scheduleNextSync(0);
-
-        if (self._currentlyVisibleContainer == self._elements.easySetup) {
-          self.showSetupSuccess();
-        }
-        self._cleanUpEasySetup();
-      },
-
-      onAbort: function onAbort(aError) {
-        if (aError == "jpake.error.userabort") {
-          Services.obs.notifyObservers(null, "browser:sync:setup:userabort", "");
-          self._cleanUpEasySetup();
-          return;
-        } else if (aError == "jpake.error.network") {
-          Services.obs.notifyObservers(null, "browser:sync:setup:networkerror", "");
-        }
-
-        if (self._currentlyVisibleContainer == self._elements.easySetup) {
-          self.showSetupFailure();
-          self._cleanUpEasySetup();
-        }
-      }
-    });
-
-    this._setupJpake.receiveNoPIN();
-  },
-
-  _showContainer: function(aContainer) {
-    this._hideVisibleContainer();
-    this._currentlyVisibleContainer = aContainer;
-    this._currentlyVisibleContainer.collapsed = false;
-  },
-
-  showSetupSuccess: function() {
-    this._showContainer(this._elements.setupSuccess);
-    this._onBackButton = this.showInitialScreen;
-  },
-
-  showSetupFailure: function() {
-    this._showContainer(this._elements.setupFailure);
-    this._onBackButton = this.showInitialScreen;
-  },
-
-  showPreSetup: function() {
-    this._showContainer(this._elements.preSetup);
-    delete this._onBackButton;
-  },
-
-  showManualSetup: function() {
-    this._showContainer(this._elements.manualSetup);
-    this._onBackButton = this.showInitialScreen;
-
-    this._elements.account.value = Weave.Service.identity.account;
-    this._elements.password.value = Weave.Service.identity.basicPassword;
-    this._elements.syncKey.value =
-             Weave.Utils.hyphenatePassphrase(Weave.Service.identity.syncKey);
-    this.updateManualSetupConnectButtonState();
-  },
-
-  updateManualSetupConnectButtonState: function() {
-    this._elements.manualSetupConnect.disabled = !this._elements.account.value
-                                              || !this._elements.password.value
-                                              || !this._elements.syncKey.value;
-  },
-
-  manualSetupConnect: function() {
-    delete this._onBackButton;
-    this._elements.manualSetupConnect.disabled = true;
-    Weave.Service.identity.account = this._elements.account.value;
-    Weave.Service.identity.basicPassword = this._elements.password.value;
-    Weave.Service.identity.syncKey = Weave.Utils.normalizePassphrase(this._elements.syncKey.value);
-    if (Weave.Service.login()) {
-      Weave.Service.persistLogin();
-      if (this._currentlyVisibleContainer == this._elements.manualSetup) {
-        this.showSetupSuccess();
-      }
-      Weave.Service.scheduler.scheduleNextSync(0);
-    } else {
-      this._elements.manualSetupFailure.textContent = Weave.Utils.getErrorString(Weave.Status.login);
-      this._elements.manualSetupFailure.collapsed = false;
-      this.updateManualSetupConnectButtonState();
-    }
-  },
-
-  onDisconnectLink: function() {
-    this._elements.disconnectWarning.collapsed = false;
-    this._elements.disconnectLink.collapsed = true;
-  },
-
-  onDisconnectCancel: function() {
-    this._elements.disconnectWarning.collapsed = true;
-    this._elements.disconnectLink.collapsed = false;
-  },
-
-  onDisconnectButton: function() {
-    Weave.Service.startOver();
-    this.showInitialScreen();
-  },
-
-  onPairDeviceLink: function() {
-    // Reset state
-    this._elements.pairCode1.value = "";
-    this._elements.pairCode2.value = "";
-    this._elements.pairCode3.value = "";
-    this.updatePairButtonState();
-    this._elements.pairFailureMessage.collapsed = true;
-    this._elements.pairNewDevice.collapsed = false;
-
-    this._showContainer(this._elements.pairNewDevice);
-    this._onBackButton = this.showInitialScreen;
-  },
-
-  updatePairButtonState: function () {
-    this._elements.pairButton.disabled = !this._elements.pairCode1.value
-                                      || !this._elements.pairCode2.value
-                                      || !this._elements.pairCode3.value;
-  },
-
-  onCancelButton: function() {
-    this.showInitialContainer();
-  },
-
-  onTryAgainButton: function() {
-    this.startEasySetup();
-  },
-
-  onPairButton: function() {
-    this._elements.pairButton.disabled = true;
-    this._elements.pairFailureMessage.collapsed = true;
-    let self = this;
-    this._pairJpake = new Weave.JPAKEClient({
-        onPaired: function() {
-          self._pairJpake.sendAndComplete({
-              account: Weave.Service.identity.account,
-              password: Weave.Service.identity.basicPassword,
-              synckey: Weave.Service.identity.syncKey,
-              serverURL: Weave.Service.serverURL
-            });
-        },
-
-        onComplete: function() {
-          delete self._pairJpake;
-          Weave.Service.persistLogin();
-          if (self._currentlyVisibleContainer == self._elements.pairNewDevice) {
-            self._showContainer(self._elements.pairSuccess);
-          }
-          Weave.Service.scheduler.scheduleNextSync(Weave.Service.scheduler.activeInterval);
-        },
-
-        onAbort: function(error) {
-          delete self._pairJpake;
-          if (error == Weave.JPAKE_ERROR_USERABORT) {
-            return;
-          }
-
-          self._elements.pairFailureMessage.collapsed = false;
-          self.updatePairButtonState();
-        }
-    });
-
-    this._pairJpake.pairWithPIN(this._elements.pairCode1.value
-                              + this._elements.pairCode2.value
-                              + this._elements.pairCode3.value,
-                                false);
-  },
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/AlertsHelper.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/AlertsHelper.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/AlertsHelper.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/AlertsHelper.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +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/. */
-
-var AlertsHelper = {
-  _listener: null,
-
-  showAlertNotification: function ah_show(aImageURL, aTitle, aText, aTextClickable, aCookie, aListener) {
-    if (aListener) {
-      Services.obs.addObserver(this, "metro_native_toast_clicked", false);
-      Services.obs.addObserver(this, "metro_native_toast_dismissed", false);
-      Services.obs.addObserver(this, "metro_native_toast_shown", false);
-    }
-    this._listener = aListener;
-
-    if (Services.metro.foreground) {
-      // Firefox is in the foreground, no need for a notification.
-      return;
-    }
-    Services.metro.showNativeToast(aTitle, aText, aImageURL, aCookie);
-  },
-
-  closeAlert: function ah_close() {
-    if (this._listener) {
-      Services.obs.removeObserver(this, "metro_native_toast_shown");
-      Services.obs.removeObserver(this, "metro_native_toast_clicked");
-      Services.obs.removeObserver(this, "metro_native_toast_dismissed");
-      this._listener = null;
-    }
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "metro_native_toast_clicked":
-        this._listener.observe(null, "alertclickcallback", aData);
-        break;
-      case "metro_native_toast_shown":
-        this._listener.observe(null, "alertshow", aData);
-        break;
-      case "metro_native_toast_dismissed":
-        this._listener.observe(null, "alertfinished", aData);
-        break;
-    }
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/ChromeSelectionHandler.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/ChromeSelectionHandler.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/ChromeSelectionHandler.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/ChromeSelectionHandler.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,435 +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/. */
-
-/*
- * Selection handler for chrome text inputs
- */
-
-let Ci = Components.interfaces;
-
-var ChromeSelectionHandler = {
-  _mode: this._SELECTION_MODE,
-
-  /*************************************************
-   * Messaging wrapper
-   */
-
-  sendAsync: function sendAsync(aMsg, aJson) {
-    SelectionHelperUI.receiveMessage({ 
-      name: aMsg,
-      json: aJson
-    });
-  },
-
-  /*************************************************
-   * Browser event handlers
-   */
-
-  /*
-   * General selection start method for both caret and selection mode.
-   */
-  _onSelectionAttach: function _onSelectionAttach(aJson) {
-    // Clear previous ChromeSelectionHandler state.
-    this._deactivate();
-
-    // Initialize ChromeSelectionHandler state.
-    this._domWinUtils = Util.getWindowUtils(window);
-    this._contentWindow = window;
-    this._targetElement = aJson.target;
-    this._targetIsEditable = Util.isTextInput(this._targetElement) ||
-        this._targetElement instanceof Ci.nsIDOMXULTextBoxElement;
-    if (!this._targetIsEditable) {
-      this._onFail("not an editable?", this._targetElement);
-      return;
-    }
-
-    let selection = this._getSelection();
-    if (!selection) {
-      this._onFail("no selection.");
-      return;
-    }
-
-    if (!this._getTargetElementValue()) {
-      this._onFail("Target element does not contain any content to select.");
-      return;
-    }
-
-    // Add a listener to respond to programmatic selection changes.
-    selection.QueryInterface(Ci.nsISelectionPrivate).addSelectionListener(this);
-
-    if (!selection.isCollapsed) {
-      this._mode = this._SELECTION_MODE;
-      this._updateSelectionUI("start", true, true);
-    } else {
-      this._mode = this._CARET_MODE;
-      this._updateSelectionUI("caret", false, false, true);
-    }
-
-    this._targetElement.addEventListener("blur", this, false);
-  },
-
-  /*
-   * Selection monocle start move event handler
-   */
-  _onSelectionMoveStart: function _onSelectionMoveStart(aMsg) {
-    if (!this.targetIsEditable) {
-      this._onFail("_onSelectionMoveStart with bad targetElement.");
-      return;
-    }
-
-    if (this._selectionMoveActive) {
-      this._onFail("mouse is already down on drag start?");
-      return;
-    }
-
-    // We bail if things get out of sync here implying we missed a message.
-    this._selectionMoveActive = true;
-
-    if (this._targetIsEditable) {
-      // If we're coming out of an out-of-bounds scroll, the node the user is
-      // trying to drag may be hidden (the monocle will be pegged to the edge
-      // of the edit). Make sure the node the user wants to move is visible
-      // and has focus.
-      this._updateInputFocus(aMsg.change);
-    }
-
-    // Update the position of our selection monocles
-    this._updateSelectionUI("update", true, true);
-  },
-  
-  /*
-   * Selection monocle move event handler
-   */
-  _onSelectionMove: function _onSelectionMove(aMsg) {
-    if (!this.targetIsEditable) {
-      this._onFail("_onSelectionMove with bad targetElement.");
-      return;
-    }
-
-    if (!this._selectionMoveActive) {
-      this._onFail("mouse isn't down for drag move?");
-      return;
-    }
-
-    this._handleSelectionPoint(aMsg, false);
-  },
-
-  /*
-   * Selection monocle move finished event handler
-   */
-  _onSelectionMoveEnd: function _onSelectionMoveComplete(aMsg) {
-    if (!this.targetIsEditable) {
-      this._onFail("_onSelectionMoveEnd with bad targetElement.");
-      return;
-    }
-
-    if (!this._selectionMoveActive) {
-      this._onFail("mouse isn't down for drag move?");
-      return;
-    }
-
-    this._handleSelectionPoint(aMsg, true);
-    this._selectionMoveActive = false;
-    
-    // Clear any existing scroll timers
-    this._clearTimers();
-
-    // Update the position of our selection monocles
-    this._updateSelectionUI("end", true, true);
-  },
-
-  _onSelectionUpdate: function _onSelectionUpdate() {
-    if (!this._targetHasFocus()) {
-      this._closeSelection();
-      return;
-    }
-    this._updateSelectionUI("update",
-                            this._mode == this._SELECTION_MODE,
-                            this._mode == this._SELECTION_MODE,
-                            this._mode == this._CARET_MODE);
-  },
-
-  /*
-   * Switch selection modes. Currently we only support switching
-   * from "caret" to "selection".
-   */
-  _onSwitchMode: function _onSwitchMode(aMode, aMarker, aX, aY) {
-    if (aMode != "selection") {
-      this._onFail("unsupported mode switch");
-      return;
-    }
-    
-    // Sanity check to be sure we are initialized
-    if (!this._targetElement) {
-      this._onFail("not initialized");
-      return;
-    }
-
-    // Similar to _onSelectionStart - we need to create initial selection
-    // but without the initialization bits.
-    let framePoint = this._clientPointToFramePoint({ xPos: aX, yPos: aY });
-    if (!this._domWinUtils.selectAtPoint(framePoint.xPos, framePoint.yPos,
-                                         Ci.nsIDOMWindowUtils.SELECT_CHARACTER)) {
-      this._onFail("failed to set selection at point");
-      return;
-    }
-
-    // We bail if things get out of sync here implying we missed a message.
-    this._selectionMoveActive = true;
-    this._mode = this._SELECTION_MODE;
-
-    // Update the position of the selection marker that is *not*
-    // being dragged.
-    this._updateSelectionUI("update", aMarker == "end", aMarker == "start");
-  },
-
-  /*
-   * Selection close event handler
-   *
-   * @param aClearSelection requests that selection be cleared.
-   */
-  _onSelectionClose: function _onSelectionClose(aClearSelection) {
-    if (aClearSelection) {
-      this._clearSelection();
-    }
-    this._closeSelection();
-  },
-
-  /*
-   * Called if for any reason we fail during the selection
-   * process. Cancels the selection.
-   */
-  _onFail: function _onFail(aDbgMessage) {
-    if (aDbgMessage && aDbgMessage.length > 0)
-      Util.dumpLn(aDbgMessage);
-    this.sendAsync("Content:SelectionFail");
-    this._clearSelection();
-    this._closeSelection();
-  },
-
-  /*
-   * Empty conversion routines to match those in
-   * browser. Called by SelectionHelperUI when
-   * sending and receiving coordinates in messages.
-   */
-
-  ptClientToBrowser: function ptClientToBrowser(aX, aY, aIgnoreScroll, aIgnoreScale) {
-    return { x: aX, y: aY }
-  },
-
-  rectBrowserToClient: function rectBrowserToClient(aRect, aIgnoreScroll, aIgnoreScale) {
-    return {
-      left: aRect.left,
-      right: aRect.right,
-      top: aRect.top,
-      bottom: aRect.bottom
-    }
-  },
-
-  ptBrowserToClient: function ptBrowserToClient(aX, aY, aIgnoreScroll, aIgnoreScale) {
-    return { x: aX, y: aY }
-  },
-
-  ctobx: function ctobx(aCoord) {
-    return aCoord;
-  },
-
-  ctoby: function ctoby(aCoord) {
-    return aCoord;
-  },
-
-  btocx: function btocx(aCoord) {
-    return aCoord;
-  },
-
-  btocy: function btocy(aCoord) {
-    return aCoord;
-  },
-
-
-  /*************************************************
-   * Selection helpers
-   */
-
-  /*
-   * _clearSelection
-   *
-   * Clear existing selection if it exists and reset our internal state.
-   */
-  _clearSelection: function _clearSelection() {
-    let selection = this._getSelection();
-    if (selection) {
-      selection.removeAllRanges();
-    }
-  },
-
-  /*
-   * _closeSelection
-   *
-   * Shuts ChromeSelectionHandler and SelectionHelperUI down.
-   */
-  _closeSelection: function _closeSelection() {
-    this._deactivate();
-    this.sendAsync("Content:HandlerShutdown", {});
-  },
-
-  /*
-   * _deactivate
-   *
-   * Resets ChromeSelectionHandler state, previously initialized in
-   * general selection start-method |_onSelectionAttach()|.
-   */
-  _deactivate: function _deactivate() {
-    // Remove our selection notification listener.
-    let selection = this._getSelection();
-    if (selection) {
-      try {
-        selection.QueryInterface(Ci.nsISelectionPrivate).removeSelectionListener(this);
-      } catch(e) {
-        // Fail safe during multiple _deactivate() calls.
-      }
-    }
-
-    this._clearTimers();
-    this._cache = null;
-    this._contentWindow = null;
-    if (this._targetElement) {
-      this._targetElement.removeEventListener("blur", this, true);
-      this._targetElement = null;
-    }
-    this._selectionMoveActive = false;
-    this._domWinUtils = null;
-    this._targetIsEditable = false;
-    this._mode = null;
-  },
-
-  get hasSelection() {
-    if (!this._targetElement) {
-      return false;
-    }
-    let selection = this._getSelection();
-    return (selection && !selection.isCollapsed);
-  },
-
-  _targetHasFocus: function() {
-    if (!this._targetElement || !document.commandDispatcher.focusedElement) {
-      return false;
-    }
-    let bindingParent = this._contentWindow.document.getBindingParent(document.commandDispatcher.focusedElement);
-    return (bindingParent && this._targetElement == bindingParent);
-  },
-
-  /*************************************************
-   * Events
-   */
-
-  /*
-   * Scroll + selection advancement timer when the monocle is
-   * outside the bounds of an input control.
-   */
-  scrollTimerCallback: function scrollTimerCallback() {
-    let result = ChromeSelectionHandler.updateTextEditSelection();
-    // Update monocle position and speed if we've dragged off to one side
-    if (result.trigger) {
-      ChromeSelectionHandler._updateSelectionUI("update", result.start, result.end);
-    }
-  },
-
-  handleEvent: function handleEvent(aEvent) {
-    if (aEvent.type == "blur" && !this._targetHasFocus()) {
-      this._closeSelection();
-    }
-  },
-
-  msgHandler: function msgHandler(aMsg, aJson) {
-    if (this._debugEvents && "Browser:SelectionMove" != aMsg) {
-      Util.dumpLn("ChromeSelectionHandler:", aMsg);
-    }
-    switch(aMsg) {
-      case "Browser:SelectionDebug":
-        this._onSelectionDebug(aJson);
-        break;
-
-      case "Browser:SelectionAttach":
-        this._onSelectionAttach(aJson);
-      break;
-
-      case "Browser:CaretAttach":
-        this._onSelectionAttach(aJson);
-        break;
-
-      case "Browser:SelectionClose":
-        this._onSelectionClose(aJson.clearSelection);
-      break;
-
-      case "Browser:SelectionUpdate":
-        this._onSelectionUpdate();
-      break;
-
-      case "Browser:SelectionMoveStart":
-        this._onSelectionMoveStart(aJson);
-        break;
-
-      case "Browser:SelectionMove":
-        this._onSelectionMove(aJson);
-        break;
-
-      case "Browser:SelectionMoveEnd":
-        this._onSelectionMoveEnd(aJson);
-        break;
-
-      case "Browser:CaretUpdate":
-        this._onCaretPositionUpdate(aJson.caret.xPos, aJson.caret.yPos);
-        break;
-
-      case "Browser:CaretMove":
-        this._onCaretMove(aJson.caret.xPos, aJson.caret.yPos);
-        break;
-
-      case "Browser:SelectionSwitchMode":
-        this._onSwitchMode(aJson.newMode, aJson.change, aJson.xPos, aJson.yPos);
-        break;
-    }
-  },
-
-  /*************************************************
-   * Utilities
-   */
-
-  _getSelection: function _getSelection() {
-    let targetElementEditor = this._getTargetElementEditor();
-
-    return targetElementEditor ? targetElementEditor.selection : null;
-  },
-
-  _getTargetElementValue: function _getTargetElementValue() {
-    if (this._targetElement instanceof Ci.nsIDOMXULTextBoxElement) {
-      return this._targetElement.inputField.value;
-    } else if (Util.isTextInput(this._targetElement)) {
-      return this._targetElement.value;
-    }
-    return null;
-  },
-
-  _getSelectController: function _getSelectController() {
-    let targetElementEditor = this._getTargetElementEditor();
-
-    return targetElementEditor ? targetElementEditor.selectionController : null;
-  },
-
-  _getTargetElementEditor: function() {
-    if (this._targetElement instanceof Ci.nsIDOMXULTextBoxElement) {
-      return this._targetElement.QueryInterface(Ci.nsIDOMXULTextBoxElement)
-          .editor;
-    } else if (Util.isTextInput(this._targetElement)) {
-      return this._targetElement.QueryInterface(Ci.nsIDOMNSEditableElement)
-          .editor;
-    }
-    return null;
-  }
-};
-
-ChromeSelectionHandler.__proto__ = new SelectionPrototype();
-ChromeSelectionHandler.type = 1; // kChromeSelector
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/FindHelperUI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/FindHelperUI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/FindHelperUI.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/FindHelperUI.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,227 +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/. */
-
-/* We don't support zooming yet, disable Animated zoom by clamping it to the default zoom. */
-const kBrowserFindZoomLevelMin = 1;
-const kBrowserFindZoomLevelMax = 1;
-
-var FindHelperUI = {
-  type: "find",
-  commands: {
-    next: "cmd_findNext",
-    previous: "cmd_findPrevious",
-    close: "cmd_findClose"
-  },
-
-  _finder: null,
-  _open: false,
-  _status: null,
-  _searchString: "",
-
-  /*
-   * Properties
-   */
-
-  get isActive() {
-    return this._open;
-  },
-
-  get status() {
-    return this._status;
-  },
-
-  set status(val) {
-    if (val != this._status) {
-      this._status = val;
-      if (!val)
-        this._textbox.removeAttribute("status");
-      else
-        this._textbox.setAttribute("status", val);
-      this.updateCommands(this._textbox.value);
-    }
-  },
-
-  init: function findHelperInit() {
-    this._textbox = document.getElementById("findbar-textbox");
-    this._container = Elements.findbar;
-
-    this._cmdPrevious = document.getElementById(this.commands.previous);
-    this._cmdNext = document.getElementById(this.commands.next);
-
-    this._textbox.addEventListener("keydown", this);
-
-    // Listen for events where form assistant should be closed
-    Elements.tabList.addEventListener("TabSelect", this, true);
-    Elements.browsers.addEventListener("URLChanged", this, true);
-    window.addEventListener("MozAppbarShowing", this);
-    window.addEventListener("MozFlyoutPanelShowing", this, false);
-  },
-
-  handleEvent: function findHelperHandleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "TabSelect":
-        this.hide();
-        break;
-
-      case "URLChanged":
-        if (aEvent.detail && aEvent.target == getBrowser())
-          this.hide();
-        break;
-
-      case "keydown":
-        if (aEvent.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_RETURN) {
-          let backwardsSearch = aEvent.shiftKey;
-          this.searchAgain(this._searchString, backwardsSearch);
-        }
-        break;
-
-      case "MozAppbarShowing":
-      case "MozFlyoutPanelShowing":
-        if (aEvent.target != this._container) {
-          this.hide();
-        }
-        break;
-    }
-  },
-
-  show: function findHelperShow() {
-    if (BrowserUI.isStartTabVisible) {
-      return;
-    }
-    if (this._open) {
-      setTimeout(() => {
-        this._textbox.select();
-        this._textbox.focus();
-      }, 0);
-      return;
-    }
-
-    // Hide any menus
-    ContextUI.dismiss();
-
-    // Shutdown selection related ui
-    SelectionHelperUI.closeEditSession();
-
-    let findbar = this._container;
-    setTimeout(() => {
-      findbar.show();
-      this.search(this._textbox.value);
-      this._textbox.select();
-      this._textbox.focus();
-
-      this._open = true;
-    }, 0);
-
-    // Prevent the view to scroll automatically while searching
-    Browser.selectedBrowser.scrollSync = false;
-  },
-
-  hide: function findHelperHide() {
-    if (!this._open)
-      return;
-
-    ContentAreaObserver.shiftBrowserDeck(0);
-
-    let onTransitionEnd = () => {
-      this._container.removeEventListener("transitionend", onTransitionEnd, true);
-      this._textbox.value = "";
-      this.status = null;
-      this._open = false;
-      if (this._finder) {
-        this._finder.removeResultListener(this);
-        this._finder = null
-      }
-      // Restore the scroll synchronisation
-      Browser.selectedBrowser.scrollSync = true;
-    };
-
-    this._textbox.blur();
-    this._container.addEventListener("transitionend", onTransitionEnd, true);
-    this._container.dismiss();
-  },
-
-  search: function findHelperSearch(aValue) {
-    if (!this._finder) {
-      this._finder = Browser.selectedBrowser.finder;
-      this._finder.addResultListener(this);
-    }
-    this._searchString = aValue;
-    if (aValue != "") {
-      this._finder.fastFind(aValue, false, false);
-    } else {
-      this.updateCommands();
-    }
-  },
-
-  searchAgain: function findHelperSearchAgain(aValue, aFindBackwards) {
-    // This can happen if the user taps next/previous after re-opening the search bar
-    if (!this._finder) {
-      this.search(aValue);
-      return;
-    }
-
-    this._finder.findAgain(aFindBackwards, false, false);
-  },
-
-  goToPrevious: function findHelperGoToPrevious() {
-    this.searchAgain(this._searchString, true);
-  },
-
-  goToNext: function findHelperGoToNext() {
-    this.searchAgain(this._searchString, false);
-  },
-
-  onFindResult: function(aData) {
-    this._status = aData.result;
-    if (aData.rect) {
-      this._zoom(aData.rect, Browser.selectedBrowser.contentDocumentHeight);
-    }
-    this.updateCommands();
-  },
-
-  updateCommands: function findHelperUpdateCommands() {
-    let disabled = (this._status == Ci.nsITypeAheadFind.FIND_NOTFOUND) || (this._searchString == "");
-    this._cmdPrevious.setAttribute("disabled", disabled);
-    this._cmdNext.setAttribute("disabled", disabled);
-  },
-
-  _zoom: function _findHelperZoom(aElementRect, aContentHeight) {
-    // The rect we get here is the content rect including scroll offset
-    // in the page.
-
-    // If the text falls below the find bar and keyboard shift content up.
-    let browserShift = 0;
-    // aElementRect.y is the top left origin of the selection rect.
-    if ((aElementRect.y + aElementRect.height) >
-        (aContentHeight - this._container.boxObject.height)) {
-      browserShift += this._container.boxObject.height;
-    }
-    browserShift += Services.metro.keyboardHeight;
-
-    // If the rect top of the selection is above the view, don't shift content
-    // (or if it's already shifted, shift it back down).
-    if (aElementRect.y < browserShift) {
-      browserShift = 0;
-    }
-
-    // Shift the deck so that the selection is within the visible view.
-    ContentAreaObserver.shiftBrowserDeck(browserShift);
-
-    // Adjust for keyboad display and position the text selection rect in
-    // the middle of the viewable area.
-    let xPos = aElementRect.x;
-    let yPos = aElementRect.y;
-    let scrollAdjust = ((ContentAreaObserver.height - Services.metro.keyboardHeight) * .5) +
-      Services.metro.keyboardHeight;
-    yPos -= scrollAdjust;
-    if (yPos < 0) {
-      yPos = 0;
-    }
-
-    // TODO zoom via apzc, right now all we support is scroll
-    // positioning.
-    Browser.selectedBrowser.contentWindow.scrollTo(xPos, yPos);
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/FormHelperUI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/FormHelperUI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/FormHelperUI.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/FormHelperUI.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,249 +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/. */
-
-/*
- * Responsible for filling in form information.
- *  - displays select popups
- *  - Provides autocomplete box for input fields.
- */
-
-var FormHelperUI = {
-  _debugEvents: false,
-  _currentBrowser: null,
-  _currentElement: null,
-  _currentCaretRect: null,
-  _currentElementRect: null,
-  _open: false,
-
-  type: "form",
-
-  init: function formHelperInit() {
-    // Listen for form assistant messages from content
-    messageManager.addMessageListener("FormAssist:Show", this);
-    messageManager.addMessageListener("FormAssist:Hide", this);
-    messageManager.addMessageListener("FormAssist:Update", this);
-    messageManager.addMessageListener("FormAssist:AutoComplete", this);
-
-    // Listen for events where form assistant should be closed or updated
-    let tabs = Elements.tabList;
-    tabs.addEventListener("TabSelect", this, true);
-    tabs.addEventListener("TabClose", this, true);
-    Elements.browsers.addEventListener("URLChanged", this, true);
-    Elements.browsers.addEventListener("SizeChanged", this, true);
-
-    // Listen some events to show/hide arrows
-    Elements.browsers.addEventListener("PanBegin", this, false);
-    Elements.browsers.addEventListener("PanFinished", this, false);
-  },
-
-  /*
-   * Open of the form helper proper. Currently doesn't display anything
-   * on metro since the nav buttons are off.
-   */
-  show: function formHelperShow(aElement) {
-    // Delay the operation until all resize operations generated by the
-    // keyboard apparition are done.
-    if (!InputSourceHelper.isPrecise && aElement.editable &&
-        ContentAreaObserver.isKeyboardTransitioning) {
-      this._waitForKeyboard(aElement);
-      return;
-    }
-
-    this._currentBrowser = Browser.selectedBrowser;
-    this._currentCaretRect = null;
-
-    let lastElement = this._currentElement || null;
-
-    this._currentElement = {
-      id: aElement.id,
-      name: aElement.name,
-      title: aElement.title,
-      value: aElement.value,
-      maxLength: aElement.maxLength,
-      type: aElement.type,
-      choices: aElement.choices,
-      isAutocomplete: aElement.isAutocomplete,
-      list: aElement.list,
-      rect: aElement.rect
-    };
-
-    this._updateContainerForSelect(lastElement, this._currentElement);
-    this._showAutoCompleteSuggestions(this._currentElement);
-
-    // Prevent the view to scroll automatically while typing
-    this._currentBrowser.scrollSync = false;
-
-    this._open = true;
-  },
-
-  hide: function formHelperHide() {
-    this._open = false;
-
-    SelectHelperUI.hide();
-    AutofillMenuUI.hide();
-
-    // Restore the scroll synchonisation
-    if (this._currentBrowser)
-      this._currentBrowser.scrollSync = true;
-
-    // reset current Element and Caret Rect
-    this._currentElementRect = null;
-    this._currentCaretRect = null;
-
-    this._updateContainerForSelect(this._currentElement, null);
-    if (this._currentBrowser)
-      this._currentBrowser.messageManager.sendAsyncMessage("FormAssist:Closed", { });
-  },
-
-  _onShowRequest: function _onShowRequest(aJsonMsg) {
-    if (aJsonMsg.current.choices) {
-      // Note, aJsonMsg.current.rect is translated from browser to client
-      // in the SelectHelperUI code.
-      SelectHelperUI.show(aJsonMsg.current.choices, aJsonMsg.current.title,
-                          aJsonMsg.current.rect);
-    } else {
-      this._currentBrowser = getBrowser();
-      this._currentElementRect =
-        Rect.fromRect(this._currentBrowser.rectBrowserToClient(aJsonMsg.current.rect));
-      this.show(aJsonMsg.current);
-    }
-  },
-
-  /*
-   * Events
-   */
-
-  handleEvent: function formHelperHandleEvent(aEvent) {
-    if (this._debugEvents) Util.dumpLn(aEvent.type);
-
-    if (!this._open)
-      return;
-
-    switch (aEvent.type) {
-      case "TabSelect":
-      case "TabClose":
-      case "PanBegin":
-      case "SizeChanged":
-        this.hide();
-        break;
-
-      case "URLChanged":
-        if (aEvent.detail && aEvent.target == getBrowser())
-          this.hide();
-        break;
-    }
-  },
-
-  receiveMessage: function formHelperReceiveMessage(aMessage) {
-    if (this._debugEvents) Util.dumpLn(aMessage.name);
-    let json = aMessage.json;
-
-    switch (aMessage.name) {
-      case "FormAssist:Show":
-        this._onShowRequest(json);
-        break;
-
-      case "FormAssist:Hide":
-        this.hide();
-        break;
-
-      case "FormAssist:AutoComplete":
-        this.show(json.current);
-        break;
-    }
-  },
-
-  doAutoComplete: function formHelperDoAutoComplete(aData) {
-    this._currentBrowser.messageManager.sendAsyncMessage("FormAssist:AutoComplete",
-      { value: aData });
-  },
-
-  /*
-   * Retrieves autocomplete suggestions asynchronously for an element from the
-   * form autocomplete service and updates and displays the autocompletepopup.
-   *
-   * @param aElement form input element
-   */
-  _showAutoCompleteSuggestions: function (aElement) {
-    if (!aElement.isAutocomplete) {
-      return;
-    }
-
-    let resultsAvailable = autoCompleteSuggestions => {
-      // Return false if there are no suggestions to show
-      if (!autoCompleteSuggestions.length) {
-        return;
-      }
-      AutofillMenuUI.show(this._currentElementRect, autoCompleteSuggestions);
-    };
-
-    this._getAutoCompleteSuggestions(aElement.value, aElement, resultsAvailable);
-  },
-
-  /*
-   * Retrieves autocomplete suggestions for an element from the form
-   * autocomplete service. 
-   *
-   * @param aSearchString text entered into form
-   * @param aElement form input element
-   * @param aCallback(array_of_suggestions) called when results are available.
-   */
-  _getAutoCompleteSuggestions: function (aSearchString, aElement, aCallback) {
-    // Cache the form autocomplete service for future use
-    if (!this._formAutoCompleteService)
-      this._formAutoCompleteService = Cc["@mozilla.org/satchel/form-autocomplete;1"].
-                                      getService(Ci.nsIFormAutoComplete);
-
-    // results callback
-    let resultsAvailable = function (results) {
-      let suggestions = [];
-      for (let idx = 0; idx < results.matchCount; idx++) {
-        let value = results.getValueAt(idx);
-
-        // Do not show the value if it is the current one in the input field
-        if (value == aSearchString)
-          continue;
-
-        // Supply a label and value, since they can differ for datalist suggestions
-        suggestions.push({ label: value, value: value });
-      }
-
-      // Add the datalist elements provided by the website, note that the
-      // displayed value can differ from the real value of the element.
-      let options = aElement.list;
-      for (let idx = 0; idx < options.length; idx++) {
-        suggestions.push(options[idx]);
-      }
-
-      aCallback(suggestions);
-    };
-
-    // Send the query
-    this._formAutoCompleteService.autoCompleteSearchAsync(aElement.name || aElement.id,
-                                                          aSearchString, aElement, null,
-                                                          resultsAvailable);
-  },
-  
-  /*
-   * Setup for displaying the selection choices menu
-   */
-  _updateContainerForSelect: function _formHelperUpdateContainerForSelect(aLastElement, aCurrentElement) {
-    let lastHasChoices = aLastElement && (aLastElement.choices != null);
-    let currentHasChoices = aCurrentElement && (aCurrentElement.choices != null);
-
-    if (currentHasChoices)
-      SelectHelperUI.show(aCurrentElement.choices, aCurrentElement.title, aCurrentElement.rect);
-    else if (lastHasChoices)
-      SelectHelperUI.hide();
-  },
-
-  _waitForKeyboard: function formHelperWaitForKeyboard(aElement) {
-    let self = this;
-    window.addEventListener("KeyboardChanged", function(aEvent) {
-      window.removeEventListener("KeyboardChanged", arguments.callee, false);
-      self._currentBrowser.messageManager.sendAsyncMessage("FormAssist:Update", {});
-    }, false);
-  }
-};
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/IndexedDB.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/IndexedDB.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/IndexedDB.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/IndexedDB.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +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/. */
-
-/**
- * Helper class for IndexedDB, parent part. Listens to
- * messages from the child and shows prompts for them.
- */
-let IndexedDB = {
-  _permissionsPrompt: "indexedDB-permissions-prompt",
-  _permissionsResponse: "indexedDB-permissions-response",
-
-  _notificationIcon: "indexedDB-notification-icon",
-
-  receiveMessage: function(aMessage) {
-    switch (aMessage.name) {
-      case "IndexedDB:Prompt":
-        this.showPrompt(aMessage);
-    }
-  },
-
-  showPrompt: function(aMessage) {
-    let browser = aMessage.target;
-    let payload = aMessage.json;
-    let host = payload.host;
-    let topic = payload.topic;
-    let type;
-
-    if (topic == this._permissionsPrompt) {
-      type = "indexedDB";
-      payload.responseTopic = this._permissionsResponse;
-    }
-
-    let prompt = Cc["@mozilla.org/content-permission/prompt;1"].createInstance(Ci.nsIContentPermissionPrompt);
-    let types = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
-    let promptType = {
-      type: type,
-      access: "unused",
-      QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType])
-    };
-    types.appendElement(promptType, false);
-
-    // If the user waits a long time before responding, we default to UNKNOWN_ACTION.
-    let timeoutId = setTimeout(function() {
-      payload.permission = Ci.nsIPermissionManager.UNKNOWN_ACTION;
-      browser.messageManager.sendAsyncMessage("IndexedDB:Response", payload);
-      timeoutId = null;
-    }, 30000);
- 
-    function checkTimeout() {
-      if (timeoutId === null) return true;
-      clearTimeout(timeoutId);
-      timeoutId = null;
-      return false;
-    }
-
-    prompt.prompt({
-      types: types,
-      uri: Services.io.newURI(payload.location, null, null),
-      window: null,
-      element: aMessage.target,
-
-      cancel: function() {
-        if (checkTimeout()) return;
-        payload.permission = Ci.nsIPermissionManager.DENY_ACTION;
-        browser.messageManager.sendAsyncMessage("IndexedDB:Response", payload);
-      },
-
-      allow: function() {
-        if (checkTimeout()) return;
-        payload.permission = Ci.nsIPermissionManager.ALLOW_ACTION;
-        browser.messageManager.sendAsyncMessage("IndexedDB:Response", payload);
-      },
-    });
-  },
-};
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/ItemPinHelper.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/ItemPinHelper.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/ItemPinHelper.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/ItemPinHelper.js	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-
-"use strict";
-
-function ItemPinHelper(aUnpinnedPrefName) {
-  this._prefKey = aUnpinnedPrefName;
-}
-
-// Cache preferences on a static variable shared
-// by all instances registered to the same pref key.
-ItemPinHelper._prefValue = {};
-
-ItemPinHelper.prototype = {
-  _getPrefValue: function _getPrefValue() {
-    if (ItemPinHelper._prefValue[this._prefKey])
-      return ItemPinHelper._prefValue[this._prefKey];
-
-    try {
-      // getComplexValue throws if pref never set. Really.
-      let prefValue = Services.prefs.getComplexValue(this._prefKey, Ci.nsISupportsString);
-      ItemPinHelper._prefValue[this._prefKey] = JSON.parse(prefValue.data);
-    } catch(e) {
-      ItemPinHelper._prefValue[this._prefKey] = [];
-    }
-
-    return ItemPinHelper._prefValue[this._prefKey];
-  },
-
-  _setPrefValue: function _setPrefValue(aNewValue) {
-    let stringified = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString);
-    stringified.data = JSON.stringify(aNewValue);
-
-    Services.prefs.setComplexValue(this._prefKey, Ci.nsISupportsString, stringified);
-    ItemPinHelper._prefValue[this._prefKey] = aNewValue;
-  },
-
-  isPinned: function isPinned(aItemId) {
-    // Bookmarks are visible on StartUI (pinned) by default
-    return this._getPrefValue().indexOf(aItemId) === -1;
-  },
-
-  setUnpinned: function setPinned(aItemId) {
-    let unpinned = this._getPrefValue();
-    unpinned.push(aItemId);
-    this._setPrefValue(unpinned);
-  },
-
-  setPinned: function unsetPinned(aItemId) {
-    let unpinned = this._getPrefValue();
-
-    let index = unpinned.indexOf(aItemId);
-    unpinned.splice(index, 1);
-
-    this._setPrefValue(unpinned);
-  },
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/MenuUI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/MenuUI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/MenuUI.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/MenuUI.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,571 +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/. */
-
-// Positioning buffer enforced between the edge of a context menu
-// and the edge of the screen.
-const kPositionPadding = 10;
-
-var AutofillMenuUI = {
-  _popupState: null,
-  __menuPopup: null,
-
-  get _panel() { return document.getElementById("autofill-container"); },
-  get _popup() { return document.getElementById("autofill-popup"); },
-  get commands() { return this._popup.childNodes[0]; },
-
-  get _menuPopup() {
-    if (!this.__menuPopup) {
-      this.__menuPopup = new MenuPopup(this._panel, this._popup);
-      this.__menuPopup._wantTypeBehind = true;
-      this.__menuPopup.controller = this;
-    }
-    return this.__menuPopup;
-  },
-
-  _firePopupEvent: function _firePopupEvent(aEventName) {
-    let menupopup = this._currentControl.menupopup;
-    if (menupopup.hasAttribute(aEventName)) {
-      let func = new Function("event", menupopup.getAttribute(aEventName));
-      func.call(this);
-    }
-  },
-
-  _emptyCommands: function _emptyCommands() {
-    while (this.commands.firstChild)
-      this.commands.removeChild(this.commands.firstChild);
-  },
-
-  _positionOptions: function _positionOptions() {
-    return {
-      bottomAligned: false,
-      leftAligned: true,
-      xPos: this._anchorRect.x,
-      yPos: this._anchorRect.y + this._anchorRect.height,
-      maxWidth: this._anchorRect.width,
-      maxHeight: 350,
-      source: Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH
-    };
-  },
-
-  show: function show(aAnchorRect, aSuggestionsList) {
-    this.commands.addEventListener("select", this, true);
-
-    this._anchorRect = aAnchorRect;
-    this._emptyCommands();
-    for (let idx = 0; idx < aSuggestionsList.length; idx++) {
-      let item = document.createElement("richlistitem");
-      let label = document.createElement("label");
-      label.setAttribute("value", aSuggestionsList[idx].label);
-      item.setAttribute("value", aSuggestionsList[idx].value);
-      item.setAttribute("data", aSuggestionsList[idx].value);
-      item.appendChild(label);
-      this.commands.appendChild(item);
-    }
-    this._menuPopup.show(this._positionOptions());
-  },
-
-  selectByIndex: function mn_selectByIndex(aIndex) {
-    this._menuPopup.hide();
-    FormHelperUI.doAutoComplete(this.commands.childNodes[aIndex].getAttribute("data"));
-  },
-
-  hide: function hide () {
-    this.commands.removeEventListener("select", this, true);
-
-    this._menuPopup.hide();
-  },
-
-  handleEvent: function (aEvent) {
-    switch (aEvent.type) {
-      case "select":
-        FormHelperUI.doAutoComplete(this.commands.value);
-        break;
-    }
-  }
-};
-
-var ContextMenuUI = {
-  _popupState: null,
-  __menuPopup: null,
-  _defaultPositionOptions: {
-    bottomAligned: true,
-    rightAligned: false,
-    centerHorizontally: true,
-    moveBelowToFit: true
-  },
-
-  get _panel() { return document.getElementById("context-container"); },
-  get _popup() { return document.getElementById("context-popup"); },
-  get commands() { return this._popup.childNodes[0]; },
-
-  get _menuPopup() {
-    if (!this.__menuPopup) {
-      this.__menuPopup = new MenuPopup(this._panel, this._popup);
-      this.__menuPopup.controller = this;
-    }
-    return this.__menuPopup;
-  },
-
-  /*******************************************
-   * External api
-   */
-
-  /*
-   * popupState - return the json object for this context. Called
-   * by context command to invoke actions on the target.
-   */
-  get popupState() {
-    return this._popupState;
-  },
-
-  /*
-   * showContextMenu - display a context sensitive menu based
-   * on the data provided in a json data structure.
-   *
-   * @param aMessage data structure containing information about
-   * the context.
-   *  aMessage.json - json data structure described below.
-   *  aMessage.target - target element on which to evoke
-   *
-   * @returns true if the context menu was displayed,
-   * false otherwise.
-   *
-   * json: TBD
-   */
-  showContextMenu: function ch_showContextMenu(aMessage) {
-    this._popupState = aMessage.json;
-    this._popupState.target = aMessage.target;
-    let contentTypes = this._popupState.types;
-
-    /*
-     * Types in ContextMenuHandler:
-     * image
-     * link
-     * input-text     - generic form input control
-     * copy           - form input that has some selected text
-     * selectable     - form input with text that can be selected
-     * input-empty    - form input (empty)
-     * paste          - form input and there's text on the clipboard
-     * selected-text  - generic content text that is selected
-     * content-text   - generic content text
-     * video
-     * media-paused, media-playing
-     * paste-url      - url bar w/text on the clipboard
-     */
-
-    Util.dumpLn("contentTypes:", contentTypes);
-
-    // Defines whether or not low priority items in images, text, and
-    // links are displayed.
-    let multipleMediaTypes = false;
-    if (contentTypes.indexOf("link") != -1 &&
-        (contentTypes.indexOf("image") != -1  ||
-         contentTypes.indexOf("video") != -1 ||
-         contentTypes.indexOf("selected-text") != -1))
-      multipleMediaTypes = true;
-
-    for (let command of Array.slice(this.commands.childNodes)) {
-      command.hidden = true;
-      command.selected = false;
-    }
-
-    let optionsAvailable = false;
-    for (let command of Array.slice(this.commands.childNodes)) {
-      let types = command.getAttribute("type").split(",");
-      let lowPriority = (command.hasAttribute("priority") &&
-        command.getAttribute("priority") == "low");
-      let searchTextItem = (command.id == "context-search");
-
-      // filter low priority items if we have more than one media type.
-      if (multipleMediaTypes && lowPriority)
-        continue;
-
-      for (let i = 0; i < types.length; i++) {
-        // If one of the item's types has '!' before it, treat it as an exclusion rule.
-        if (types[i].charAt(0) == '!' && contentTypes.indexOf(types[i].substring(1)) != -1) {
-          break;
-        }
-        if (contentTypes.indexOf(types[i]) != -1) {
-          // If this is the special search text item, we need to set its label dynamically.
-          if (searchTextItem && !ContextCommands.searchTextSetup(command, this._popupState.string)) {
-            break;
-          }
-          optionsAvailable = true;
-          command.hidden = false;
-          break;
-        }
-      }
-    }
-
-    if (!optionsAvailable) {
-      this._popupState = null;
-      return false;
-    }
-
-    let coords = { x: aMessage.json.xPos, y: aMessage.json.yPos };
-
-    // chrome calls don't need to be translated and as such
-    // don't provide target.
-    if (aMessage.target && aMessage.target.localName === "browser") {
-      coords = aMessage.target.msgBrowserToClient(aMessage, true);
-    }
-    this._menuPopup.show(Util.extend({}, this._defaultPositionOptions, {
-      xPos: coords.x,
-      yPos: coords.y,
-      source: aMessage.json.source
-    }));
-    return true;
-  },
-
-  hide: function hide () {
-    for (let command of this.commands.querySelectorAll("richlistitem[selected]")) {
-      command.removeAttribute("selected");
-    }
-    this._menuPopup.hide();
-    this._popupState = null;
-  },
-
-  reset: function reset() {
-    this._popupState = null;
-  }
-};
-
-var MenuControlUI = {
-  _currentControl: null,
-  __menuPopup: null,
-
-  get _panel() { return document.getElementById("menucontrol-container"); },
-  get _popup() { return document.getElementById("menucontrol-popup"); },
-  get commands() { return this._popup.childNodes[0]; },
-
-  get _menuPopup() {
-    if (!this.__menuPopup) {
-      this.__menuPopup = new MenuPopup(this._panel, this._popup);
-      this.__menuPopup.controller = this;
-    }
-    return this.__menuPopup;
-  },
-
-  _firePopupEvent: function _firePopupEvent(aEventName) {
-    let menupopup = this._currentControl.menupopup;
-    if (menupopup.hasAttribute(aEventName)) {
-      let func = new Function("event", menupopup.getAttribute(aEventName));
-      func.call(this);
-    }
-  },
-
-  _emptyCommands: function _emptyCommands() {
-    while (this.commands.firstChild)
-      this.commands.removeChild(this.commands.firstChild);
-  },
-
-  _positionOptions: function _positionOptions() {
-    let position = this._currentControl.menupopup.position || "after_start";
-    let rect = this._currentControl.getBoundingClientRect();
-
-    let options = {};
-
-    // TODO: Detect text direction and flip for RTL.
-
-    switch (position) {
-      case "before_start":
-        options.xPos = rect.left;
-        options.yPos = rect.top;
-        options.bottomAligned = true;
-        options.leftAligned = true;
-        break;
-      case "before_end":
-        options.xPos = rect.right;
-        options.yPos = rect.top;
-        options.bottomAligned = true;
-        options.rightAligned = true;
-        break;
-      case "after_start":
-        options.xPos = rect.left;
-        options.yPos = rect.bottom;
-        options.topAligned = true;
-        options.leftAligned = true;
-        break;
-      case "after_end":
-        options.xPos = rect.right;
-        options.yPos = rect.bottom;
-        options.topAligned = true;
-        options.rightAligned = true;
-        break;
-
-      // TODO: Support other popup positions.
-    }
-
-    return options;
-  },
-
-  show: function show(aMenuControl) {
-    this._currentControl = aMenuControl;
-    this._panel.setAttribute("for", aMenuControl.id);
-    this._firePopupEvent("onpopupshowing");
-
-    this._emptyCommands();
-    let children = this._currentControl.menupopup.children;
-    for (let i = 0; i < children.length; i++) {
-      let child = children[i];
-      let item = document.createElement("richlistitem");
-
-      if (child.disabled)
-        item.setAttribute("disabled", "true");
-
-      if (child.hidden)
-        item.setAttribute("hidden", "true");
-
-      // Add selected as a class name instead of an attribute to not being overidden
-      // by the richlistbox behavior (it sets the "current" and "selected" attribute
-      if (child.selected)
-        item.setAttribute("class", "selected");
-
-      let image = document.createElement("image");
-      image.setAttribute("src", child.image || "");
-      item.appendChild(image);
-
-      let label = document.createElement("label");
-      label.setAttribute("value", child.label);
-      item.appendChild(label);
-
-      this.commands.appendChild(item);
-    }
-
-    this._menuPopup.show(this._positionOptions());
-  },
-
-  selectByIndex: function mn_selectByIndex(aIndex) {
-    this._currentControl.selectedIndex = aIndex;
-
-    // Dispatch a xul command event to the attached menulist
-    if (this._currentControl.dispatchEvent) {
-      let evt = document.createEvent("XULCommandEvent");
-      evt.initCommandEvent("command", true, true, window, 0, false, false, false, false, null);
-      this._currentControl.dispatchEvent(evt);
-    }
-
-    this._menuPopup.hide();
-  }
-};
-
-function MenuPopup(aPanel, aPopup) {
-  this._panel = aPanel;
-  this._popup = aPopup;
-  this._wantTypeBehind = false;
-
-  window.addEventListener('MozAppbarShowing', this, false);
-}
-MenuPopup.prototype = {
-  get visible() { return !this._panel.hidden; },
-  get commands() { return this._popup.childNodes[0]; },
-
-  show: function (aPositionOptions) {
-    if (!this.visible) {
-      this._animateShow(aPositionOptions);
-    }
-  },
-
-  hide: function () {
-    if (this.visible) {
-      this._animateHide();
-    }
-  },
-
-  _position: function _position(aPositionOptions) {
-    let aX = aPositionOptions.xPos;
-    let aY = aPositionOptions.yPos;
-    let aSource = aPositionOptions.source;
-
-    // Set these first so they are set when we do misc. calculations below.
-    if (aPositionOptions.maxWidth) {
-      this._popup.style.maxWidth = aPositionOptions.maxWidth + "px";
-    }
-    if (aPositionOptions.maxHeight) {
-      this._popup.style.maxHeight = aPositionOptions.maxHeight + "px";
-    }
-
-    let width = this._popup.boxObject.width;
-    let height = this._popup.boxObject.height;
-    let halfWidth = width / 2;
-    let screenWidth = ContentAreaObserver.width;
-    let screenHeight = ContentAreaObserver.height;
-
-    if (aPositionOptions.rightAligned)
-      aX -= width;
-
-    if (aPositionOptions.bottomAligned)
-      aY -= height;
-
-    if (aPositionOptions.centerHorizontally)
-      aX -= halfWidth;
-
-    // Always leave some padding.
-    if (aX < kPositionPadding) {
-      aX = kPositionPadding;
-    } else if (aX + width + kPositionPadding > screenWidth){
-      // Don't let the popup overflow to the right.
-      aX = Math.max(screenWidth - width - kPositionPadding, kPositionPadding);
-    }
-
-    if (aY < kPositionPadding  && aPositionOptions.moveBelowToFit) {
-      // show context menu below when it doesn't fit.
-      aY = aPositionOptions.yPos;
-    }
-
-    if (aY < kPositionPadding) {
-      aY = kPositionPadding;
-    } else if (aY + height + kPositionPadding > screenHeight){
-      aY = Math.max(screenHeight - height - kPositionPadding, kPositionPadding);
-    }
-
-    this._panel.left = aX;
-    this._panel.top = aY;
-
-    if (!aPositionOptions.maxHeight) {
-      // Make sure it fits in the window.
-      let popupHeight = Math.min(aY + height + kPositionPadding, screenHeight - aY - kPositionPadding);
-      this._popup.style.maxHeight = popupHeight + "px";
-    }
-
-    if (!aPositionOptions.maxWidth) {
-      let popupWidth = Math.min(aX + width + kPositionPadding, screenWidth - aX - kPositionPadding);
-      this._popup.style.maxWidth = popupWidth + "px";
-    }
-  },
-
-  _animateShow: function (aPositionOptions) {
-    let deferred = Promise.defer();
-
-    window.addEventListener("keypress", this, true);
-    window.addEventListener("mousedown", this, true);
-    window.addEventListener("touchstart", this, true);
-    window.addEventListener("scroll", this, true);
-    window.addEventListener("blur", this, true);
-    Elements.stack.addEventListener("PopupChanged", this, false);
-
-    this._panel.hidden = false;
-    let popupFrom = !aPositionOptions.bottomAligned ? "above" : "below";
-    this._panel.setAttribute("showingfrom", popupFrom);
-
-    // This triggers a reflow, which sets transitionability.
-    // All animation/transition setup must happen before here.
-    this._position(aPositionOptions || {});
-
-    let self = this;
-    this._panel.addEventListener("transitionend", function popupshown () {
-      self._panel.removeEventListener("transitionend", popupshown);
-      self._panel.removeAttribute("showingfrom");
-
-      self._dispatch("popupshown");
-      deferred.resolve();
-    });
-
-    this._panel.setAttribute("showing", "true");
-    return deferred.promise;
-  },
-
-  _animateHide: function () {
-    let deferred = Promise.defer();
-
-    window.removeEventListener("keypress", this, true);
-    window.removeEventListener("mousedown", this, true);
-    window.removeEventListener("touchstart", this, true);
-    window.removeEventListener("scroll", this, true);
-    window.removeEventListener("blur", this, true);
-    Elements.stack.removeEventListener("PopupChanged", this, false);
-
-    let self = this;
-    this._panel.addEventListener("transitionend", function popuphidden() {
-      self._panel.removeEventListener("transitionend", popuphidden);
-      self._panel.removeAttribute("hiding");
-      self._panel.hidden = true;
-      self._popup.style.maxWidth = "none";
-      self._popup.style.maxHeight = "none";
-
-      self._dispatch("popuphidden");
-      deferred.resolve();
-    });
-
-    this._panel.setAttribute("hiding", "true");
-    this._panel.removeAttribute("showing");
-    return deferred.promise;
-  },
-
-  _dispatch: function _dispatch(aName) {
-    let event = document.createEvent("Events");
-    event.initEvent(aName, true, false);
-    this._panel.dispatchEvent(event);
-  },
-
-  handleEvent: function handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "keypress":
-        // this.commands is not holding focus and not processing key events.
-        // Proxying events so that they're handled properly.
-
-        // Avoid recursion
-        if (aEvent.mine)
-          break;
-
-        let ev = document.createEvent("KeyboardEvent");
-        ev.initKeyEvent(
-          "keypress",        //  in DOMString typeArg,
-          false,             //  in boolean canBubbleArg,
-          true,              //  in boolean cancelableArg,
-          null,              //  in nsIDOMAbstractView viewArg,  Specifies UIEvent.view. This value may be null.
-          aEvent.ctrlKey,    //  in boolean ctrlKeyArg,
-          aEvent.altKey,     //  in boolean altKeyArg,
-          aEvent.shiftKey,   //  in boolean shiftKeyArg,
-          aEvent.metaKey,    //  in boolean metaKeyArg,
-          aEvent.keyCode,    //  in unsigned long keyCodeArg,
-          aEvent.charCode);  //  in unsigned long charCodeArg);
-
-        ev.mine = true;
-
-        switch (aEvent.keyCode) {
-          case aEvent.DOM_VK_ESCAPE:
-            this.hide();
-            break;
-
-          case aEvent.DOM_VK_RETURN:
-            this.commands.currentItem.click();
-            break;
-        }
-
-        if (Util.isNavigationKey(aEvent.keyCode)) {
-          aEvent.stopPropagation();
-          aEvent.preventDefault();
-          this.commands.dispatchEvent(ev);
-        } else if (!this._wantTypeBehind) {
-          // Hide the context menu so you can't type behind it.
-          aEvent.stopPropagation();
-          aEvent.preventDefault();
-          this.hide();
-        }
-        break;
-      case "blur":
-      case "mousedown":
-      case "touchstart":
-      case "scroll":
-        if (!this._popup.contains(aEvent.target)) {
-          aEvent.stopPropagation();
-          this.hide();
-        }
-        break;
-      case "PopupChanged":
-        if (aEvent.detail) {
-          this.hide();
-        }
-        break;
-      case "MozAppbarShowing":
-        if (this.controller && this.controller.hide) {
-          this.controller.hide()
-        } else {
-          this.hide();
-        }
-        break;
-    }
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/OfflineApps.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/OfflineApps.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/OfflineApps.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/OfflineApps.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +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/. */
-
-/*
- * Provide supports for Offline Applications
- */
-var OfflineApps = {
-  offlineAppRequested: function(aRequest, aTarget) {
-    if (!Services.prefs.getBoolPref("browser.offline-apps.notify"))
-      return;
-
-    let currentURI = Services.io.newURI(aRequest.location, aRequest.charset, null);
-
-    // don't bother showing UI if the user has already made a decision
-    if (Services.perms.testExactPermission(currentURI, "offline-app") != Ci.nsIPermissionManager.UNKNOWN_ACTION)
-      return;
-
-    try {
-      if (Services.prefs.getBoolPref("offline-apps.allow_by_default")) {
-        // all pages can use offline capabilities, no need to ask the user
-        return;
-      }
-    } catch(e) {
-      // this pref isn't set by default, ignore failures
-    }
-
-    let host = currentURI.asciiHost;
-    let notificationID = "offline-app-requested-" + host;
-    let notificationBox = Browser.getNotificationBox(aTarget);
-
-    let notification = notificationBox.getNotificationWithValue(notificationID);
-    let strings = Strings.browser;
-    if (notification) {
-      notification.documents.push(aRequest);
-    } else {
-      let buttons = [{
-        label: strings.GetStringFromName("offlineApps.allow"),
-        accessKey: "",
-        callback: function() {
-          for (let i = 0; i < notification.documents.length; i++)
-            OfflineApps.allowSite(notification.documents[i], aTarget);
-        }
-      },{
-        label: strings.GetStringFromName("contentPermissions.neverForSite"),
-        accessKey: "",
-        callback: function() {
-          for (let i = 0; i < notification.documents.length; i++)
-            OfflineApps.disallowSite(notification.documents[i]);
-        }
-      }];
-
-      const priority = notificationBox.PRIORITY_INFO_LOW;
-      let message = strings.formatStringFromName("offlineApps.wantsTo", [host], 1);
-      notification = notificationBox.appendNotification(message, notificationID, "", priority, buttons);
-      notification.documents = [aRequest];
-    }
-  },
-
-  allowSite: function(aRequest, aTarget) {
-    let currentURI = Services.io.newURI(aRequest.location, aRequest.charset, null);
-    Services.perms.add(currentURI, "offline-app", Ci.nsIPermissionManager.ALLOW_ACTION);
-
-    // When a site is enabled while loading, manifest resources will start
-    // fetching immediately.  This one time we need to do it ourselves.
-    // The update must be started on the content process.
-    aTarget.messageManager.sendAsyncMessage("Browser:MozApplicationCache:Fetch", aRequest);
-  },
-
-  disallowSite: function(aRequest) {
-    let currentURI = Services.io.newURI(aRequest.location, aRequest.charset, null);
-    Services.perms.add(currentURI, "offline-app", Ci.nsIPermissionManager.DENY_ACTION);
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    if (aMessage.name == "Browser:MozApplicationManifest") {
-      this.offlineAppRequested(aMessage.json, aMessage.target);
-    }
-  }
-};
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/SelectHelperUI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/SelectHelperUI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/SelectHelperUI.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/SelectHelperUI.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,169 +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/. */
-
-"use strict";
-
-/**
- * SelectHelperUI: Provides an interface for making a choice in a list.
- *   Supports simultaneous selection of choices and group headers.
- */
-var SelectHelperUI = {
-  _list: null,
-
-  get _container() {
-    delete this._container;
-    return this._container = document.getElementById("select-container");
-  },
-
-  get _listbox() {
-    delete this._listbox;
-    return this._listbox = document.getElementById("select-commands");
-  },
-
-  get _menuPopup() {
-    let popup = document.getElementById("select-popup");
-    delete this._menuPopup;
-    return this._menuPopup = new MenuPopup(this._container, popup);
-  },
-
-  show: function selectHelperShow(aList, aTitle, aRect) {
-    if (this._list) {
-      this.reset();
-    }
-
-    this._list = aList;
-
-    this._listbox.setAttribute("seltype", aList.multiple ? "multiple" : "single");
-
-    let firstSelected = null;
-
-    // Using a fragment prevent us to hang on huge list
-    let fragment = document.createDocumentFragment();
-    let choices = aList.choices;
-    let selectedItems = [];
-    for (let i = 0; i < choices.length; i++) {
-      let choice = choices[i];
-      let item = document.createElement("richlistitem");
-      let label = document.createElement("label");
-
-      item.setAttribute("class", "option-command listitem-iconic");
-      item.setAttribute("flex", "1");
-      item.setAttribute("crop", "center");
-      label.setAttribute("value", choice.text);
-      item.appendChild(label);
-      item.setAttribute("oldstate", "false");
-      choice.disabled ? item.setAttribute("disabled", "true")
-                      : item.removeAttribute("disabled");
-
-      fragment.appendChild(item);
-
-      if (choice.group) {
-        item.classList.add("optgroup");
-        continue;
-      }
-
-      item.optionIndex = choice.optionIndex;
-      item.choiceIndex = i;
-
-      if (choice.inGroup) {
-        item.classList.add("in-optgroup");
-      }
-
-      if (choice.selected) {
-        firstSelected = firstSelected || item;
-        selectedItems.push(item);
-      }
-    }
-    this._listbox.appendChild(fragment);
-
-    this._container.addEventListener("click", this, false);
-    window.addEventListener("MozPrecisePointer", this, false);
-    this._menuPopup.show(this._positionOptions(aRect));
-
-    // Setup pre-selected items. Note, this has to happen after show.
-    this._listbox.clearSelection();
-    for (let item of selectedItems) {
-      this._listbox.addItemToSelection(item);
-      item.setAttribute("oldstate", "true");
-    }
-    this._listbox.ensureElementIsVisible(firstSelected);
-  },
-
-  reset: function selectHelperReset() {
-    this._updateControl();
-    while (this._listbox.hasChildNodes())
-      this._listbox.removeChild(this._listbox.lastChild);
-    this._list = null;
-  },
-
-  hide: function selectHelperHide() {
-    if (!this._list)
-      return;
-
-    this._container.removeEventListener("click", this, false);
-    window.removeEventListener("MozPrecisePointer", this, false);
-    this._menuPopup.hide();
-    this.reset();
-  },
-
-  _positionOptions: function _positionOptions(aRect) {
-    let browser = Browser.selectedBrowser;
-    let p0 = browser.ptBrowserToClient(aRect.left, aRect.top);
-    let p1 = browser.ptBrowserToClient(aRect.right, aRect.bottom);
-
-    return {
-      xPos: p0.x,
-      yPos: p1.y,
-      bottomAligned: false,
-      leftAligned: true
-    };
-  },
-
-  _updateControl: function _selectHelperUpdateControl() {
-    Browser.selectedBrowser.messageManager.sendAsyncMessage("FormAssist:ChoiceChange", { });
-  },
-
-  handleEvent: function selectHelperHandleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "MozPrecisePointer":
-        this.hide();
-      break;
-      case "click":
-        let item = aEvent.target;
-        if (item && item.hasOwnProperty("optionIndex")) {
-          if (this._list.multiple) {
-            // item.selected is always true here since that's how richlistbox handles
-            // mouse click events. We track our own state so that we can toggle here
-            // on click events. Iniial 'oldstate' values are setup in show above.
-            if (item.getAttribute("oldstate") == "true") {
-              item.setAttribute("oldstate", "false");
-            } else {
-              item.setAttribute("oldstate", "true");
-            }
-            // Fix up selected items - richlistbox will clear selection on click events
-            // so we need to set selection on the items the user has previously chosen.
-            this._listbox.clearSelection();
-            for (let node of this._listbox.childNodes) {
-              if (node.getAttribute("oldstate") == "true") {
-                this._listbox.addItemToSelection(node);
-              }
-            }
-          }
-          // Let the form element know we've added or removed a selected item.
-          this.onSelect(item.optionIndex, item.selected);
-        }
-        break;
-    }
-  },
-
-  onSelect: function selectHelperOnSelect(aIndex, aSelected) {
-    Browser.selectedBrowser.messageManager.sendAsyncMessage("FormAssist:ChoiceSelect", {
-      index: aIndex,
-      selected: aSelected
-    });
-    if (!this._list.multiple) {
-      this.hide();
-    }
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/SelectionHelperUI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/SelectionHelperUI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/helperui/SelectionHelperUI.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/helperui/SelectionHelperUI.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,1186 +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/. */
-
-/*
- * selection management
- */
-
-/*
- * Current monocle image:
- *  dimensions: 32 x 24
- *  circle center: 16 x 14
- *  padding top: 6
- */
-
-// Y axis scroll distance that will disable this module and cancel selection
-const kDisableOnScrollDistance = 25;
-
-// Drag hysteresis programmed into monocle drag moves
-const kDragHysteresisDistance = 10;
-
-// selection layer id returned from SelectionHandlerUI's layerMode.
-const kChromeLayer = 1;
-const kContentLayer = 2;
-
-/*
- * Markers
- */
-
-function MarkerDragger(aMarker) {
-  this._marker = aMarker;
-}
-
-MarkerDragger.prototype = {
-  _selectionHelperUI: null,
-  _marker: null,
-  _shutdown: false,
-  _dragging: false,
-
-  get marker() {
-    return this._marker;
-  },
-
-  set shutdown(aVal) {
-    this._shutdown = aVal;
-  },
-
-  get shutdown() {
-    return this._shutdown;
-  },
-
-  get dragging() {
-    return this._dragging;
-  },
-
-  freeDrag: function freeDrag() {
-    return true;
-  },
-
-  isDraggable: function isDraggable(aTarget, aContent) {
-    return { x: true, y: true };
-  },
-
-  dragStart: function dragStart(aX, aY, aTarget, aScroller) {
-    if (this._shutdown)
-      return false;
-    this._dragging = true;
-    this.marker.dragStart(aX, aY);
-    return true;
-  },
-
-  dragStop: function dragStop(aDx, aDy, aScroller) {
-    if (this._shutdown)
-      return false;
-    this._dragging = false;
-    this.marker.dragStop(aDx, aDy);
-    return true;
-  },
-
-  dragMove: function dragMove(aDx, aDy, aScroller, aIsKenetic, aClientX, aClientY) {
-    // Note if aIsKenetic is true this is synthetic movement,
-    // we don't want that so return false.
-    if (this._shutdown || aIsKenetic)
-      return false;
-    this.marker.moveBy(aDx, aDy, aClientX, aClientY);
-    // return true if we moved, false otherwise. The result
-    // is used in deciding if we should repaint between drags.
-    return true;
-  }
-}
-
-function Marker(aParent, aTag, aElementId, xPos, yPos) {
-  this._xPos = xPos;
-  this._yPos = yPos;
-  this._selectionHelperUI = aParent;
-  this._element = aParent.overlay.getMarker(aElementId);
-  this._elementId = aElementId;
-  // These get picked in input.js and receives drag input
-  this._element.customDragger = new MarkerDragger(this);
-  this.tag = aTag;
-}
-
-Marker.prototype = {
-  _element: null,
-  _elementId: "",
-  _selectionHelperUI: null,
-  _xPos: 0,
-  _yPos: 0,
-  _xDrag: 0,
-  _yDrag: 0,
-  _tag: "",
-  _hPlane: 0,
-  _vPlane: 0,
-  _restrictedToBounds: false,
-
-  // Tweak me if the monocle graphics change in any way
-  _monocleRadius: 8,
-  _monocleXHitTextAdjust: -2, 
-  _monocleYHitTextAdjust: -10,
-
-  get xPos() {
-    return this._xPos;
-  },
-
-  get yPos() {
-    return this._yPos;
-  },
-
-  get tag() {
-    return this._tag;
-  },
-
-  set tag(aVal) {
-    this._tag = aVal;
-  },
-
-  get dragging() {
-    return this._element.customDragger.dragging;
-  },
-
-  // Indicates that marker's position doesn't reflect real selection boundary
-  // but rather boundary of input control while actual selection boundaries are
-  // not visible (ex. due scrolled content).
-  get restrictedToBounds() {
-    return this._restrictedToBounds;
-  },
-
-  shutdown: function shutdown() {
-    this._element.hidden = true;
-    this._element.customDragger.shutdown = true;
-    delete this._element.customDragger;
-    this._selectionHelperUI = null;
-    this._element = null;
-  },
-
-  setTrackBounds: function setTrackBounds(aVerticalPlane, aHorizontalPlane) {
-    // monocle boundaries
-    this._hPlane = aHorizontalPlane;
-    this._vPlane = aVerticalPlane;
-  },
-
-  show: function show() {
-    this._element.hidden = false;
-  },
-
-  hide: function hide() {
-    this._element.hidden = true;
-  },
-
-  get visible() {
-    return this._element.hidden == false;
-  },
-
-  position: function position(aX, aY, aRestrictedToBounds) {
-    this._xPos = aX;
-    this._yPos = aY;
-    this._restrictedToBounds = !!aRestrictedToBounds;
-    this._setPosition();
-  },
-
-  _setPosition: function _setPosition() {
-    this._element.left = this._xPos + "px";
-    this._element.top = this._yPos + "px";
-  },
-
-  dragStart: function dragStart(aX, aY) {
-    this._xDrag = 0;
-    this._yDrag = 0;
-    this._selectionHelperUI.markerDragStart(this);
-  },
-
-  dragStop: function dragStop(aDx, aDy) {
-    this._selectionHelperUI.markerDragStop(this);
-  },
-
-  moveBy: function moveBy(aDx, aDy, aClientX, aClientY) {
-    this._xPos -= aDx;
-    this._yPos -= aDy;
-    this._xDrag -= aDx;
-    this._yDrag -= aDy;
-    // Add a bit of hysteresis to our directional detection so "big fingers"
-    // are detected accurately.
-    let direction = "tbd";
-    if (Math.abs(this._xDrag) > kDragHysteresisDistance ||
-        Math.abs(this._yDrag) > kDragHysteresisDistance) {
-      direction = (this._xDrag <= 0 && this._yDrag <= 0 ? "start" : "end");
-    }
-    // We may swap markers in markerDragMove. If markerDragMove
-    // returns true keep processing, otherwise get out of here.
-    if (this._selectionHelperUI.markerDragMove(this, direction)) {
-      this._setPosition();
-    }
-  },
-
-  hitTest: function hitTest(aX, aY) {
-    // Gets the pointer of the arrow right in the middle of the
-    // monocle.
-    aY += this._monocleYHitTextAdjust;
-    aX += this._monocleXHitTextAdjust;
-    if (aX >= (this._xPos - this._monocleRadius) &&
-        aX <= (this._xPos + this._monocleRadius) &&
-        aY >= (this._yPos - this._monocleRadius) &&
-        aY <= (this._yPos + this._monocleRadius))
-      return true;
-    return false;
-  },
-
-  swapMonocle: function swapMonocle(aCaret) {
-    let targetElement = aCaret._element;
-    let targetElementId = aCaret._elementId;
-
-    aCaret._element = this._element;
-    aCaret._element.customDragger._marker = aCaret;
-    aCaret._elementId = this._elementId;
-
-    this._xPos = aCaret._xPos;
-    this._yPos = aCaret._yPos;
-    this._element = targetElement;
-    this._element.customDragger._marker = this;
-    this._elementId = targetElementId;
-    this._element.visible = true;
-  },
-
-};
-
-/*
- * SelectionHelperUI
- */
-
-var SelectionHelperUI = {
-  _debugEvents: false,
-  _msgTarget: null,
-  _startMark: null,
-  _endMark: null,
-  _caretMark: null,
-  _target: null,
-  _showAfterUpdate: false,
-  _activeSelectionRect: null,
-  _selectionMarkIds: [],
-  _targetIsEditable: false,
-
-  /*
-   * Properties
-   */
-
-  get startMark() {
-    if (this._startMark == null) {
-      this._startMark = new Marker(this, "start", this._selectionMarkIds.pop(), 0, 0);
-    }
-    return this._startMark;
-  },
-
-  get endMark() {
-    if (this._endMark == null) {
-      this._endMark = new Marker(this, "end", this._selectionMarkIds.pop(), 0, 0);
-    }
-    return this._endMark;
-  },
-
-  get caretMark() {
-    if (this._caretMark == null) {
-      this._caretMark = new Marker(this, "caret", this._selectionMarkIds.pop(), 0, 0);
-    }
-    return this._caretMark;
-  },
-
-  get overlay() {
-    return document.getElementById(this.layerMode == kChromeLayer ?
-      "chrome-selection-overlay" : "content-selection-overlay");
-  },
-
-  get layerMode() {
-    if (this._msgTarget && this._msgTarget instanceof SelectionPrototype)
-      return kChromeLayer;
-    return kContentLayer;
-  },
-
-  /*
-   * isActive (prop)
-   *
-   * Determines if a selection edit session is currently active.
-   */
-  get isActive() {
-    return this._msgTarget ? true : false;
-  },
-
-  /*
-   * isSelectionUIVisible (prop)
-   *
-   * Determines if edit session monocles are visible. Useful
-   * in checking if selection handler is setup for tests.
-   */
-  get isSelectionUIVisible() {
-    if (!this._msgTarget || !this._startMark)
-      return false;
-    return this._startMark.visible;
-  },
-
-  /*
-   * isCaretUIVisible (prop)
-   *
-   * Determines if caret browsing monocle is visible. Useful
-   * in checking if selection handler is setup for tests.
-   */
-  get isCaretUIVisible() {
-    if (!this._msgTarget || !this._caretMark)
-      return false;
-    return this._caretMark.visible;
-  },
-
-  /*
-   * hasActiveDrag (prop)
-   *
-   * Determines if a marker is actively being dragged (missing call
-   * to markerDragStop). Useful in checking if selection handler is
-   * setup for tests.
-   */
-  get hasActiveDrag() {
-    if (!this._msgTarget)
-      return false;
-    if ((this._caretMark && this._caretMark.dragging) ||
-        (this._startMark && this._startMark.dragging) ||
-        (this._endMark && this._endMark.dragging))
-      return true;
-    return false;
-  },
-
-
-  /*
-   * Observers
-   */
-
-  observe: function (aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "attach_edit_session_to_content":
-        // We receive this from text input bindings when this module
-        // isn't accessible.
-        this.chromeTextboxClick(aSubject);
-        break;
-
-      case "apzc-transform-begin":
-        if (this.isActive && this.layerMode == kContentLayer) {
-          this._hideMonocles();
-        }
-        break;
-
-      case "apzc-transform-end":
-        // The selection range callback will check to see if the new
-        // position is off the screen, in which case it shuts down and
-        // clears the selection.
-        if (this.isActive && this.layerMode == kContentLayer) {
-          this._showAfterUpdate = true;
-          this._sendAsyncMessage("Browser:SelectionUpdate", {
-            isInitiatedByAPZC: true
-          });
-        }
-        break;
-      }
-  },
-
-  /*
-   * Public apis
-   */
-
-  /*
-   * pingSelectionHandler
-   * 
-   * Ping the SelectionHandler and wait for the right response. Insures
-   * all previous messages have been received. Useful in checking if
-   * selection handler is setup for tests.
-   *
-   * @return a promise
-   */
-  pingSelectionHandler: function pingSelectionHandler() {
-    if (!this.isActive)
-      return null;
-
-    if (this._pingCount == undefined) {
-      this._pingCount = 0;
-      this._pingArray = [];
-    }
-
-    this._pingCount++;
-
-    let deferred = Promise.defer();
-    this._pingArray.push({
-      id: this._pingCount,
-      deferred: deferred
-    });
-
-    this._sendAsyncMessage("Browser:SelectionHandlerPing", { id: this._pingCount });
-    return deferred.promise;
-  },
-
-  /*
-   * openEditSession
-   *
-   * Attempts to select underlying text at a point and begins editing
-   * the section.
-   *
-   * @param aMsgTarget - Browser or chrome message target
-   * @param aX, aY - Browser relative client coordinates.
-   * @param aSetFocus - (optional) For form inputs, requests that the focus
-   * be set to the element.
-   */
-  openEditSession: function openEditSession(aMsgTarget, aX, aY, aSetFocus) {
-    if (!aMsgTarget || this.isActive)
-      return;
-    this._init(aMsgTarget);
-    this._setupDebugOptions();
-    let setFocus = aSetFocus || false;
-    // Send this over to SelectionHandler in content, they'll message us
-    // back with information on the current selection. SelectionStart
-    // takes client coordinates.
-    this._sendAsyncMessage("Browser:SelectionStart", {
-      setFocus: setFocus,
-      xPos: aX,
-      yPos: aY
-    });
-  },
-
-  /*
-   * attachEditSession
-   *
-   * Attaches to existing selection and begins editing.
-   *
-   * @param aMsgTarget - Browser or chrome message target.
-   * @param aX Tap browser relative client X coordinate.
-   * @param aY Tap browser relative client Y coordinate.
-   * @param aTarget Actual tap target (optional).
-   */
-  attachEditSession: function attachEditSession(aMsgTarget, aX, aY, aTarget) {
-    if (!aMsgTarget || this.isActive)
-      return;
-    this._init(aMsgTarget);
-    this._setupDebugOptions();
-
-    // Send this over to SelectionHandler in content, they'll message us
-    // back with information on the current selection. SelectionAttach
-    // takes client coordinates.
-    this._sendAsyncMessage("Browser:SelectionAttach", {
-      target: aTarget,
-      xPos: aX,
-      yPos: aY
-    });
-  },
-
-  /*
-   * attachToCaret
-   * 
-   * Initiates a touch caret selection session for a text input.
-   * Can be called multiple times to move the caret marker around.
-   *
-   * Note the caret marker is pretty limited in functionality. The
-   * only thing is can do is be displayed at the caret position.
-   * Once the user starts a drag, the caret marker is hidden, and
-   * the start and end markers take over.
-   *
-   * @param aMsgTarget - Browser or chrome message target.
-   * @param aX Tap browser relative client X coordinate.
-   * @param aY Tap browser relative client Y coordinate.
-   * @param aTarget Actual tap target (optional).
-   */
-  attachToCaret: function attachToCaret(aMsgTarget, aX, aY, aTarget) {
-    if (!this.isActive) {
-      this._init(aMsgTarget);
-      this._setupDebugOptions();
-    } else {
-      this._hideMonocles();
-    }
-
-    this._lastCaretAttachment = {
-      target: aTarget,
-      xPos: aX,
-      yPos: aY
-    };
-
-    this._sendAsyncMessage("Browser:CaretAttach", {
-      target: aTarget,
-      xPos: aX,
-      yPos: aY
-    });
-  },
-
-  /*
-   * canHandleContextMenuMsg
-   *
-   * Determines if we can handle a ContextMenuHandler message.
-   */
-  canHandleContextMenuMsg: function canHandleContextMenuMsg(aMessage) {
-    if (aMessage.json.types.indexOf("content-text") != -1)
-      return true;
-    return false;
-  },
-
-  /*
-   * closeEditSession(aClearSelection)
-   *
-   * Closes an active edit session and shuts down. Does not clear existing
-   * selection regions if they exist.
-   *
-   * @param aClearSelection bool indicating if the selection handler should also
-   * clear any selection. optional, the default is false.
-   */
-  closeEditSession: function closeEditSession(aClearSelection) {
-    if (!this.isActive) {
-      return;
-    }
-    // This will callback in _selectionHandlerShutdown in
-    // which we will call _shutdown().
-    let clearSelection = aClearSelection || false;
-    this._sendAsyncMessage("Browser:SelectionClose", {
-      clearSelection: clearSelection
-    });
-  },
-
-  /*
-   * Click handler for chrome pages loaded into the browser (about:config).
-   * Called from the text input bindings via the attach_edit_session_to_content
-   * observer.
-   */
-  chromeTextboxClick: function (aEvent) {
-    this.attachEditSession(Browser.selectedTab.browser, aEvent.clientX,
-        aEvent.clientY, aEvent.target);
-  },
-
-  /*
-   * Handy debug routines that work independent of selection. They
-   * make use of the selection overlay for drawing points.
-   */
-
-  debugDisplayDebugPoint: function (aLeft, aTop, aSize, aCssColorStr, aFill) {
-    this.overlay.enabled = true;
-    this.overlay.displayDebugLayer = true;
-    this.overlay.addDebugRect(aLeft, aTop, aLeft + aSize, aTop + aSize,
-                              aCssColorStr, aFill);
-  },
-
-  debugClearDebugPoints: function () {
-    this.overlay.displayDebugLayer = false;
-    if (!this._msgTarget) {
-      this.overlay.enabled = false;
-    }
-  },
-
-  /*
-   * Init and shutdown
-   */
-
-  init: function () {
-    let os = Services.obs;
-    os.addObserver(this, "attach_edit_session_to_content", false);
-    os.addObserver(this, "apzc-transform-begin", false);
-    os.addObserver(this, "apzc-transform-end", false);
-  },
-
-  _init: function _init(aMsgTarget) {
-    // store the target message manager
-    this._msgTarget = aMsgTarget;
-
-    // Init our list of available monocle ids
-    this._setupMonocleIdArray();
-
-    // Init selection rect info
-    this._activeSelectionRect = Util.getCleanRect();
-    this._targetElementRect = Util.getCleanRect();
-
-    // SelectionHandler messages
-    messageManager.addMessageListener("Content:SelectionRange", this);
-    messageManager.addMessageListener("Content:SelectionCopied", this);
-    messageManager.addMessageListener("Content:SelectionFail", this);
-    messageManager.addMessageListener("Content:SelectionDebugRect", this);
-    messageManager.addMessageListener("Content:HandlerShutdown", this);
-    messageManager.addMessageListener("Content:SelectionHandlerPong", this);
-    messageManager.addMessageListener("Content:SelectionSwap", this);
-
-    // capture phase
-    window.addEventListener("keypress", this, true);
-    window.addEventListener("MozPrecisePointer", this, true);
-    window.addEventListener("MozDeckOffsetChanging", this, true);
-    window.addEventListener("MozDeckOffsetChanged", this, true);
-    window.addEventListener("KeyboardChanged", this, true);
-
-    // bubble phase
-    window.addEventListener("click", this, false);
-    window.addEventListener("touchstart", this, false);
-
-    Elements.browsers.addEventListener("URLChanged", this, true);
-    Elements.browsers.addEventListener("SizeChanged", this, true);
-
-    Elements.tabList.addEventListener("TabSelect", this, true);
-
-    Elements.navbar.addEventListener("transitionend", this, true);
-
-    this.overlay.enabled = true;
-  },
-
-  _shutdown: function _shutdown() {
-    messageManager.removeMessageListener("Content:SelectionRange", this);
-    messageManager.removeMessageListener("Content:SelectionCopied", this);
-    messageManager.removeMessageListener("Content:SelectionFail", this);
-    messageManager.removeMessageListener("Content:SelectionDebugRect", this);
-    messageManager.removeMessageListener("Content:HandlerShutdown", this);
-    messageManager.removeMessageListener("Content:SelectionHandlerPong", this);
-    messageManager.removeMessageListener("Content:SelectionSwap", this);
-
-    window.removeEventListener("keypress", this, true);
-    window.removeEventListener("MozPrecisePointer", this, true);
-    window.removeEventListener("MozDeckOffsetChanging", this, true);
-    window.removeEventListener("MozDeckOffsetChanged", this, true);
-    window.removeEventListener("KeyboardChanged", this, true);
-
-    window.removeEventListener("click", this, false);
-    window.removeEventListener("touchstart", this, false);
-
-    Elements.browsers.removeEventListener("URLChanged", this, true);
-    Elements.browsers.removeEventListener("SizeChanged", this, true);
-
-    Elements.tabList.removeEventListener("TabSelect", this, true);
-
-    Elements.navbar.removeEventListener("transitionend", this, true);
-
-    this._shutdownAllMarkers();
-
-    this._selectionMarkIds = [];
-    this._msgTarget = null;
-    this._activeSelectionRect = null;
-
-    this.overlay.displayDebugLayer = false;
-    this.overlay.enabled = false;
-  },
-
-  /*
-   * Utilities
-   */
-
-  /*
-   * _swapCaretMarker
-   *
-   * Swap two drag markers - used when transitioning from caret mode
-   * to selection mode. We take the current caret marker (which is in a
-   * drag state) and swap it out with one of the selection markers.
-   */
-  _swapCaretMarker: function _swapCaretMarker(aDirection) {
-    let targetMark = null;
-    if (aDirection == "start")
-      targetMark = this.startMark;
-    else
-      targetMark = this.endMark;
-    let caret = this.caretMark;
-    targetMark.swapMonocle(caret);
-    let id = caret._elementId;
-    caret.shutdown();
-    this._caretMark = null;
-    this._selectionMarkIds.push(id);
-  },
-
-  /*
-   * _transitionFromCaretToSelection
-   *
-   * Transitions from caret mode to text selection mode.
-   */
-  _transitionFromCaretToSelection: function _transitionFromCaretToSelection(aDirection) {
-    // Get selection markers initialized if they aren't already
-    { let mark = this.startMark; mark = this.endMark; }
-
-    // Swap the caret marker out for the start or end marker depending
-    // on direction.
-    this._swapCaretMarker(aDirection);
-
-    let targetMark = null;
-    if (aDirection == "start")
-      targetMark = this.startMark;
-    else
-      targetMark = this.endMark;
-
-    // Position both in the same starting location.
-    this.startMark.position(targetMark.xPos, targetMark.yPos);
-    this.endMark.position(targetMark.xPos, targetMark.yPos);
-
-    // We delay transitioning until we know which direction the user is dragging
-    // based on a hysteresis value in the drag marker code. Down in our caller, we
-    // cache the first drag position in _cachedCaretPos so we can select from the
-    // initial caret drag position. Use those values if we have them. (Note
-    // _cachedCaretPos has already been translated in _getMarkerBaseMessage.)
-    let xpos = this._cachedCaretPos ? this._cachedCaretPos.xPos :
-      this._msgTarget.ctobx(targetMark.xPos, true);
-    let ypos = this._cachedCaretPos ? this._cachedCaretPos.yPos :
-      this._msgTarget.ctoby(targetMark.yPos, true);
-
-    // Start the selection monocle drag. SelectionHandler relies on this
-    // for getting initialized. This will also trigger a message back for
-    // monocle positioning. Note, markerDragMove is still on the stack in
-    // this call!
-    this._sendAsyncMessage("Browser:SelectionSwitchMode", {
-      newMode: "selection",
-      change: targetMark.tag,
-      xPos: xpos,
-      yPos: ypos,
-    });
-  },
-
-  /*
-   * _setupDebugOptions
-   *
-   * Sends a message over to content instructing it to
-   * turn on various debug features.
-   */
-  _setupDebugOptions: function _setupDebugOptions() {
-    // Debug options for selection
-    let debugOpts = { dumpRanges: false, displayRanges: false, dumpEvents: false };
-    try {
-      if (Services.prefs.getBoolPref(kDebugSelectionDumpPref))
-        debugOpts.displayRanges = true;
-    } catch (ex) {}
-    try {
-      if (Services.prefs.getBoolPref(kDebugSelectionDisplayPref))
-        debugOpts.displayRanges = true;
-    } catch (ex) {}
-    try {
-      if (Services.prefs.getBoolPref(kDebugSelectionDumpEvents)) {
-        debugOpts.dumpEvents = true;
-        this._debugEvents = true;
-      }
-    } catch (ex) {}
-
-    if (debugOpts.displayRanges || debugOpts.dumpRanges || debugOpts.dumpEvents) {
-      // Turn on the debug layer
-      this.overlay.displayDebugLayer = true;
-      // Tell SelectionHandler what to do
-      this._sendAsyncMessage("Browser:SelectionDebug", debugOpts);
-    }
-  },
-
-  /*
-   * _sendAsyncMessage
-   *
-   * Helper for sending a message to SelectionHandler.
-   */
-  _sendAsyncMessage: function _sendAsyncMessage(aMsg, aJson) {
-    if (!this._msgTarget) {
-      if (this._debugEvents)
-        Util.dumpLn("SelectionHelperUI sendAsyncMessage could not send", aMsg);
-      return;
-    }
-    if (this._msgTarget && this._msgTarget instanceof SelectionPrototype) {
-      this._msgTarget.msgHandler(aMsg, aJson);
-    } else {
-      this._msgTarget.messageManager.sendAsyncMessage(aMsg, aJson);
-    }
-  },
-
-  _checkForActiveDrag: function _checkForActiveDrag() {
-    return (this.startMark.dragging || this.endMark.dragging ||
-            this.caretMark.dragging);
-  },
-
-  _hitTestSelection: function _hitTestSelection(aEvent) {
-    // Ignore if the double tap isn't on our active selection rect.
-    if (this._activeSelectionRect &&
-        Util.pointWithinRect(aEvent.clientX, aEvent.clientY, this._activeSelectionRect)) {
-      return true;
-    }
-    return false;
-  },
-
-  /*
-   * _setCaretPositionAtPoint - sets the current caret position.
-   *
-   * @param aX, aY - browser relative client coordinates
-   */
-  _setCaretPositionAtPoint: function _setCaretPositionAtPoint(aX, aY) {
-    let json = this._getMarkerBaseMessage("caret");
-    json.caret.xPos = aX;
-    json.caret.yPos = aY;
-    this._sendAsyncMessage("Browser:CaretUpdate", json);
-  },
-
-  /*
-   * _shutdownAllMarkers
-   *
-   * Helper for shutting down all markers and
-   * freeing the objects associated with them.
-   */
-  _shutdownAllMarkers: function _shutdownAllMarkers() {
-    if (this._startMark)
-      this._startMark.shutdown();
-    if (this._endMark)
-      this._endMark.shutdown();
-    if (this._caretMark)
-      this._caretMark.shutdown();
-
-    this._startMark = null;
-    this._endMark = null;
-    this._caretMark = null;
-  },
-
-  /*
-   * _setupMonocleIdArray
-   *
-   * Helper for initing the array of monocle anon ids.
-   */
-  _setupMonocleIdArray: function _setupMonocleIdArray() {
-    this._selectionMarkIds = ["selectionhandle-mark1",
-                              "selectionhandle-mark2",
-                              "selectionhandle-mark3"];
-  },
-
-  _hideMonocles: function _hideMonocles() {
-    if (this._startMark) {
-      this.startMark.hide();
-    }
-    if (this._endMark) {
-      this.endMark.hide();
-    }
-    if (this._caretMark) {
-      this.caretMark.hide();
-    }
-  },
-
-  _showMonocles: function _showMonocles(aSelection) {
-    if (!aSelection) {
-      if (this._checkMonocleVisibility(this.caretMark.xPos, this.caretMark.yPos)) {
-        this.caretMark.show();
-      }
-    } else {
-      if (this._checkMonocleVisibility(this.endMark.xPos, this.endMark.yPos)) {
-        this.endMark.show();
-      }
-      if (this._checkMonocleVisibility(this.startMark.xPos, this.startMark.yPos)) {
-        this.startMark.show();
-      }
-    }
-  },
-
-  _checkMonocleVisibility: function(aX, aY) {
-    let viewport = Browser.selectedBrowser.contentViewportBounds;
-    aX = this._msgTarget.ctobx(aX);
-    aY = this._msgTarget.ctoby(aY);
-    if (aX < viewport.x || aY < viewport.y ||
-        aX > (viewport.x + viewport.width) ||
-        aY > (viewport.y + viewport.height)) {
-      return false;
-    }
-    return true;
-  },
-
-  /*
-   * Event handlers for document events
-   */
-
-  /*
-   * Handles taps that move the current caret around in text edits,
-   * clear active selection and focus when necessary, or change
-   * modes. Only active after SelectionHandlerUI is initialized.
-   */
-  _onClick: function(aEvent) {
-    if (this.layerMode == kChromeLayer && this._targetIsEditable) {
-      this.attachToCaret(this._msgTarget, aEvent.clientX, aEvent.clientY,
-          aEvent.target);
-    }
-  },
-
-  _onKeypress: function _onKeypress() {
-    this.closeEditSession();
-  },
-
-  _onResize: function _onResize() {
-    this._sendAsyncMessage("Browser:SelectionUpdate", {});
-  },
-
-  /*
-   * _onDeckOffsetChanging - fired by ContentAreaObserver before the browser
-   * deck is shifted for form input access in response to a soft keyboard
-   * display.
-   */
-  _onDeckOffsetChanging: function _onDeckOffsetChanging(aEvent) {
-    // Hide the monocles temporarily
-    this._hideMonocles();
-  },
-
-  /*
-   * _onDeckOffsetChanged - fired by ContentAreaObserver after the browser
-   * deck is shifted for form input access in response to a soft keyboard
-   * display.
-   */
-  _onDeckOffsetChanged: function _onDeckOffsetChanged(aEvent) {
-    // Update the monocle position and display
-    this.attachToCaret(null, this._lastCaretAttachment.xPos,
-        this._lastCaretAttachment.yPos, this._lastCaretAttachment.target);
-  },
-
-  /*
-   * Detects when the nav bar transitions, so we can enable selection at the
-   * appropriate location once the transition is complete, or shutdown
-   * selection down when the nav bar is hidden.
-   */
-  _onNavBarTransitionEvent: function _onNavBarTransitionEvent(aEvent) {
-    // Ignore when selection is in content
-    if (this.layerMode == kContentLayer) {
-      return;
-    }
-
-    // After tansitioning up, show the monocles
-    if (Elements.navbar.isShowing) {
-      this._showAfterUpdate = true;
-      this._sendAsyncMessage("Browser:SelectionUpdate", {});
-    }
-  },
-
-  _onKeyboardChangedEvent: function _onKeyboardChangedEvent() {
-    if (!this.isActive || this.layerMode == kContentLayer) {
-      return;
-    }
-    this._sendAsyncMessage("Browser:SelectionUpdate", {});
-  },
-
-  /*
-   * Event handlers for message manager
-   */
-
-  _onDebugRectRequest: function _onDebugRectRequest(aMsg) {
-    this.overlay.addDebugRect(aMsg.left, aMsg.top, aMsg.right, aMsg.bottom,
-                              aMsg.color, aMsg.fill, aMsg.id);
-  },
-
-  _selectionHandlerShutdown: function _selectionHandlerShutdown() {
-    this._shutdown();
-  },
-
-  _selectionSwap: function _selectionSwap() {
-    [this.startMark.tag, this.endMark.tag] = [this.endMark.tag,
-        this.startMark.tag];
-    [this._startMark, this._endMark] = [this.endMark, this.startMark];
-  },
-
-  /*
-   * Message handlers
-   */
-
-  _onSelectionCopied: function _onSelectionCopied(json) {
-    this.closeEditSession(true);
-  },
-
-  _onSelectionRangeChange: function _onSelectionRangeChange(json) {
-    let haveSelectionRect = true;
-
-    if (json.updateStart) {
-      let x = this._msgTarget.btocx(json.start.xPos, true);
-      let y = this._msgTarget.btocy(json.start.yPos, true);
-      this.startMark.position(x, y, json.start.restrictedToBounds);
-    }
-
-    if (json.updateEnd) {
-      let x = this._msgTarget.btocx(json.end.xPos, true);
-      let y = this._msgTarget.btocy(json.end.yPos, true);
-      this.endMark.position(x, y, json.end.restrictedToBounds);
-    }
-
-    if (json.updateCaret) {
-      let x = this._msgTarget.btocx(json.caret.xPos, true);
-      let y = this._msgTarget.btocy(json.caret.yPos, true);
-      // If selectionRangeFound is set SelectionHelper found a range we can
-      // attach to. If not, there's no text in the control, and hence no caret
-      // position information we can use.
-      haveSelectionRect = json.selectionRangeFound;
-      if (json.selectionRangeFound) {
-        this.caretMark.position(x, y);
-        this._showMonocles(false);
-      }
-    }
-
-    if (this._showAfterUpdate) {
-      this._showAfterUpdate = false;
-      this._showMonocles(!json.updateCaret);
-    }
-
-    this._targetIsEditable = json.targetIsEditable;
-    this._activeSelectionRect = haveSelectionRect ?
-      this._msgTarget.rectBrowserToClient(json.selection, true) :
-      this._activeSelectionRect = Util.getCleanRect();
-    this._targetElementRect =
-      this._msgTarget.rectBrowserToClient(json.element, true);
-
-    // If this is the end of a selection move show the appropriate
-    // monocle images. src=(start, update, end, caret)
-    if (json.src == "start" || json.src == "end") {
-      this._showMonocles(true);
-    }
-  },
-
-  _onSelectionFail: function _onSelectionFail() {
-    Util.dumpLn("failed to get a selection.");
-    this.closeEditSession();
-  },
-
-  /*
-   * _onPong
-   *
-   * Handles the closure of promise we return when we send a ping
-   * to SelectionHandler in pingSelectionHandler. Testing use.
-   */
-  _onPong: function _onPong(aId) {
-    let ping = this._pingArray.pop();
-    if (ping.id != aId) {
-      ping.deferred.reject(
-        new Error("Selection module's pong doesn't match our last ping."));
-    }
-    ping.deferred.resolve();
-   },
-
-  /*
-   * Events
-   */
-
-  handleEvent: function handleEvent(aEvent) {
-    if (this._debugEvents && aEvent.type != "touchmove") {
-      Util.dumpLn("SelectionHelperUI:", aEvent.type);
-    }
-    switch (aEvent.type) {
-      case "click":
-        this._onClick(aEvent);
-        break;
-
-      case "touchstart": {
-        if (aEvent.touches.length != 1)
-          break;
-        // Only prevent default if we're dragging so that
-        // APZC doesn't scroll.
-        if (this._checkForActiveDrag()) {
-          aEvent.preventDefault();
-        }
-        break;
-      }
-
-      case "keypress":
-        this._onKeypress(aEvent);
-        break;
-
-      case "SizeChanged":
-        this._onResize(aEvent);
-        break;
-
-      case "URLChanged":
-      case "TabSelect":
-        this._shutdown();
-        break;
-
-      case "MozPrecisePointer":
-        this.closeEditSession(true);
-        break;
-
-      case "MozDeckOffsetChanging":
-        this._onDeckOffsetChanging(aEvent);
-        break;
-
-      case "MozDeckOffsetChanged":
-        this._onDeckOffsetChanged(aEvent);
-        break;
-
-      case "transitionend":
-        this._onNavBarTransitionEvent(aEvent);
-        break;
-
-      case "KeyboardChanged":
-        this._onKeyboardChangedEvent();
-        break;
-    }
-  },
-
-  receiveMessage: function sh_receiveMessage(aMessage) {
-    if (this._debugEvents) Util.dumpLn("SelectionHelperUI:", aMessage.name);
-    let json = aMessage.json;
-    switch (aMessage.name) {
-      case "Content:SelectionFail":
-        this._onSelectionFail();
-        break;
-      case "Content:SelectionRange":
-        this._onSelectionRangeChange(json);
-        break;
-      case "Content:SelectionCopied":
-        this._onSelectionCopied(json);
-        break;
-      case "Content:SelectionDebugRect":
-        this._onDebugRectRequest(json);
-        break;
-      case "Content:HandlerShutdown":
-        this._selectionHandlerShutdown();
-        break;
-      case "Content:SelectionSwap":
-        this._selectionSwap();
-        break;
-      case "Content:SelectionHandlerPong":
-        this._onPong(json.id);
-        break;
-    }
-  },
-
-  /*
-   * Callbacks from markers
-   */
-
-  _getMarkerBaseMessage: function _getMarkerBaseMessage(aMarkerTag) {
-    return {
-      change: aMarkerTag,
-      start: {
-        xPos: this._msgTarget.ctobx(this.startMark.xPos, true),
-        yPos: this._msgTarget.ctoby(this.startMark.yPos, true),
-        restrictedToBounds: this.startMark.restrictedToBounds
-      },
-      end: {
-        xPos: this._msgTarget.ctobx(this.endMark.xPos, true),
-        yPos: this._msgTarget.ctoby(this.endMark.yPos, true),
-        restrictedToBounds: this.endMark.restrictedToBounds
-      },
-      caret: {
-        xPos: this._msgTarget.ctobx(this.caretMark.xPos, true),
-        yPos: this._msgTarget.ctoby(this.caretMark.yPos, true)
-      },
-    };
-  },
-
-  markerDragStart: function markerDragStart(aMarker) {
-    let json = this._getMarkerBaseMessage(aMarker.tag);
-    if (aMarker.tag == "caret") {
-      // Cache for when we start the drag in _transitionFromCaretToSelection.
-      if (!this._cachedCaretPos) {
-        this._cachedCaretPos = this._getMarkerBaseMessage(aMarker.tag).caret;
-      }
-      return;
-    }
-    this._sendAsyncMessage("Browser:SelectionMoveStart", json);
-  },
-
-  markerDragStop: function markerDragStop(aMarker) {
-    let json = this._getMarkerBaseMessage(aMarker.tag);
-    if (aMarker.tag == "caret") {
-      this._cachedCaretPos = null;
-      return;
-    }
-    this._sendAsyncMessage("Browser:SelectionMoveEnd", json);
-  },
-
-  markerDragMove: function markerDragMove(aMarker, aDirection) {
-    if (aMarker.tag == "caret") {
-      // If direction is "tbd" the drag monocle hasn't determined which
-      // direction the user is dragging.
-      if (aDirection != "tbd") {
-        // We are going to transition from caret browsing mode to selection
-        // mode on drag. So swap the caret monocle for a start or end monocle
-        // depending on the direction of the drag, and start selecting text.
-        this._transitionFromCaretToSelection(aDirection);
-        return false;
-      }
-      return true;
-    }
-    this._cachedCaretPos = null;
-
-    // We'll re-display these after the drag is complete.
-    this._hideMonocles();
-
-    let json = this._getMarkerBaseMessage(aMarker.tag);
-    this._sendAsyncMessage("Browser:SelectionMove", json);
-    return true;
-  },
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/input.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/input.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/input.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/input.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,1052 +0,0 @@
-// -*- indent-tabs-mode: nil; js-indent-level: 2; js2-strict-trailing-comma-warning: 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/. */
-
-Components.utils.import("resource://gre/modules/Geometry.jsm");
-
-/*
- * Drag scrolling related constants
- */
-
-// maximum drag distance in inches while axis locking can still be reverted
-const kAxisLockRevertThreshold = 0.8;
-
-// Same as NS_EVENT_STATE_ACTIVE from mozilla/EventStates.h
-const kStateActive = 0x00000001;
-
-// After a drag begins, kinetic panning is stopped if the drag doesn't become
-// a pan in 300 milliseconds.
-const kStopKineticPanOnDragTimeout = 300;
-
-// Min/max velocity of kinetic panning. This is in pixels/millisecond.
-const kMinVelocity = 0.4;
-const kMaxVelocity = 6;
-
-/*
- * prefs
- */
-
-// Display rects around selection ranges. Useful in debugging
-// selection problems.
-const kDebugSelectionDisplayPref = "metro.debug.selection.displayRanges";
-// Dump range rect data to the console. Very useful, but also slows
-// things down a lot.
-const kDebugSelectionDumpPref = "metro.debug.selection.dumpRanges";
-// Dump message manager event traffic for selection.
-const kDebugSelectionDumpEvents = "metro.debug.selection.dumpEvents";
-const kAsyncPanZoomEnabled = "layers.async-pan-zoom.enabled"
-
-/**
- * TouchModule
- *
- * Handles all touch-related input such as dragging and tapping.
- *
- * The Fennec chrome DOM tree has elements that are augmented dynamically with
- * custom JS properties that tell the TouchModule they have custom support for
- * either dragging or clicking.  These JS properties are JS objects that expose
- * an interface supporting dragging or clicking (though currently we only look
- * to drag scrollable elements).
- *
- * A custom dragger is a JS property that lives on a scrollable DOM element,
- * accessible as myElement.customDragger.  The customDragger must support the
- * following interface:  (The `scroller' argument is given for convenience, and
- * is the object reference to the element's scrollbox object).
- *
- *   dragStart(cX, cY, target, scroller)
- *     Signals the beginning of a drag.  Coordinates are passed as
- *     client coordinates. target is copied from the event.
- *
- *   dragStop(dx, dy, scroller)
- *     Signals the end of a drag.  The dx, dy parameters may be non-zero to
- *     indicate one last drag movement.
- *
- *   dragMove(dx, dy, scroller, isKinetic)
- *     Signals an input attempt to drag by dx, dy.
- *
- * There is a default dragger in case a scrollable element is dragged --- see
- * the defaultDragger prototype property.
- */
-
-var TouchModule = {
-  _debugEvents: false,
-  _isCancelled: false,
-  _isCancellable: false,
-
-  init: function init() {
-    this._dragData = new DragData();
-
-    this._dragger = null;
-
-    this._targetScrollbox = null;
-    this._targetScrollInterface = null;
-
-    this._kinetic = new KineticController(this._dragBy.bind(this),
-                                          this._kineticStop.bind(this));
-
-    // capture phase events
-    window.addEventListener("CancelTouchSequence", this, true);
-    window.addEventListener("keydown", this, true);
-    window.addEventListener("MozMouseHittest", this, true);
-
-    // bubble phase
-    window.addEventListener("contextmenu", this, false);
-    window.addEventListener("touchstart", this, false);
-    window.addEventListener("touchmove", this, false);
-    window.addEventListener("touchend", this, false);
-
-    Services.obs.addObserver(this, "Gesture:SingleTap", false);
-    Services.obs.addObserver(this, "Gesture:DoubleTap", false);
-  },
-
-  /*
-   * Events
-   */
-
-  handleEvent: function handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "contextmenu":
-        this._onContextMenu(aEvent);
-        break;
-
-      case "CancelTouchSequence":
-        this.cancelPending();
-        break;
-
-      default: {
-        if (this._debugEvents) {
-          if (aEvent.type != "touchmove")
-            Util.dumpLn("TouchModule:", aEvent.type, aEvent.target);
-        }
-
-        switch (aEvent.type) {
-          case "touchstart":
-            this._onTouchStart(aEvent);
-            break;
-          case "touchmove":
-            this._onTouchMove(aEvent);
-            break;
-          case "touchend":
-            this._onTouchEnd(aEvent);
-            break;
-          case "keydown":
-            this._handleKeyDown(aEvent);
-            break;
-          case "MozMouseHittest":
-            // Used by widget to hit test chrome vs content. Make sure the XUl scrollbars
-            // are counted as "chrome". Since the XUL scrollbars have sub-elements we walk
-            // the parent chain to ensure we catch all of those as well.
-            let onScrollbar = false;
-            for (let node = aEvent.originalTarget; node instanceof XULElement; node = node.parentNode) {
-              if (node.tagName == 'scrollbar') {
-                onScrollbar = true;
-                break;
-              }
-            }
-            if (onScrollbar || aEvent.target.ownerDocument == document) {
-              aEvent.preventDefault();
-            }
-            aEvent.stopPropagation();
-            break;
-        }
-      }
-    }
-  },
-
-  _handleKeyDown: function _handleKeyDown(aEvent) {
-    const TABKEY = 9;
-    if (aEvent.keyCode == TABKEY && !InputSourceHelper.isPrecise) {
-      if (Util.isEditable(aEvent.target) &&
-          aEvent.target.selectionStart != aEvent.target.selectionEnd) {
-        SelectionHelperUI.closeEditSession(false);
-      }
-      setTimeout(function() {
-        let element = Browser.selectedBrowser.contentDocument.activeElement;
-        // We only want to attach monocles if we have an input, text area,
-        // there is selection, and the target element changed.
-        // Sometimes the target element won't change even though selection is
-        // cleared because of focus outside the browser.
-        if (Util.isEditable(element) &&
-            !SelectionHelperUI.isActive &&
-            element.selectionStart != element.selectionEnd &&
-            // not e10s friendly
-            aEvent.target != element) {
-              let rect = element.getBoundingClientRect();
-              SelectionHelperUI.attachEditSession(Browser.selectedBrowser,
-                                                  rect.left + rect.width / 2,
-                                                  rect.top + rect.height / 2);
-        }
-      }, 50);
-    }
-  },
-
-  observe: function BrowserUI_observe(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "Gesture:SingleTap":
-      case "Gesture:DoubleTap":
-        Browser.selectedBrowser.messageManager.sendAsyncMessage(aTopic, JSON.parse(aData));
-        break;
-    }
-  },
-
-
-  sample: function sample(aTimeStamp) {
-    this._waitingForPaint = false;
-  },
-
-  /**
-   * This gets invoked by the input handler if another module grabs.  We should
-   * reset our state or something here.  This is probably doing the wrong thing
-   * in its current form.
-   */
-  cancelPending: function cancelPending() {
-    this._doDragStop();
-
-    // Kinetic panning may have already been active or drag stop above may have
-    // made kinetic panning active.
-    this._kinetic.end();
-
-    this._targetScrollbox = null;
-    this._targetScrollInterface = null;
-  },
-
-  _onContextMenu: function _onContextMenu(aEvent) {
-    // bug 598965 - chrome UI should stop to be pannable once the
-    // context menu has appeared.
-    if (ContextMenuUI.popupState) {
-      this.cancelPending();
-    }
-  },
-
-  /** Begin possible pan and send tap down event. */
-  _onTouchStart: function _onTouchStart(aEvent) {
-    if (aEvent.touches.length > 1)
-      return;
-
-    this._isCancelled = false;
-    this._isCancellable = true;
-
-    if (aEvent.defaultPrevented) {
-      this._isCancelled = true;
-      return;
-    }
-
-    let dragData = this._dragData;
-    if (dragData.dragging) {
-      // Somehow a mouse up was missed.
-      this._doDragStop();
-    }
-    dragData.reset();
-    this.dX = 0;
-    this.dY = 0;
-
-    // walk up the DOM tree in search of nearest scrollable ancestor.  nulls are
-    // returned if none found.
-    let [targetScrollbox, targetScrollInterface, dragger]
-      = ScrollUtils.getScrollboxFromElement(aEvent.originalTarget);
-
-    // stop kinetic panning if targetScrollbox has changed
-    if (this._kinetic.isActive() && this._dragger != dragger)
-      this._kinetic.end();
-
-    this._targetScrollbox = targetScrollInterface ? targetScrollInterface.element : targetScrollbox;
-    this._targetScrollInterface = targetScrollInterface;
-
-    if (!this._targetScrollbox) {
-      return;
-    }
-
-    // Don't allow kinetic panning if APZC is enabled and the pan element is the deck
-    let deck = document.getElementById("browsers");
-    if (Services.prefs.getBoolPref(kAsyncPanZoomEnabled) &&
-        this._targetScrollbox == deck) {
-      return;
-    }
-
-    // XXX shouldn't dragger always be valid here?
-    if (dragger) {
-      let draggable = dragger.isDraggable(targetScrollbox, targetScrollInterface);
-      dragData.locked = !draggable.x || !draggable.y;
-      if (draggable.x || draggable.y) {
-        this._dragger = dragger;
-        if (dragger.freeDrag)
-          dragData.alwaysFreeDrag = dragger.freeDrag();
-        this._doDragStart(aEvent, draggable);
-      }
-    }
-  },
-
-  /** Send tap up event and any necessary full taps. */
-  _onTouchEnd: function _onTouchEnd(aEvent) {
-    if (aEvent.touches.length > 0 || this._isCancelled || !this._targetScrollbox)
-      return;
-
-    // onMouseMove will not record the delta change if we are waiting for a
-    // paint. Since this is the last input for this drag, we override the flag.
-    this._waitingForPaint = false;
-    this._onTouchMove(aEvent);
-
-    let dragData = this._dragData;
-    this._doDragStop();
-  },
-
-  /**
-   * If we're in a drag, do what we have to do to drag on.
-   */
-  _onTouchMove: function _onTouchMove(aEvent) {
-    if (aEvent.touches.length > 1)
-      return;
-
-    if (this._isCancellable) {
-      // only the first touchmove is cancellable.
-      this._isCancellable = false;
-      if (aEvent.defaultPrevented) {
-        this._isCancelled = true;
-      }
-    }
-
-    if (this._isCancelled)
-      return;
-
-    let touch = aEvent.changedTouches[0];
-    if (!this._targetScrollbox) {
-      return;
-    }
-
-    let dragData = this._dragData;
-
-    if (dragData.dragging) {
-      let oldIsPan = dragData.isPan();
-      dragData.setDragPosition(touch.screenX, touch.screenY);
-      dragData.setMousePosition(touch);
-
-      // Kinetic panning is sensitive to time. It is more stable if it receives
-      // the mousemove events as they come. For dragging though, we only want
-      // to call _dragBy if we aren't waiting for a paint (so we don't spam the
-      // main browser loop with a bunch of redundant paints).
-      //
-      // Here, we feed kinetic panning drag differences for mouse events as
-      // come; for dragging, we build up a drag buffer in this.dX/this.dY and
-      // release it when we are ready to paint.
-      //
-      let [sX, sY] = dragData.panPosition();
-      this.dX += dragData.prevPanX - sX;
-      this.dY += dragData.prevPanY - sY;
-
-      if (dragData.isPan()) {
-        // Only pan when mouse event isn't part of a click. Prevent jittering on tap.
-        this._kinetic.addData(sX - dragData.prevPanX, sY - dragData.prevPanY);
-
-        // dragBy will reset dX and dY values to 0
-        this._dragBy(this.dX, this.dY);
-
-        // Let everyone know when mousemove begins a pan
-        if (!oldIsPan && dragData.isPan()) {
-          let event = document.createEvent("Events");
-          event.initEvent("PanBegin", true, false);
-          this._targetScrollbox.dispatchEvent(event);
-
-          Browser.selectedBrowser.messageManager.sendAsyncMessage("Browser:PanBegin", {});
-        }
-      }
-    }
-  },
-
-  /**
-   * Inform our dragger of a dragStart.
-   */
-  _doDragStart: function _doDragStart(aEvent, aDraggable) {
-    let touch = aEvent.changedTouches[0];
-    let dragData = this._dragData;
-    dragData.setDragStart(touch.screenX, touch.screenY, aDraggable);
-    this._kinetic.addData(0, 0);
-    this._dragStartTime = Date.now();
-    if (!this._kinetic.isActive()) {
-      this._dragger.dragStart(touch.clientX, touch.clientY, touch.target, this._targetScrollInterface);
-    }
-  },
-
-  /** Finish a drag. */
-  _doDragStop: function _doDragStop() {
-    let dragData = this._dragData;
-    if (!dragData.dragging)
-      return;
-
-    dragData.endDrag();
-
-    // Note: it is possible for kinetic scrolling to be active from a
-    // mousedown/mouseup event previous to this one. In this case, we
-    // want the kinetic panner to tell our drag interface to stop.
-
-    if (dragData.isPan()) {
-      if (Date.now() - this._dragStartTime > kStopKineticPanOnDragTimeout)
-        this._kinetic._velocity.set(0, 0);
-
-      // Start kinetic pan if we aren't using async pan zoom or the scroll
-      // element is not browsers.
-      let deck = document.getElementById("browsers");
-      if (!Services.prefs.getBoolPref(kAsyncPanZoomEnabled) ||
-          this._targetScrollbox != deck) {
-        this._kinetic.start();
-      }
-    } else {
-      this._kinetic.end();
-      if (this._dragger)
-        this._dragger.dragStop(0, 0, this._targetScrollInterface);
-      this._dragger = null;
-    }
-  },
-
-  /**
-   * Used by _onTouchMove() above and by KineticController's timer to do the
-   * actual dragMove signalling to the dragger.  We'd put this in _onTouchMove()
-   * but then KineticController would be adding to its own data as it signals
-   * the dragger of dragMove()s.
-   */
-  _dragBy: function _dragBy(dX, dY, aIsKinetic) {
-    let dragged = true;
-    let dragData = this._dragData;
-    if (!this._waitingForPaint || aIsKinetic) {
-      let dragData = this._dragData;
-      dragged = this._dragger.dragMove(dX, dY, this._targetScrollInterface, aIsKinetic,
-                                       dragData._mouseX, dragData._mouseY);
-      if (dragged && !this._waitingForPaint) {
-        this._waitingForPaint = true;
-        mozRequestAnimationFrame(this);
-      }
-      this.dX = 0;
-      this.dY = 0;
-    }
-    if (!dragData.isPan())
-      this._kinetic.pause();
-
-    return dragged;
-  },
-
-  /** Callback for kinetic scroller. */
-  _kineticStop: function _kineticStop() {
-    // Kinetic panning could finish while user is panning, so don't finish
-    // the pan just yet.
-    let dragData = this._dragData;
-    if (!dragData.dragging) {
-      if (this._dragger)
-        this._dragger.dragStop(0, 0, this._targetScrollInterface);
-      this._dragger = null;
-
-      let event = document.createEvent("Events");
-      event.initEvent("PanFinished", true, false);
-      this._targetScrollbox.dispatchEvent(event);
-    }
-  },
-
-  toString: function toString() {
-    return '[TouchModule] {'
-      + '\n\tdragData=' + this._dragData + ', '
-      + 'dragger=' + this._dragger + ', '
-      + '\n\ttargetScroller=' + this._targetScrollInterface + '}';
-  },
-};
-
-var ScrollUtils = {
-  // threshold in pixels for sensing a tap as opposed to a pan
-  get tapRadius() {
-    let dpi = Util.displayDPI;
-    delete this.tapRadius;
-    return this.tapRadius = Services.prefs.getIntPref("ui.dragThresholdX") / 240 * dpi;
-  },
-
-  /**
-   * Walk up (parentward) the DOM tree from elem in search of a scrollable element.
-   * Return the element and its scroll interface if one is found, two nulls otherwise.
-   *
-   * This function will cache the pointer to the scroll interface on the element itself,
-   * so it is safe to call it many times without incurring the same XPConnect overhead
-   * as in the initial call.
-   */
-  getScrollboxFromElement: function getScrollboxFromElement(elem) {
-    let scrollbox = null;
-    let qinterface = null;
-
-    // if element is content or the startui page, get the browser scroll interface
-    if (elem.ownerDocument == Browser.selectedBrowser.contentDocument) {
-      elem = Browser.selectedBrowser;
-    }
-    for (; elem; elem = elem.parentNode) {
-      try {
-        if (elem.anonScrollBox) {
-          scrollbox = elem.anonScrollBox;
-          qinterface = scrollbox.boxObject;
-        } else if (elem.scrollBoxObject) {
-          scrollbox = elem;
-          qinterface = elem.scrollBoxObject;
-          break;
-        } else if (elem.customDragger) {
-          scrollbox = elem;
-          break;
-        } else if (elem.boxObject) {
-          let qi = (elem._cachedSBO) ? elem._cachedSBO
-                                     : elem.boxObject;
-          if (qi) {
-            scrollbox = elem;
-            scrollbox._cachedSBO = qinterface = qi;
-            break;
-          }
-        }
-      } catch (e) { /* we aren't here to deal with your exceptions, we'll just keep
-                       traversing until we find something more well-behaved, as we
-                       prefer default behaviour to whiny scrollers. */ }
-    }
-    return [scrollbox, qinterface, (scrollbox ? (scrollbox.customDragger || this._defaultDragger) : null)];
-  },
-
-  /** Determine if the distance moved can be considered a pan */
-  isPan: function isPan(aPoint, aPoint2) {
-    return (Math.abs(aPoint.x - aPoint2.x) > this.tapRadius ||
-            Math.abs(aPoint.y - aPoint2.y) > this.tapRadius);
-  },
-
-  /**
-   * The default dragger object used by TouchModule when dragging a scrollable
-   * element that provides no customDragger.  Simply performs the expected
-   * regular scrollBy calls on the scroller.
-   */
-  _defaultDragger: {
-    isDraggable: function isDraggable(target, scroller) {
-      let rect = target.getBoundingClientRect();
-      return { x: (scroller.scrolledWidth > rect.width   || scroller.positionX != 0),
-               y: (scroller.scrolledHeight > rect.height || scroller.positionY != 0) };
-    },
-
-    dragStart: function dragStart(cx, cy, target, scroller) {
-      scroller.element.addEventListener("PanBegin", this._showScrollbars, false);
-    },
-
-    dragStop: function dragStop(dx, dy, scroller) {
-      scroller.element.removeEventListener("PanBegin", this._showScrollbars, false);
-      return this.dragMove(dx, dy, scroller);
-    },
-
-    dragMove: function dragMove(dx, dy, scroller) {
-        try {
-        let oldX = scroller.positionX,
-            oldY = scroller.positionY;
-
-          scroller.scrollBy(dx, dy);
-
-        let newX = scroller.positionX,
-            newY = scroller.positionY;
-
-        return (newX != oldX) || (newY != oldY);
-
-        } catch (e) { /* we have no time for whiny scrollers! */ }
-      return false;
-    },
-
-    _showScrollbars: function _showScrollbars(aEvent) {
-      let scrollbox = aEvent.target;
-      scrollbox.setAttribute("panning", "true");
-
-      let hideScrollbars = function() {
-        scrollbox.removeEventListener("PanFinished", hideScrollbars, false);
-        scrollbox.removeEventListener("CancelTouchSequence", hideScrollbars, false);
-        scrollbox.removeAttribute("panning");
-      }
-
-      // Wait for panning to be completely finished before removing scrollbars
-      scrollbox.addEventListener("PanFinished", hideScrollbars, false);
-      scrollbox.addEventListener("CancelTouchSequence", hideScrollbars, false);
-    }
-  }
-};
-
-/**
- * DragData handles processing drags on the screen, handling both
- * locking of movement on one axis, and click detection.
- */
-function DragData() {
-  this._domUtils = Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
-  this._lockRevertThreshold = Util.displayDPI * kAxisLockRevertThreshold;
-  this.reset();
-};
-
-DragData.prototype = {
-  reset: function reset() {
-    this.dragging = false;
-    this.sX = null;
-    this.sY = null;
-    this.locked = false;
-    this.stayLocked = false;
-    this.alwaysFreeDrag = false;
-    this.lockedX = null;
-    this.lockedY = null;
-    this._originX = null;
-    this._originY = null;
-    this.prevPanX = null;
-    this.prevPanY = null;
-    this._isPan = false;
-  },
-
-  /** Depending on drag data, locks sX,sY to X-axis or Y-axis of start position. */
-  _lockAxis: function _lockAxis(sX, sY) {
-    if (this.locked) {
-      if (this.lockedX !== null)
-        sX = this.lockedX;
-      else if (this.lockedY !== null)
-        sY = this.lockedY;
-      return [sX, sY];
-    }
-    else {
-      return [this._originX, this._originY];
-    }
-  },
-
-  setMousePosition: function setMousePosition(aEvent) {
-    this._mouseX = aEvent.clientX;
-    this._mouseY = aEvent.clientY;
-  },
-
-  setDragPosition: function setDragPosition(sX, sY) {
-    // Check if drag is now a pan.
-    if (!this._isPan) {
-      this._isPan = ScrollUtils.isPan(new Point(this._originX, this._originY), new Point(sX, sY));
-      if (this._isPan) {
-        this._resetActive();
-      }
-    }
-
-    // If now a pan, mark previous position where panning was.
-    if (this._isPan) {
-      let absX = Math.abs(this._originX - sX);
-      let absY = Math.abs(this._originY - sY);
-
-      if (absX > this._lockRevertThreshold || absY > this._lockRevertThreshold)
-        this.stayLocked = true;
-
-      // After the first lock, see if locking decision should be reverted.
-      if (!this.stayLocked) {
-        if (this.lockedX && absX > 3 * absY)
-          this.lockedX = null;
-        else if (this.lockedY && absY > 3 * absX)
-          this.lockedY = null;
-      }
-
-      if (!this.locked) {
-        // look at difference from origin coord to lock movement, but only
-        // do it if initial movement is sufficient to detect intent
-
-        // divide possibilty space into eight parts.  Diagonals will allow
-        // free movement, while moving towards a cardinal will lock that
-        // axis.  We pick a direction if you move more than twice as far
-        // on one axis than another, which should be an angle of about 30
-        // degrees from the axis
-
-        if (absX > 2.5 * absY)
-          this.lockedY = sY;
-        else if (absY > absX)
-          this.lockedX = sX;
-
-        this.locked = true;
-      }
-    }
-
-    // Never lock if the dragger requests it
-    if (this.alwaysFreeDrag) {
-      this.lockedY = null;
-      this.lockedX = null;
-    }
-
-    // After pan lock, figure out previous panning position. Base it on last drag
-    // position so there isn't a jump in panning.
-    let [prevX, prevY] = this._lockAxis(this.sX, this.sY);
-    this.prevPanX = prevX;
-    this.prevPanY = prevY;
-
-    this.sX = sX;
-    this.sY = sY;
-  },
-
-  setDragStart: function setDragStart(screenX, screenY, aDraggable) {
-    this.sX = this._originX = screenX;
-    this.sY = this._originY = screenY;
-    this.dragging = true;
-
-    // If the target area is pannable only in one direction lock it early
-    // on the right axis
-    this.lockedX = !aDraggable.x ? screenX : null;
-    this.lockedY = !aDraggable.y ? screenY : null;
-    this.stayLocked = this.lockedX || this.lockedY;
-    this.locked = this.stayLocked;
-  },
-
-  endDrag: function endDrag() {
-    this._resetActive();
-    this.dragging = false;
-  },
-
-  /** Returns true if drag should pan scrollboxes.*/
-  isPan: function isPan() {
-    return this._isPan;
-  },
-
-  /** Return true if drag should be parsed as a click. */
-  isClick: function isClick() {
-    return !this._isPan;
-  },
-
-  /**
-   * Returns the screen position for a pan. This factors in axis locking.
-   * @return Array of screen X and Y coordinates
-   */
-  panPosition: function panPosition() {
-    return this._lockAxis(this.sX, this.sY);
-  },
-
-  /** dismiss the active state of the pan element */
-  _resetActive: function _resetActive() {
-    let target = document.documentElement;
-    // If the target is active, toggle (turn off) the active flag. Otherwise do nothing.
-    if (this._domUtils.getContentState(target) & kStateActive)
-      this._domUtils.setContentState(target, kStateActive);
-  },
-
-  toString: function toString() {
-    return '[DragData] { sX,sY=' + this.sX + ',' + this.sY + ', dragging=' + this.dragging + ' }';
-  }
-};
-
-
-/**
- * KineticController - a class to take drag position data and use it
- * to do kinetic panning of a scrollable object.
- *
- * aPanBy is a function that will be called with the dx and dy
- * generated by the kinetic algorithm.  It should return true if the
- * object was panned, false if there was no movement.
- *
- * There are two complicated things done here.  One is calculating the
- * initial velocity of the movement based on user input.  Two is
- * calculating the distance to move every frame.
- */
-function KineticController(aPanBy, aEndCallback) {
-  this._panBy = aPanBy;
-  this._beforeEnd = aEndCallback;
-
-  // These are used to calculate the position of the scroll panes during kinetic panning. Think of
-  // these points as vectors that are added together and multiplied by scalars.
-  this._position = new Point(0, 0);
-  this._velocity = new Point(0, 0);
-  this._acceleration = new Point(0, 0);
-  this._time = 0;
-  this._timeStart = 0;
-
-  // How often do we change the position of the scroll pane?  Too often and panning may jerk near
-  // the end. Too little and panning will be choppy. In milliseconds.
-  this._updateInterval = Services.prefs.getIntPref("browser.ui.kinetic.updateInterval");
-  // Constants that affect the "friction" of the scroll pane.
-  this._exponentialC = Services.prefs.getIntPref("browser.ui.kinetic.exponentialC");
-  this._polynomialC = Services.prefs.getIntPref("browser.ui.kinetic.polynomialC") / 1000000;
-  // Number of milliseconds that can contain a swipe. Movements earlier than this are disregarded.
-  this._swipeLength = Services.prefs.getIntPref("browser.ui.kinetic.swipeLength");
-
-  this._reset();
-}
-
-KineticController.prototype = {
-  _reset: function _reset() {
-    this._active = false;
-    this._paused = false;
-    this.momentumBuffer = [];
-    this._velocity.set(0, 0);
-  },
-
-  isActive: function isActive() {
-    return this._active;
-  },
-
-  _startTimer: function _startTimer() {
-    let self = this;
-
-    let lastp = this._position;  // track last position vector because pan takes deltas
-    let v0 = this._velocity;  // initial velocity
-    let a = this._acceleration;  // acceleration
-    let c = this._exponentialC;
-    let p = new Point(0, 0);
-    let dx, dy, t, realt;
-
-    function calcP(v0, a, t) {
-      // Important traits for this function:
-      //   p(t=0) is 0
-      //   p'(t=0) is v0
-      //
-      // We use exponential to get a smoother stop, but by itself exponential
-      // is too smooth at the end. Adding a polynomial with the appropriate
-      // weight helps to balance
-      return v0 * Math.exp(-t / c) * -c + a * t * t + v0 * c;
-    }
-
-    this._calcV = function(v0, a, t) {
-      return v0 * Math.exp(-t / c) + 2 * a * t;
-    }
-
-    let callback = {
-      sample: function kineticHandleEvent(timeStamp) {
-        // Someone called end() on us between timer intervals
-        // or we are paused.
-        if (!self.isActive() || self._paused)
-          return;
-
-        // To make animation end fast enough but to keep smoothness, average the ideal
-        // time frame (smooth animation) with the actual time lapse (end fast enough).
-        // Animation will never take longer than 2 times the ideal length of time.
-        realt = timeStamp - self._initialTime;
-        self._time += self._updateInterval;
-        t = (self._time + realt) / 2;
-
-        // Calculate new position.
-        p.x = calcP(v0.x, a.x, t);
-        p.y = calcP(v0.y, a.y, t);
-        dx = Math.round(p.x - lastp.x);
-        dy = Math.round(p.y - lastp.y);
-
-        // Test to see if movement is finished for each component.
-        if (dx * a.x > 0) {
-          dx = 0;
-          lastp.x = 0;
-          v0.x = 0;
-          a.x = 0;
-        }
-        // Symmetric to above case.
-        if (dy * a.y > 0) {
-          dy = 0;
-          lastp.y = 0;
-          v0.y = 0;
-          a.y = 0;
-        }
-
-        if (v0.x == 0 && v0.y == 0) {
-          self.end();
-        } else {
-          let panStop = false;
-          if (dx != 0 || dy != 0) {
-            try { panStop = !self._panBy(-dx, -dy, true); } catch (e) {}
-            lastp.add(dx, dy);
-          }
-
-          if (panStop)
-            self.end();
-          else
-            mozRequestAnimationFrame(this);
-        }
-      }
-    };
-
-    this._active = true;
-    this._paused = false;
-    mozRequestAnimationFrame(callback);
-  },
-
-  start: function start() {
-    function sign(x) {
-      return x ? ((x > 0) ? 1 : -1) : 0;
-    }
-
-    function clampFromZero(x, closerToZero, furtherFromZero) {
-      if (x >= 0)
-        return Math.max(closerToZero, Math.min(furtherFromZero, x));
-      return Math.min(-closerToZero, Math.max(-furtherFromZero, x));
-    }
-
-    let mb = this.momentumBuffer;
-    let mblen = this.momentumBuffer.length;
-
-    let lastTime = mb[mblen - 1].t;
-    let distanceX = 0;
-    let distanceY = 0;
-    let swipeLength = this._swipeLength;
-
-    // determine speed based on recorded input
-    let me;
-    for (let i = 0; i < mblen; i++) {
-      me = mb[i];
-      if (lastTime - me.t < swipeLength) {
-        distanceX += me.dx;
-        distanceY += me.dy;
-      }
-    }
-
-    let currentVelocityX = 0;
-    let currentVelocityY = 0;
-
-    if (this.isActive()) {
-      // If active, then we expect this._calcV to be defined.
-      let currentTime = Date.now() - this._initialTime;
-      currentVelocityX = Util.clamp(this._calcV(this._velocity.x, this._acceleration.x, currentTime), -kMaxVelocity, kMaxVelocity);
-      currentVelocityY = Util.clamp(this._calcV(this._velocity.y, this._acceleration.y, currentTime), -kMaxVelocity, kMaxVelocity);
-    }
-
-    if (currentVelocityX * this._velocity.x <= 0)
-      currentVelocityX = 0;
-    if (currentVelocityY * this._velocity.y <= 0)
-      currentVelocityY = 0;
-
-    let swipeTime = Math.min(swipeLength, lastTime - mb[0].t);
-    this._velocity.x = clampFromZero((distanceX / swipeTime) + currentVelocityX, Math.abs(currentVelocityX), kMaxVelocity);
-    this._velocity.y = clampFromZero((distanceY / swipeTime) + currentVelocityY, Math.abs(currentVelocityY), kMaxVelocity);
-
-    if (Math.abs(this._velocity.x) < kMinVelocity)
-      this._velocity.x = 0;
-    if (Math.abs(this._velocity.y) < kMinVelocity)
-      this._velocity.y = 0;
-
-    // Set acceleration vector to opposite signs of velocity
-    this._acceleration.set(this._velocity.clone().map(sign).scale(-this._polynomialC));
-
-    this._position.set(0, 0);
-    this._initialTime = mozAnimationStartTime;
-    this._time = 0;
-    this.momentumBuffer = [];
-
-    if (!this.isActive() || this._paused)
-      this._startTimer();
-
-    return true;
-  },
-
-  pause: function pause() {
-    this._paused = true;
-  },
-
-  end: function end() {
-    if (this.isActive()) {
-      if (this._beforeEnd)
-        this._beforeEnd();
-      this._reset();
-    }
-  },
-
-  addData: function addData(dx, dy) {
-    let mbLength = this.momentumBuffer.length;
-    let now = Date.now();
-
-    if (this.isActive()) {
-      // Stop active movement when dragging in other direction.
-      if (dx * this._velocity.x < 0 || dy * this._velocity.y < 0)
-        this.end();
-    }
-
-    this.momentumBuffer.push({'t': now, 'dx' : dx, 'dy' : dy});
-  }
-};
-
-
-/*
- * Simple gestures support
- */
-
-var GestureModule = {
-  _debugEvents: false,
-
-  init: function init() {
-    window.addEventListener("MozSwipeGesture", this, true);
-  },
-
-  /*
-   * Events
-   *
-   * Dispatch events based on the type of mouse gesture event. For now, make
-   * sure to stop propagation of every gesture event so that web content cannot
-   * receive gesture events.
-   *
-   * @param nsIDOMEvent information structure
-   */
-
-  handleEvent: function handleEvent(aEvent) {
-    try {
-      aEvent.stopPropagation();
-      aEvent.preventDefault();
-      if (this._debugEvents) Util.dumpLn("GestureModule:", aEvent.type);
-      switch (aEvent.type) {
-        case "MozSwipeGesture":
-          if (this._onSwipe(aEvent)) {
-            let event = document.createEvent("Events");
-            event.initEvent("CancelTouchSequence", true, true);
-            aEvent.target.dispatchEvent(event);
-          }
-          break;
-      }
-    } catch (e) {
-      Util.dumpLn("Error while handling gesture event", aEvent.type,
-                  "\nPlease report error at:", e);
-      Cu.reportError(e);
-    }
-  },
-
-  _onSwipe: function _onSwipe(aEvent) {
-    switch (aEvent.direction) {
-      case Ci.nsIDOMSimpleGestureEvent.DIRECTION_LEFT:
-        return this._tryCommand("cmd_forward");
-      case Ci.nsIDOMSimpleGestureEvent.DIRECTION_RIGHT:
-        return this._tryCommand("cmd_back");
-    }
-    return false;
-  },
-
-  _tryCommand: function _tryCommand(aId) {
-     if (document.getElementById(aId).getAttribute("disabled") == "true")
-       return false;
-     CommandUpdater.doCommand(aId);
-     return true;
-  },
-};
-
-/**
- * Helper to track when the user is using a precise pointing device (pen/mouse)
- * versus an imprecise one (touch).
- */
-var InputSourceHelper = {
-  isPrecise: false,
-
-  init: function ish_init() {
-    Services.obs.addObserver(this, "metro_precise_input", false);
-    Services.obs.addObserver(this, "metro_imprecise_input", false);
-  },
-
-  _precise: function () {
-    if (!this.isPrecise) {
-      this.isPrecise = true;
-      this._fire("MozPrecisePointer");
-    }
-  },
-
-  _imprecise: function () {
-    if (this.isPrecise) {
-      this.isPrecise = false;
-      this._fire("MozImprecisePointer");
-    }
-  },
-
-  observe: function BrowserUI_observe(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "metro_precise_input":
-        this._precise();
-        break;
-      case "metro_imprecise_input":
-        this._imprecise();
-        break;
-    }
-  },
-
-  fireUpdate: function fireUpdate() {
-    if (this.isPrecise) {
-      this._fire("MozPrecisePointer");
-    } else {
-      this._fire("MozImprecisePointer");
-    }
-  },
-
-  _fire: function (name) {
-    let event = document.createEvent("Events");
-    event.initEvent(name, true, true);
-    window.dispatchEvent(event);
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/jsshell/shell.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/jsshell/shell.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/jsshell/shell.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/jsshell/shell.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,770 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-
-<html onclick="keepFocusInTextbox(event)">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>JavaScript Shell 1.4</title>
-
-<script type="text/javascript">
-var 
-  histList = [""], 
-  histPos = 0, 
-  _scope = {}, 
-  _win, // a top-level context
-  question, // {String} the input command that's being evaluated. Accessed via
-            // |Shell.question| from the target window for evaluation.
-  _in, // {HTMLTextAreaElement} the textarea containing the input
-  _out, // {HTMLDivElement} the output is printed to this element
-  tooManyMatches = null,
-  lastError = null,
-  _jsVer = 0 // determines the way to execute the commands, see run()
-  ;
-
-function refocus()
-{
-  _in.blur(); // Needed for Mozilla to scroll correctly.
-  _in.focus();
-}
-
-function init()
-{
-  _in = document.getElementById("input");
-  _out = document.getElementById("output");
-
-  _win = window;
-
-  if (opener && !opener.closed)
-  {
-    println("Using bookmarklet version of shell: commands will run in opener's context.", "message");
-    _win = opener;
-  }
-
-  /* Run a series of (potentially async, but quick) tests to determine the
-   * way to run code in this browser (for run()). Sets window._jsVer based
-   * on the tests. */
-  _jsVer = 0;
-  for (var jsVerToTry=19; jsVerToTry>=15; jsVerToTry--) {
-    run(window, "if(_jsVer < " + jsVerToTry + ") { " +
-      "_jsVer=" + jsVerToTry + "; }", jsVerToTry);
-  }
-
-  initTarget();
-
-  recalculateInputHeight();
-  refocus();
-}
-
-/**
- * Runs |code| in |_win|'s context.
- * @param overridenJSVer {int} (optional) overrides the default (specified by _jsVer)
- *                             way to run the code.
- */
-function run(_win, code, overridenJSVer) {
-  var jsVerToUse = overridenJSVer ? overridenJSVer : _jsVer;
-  if (jsVerToUse <= 15) {
-    _win.location.href = "javascript:" + code + "; void 0";
-  } else {
-    var sc = _win.document.createElement("script");
-    sc.type="application/javascript;version=" + jsVerToUse/10;
-    sc.src="data:application/x-javascript," + code;
-    _win.document.body.appendChild(sc); // runs the script asynchronously    
-  }
-}
-
-function initTarget()
-{
-  _win.Shell = window;
-  _win.print = shellCommands.print;
-}
-
-
-// Unless the user is selected something, refocus the textbox.
-// (requested by caillon, brendan, asa)
-function keepFocusInTextbox(e) 
-{
-  var g = e.srcElement ? e.srcElement : e.target; // IE vs. standard
-  
-  while (!g.tagName)
-    g = g.parentNode;
-  var t = g.tagName.toUpperCase();
-  if (t=="A" || t=="INPUT")
-    return;
-    
-  if (window.getSelection) {
-    // Mozilla
-    if (String(window.getSelection()))
-      return;
-  }
-  else {
-    // IE
-    if ( document.selection.createRange().text )
-      return;
-  }
-  
-  refocus();
-}
-
-function inputKeydown(e) {
-  // Use onkeydown because IE doesn't support onkeypress for arrow keys
-
-  //alert(e.keyCode + " ^ " + e.keycode);
-
-  if (e.shiftKey && e.keyCode == 13) { // shift-enter
-    // don't do anything; allow the shift-enter to insert a line break as normal
-  } else if (e.keyCode == 13) { // enter
-    // execute the input on enter
-    try { go(); } catch(er) { alert(er); };
-    setTimeout(function() { _in.value = ""; }, 0); // can't preventDefault on input, so clear it later
-  } else if (e.keyCode == 38) { // up
-    // go up in history if at top or ctrl-up
-    if (e.ctrlKey || caretInFirstLine(_in))
-      hist(true);
-  } else if (e.keyCode == 40) { // down
-    // go down in history if at end or ctrl-down
-    if (e.ctrlKey || caretInLastLine(_in))
-      hist(false);
-  } else if (e.keyCode == 9) { // tab
-    tabcomplete();
-    setTimeout(function() { refocus(); }, 0); // refocus because tab was hit
-  } else { }
-
-  setTimeout(recalculateInputHeight, 0);
-  
-  //return true;
-};
-
-function caretInFirstLine(textbox)
-{
-  // IE doesn't support selectionStart/selectionEnd
-  if (textbox.selectionStart == undefined)
-    return true;
-
-  var firstLineBreak = textbox.value.indexOf("\n");
-  
-  return ((firstLineBreak == -1) || (textbox.selectionStart <= firstLineBreak));
-}
-
-function caretInLastLine(textbox)
-{
-  // IE doesn't support selectionStart/selectionEnd
-  if (textbox.selectionEnd == undefined)
-    return true;
-
-  var lastLineBreak = textbox.value.lastIndexOf("\n");
-  
-  return (textbox.selectionEnd > lastLineBreak);
-}
-
-function recalculateInputHeight()
-{
-  var rows = _in.value.split(/\n/).length
-    + 1 // prevent scrollbar flickering in Mozilla
-    + (window.opera ? 1 : 0); // leave room for scrollbar in Opera
-  
-  if (_in.rows != rows) // without this check, it is impossible to select text in Opera 7.60 or Opera 8.0.
-    _in.rows = rows;
-}
-
-function println(s, type)
-{
-  if((s=String(s)))
-  {
-    var newdiv = document.createElement("div");
-    newdiv.appendChild(document.createTextNode(s));
-    newdiv.className = type;
-    _out.appendChild(newdiv);
-    return newdiv;
-  }
-  return false;
-}
-
-function printWithRunin(h, s, type)
-{
-  var div = println(s, type);
-  if (div) {
-    var head = document.createElement("strong");
-    head.appendChild(document.createTextNode(h + ": "));
-    div.insertBefore(head, div.firstChild);
-  }
-}
-
-
-var shellCommands = 
-{
-load : function load(url)
-{
-  var s = _win.document.createElement("script");
-  s.type = "text/javascript";
-  s.src = url;
-  _win.document.getElementsByTagName("head")[0].appendChild(s);
-  println("Loading " + url + "...", "message");
-},
-
-clear : function clear()
-{
-  var CHILDREN_TO_PRESERVE = 3;
-  while (_out.childNodes[CHILDREN_TO_PRESERVE]) 
-    _out.removeChild(_out.childNodes[CHILDREN_TO_PRESERVE]);
-},
-
-print : function print(s) { println(s, "print"); },
-
-// the normal function, "print", shouldn't return a value
-// (suggested by brendan; later noticed it was a problem when showing others)
-pr : function pr(s) 
-{ 
-  shellCommands.print(s); // need to specify shellCommands so it doesn't try window.print()!
-  return s;
-},
-
-props : function props(e, onePerLine)
-{
-  if (e === null) {
-    println("props called with null argument", "error");
-    return;
-  }
-
-  if (e === undefined) {
-    println("props called with undefined argument", "error");
-    return;
-  }
-
-  var ns = ["Methods", "Fields", "Unreachables"];
-  var as = [[], [], []]; // array of (empty) arrays of arrays!
-  var p, j, i; // loop variables, several used multiple times
-
-  var protoLevels = 0;
-
-  for (p = e; p; p = p.__proto__)
-  {
-    for (i=0; i<ns.length; ++i)
-      as[i][protoLevels] = [];
-    ++protoLevels;
-  }
-
-  for(var a in e)
-  {
-    // Shortcoming: doesn't check that VALUES are the same in object and prototype.
-
-    var protoLevel = -1;
-    try
-    {
-      for (p = e; p && (a in p); p = p.__proto__)
-        ++protoLevel;
-    }
-    catch(er) { protoLevel = 0; } // "in" operator throws when param to props() is a string
-
-    var type = 1;
-    try
-    {
-      if ((typeof e[a]) == "function")
-        type = 0;
-    }
-    catch (er) { type = 2; }
-
-    as[type][protoLevel].push(a);
-  }
-
-  function times(s, n) { return n ? s + times(s, n-1) : ""; }
-
-  for (j=0; j<protoLevels; ++j)
-    for (i=0;i<ns.length;++i)
-      if (as[i][j].length) 
-        printWithRunin(
-          ns[i] + times(" of prototype", j), 
-          (onePerLine ? "\n\n" : "") + as[i][j].sort().join(onePerLine ? "\n" : ", ") + (onePerLine ? "\n\n" : ""), 
-          "propList"
-        );
-},
-
-blink : function blink(node)
-{
-  if (!node)                     throw("blink: argument is null or undefined.");
-  if (node.nodeType == null)     throw("blink: argument must be a node.");
-  if (node.nodeType == 3)        throw("blink: argument must not be a text node");
-  if (node.documentElement)      throw("blink: argument must not be the document object");
-
-  function setOutline(o) { 
-    return function() {
-      if (node.style.outline != node.style.bogusProperty) {
-        // browser supports outline (Firefox 1.1 and newer, CSS3, Opera 8).
-        node.style.outline = o;
-      }
-      else if (node.style.MozOutline != node.style.bogusProperty) {
-        // browser supports MozOutline (Firefox 1.0.x and older)
-        node.style.MozOutline = o;
-      }
-      else {
-        // browser only supports border (IE). border is a fallback because it moves things around.
-        node.style.border = o;
-      }
-    }
-  } 
-  
-  function focusIt(a) {
-    return function() {
-      a.focus(); 
-    }
-  }
-
-  if (node.ownerDocument) {
-    var windowToFocusNow = (node.ownerDocument.defaultView || node.ownerDocument.parentWindow); // Moz vs. IE
-    if (windowToFocusNow)
-      setTimeout(focusIt(windowToFocusNow.top), 0);
-  }
-
-  for(var i=1;i<7;++i)
-    setTimeout(setOutline((i%2)?'3px solid red':'none'), i*100);
-
-  setTimeout(focusIt(window), 800);
-  setTimeout(focusIt(_in), 810);
-},
-
-scope : function scope(sc)
-{
-  if (!sc) sc = {};
-  _scope = sc;
-  println("Scope is now " + sc + ".  If a variable is not found in this scope, window will also be searched.  New variables will still go on window.", "message");
-},
-
-mathHelp : function mathHelp()
-{
-  printWithRunin("Math constants", "E, LN2, LN10, LOG2E, LOG10E, PI, SQRT1_2, SQRT2", "propList");
-  printWithRunin("Math methods", "abs, acos, asin, atan, atan2, ceil, cos, exp, floor, log, max, min, pow, random, round, sin, sqrt, tan", "propList");
-},
-
-ans : undefined
-};
-
-
-function hist(up)
-{
-  // histList[0] = first command entered, [1] = second, etc.
-  // type something, press up --> thing typed is now in "limbo"
-  // (last item in histList) and should be reachable by pressing 
-  // down again.
-
-  var L = histList.length;
-
-  if (L == 1)
-    return;
-
-  if (up)
-  {
-    if (histPos == L-1)
-    {
-      // Save this entry in case the user hits the down key.
-      histList[histPos] = _in.value;
-    }
-
-    if (histPos > 0)
-    {
-      histPos--;
-      // Use a timeout to prevent up from moving cursor within new text
-      // Set to nothing first for the same reason
-      setTimeout(
-        function() {
-          _in.value = ''; 
-          _in.value = histList[histPos];
-          var caretPos = _in.value.length;
-          if (_in.setSelectionRange) 
-            _in.setSelectionRange(caretPos, caretPos);
-        },
-        0
-      );
-    }
-  } 
-  else // down
-  {
-    if (histPos < L-1)
-    {
-      histPos++;
-      _in.value = histList[histPos];
-    }
-    else if (histPos == L-1)
-    {
-      // Already on the current entry: clear but save
-      if (_in.value)
-      {
-        histList[histPos] = _in.value;
-        ++histPos;
-        _in.value = "";
-      }
-    }
-  }
-}
-
-function tabcomplete()
-{
-  /*
-   * Working backwards from s[from], find the spot
-   * where this expression starts.  It will scan
-   * until it hits a mismatched ( or a space,
-   * but it skips over quoted strings.
-   * If stopAtDot is true, stop at a '.'
-   */
-  function findbeginning(s, from, stopAtDot)
-  {
-    /*
-     *  Complicated function.
-     *
-     *  Return true if s[i] == q BUT ONLY IF
-     *  s[i-1] is not a backslash.
-     */
-    function equalButNotEscaped(s,i,q)
-    {
-      if(s.charAt(i) != q) // not equal go no further
-        return false;
-
-      if(i==0) // beginning of string
-        return true;
-
-      if(s.charAt(i-1) == '\\') // escaped?
-        return false;
-
-      return true;
-    }
-
-    var nparens = 0;
-    var i;
-    for(i=from; i>=0; i--)
-    {
-      if(s.charAt(i) == ' ')
-        break;
-
-      if(stopAtDot && s.charAt(i) == '.')
-        break;
-        
-      if(s.charAt(i) == ')')
-        nparens++;
-      else if(s.charAt(i) == '(')
-        nparens--;
-
-      if(nparens < 0)
-        break;
-
-      // skip quoted strings
-      if(s.charAt(i) == '\'' || s.charAt(i) == '\"')
-      {
-        //dump("skipping quoted chars: ");
-        var quot = s.charAt(i);
-        i--;
-        while(i >= 0 && !equalButNotEscaped(s,i,quot)) {
-          //dump(s.charAt(i));
-          i--;
-        }
-        //dump("\n");
-      }
-    }
-    return i;
-  }
-
-  // XXX should be used more consistently (instead of using selectionStart/selectionEnd throughout code)
-  // XXX doesn't work in IE, even though it contains IE-specific code
-  function getcaretpos(inp)
-  {
-    if(inp.selectionEnd != null)
-      return inp.selectionEnd;
-      
-    if(inp.createTextRange)
-    {
-      var docrange = _win.Shell.document.selection.createRange();
-      var inprange = inp.createTextRange();
-      if (inprange.setEndPoint)
-      {
-        inprange.setEndPoint('EndToStart', docrange);
-        return inprange.text.length;
-      }
-    }
-
-    return inp.value.length; // sucks, punt
-  }
-
-  function setselectionto(inp,pos)
-  {
-    if(inp.selectionStart) {
-      inp.selectionStart = inp.selectionEnd = pos;
-    }
-    else if(inp.createTextRange) {
-      var docrange = _win.Shell.document.selection.createRange();
-      var inprange = inp.createTextRange();
-      inprange.move('character',pos);
-      inprange.select();
-    }
-    else { // err...
-    /*
-      inp.select();
-      if(_win.Shell.document.getSelection())
-        _win.Shell.document.getSelection() = "";
-        */
-    }
-  }
-    // get position of cursor within the input box
-    var caret = getcaretpos(_in);
-
-    if(caret) {
-      //dump("----\n");
-      var dotpos, spacepos, complete, obj;
-      //dump("caret pos: " + caret + "\n");
-      // see if there's a dot before here
-      dotpos = findbeginning(_in.value, caret-1, true);
-      //dump("dot pos: " + dotpos + "\n");
-      if(dotpos == -1 || _in.value.charAt(dotpos) != '.') {
-        dotpos = caret;
-//dump("changed dot pos: " + dotpos + "\n");
-      }
-
-      // look backwards for a non-variable-name character
-      spacepos = findbeginning(_in.value, dotpos-1, false);
-      //dump("space pos: " + spacepos + "\n");
-      // get the object we're trying to complete on
-      if(spacepos == dotpos || spacepos+1 == dotpos || dotpos == caret)
-      {
-        // try completing function args
-        if(_in.value.charAt(dotpos) == '(' ||
- (_in.value.charAt(spacepos) == '(' && (spacepos+1) == dotpos))
-        {
-          var fn,fname;
-  var from = (_in.value.charAt(dotpos) == '(') ? dotpos : spacepos;
-          spacepos = findbeginning(_in.value, from-1, false);
-
-          fname = _in.value.substr(spacepos+1,from-(spacepos+1));
-  //dump("fname: " + fname + "\n");
-          try {
-            with(_win.Shell._scope)
-              with(_win)
-                with(Shell.shellCommands)
-                  fn = eval(fname);
-          }
-          catch(er) {
-            //dump('fn is not a valid object\n');
-            return;
-          }
-          if(fn == undefined) {
-             //dump('fn is undefined');
-             return;
-          }
-          if(fn instanceof Function)
-          {
-            // Print function definition, including argument names, but not function body
-            if(!fn.toString().match(/function .+?\(\) +\{\n +\[native code\]\n\}/))
-              println(fn.toString().match(/function .+?\(.*?\)/), "tabcomplete");
-          }
-
-          return;
-        }
-        else
-          obj = _win;
-      }
-      else
-      {
-        var objname = _in.value.substr(spacepos+1,dotpos-(spacepos+1));
-        //dump("objname: |" + objname + "|\n");
-        try {
-          with(_win.Shell._scope)
-            with(_win)
-                obj = eval(objname);
-        }
-        catch(er) {
-          printError(er); 
-          return;
-        }
-        if(obj == undefined) {
-          // sometimes this is tabcomplete's fault, so don't print it :(
-          // e.g. completing from "print(document.getElements"
-          // println("Can't complete from null or undefined expression " + objname, "error");
-          return;
-        }
-      }
-      //dump("obj: " + obj + "\n");
-      // get the thing we're trying to complete
-      if(dotpos == caret)
-      {
-        if(spacepos+1 == dotpos || spacepos == dotpos)
-        {
-          // nothing to complete
-          //dump("nothing to complete\n");
-          return;
-        }
-
-        complete = _in.value.substr(spacepos+1,dotpos-(spacepos+1));
-      }
-      else {
-        complete = _in.value.substr(dotpos+1,caret-(dotpos+1));
-      }
-      //dump("complete: " + complete + "\n");
-      // ok, now look at all the props/methods of this obj
-      // and find ones starting with 'complete'
-      var matches = [];
-      var bestmatch = null;
-      for(var a in obj)
-      {
-        //a = a.toString();
-        //XXX: making it lowercase could help some cases,
-        // but screws up my general logic.
-        if(a.substr(0,complete.length) == complete) {
-          matches.push(a);
-          ////dump("match: " + a + "\n");
-          // if no best match, this is the best match
-          if(bestmatch == null)
-          {
-            bestmatch = a;
-          }
-          else {
-            // the best match is the longest common string
-            function min(a,b){ return ((a<b)?a:b); }
-            var i;
-            for(i=0; i< min(bestmatch.length, a.length); i++)
-            {
-              if(bestmatch.charAt(i) != a.charAt(i))
-                break;
-            }
-            bestmatch = bestmatch.substr(0,i);
-            ////dump("bestmatch len: " + i + "\n");
-          }
-          ////dump("bestmatch: " + bestmatch + "\n");
-        }
-      }
-      bestmatch = (bestmatch || "");
-      ////dump("matches: " + matches + "\n");
-      var objAndComplete = (objname || obj) + "." + bestmatch;
-      //dump("matches.length: " + matches.length + ", tooManyMatches: " + tooManyMatches + ", objAndComplete: " + objAndComplete + "\n");
-      if(matches.length > 1 && (tooManyMatches == objAndComplete || matches.length <= 10)) {
-
-        printWithRunin("Matches: ", matches.join(', '), "tabcomplete");
-        tooManyMatches = null;
-      }
-      else if(matches.length > 10)
-      {
-        println(matches.length + " matches.  Press tab again to see them all", "tabcomplete");
-        tooManyMatches = objAndComplete;
-      }
-      else {
-        tooManyMatches = null;
-      }
-      if(bestmatch != "")
-      {
-        var sstart;
-        if(dotpos == caret) {
-          sstart = spacepos+1;
-        }
-        else {
-          sstart = dotpos+1;
-        }
-        _in.value = _in.value.substr(0, sstart)
-                  + bestmatch
-                  + _in.value.substr(caret);
-        setselectionto(_in,caret + (bestmatch.length - complete.length));
-      }
-    }
-}
-
-function printQuestion(q)
-{
-  println(q, "input");
-}
-
-function printAnswer(a)
-{
-  if (a !== undefined) {
-    println(a, "normalOutput");
-    shellCommands.ans = a;
-  }
-}
-
-function printError(er)
-{ 
-  var lineNumberString;
-
-  lastError = er; // for debugging the shell
-  if (er.name)
-  {
-    // lineNumberString should not be "", to avoid a very wacky bug in IE 6.
-    lineNumberString = (er.lineNumber != undefined) ? (" on line " + er.lineNumber + ": ") : ": ";
-    println(er.name + lineNumberString + er.message, "error"); // Because IE doesn't have error.toString.
-  }
-  else
-    println(er, "error"); // Because security errors in Moz /only/ have toString.
-}
-
-/**
- * Evaluates |s| or current input (_in.value) in the previously set up context.
- * @param {String} s - (optional) command to evaluate.
- */
-function go(s)
-{
-  // save the command to eval in |question|, so that the target window can access
-  // it when evaluating.
-  _in.value = question = s ? s : _in.value;
-
-  if (question == "")
-    return;
-
-  histList[histList.length-1] = question;
-  histList[histList.length] = "";
-  histPos = histList.length - 1;
-  
-  // Unfortunately, this has to happen *before* the JavaScript is run, so that 
-  // print() output will go in the right place.
-  _in.value='';
-  recalculateInputHeight();
-  printQuestion(question);
-
-  if (_win.closed) {
-    printError("Target window has been closed.");
-    return;
-  }
-  
-  try { ("Shell" in _win) }
-  catch(er) {
-    printError("The JavaScript Shell cannot access variables in the target window.  The most likely reason is that the target window now has a different page loaded and that page has a different hostname than the original page.");
-    return;
-  }
-
-  if (!("Shell" in _win))
-    initTarget(); // silent
-
-  // Evaluate Shell.question using _win's eval (this is why eval isn't in the |with|, IIRC).
-  run(_win, "try{ Shell.printAnswer(eval('with(Shell._scope) with(Shell.shellCommands) {' + Shell.question + String.fromCharCode(10) + '}')); } catch(er) { Shell.printError(er); }; setTimeout(Shell.refocus, 0);");
-}
-
-</script>
-
-<!-- for http://ted.mielczarek.org/code/mozilla/extensiondev/ -->
-<script type="text/javascript" src="chrome://extensiondev/content/chromeShellExtras.js"></script>
-
-<style type="text/css">
-  body { background: white; color: black; }
-
-  #output {
-    /* Preserve line breaks, but wrap too if browser supports it */
-    white-space: pre;
-    white-space: -moz-pre-wrap;
-    white-space: pre-wrap;
-  }
-
-  h3 { margin-top: 0; margin-bottom: 0em; }
-  h3 + div { margin: 0; }
-
-  form { margin: 0; padding: 0; }
-  #input { width: 100%; border: none; padding: 0; overflow: auto; }
-
-  .input { color: blue; background: white; font: inherit; font-weight: bold; margin-top: .5em; /* background: #E6E6FF; */ }
-  .normalOutput { color: black; background: white; }
-  .print { color: brown; background: white; }
-  .error { color: red; background: white; }
-  .propList { color: green; background: white; }
-  .message { color: green; background: white; }
-  .tabcomplete { color: purple; background: white; }
-</style>
-</head>
-
-<body onload="init()">
-
-<div id="output"><h3>JavaScript Shell 1.4</h3><div>Features: autocompletion of property names with Tab, multiline input with Shift+Enter, input history with (Ctrl+) Up/Down, <a accesskey="M" href="javascript:go('scope(Math); mathHelp();');" title="Accesskey: M">Math</a>, <a accesskey="H" href="http://www.squarefree.com/shell/?ignoreReferrerFrom=shell1.4"  title="Accesskey: H">help</a></div><div>Values and functions: ans, print(string), <a accesskey="P" href="javascript:go('props(ans)')" title="Accesskey: P">props(object)</a>, <a accesskey="B" href="javascript:go('blink(ans)')" title="Accesskey: B">blink(node)</a>, <a accesskey="C" href="javascript:go('clear()')" title="Accesskey: C">clear()</a>, load(scriptURL), scope(object)</div></div>
-
-<div><textarea id="input" class="input" wrap="off" spellcheck="false" onkeydown="inputKeydown(event)" rows="1"></textarea></div>
-
-</body>
-
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/jsshell/shell.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/jsshell/shell.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/jsshell/shell.xul	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/jsshell/shell.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<window id="jsshell"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        contenttitlesetting="true"
-        title="Debug JSShell"
-        width="600"
-        height="400"
-        persist="width height screenX screenY">
-  <browser id="content" flex="1" type="content-primary" src="chrome://browser/content/shell.html"/>
-</window>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/library/SelectionPrototype.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/library/SelectionPrototype.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/library/SelectionPrototype.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/library/SelectionPrototype.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,1084 +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/. */
-"use strict";
-
-let Ci = Components.interfaces;
-let Cc = Components.classes;
-
-/*
- * SelectionPrototype - common base class used by both chrome and content selection logic.
- */
-
-// selection node parameters for various apis
-this.kSelectionNodeAnchor = 1;
-this.kSelectionNodeFocus = 2;
-
-// selection type property constants
-this.kChromeSelector = 1;
-this.kContentSelector = 2;
-
-dump("### SelectionPrototype.js loaded\n");
-
-/*
-  http://mxr.mozilla.org/mozilla-central/source/docshell/base/nsIDocShell.idl
-  http://mxr.mozilla.org/mozilla-central/source/dom/base/nsISelectionDisplay.idl
-  http://mxr.mozilla.org/mozilla-central/source/dom/base/nsISelectionListener.idl
-  http://mxr.mozilla.org/mozilla-central/source/dom/base/nsISelectionPrivate.idl
-  http://mxr.mozilla.org/mozilla-central/source/dom/base/nsISelectionController.idl
-  http://mxr.mozilla.org/mozilla-central/source/dom/base/nsISelection.idl
-  http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/core/nsIDOMDocument.idl#372
-    rangeCount
-    getRangeAt
-    containsNode
-  http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html
-  http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/range/nsIDOMRange.idl
-  http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/core/nsIDOMDocument.idl#80
-    content.document.createRange()
-    getBoundingClientRect
-    isPointInRange
-  http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/core/nsIDOMNode.idl
-  http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/base/nsIDOMWindowUtils.idl
-    setSelectionAtPoint
-  http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/core/nsIDOMElement.idl
-    getClientRect
-  http://mxr.mozilla.org/mozilla-central/source/layout/generic/nsFrameSelection.h
-  http://mxr.mozilla.org/mozilla-central/source/editor/idl/nsIEditor.idl
-  http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/base/nsIFocusManager.idl
-  http://mxr.mozilla.org/mozilla-central/source/toolkit/content/widgets/textbox.xml
-  http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/xul/nsIDOMXULTextboxElement.idl
-    mEditor
-*/
-
-var SelectionPrototype = function() { }
-
-SelectionPrototype.prototype = {
-  _CARET_MODE: 1, // Single monocle mode (Collapsed caret).
-  _SELECTION_MODE: 2, // Double monocle mode (Selection w/Text).
-
-  _debugEvents: false,
-  _cache: {},
-  _targetElement: null,
-  _targetIsEditable: true,
-  _contentOffset: { x: 0, y: 0 },
-  _contentWindow: null,
-  _debugOptions: { dumpRanges: false, displayRanges: false },
-  _domWinUtils: null,
-  _selectionMoveActive: false,
-  _snap: false,
-  _type: 0,
-
-  /*************************************************
-   * Properties
-   */
-
-  get isActive() {
-    return !!this._targetElement;
-  },
-
-  get targetIsEditable() {
-    return this._targetIsEditable || false;
-  },
-
-  /*
-   * snap - enable or disable word snap for the active marker when a
-   * SelectionMoveEnd event is received. Typically you would disable
-   * snap when zoom is < 1.0 for precision selection. defaults to off.
-   */
-  get snap() {
-    return this._snap;
-  },
-
-  set snap(aValue) {
-    this._snap = aValue;
-  },
-
-  /*
-   * type - returns a constant indicating which module we're
-   * loaded into - chrome or content.
-   */
-  set type(aValue) {
-    this._type = aValue;
-  },
-
-  get type() {
-    return this._type;
-  },
-
-  /*************************************************
-   * Messaging wrapper
-   */
-
-  /*
-   * sendAsync
-   *
-   * Wrapper over sendAsyncMessage in content, waps direct invocation on
-   * SelectionHelperUI in chrome. Should be overriden by objects that inherit
-   * our behavior. 
-   */
-  sendAsync: function sendAsync(aMsg, aJson) {
-    Util.dumpLn("Base sendAsync called on SelectionPrototype. This is a no-op.");
-  },
-
-  /*************************************************
-   * Common browser event handlers
-   */
-
-   /*
-    * _onCaretPositionUpdate - sets the current caret location based on
-    * a client coordinates. Messages back with updated monocle position
-    * information.
-    *
-    * @param aX, aY drag location in client coordinates.
-    */
-  _onCaretPositionUpdate: function _onCaretPositionUpdate(aX, aY) {
-    this._onCaretMove(aX, aY);
-
-    // Update the position of our selection monocles
-    this._updateSelectionUI("caret", false, false, true);
-  },
-
-   /*
-    * _onCaretMove - updates the current caret location based on a client
-    * coordinates.
-    *
-    * @param aX, aY drag location in client coordinates.
-    */
-  _onCaretMove: function _onCaretMove(aX, aY) {
-    if (!this._targetIsEditable) {
-      this._onFail("Unexpected, caret position isn't supported with non-inputs.");
-      return;
-    }
-
-    // SelectionHelperUI sends text input tap coordinates and a caret move
-    // event at the start of a monocle drag. caretPositionFromPoint isn't
-    // going to give us correct info if the coord is outside the edit bounds,
-    // so restrict the coordinates before we call cpfp.
-    let containedCoords = this._restrictCoordinateToEditBounds(aX, aY);
-    let cp = this._contentWindow.document.caretPositionFromPoint(containedCoords.xPos,
-                                                                 containedCoords.yPos);
-    if (cp) {
-      let input = cp.offsetNode;
-      let offset = cp.offset;
-      input.selectionStart = input.selectionEnd = offset;
-    }
-  },
-
-  /*
-   * Turning on or off various debug features.
-   */
-  _onSelectionDebug: function _onSelectionDebug(aMsg) {
-    this._debugOptions = aMsg;
-    this._debugEvents = aMsg.dumpEvents;
-  },
-
-  /*
-   * Selection Changed notification listener. This allows us to respond to selection changes
-   * introduced programmatically by Gecko events, target-page support code, etc.
-   */
-  notifySelectionChanged: function notifySelectionChanged(aDocument, aSelection, aReason) {
-    // Ignore user generated selectionChange notifications during monocle/marker movement.
-    if ((typeof SelectionHelperUI != "undefined") && SelectionHelperUI.hasActiveDrag) {
-      return;
-    }
-
-    // Ignore selectionChange notifications, unless reason is mouseup, or unknown.
-    if (!(aReason & Ci.nsISelectionListener.MOUSEUP_REASON) &&
-        (aReason != Ci.nsISelectionListener.NO_REASON)) {
-      return;
-    }
-
-    // If in selection mode, and we have a selection, update it.
-    if (this._mode == this._SELECTION_MODE && !aSelection.isCollapsed) {
-      this._updateSelectionUI("update", true, true);
-    }
-  },
-
-  /*************************************************
-   * Selection api
-   */
-
-  /*
-   * _updateSelectionUI
-   *
-   * Informs SelectionHelperUI about selection marker position
-   * so that our selection monocles can be positioned properly.
-   *
-   * @param aSrcMsg string the message type that triggered this update.
-   * @param aUpdateStart bool update start marker position
-   * @param aUpdateEnd bool update end marker position
-   * @param aUpdateCaret bool update caret marker position, can be
-   * undefined, defaults to false.
-   */
-  _updateSelectionUI: function _updateSelectionUI(aSrcMsg, aUpdateStart, aUpdateEnd,
-                                                  aUpdateCaret) {
-    let selection = this._getSelection();
-
-    // If the range didn't have any text, let's bail
-    if (!selection) {
-      this._onFail("no selection was present");
-      return;
-    }
-
-    // Updates this._cache content selection position data which we send over
-    // to SelectionHelperUI. Note updateUIMarkerRects will fail if there isn't
-    // any selection in the page. This can happen when we start a monocle drag
-    // but haven't dragged enough to create selection. Just return.
-    try {
-      this._updateUIMarkerRects(selection);
-    } catch (ex) {
-      Util.dumpLn("_updateUIMarkerRects:", ex.message);
-      return;
-    }
-
-    this._cache.src = aSrcMsg;
-    this._cache.updateStart = aUpdateStart;
-    this._cache.updateEnd = aUpdateEnd;
-    this._cache.updateCaret = aUpdateCaret || false;
-    this._cache.targetIsEditable = this._targetIsEditable;
-
-    // Get monocles positioned correctly
-    this.sendAsync("Content:SelectionRange", this._cache);
-  },
-
-  /*
-   * _handleSelectionPoint(aSelectionInfo, aEndOfSelection)
-   *
-   * After a monocle moves to a new point in the document, determines
-   * what the target is and acts on its selection accordingly. If the
-   * monocle is within the bounds of the target, adds or subtracts selection
-   * at the monocle coordinates appropriately and then merges selection ranges
-   * into a single continuous selection. If the monocle is outside the bounds
-   * of the target and the underlying target is editable, uses the selection
-   * controller to advance selection and visibility within the control.
-   */
-  _handleSelectionPoint: function _handleSelectionPoint(aSelectionInfo,
-                                                        aEndOfSelection) {
-    let selection = this._getSelection();
-
-    let markerToChange = aSelectionInfo.change == "start" ?
-        aSelectionInfo.start : aSelectionInfo.end;
-
-    if (selection.rangeCount == 0) {
-      this._onFail("selection.rangeCount == 0");
-      return;
-    }
-
-    // We expect continuous selection ranges.
-    if (selection.rangeCount > 1) {
-      this._setContinuousSelection();
-    }
-
-    // Adjust our y position up such that we are sending coordinates on
-    // the text line vs. below it where the monocle is positioned.
-    let halfLineHeight = this._queryHalfLineHeight(aSelectionInfo.start,
-        selection);
-    aSelectionInfo.start.yPos -= halfLineHeight;
-    aSelectionInfo.end.yPos -= halfLineHeight;
-
-    let isSwapNeeded = false;
-    if (this._isSelectionSwapNeeded(aSelectionInfo.start, aSelectionInfo.end,
-        halfLineHeight)) {
-      [aSelectionInfo.start, aSelectionInfo.end] =
-          [aSelectionInfo.end, aSelectionInfo.start];
-
-      isSwapNeeded = true;
-      this.sendAsync("Content:SelectionSwap");
-    }
-
-    // Modify selection based on monocle movement
-    if (this._targetIsEditable && !Util.isEditableContent(this._targetElement)) {
-      if (isSwapNeeded) {
-        this._adjustEditableSelection("start", aSelectionInfo.start,
-            aEndOfSelection);
-        this._adjustEditableSelection("end", aSelectionInfo.end,
-            aEndOfSelection);
-      } else {
-        this._adjustEditableSelection(aSelectionInfo.change, markerToChange,
-            aEndOfSelection);
-      }
-    } else {
-      if (isSwapNeeded) {
-        this._adjustSelectionAtPoint("start", aSelectionInfo.start,
-            aEndOfSelection, true);
-        this._adjustSelectionAtPoint("end", aSelectionInfo.end,
-            aEndOfSelection, true);
-      } else {
-        this._adjustSelectionAtPoint(aSelectionInfo.change, markerToChange,
-            aEndOfSelection);
-      }
-    }
-  },
-
-  /**
-   * Checks whether we need to swap start and end markers depending the target
-   * element and monocle position.
-   * @param aStart Start monocle coordinates.
-   * @param aEnd End monocle coordinates
-   * @param aYThreshold Y-coordinate threshold used to eliminate slight
-   * differences in monocle vertical positions.
-   */
-  _isSelectionSwapNeeded: function(aStart, aEnd, aYThreshold) {
-    let isSwapNeededByX = aStart.xPos > aEnd.xPos;
-    let isSwapNeededByY = aStart.yPos - aEnd.yPos > aYThreshold;
-    let onTheSameLine = Math.abs(aStart.yPos - aEnd.yPos) <= aYThreshold;
-
-    if (this._targetIsEditable &&
-        !Util.isEditableContent(this._targetElement)) {
-
-      // If one of the markers is restricted to edit bounds, then we shouldn't
-      // swap it until we know its real position
-      if (aStart.restrictedToBounds && aEnd.restrictedToBounds) {
-        return false;
-      }
-
-      // For multi line we should respect Y-coordinate
-      if (Util.isMultilineInput(this._targetElement)) {
-        return isSwapNeededByY || (isSwapNeededByX && onTheSameLine);
-      }
-
-      return isSwapNeededByX;
-    }
-
-    return isSwapNeededByY || (isSwapNeededByX && onTheSameLine);
-  },
-
-  /*
-   * _handleSelectionPoint helper methods
-   */
-
-  /*
-   * _adjustEditableSelection
-   *
-   * Based on a monocle marker and position, adds or subtracts from the
-   * existing selection in editable controls. Handles auto-scroll as well.
-   *
-   * @param the marker currently being manipulated
-   * @param aAdjustedClientPoint client point adjusted for line height.
-   * @param aEndOfSelection indicates if this is the end of a selection
-   * move, in which case we may want to snap to the end of a word or
-   * sentence.
-   */
-  _adjustEditableSelection: function _adjustEditableSelection(aMarker,
-                                                              aAdjustedClientPoint,
-                                                              aEndOfSelection) {
-    // Test to see if we need to handle auto-scroll in cases where the
-    // monocle is outside the bounds of the control. This also handles
-    // adjusting selection if out-of-bounds is true.
-    let result = this.updateTextEditSelection(aAdjustedClientPoint);
-
-    // If result.trigger is true, the monocle is outside the bounds of the
-    // control.
-    if (result.trigger) {
-      // _handleSelectionPoint is triggered by input movement, so if we've
-      // tested positive for out-of-bounds scrolling here, we need to set a
-      // recurring timer to keep the expected selection behavior going as
-      // long as the user keeps the monocle out of bounds.
-      this._setTextEditUpdateInterval(result.speed);
-
-      // Smooth the selection
-      this._setContinuousSelection();
-
-      // Update the other monocle's position if we've dragged off to one side
-      this._updateSelectionUI("update", result.start, result.end);
-    } else {
-      // If we aren't out-of-bounds, clear the scroll timer if it exists.
-      this._clearTimers();
-
-      // Restrict the client point to the interior of the control.
-      let constrainedPoint =
-        this._constrainPointWithinControl(aAdjustedClientPoint);
-
-      //  Add or subtract selection
-      let cp =
-        this._contentWindow.document.caretPositionFromPoint(constrainedPoint.xPos,
-                                                            constrainedPoint.yPos);
-
-      // For textareas or if cpfp fails we fall back on the selectAtPoint
-      // logic (bugs 882149, 943071).
-      if (Util.isMultilineInput(this._targetElement) || !cp ||
-          !this._offsetNodeIsValid(cp.offsetNode)) {
-        this._adjustSelectionAtPoint(aMarker, constrainedPoint, aEndOfSelection);
-        return;
-      }
-
-      if (aMarker == "start") {
-        this._targetElement.selectionStart = cp.offset;
-      } else {
-        this._targetElement.selectionEnd = cp.offset;
-      }
-    }
-  },
-
-  /*
-   * Make sure caretPositionFromPoint gave us an offset node that equals our
-   * editable, or in the case of getBindingParent identifies an anonymous
-   * element in chrome content within our target element. (navbar)
-   */
-  _offsetNodeIsValid: function (aNode) {
-    if (aNode == this._targetElement ||
-        this._contentWindow.document.getBindingParent(aNode) == this._targetElement) {
-      return true;
-    }
-    return false;
-  },
-
-  /*
-   * _adjustSelectionAtPoint
-   *
-   * Based on a monocle marker and position, adds or subtracts from the
-   * existing selection at a point.
-   *
-   * Note: we are trying to move away from this api due to the overhead. 
-   *
-   * @param the marker currently being manipulated
-   * @param aClientPoint the point designating the new start or end
-   * position for the selection.
-   * @param aEndOfSelection indicates if this is the end of a selection
-   * move, in which case we may want to snap to the end of a word or
-   * sentence.
-   * @param suppressSelectionUIUpdate Indicates that we don't want to update
-   * static monocle automatically as it's going to be be updated explicitly like
-   * in case with monocle swapping.
-   */
-  _adjustSelectionAtPoint: function _adjustSelectionAtPoint(aMarker,
-      aClientPoint, aEndOfSelection, suppressSelectionUIUpdate) {
-    // Make a copy of the existing range, we may need to reset it.
-    this._backupRangeList();
-
-    // shrinkSelectionFromPoint takes sub-frame relative coordinates.
-    let framePoint = this._clientPointToFramePoint(aClientPoint);
-
-    // Tests to see if the user is trying to shrink the selection, and if so
-    // collapses it down to the appropriate side such that our calls below
-    // will reset the selection to the proper range.
-    let shrunk = this._shrinkSelectionFromPoint(aMarker, framePoint);
-
-    let selectResult = false;
-    try {
-      // If we're at the end of a selection (touchend) snap to the word.
-      let type = ((aEndOfSelection && this._snap) ?
-        Ci.nsIDOMWindowUtils.SELECT_WORD :
-        Ci.nsIDOMWindowUtils.SELECT_CHARACTER);
-
-      // Select a character at the point.
-      selectResult = this._domWinUtils.selectAtPoint(framePoint.xPos,
-          framePoint.yPos, type);
-
-      // selectAtPoint selects char back and forward and apparently can select
-      // content that is beyond selection boundaries that we had before it was
-      // shrunk that forces selection to always move forward or backward
-      // preventing monocle swapping.
-      if (selectResult && shrunk && this._rangeBackup) {
-        let selection = this._getSelection();
-
-        let currentSelection = this._extractUIRects(
-            selection.getRangeAt(selection.rangeCount - 1)).selection;
-        let previousSelection = this._extractUIRects(
-            this._rangeBackup[0]).selection;
-
-        if (aMarker == "start" &&
-            currentSelection.right > previousSelection.right) {
-          selectResult = false;
-        }
-
-        if (aMarker == "end"  &&
-            currentSelection.left < previousSelection.left) {
-          selectResult = false;
-        }
-      }
-    } catch (ex) {
-    }
-
-    // If selectAtPoint failed (which can happen if there's nothing to select)
-    // reset our range back before we shrunk it.
-    if (!selectResult) {
-      this._restoreRangeList();
-    }
-
-    this._freeRangeList();
-
-    // Smooth over the selection between all existing ranges.
-    this._setContinuousSelection();
-
-    // Update the other monocle's position. We do this because the dragging
-    // monocle may reset the static monocle to a new position if the dragging
-    // monocle drags ahead or behind the other.
-    this._updateSelectionUI("update",
-      aMarker == "end" && !suppressSelectionUIUpdate,
-      aMarker == "start" && !suppressSelectionUIUpdate);
-  },
-
-  /*
-   * _backupRangeList, _restoreRangeList, and _freeRangeList
-   *
-   * Utilities that manage a cloned copy of the existing selection.
-   */
-
-  _backupRangeList: function _backupRangeList() {
-    this._rangeBackup = new Array();
-    for (let idx = 0; idx < this._getSelection().rangeCount; idx++) {
-      this._rangeBackup.push(this._getSelection().getRangeAt(idx).cloneRange());
-    }
-  },
-
-  _restoreRangeList: function _restoreRangeList() {
-    if (this._rangeBackup == null)
-      return;
-
-    // Remove every previously created selection range
-    this._getSelection().removeAllRanges();
-
-    for (let idx = 0; idx < this._rangeBackup.length; idx++) {
-      this._getSelection().addRange(this._rangeBackup[idx]);
-    }
-    this._freeRangeList();
-  },
-
-  _freeRangeList: function _restoreRangeList() {
-    this._rangeBackup = null;
-  },
-
-  /*
-   * Constrains a selection point within a text input control bounds.
-   *
-   * @param aPoint - client coordinate point
-   * @param aMargin - added inner margin to respect, defaults to 0.
-   * @param aOffset - amount to push the resulting point inward, defaults to 0.
-   * @return new constrained point struct
-   */
-  _constrainPointWithinControl: function _cpwc(aPoint, aMargin, aOffset) {
-    let margin = aMargin || 0;
-    let offset = aOffset || 0;
-    let bounds = this._getTargetBrowserRect();
-    let point = { xPos: aPoint.xPos, yPos: aPoint.yPos };
-    if (point.xPos <= (bounds.left + margin))
-      point.xPos = bounds.left + offset;
-    if (point.xPos >= (bounds.right - margin))
-      point.xPos = bounds.right - offset;
-    if (point.yPos <= (bounds.top + margin))
-      point.yPos = bounds.top + offset;
-    if (point.yPos >= (bounds.bottom - margin))
-      point.yPos = bounds.bottom - offset;
-    return point;
-  },
-
-  /*
-   * _pointOrientationToRect(aPoint, aRect)
-   *
-   * Returns a table representing which sides of target aPoint is offset
-   * from: { left: offset, top: offset, right: offset, bottom: offset }
-   * Works on client coordinates.
-   */
-  _pointOrientationToRect: function _pointOrientationToRect(aPoint) {
-    let bounds = this._getTargetBrowserRect();
-    let result = { left: 0, right: 0, top: 0, bottom: 0 };
-    if (aPoint.xPos <= bounds.left)
-      result.left = bounds.left - aPoint.xPos;
-    if (aPoint.xPos >= bounds.right)
-      result.right = aPoint.xPos - bounds.right;
-    if (aPoint.yPos <= bounds.top)
-      result.top = bounds.top - aPoint.yPos;
-    if (aPoint.yPos >= bounds.bottom)
-      result.bottom = aPoint.yPos - bounds.bottom;
-    return result;
-  },
-
-  /*
-   * updateTextEditSelection(aPoint, aClientPoint)
-   *
-   * Checks to see if the monocle point is outside the bounds of the target
-   * edit. If so, use the selection controller to select and scroll the edit
-   * appropriately.
-   *
-   * @param aClientPoint raw pointer position
-   * @return { speed: 0.0 -> 1.0,
-   *           trigger: true/false if out of bounds,
-   *           start: true/false if updated position,
-   *           end: true/false if updated position }
-   */
-  updateTextEditSelection: function updateTextEditSelection(aClientPoint) {
-    if (aClientPoint == undefined) {
-      aClientPoint = this._rawSelectionPoint;
-    }
-    this._rawSelectionPoint = aClientPoint;
-
-    let orientation = this._pointOrientationToRect(aClientPoint);
-    let result = { speed: 1, trigger: false, start: false, end: false };
-    let ml = Util.isMultilineInput(this._targetElement);
-
-    // This could be improved such that we only select to the beginning of
-    // the line when dragging left but not up.
-    if (orientation.left || (ml && orientation.top)) {
-      this._addEditSelection(kSelectionNodeAnchor);
-      result.speed = orientation.left + orientation.top;
-      result.trigger = true;
-      result.end = true;
-    } else if (orientation.right || (ml && orientation.bottom)) {
-      this._addEditSelection(kSelectionNodeFocus);
-      result.speed = orientation.right + orientation.bottom;
-      result.trigger = true;
-      result.start = true;
-    }
-
-    // 'speed' is just total pixels offset, so clamp it to something
-    // reasonable callers can work with.
-    if (result.speed > 100)
-      result.speed = 100;
-    if (result.speed < 1)
-      result.speed = 1;
-    result.speed /= 100;
-    return result;
-  },
-
-  _setTextEditUpdateInterval: function _setTextEditUpdateInterval(aSpeedValue) {
-    let timeout = (75 - (aSpeedValue * 75));
-    if (!this._scrollTimer)
-      this._scrollTimer = new Util.Timeout();
-    this._scrollTimer.interval(timeout, this.scrollTimerCallback);
-  },
-
-  _clearTimers: function _clearTimers() {
-    if (this._scrollTimer) {
-      this._scrollTimer.clear();
-    }
-  },
-
-  /*
-   * _addEditSelection - selection control call wrapper for text inputs.
-   * Adds selection on the anchor or focus side of selection in a text
-   * input. Scrolls the location into view as well.
-   *
-   * @param const selection node identifier
-   */
-  _addEditSelection: function _addEditSelection(aLocation) {
-    let selCtrl = this._getSelectController();
-    try {
-      if (aLocation == kSelectionNodeAnchor) {
-        let start = Math.max(this._targetElement.selectionStart - 1, 0);
-        this._targetElement.setSelectionRange(start, this._targetElement.selectionEnd,
-                                              "backward");
-      } else {
-        let end = Math.min(this._targetElement.selectionEnd + 1,
-                           this._targetElement.textLength);
-        this._targetElement.setSelectionRange(this._targetElement.selectionStart,
-                                              end,
-                                              "forward");
-      }
-      selCtrl.scrollSelectionIntoView(Ci.nsISelectionController.SELECTION_NORMAL,
-                                      Ci.nsISelectionController.SELECTION_FOCUS_REGION,
-                                      Ci.nsISelectionController.SCROLL_SYNCHRONOUS);
-    } catch (ex) { Util.dumpLn(ex);}
-  },
-
-  _updateInputFocus: function _updateInputFocus(aMarker) {
-    try {
-      let selCtrl = this._getSelectController();
-      this._targetElement.setSelectionRange(this._targetElement.selectionStart,
-                                            this._targetElement.selectionEnd,
-                                            aMarker == "start" ?
-                                              "backward" : "forward");
-      selCtrl.scrollSelectionIntoView(Ci.nsISelectionController.SELECTION_NORMAL,
-                                      Ci.nsISelectionController.SELECTION_FOCUS_REGION,
-                                      Ci.nsISelectionController.SCROLL_SYNCHRONOUS);
-    } catch (ex) {}
-  },
-
-  /*
-   * _queryHalfLineHeight(aMarker, aSelection)
-   *
-   * Y offset applied to the coordinates of the selection position we send
-   * to dom utils. The selection marker sits below text, but we want the
-   * selection position to be on the text above the monocle. Since text
-   * height can vary across the entire selection range, we need the correct
-   * height based on the line the marker in question is moving on.
-   */
-  _queryHalfLineHeight: function _queryHalfLineHeight(aMarker, aSelection) {
-    let rects = aSelection.getRangeAt(0).getClientRects();
-    if (!rects.length) {
-      return 0;
-    }
-
-    // We are assuming here that these rects are ordered correctly.
-    // From looking at the range code it appears they will be.
-    let height = 0;
-    if (aMarker == "start") {
-      // height of the first rect corresponding to the start marker:
-      height = rects[0].bottom - rects[0].top;
-    } else {
-      // height of the last rect corresponding to the end marker:
-      let len = rects.length - 1;
-      height = rects[len].bottom - rects[len].top;
-    }
-    return height / 2;
-  },
-
-  /*
-   * _setContinuousSelection()
-   *
-   * Smooths a selection with multiple ranges into a single
-   * continuous range.
-   */
-  _setContinuousSelection: function _setContinuousSelection() {
-    let selection = this._getSelection();
-    try {
-      if (selection.rangeCount > 1) {
-        let startRange = selection.getRangeAt(0);
-        if (this. _debugOptions.displayRanges) {
-          let clientRect = startRange.getBoundingClientRect();
-          this._setDebugRect(clientRect, "red", false);
-        }
-        let newStartNode = null;
-        let newStartOffset = 0;
-        let newEndNode = null;
-        let newEndOffset = 0;
-        for (let idx = 1; idx < selection.rangeCount; idx++) {
-          let range = selection.getRangeAt(idx);
-          switch (startRange.compareBoundaryPoints(Ci.nsIDOMRange.START_TO_START, range)) {
-            case -1: // startRange is before
-              newStartNode = startRange.startContainer;
-              newStartOffset = startRange.startOffset;
-              break;
-            case 0: // startRange is equal
-              newStartNode = startRange.startContainer;
-              newStartOffset = startRange.startOffset;
-              break;
-            case 1: // startRange is after
-              newStartNode = range.startContainer;
-              newStartOffset = range.startOffset;
-              break;
-          }
-          switch (startRange.compareBoundaryPoints(Ci.nsIDOMRange.END_TO_END, range)) {
-            case -1: // startRange is before
-              newEndNode = range.endContainer;
-              newEndOffset = range.endOffset;
-              break;
-            case 0: // startRange is equal
-              newEndNode = range.endContainer;
-              newEndOffset = range.endOffset;
-              break;
-            case 1: // startRange is after
-              newEndNode = startRange.endContainer;
-              newEndOffset = startRange.endOffset;
-              break;
-          }
-          if (this. _debugOptions.displayRanges) {
-            let clientRect = range.getBoundingClientRect();
-            this._setDebugRect(clientRect, "orange", false);
-          }
-        }
-        let range = content.document.createRange();
-        range.setStart(newStartNode, newStartOffset);
-        range.setEnd(newEndNode, newEndOffset);
-        selection.addRange(range);
-      }
-    } catch (ex) {
-      Util.dumpLn("exception while modifying selection:", ex.message);
-      this._onFail("_handleSelectionPoint failed.");
-      return false;
-    }
-    return true;
-  },
-
-  /*
-   * _shrinkSelectionFromPoint(aMarker, aFramePoint)
-   *
-   * Tests to see if aFramePoint intersects the current selection and if so,
-   * collapses selection down to the opposite start or end point leaving a
-   * character of selection at the collapse point.
-   *
-   * @param aMarker the marker that is being relocated. ("start" or "end")
-   * @param aFramePoint position of the marker.
-   */
-  _shrinkSelectionFromPoint: function _shrinkSelectionFromPoint(aMarker, aFramePoint) {
-    let result = false;
-    try {
-      let selection = this._getSelection();
-      for (let range = 0; range < selection.rangeCount; range++) {
-        // relative to frame
-        let rects = selection.getRangeAt(range).getClientRects();
-        for (let idx = 0; idx < rects.length; idx++) {
-          // Util.dumpLn("[" + idx + "]", aFramePoint.xPos, aFramePoint.yPos, rects[idx].left,
-          // rects[idx].top, rects[idx].right, rects[idx].bottom);
-          if (Util.pointWithinDOMRect(aFramePoint.xPos, aFramePoint.yPos, rects[idx])) {
-            result = true;
-            if (aMarker == "start") {
-              selection.collapseToEnd();
-            } else {
-              selection.collapseToStart();
-            }
-            // collapseToStart and collapseToEnd leave an empty range in the
-            // selection at the collapse point. Therefore we need to add some
-            // selection such that the selection added by selectAtPoint and
-            // the current empty range will get merged properly when we smooth
-            // the selection ranges out.
-            let selCtrl = this._getSelectController();
-            // Expand the collapsed range such that it occupies a little space.
-            if (aMarker == "start") {
-              // State: focus = anchor (collapseToEnd does this)
-              selCtrl.characterMove(false, true);
-              // State: focus = (anchor - 1)
-              selection.collapseToStart();
-              // State: focus = anchor and both are -1 from the original offset
-              selCtrl.characterMove(true, true);
-              // State: focus = anchor + 1, both have been moved back one char
-            } else {
-              selCtrl.characterMove(true, true);
-            }
-            break;
-          }
-        }
-      }
-    } catch (ex) {
-      Util.dumpLn("error shrinking selection:", ex.message);
-    }
-    return result;
-  },
-
-  /*
-   * _updateUIMarkerRects(aSelection)
-   *
-   * Extracts the rects of the current selection, clips them to any text
-   * input bounds, and stores them in the cache table we send over to
-   * SelectionHelperUI.
-   */
-  _updateUIMarkerRects: function _updateUIMarkerRects(aSelection) {
-    this._cache = this._extractUIRects(aSelection.getRangeAt(0));
-    if (this. _debugOptions.dumpRanges)  {
-       Util.dumpLn("start:", "(" + this._cache.start.xPos + "," +
-                   this._cache.start.yPos + ")");
-       Util.dumpLn("end:", "(" + this._cache.end.xPos + "," +
-                   this._cache.end.yPos + ")");
-       Util.dumpLn("caret:", "(" + this._cache.caret.xPos + "," +
-                   this._cache.caret.yPos + ")");
-    }
-    this._restrictSelectionRectToEditBounds();
-  },
-
-  /*
-   * _extractUIRects - Extracts selection and target element information
-   * used by SelectionHelperUI. Returns client relative coordinates.
-   *
-   * @return table containing various ui rects and information
-   */
-  _extractUIRects: function _extractUIRects(aRange) {
-    let seldata = {
-      start: {}, end: {}, caret: {},
-      selection: { left: 0, top: 0, right: 0, bottom: 0 },
-      element: { left: 0, top: 0, right: 0, bottom: 0 }
-    };
-
-    // When in an iframe, aRange coordinates are relative to the frame origin.
-    let rects = aRange.getClientRects();
-
-    if (rects && rects.length) {
-      let startSet = false;
-      for (let idx = 0; idx < rects.length; idx++) {
-        if (this. _debugOptions.dumpRanges) Util.dumpDOMRect(idx, rects[idx]);
-        if (!startSet && !Util.isEmptyDOMRect(rects[idx])) {
-          seldata.start.xPos = rects[idx].left + this._contentOffset.x;
-          seldata.start.yPos = rects[idx].bottom + this._contentOffset.y;
-          seldata.caret = seldata.start;
-          startSet = true;
-          if (this. _debugOptions.dumpRanges) Util.dumpLn("start set");
-        }
-        if (!Util.isEmptyDOMRect(rects[idx])) {
-          seldata.end.xPos = rects[idx].right + this._contentOffset.x;
-          seldata.end.yPos = rects[idx].bottom + this._contentOffset.y;
-          if (this. _debugOptions.dumpRanges) Util.dumpLn("end set");
-        }
-      }
-
-      // Store the client rect of selection
-      let r = aRange.getBoundingClientRect();
-      seldata.selection.left = r.left + this._contentOffset.x;
-      seldata.selection.top = r.top + this._contentOffset.y;
-      seldata.selection.right = r.right + this._contentOffset.x;
-      seldata.selection.bottom = r.bottom + this._contentOffset.y;
-    }
-
-    // Store the client rect of target element
-    let r = this._getTargetClientRect();
-    seldata.element.left = r.left + this._contentOffset.x;
-    seldata.element.top = r.top + this._contentOffset.y;
-    seldata.element.right = r.right + this._contentOffset.x;
-    seldata.element.bottom = r.bottom + this._contentOffset.y;
-
-    // If we don't have a range we can attach to let SelectionHelperUI know.
-    seldata.selectionRangeFound = !!rects.length;
-
-    return seldata;
-  },
-
-  /**
-   * Updates point's coordinate with max\min available in accordance with the
-   * bounding rectangle. Returns true if point coordinates were actually updated,
-   * and false - otherwise.
-   * @param aPoint Target point which coordinates will be analyzed.
-   * @param aRectangle Target rectangle to bound to.
-   */
-  _restrictPointToRectangle: function(aPoint, aRectangle) {
-    let restrictionWasRequired = false;
-
-    if (aPoint.xPos < aRectangle.left) {
-      aPoint.xPos = aRectangle.left;
-      restrictionWasRequired = true;
-    } else if (aPoint.xPos > aRectangle.right) {
-      aPoint.xPos = aRectangle.right;
-      restrictionWasRequired = true;
-    }
-
-    if (aPoint.yPos < aRectangle.top) {
-      aPoint.yPos = aRectangle.top;
-      restrictionWasRequired = true;
-    } else if (aPoint.yPos > aRectangle.bottom) {
-      aPoint.yPos = aRectangle.bottom;
-      restrictionWasRequired = true;
-    }
-
-    return restrictionWasRequired;
-  },
-
-  /*
-   * Selection bounds will fall outside the bound of a control if the control
-   * can scroll. Clip UI cache data to the bounds of the target so monocles
-   * don't draw outside the control.
-   */
-  _restrictSelectionRectToEditBounds: function _restrictSelectionRectToEditBounds() {
-    if (!this._targetIsEditable)
-      return;
-
-    let targetRectangle = this._getTargetBrowserRect();
-    this._cache.start.restrictedToBounds = this._restrictPointToRectangle(
-        this._cache.start, targetRectangle);
-    this._cache.end.restrictedToBounds = this._restrictPointToRectangle(
-        this._cache.end, targetRectangle);
-    this._restrictPointToRectangle(this._cache.caret, targetRectangle);
-  },
-
-  _restrictCoordinateToEditBounds: function _restrictCoordinateToEditBounds(aX, aY) {
-    let result = {
-      xPos: aX,
-      yPos: aY
-    };
-    if (!this._targetIsEditable)
-      return result;
-    let bounds = this._getTargetBrowserRect();
-    if (aX <= bounds.left)
-      result.xPos = bounds.left + 1;
-    if (aX >= bounds.right)
-      result.xPos = bounds.right - 1;
-    if (aY <= bounds.top)
-      result.yPos = bounds.top + 1;
-    if (aY >= bounds.bottom)
-      result.yPos = bounds.bottom - 1;
-    return result;
-  },
-
-  /*************************************************
-   * Utilities
-   */
-
-  /*
-   * Returns bounds of the element relative to the inner sub frame it sits
-   * in.
-   */
-  _getTargetClientRect: function _getTargetClientRect() {
-    return this._targetElement.getBoundingClientRect();
-  },
-
-  /*
-   * Returns bounds of the element relative to the top level browser.
-   */
-  _getTargetBrowserRect: function _getTargetBrowserRect() {
-    let client = this._getTargetClientRect();
-    return {
-      left: client.left +  this._contentOffset.x,
-      top: client.top +  this._contentOffset.y,
-      right: client.right +  this._contentOffset.x,
-      bottom: client.bottom +  this._contentOffset.y
-    };
-  },
-
-  _clientPointToFramePoint: function _clientPointToFramePoint(aClientPoint) {
-    let point = {
-      xPos: aClientPoint.xPos - this._contentOffset.x,
-      yPos: aClientPoint.yPos - this._contentOffset.y
-    };
-    return point;
-  },
-
-  /*************************************************
-   * Debug routines
-   */
-
-  _debugDumpSelection: function _debugDumpSelection(aNote, aSel) {
-    Util.dumpLn("--" + aNote + "--");
-    Util.dumpLn("anchor:", aSel.anchorNode, aSel.anchorOffset);
-    Util.dumpLn("focus:", aSel.focusNode, aSel.focusOffset);
-  },
-
-  _debugDumpChildNodes: function _dumpChildNodes(aNode, aSpacing) {
-    for (let idx = 0; idx < aNode.childNodes.length; idx++) {
-      let node = aNode.childNodes.item(idx);
-      for (let spaceIdx = 0; spaceIdx < aSpacing; spaceIdx++) dump(" ");
-      Util.dumpLn("[" + idx + "]", node);
-      this._debugDumpChildNodes(node, aSpacing + 1);
-    }
-  },
-
-  _setDebugElementRect: function _setDebugElementRect(e, aScrollOffset, aColor) {
-    try {
-      if (e == null) {
-        Util.dumpLn("_setDebugElementRect(): passed in null element");
-        return;
-      }
-      if (e.offsetWidth == 0 || e.offsetHeight== 0) {
-        Util.dumpLn("_setDebugElementRect(): passed in flat rect");
-        return;
-      }
-      // e.offset values are positioned relative to the view.
-      this.sendAsync("Content:SelectionDebugRect",
-        { left:e.offsetLeft - aScrollOffset.x,
-          top:e.offsetTop - aScrollOffset.y,
-          right:e.offsetLeft + e.offsetWidth - aScrollOffset.x,
-          bottom:e.offsetTop + e.offsetHeight - aScrollOffset.y,
-          color:aColor, id: e.id });
-    } catch(ex) {
-      Util.dumpLn("_setDebugElementRect():", ex.message);
-    }
-  },
-
-  /*
-   * Adds a debug rect to the selection overlay, useful in identifying
-   * locations for points and rects. Params are in client coordinates.
-   *
-   * Example:
-   * let rect = { left: aPoint.xPos - 1, top: aPoint.yPos - 1,
-   *              right: aPoint.xPos + 1, bottom: aPoint.yPos + 1 };
-   * this._setDebugRect(rect, "red");
-   *
-   * In SelectionHelperUI, you'll need to turn on displayDebugLayer
-   * in init().
-   */
-  _setDebugRect: function _setDebugRect(aRect, aColor, aFill, aId) {
-    this.sendAsync("Content:SelectionDebugRect",
-      { left:aRect.left, top:aRect.top,
-        right:aRect.right, bottom:aRect.bottom,
-        color:aColor, fill: aFill, id: aId });
-  },
-
-  /*
-   * Adds a small debug rect at the point specified. Params are in
-   * client coordinates.
-   *
-   * In SelectionHelperUI, you'll need to turn on displayDebugLayer
-   * in init().
-   */
-  _setDebugPoint: function _setDebugPoint(aX, aY, aColor) {
-    let rect = { left: aX - 2, top: aY - 2,
-                 right: aX + 2, bottom: aY + 2 };
-    this._setDebugRect(rect, aColor, true);
-  },
-};
-this.SelectionPrototype = SelectionPrototype;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/NavButtonSlider.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/NavButtonSlider.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/NavButtonSlider.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/NavButtonSlider.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,217 +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/. */
-
-/*
- * Handles nav overlay button positioning.
- */
-
-// minimum amount of movement using the mouse after which we cancel the button click handlers
-const kOnClickMargin = 3;
-
-const kNavButtonPref = "browser.display.overlaynavbuttons";
-
-var NavButtonSlider = {
-  _back: document.getElementById("overlay-back"),
-  _plus: document.getElementById("overlay-plus"),
-  _mouseMoveStarted: false,
-  _mouseDown: false,
-  _yPos: -1,
-
-  get back() {
-    return this._back;
-  },
-
-  get plus() {
-    return this._plus;
-  },
-
-  /*
-   * custom dragger, see input.js
-   */
-
-  freeDrag: function freeDrag() {
-    return true;
-  },
-
-  isDraggable: function isDraggable(aTarget, aContent) {
-    return { x: false, y: true };
-  },
-
-  dragStart: function dragStart(aX, aY, aTarget, aScroller) {
-    return true;
-  },
-
-  dragStop: function dragStop(aDx, aDy, aScroller) {
-    return true;
-  },
-
-  dragMove: function dragMove(aDx, aDy, aScroller, aIsKenetic, aClientX, aClientY) {
-    // Note if aIsKenetic is true this is synthetic movement,
-    // we don't want that so return false.
-    if (aIsKenetic) {
-      return false;
-    }
-    
-    this._updatePosition(aClientY);
-
-    // return true if we moved, false otherwise. The result
-    // is used in deciding if we should repaint between drags.
-    return true;
-  },
-
-  /*
-   * logic
-   */
-
-  init: function init() {
-    // Touch drag support provided by input.js
-    this._back.customDragger = this;
-    this._plus.customDragger = this;
-    Elements.browsers.addEventListener("ContentSizeChanged", this, true);
-    let events = ["mousedown", "mouseup", "mousemove", "click", "touchstart", "touchmove", "touchend"];
-    events.forEach(function (value) {
-      this._back.addEventListener(value, this, true);
-      this._plus.addEventListener(value, this, true);
-    }, this);
-
-    this._updateStops();
-    this._updateVisibility();
-    Services.prefs.addObserver(kNavButtonPref, this, false);
-  },
-
-  observe: function (aSubject, aTopic, aData) {
-    if (aTopic == "nsPref:changed" && aData == kNavButtonPref) {
-      this._updateVisibility();
-    }
-  },
-
-  _updateVisibility: function () {
-    if (Services.prefs.getBoolPref(kNavButtonPref)) {
-      this._back.removeAttribute("hidden");
-      this._plus.removeAttribute("hidden");
-    } else {
-      this._back.setAttribute("hidden", true);
-      this._plus.setAttribute("hidden", true);
-    }
-  },
-
-  _updateStops: function () {
-    this._contentHeight = ContentAreaObserver.contentHeight;
-    this._imageHeight = 118;
-    this._topStop = this._imageHeight * .7;
-    this._bottomStop = this._contentHeight - (this._imageHeight * .7);
-
-    // Check to see if we need to move the slider into view
-    if (this._yPos != -1 &&
-        (this._topStop > this._yPos || this._bottomStop < this._yPos)) {
-      this._back.style.top = "50%";
-      this._plus.style.top = "50%";
-    }
-  },
-
-  _getPosition: function _getPosition() {
-    this._yPos = parseInt(getComputedStyle(this._back).top);
-  },
-
-  _setPosition: function _setPosition() {
-    this._back.style.top = this._yPos + "px";
-    this._plus.style.top = this._yPos + "px";
-  },
-
-  _updatePosition: function (aClientY) {
-    if (this._topStop > aClientY || this._bottomStop < aClientY)
-      return;
-    this._yPos = aClientY;
-    this._setPosition();
-  },
-
-  _updateOffset: function (aOffset) {
-    let newPos = this._yPos + aOffset;
-    if (this._topStop > newPos || this._bottomStop < newPos)
-      return;
-    this._yPos = newPos;
-    this._setPosition();
-  },
-
-  /*
-   * Events
-   */
-
-  handleEvent: function handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "ContentSizeChanged":
-        this._updateStops();
-        break;
-
-      case "touchstart":
-        if (aEvent.touches.length != 1)
-          break;
-        aEvent.preventDefault();
-        aEvent = aEvent.touches[0];
-      case "mousedown":
-        this._getPosition();
-        this._mouseDown = true;
-        this._mouseMoveStarted = false;
-        this._mouseY = aEvent.clientY;
-        if (aEvent.originalTarget)
-          aEvent.originalTarget.setCapture();
-        this._back.setAttribute("mousedrag", true);
-        this._plus.setAttribute("mousedrag", true);
-        break;
-
-      case "touchend":
-        if (aEvent.touches.length != 0)
-          break;
-        this._mouseDown = false;
-        this._back.removeAttribute("mousedrag");
-        this._plus.removeAttribute("mousedrag");
-        if (!this._mouseMoveStarted) {
-          if (aEvent.originalTarget == this._back) {
-            CommandUpdater.doCommand('cmd_back');
-          } else {
-            CommandUpdater.doCommand('cmd_newTab');
-          }
-        }
-        break;
-      case "mouseup":
-        this._mouseDown = false;
-        this._back.removeAttribute("mousedrag");
-        this._plus.removeAttribute("mousedrag");
-        break;
-
-      case "touchmove":
-        if (aEvent.touches.length != 1)
-          break;
-        aEvent = aEvent.touches[0];
-      case "mousemove":
-        // Check to be sure this is a drag operation
-        if (!this._mouseDown) {
-          return;
-        }
-        // Don't start a drag until we've passed a threshold
-        let dy = aEvent.clientY - this._mouseY;
-        if (!this._mouseMoveStarted && Math.abs(dy) < kOnClickMargin) {
-          return;
-        }
-        // Start dragging via the mouse
-        this._mouseMoveStarted = true;
-        this._mouseY = aEvent.clientY;
-        this._updateOffset(dy);
-        break;
-      case "click":
-        // Don't invoke the click action if we've moved the buttons via the mouse.
-        if (this._mouseMoveStarted) {
-          return;
-        }
-        if (aEvent.originalTarget == this._back) {
-           CommandUpdater.doCommand('cmd_back');
-        } else {
-           CommandUpdater.doCommand('cmd_newTab');
-        }
-        break;
-    }
-  },
-};
-
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/aboutAddons.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/aboutAddons.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/aboutAddons.xhtml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/aboutAddons.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
-  <!ENTITY % aboutAddonsDTD SYSTEM "chrome://browser/locale/aboutAddons.dtd">
-  %aboutAddonsDTD;
-]>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.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 xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-  <title> &aboutAddons.title; </title>
-  <link rel="stylesheet" href="chrome://browser/skin/aboutAddons.css" type="text/css"/>
-</head>
-
-<body>
-  <div id="fox">
-    <div id="floatingTextBox">
-      <div id="aboutAddonsTextTitle">
-        &aboutAddons.messageTitle;
-      </div>
-      <div id="aboutAddonsTextBody">
-        &aboutAddons.message;
-        &aboutAddons.goBackToStartStart;
-        <a href="about:start">&aboutAddons.goBacktoStartLink;</a>
-        &aboutAddons.goBacktoStartEnd;
-      </div>
-    </div>
-  </div>
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/aboutCertError.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/aboutCertError.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/aboutCertError.xhtml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/aboutCertError.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % globalDTD
-    SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-  <!ENTITY % certerrorDTD
-    SYSTEM "chrome://browser/locale/aboutCertError.dtd">
-  %certerrorDTD;
-]>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.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 xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>&certerror.pagetitle;</title>
-    <meta name="viewport" content="width=device-width; user-scalable=false" />
-    <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
-    <!-- This page currently uses the same favicon as neterror.xhtml.
-         If the location of the favicon is changed for both pages, the
-         FAVICON_ERRORPAGE_URL symbol in toolkit/components/places/src/nsFaviconService.h
-         should be updated. If this page starts using a different favicon
-         than neterror, nsFaviconService->SetAndFetchFaviconForPage
-         should be updated to ignore this one as well. -->
-    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
-
-    <script type="application/javascript"><![CDATA[
-      // Error url MUST be formatted like this:
-      //   about:certerror?e=error&u=url&d=desc
-
-      // Note that this file uses document.documentURI to get
-      // the URL (with the format from above). This is because
-      // document.location.href gets the current URI off the docshell,
-      // which is the URL displayed in the location bar, i.e.
-      // the URI that the user attempted to load.
-
-      function getCSSClass()
-      {
-        var url = document.documentURI;
-        var matches = url.match(/s\=([^&]+)\&/);
-        // s is optional, if no match just return nothing
-        if (!matches || matches.length < 2)
-          return "";
-
-        // parenthetical match is the second entry
-        return decodeURIComponent(matches[1]);
-      }
-
-      function getDescription()
-      {
-        var url = document.documentURI;
-        var desc = url.search(/d\=/);
-
-        // desc == -1 if not found; if so, return an empty string
-        // instead of what would turn out to be portions of the URI
-        if (desc == -1)
-          return "";
-
-        return decodeURIComponent(url.slice(desc + 2));
-      }
-
-      function initPage()
-      {
-        // Replace the "#1" string in the intro with the hostname.  Trickier
-        // than it might seem since we want to preserve the <b> tags, but
-        // not allow for any injection by just using innerHTML.  Instead,
-        // just find the right target text node.
-        var intro = document.getElementById('introContentP1');
-        function replaceWithHost(node) {
-          if (node.textContent == "#1")
-            node.textContent = location.host;
-          else
-            for(var i = 0; i < node.childNodes.length; i++)
-              replaceWithHost(node.childNodes[i]);
-        };
-        replaceWithHost(intro);
-
-        if (getCSSClass() == "expertBadCert") {
-          toggle('technicalContent');
-          toggle('expertContent');
-        }
-
-        var tech = document.getElementById("technicalContentText");
-        if (tech)
-          tech.textContent = getDescription();
-
-        addDomainErrorLink();
-      }
-
-      /* In the case of SSL error pages about domain mismatch, see if
-         we can hyperlink the user to the correct site.  We don't want
-         to do this generically since it allows MitM attacks to redirect
-         users to a site under attacker control, but in certain cases
-         it is safe (and helpful!) to do so.  Bug 402210
-      */
-      function addDomainErrorLink() {
-        // Rather than textContent, we need to treat description as HTML
-        var sd = document.getElementById("technicalContentText");
-        if (sd) {
-          var desc = getDescription();
-
-          // sanitize description text - see bug 441169
-
-          // First, find the index of the <a> tag we care about, being careful not to
-          // use an over-greedy regex
-          var re = /<a id="cert_domain_link" title="([^"]+)">/;
-          var result = re.exec(desc);
-          if(!result)
-            return;
-
-          // Remove sd's existing children
-          sd.textContent = "";
-
-          // Everything up to the link should be text content
-          sd.appendChild(document.createTextNode(desc.slice(0, result.index)));
-
-          // Now create the link itself
-          var anchorEl = document.createElement("a");
-          anchorEl.setAttribute("id", "cert_domain_link");
-          anchorEl.setAttribute("title", result[1]);
-          anchorEl.appendChild(document.createTextNode(result[1]));
-          sd.appendChild(anchorEl);
-
-          // Finally, append text for anything after the closing </a>
-          sd.appendChild(document.createTextNode(desc.slice(desc.indexOf("</a>") + "</a>".length)));
-        }
-
-        var link = document.getElementById('cert_domain_link');
-        if (!link)
-          return;
-
-        var okHost = link.getAttribute("title");
-        var thisHost = document.location.hostname;
-        var proto = document.location.protocol;
-
-        // If okHost is a wildcard domain ("*.example.com") let's
-        // use "www" instead.  "*.example.com" isn't going to
-        // get anyone anywhere useful. bug 432491
-        okHost = okHost.replace(/^\*\./, "www.");
-
-        /* case #1:
-         * example.com uses an invalid security certificate.
-         *
-         * The certificate is only valid for www.example.com
-         *
-         * Make sure to include the "." ahead of thisHost so that
-         * a MitM attack on paypal.com doesn't hyperlink to "notpaypal.com"
-         *
-         * We'd normally just use a RegExp here except that we lack a
-         * library function to escape them properly (bug 248062), and
-         * domain names are famous for having '.' characters in them,
-         * which would allow spurious and possibly hostile matches.
-         */
-        if (endsWith(okHost, "." + thisHost))
-          link.href = proto + okHost;
-
-        /* case #2:
-         * browser.garage.maemo.org uses an invalid security certificate.
-         *
-         * The certificate is only valid for garage.maemo.org
-         */
-        if (endsWith(thisHost, "." + okHost))
-          link.href = proto + okHost;
-
-        // If we set a link, meaning there's something helpful for
-        // the user here, expand the section by default
-        if (link.href && getCSSClass() != "expertBadCert")
-          toggle("technicalContent");
-      }
-
-      function endsWith(haystack, needle) {
-        return haystack.slice(-needle.length) == needle;
-      }
-
-      function toggle(id) {
-        var element = document.getElementById(id);
-        if (element.hasAttribute("collapsed")) {
-          element.removeAttribute("collapsed");
-        } else {
-          element.setAttribute("collapsed", true);
-        }
-      }
-    ]]></script>
-  </head>
-
-  <body id="errorPage" class="certerror" dir="&locale.dir;">
-    <div class="top-decoration"></div>
-
-    <!-- PAGE CONTAINER (for styling purposes only) -->
-    <div id="errorPageContainer" class="section">
-
-      <!-- Error Title -->
-      <div id="errorTitle" class="section-header">
-        <span id="errorTitleIcon"></span>
-        <h1 class="errorTitleText">&certerror.longpagetitle;</h1>
-      </div>
-
-      <!-- LONG CONTENT (the section most likely to require scrolling) -->
-      <div id="errorLongContent" class="section-details">
-        <div id="introContent">
-          <p id="introContentP1">&certerror.introPara1;</p>
-        </div>
-
-        <div id="whatShouldIDoContent">
-          <h2>&certerror.whatShouldIDo.heading;</h2>
-          <div id="whatShouldIDoContentText">
-            <p>&certerror.whatShouldIDo.content;</p>
-            <xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='getMeOutOfHereButton' label='&certerror.getMeOutOfHere.label;'/>
-          </div>
-        </div>
-
-        <!-- The following sections can be unhidden by default by setting the
-             "browser.xul.error_pages.expert_bad_cert" pref to true -->
-        <div id="technicalContent" class="expandable-section" collapsed="true">
-          <h2 onclick="toggle('technicalContent');" id="technicalContentHeading" class="expandable-heading">&certerror.technical.heading;</h2>
-          <p class="expandable-content" id="technicalContentText"/>
-        </div>
-
-        <div id="expertContent" class="expandable-section" collapsed="true">
-          <h2 onclick="toggle('expertContent');" id="expertContentHeading" class="expandable-heading">&certerror.expert.heading;</h2>
-          <div class="expandable-content">
-            <p>&certerror.expert.content;</p>
-            <p>&certerror.expert.contentPara2;</p>
-            <xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='temporaryExceptionButton' label='&certerror.addTemporaryException.label;'/>
-            <xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='permanentExceptionButton' label='&certerror.addPermanentException.label;'/>
-          </div>
-        </div>
-      </div>
-
-    </div>
-    <!--
-    - Note: It is important to run the script this way, instead of using
-    - an onload handler. This is because error pages are loaded as
-    - LOAD_BACKGROUND, which means that onload handlers will not be executed.
-    -->
-    <script type="application/javascript">initPage();</script>
-
-  </body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/aboutRights.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/aboutRights.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/aboutRights.xhtml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/aboutRights.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
-  <!ENTITY % aboutRightsDTD SYSTEM "chrome://global/locale/aboutRights.dtd">
-  %aboutRightsDTD;
-]>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.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 xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-  <title>&rights.pagetitle;</title>
-  <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"/>
-</head>
-
-<body id="your-rights" dir="&rights.locale-direction;" class="aboutPageWideContainer">
-
-<h1>&rights.intro-header;</h1>
-
-<p>&rights.intro;</p>
-
-<ul>
-  <li>&rights.intro-point1a;<a href="http://www.mozilla.org/MPL/">&rights.intro-point1b;</a>&rights.intro-point1c;</li>
-  <!--
-    Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded.
-    Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace)
-    Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace)
-  -->
-  <li>&rights.intro-point2-a;<a href="http://www.mozilla.org/foundation/trademarks/policy.html">&rights.intro-point2-b;</a>&rights.intro-point2-c;</li>
-  <li>&rights.intro-point2.5;</li>
-  <li>&rights2.intro-point3a;<a href="https://www.mozilla.org/legal/privacy/">&rights2.intro-point3b;</a>&rights.intro-point3c;</li>
-  <li>&rights2.intro-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li>
-</ul>
-
-<div id="webservices-container">
-  <a name="webservices"/>
-  <h3>&rights2.webservices-header;</h3>
-
-  <p>&rights2.webservices-a;<a href="about:rights#disabling-webservices" onclick="showDisablingServices();">&rights2.webservices-b;</a>&rights3.webservices-c;</p>
-
-  <div id="disabling-webservices-container" style="margin-left:40px;">
-    <a name="disabling-webservices"/>
-    <!-- XXX Safe Browsing is not enabled in Firefox Mobile -->
-    <!--
-    <p><strong>&rights.safebrowsing-a;</strong>&rights.safebrowsing-b;</p>
-    <ul>
-      <li>&rights.safebrowsing-term1;</li>
-      <li>&rights.safebrowsing-term2;</li>
-      <li>&rights.safebrowsing-term3;</li>
-      <li>&rights.safebrowsing-term4;</li>
-    </ul>
-    -->
-
-    <p><strong>&rights.locationawarebrowsing-a;</strong>&rights.locationawarebrowsing-b;</p>
-    <ul>
-      <li>&rights.locationawarebrowsing-term1a;<code>&rights.locationawarebrowsing-term1b;</code></li>
-      <li>&rights.locationawarebrowsing-term2;</li>
-      <li>&rights.locationawarebrowsing-term3;</li>
-      <li>&rights.locationawarebrowsing-term4;</li>
-    </ul>
-  </div>
-
-  <ol>
-    <!-- Terms only apply to official builds, unbranded builds get a placeholder. -->
-    <li>&rights2.webservices-term1;</li>
-    <li>&rights.webservices-term2;</li>
-    <li>&rights2.webservices-term3;</li>
-    <li><strong>&rights.webservices-term4;</strong></li>
-    <li><strong>&rights.webservices-term5;</strong></li>
-    <li>&rights.webservices-term6;</li>
-    <li>&rights.webservices-term7;</li>
-  </ol>
-</div>
-
-<script type="application/javascript"><![CDATA[
-  var servicesDiv = document.getElementById("webservices-container");
-  servicesDiv.style.display = "none";
-
-  function showServices() {
-    servicesDiv.style.display = "";
-  }
-  
-  var disablingServicesDiv = document.getElementById("disabling-webservices-container");
-  disablingServicesDiv.style.display = "none";
-  
-  function showDisablingServices() {
-    disablingServicesDiv.style.display = "";
-  }
-]]></script>
-
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/blockedSite.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/blockedSite.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/blockedSite.xhtml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/blockedSite.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-  %brandDTD;
-  <!ENTITY % blockedSiteDTD SYSTEM "chrome://browser/locale/phishing.dtd">
-  %blockedSiteDTD;
-]>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.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 xmlns="http://www.w3.org/1999/xhtml" class="blacklist">
-  <head>
-    <meta name="viewport" content="width=device-width; user-scalable=false" />
-    <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
-    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blacklist_favicon.png"/>
-
-    <script type="application/javascript"><![CDATA[
-      // Error url MUST be formatted like this:
-      //   about:blocked?e=error_code&u=url
-
-      // Note that this file uses document.documentURI to get
-      // the URL (with the format from above). This is because
-      // document.location.href gets the current URI off the docshell,
-      // which is the URL displayed in the location bar, i.e.
-      // the URI that the user attempted to load.
-
-      function getErrorCode()
-      {
-        var url = document.documentURI;
-        var error = url.search(/e\=/);
-        var duffUrl = url.search(/\&u\=/);
-        return decodeURIComponent(url.slice(error + 2, duffUrl));
-      }
-
-      function getURL()
-      {
-        var url = document.documentURI;
-        var match = url.match(/&u=([^&]+)&/);
-
-        // match == null if not found; if so, return an empty string
-        // instead of what would turn out to be portions of the URI
-        if (!match)
-          return "";
-
-        url = decodeURIComponent(match[1]);
-
-        // If this is a view-source page, then get then real URI of the page
-        if (/^view-source\:/.test(url))
-          url = url.slice(12);
-        return url;
-      }
-
-      /**
-       * Attempt to get the hostname via document.location.  Fail back
-       * to getURL so that we always return something meaningful.
-       */
-      function getHostString()
-      {
-        try {
-          return document.location.hostname;
-        } catch (e) {
-          return getURL();
-        }
-      }
-
-      function initPage()
-      {
-        // Handoff to the appropriate initializer, based on error code
-        switch (getErrorCode()) {
-          case "malwareBlocked" :
-            initPage_malware();
-            break;
-          case "phishingBlocked" :
-            initPage_phishing();
-            break;
-        }
-      }
-
-      /**
-       * Initialize custom strings and functionality for blocked malware case
-       */
-      function initPage_malware()
-      {
-        // Remove phishing strings
-        var el = document.getElementById("errorTitleText_phishing");
-        el.parentNode.removeChild(el);
-
-        el = document.getElementById("errorShortDescText_phishing");
-        el.parentNode.removeChild(el);
-
-        el = document.getElementById("errorLongDescText_phishing");
-        el.parentNode.removeChild(el);
-
-        // Set sitename
-        document.getElementById("malware_sitename").textContent = getHostString();
-        document.title = document.getElementById("errorTitleText_malware")
-                                 .innerHTML;
-      }
-
-      /**
-       * Initialize custom strings and functionality for blocked phishing case
-       */
-      function initPage_phishing()
-      {
-        // Remove malware strings
-        var el = document.getElementById("errorTitleText_malware");
-        el.parentNode.removeChild(el);
-
-        el = document.getElementById("errorShortDescText_malware");
-        el.parentNode.removeChild(el);
-
-        el = document.getElementById("errorLongDescText_malware");
-        el.parentNode.removeChild(el);
-
-        // Set sitename
-        document.getElementById("phishing_sitename").textContent = getHostString();
-        document.title = document.getElementById("errorTitleText_phishing")
-                                 .innerHTML;
-      }
-    ]]></script>
-    <style type="text/css">
-      /* Style warning button to look like a small text link in the
-         bottom right. This is preferable to just using a text link
-         since there is already a mechanism in browser.js for trapping
-         oncommand events from unprivileged chrome pages (BrowserOnCommand).*/
-      #ignoreWarningButton {
-        -moz-appearance: none;
-        background: transparent;
-        border: none;
-        color: white;  /* Hard coded because netError.css forces this page's background to dark red */
-        text-decoration: underline;
-        margin: 0;
-        padding: 0;
-        position: relative;
-        top: 23px;
-        left: 20px;
-        font-size: smaller;
-      }
-
-      #ignoreWarning {
-        text-align: right;
-      }
-    </style>
-  </head>
-
-  <body id="errorPage" class="blockedsite" dir="&locale.dir;">
-    <div class="top-decoration"></div>
-
-    <div id="errorPageContainer" class="section">
-
-      <!-- Error Title -->
-      <div id="errorTitle" class="section-header">
-        <span id="errorTitleIcon"></span>
-        <h1 id="errorTitleText_phishing" class="errorTitleText">&safeb.blocked.phishingPage.title2;</h1>
-        <h1 id="errorTitleText_malware" class="errorTitleText">&safeb.blocked.malwarePage.title;</h1>
-      </div>
-      <div id="errorLongContent" class="section-details">
-
-        <!-- Short Description -->
-        <div id="errorShortDesc">
-          <p id="errorShortDescText_phishing">&safeb.blocked.phishingPage.shortDesc2;</p>
-          <p id="errorShortDescText_malware">&safeb.blocked.malwarePage.shortDesc;</p>
-        </div>
-
-        <!-- Long Description -->
-        <div id="errorLongDesc">
-          <p id="errorLongDescText_phishing">&safeb.blocked.phishingPage.longDesc2;</p>
-          <p id="errorLongDescText_malware">&safeb.blocked.malwarePage.longDesc;</p>
-        </div>
-      </div>
-      <div class="section-footer">
-        <!-- Action buttons -->
-        <div id="buttons">
-          <!-- Commands handled in browser.js -->
-          <button id="getMeOutButton">&safeb.palm.accept.label;</button>
-          <button id="reportButton">&safeb.palm.reportPage.label;</button>
-        </div>
-      </div>
-    </div>
-    <!--
-    - Note: It is important to run the script this way, instead of using
-    - an onload handler. This is because error pages are loaded as
-    - LOAD_BACKGROUND, which means that onload handlers will not be executed.
-    -->
-    <script type="application/javascript">initPage();</script>
-  </body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/config.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/config.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/config.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/config.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,632 +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/. */
-"use strict";
-
-const {classes: Cc, interfaces: Ci, manager: Cm, utils: Cu} = Components;
-Cu.import("resource://gre/modules/Services.jsm");
-
-const INITIAL_PAGE_DELAY = 500;   // Initial pause on program start for scroll alignment
-const PREFS_BUFFER_MAX = 100;   // Max prefs buffer size for getPrefsBuffer()
-const PAGE_SCROLL_TRIGGER = 200;     // Triggers additional getPrefsBuffer() on user scroll-to-bottom
-const FILTER_CHANGE_TRIGGER = 200;     // Delay between responses to filterInput changes
-const INNERHTML_VALUE_DELAY = 100;    // Delay before providing prefs innerHTML value
-
-let gStringBundle = Services.strings.createBundle("chrome://browser/locale/config.properties");
-let gClipboardHelper = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
-
-
-/* ============================== NewPrefDialog ==============================
- *
- * New Preference Dialog Object and methods
- *
- * Implements User Interfaces for creation of a single(new) Preference setting
- *
- */
-var NewPrefDialog = {
-
-  _prefsShield: null,
-
-  _newPrefsDialog: null,
-  _newPrefItem: null,
-  _prefNameInputElt: null,
-  _prefTypeSelectElt: null,
-
-  _booleanValue: null,
-  _booleanToggle: null,
-  _stringValue: null,
-  _intValue: null,
-
-  _positiveButton: null,
-
-  get type() {
-    return this._prefTypeSelectElt.value;
-  },
-
-  set type(aType) {
-    this._prefTypeSelectElt.value = aType;
-    switch(this._prefTypeSelectElt.value) {
-      case "boolean":
-        this._prefTypeSelectElt.selectedIndex = 0;
-        break;
-      case "string":
-        this._prefTypeSelectElt.selectedIndex = 1;
-        break;
-      case "int":
-        this._prefTypeSelectElt.selectedIndex = 2;
-        break;
-    }
-
-    this._newPrefItem.setAttribute("typestyle", aType);
-  },
-
-  // Init the NewPrefDialog
-  init: function AC_init() {
-    this._prefsShield = document.getElementById("prefs-shield");
-
-    this._newPrefsDialog = document.getElementById("new-pref-container");
-    this._newPrefItem = document.getElementById("new-pref-item");
-    this._prefNameInputElt = document.getElementById("new-pref-name");
-    this._prefTypeSelectElt = document.getElementById("new-pref-type");
-
-    this._booleanValue = document.getElementById("new-pref-value-boolean");
-    this._stringValue = document.getElementById("new-pref-value-string");
-    this._intValue = document.getElementById("new-pref-value-int");
-
-    this._positiveButton = document.getElementById("positive-button");
-  },
-
-  // Called to update positive button to display text ("Create"/"Change), and enabled/disabled status
-  // As new pref name is initially displayed, re-focused, or modifed during user input
-  _updatePositiveButton: function AC_updatePositiveButton(aPrefName) {
-    this._positiveButton.textContent = gStringBundle.GetStringFromName("newPref.createButton");
-    this._positiveButton.setAttribute("disabled", true);
-    if (aPrefName == "") {
-      return;
-    }
-
-    // If item already in list, it's being changed, else added
-    let item = document.querySelector(".pref-item[name=\"" + CSS.escape(aPrefName) + "\"]");
-    if (item) {
-      this._positiveButton.textContent = gStringBundle.GetStringFromName("newPref.changeButton");
-    } else {
-      this._positiveButton.removeAttribute("disabled");
-    }
-  },
-
-  // When we want to cancel/hide an existing, or show a new pref dialog
-  toggleShowHide: function AC_toggleShowHide() {
-    if (this._newPrefsDialog.classList.contains("show")) {
-      this.hide();
-    } else {
-      this._show();
-    }
-  },
-
-  // When we want to show the new pref dialog / shield the prefs list
-  _show: function AC_show() {
-    this._newPrefsDialog.classList.add("show");
-    this._prefsShield.setAttribute("shown", true);
-
-    // Initial default field values
-    this._prefNameInputElt.value = "";
-    this._updatePositiveButton(this._prefNameInputElt.value);
-
-    this.type = "boolean";
-    this._booleanValue.value = "false";
-    this._stringValue.value = "";
-    this._intValue.value = "";
-
-    this._prefNameInputElt.focus();
-
-    window.addEventListener("keypress", this.handleKeypress, false);
-  },
-
-  // When we want to cancel/hide the new pref dialog / un-shield the prefs list
-  hide: function AC_hide() {
-    this._newPrefsDialog.classList.remove("show");
-    this._prefsShield.removeAttribute("shown");
-
-    window.removeEventListener("keypress", this.handleKeypress, false);
-  },
-
-  // Watch user key input so we can provide Enter key action, commit input values
-  handleKeypress: function AC_handleKeypress(aEvent) {
-    // Close our VKB on new pref enter key press
-    if (aEvent.keyCode == KeyEvent.DOM_VK_RETURN)
-      aEvent.target.blur();
-  },
-
-  // New prefs create dialog only allows creating a non-existing preference, doesn't allow for
-  // Changing an existing one on-the-fly, tap existing/displayed line item pref for that
-  create: function AC_create(aEvent) {
-    if (this._positiveButton.getAttribute("disabled") == "true") {
-      return;
-    }
-
-    switch(this.type) {
-      case "boolean":
-        Services.prefs.setBoolPref(this._prefNameInputElt.value, (this._booleanValue.value == "true") ? true : false);
-        break;
-      case "string":
-        Services.prefs.setCharPref(this._prefNameInputElt.value, this._stringValue.value);
-        break;
-      case "int":
-        Services.prefs.setIntPref(this._prefNameInputElt.value, this._intValue.value);
-        break;
-    }
-
-    this.hide();
-  },
-
-  // Display proper positive button text/state on new prefs name input focus
-  focusName: function AC_focusName(aEvent) {
-    this._updatePositiveButton(aEvent.target.value);
-  },
-
-  // Display proper positive button text/state as user changes new prefs name
-  updateName: function AC_updateName(aEvent) {
-    this._updatePositiveButton(aEvent.target.value);
-  },
-
-  // In new prefs dialog, bool prefs are <input type="text">, as they aren't yet tied to an
-  // Actual Services.prefs.*etBoolPref()
-  toggleBoolValue: function AC_toggleBoolValue() {
-    this._booleanValue.value = (this._booleanValue.value == "true" ? "false" : "true");
-  }
-}
-
-
-/* ============================== AboutConfig ==============================
- *
- * Main AboutConfig object and methods
- *
- * Implements User Interfaces for maintenance of a list of Preference settings
- *
- */
-var AboutConfig = {
-
-  filterInput: null,
-  _filterPrevInput: null,
-  _filterChangeTimer: null,
-  _prefsContainer: null,
-  _loadingContainer: null,
-  _list: null,
-
-  // Init the main AboutConfig dialog
-  init: function AC_init() {
-    this.filterInput = document.getElementById("filter-input");
-    this._prefsContainer = document.getElementById("prefs-container");
-    this._loadingContainer = document.getElementById("loading-container");
-
-    let list = Services.prefs.getChildList("");
-    this._list = list.sort().map( function AC_getMapPref(aPref) {
-      return new Pref(aPref);
-    }, this);
-
-    // Display the current prefs list (retains searchFilter value)
-    this.bufferFilterInput();
-
-    // Setup the prefs observers
-    Services.prefs.addObserver("", this, false);
-  },
-
-  // Uninit the main AboutConfig dialog
-  uninit: function AC_uninit() {
-    // Remove the prefs observer
-    Services.prefs.removeObserver("", this);
-  },
-
-  // Clear the filterInput value, to display the entire list
-  clearFilterInput: function AC_clearFilterInput() {
-    this.filterInput.value = "";
-    this.bufferFilterInput();
-  },
-
-  // Buffer down rapid changes in filterInput value from keyboard
-  bufferFilterInput: function AC_bufferFilterInput() {
-    if (this._filterChangeTimer) {
-      clearTimeout(this._filterChangeTimer);
-    }
-
-    this._filterChangeTimer = setTimeout((function() {
-      this._filterChangeTimer = null;
-      // Display updated prefs list when filterInput value settles
-      this._displayNewList();
-    }).bind(this), FILTER_CHANGE_TRIGGER);
-  },
-
-  // Update displayed list when filterInput value changes
-  _displayNewList: function AC_displayNewList() {
-    // This survives the search filter value past a page refresh
-    this.filterInput.setAttribute("value", this.filterInput.value);
-
-    // Don't start new filter search if same as last
-    if (this.filterInput.value == this._filterPrevInput) {
-      return;
-    }
-    this._filterPrevInput = this.filterInput.value;
-
-    // Clear list item selection and prefs list, get first buffer, set scrolling on
-    this.selected = "";
-    this._clearPrefsContainer();
-    this._addMorePrefsToContainer();
-    window.onscroll = this.onScroll.bind(this);
-
-    // Pause for screen to settle, then ensure at top
-    setTimeout((function() {
-      window.scrollTo(0, 0);
-    }).bind(this), INITIAL_PAGE_DELAY);
-  },
-
-  // Clear the displayed preferences list
-  _clearPrefsContainer: function AC_clearPrefsContainer() {
-    // Quick clear the prefsContainer list
-    let empty = this._prefsContainer.cloneNode(false);
-    this._prefsContainer.parentNode.replaceChild(empty, this._prefsContainer);
-    this._prefsContainer = empty;
-
-    // Quick clear the prefs li.HTML list
-    this._list.forEach(function(item) {
-      delete item.li;
-    });
-  },
-
-  // Get a small manageable block of prefs items, and add them to the displayed list
-  _addMorePrefsToContainer: function AC_addMorePrefsToContainer() {
-    // Create filter regex
-    let filterExp = this.filterInput.value ?
-      new RegExp(this.filterInput.value, "i") : null;
-
-    // Get a new block for the display list
-    let prefsBuffer = [];
-    for (let i = 0; i < this._list.length && prefsBuffer.length < PREFS_BUFFER_MAX; i++) {
-      if (!this._list[i].li && this._list[i].test(filterExp)) {
-        prefsBuffer.push(this._list[i]);
-      }
-    }
-
-    // Add the new block to the displayed list
-    for (let i = 0; i < prefsBuffer.length; i++) {
-      this._prefsContainer.appendChild(prefsBuffer[i].getOrCreateNewLINode());
-    }
-
-    // Determine if anything left to add later by scrolling
-    let anotherPrefsBufferRemains = false;
-    for (let i = 0; i < this._list.length; i++) {
-      if (!this._list[i].li && this._list[i].test(filterExp)) {
-        anotherPrefsBufferRemains = true;
-        break;
-      }
-    }
-
-    if (anotherPrefsBufferRemains) {
-      // If still more could be displayed, show the throbber
-      this._loadingContainer.style.display = "block";
-    } else {
-      // If no more could be displayed, hide the throbber, and stop noticing scroll events
-      this._loadingContainer.style.display = "none";
-      window.onscroll = null;
-    }
-  },
-
-  // If scrolling at the bottom, maybe add some more entries
-  onScroll: function AC_onScroll(aEvent) {
-    if (this._prefsContainer.scrollHeight - (window.pageYOffset + window.innerHeight) < PAGE_SCROLL_TRIGGER) {
-      if (!this._filterChangeTimer) {
-        this._addMorePrefsToContainer();
-      }
-    }
-  },
-
-  // Return currently selected list item node
-  get selected() {
-    return document.querySelector(".pref-item.selected");
-  },
-
-  // Set list item node as selected
-  set selected(aSelection) {
-    let currentSelection = this.selected;
-    if (aSelection == currentSelection) {
-      return;
-    }
-
-    // Clear any previous selection
-    if (currentSelection) {
-      currentSelection.classList.remove("selected");
-      currentSelection.removeEventListener("keypress", this.handleKeypress, false);
-    }
-
-    // Set any current selection
-    if (aSelection) {
-      aSelection.classList.add("selected");
-      aSelection.addEventListener("keypress", this.handleKeypress, false);
-    }
-  },
-
-  // Watch user key input so we can provide Enter key action, commit input values
-  handleKeypress: function AC_handleKeypress(aEvent) {
-    if (aEvent.keyCode == KeyEvent.DOM_VK_RETURN)
-      aEvent.target.blur();
-  },
-
-  // Return the target list item node of an action event
-  getLINodeForEvent: function AC_getLINodeForEvent(aEvent) {
-    let node = aEvent.target;
-    while (node && node.nodeName != "li") {
-      node = node.parentNode;
-    }
-
-    return node;
-  },
-
-  // Return a pref of a list item node
-  _getPrefForNode: function AC_getPrefForNode(aNode) {
-    let pref = aNode.getAttribute("name");
-
-    return new Pref(pref);
-  },
-
-  // When list item name or value are tapped
-  selectOrToggleBoolPref: function AC_selectOrToggleBoolPref(aEvent) {
-    let node = this.getLINodeForEvent(aEvent);
-
-    // If not already selected, just do so
-    if (this.selected != node) {
-      this.selected = node;
-      return;
-    }
-
-    // If already selected, and value is boolean, toggle it
-    let pref = this._getPrefForNode(node);
-    if (pref.type != Services.prefs.PREF_BOOL) {
-      return;
-    }
-
-    this.toggleBoolPref(aEvent);
-  },
-
-  // When finalizing list input values due to blur
-  setIntOrStringPref: function AC_setIntOrStringPref(aEvent) {
-    let node = this.getLINodeForEvent(aEvent);
-
-    // Skip if locked
-    let pref = this._getPrefForNode(node);
-    if (pref.locked) {
-      return;
-    }
-
-    // Boolean inputs blur to remove focus from "button"
-    if (pref.type == Services.prefs.PREF_BOOL) {
-      return;
-    }
-
-    // String and Int inputs change / commit on blur
-    pref.value = aEvent.target.value;
-  },
-
-  // When we reset a pref to it's default value (note resetting a user created pref will delete it)
-  resetDefaultPref: function AC_resetDefaultPref(aEvent) {
-    let node = this.getLINodeForEvent(aEvent);
-
-    // If not already selected, do so
-    if (this.selected != node) {
-      this.selected = node;
-    }
-
-    // Reset will handle any locked condition
-    let pref = this._getPrefForNode(node);
-    pref.reset();
-  },
-
-  // When we want to toggle a bool pref
-  toggleBoolPref: function AC_toggleBoolPref(aEvent) {
-    let node = this.getLINodeForEvent(aEvent);
-
-    // Skip if locked, or not boolean
-    let pref = this._getPrefForNode(node);
-    if (pref.locked) {
-      return;
-    }
-
-    // Toggle, and blur to remove field focus
-    pref.value = !pref.value;
-    aEvent.target.blur();
-  },
-
-  // When Int inputs have their Up or Down arrows toggled
-  incrOrDecrIntPref: function AC_incrOrDecrIntPref(aEvent, aInt) {
-    let node = this.getLINodeForEvent(aEvent);
-
-    // Skip if locked
-    let pref = this._getPrefForNode(node);
-    if (pref.locked) {
-      return;
-    }
-
-    pref.value += aInt;
-  },
-
-  // Observe preference changes
-  observe: function AC_observe(aSubject, aTopic, aPrefName) {
-    let pref = new Pref(aPrefName);
-
-    // Ignore uninteresting changes, and avoid "private" preferences
-    if (aTopic != "nsPref:changed") {
-      return;
-    }
-
-    // If pref type invalid, refresh display as user reset/removed an item from the list
-    if (pref.type == Services.prefs.PREF_INVALID) {
-      document.location.reload();
-      return;
-    }
-
-    // If pref not already in list, refresh display as it's being added
-    let item = document.querySelector(".pref-item[name=\"" + CSS.escape(pref.name) + "\"]");
-    if (!item) {
-      document.location.reload();
-      return;
-    }
-
-    // Else we're modifying a pref
-    item.setAttribute("value", pref.value);
-    let input = item.querySelector("input");
-    input.setAttribute("value", pref.value);
-    input.value = pref.value;
-
-    pref.default ?
-      item.querySelector(".reset").setAttribute("disabled", "true") :
-      item.querySelector(".reset").removeAttribute("disabled");
-  }
-}
-
-
-/* ============================== Pref ==============================
- *
- * Individual Preference object / methods
- *
- * Defines a Pref object, a document list item tied to Preferences Services
- * And the methods by which they interact.
- *
- */
-function Pref(aName) {
-  this.name = aName;
-}
-
-Pref.prototype = {
-  get type() {
-    return Services.prefs.getPrefType(this.name);
-  },
-
-  get value() {
-    switch (this.type) {
-      case Services.prefs.PREF_BOOL:
-        return Services.prefs.getBoolPref(this.name);
-      case Services.prefs.PREF_INT:
-        return Services.prefs.getIntPref(this.name);
-      case Services.prefs.PREF_STRING:
-      default:
-        return Services.prefs.getCharPref(this.name);
-    }
-
-  },
-
-  set value(aPrefValue) {
-    switch (this.type) {
-      case Services.prefs.PREF_BOOL:
-        Services.prefs.setBoolPref(this.name, aPrefValue);
-        break;
-      case Services.prefs.PREF_INT:
-        Services.prefs.setIntPref(this.name, aPrefValue);
-        break;
-      case Services.prefs.PREF_STRING:
-      default:
-        Services.prefs.setCharPref(this.name, aPrefValue);
-    }
-  },
-
-  get default() {
-    return !Services.prefs.prefHasUserValue(this.name);
-  },
-
-  get locked() {
-    return Services.prefs.prefIsLocked(this.name);
-  },
-
-  reset: function AC_reset() {
-    Services.prefs.clearUserPref(this.name);
-  },
-
-  test: function AC_test(aValue) {
-    return aValue ? aValue.test(this.name) : true;
-  },
-
-  // Get existing or create new LI node for the pref
-  getOrCreateNewLINode: function AC_getOrCreateNewLINode() {
-    if (!this.li) {
-      this.li = document.createElement("li");
-
-      this.li.className = "pref-item";
-      this.li.setAttribute("name", this.name);
-
-      // Click callback to ensure list item selected even on no-action tap events
-      this.li.addEventListener("click",
-        function(aEvent) {
-          AboutConfig.selected = AboutConfig.getLINodeForEvent(aEvent);
-        },
-        false
-      );
-
-      // Create list item outline, bind to object actions
-      this.li.innerHTML =
-        "<div class='pref-name' " +
-            "onclick='AboutConfig.selectOrToggleBoolPref(event);'>" +
-            this.name +
-        "</div>" +
-        "<div class='pref-item-line'>" +
-          "<input class='pref-value' value='' " +
-            "onblur='AboutConfig.setIntOrStringPref(event);' " +
-            "onclick='AboutConfig.selectOrToggleBoolPref(event);'>" +
-          "</input>" +
-          "<div class='pref-button reset' " +
-            "onclick='AboutConfig.resetDefaultPref(event);'>" +
-            gStringBundle.GetStringFromName("pref.resetButton") +
-          "</div>" +
-          "<div class='pref-button toggle' " +
-            "onclick='AboutConfig.toggleBoolPref(event);'>" +
-            gStringBundle.GetStringFromName("pref.toggleButton") +
-          "</div>" +
-          "<div class='pref-button up' " +
-            "onclick='AboutConfig.incrOrDecrIntPref(event, 1);'>" +
-          "</div>" +
-          "<div class='pref-button down' " +
-            "onclick='AboutConfig.incrOrDecrIntPref(event, -1);'>" +
-          "</div>" +
-        "</div>";
-
-      // Delay providing the list item values, until the LI is returned and added to the document
-      setTimeout(this._valueSetup.bind(this), INNERHTML_VALUE_DELAY);
-    }
-
-    return this.li;
-  },
-
-  // Initialize list item object values
-  _valueSetup: function AC_valueSetup() {
-
-    this.li.setAttribute("type", this.type);
-    this.li.setAttribute("value", this.value);
-
-    let valDiv = this.li.querySelector(".pref-value");
-    valDiv.value = this.value;
-
-    switch(this.type) {
-      case Services.prefs.PREF_BOOL:
-        valDiv.setAttribute("type", "button");
-        this.li.querySelector(".up").setAttribute("disabled", true);
-        this.li.querySelector(".down").setAttribute("disabled", true);
-        break;
-      case Services.prefs.PREF_STRING:
-        valDiv.setAttribute("type", "text");
-        this.li.querySelector(".up").setAttribute("disabled", true);
-        this.li.querySelector(".down").setAttribute("disabled", true);
-        this.li.querySelector(".toggle").setAttribute("disabled", true);
-        break;
-      case Services.prefs.PREF_INT:
-        valDiv.setAttribute("type", "number");
-        this.li.querySelector(".toggle").setAttribute("disabled", true);
-        break;
-    }
-
-    this.li.setAttribute("default", this.default);
-    if (this.default) {
-      this.li.querySelector(".reset").setAttribute("disabled", true);
-    }
-
-    if (this.locked) {
-      valDiv.setAttribute("disabled", this.locked);
-      this.li.querySelector(".pref-name").setAttribute("locked", true);
-    }
-  }
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/config.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/config.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/config.xhtml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/config.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-<?xml version="1.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/. -->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
-<!ENTITY % configDTD SYSTEM "chrome://browser/locale/config.dtd">
-%configDTD;
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-    <meta name="viewport" content="width=device-width; user-scalable=false" />
-
-    <link rel="stylesheet" href="chrome://browser/skin/config.css" type="text/css"/>
-    <script type="text/javascript;version=1.8" src="chrome://browser/content/pages/config.js"/>
-</head>
-
-<body dir="&locale.dir;" onload="NewPrefDialog.init(); AboutConfig.init();"
-                         onunload="AboutConfig.uninit();">
-
-    <div class="toolbar">
-        <div class="toolbar-container">
-            <div id="new-pref-toggle-button" onclick="NewPrefDialog.toggleShowHide();"/>
-
-            <div class="toolbar-item" id="filter-container">
-                <div id="filter-search-button"/>
-                <input id="filter-input" type="search" placeholder="&empty.label;" value=""
-                    oninput="AboutConfig.bufferFilterInput();"/>
-                <div id="filter-input-clear-button" onclick="AboutConfig.clearFilterInput();"/>
-            </div>
-        </div>
-    </div>
-
-    <div id="content" ontouchstart="AboutConfig.filterInput.blur();">
-
-        <div id="new-pref-container">
-            <li class="pref-item" id="new-pref-item">
-                <div class="pref-item-line">
-                    <input class="pref-name" id="new-pref-name" type="text" placeholder="&addpref.name;"
-                        onfocus="NewPrefDialog.focusName(event);"
-                        oninput="NewPrefDialog.updateName(event);"/>
-                    <select class="pref-value" id="new-pref-type" onchange="NewPrefDialog.type = event.target.value;">
-                        <option value="boolean">&boolean.label;</option>
-                        <option value="string">&string.label;</option>
-                        <option value="int">&integer.label;</option>
-                    </select>
-                </div>
-
-                <div class="pref-item-line" id="new-pref-line-boolean">
-                    <input class="pref-value" id="new-pref-value-boolean" disabled="disabled"/>
-                    <div class="pref-button toggle" onclick="NewPrefDialog.toggleBoolValue();">&toggle.label;</div>
-                </div>
-
-                <div class="pref-item-line">
-                    <input class="pref-value" id="new-pref-value-string" placeholder="&string.placeholder;"/>
-                    <input class="pref-value" id="new-pref-value-int" placeholder="&number.placeholder;" type="number"/>
-                </div>
-
-                <div class="pref-item-line">
-                    <div class="pref-button cancel" id="negative-button" onclick="NewPrefDialog.hide();">&cancel.label;</div>
-                    <div class="pref-button create" id="positive-button" onclick="NewPrefDialog.create(event);"></div>
-                </div>
-            </li>
-        </div>
-
-        <div id="prefs-shield"></div>
-
-        <ul id="prefs-container"/>
-
-        <ul id="loading-container"><li></li></ul>
-
-    </div>
-
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/crashprompt.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/crashprompt.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/crashprompt.xhtml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/crashprompt.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % globalDTD
-    SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-  <!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
-  <!ENTITY % crashPromptDTD
-    SYSTEM "chrome://browser/locale/crashprompt.dtd">
-  %crashPromptDTD;
-]>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.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 xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="http://www.mozilla.org/en-US/legal/privacy/firefox.html"></base>
-    <meta name="viewport" content="width=device-width; user-scalable=false;" />
-    <title>&crashprompt.title;</title>
-    <link rel="stylesheet" href="chrome://browser/skin/platform.css" type="text/css" media="all" />
-    <link rel="stylesheet" href="chrome://browser/content/bindings.css" type="text/css" media="all" />
-    <link rel="stylesheet" href="chrome://browser/skin/crashprompt.css" type="text/css" media="all" />
-    <!--TODO: Do we need a favicon?-->
-
-    <script type="application/javascript"><![CDATA[
-      Components.utils.import("resource://gre/modules/Services.jsm");
-
-      function toggleDetailsVisible() {
-        var arrow = document.getElementById("detailsArrow");
-        detailsArrow.classList.toggle('hidden');
-
-        var arrowExpanded = document.getElementById("detailsArrowExpanded");
-        detailsArrowExpanded.classList.toggle('hidden');
-
-        var details = document.getElementById("detailsContainer");
-        details.classList.toggle('hidden');
-      }
-
-      function togglePrivacyDetails() {
-        var privacyDetails = document.getElementById("lightboxBackdrop");
-        privacyDetails.classList.toggle('hidden');
-      }
-
-      function onChoseSendReports() {
-        Services.prefs.setBoolPref("app.crashreporter.prompted", true);
-        Services.prefs.setBoolPref("app.crashreporter.autosubmit", true);
-
-        var includeURLCheckbox = document.getElementById("crashpromptIncludeURLCheckbox");
-        if (includeURLCheckbox.checked) {
-          Services.prefs.setBoolPref("app.crashreporter.submitURLs", true);
-        } else {
-          Services.prefs.setBoolPref("app.crashreporter.submitURLs", false);
-        }
-
-        // TODO: How can we access BrowserUI from here?
-        // BrowserUI.startupCrashCheck();
-        window.close();
-      }
-
-      function onChoseDoNotSend() {
-        Services.prefs.setBoolPref("app.crashreporter.prompted", true);
-        Services.prefs.setBoolPref("app.crashreporter.autosubmit", false);
-        window.close();
-      }
-
-
-      function onLoad() {
-        document.getElementById("crashpromptIncludeURLCheckbox").checked =
-          Services.prefs.getBoolPref("app.crashreporter.submitURLs");
-      }
-    ]]></script>
-
-  </head>
-
-  <body id="crashPromptPage" dir="&locale.dir;" onload="onLoad();">
-    <div id="crashPromptContainer">
-      <h1 id="crashPromptTitle">&crashprompt.title;</h1>
-      <hr id="crashPromptSeparator" />
-      <p>&crashprompt.message;</p>
-      <p id="detailsGrid">
-        <a href="javascript:toggleDetailsVisible();"
-           id="detailsLink">
-          <img id="detailsArrow"
-               src="chrome://browser/skin/images/arrowbox-horiz-blue-filled.png"
-               class="detailsSpacer" />
-          <img id="detailsArrowExpanded"
-               src="chrome://browser/skin/images/arrowbox-down-blue-filled.png"
-               class="hidden detailsSpacer" />
-          <label id="detailsLinkLabel">&crashprompt.detailsLink;</label>
-        </a>
-        <div id="detailsContainer"
-             class="hidden">
-          <div id="detailsSpacer" class="detailsSpacer" />
-          <label id="crashpromptDetailedMessage">
-            &crashprompt.detailedMessage.firstParagraph;<br />
-            &crashprompt.detailedMessage.secondParagraph;<br />
-            &crashprompt.detailedMessage.thirdParagraphBeforeLink;<!--
-            --><a id="privacyPolicyLink" href="javascript:togglePrivacyDetails();">&crashprompt.privacyPolicyLink;</a><!--
-            -->&crashprompt.detailedMessage.thirdParagraphAfterLink;
-          </label>
-        </div>
-      </p>
-      <div id="crashpromptURLCheckboxContainer">
-        <label id="crashpromptIncludeURLLabel">
-          <input type="checkbox"
-                 id="crashpromptIncludeURLCheckbox" />
-          &crashprompt.includeURLLabel;
-        </label>
-      </div>
-      <div id="crashPromptButtonContainer">
-        <button id="sendReportsButton"
-                class="button-default"
-                onclick="onChoseSendReports();">
-          &crashprompt.acceptbutton;
-        </button>
-        <button id="refuseButton"
-                onclick="onChoseDoNotSend();">
-          &crashprompt.refusebutton;
-        </button>
-      </div>
-    </div>
-
-    <div id="lightboxBackdrop" class="hidden" onclick="javascript:togglePrivacyDetails();">
-      <div id="lightbox" onclick="event.stopPropagation();">
-        <div id="lightboxCloseButton"
-             onclick="togglePrivacyDetails();" />
-        <h2 id="privacyPolicyTitle">&crashprompt.privacyPolicy.title;</h2>
-        <div id="privacyPolicyBody"  onclick="event.stopPropagation();">
-          <div id="content">
-            <p>
-              This privacy policy explains how Mozilla Corporation (“Mozilla”), a wholly-owned subsidiary of the non-profit Mozilla Foundation, collects and uses information about users of the official Mozilla Firefox® web browser (“Firefox”). It does not apply to other Mozilla websites, products, or services.
-            </p>
-
-            <h3>Overview</h3>
-
-            <p>In this privacy policy, we address the following:</p>
-            <ul>
-              <li>Definitions of the types of information</li>
-              <li>What Firefox Sends to Websites</li>
-              <li>Feature-by-Feature Description of Data Practices</li>
-              <li>What Mozilla Does to Secure Data</li>
-              <li>Government and Court Demands for Information</li>
-              <li>Overview of Other Situations Involving Possibility of Data Disclosures</li>
-              <li>Mozilla’s Approach to Data Retention</li>
-              <li>How Mozilla Discloses Changes to this Policy</li>
-              <li>How to Contact Mozilla about this Policy</li>
-              <li>Appendix of Practices relating to Prior Versions of Firefox</li>
-            </ul>
-
-            <h3>Types of Information</h3>
-            <p><em>"Personal Information"</em> is information that you provide to us that personally identifies you, such as your name, phone number, or email address. Except as described below, Mozilla does not collect or require end-users of Firefox to provide Personal Information.</p>
-
-            <p><em>"Non-Personal Information"</em> is information that cannot be directly associated with a specific person or entity. Non-Personal Information includes but is not limited to your computer’s configuration and the version of Firefox you use.</p>
-
-            <p><em>"Potentially Personal Information"</em> is information that is Non-Personal Information in and of itself but that could be used in conjunction with other information to personally identify you. For example, Uniform Resource Locators (“URLs”) (the addresses of web pages) or Internet Protocol (“IP”) addresses (the addresses of computers on the Internet), which are Non-Personal Information in and of themselves, could be Personal Information when combined with Internet service provider (“ISP”) records.</p>
-
-            <p><em>“Aggregate Data”</em> is information that is recorded about users and collected into groups so that it no longer reflects or references an individually identifiable user.</p>
-
-            <h3>Information Firefox Sends to Websites and ISPs</h3>
-            <p>Like other web browsers, Firefox sends Non-Personal and Potentially Personal Information to the websites you visit when requested by the website. This may include, e.g. the type of browser you are using, the type of device you are using (desktop, mobile, touch screen), your language preference, the referring site, and your IP address. If you are viewing a video, the buffering functionality of Firefox may allow the server hosting the video to determine which sections of the video you have actually played. This information may be logged by the websites you visit and the Internet Service Provider you are using. What information is logged and how that information is used depends on the policies of each of the websites you visit and the ISPs you use.</p>
-
-            <p>Each website determines its own privacy practices for the distribution and use of this Non- Personal Information and Potentially Personal Information. If you are concerned about how a website will use this information, check out its privacy policy. To find out more about how Mozilla uses this information on its own websites, see the <a href="/en-US/privacy-policy.html">Mozilla Privacy Policy</a>.</p>
-
-            <h3>Cookies</h3>
-            <p>A cookie is information stored on your computer by a website you visit. Cookies often store your settings for a website, such as your preferred language or location. When you return to the site, Firefox sends back the cookies that belong to the site. This allows the site to present you with information customized to fit your needs. Cookies can store a wide range of information, including personally identifiable information (such as your name, home address, e-mail address, or telephone number). Because of their ability to store Personal Information, or references to such information, cookies can allow websites to track the online movements of particular individuals.</p>
-
-            <p>Firefox itself does not set any cookies on behalf of Mozilla.</p>
-
-            <p>By default, the activities of storing and sending cookies are invisible to you. However, you can change your Firefox settings to allow you to approve or deny cookie storage requests, delete stored cookies automatically when you close Firefox, and more. An <a href="//support.mozilla.org/en-US/kb/Cookies">article in our Firefox Knowledge Base</a> gives you information about changing these preferences.</p>
-
-            <h3>Interactive Product Features</h3>
-            <p><strong>Add-ons Features.</strong> One thing that makes Firefox so flexible is the ability for you to add various add-ons, extensions, and themes to Firefox, thereby creating a custom browser that fits your needs. The following features show how Firefox provides the ability both to obtain additional add- ons easily and to protect against potentially harmful add-ons.</p>
-
-            <dl>
-              <dt style="text-decoration: underline;">Get Add-ons Page</dt>
-              <dd>
-                <p>Firefox offers a Get Add-ons page of the Add-ons Manager that features popular add-ons and displays personalized recommendations based on the add-ons you already have installed. This page can be accessed by clicking (or tapping on a mobile device) on the “Get Add-ons” tab of the Firefox Add-ons Manager. To display the personalized recommendations, Firefox sends certain information to Mozilla, including the list of add-ons you have installed, Firefox version information, and your IP address. This communication only happens when the Get Add-ons area is open and can be turned off at any time by following <a href="http://blog.mozilla.com/addons/how-to-opt-out-of-add-on-metadata-updates/">these instructions</a>.</p>
-              </dd>
-
-              <dt style="text-decoration: underline;">Add-on Information and Searches</dt>
-              <dd>
-                <p>In order to keep the information displayed to you about your installed add-ons up to date, Firefox communicates with Mozilla once a day to update add-on descriptions, home pages, download counts, screenshots, and ratings. This communication includes the list of add-ons you have installed, Firefox version information, how long it took Firefox to start up, and your IP address. You can turn off this functionality at any time by following <a href="http://blog.mozilla.com/addons/how-to-opt-out-of-add-on-metadata-updates/">these instructions</a>.</p>
-                <p>If you enter keywords into the search field for the Add-ons Manager, those keywords will be sent to Mozilla in order to perform the search, along with Potentially Personal Information (such as IP address) normally transferred to perform such functionality.</p>
-              </dd>
-            </dl>
-
-            <p><strong>Automated Update Service.</strong> Firefox’s automatic update feature periodically checks to see if an updated version of Firefox and installed add-ons are available from Mozilla.</p>
-
-            <p>This feature sends Non-Personal Information to Mozilla, including the version of Firefox you are using, build ID and target, update channel, your language preference, and your operating system. This feature also sends Potentially Personal Information to Mozilla in the form of your IP address and a cookie that contains a unique numeric value to distinguish individual Firefox installs. Mozilla uses this information to provide you with updated versions of Firefox and to understand the usage patterns of Firefox users. We use this information to improve our products and services and to support decision making regarding feature and capacity planning.</p>
-
-            <p>Mozilla does not collect or track any Personal Information or any information about the websites you visit, and Mozilla does not release the raw information we obtain from these Firefox features to the public. We may release reports containing Aggregate Data so that our global community can make better product and design decisions. To prevent Mozilla from obtaining this information, you can turn this feature off in Firefox’s preferences. An <a href="//support.mozilla.org/en-US/kb/Firefox%20makes%20unrequested%20connections#Auto_update_checking">article in our Firefox Knowledge Base</a> gives you information about changing your preferences in non-mobile versions of Firefox.</p>
-
-            <p><strong>Blocklist Feature.</strong> Firefox also offers a Blocklist feature. With this feature, once a day Firefox does a regularly scheduled, automatic check to see if you have any harmful add-ons or plug-ins installed. If so, this feature disables add-ons or plug-ins that Mozilla has determined contain known vulnerabilities or major user-facing issues or fatal bugs (e.g., Firefox crashes on startup or something causes an endless loop). You may view the <a href="/en-US/blocklist/">current list of Blocklisted items</a>. This feature sends Non-Personal Information to Mozilla, including the version of Firefox you are using, operating system version, build ID and target, update channel, and your language preference. This feature also sends Potentially Personal Information to Mozilla in the form of your IP address and a cookie. In addition, Mozilla also uses this feature to analyze Firefox usage patterns so we may improve our products and services, including planning features and capacity. Currently there is no basic user interface to disable the Blocklist feature. An <a href="http://support.mozilla.org/en-US/kb/Firefox+makes+unrequested+connections#Extension_blocklist_updating">article in our Firefox Knowledge Base</a> explains how you may disable the Blocklist feature. Disabling the Blocklist feature is not recommended as it may result in using extensions known to be untrustworthy.</p>
-
-            <p><strong>Crash-Reporting Feature</strong> (not applicable to Firefox for mobile). Firefox has a crash-reporting feature that sends a report to Mozilla when Firefox crashes. Mozilla uses the information in the crash reports to diagnose and correct the problems in Firefox that caused the crash. Though this feature starts automatically after Firefox crashes, it does not send information to Mozilla until you explicitly authorize it to do so. By default, this feature sends a variety of Non-Personal Information to Mozilla, including the stack trace (a detailed description of which parts of the Firefox code were active at the time of the crash) and the type of computer you are using. Additional information is collected by the crash reporting feature. Which crash reporting feature is used and what additional information collected by Firefox depends on which version of Firefox you’re using. For pre-3.x versions of Firefox, please see the end of this privacy policy.</p>
-
-            <dl>
-              <dt style="text-decoration: underline;">Firefox 3.0 to present</dt>
-              <dd>
-                <p>For the current versions of Firefox, “Firefox Crash Reporter” is Firefox’s crash reporting feature. With this feature, you have the option to include Personal Information (including your email address), Potentially Personal Information (including your IP address and the URL of the site you were visiting when Firefox crashed), and a comment. Firefox Crash Reporter also sends a list of all add-ons that you were using at the time of the crash, the time since (i) the last crash, (ii) the last install, and (iii) the start-up of the program. For Firefox 3.0.0 – 3.0.5, Firefox Crash Reporter also collects Potentially Personal Information to Mozilla in the form of a unique alphanumeric value to distinguish individual Firefox installs. This value is not assigned to users of Firefox 3.0.6 and subsequent versions. Mozilla only makes Non-Personal Information (i.e., generic information about your computer, the stack trace, and any comment given by the user) available in the public reports available online at <a href="http://crash-stats.mozilla.com/">http://crash-stats.mozilla.com/</a>.</p>
-              </dd>
-            </dl>
-
-            <p><strong>Location-Aware Feature.</strong> Beginning with Firefox 3.5 and all versions of Firefox for mobile, Firefox offers a <a href="/en-US/firefox/geolocation/">Location-Aware Feature</a>, parts of which may be provided by <a href="/en-US/legal/privacy/firefox-third-party.html">third-party service providers</a>.</p>
-
-            <dl>
-              <dt style="text-decoration: underline;">You Elect to Use the Location-Aware Feature</dt>
-              <dd>
-                <p>This feature remains inoperative until you visit a website that requests your location and you choose to opt in to the feature. If you elect not to, nothing happens. Each time you visit such a website, Firefox asks you if you want it to provide the site with your current location. Additionally, you may elect to have Firefox remember your choice to allow or not allow the feature for each site. Any such election is domain specific. You are able to opt out at any time of having Firefox remember your choice, just like any other preference setting.</p>
-              </dd>
-              <dt style="text-decoration: underline;">What Information Firefox Collects</dt>
-              <dd>
-                <p>If you choose to allow it, the Firefox Location-Aware Feature first collects one or more of the following relevant location markers: (i) location provided by a GPS device built into or attached to your computer or device and/or geolocation services provided by the operating system; (ii) the wifi routers closest to you; (iii) cell ids of the cell phone broadcast towers closest to you; (iv) the signal strength of nearby wireless access points and/or cell phone broadcast towers; and/or (v) your computer or device’s IP address. Next, it attempts to determine your location using these location markers. Any information Firefox uses, receives or sends as part of this Location-Aware Feature is not received by any Mozilla servers or by Mozilla. Firefox does not track or remember your location. Firefox does remember a random client identifier, the temporary ID assigned by our third party provider to process your request, for two weeks.</p>
-              </dd>
-              <dt style="text-decoration: underline;">Transmission of Geolocation Information to Third Parties</dt>
-              <dd>
-                <p>If your computer or device has a GPS unit or your operating system provides geolocation services and you have elected to use the location aware feature, Firefox will send your location information directly to the requesting website. If not, Firefox will send the other information described above, plus your user agent information (e.g., version of Firefox you’re using) and a temporary client identifier, to a third party geolocation services provider. That provider can determine your approximate location from such data (e.g., convert a set of WiFi signal strengths into latitude and longitude). This information is sent by Firefox over an encrypted connection and no cookies are used. Neither the domain name nor the URL of the site you’re visiting is sent to our service providers. Our providers estimate your location and return it to Firefox. Firefox provides your location information to the webpage that made the request.</p>
-              </dd>
-              <dt style="text-decoration: underline;">Restrictions on How Third Party Providers Use the Location Information Received</dt>
-              <dd>
-                <p>Our policy is to require third-party providers to enter licensing agreements with Mozilla, which prohibit them from releasing Personal or Potentially Personal Information to the public. We only permit our third party providers to use this information in conjunction with the service(s) they are providing to us. They are required to ensure that any information collected on our behalf is anonymized and aggregated before they are permitted to use such information to develop new features or products and services, or to improve the overall quality of any of their products and services. For example, this means that they are required to ensure that your IP address and unique identifier of your client will be stripped out before being used by any of our third party provider’s other products or features. For more information on how our geolocation services providers use information sent by Firefox, please see the privacy policy links in our list of <a href="/en-US/legal/privacy/firefox-third-party.html">third-party service providers</a>.</p>
-              </dd>
-              <dt style="text-decoration: underline;">Third Party Privacy Policies</dt>
-              <dd>
-                <p>Please carefully consider any website or service provider's privacy practices before agreeing to share your location.</p>
-                <ul>
-                  <li><em>Requesting Websites</em>. For information on the use of location data sent back to the website, please see that website’s privacy policy.</li>
-                  <li><em>Location-Aware Service Providers</em>. For information on how our service providers use the location data sent by Firefox, see the privacy policies linked from our list of <a href="/en-US/legal/privacy/firefox-third-party.html">third-party service providers</a>.</li>
-                </ul>
-              </dd>
-            </dl>
-
-            <p><strong>Panorama Feature</strong> (not applicable to Firefox for mobile).  Starting with Firefox 4, Firefox provides Panorama, which manages your tab experience. Your tab usage and names are not sent to Mozilla, but rather reside locally on your device. The first time you run Panorama, a video may be presented to you explaining Panorama. The video or web page is hosted by Mozilla so Mozilla receives your IP address and date and time of receiving the video.</p>
-
-            <p><strong>Firefox Sync Feature</strong>. The Firefox Sync feature is included in versions of Firefox beginning with Version 4. Firefox Sync allows you to synchronize certain data between your computers, mobile phones, and other devices that have the Firefox browser installed, by utilizing the Firefox Sync Services. (You can also use Sync with a syncing service hosted on a non-Mozilla server set up by yourself or a third party, but in that case this policy doesn’t apply to your use of such syncing service.) Examples of data you can synchronize include browsing history, form history, bookmarks, saved passwords, preferences, and open tabs. This data (“Firefox Sync User Data”) is stored on, manipulated, and transmitted to and from Mozilla’s servers by means of your use of the Firefox Sync Services. Firefox Sync User Data is encrypted on your computer before it is sent to Mozilla’s servers, so it is not available to Mozilla in a readable form. Mozilla uses SSL/TLS technology to ensure your Firefox Sync User Data is encrypted during transit.</p>
-
-            <p>In order to utilize the Sync functionality you must register for the Firefox Sync Services. During registration you will need to provide your email address and create a username and password (collectively “Account Data”). Your Account Data will be encrypted using SSL/TLS for transit. Your password will be stored on our servers in an encrypted form called a hash. This form of encryption disguises your password on the server, but still allows us to authenticate you when you sign into the Firefox Sync Services. Certain versions of Sync also ask you to create a secret phrase. The secret phrase is stored on your computer and is not sent to the Firefox Sync servers or to Mozilla. Mozilla does not collect any other Personal Information through Firefox Sync.</p>
-
-            <p>Mozilla receives and uses the following Non-Personal and Potentially Personal Information for the purpose of providing and improving the Firefox Sync Services: IP address, username, date and time of accessing the Firefox Sync Services, user agent string information such as the type of client OS and Firefox version in use, and aggregated operational data such as access log data and how many bookmarks, history, or tabs users have collectively created and synced.</p>
-
-            <p>The Firefox Sync Services also receive the host names you have given your devices that you are syncing. These names are used to label your tabs within Firefox Sync. If you don’t want to share your devices’ names, you should consider naming your devices with fanciful names rather than your actual name. The information is transmitted using SSL. Currently, you can opt out of having your devices named in Firefox Sync by visiting the Firefox preferences pane or about:config.</p>
-
-            <p>You can disconnect from the Firefox Sync Services and have your Account Data and Firefox Sync User Data removed from our servers at any time. On your computer, go to the “Tools” menu, highlight “Sync,” and click “Disconnect.” Then go to <a href="https://services.mozilla.com/delete-account/">https://services.mozilla.com/delete-account/</a>, and submit the form to request deletion of your Account Data and Firefox Sync User Data from our servers. If you are transferring a synced device to another party (such as if you are sharing, reselling, or donating your laptop or phone) you may wish to disconnect and then remove your Sync data from your device to avoid sharing it with the device recipient.</p>
-
-            <p><strong>Personas Feature</strong>. Firefox’s Personas feature is a theme that lets you personalize the look of your browser.</p>
-
-            <dl>
-              <dt style="text-decoration: underline;">Applying Personas</dt>
-              <dd>
-                <p>When you apply a Persona to your browser, Mozilla collects your IP address, the date and time you applied the Persona to your browser, and the url you used to make the application as well as the url you were visiting immediately before that (known as the “referrer” url).</p>
-              </dd>
-              <dt style="text-decoration: underline;">Creating a Custom Persona</dt>
-              <dd>
-                <p>If you are creating a Custom Persona for your own use, Mozilla does not collect any Personal Information.</p>
-              </dd>
-              <dt style="text-decoration: underline;">Contributing a Design to the Personas Gallery</dt>
-              <dd>
-                <p>The Personas gallery is where you can browse all the available designs. If you contribute a design or image (each a “Persona”) to the Personas gallery, Mozilla collects the following Personal Information: (1) your username and (2) your email address. Your username will be used to attribute your Persona to you and will be publicly available on the Personas gallery. You do not have to provide your real name; you can use a nickname or avatar. Mozilla will not make your email address publicly available without your consent or share it with any third parties other than Mozilla’s service providers. Mozilla will use your email address only to contact you regarding your design or to provide any additional information that you elect or opt in to receive.</p>
-              </dd>
-              <dt style="text-decoration: underline;">Personas’ Interactive Product Features</dt>
-              <dd>
-                <p>After you have selected your Persona, it is stored on your computer. Once per day the Personas service checks to see if your selected Persona has been updated. This feature sends the same information that web browsers typically transfer with any HTTP requests including user agent and your IP address.</p>
-                <p>We use this information to improve our products and services and to support decision making regarding feature and capacity planning. Mozilla is an open organization that believes in sharing as much information as possible about its products, its operations, and its associations. Accordingly, we may release public reports containing Aggregate Data so that our global community and Personas partners may make better product and design decisions. For example, we think it is good for users of Personas to know which are the most popular Personas and Personas designers to know how many times their Persona was downloaded.</p>
-              </dd>
-            </dl>
-
-            <p><strong>Report Web Forgery Feature</strong> (not applicable to Firefox for mobile). Firefox’s Report Web Forgery feature lets you report suspected web forgeries to Mozilla’s third party service provider(s) for the web forgery protection feature when you encounter a suspected malicious “phishing” or fraudulent website that is impersonating a legitimate website. This feature sends your comments about the suspected fraudulent website to our third-party provider(s), as well as the same information that the browser sends when you visit a website. Our policy is to require each of our third-party providers to enter into written agreements with Mozilla that prohibit them from releasing Potentially Personal Information to the public. Our policy is to only permit these third party providers to use this information in conjunction with the web forgery protection service they are providing. In addition, we require each third-party provider to maintain its own privacy policy that is linked to the online form where you report a potential web forgery. To prevent the third party provider from obtaining this information, don’t use this feature to report a web forgery. (Also see <em>“Protection Against Suspected Forgery and Attack Sites Features”</em> below.)</p>
-
-            <p id="telemetry"><strong>Usage Statistics</strong> (also known as Telemetry). Beginning with version 7, Firefox includes functionality that sends Mozilla usage, performance, and responsiveness statistics about user interface features, memory, hardware configuration along with IP address.</p>
-
-            <p>
-              This feature is turned off by default in general release versions of Firefox and Firefox Beta. In order to enable Aurora and Nightly testers to provide more efficient feedback, Usage Statistics are enabled by default on Aurora and Nightly. In either case, if this functionality is enabled, users can disable it in Firefox's Options/Preferences by simply deselecting the "Submit performance data" item.
-            </p>
-
-            <p>
-              Usage statistics are transmitted using SSL (a method of protecting data in transit) and help us improve future versions of Firefox. Once sent to Mozilla, usage statistics are stored in an aggregate form and made available to a broad range of developers, including both Mozilla employees and public contributors.
-            </p>
-
-            <p><strong>Snippets </strong>Firefox's default home page (&lt;about:home&gt;) loads small bits of information that we think will be useful to you. We call these "snippets". You can see them right below the search bar.</p>
-
-            <p>Once per day, Firefox gets new snippets from Mozilla. Whenever you see a snippet, that snippet makes a request to Mozilla, so that we can count how often snippets are viewed.  This request to Mozilla sends the name of the snippet and is securely transmitted over HTTPS. Aside from this and standard log data collected as a part of any web request, snippets in Firefox do not send other information to Mozilla.</p>
-
-            <p>To help display relevant snippets, your Firefox browser sends Mozilla a monthly request to look up your location at a country level using your IP address. We then send that country level information back to your Firefox browser, where it's stored locally. Your Firefox browser (not our web servers) will then pick snippets to show you based on the locally stored country information.</p>
-
-            <p>Aside from providing you with the snippets service, we use the information from these requests to estimate what fraction of Firefox users click on each snippet (broken down into general categories like Firefox version and geographic area). We will not use any of the information in this request to attempt to identify you or your web browsing activity on other websites, and we aggregate the info we receive into these general categories as soon as is practical.</p>
-
-            <p><strong>Feedback Button and Test Pilot for Beta Users</strong>. If you installed a Firefox 4 beta and then got the general release version of Firefox 4 by clicking an “update” button, then your Firefox still has the feedback features you received as a beta user. If you installed a beta version of Firefox 4 for computers and then got the general release version of Firefox 4 by clicking a “download” button, you still have the Test Pilot add-on as an extension to Firefox. The privacy policy for Feedback is <a href="/en-US/firefox/beta/feedbackprivacypolicy/">here</a> and for Test Pilot is <a href="https://testpilot.mozillalabs.com/privacy.php">here</a>. If you decide to remove Test Pilot or Feedback from Firefox on your computer, you can do so under the Tools menu in Firefox by selecting add-ons in the drop down menu and then uninstall. If you decide to remove Beta Tester Tools from Firefox on your mobile device, you can do so under the Add-ons Manager pane in the Browser Controls window by selecting the add-on in the extension list and clicking "Disable."</p>
-
-            <p id="health-report"><strong>Firefox Health Report</strong>. Firefox Health Report (“FHR”) is a Firefox feature designed to provide you with insights about your browser’s stability and performance. FHR does this by collecting data and sharing it with us in a way designed to minimize our ability to identify your browser. Our systems aggregate your data with that of other Firefox users and then send it back to your browser so you can see how your Firefox performance compares to others. FHR does not send us sites from your browsing history.</p>
-
-            <p>We use the data sent through FHR to provide users with FHR’s functionality, such as helping you analyze and address performance issues with your browser. We also use what we learn from the FHR data in the aggregate to make Firefox and our other products better. We may disclose aggregated FHR data openly in order to help further our mission of promoting openness, innovation and opportunity on the Web. We aim to be transparent about FHR and you can learn more about the exact data being sent to us in the feature itself. If you wish, you can choose not to share your FHR data with us in Firefox settings or the feature itself. <a href="https://support.mozilla.org/kb/firefox-health-report-understand-your-browser-perf">Learn more about FHR</a>.</p>
-
-            <h3>Security</h3>
-            <p>Mozilla is committed to protecting your personal information from unauthorized access, alteration, disclosure, or destruction. We undertake a range of security measures including physical access restraints, technical security monitoring, and internal security reviews of the environment. We also have policies in place to prohibit employees from viewing personal information without business justification. Additionally, it is our policy to ensure that Mozilla employees and contractors are bound by confidentiality obligations.</p>
-
-            <p>Beginning with Firefox 2.0, Mozilla has additional security features, some of which are provided by <a href="/en-US/legal/privacy/firefox-third-party.html">third-party service providers</a>.</p>
-
-            <p>The security features available depend on the version of Firefox you are using. Please see the end of this privacy policy for older versions of Firefox.</p>
-
-            <p><strong>Secure Website Certificate Verification</strong>. When you visit a secure website, Firefox may check with any status provider mentioned in the certificate to validate that website’s certificate. Firefox sends only the certificate identification to the certificate provider, not the exact URL you are visiting. Sending these verification requests to third parties is sometimes necessary to ensure your connection to a site is secure; to help maintain your security, Firefox may block access to the site if it can't verify your connection using the third party. If the certificate is no longer valid, you will receive an error page that states why the certificate is not valid and you will not be able to access that website. The technical name for this process is OCSP or On-line Certificate Status Protocol. You may disable online certificate verification in Firefox's preferences under the encryption tab. If you do this, none of the information discussed here will be sent to any third party certificate provider. An <a href="http://support.mozilla.org/en-US/kb/Options%20window%20-%20Advanced%20panel?bl=n&amp;s=OCSP#Certificates">article in our Firefox Knowledge Base</a> gives you information about changing your preferences. However, if you choose to disable the online verification feature, Firefox will not be able to confirm the identity of the website you are visiting, which may put you at greater risk of having your private information intercepted. In this case, Firefox will also not show the identity of the website in the URL bar.</p>
-
-
-            <p><strong>Protection Against Suspected Forgery and Attack Sites Features</strong> (not applicable to Firefox for mobile). The Firefox forgery and attack protection feature displays a warning if the website you are visiting is suspected of impersonating a legitimate website (commonly referred to as a phishing or forgery website) or a site that infiltrates or damages a computer system without your informed consent, including, without limitation, any computer viruses, worms, trojan horses, spyware, computer contaminant and/or other malicious and unwanted software (commonly called an attack site or malware). By default, Firefox checks the web pages that you visit against a blacklist that is downloaded to your hard drive at regularly scheduled intervals (e.g., approximately twice per hour), the rate of frequency may change from time to time. The blacklist does not include the full URL of each suspicious site. Instead, each URL is hashed (obscured so it can't be read) and then broken into portions. Only a portion of each hashed URL is included on the blacklist on your hard drive. If there is a match, Firefox will check with its third party provider to ensure that the website is still on the blacklist. The information sent between Firefox and its third party provider(s) are hashed URLs. In fact, multiple hashed URLs are sent with the real hash so that the third party provider(s) will not know what site you are visiting. If there is a match, Firefox displays either a “Reported Web Forgery” or “Reported Attack Site” alert, as applicable.</p>
-
-            <p>You may completely turn off the forgery and/or attack site protection features in Firefox’s preferences. If you do this, none of the information discussed here will be downloaded to your hard drive or sent to any third party service provider. An <a href="http://support.mozilla.org/en-US/kb/Options%20window%20-%20Security%20panel?bl=n&amp;s=suspected%20web%20forgery">article in our Firefox Knowledge Base</a> gives you information about changing your preferences.</p>
-
-            <p>Each time Firefox checks in with a third party provider to download a new blacklist, Non-Personal Information and Potentially Personal Information, such as the information that the browser sends every time you visit a website as well as the version number of the blacklist on your system, is sent to a third party provider. In order to safeguard your privacy, Firefox will not transmit the complete URL of web pages that you visit to anyone other than Mozilla and its service providers. While it is possible that a third party service provider may determine the actual URL from the hashed URL sent, Mozilla’s policy is to require its third party service providers to enter into a written agreement with Mozilla not to use any data or other information about or from users of Firefox for purposes other than to provide and maintain their service. In addition, Mozilla’s policy is to prohibit these third party service providers from correlating any Firefox user data with any other data collected through other products, services or web properties of that provider. These third party service providers may post about additional notices regarding their applicable privacy policies. (For example, see <a href="http://code.google.com/apis/safebrowsing/firefox3_privacy.html">Google Safe Browsing Service in Mozilla Firefox Version 3</a>.)</p>
-
-            <p>Please note that we’re not yelling at you in this paragraph. Our lawyers have advised us that we need to make sure this information is conspicuous so you’ll read it. <b>The forgery and attack site protection feature is provided “as is” and for your information as advice and guidance only. Mozilla and its contributors, licensors and partners do not guarantee that these protection features will prevent you from being deceived by a malicious website and we strongly recommend that you continue to be vigilant while online, particularly when following links sent to you in e-mail.</b></p>
-
-            <h3>Legal Process and Other Disclosures</h3>
-
-            <p>Consistent with our privacy commitments, we will scrutinize third party requests for information about you for compliance with the law, including those coming from governmental agencies or civil litigants.  We may access, use, preserve or disclose information about you only when we have a good faith belief that it is reasonably necessary to do so to satisfy the applicable law, regulation, legal process or lawful governmental request of any country, or to protect the rights, property or safety of Mozilla, its users or the public.  We will provide notice of legal process or governmental requests unless prohibited to do so by law or the circumstances warrant otherwise.</p>
-
-
-            <h3>What and When We Share with Third Parties</h3>
-
-            <p>Mozilla’s policy is to make Personal Information, such as your name and email address, and Potentially Personal Information, such as the URL of the site you last visited, only available to its employees, contractors, and selected contributors who signed confidentiality agreements that prohibit them from using or disclosing such information other than for approved Mozilla purposes.</p>
-
-            <p>We also work with third parties who provide infrastructure or back-end services (like content delivery networks, bandwidth providers, and services of an administrative nature). We may share Personal Information about you with such third parties for the purpose of enabling these third parties to provide such services.</p>
-
-            <p>Additionally, Mozilla may need to transfer Personal Information to an affiliate or successor in the event of a change of our corporate structure or status, such as in the event of a restructuring, sale, or bankruptcy.</p>
-
-            <h3>Transfer of Data to the U.S.</h3>
-
-            <p>Mozilla is a global organization and operates in different countries. Privacy laws and common practices vary from country to country. Some countries may provide for less legal protection of your personal data; others may provide more legal protection. By using Firefox, you consent to the transfer of the information collected, as outlined by this Policy, to Mozilla or its third party service providers in the United States, the Netherlands, and other places where our distributed, third party content delivery network exists (which is in several countries around the world), which countries may provide a lesser level of data security than in your country of residence.</p>
-
-            <h3>Data Retention</h3>
-
-            <p>We will retain any information collected for the period necessary to fulfill the purposes outlined in this Policy unless a longer retention period is required by law and/or regulations.</p>
-
-            <h3>Privacy Policy Changes</h3>
-
-            <p>Mozilla may change the Firefox Privacy Policy from time to time. Any and all changes will be reflected on this page. Substantive changes may also be announced through the standard mechanisms by which Mozilla communicates with its users and community, such as Mozilla's "announce" <a href="https://lists.mozilla.org/listinfo/announce">mailing list</a> and <a href="https://lists.mozilla.org/listinfo/announce">newsgroup</a>. It is your responsibility to ensure that you understand the terms of this Privacy Policy. You should periodically check this page for any changes to the current policy.</p>
-
-            <h3>For More Information</h3>
-            <p>You may request access, correction, or deletion of Personal Information or Potentially Personal Information, as permitted by law. We will seek to comply with such requests, provided that we have sufficient information to identify the Personal Information or Potentially Personal Information related to you.</p>
-
-            <p>Any such requests or other questions or concerns regarding this Policy and Mozilla's data protection practices should be addressed to:</p>
-
-            <p>
-              Mozilla Corporation<br/>
-              Attn:  Legal Notices - Privacy<br/>
-              650 Castro Street, Suite 300<br/>
-              Mountain View, CA 94041-2072<br/>
-              Phone: +1-650-903-0800<br/>
-              E-mail: <a href="mailto:privacy@mozilla.com">privacy@mozilla.com</a>
-            </p>
-
-            <h3>Appendix for Pre-Firefox 4.0</h3>
-
-            <dl>
-              <dt>Report Broken Website Feature. -3.6.x.</dt>
-              <dd>
-                <p>Firefox’s Report Broken Website feature lets you notify Mozilla when a website you visit improperly displays or incorrectly functions. The feature sends the URL of the broken website to Mozilla. You may also choose to send your email address and a description of the problem. This feature also sends your IP address and a variety of Non-Personal Information to Mozilla, including but not limited to the version of Firefox you are using and your language preference. Except for your email and IP address, Mozilla makes all of this information public. This feature does not send information to Mozilla until you explicitly authorize Firefox to do so. To prevent this public release of Personal and Potentially Personal Information, don’t report a website if the website’s URL contains your Personal and Potentially Personal Information, and don’t include Personal Information in your description of the problem. To prevent the release of any information, don’t use this feature to report a broken website.</p>
-              </dd>
-
-              <dt>Crash-Reporting Feature for Firefox 1.0-2.x.</dt>
-              <dd>
-                <p>For these earlier versions of Firefox, “Talkback” is Firefox’s crash reporting feature. Talkback also gives you the option to provide your Personal Information and Potentially Personal Information (including your name, email address, and the url you were visiting) and Potentially Personal Information (including your computer’s name, IP address, and the processes you were running at the time of the crash). You can selectively disable the sending of this information. Additionally, you have the option to include the URL of the site you were visiting when Firefox crashed, a comment, and your email address in the report. Mozilla only makes Non-Personal Information and Potentially Personal Information in the public reports available online at <a href="http://talkback-public.mozilla.org/">http://talkback-public.mozilla.org/</a>.</p>
-              </dd>
-
-              <dt>Security for Firefox 2.0 to 2.x.</dt>
-              <dd>
-                <p><strong>Protection Against Suspected Forgery Sites</strong>. The Firefox web forgery protection feature displays a warning if the website you are visiting is suspected of impersonating a legitimate website. Firefox lets you select various levels of protection, and different information is transmitted by Firefox depending on the level you choose.</p>
-
-                <p>By default, Firefox checks the web pages that you visit against a list of suspected web forgeries (a “blacklist”) that is downloaded to your hard drive at regularly scheduled intervals (e.g., approximately twice per hour), the rate of frequency may change from time to time. If there is a match, Firefox displays a “Suspected Web Forgery” alert. Each time Firefox checks in with the third party provider to download a new blacklist, Non-Personal Information and Potentially Personal Information, such as the information that the browser sends every time you visit a website as well as the version number of the blacklist on your system, is sent to the third party provider. In order to safeguard your privacy, Firefox will not transmit the URL of web pages that you visit in this default mode to anyone other than Mozilla and its service providers.</p>
-
-                <p>You may completely turn off the web forgery protection feature in Firefox’s preferences. If you do this, none of the information discussed here will be downloaded to your hard drive or sent to any third party service provider.</p>
-
-                <p>Each time Firefox checks in with the third party provider to download a new blacklist, Non-Personal Information and Potentially Personal Information, such as the information that the browser sends every time you visit a website as well as the version number of the blacklist on your system, is sent to the third party provider. In order to safeguard your privacy, Firefox will not transmit the complete URL of web pages that you visit to anyone other than Mozilla and its service providers. While it is possible that a third party service provider may determine the actual URL from the hashed URL sent, Mozilla’s policy is to require its third party service providers to enter into a written agreement with Mozilla not to use any data or other information about or from users of Firefox for purposes other than to provide and maintain their service. In addition, Mozilla’s policy is to prohibit its third party service providers from correlating any Firefox user data with any other data collected through other products, services or web properties of that provider. These third party service providers may inform you about additional notices regarding their applicable privacy policies.</p>
-              </dd>
-            </dl>
-          </div><!-- end #content div -->
-
-
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/netError.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/netError.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/pages/netError.xhtml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/pages/netError.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % netErrorDTD
-    SYSTEM "chrome://global/locale/netError.dtd">
-  %netErrorDTD;
-  <!ENTITY % globalDTD
-    SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-]>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.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 xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta name="viewport" content="width=device-width; user-scalable=false;" />
-    <title>&loadError.label;</title>
-    <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
-    <!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in
-         toolkit/components/places/src/nsFaviconService.h should be updated. -->
-    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
-
-    <script type="application/javascript"><![CDATA[
-      // Error url MUST be formatted like this:
-      //   moz-neterror:page?e=error&u=url&d=desc
-      //
-      // or optionally, to specify an alternate CSS class to allow for
-      // custom styling and favicon:
-      //
-      //   moz-neterror:page?e=error&u=url&s=classname&d=desc
-
-      // Note that this file uses document.documentURI to get
-      // the URL (with the format from above). This is because
-      // document.location.href gets the current URI off the docshell,
-      // which is the URL displayed in the location bar, i.e.
-      // the URI that the user attempted to load.
-
-      function getErrorCode()
-      {
-        var url = document.documentURI;
-        var error = url.search(/e\=/);
-        var duffUrl = url.search(/\&u\=/);
-        return decodeURIComponent(url.slice(error + 2, duffUrl));
-      }
-
-      function getCSSClass()
-      {
-        var url = document.documentURI;
-        var matches = url.match(/s\=([^&]+)\&/);
-        // s is optional, if no match just return nothing
-        if (!matches || matches.length < 2)
-          return "";
-
-        // parenthetical match is the second entry
-        return decodeURIComponent(matches[1]);
-      }
-
-      function getDescription()
-      {
-        var url = document.documentURI;
-        var desc = url.search(/d\=/);
-
-        // desc == -1 if not found; if so, return an empty string
-        // instead of what would turn out to be portions of the URI
-        if (desc == -1)
-          return "";
-
-        return decodeURIComponent(url.slice(desc + 2));
-      }
-
-      function retryThis(buttonEl)
-      {
-        // Note: The application may wish to handle switching off "offline mode"
-        // before this event handler runs, but using a capturing event handler.
-
-        // Session history has the URL of the page that failed
-        // to load, not the one of the error page. So, just call
-        // reload(), which will also repost POST data correctly.
-        try {
-          location.reload();
-        } catch (e) {
-          // We probably tried to reload a URI that caused an exception to
-          // occur;  e.g. a nonexistent file.
-        }
-
-        buttonEl.disabled = true;
-      }
-
-      function initPage()
-      {
-        var err = getErrorCode();
-
-        // if it's an unknown error or there's no title or description
-        // defined, get the generic message
-        var errTitle = document.getElementById("et_" + err);
-        var errDesc  = document.getElementById("ed_" + err);
-        if (!errTitle || !errDesc)
-        {
-          errTitle = document.getElementById("et_generic");
-          errDesc  = document.getElementById("ed_generic");
-        }
-
-        var title = document.querySelector(".errorTitleText");
-        if (title)
-        {
-          title.parentNode.replaceChild(errTitle, title);
-          // change id to the replaced child's id so styling works
-          errTitle.classList.add("errorTitleText");
-        }
-
-        var sd = document.getElementById("errorShortDescText");
-        if (sd)
-          sd.textContent = getDescription();
-
-        var ld = document.getElementById("errorLongDesc");
-        if (ld)
-        {
-          ld.parentNode.replaceChild(errDesc, ld);
-          // change id to the replaced child's id so styling works
-          errDesc.id = "errorLongDesc";
-        }
-
-        // remove undisplayed errors to avoid bug 39098
-        var errContainer = document.getElementById("errorContainer");
-        errContainer.parentNode.removeChild(errContainer);
-
-        var className = getCSSClass();
-        if (className && className != "expertBadCert") {
-          // Associate a CSS class with the root of the page, if one was passed in,
-          // to allow custom styling.
-          // Not "expertBadCert" though, don't want to deal with the favicon
-          document.documentElement.className = className;
-
-          // Also, if they specified a CSS class, they must supply their own
-          // favicon.  In order to trigger the browser to repaint though, we
-          // need to remove/add the link element.
-          var favicon = document.getElementById("favicon");
-          var faviconParent = favicon.parentNode;
-          faviconParent.removeChild(favicon);
-          favicon.setAttribute("href", "chrome://global/skin/icons/" + className + "_favicon.png");
-          faviconParent.appendChild(favicon);
-        }
-        if (className == "expertBadCert") {
-          showSecuritySection();
-        }
-
-        if (err == "remoteXUL") {
-          // Remove the "Try again" button for remote XUL errors given that
-          // it is useless.
-          document.getElementById("errorTryAgain").style.display = "none";
-        }
-
-        if (err == "cspBlocked") {
-          // Remove the "Try again" button for CSP violations, since it's
-          // almost certainly useless. (Bug 553180)
-          document.getElementById("errorTryAgain").style.display = "none";
-        }
-
-        if (err == "nssBadCert") {
-          // Remove the "Try again" button for security exceptions, since it's
-          // almost certainly useless.
-          document.getElementById("errorTryAgain").style.display = "none";
-          document.getElementById("errorPage").setAttribute("class", "certerror");
-          addDomainErrorLink();
-        }
-        else {
-          // Remove the override block for non-certificate errors.  CSS-hiding
-          // isn't good enough here, because of bug 39098
-          var secOverride = document.getElementById("securityOverrideDiv");
-          secOverride.parentNode.removeChild(secOverride);
-        }
-      }
-
-      function showSecuritySection() {
-        // Swap link out, content in
-        document.getElementById('securityOverrideContent').style.display = '';
-        document.getElementById('securityOverrideLink').style.display = 'none';
-      }
-
-      /* In the case of SSL error pages about domain mismatch, see if
-         we can hyperlink the user to the correct site.  We don't want
-         to do this generically since it allows MitM attacks to redirect
-         users to a site under attacker control, but in certain cases
-         it is safe (and helpful!) to do so.  Bug 402210
-      */
-      function addDomainErrorLink() {
-        // Rather than textContent, we need to treat description as HTML
-        var sd = document.getElementById("errorShortDescText");
-        if (sd) {
-          var desc = getDescription();
-
-          // sanitize description text - see bug 441169
-
-          // First, find the index of the <a> tag we care about, being careful not to
-          // use an over-greedy regex
-          var re = /<a id="cert_domain_link" title="([^"]+)">/;
-          var result = re.exec(desc);
-          if(!result)
-            return;
-
-          // Remove sd's existing children
-          sd.textContent = "";
-
-          // Everything up to the link should be text content
-          sd.appendChild(document.createTextNode(desc.slice(0, result.index)));
-
-          // Now create the link itself
-          var anchorEl = document.createElement("a");
-          anchorEl.setAttribute("id", "cert_domain_link");
-          anchorEl.setAttribute("title", result[1]);
-          anchorEl.appendChild(document.createTextNode(result[1]));
-          sd.appendChild(anchorEl);
-
-          // Finally, append text for anything after the closing </a>
-          sd.appendChild(document.createTextNode(desc.slice(desc.indexOf("</a>") + "</a>".length)));
-        }
-
-        var link = document.getElementById('cert_domain_link');
-        if (!link)
-          return;
-
-        var okHost = link.getAttribute("title");
-        var thisHost = document.location.hostname;
-        var proto = document.location.protocol;
-
-        // If okHost is a wildcard domain ("*.example.com") let's
-        // use "www" instead.  "*.example.com" isn't going to
-        // get anyone anywhere useful. bug 432491
-        okHost = okHost.replace(/^\*\./, "www.");
-
-        /* case #1:
-         * example.com uses an invalid security certificate.
-         *
-         * The certificate is only valid for www.example.com
-         *
-         * Make sure to include the "." ahead of thisHost so that
-         * a MitM attack on paypal.com doesn't hyperlink to "notpaypal.com"
-         *
-         * We'd normally just use a RegExp here except that we lack a
-         * library function to escape them properly (bug 248062), and
-         * domain names are famous for having '.' characters in them,
-         * which would allow spurious and possibly hostile matches.
-         */
-        if (endsWith(okHost, "." + thisHost))
-          link.href = proto + okHost;
-
-        /* case #2:
-         * browser.garage.maemo.org uses an invalid security certificate.
-         *
-         * The certificate is only valid for garage.maemo.org
-         */
-        if (endsWith(thisHost, "." + okHost))
-          link.href = proto + okHost;
-      }
-
-      function endsWith(haystack, needle) {
-        return haystack.slice(-needle.length) == needle;
-      }
-
-    ]]></script>
-  </head>
-
-  <body id="errorPage" dir="&locale.dir;">
-
-    <!-- ERROR ITEM CONTAINER (removed during loading to avoid bug 39098) -->
-    <div id="errorContainer">
-      <div id="errorTitlesContainer">
-        <h1 id="et_generic">&generic.title;</h1>
-        <h1 id="et_dnsNotFound">&dnsNotFound.title;</h1>
-        <h1 id="et_fileNotFound">&fileNotFound.title;</h1>
-        <h1 id="et_malformedURI">&malformedURI.title;</h1>
-        <h1 id="et_unknownProtocolFound">&unknownProtocolFound.title;</h1>
-        <h1 id="et_connectionFailure">&connectionFailure.title;</h1>
-        <h1 id="et_netTimeout">&netTimeout.title;</h1>
-        <h1 id="et_redirectLoop">&redirectLoop.title;</h1>
-        <h1 id="et_unknownSocketType">&unknownSocketType.title;</h1>
-        <h1 id="et_netReset">&netReset.title;</h1>
-        <h1 id="et_notCached">&notCached.title;</h1>
-        <h1 id="et_netOffline">&netOffline.title;</h1>
-        <h1 id="et_netInterrupt">&netInterrupt.title;</h1>
-        <h1 id="et_deniedPortAccess">&deniedPortAccess.title;</h1>
-        <h1 id="et_proxyResolveFailure">&proxyResolveFailure.title;</h1>
-        <h1 id="et_proxyConnectFailure">&proxyConnectFailure.title;</h1>
-        <h1 id="et_contentEncodingError">&contentEncodingError.title;</h1>
-        <h1 id="et_unsafeContentType">&unsafeContentType.title;</h1>
-        <h1 id="et_nssFailure2">&nssFailure2.title;</h1>
-        <h1 id="et_nssBadCert">&nssBadCert.title;</h1>
-        <h1 id="et_cspBlocked">&cspBlocked.title;</h1>
-        <h1 id="et_remoteXUL">&remoteXUL.title;</h1>
-        <h1 id="et_corruptedContentError">&corruptedContentError.title;</h1>
-      </div>
-      <div id="errorDescriptionsContainer">
-        <div id="ed_generic">&generic.longDesc;</div>
-        <div id="ed_dnsNotFound">&dnsNotFound.longDesc;</div>
-        <div id="ed_fileNotFound">&fileNotFound.longDesc;</div>
-        <div id="ed_malformedURI">&malformedURI.longDesc;</div>
-        <div id="ed_unknownProtocolFound">&unknownProtocolFound.longDesc;</div>
-        <div id="ed_connectionFailure">&connectionFailure.longDesc;</div>
-        <div id="ed_netTimeout">&netTimeout.longDesc;</div>
-        <div id="ed_redirectLoop">&redirectLoop.longDesc;</div>
-        <div id="ed_unknownSocketType">&unknownSocketType.longDesc;</div>
-        <div id="ed_netReset">&netReset.longDesc;</div>
-        <div id="ed_notCached">&notCached.longDesc;</div>
-        <div id="ed_netOffline">&netOffline.longDesc2;</div>
-        <div id="ed_netInterrupt">&netInterrupt.longDesc;</div>
-        <div id="ed_deniedPortAccess">&deniedPortAccess.longDesc;</div>
-        <div id="ed_proxyResolveFailure">&proxyResolveFailure.longDesc;</div>
-        <div id="ed_proxyConnectFailure">&proxyConnectFailure.longDesc;</div>
-        <div id="ed_contentEncodingError">&contentEncodingError.longDesc;</div>
-        <div id="ed_unsafeContentType">&unsafeContentType.longDesc;</div>
-        <div id="ed_nssFailure2">&nssFailure2.longDesc2;</div>
-        <div id="ed_nssBadCert">&nssBadCert.longDesc2;</div>
-        <div id="ed_cspBlocked">&cspBlocked.longDesc;</div>
-        <div id="ed_remoteXUL">&remoteXUL.longDesc;</div>
-        <div id="ed_corruptedContentError">&corruptedContentError.longDesc;</div>
-      </div>
-    </div>
-
-    <!-- PAGE CONTAINER (for styling purposes only) -->
-    <div id="errorPageContainer" class="section">
-
-      <!-- Error Title -->
-      <div id="errorTitle" class="section-header">
-        <span id="errorTitleIcon"></span>
-        <h1 class="errorTitleText" />
-      </div>
-
-      <!-- LONG CONTENT (the section most likely to require scrolling) -->
-      <div id="errorLongContent" class="section-details">
-
-        <!-- Short Description -->
-        <div id="errorShortDesc">
-          <p id="errorShortDescText" />
-        </div>
-
-        <!-- Long Description (Note: See netError.dtd for used XHTML tags) -->
-        <div id="errorLongDesc" />
-
-        <!-- Override section - For ssl errors only.  Removed on init for other
-             error types.  -->
-        <div id="securityOverrideDiv">
-          <a id="securityOverrideLink" href="javascript:showSecuritySection();" >&securityOverride.linkText;</a>
-          <div id="securityOverrideContent" style="display: none;">&securityOverride.warningContent;</div>
-        </div>
-      </div>
-
-      <div class="section-footer">
-        <!-- Retry Button -->
-        <button id="errorTryAgain" onclick="retryThis(this);">&retry.label;</button>
-      </div>
-
-    </div>
-
-    <!--
-    - Note: It is important to run the script this way, instead of using
-    - an onload handler. This is because error pages are loaded as
-    - LOAD_BACKGROUND, which means that onload handlers will not be executed.
-    -->
-    <script type="application/javascript">initPage();</script>
-
-  </body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/sanitize.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/sanitize.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/sanitize.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/sanitize.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,314 +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/. */
-
-XPCOMUtils.defineLazyModuleGetter(this, "LoadContextInfo",
-                                  "resource://gre/modules/LoadContextInfo.jsm");
-function Sanitizer() {}
-
-Sanitizer.prototype = {
-  // warning to the caller: this one may raise an exception (e.g. bug #265028)
-  clearItem: function (aItemName)
-  {
-    if (this.items[aItemName].canClear)
-      this.items[aItemName].clear();
-  },
-
-  canClearItem: function (aItemName, aCallback, aArg)
-  {
-    let canClear = this.items[aItemName].canClear;
-    if (typeof canClear == "function"){
-      canClear(aCallback, aArg);
-    } else {
-      aCallback(aItemName, canClear, aArg);
-    }
-  },
-
-  _prefDomain: "privacy.item.",
-  getNameFromPreference: function (aPreferenceName)
-  {
-    return aPreferenceName.substr(this._prefDomain.length);
-  },
-
-  /**
-   * Deletes privacy sensitive data in a batch, according to user preferences
-   *
-   * @returns  null if everything's fine;  an object in the form
-   *           { itemName: error, ... } on (partial) failure
-   */
-  sanitize: function ()
-  {
-    var branch = Services.prefs.getBranch(this._prefDomain);
-    var errors = null;
-    for (var itemName in this.items) {
-      if ("clear" in item && branch.getBoolPref(itemName)) {
-        // Some of these clear() may raise exceptions (see bug #265028)
-        // to sanitize as much as possible, we catch and store them, 
-        // rather than fail fast.
-        // Callers should check returned errors and give user feedback
-        // about items that could not be sanitized
-        let clearCallback = (itemName, aCanClear) => {
-          let item = this.items[itemName];
-          try{
-            if (aCanClear){
-              item.clear();
-            }
-          } catch(er){
-            if (!errors){
-              errors = {};
-            }
-            errors[itemName] = er;
-            dump("Error sanitizing " + itemName + ":" + er + "\n");
-          }
-        }
-        this.canClearItem(itemName, clearCallback);
-      }
-    }
-    return errors;
-  },
-
-  items: {
-    // Clear Sync account before passwords so that Sync still has access to the
-    // credentials to clean up device-specific records on the server. Also
-    // disable it before wiping history so we don't accidentally sync that.
-    syncAccount: {
-      clear: function ()
-      {
-        Sync.disconnect();
-      },
-
-      get canClear()
-      {
-        return (Weave.Status.checkSetup() != Weave.CLIENT_NOT_CONFIGURED);
-      }
-    },
-
-    cache: {
-      clear: function ()
-      {
-        var cache = Cc["@mozilla.org/netwerk/cache-storage-service;1"].getService(Ci.nsICacheStorageService);
-        try {
-          cache.clear();
-        } catch(er) {}
-
-        let imageCache = Cc["@mozilla.org/image/cache;1"].getService(Ci.imgICache);
-        try {
-          imageCache.clearCache(false); // true=chrome, false=content
-        } catch(er) {}
-      },
-
-      get canClear()
-      {
-        return true;
-      }
-    },
-
-    cookies: {
-      clear: function ()
-      {
-        var cookieMgr = Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager);
-        cookieMgr.removeAll();
-      },
-
-      get canClear()
-      {
-        return true;
-      }
-    },
-
-    siteSettings: {
-      clear: function ()
-      {
-        // Clear site-specific permissions like "Allow this site to open popups"
-        Services.perms.removeAll();
-
-        // Clear site-specific settings like page-zoom level
-        var cps = Cc["@mozilla.org/content-pref/service;1"].getService(Ci.nsIContentPrefService2);
-        cps.removeAllDomains(null);
-
-        // Clear "Never remember passwords for this site", which is not handled by
-        // the permission manager
-        var pwmgr = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
-        var hosts = pwmgr.getAllDisabledHosts({})
-        for each (var host in hosts) {
-          pwmgr.setLoginSavingEnabled(host, true);
-        }
-
-        // Clear site security settings
-        var sss = Cc["@mozilla.org/ssservice;1"]
-                    .getService(Ci.nsISiteSecurityService);
-        sss.clearAll();
-      },
-
-      get canClear()
-      {
-        return true;
-      }
-    },
-
-    offlineApps: {
-      clear: function ()
-      {
-        var cacheService = Cc["@mozilla.org/netwerk/cache-storage-service;1"].getService(Ci.nsICacheStorageService);
-        var appCacheStorage = cacheService.appCacheStorage(LoadContextInfo.default, null);
-        try {
-          appCacheStorage.asyncEvictStorage(null);
-        } catch(er) {}
-      },
-
-      get canClear()
-      {
-          return true;
-      }
-    },
-
-    history: {
-      clear: function ()
-      {
-        try {
-          Services.obs.notifyObservers(null, "browser:purge-session-history", "");
-        }
-        catch (e) {
-          Components.utils.reportError("Failed to notify observers of "
-                                     + "browser:purge-session-history: "
-                                     + e);
-        }
-      },
-
-      get canClear()
-      {
-        // bug 347231: Always allow clearing history due to dependencies on
-        // the browser:purge-session-history notification. (like error console)
-        return true;
-      }
-    },
-
-    formdata: {
-      clear: function ()
-      {
-        //Clear undo history of all searchBars
-        var windows = Services.wm.getEnumerator("navigator:browser");
-        while (windows.hasMoreElements()) {
-          var searchBar = windows.getNext().document.getElementById("searchbar");
-          if (searchBar) {
-            searchBar.value = "";
-            searchBar.textbox.editor.transactionManager.clear();
-          }
-        }
-        FormHistory.update({op : "remove"});
-      },
-
-      canClear : function(aCallback, aArg)
-      {
-        let count = 0;
-        let countDone = {
-          handleResult : function(aResult) { count = aResult; },
-          handleError : function(aError) { Components.utils.reportError(aError); },
-          handleCompletion : function(aReason) { aCallback("formdata", aReason == 0 && count > 0, aArg); }
-        };
-        FormHistory.count({}, countDone);
-      }
-    },
-
-    downloads: {
-      clear: function ()
-      {
-        var dlMgr = Cc["@mozilla.org/download-manager;1"].getService(Ci.nsIDownloadManager);
-        dlMgr.cleanUp();
-      },
-
-      get canClear()
-      {
-        var dlMgr = Cc["@mozilla.org/download-manager;1"].getService(Ci.nsIDownloadManager);
-        return dlMgr.canCleanUp;
-      }
-    },
-
-    passwords: {
-      clear: function ()
-      {
-        var pwmgr = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
-        pwmgr.removeAllLogins();
-      },
-
-      get canClear()
-      {
-        var pwmgr = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
-        var count = pwmgr.countLogins("", "", ""); // count all logins
-        return (count > 0);
-      }
-    },
-
-    sessions: {
-      clear: function ()
-      {
-        // clear all auth tokens
-        var sdr = Cc["@mozilla.org/security/sdr;1"].getService(Ci.nsISecretDecoderRing);
-        sdr.logoutAndTeardown();
-
-        // clear plain HTTP auth sessions
-        var authMgr = Cc['@mozilla.org/network/http-auth-manager;1'].getService(Ci.nsIHttpAuthManager);
-        authMgr.clearAll();
-      },
-
-      get canClear()
-      {
-        return true;
-      }
-    }
-  }
-};
-
-
-// "Static" members
-Sanitizer.prefDomain          = "privacy.sanitize.";
-Sanitizer.prefShutdown        = "sanitizeOnShutdown";
-Sanitizer.prefDidShutdown     = "didShutdownSanitize";
-
-Sanitizer._prefs = null;
-Sanitizer.__defineGetter__("prefs", function() 
-{
-  return Sanitizer._prefs ? Sanitizer._prefs
-    : Sanitizer._prefs = Cc["@mozilla.org/preferences-service;1"]
-                         .getService(Ci.nsIPrefService)
-                         .getBranch(Sanitizer.prefDomain);
-});
-
-/** 
- * Deletes privacy sensitive data in a batch, optionally showing the 
- * sanitize UI, according to user preferences
- *
- * @returns  null if everything's fine
- *           an object in the form { itemName: error, ... } on (partial) failure
- */
-Sanitizer.sanitize = function() 
-{
-  return new Sanitizer().sanitize();
-};
-
-Sanitizer.onStartup = function() 
-{
-  // we check for unclean exit with pending sanitization
-  Sanitizer._checkAndSanitize();
-};
-
-Sanitizer.onShutdown = function() 
-{
-  // we check if sanitization is needed and perform it
-  Sanitizer._checkAndSanitize();
-};
-
-// this is called on startup and shutdown, to perform pending sanitizations
-Sanitizer._checkAndSanitize = function() 
-{
-  const prefs = Sanitizer.prefs;
-  if (prefs.getBoolPref(Sanitizer.prefShutdown) && 
-      !prefs.prefHasUserValue(Sanitizer.prefDidShutdown)) {
-    // this is a shutdown or a startup after an unclean exit
-    Sanitizer.sanitize() || // sanitize() returns null on full success
-      prefs.setBoolPref(Sanitizer.prefDidShutdown, true);
-  }
-};
-
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/sanitizeUI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/sanitizeUI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/sanitizeUI.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/sanitizeUI.js	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-
-"use strict";
-
-var SanitizeUI = {
-  _sanitizer: null,
-
-  _privDataElement: null,
-  get _privData() {
-    if (this._privDataElement === null) {
-      this._privDataElement = document.getElementById("prefs-privdata");
-    }
-    return this._privDataElement;
-  },
-
-  init: function () {
-    this._sanitizer = new Sanitizer();
-    this._privData.addEventListener("CheckboxStateChange", this, true);
-  },
-
-  _clearNotificationTimeout: null,
-  onSanitize: function onSanitize() {
-    let button = document.getElementById("prefs-clear-data");
-    let clearNotificationDeck = document.getElementById("clear-notification");
-    let clearNotificationEmpty = document.getElementById("clear-notification-empty");
-    let clearNotificationClearing = document.getElementById("clear-notification-clearing");
-    let clearNotificationDone = document.getElementById("clear-notification-done");
-    let allCheckboxes = SanitizeUI._privData.querySelectorAll("checkbox");
-    let allSelected = SanitizeUI._privData.querySelectorAll(
-      "#prefs-privdata-history[checked], " +
-      "#prefs-privdata-other[checked] + #prefs-privdata-subitems .privdata-subitem-item[checked]");
-
-    // disable button and checkboxes temporarily to indicate something is happening
-    button.disabled = true;
-    for (let checkbox of allCheckboxes) {
-      checkbox.disabled = true;
-    }
-    clearNotificationDeck.selectedPanel = clearNotificationClearing;
-    document.getElementById("clearprivacythrobber").enabled = true;
-
-    // Run asynchronously to let UI update
-    setTimeout(function() {
-      for (let item of allSelected) {
-        let itemName = item.getAttribute("itemName");
-
-        try {
-          SanitizeUI._sanitizer.clearItem(itemName);
-        } catch(e) {
-          Components.utils.reportError("Error sanitizing " + itemName + ": " + e);
-        }
-      }
-
-      button.disabled = false;
-      for (let checkbox of allCheckboxes) {
-        checkbox.disabled = false;
-      }
-      clearNotificationDeck.selectedPanel = clearNotificationDone;
-      document.getElementById("clearprivacythrobber").enabled = false;
-
-      // Clear notifications after 4 seconds
-      clearTimeout(SanitizeUI._clearNotificationTimeout);
-      SanitizeUI._clearNotificationTimeout = setTimeout(function() {
-        clearNotificationDeck.selectedPanel = clearNotificationEmpty;
-      }, 4000);
-    }, 0);
-  },
-
-  /* Disable the clear button when nothing is selected */
-  _onCheckboxChange: function _onCheckboxChange() {
-    let anySelected = SanitizeUI._privData.querySelector(
-      "#prefs-privdata-history[checked], " +
-      "#prefs-privdata-other[checked] + #prefs-privdata-subitems .privdata-subitem-item[checked]");
-
-    let clearButton = document.getElementById("prefs-clear-data");
-    clearButton.disabled = !anySelected;
-  },
-
-  handleEvent: function (aEvent) {
-    switch (aEvent.type) {
-      case "CheckboxStateChange":
-        this._onCheckboxChange();
-        break;
-    }
-  },
-};
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/Site.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/Site.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/Site.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/Site.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +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';
-
-/**
- * dumb model class to provide default values for sites.
- * link parameter/model object expected to have a .url property, and optionally .title
- */
-function Site(aLink) {
-  if (!aLink.url) {
-    throw Cr.NS_ERROR_INVALID_ARG;
-  }
-  this._link = aLink;
-}
-
-Site.prototype = {
-  icon: '',
-  get url() {
-    return this._link.url;
-  },
-  get title() {
-    // use url if no title was recorded
-    return this._link.title || this._link.url;
-  },
-  get label() {
-    // alias for .title
-    return this.title;
-  },
-  get pinned() {
-    return NewTabUtils.pinnedLinks.isPinned(this);
-  },
-  get contextActions() {
-    return [
-      'delete', // delete means hide here
-      this.pinned ? 'unpin' : 'pin'
-    ];
-  },
-  get blocked() {
-    return NewTabUtils.blockedLinks.isBlocked(this);
-  },
-  get attributeValues() {
-    return {
-      value: this.url,
-      label: this.title,
-      pinned: this.pinned ? true : undefined,
-      selected: this.selected,
-      customColor: this.color,
-      customImage: this.backgroundImage,
-      iconURI: this.icon,
-      "data-contextactions": this.contextActions.join(',')
-    };
-  },
-  applyToTileNode: function(aNode) {
-    // apply this site's properties as attributes on a tile element
-    // the decorated node acts as a view-model for the tile binding
-    let attrs = this.attributeValues;
-    for (let key in attrs) {
-      if (undefined === attrs[key]) {
-        aNode.removeAttribute(key);
-      } else {
-        aNode.setAttribute(key, attrs[key]);
-      }
-    }
-    // is binding already applied?
-    if ('refresh' in aNode) {
-      // just update it
-      aNode.refresh();
-    } else {
-      // these attribute values will get picked up later when the binding is applied
-    }
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/BookmarksView.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/BookmarksView.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/BookmarksView.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/BookmarksView.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,385 +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/. */
-
-"use strict";
-
-/**
- * Wraps a list/grid control implementing nsIDOMXULSelectControlElement and
- * fills it with the user's bookmarks.
- *
- * @param           aSet    Control implementing nsIDOMXULSelectControlElement.
- * @param           aRoot   Bookmark root to show in the view.
- */
-function BookmarksView(aSet, aRoot, aFilterUnpinned) {
-  View.call(this, aSet);
-
-  this._inBatch = false; // batch up grid updates to avoid redundant arrangeItems calls
-
-  // View monitors this for maximum tile display counts
-  this.tilePrefName = "browser.display.startUI.bookmarks.maxresults";
-  this.showing = this.maxTiles > 0;
-
-  this._filterUnpinned = aFilterUnpinned;
-  this._bookmarkService = PlacesUtils.bookmarks;
-  this._navHistoryService = gHistSvc;
-
-  this._changes = new BookmarkChangeListener(this);
-  this._pinHelper = new ItemPinHelper("metro.bookmarks.unpinned");
-  this._bookmarkService.addObserver(this._changes, false);
-  StartUI.chromeWin.addEventListener('MozAppbarDismissing', this, false);
-  StartUI.chromeWin.addEventListener('BookmarksNeedsRefresh', this, false);
-  window.addEventListener("TabClose", this, true);
-
-  this.root = aRoot;
-}
-
-BookmarksView.prototype = Util.extend(Object.create(View.prototype), {
-  _set: null,
-  _changes: null,
-  _root: null,
-  _sort: 0, // Natural bookmark order.
-  _toRemove: null,
-
-  // For View's showing property
-  get vbox() {
-    return document.getElementById("start-bookmarks");
-  },
-
-  get sort() {
-    return this._sort;
-  },
-
-  set sort(aSort) {
-    this._sort = aSort;
-    this.clearBookmarks();
-    this.getBookmarks();
-  },
-
-  get root() {
-    return this._root;
-  },
-
-  set root(aRoot) {
-    this._root = aRoot;
-  },
-
-  destruct: function bv_destruct() {
-    this._bookmarkService.removeObserver(this._changes);
-    if (StartUI.chromeWin) {
-      StartUI.chromeWin.removeEventListener('MozAppbarDismissing', this, false);
-      StartUI.chromeWin.removeEventListener('BookmarksNeedsRefresh', this, false);
-    }
-    View.prototype.destruct.call(this);
-  },
-
-  refreshView: function () {
-    this.clearBookmarks();
-    this.getBookmarks();
-  },
-
-  handleItemClick: function bv_handleItemClick(aItem) {
-    let url = aItem.getAttribute("value");
-    StartUI.goToURI(url);
-  },
-
-  _getItemForBookmarkId: function bv__getItemForBookmark(aBookmarkId) {
-    return this._set.querySelector("richgriditem[anonid='" + aBookmarkId + "']");
-  },
-
-  _getBookmarkIdForItem: function bv__getBookmarkForItem(aItem) {
-    return +aItem.getAttribute("anonid");
-  },
-
-  _updateItemWithAttrs: function dv__updateItemWithAttrs(anItem, aAttrs) {
-    for (let name in aAttrs)
-      anItem.setAttribute(name, aAttrs[name]);
-  },
-
-  getBookmarks: function bv_getBookmarks(aRefresh) {
-    let options = this._navHistoryService.getNewQueryOptions();
-    options.queryType = options.QUERY_TYPE_BOOKMARKS;
-    options.excludeQueries = true; // Don't include "smart folders"
-    options.sortingMode = this._sort;
-
-    let limit = this.maxTiles;
-
-    let query = this._navHistoryService.getNewQuery();
-    query.setFolders([Bookmarks.metroRoot], 1);
-
-    let result = this._navHistoryService.executeQuery(query, options);
-    let rootNode = result.root;
-    rootNode.containerOpen = true;
-    let childCount = rootNode.childCount;
-
-    this._inBatch = true; // batch up grid updates to avoid redundant arrangeItems calls
-
-    for (let i = 0, addedCount = 0; i < childCount && addedCount < limit; i++) {
-      let node = rootNode.getChild(i);
-
-      // Ignore folders, separators, undefined item types, etc.
-      if (node.type != node.RESULT_TYPE_URI)
-        continue;
-
-      // If item is marked for deletion, skip it.
-      if (this._toRemove && this._toRemove.indexOf(node.itemId) !== -1)
-        continue;
-
-      let item = this._getItemForBookmarkId(node.itemId);
-
-      // Item has been unpinned.
-      if (this._filterUnpinned && !this._pinHelper.isPinned(node.itemId)) {
-        if (item)
-          this.removeBookmark(node.itemId);
-
-        continue;
-      }
-
-      if (!aRefresh || !item) {
-        // If we're not refreshing or the item is not in the grid, add it.
-        this.addBookmark(node.itemId, addedCount);
-      } else if (aRefresh && item) {
-        // Update context action in case it changed in another view.
-        this._setContextActions(item);
-      }
-
-      addedCount++;
-    }
-
-    // Remove extra items in case a refresh added more than the limit.
-    // This can happen when undoing a delete.
-    if (aRefresh) {
-      while (this._set.itemCount > limit)
-        this._set.removeItemAt(this._set.itemCount - 1, true);
-    }
-    this._set.arrangeItems();
-    this._inBatch = false;
-    rootNode.containerOpen = false;
-  },
-
-  inCurrentView: function bv_inCurrentView(aParentId, aItemId) {
-    if (this._root && aParentId != this._root)
-      return false;
-
-    return !!this._getItemForBookmarkId(aItemId);
-  },
-
-  clearBookmarks: function bv_clearBookmarks() {
-    if ('clearAll' in this._set)
-      this._set.clearAll();
-  },
-
-  addBookmark: function bv_addBookmark(aBookmarkId, aPos) {
-    let index = this._bookmarkService.getItemIndex(aBookmarkId);
-    let uri = this._bookmarkService.getBookmarkURI(aBookmarkId);
-    let title = this._bookmarkService.getItemTitle(aBookmarkId) || uri.spec;
-    let item = this._set.insertItemAt(aPos || index, title, uri.spec, this._inBatch);
-    item.setAttribute("anonid", aBookmarkId);
-    this._setContextActions(item);
-    this._updateFavicon(item, uri);
-  },
-
-  _setContextActions: function bv__setContextActions(aItem) {
-    let itemId = this._getBookmarkIdForItem(aItem);
-    aItem.setAttribute("data-contextactions", "delete," + (this._pinHelper.isPinned(itemId) ? "hide" : "pin"));
-    if (aItem.refresh) aItem.refresh();
-  },
-
-  _sendNeedsRefresh: function bv__sendNeedsRefresh(){
-    // Event sent when all view instances need to refresh.
-    let event = document.createEvent("Events");
-    event.initEvent("BookmarksNeedsRefresh", true, false);
-    window.dispatchEvent(event);
-  },
-
-  updateBookmark: function bv_updateBookmark(aBookmarkId) {
-    let item = this._getItemForBookmarkId(aBookmarkId);
-
-    if (!item)
-      return;
-
-    let oldIndex = this._set.getIndexOfItem(item);
-    let index = this._bookmarkService.getItemIndex(aBookmarkId);
-
-    if (oldIndex != index) {
-      this.removeBookmark(aBookmarkId);
-      this.addBookmark(aBookmarkId);
-      return;
-    }
-
-    let uri = this._bookmarkService.getBookmarkURI(aBookmarkId);
-    let title = this._bookmarkService.getItemTitle(aBookmarkId) || uri.spec;
-
-    item.setAttribute("anonid", aBookmarkId);
-    item.setAttribute("value", uri.spec);
-    item.setAttribute("label", title);
-
-    this._updateFavicon(item, uri);
-  },
-
-  removeBookmark: function bv_removeBookmark(aBookmarkId) {
-    let item = this._getItemForBookmarkId(aBookmarkId);
-    let index = this._set.getIndexOfItem(item);
-    this._set.removeItemAt(index, this._inBatch);
-  },
-
-  doActionOnSelectedTiles: function bv_doActionOnSelectedTiles(aActionName, aEvent) {
-    let tileGroup = this._set;
-    let selectedTiles = tileGroup.selectedItems;
-
-    switch (aActionName){
-      case "delete":
-        Array.forEach(selectedTiles, function(aNode) {
-          if (!this._toRemove) {
-            this._toRemove = [];
-          }
-
-          let itemId = this._getBookmarkIdForItem(aNode);
-
-          this._toRemove.push(itemId);
-          this.removeBookmark(itemId);
-        }, this);
-
-        // stop the appbar from dismissing
-        aEvent.preventDefault();
-
-        // at next tick, re-populate the context appbar.
-        setTimeout(function(){
-          // fire a MozContextActionsChange event to update the context appbar
-          let event = document.createEvent("Events");
-          // we need the restore button to show (the tile node will go away though)
-          event.actions = ["restore"];
-          event.initEvent("MozContextActionsChange", true, false);
-          tileGroup.dispatchEvent(event);
-        }, 0);
-        break;
-
-      case "restore":
-        // clear toRemove and let _sendNeedsRefresh update the items.
-        this._toRemove = null;
-        break;
-
-      case "unpin":
-        Array.forEach(selectedTiles, function(aNode) {
-          let itemId = this._getBookmarkIdForItem(aNode);
-
-          if (this._filterUnpinned)
-            this.removeBookmark(itemId);
-
-          this._pinHelper.setUnpinned(itemId);
-        }, this);
-        break;
-
-      case "pin":
-        Array.forEach(selectedTiles, function(aNode) {
-          let itemId = this._getBookmarkIdForItem(aNode);
-
-          this._pinHelper.setPinned(itemId);
-        }, this);
-        break;
-
-      default:
-        return;
-    }
-
-    // Send refresh event so all view are in sync.
-    this._sendNeedsRefresh();
-  },
-
-  handleEvent: function bv_handleEvent(aEvent) {
-    switch (aEvent.type){
-      case "MozAppbarDismissing":
-        // If undo wasn't pressed, time to do definitive actions.
-        if (this._toRemove) {
-          for (let bookmarkId of this._toRemove) {
-            this._bookmarkService.removeItem(bookmarkId);
-          }
-          this._toRemove = null;
-        }
-        break;
-
-      case "BookmarksNeedsRefresh":
-        this.getBookmarks(true);
-        break;
-
-      case "TabClose":
-        // Flush any pending actions - appbar will call us back
-        // before this returns with 'MozAppbarDismissing' above.
-        StartUI.chromeWin.ContextUI.dismissContextAppbar();
-      break;
-    }
-  }
-});
-
-let BookmarksStartView = {
-  _view: null,
-  get _grid() { return document.getElementById("start-bookmarks-grid"); },
-
-  init: function init() {
-    this._view = new BookmarksView(this._grid, Bookmarks.metroRoot, true);
-    this._view.getBookmarks();
-    this._grid.removeAttribute("fade");
-  },
-
-  uninit: function uninit() {
-    if (this._view) {
-      this._view.destruct();
-    }
-  },
-};
-
-/**
- * Observes bookmark changes and keeps a linked BookmarksView updated.
- *
- * @param aView An instance of BookmarksView.
- */
-function BookmarkChangeListener(aView) {
-  this._view = aView;
-}
-
-BookmarkChangeListener.prototype = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsINavBookmarkObserver
-  onBeginUpdateBatch: function () { },
-  onEndUpdateBatch: function () { },
-
-  onItemAdded: function bCL_onItemAdded(aItemId, aParentId, aIndex, aItemType, aURI, aTitle, aDateAdded, aGUID, aParentGUID) {
-    this._view.getBookmarks(true);
-  },
-
-  onItemChanged: function bCL_onItemChanged(aItemId, aProperty, aIsAnnotationProperty, aNewValue, aLastModified, aItemType, aParentId, aGUID, aParentGUID) {
-    let itemIndex = PlacesUtils.bookmarks.getItemIndex(aItemId);
-    if (!this._view.inCurrentView(aParentId, aItemId))
-      return;
-
-    this._view.updateBookmark(aItemId);
-  },
-
-  onItemMoved: function bCL_onItemMoved(aItemId, aOldParentId, aOldIndex, aNewParentId, aNewIndex, aItemType, aGUID, aOldParentGUID, aNewParentGUID) {
-    let wasInView = this._view.inCurrentView(aOldParentId, aItemId);
-    let nowInView = this._view.inCurrentView(aNewParentId, aItemId);
-
-    if (!wasInView && nowInView)
-      this._view.addBookmark(aItemId);
-
-    if (wasInView && !nowInView)
-      this._view.removeBookmark(aItemId);
-
-    this._view.getBookmarks(true);
-  },
-
-  onBeforeItemRemoved: function (aItemId, aItemType, aParentId, aGUID, aParentGUID) { },
-  onItemRemoved: function bCL_onItemRemoved(aItemId, aParentId, aIndex, aItemType, aURI, aGUID, aParentGUID) {
-    if (!this._view.inCurrentView(aParentId, aItemId))
-      return;
-
-    this._view.removeBookmark(aItemId);
-    this._view.getBookmarks(true);
-  },
-
-  onItemVisited: function(aItemId, aVisitId, aTime, aTransitionType, aURI, aParentId, aGUID, aParentGUID) { },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver])
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/FirstRunContentOverlay.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/FirstRunContentOverlay.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/FirstRunContentOverlay.xul	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/FirstRunContentOverlay.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://browser/skin/firstruncontent.css" type="text/css"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE window [
-  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-  %browserDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
-]>
-
-<overlay id="firstruncontent"
-         xmlns:html="http://www.w3.org/1999/xhtml"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <stack id="stack">
-    <box id="firstrun-bg-pane" insertafter="page" class="firstrun-content"></box>
-
-    <box id="instruction-tabs" class="firstrun-content">
-      <vbox class="instruction-content-container" align="center">
-        <image class="instruction-arrow arrow-top" />
-        <label class="instruction-label">&firstRunTabs.label;</label>
-      </vbox>
-    </box>
-
-    <box id="instruction-back" class="firstrun-content">
-      <vbox class="instruction-content-container" align="start">
-        <image class="instruction-arrow arrow-back" />
-        <label class="instruction-label">&firstRunBack.label;</label>
-      </vbox>
-    </box>
-
-    <box id="instruction-plus" class="firstrun-content">
-      <vbox class="instruction-content-container" align="end">
-        <image class="instruction-arrow arrow-forward" />
-        <label class="instruction-label">&firstRunNewTab.label;</label>
-      </vbox>
-    </box>
-
-    <appbar id="navbar">
-
-      <box id="instruction-star" class="firstrun-content">
-        <hbox class="instruction-content-container">
-          <label class="instruction-label">&firstRunStar.label;</label>
-          <image class="instruction-arrow arrow-down" />
-        </hbox>
-      </box>
-
-      <box id="instruction-pin" class="firstrun-content">
-        <vbox class="instruction-content-container" align="end">
-          <label class="instruction-label">&firstRunPin.label;</label>
-          <image class="instruction-arrow arrow-down-reverse" />
-        </vbox>
-      </box>
-
-      <box id="firstrun-gotit" class="firstrun-content">
-        <button class="firstrun-button" label="&firstRunGotIt.label;" oncommand="BrowserUI.firstRunContentDismiss()" />
-      </box>
-
-    </appbar>
-
-
-  </stack>
-</overlay>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/FirstRunOverlay.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/FirstRunOverlay.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/FirstRunOverlay.xul	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/FirstRunOverlay.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://browser/skin/firstrun.css" type="text/css"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE window [
-  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-  %browserDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
-]>
-
-<overlay id="firstrun"
-         xmlns:html="http://www.w3.org/1999/xhtml"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <hbox id="start-container">
-    <box id="instruction-topsites-box" insertafter="start-topsites" class="firstrun">
-      <box id="instruction-topsites">
-        <vbox class="instruction-content-container">
-          <image class="instruction-arrow arrow-back-straight" />
-          <image class="instruction-arrow arrow-back" />
-          <label class="instruction-label">&firstRunTopSites.label;</label>
-        </vbox>
-      </box>
-    </box>
-
-    <vbox id="firstrun-welcome" insertafter="instruction-topsites-box" class="firstrun" align="center" pack="center">
-      <image class="welcome-image" />
-      <label class="welcome-title" value="&firstRunWelcome.label;"/>
-      <label class="welcome-subtitle" value="&firstRunDifferent.label;"/>
-    </vbox>
-
-    <box insertafter="start-bookmarks" class="firstrun">
-      <box id="instruction-bookmarks">
-        <vbox class="instruction-content-container" align="center">
-          <image class="instruction-arrow arrow-forward" />
-          <label class="instruction-label">&firstRunBookmarks.label;</label>
-        </vbox>
-      </box>
-    </box>
-
-    <box id="instruction-history-container" insertafter="start-history" class="firstrun">
-      <box id="instruction-history">
-        <vbox class="instruction-content-container" align="center">
-          <image class="instruction-arrow arrow-forward" />
-          <label class="instruction-label">&firstRunHistory.label;</label>
-        </vbox>
-      </box>
-    </box>
-
-    <box id="instruction-tabs" class="firstrun">
-      <vbox class="instruction-content-container" align="center">
-        <image class="instruction-arrow arrow-top" />
-        <label class="instruction-label">&firstRunTabs.label;</label>
-      </vbox>
-    </box>
-
-    <box id="instruction-menu" class="firstrun">
-      <hbox class="instruction-content-container" align="right">
-        <label class="instruction-label">&firstRunMenu.label;</label>
-        <image class="instruction-arrow arrow-down" />
-      </hbox>
-    </box>
-
- </hbox>
-</overlay>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/HistoryView.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/HistoryView.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/HistoryView.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/HistoryView.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,323 +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/. */
-
-'use strict';
-
-function HistoryView(aSet, aFilterUnpinned) {
-  View.call(this, aSet);
-
-  this._inBatch = 0;
-
-  // View monitors this for maximum tile display counts
-  this.tilePrefName = "browser.display.startUI.history.maxresults";
-  this.showing = this.maxTiles > 0;
-
-  this._filterUnpinned = aFilterUnpinned;
-  this._historyService = PlacesUtils.history;
-  this._navHistoryService = gHistSvc;
-
-  this._pinHelper = new ItemPinHelper("metro.history.unpinned");
-  this._historyService.addObserver(this, false);
-  StartUI.chromeWin.addEventListener('MozAppbarDismissing', this, false);
-  StartUI.chromeWin.addEventListener('HistoryNeedsRefresh', this, false);
-  window.addEventListener("TabClose", this, true);
-}
-
-HistoryView.prototype = Util.extend(Object.create(View.prototype), {
-  _set: null,
-  _toRemove: null,
-
-  // For View's showing property
-  get vbox() {
-    return document.getElementById("start-history");
-  },
-
-  destruct: function destruct() {
-    this._historyService.removeObserver(this);
-    if (StartUI.chromeWin) {
-      StartUI.chromeWin.removeEventListener('MozAppbarDismissing', this, false);
-      StartUI.chromeWin.removeEventListener('HistoryNeedsRefresh', this, false);
-    }
-    View.prototype.destruct.call(this);
-  },
-
-  refreshView: function () {
-    this.onClearHistory();
-    this.populateGrid();
-  },
-
-  handleItemClick: function tabview_handleItemClick(aItem) {
-    let url = aItem.getAttribute("value");
-    StartUI.goToURI(url);
-  },
-
-  populateGrid: function populateGrid(aRefresh) {
-    this._inBatch++; // always batch up grid updates to avoid redundant arrangeItems calls
-    let query = this._navHistoryService.getNewQuery();
-    let options = this._navHistoryService.getNewQueryOptions();
-    options.excludeQueries = true;
-    options.queryType = options.QUERY_TYPE_HISTORY;
-    options.resultType = options.RESULTS_AS_URI;
-    options.sortingMode = options.SORT_BY_DATE_DESCENDING;
-
-    let limit = this.maxTiles;
-    let result = this._navHistoryService.executeQuery(query, options);
-    let rootNode = result.root;
-    rootNode.containerOpen = true;
-    let childCount = rootNode.childCount;
-
-    for (let i = 0, addedCount = 0; i < childCount && addedCount < limit; i++) {
-      let node = rootNode.getChild(i);
-      let uri = node.uri;
-      let title = (node.title && node.title.length) ? node.title : uri;
-
-      // If item is marked for deletion, skip it.
-      if (this._toRemove && this._toRemove.indexOf(uri) !== -1)
-        continue;
-
-      let items = this._set.getItemsByUrl(uri);
-
-      // Item has been unpinned, skip if filterUnpinned set.
-      if (this._filterUnpinned && !this._pinHelper.isPinned(uri)) {
-        if (items.length > 0)
-          this.removeHistory(uri);
-
-        continue;
-      }
-
-      if (!aRefresh || items.length === 0) {
-        // If we're not refreshing or the item is not in the grid, add it.
-        this.addItemToSet(uri, title, node.icon, addedCount);
-      } else if (aRefresh && items.length > 0) {
-        // Update context action in case it changed in another view.
-        for (let item of items) {
-          this._setContextActions(item);
-        }
-      }
-
-      addedCount++;
-    }
-
-    // Remove extra items in case a refresh added more than the limit.
-    // This can happen when undoing a delete.
-    if (aRefresh) {
-      while (this._set.itemCount > limit)
-        this._set.removeItemAt(this._set.itemCount - 1);
-    }
-
-    rootNode.containerOpen = false;
-    this._set.arrangeItems();
-    if (this._inBatch > 0)
-      this._inBatch--;
-  },
-
-  addItemToSet: function addItemToSet(aURI, aTitle, aIcon, aPos) {
-    let item = this._set.insertItemAt(aPos || 0, aTitle, aURI, this._inBatch);
-    this._setContextActions(item);
-    this._updateFavicon(item, aURI);
-  },
-
-  _setContextActions: function bv__setContextActions(aItem) {
-    let uri = aItem.getAttribute("value");
-    aItem.setAttribute("data-contextactions", "delete," + (this._pinHelper.isPinned(uri) ? "hide" : "pin"));
-    if ("refresh" in aItem) aItem.refresh();
-  },
-
-  _sendNeedsRefresh: function bv__sendNeedsRefresh(){
-    // Event sent when all views need to refresh.
-    let event = document.createEvent("Events");
-    event.initEvent("HistoryNeedsRefresh", true, false);
-    window.dispatchEvent(event);
-  },
-
-  removeHistory: function (aUri) {
-    let items = this._set.getItemsByUrl(aUri);
-    for (let item of items)
-      this._set.removeItem(item, true);
-    if (!this._inBatch)
-      this._set.arrangeItems();
-  },
-
-  doActionOnSelectedTiles: function bv_doActionOnSelectedTiles(aActionName, aEvent) {
-    let tileGroup = this._set;
-    let selectedTiles = tileGroup.selectedItems;
-
-    // just arrange the grid once at the end of any action handling
-    this._inBatch = true;
-
-    switch (aActionName){
-      case "delete":
-        Array.forEach(selectedTiles, function(aNode) {
-          if (!this._toRemove) {
-            this._toRemove = [];
-          }
-
-          let uri = aNode.getAttribute("value");
-
-          this._toRemove.push(uri);
-          this.removeHistory(uri);
-        }, this);
-
-        // stop the appbar from dismissing
-        aEvent.preventDefault();
-
-        // at next tick, re-populate the context appbar.
-        setTimeout(function(){
-          // fire a MozContextActionsChange event to update the context appbar
-          let event = document.createEvent("Events");
-          // we need the restore button to show (the tile node will go away though)
-          event.actions = ["restore"];
-          event.initEvent("MozContextActionsChange", true, false);
-          tileGroup.dispatchEvent(event);
-        }, 0);
-        break;
-
-      case "restore":
-        // clear toRemove and let _sendNeedsRefresh update the items.
-        this._toRemove = null;
-        break;
-
-      case "unpin":
-        Array.forEach(selectedTiles, function(aNode) {
-          let uri = aNode.getAttribute("value");
-
-          if (this._filterUnpinned)
-            this.removeHistory(uri);
-
-          this._pinHelper.setUnpinned(uri);
-        }, this);
-        break;
-
-      case "pin":
-        Array.forEach(selectedTiles, function(aNode) {
-          let uri = aNode.getAttribute("value");
-
-          this._pinHelper.setPinned(uri);
-        }, this);
-        break;
-
-      default:
-        this._inBatch = false;
-        return;
-    }
-
-    this._inBatch = false;
-    // Send refresh event so all view are in sync.
-    this._sendNeedsRefresh();
-  },
-
-  handleEvent: function bv_handleEvent(aEvent) {
-    switch (aEvent.type){
-      case "MozAppbarDismissing":
-        // If undo wasn't pressed, time to do definitive actions.
-        if (this._toRemove) {
-          for (let uri of this._toRemove) {
-            this._historyService.removePage(NetUtil.newURI(uri));
-          }
-
-          // Clear context app bar
-          let event = document.createEvent("Events");
-          event.actions = [];
-          event.initEvent("MozContextActionsChange", true, false);
-          this._set.dispatchEvent(event);
-
-          this._toRemove = null;
-        }
-        break;
-
-      case "HistoryNeedsRefresh":
-        this.populateGrid(true);
-        break;
-
-      case "TabClose":
-        // Flush any pending actions - appbar will call us back
-        // before this returns with 'MozAppbarDismissing' above.
-        StartUI.chromeWin.ContextUI.dismissContextAppbar();
-      break;
-    }
-  },
-
-  // nsINavHistoryObserver & helpers
-
-  onBeginUpdateBatch: function() {
-    // Avoid heavy grid redraws while a batch is in process
-    this._inBatch++;
-  },
-
-  onEndUpdateBatch: function() {
-    this.populateGrid(true);
-    if (this._inBatch > 0) {
-      this._inBatch--;
-      this._set.arrangeItems();
-    }
-  },
-
-  onVisit: function(aURI, aVisitID, aTime, aSessionID,
-                    aReferringID, aTransitionType) {
-    if (!this._inBatch) {
-      this.populateGrid(true);
-    }
-  },
-
-  onTitleChanged: function(aURI, aPageTitle) {
-    let changedItems = this._set.getItemsByUrl(aURI.spec);
-    for (let item of changedItems) {
-      item.setAttribute("label", aPageTitle);
-    }
-  },
-
-  onDeleteURI: function(aURI) {
-    this.removeHistory(aURI.spec);
-  },
-
-  onClearHistory: function() {
-    if ('clearAll' in this._set)
-      this._set.clearAll();
-  },
-
-  onPageChanged: function(aURI, aWhat, aValue) {
-    if (aWhat ==  Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON) {
-      let changedItems = this._set.getItemsByUrl(aURI.spec);
-      for (let item of changedItems) {
-        let currIcon = item.getAttribute("iconURI");
-        if (currIcon != aValue) {
-          item.setAttribute("iconURI", aValue);
-          if ("refresh" in item)
-            item.refresh();
-        }
-      }
-    }
-  },
-
-  onDeleteVisits: function (aURI, aVisitTime, aGUID, aReason, aTransitionType) {
-    if ((aReason ==  Ci.nsINavHistoryObserver.REASON_DELETED) && !this._inBatch) {
-      this.populateGrid(true);
-    }
-  },
-
-  QueryInterface: function(iid) {
-    if (iid.equals(Components.interfaces.nsINavHistoryObserver) ||
-        iid.equals(Components.interfaces.nsISupports)) {
-      return this;
-    }
-    throw Cr.NS_ERROR_NO_INTERFACE;
-  }
-});
-
-let HistoryStartView = {
-  _view: null,
-  get _grid() { return document.getElementById("start-history-grid"); },
-
-  init: function init() {
-    this._view = new HistoryView(this._grid, true);
-    this._view.populateGrid();
-    this._grid.removeAttribute("fade");
-  },
-
-  uninit: function uninit() {
-    if (this._view) {
-      this._view.destruct();
-    }
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/RemoteTabsView.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/RemoteTabsView.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/RemoteTabsView.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/RemoteTabsView.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,143 +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";
-
-const Cu = Components.utils;
-
-Cu.import("resource://services-sync/main.js");
-Cu.import("resource://gre/modules/PlacesUtils.jsm", this);
-
-/**
- * Wraps a list/grid control implementing nsIDOMXULSelectControlElement and
- * fills it with the user's synced tabs.
- *
- * Note, the Sync module takes care of initializing the sync service. We should
- * not make calls that start sync or sync tabs since this module loads really
- * early during startup.
- *
- * @param    aSet         Control implementing nsIDOMXULSelectControlElement.
- * @param    aSetUIAccess The UI element that should be hidden when Sync is
- *                          disabled. Must sanely support 'hidden' attribute.
- *                          You may only have one UI access point at this time.
- */
-function RemoteTabsView(aSet, aSetUIAccessList) {
-  View.call(this, aSet);
-
-  this._uiAccessElements = aSetUIAccessList;
-
-  // Sync uses special voodoo observers.
-  // If you want to change this code, talk to the fx-si team
-  Weave.Svc.Obs.add("weave:service:sync:finish", this);
-  Weave.Svc.Obs.add("weave:service:start-over", this);
-
-  if (this.isSyncEnabled() ) {
-    this.populateGrid();
-  }
-  else {
-    this.setUIAccessVisible(false);
-  }
-}
-
-RemoteTabsView.prototype = Util.extend(Object.create(View.prototype), {
-  _set: null,
-  _uiAccessElements: [],
-
-  handleItemClick: function tabview_handleItemClick(aItem) {
-    let url = aItem.getAttribute("value");
-    StartUI.goToURI(url);
-  },
-
-  observe: function(subject, topic, data) {
-    switch (topic) {
-      case "weave:service:sync:finish":
-        this.populateGrid();
-        break;
-      case "weave:service:start-over":
-        this.setUIAccessVisible(false);
-        break;
-    }
-  },
-
-  setUIAccessVisible: function setUIAccessVisible(aVisible) {
-    for (let elem of this._uiAccessElements) {
-      elem.hidden = !aVisible;
-    }
-  },
-
-  getIcon: function (iconUri, defaultIcon) {
-    try {
-      let iconURI = Weave.Utils.makeURI(iconUri);
-      return PlacesUtils.favicons.getFaviconLinkForIcon(iconURI).spec;
-    } catch(ex) {
-      // Do nothing.
-    }
-
-    // Just give the provided default icon or the system's default.
-    return defaultIcon || PlacesUtils.favicons.defaultFavicon.spec;
-  },
-
-  populateGrid: function populateGrid() {
-
-    let tabsEngine = Weave.Service.engineManager.get("tabs");
-    let list = this._set;
-    let seenURLs = new Set();
-    let localURLs = tabsEngine.getOpenURLs();
-
-    // Clear grid, We don't know what has happened to tabs since last sync
-    // Also can result in duplicate tabs(bug 864614)
-    this._set.clearAll();
-    let show = false;
-    for (let [guid, client] in Iterator(tabsEngine.getAllClients())) {
-      client.tabs.forEach(function({title, urlHistory, icon}) {
-        let url = urlHistory[0];
-        if (!url || getOpenURLs.has(url) || seenURLs.has(url)) {
-          return;
-        }
-        seenURLs.add(url);
-        show = true;
-
-        // If we wish to group tabs by client, we should be looking for records
-        //  of {type:client, clientName, class:{mobile, desktop}} and will
-        //  need to readd logic to reset seenURLs for each client.
-
-        let item = this._set.appendItem((title || url), url);
-        item.setAttribute("iconURI", this.getIcon(icon));
-
-      }, this);
-    }
-    this.setUIAccessVisible(show);
-    this._set.arrangeItems();
-  },
-
-  destruct: function destruct() {
-    Weave.Svc.Obs.remove("weave:engine:sync:finish", this);
-    Weave.Svc.Obs.remove("weave:service:logout:start-over", this);
-    View.prototype.destruct.call(this);
-  },
-
-  isSyncEnabled: function isSyncEnabled() {
-    return (Weave.Status.checkSetup() != Weave.CLIENT_NOT_CONFIGURED);
-  }
-
-});
-
-let RemoteTabsStartView = {
-  _view: null,
-  get _grid() { return document.getElementById("start-remotetabs-grid"); },
-
-  init: function init() {
-    let vbox = document.getElementById("start-remotetabs");
-    let uiList = [vbox];
-    this._view = new RemoteTabsView(this._grid, uiList);
-    this._grid.removeAttribute("fade");
-  },
-
-  uninit: function uninit() {
-    if (this._view) {
-      this._view.destruct();
-    }
-  },
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/StartUI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/StartUI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/StartUI.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/StartUI.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,153 +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/. */
-
-"use strict";
-
-Cu.import("resource://gre/modules/Services.jsm");
-
-var StartUI = {
-  get startUI() { return document.getElementById("start-container"); },
-
-  get chromeWin() {
-    // XXX Not e10s friendly. We use this in a few places.
-    return Services.wm.getMostRecentWindow('navigator:browser');
-  },
-
-  init: function init() {
-    this.startUI.addEventListener("click", this, false);
-    this.startUI.addEventListener("MozMousePixelScroll", this, false);
-
-    // Update the input type on our local broadcaster
-    document.getElementById("bcast_preciseInput").setAttribute("input",
-      this.chromeWin.InputSourceHelper.isPrecise ? "precise" : "imprecise");
-
-    let firstRunCount = Services.prefs.getIntPref("browser.firstrun.count");
-    if (firstRunCount > 0) {
-      document.loadOverlay("chrome://browser/content/FirstRunOverlay.xul", null);
-      Services.prefs.setIntPref("browser.firstrun.count", firstRunCount - 1);
-    }
-
-    this._adjustDOMforViewState(this.chromeWin.ContentAreaObserver.viewstate);
-
-    TopSitesStartView.init();
-    BookmarksStartView.init();
-    HistoryStartView.init();
-    RemoteTabsStartView.init();
-
-    this.chromeWin.addEventListener("MozPrecisePointer", this, true);
-    this.chromeWin.addEventListener("MozImprecisePointer", this, true);
-    this.chromeWin.addEventListener("MozAfterPaint", this, true);
-    this.chromeWin.Elements.panelUI.addEventListener("ToolPanelHidden", this, false);
-
-    Services.obs.addObserver(this, "metro_viewstate_changed", false);
-  },
-
-  uninit: function() {
-    if (TopSitesStartView)
-      TopSitesStartView.uninit();
-    if (BookmarksStartView)
-      BookmarksStartView.uninit();
-    if (HistoryStartView)
-      HistoryStartView.uninit();
-    if (RemoteTabsStartView)
-      RemoteTabsStartView.uninit();
-
-    if (this.chromeWin) {
-      this.chromeWin.removeEventListener("MozPrecisePointer", this, true);
-      this.chromeWin.removeEventListener("MozImprecisePointer", this, true);
-    }
-    Services.obs.removeObserver(this, "metro_viewstate_changed");
-  },
-
-  goToURI: function (aURI) {
-    this.chromeWin.BrowserUI.goToURI(aURI);
-  },
-
-  onClick: function onClick(aEvent) {
-    // If someone clicks / taps in empty grid space, take away
-    // focus from the nav bar edit so the soft keyboard will hide.
-    this.chromeWin.BrowserUI.blurNavBar();
-
-    if (aEvent.button == 0) {
-      this.chromeWin.ContextUI.dismissTabs();
-    }
-  },
-
-  onNarrowTitleClick: function onNarrowTitleClick(sectionId) {
-    let section = document.getElementById(sectionId);
-
-    if (section.hasAttribute("expanded"))
-      return;
-
-    for (let expandedSection of this.startUI.querySelectorAll(".meta-section[expanded]"))
-      expandedSection.removeAttribute("expanded")
-
-    section.setAttribute("expanded", "true");
-  },
-
-  _adjustDOMforViewState: function(aState) {
-    document.getElementById("bcast_windowState").setAttribute("viewstate", aState);
-  },
-
-  handleEvent: function handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "MozPrecisePointer":
-        document.getElementById("bcast_preciseInput").setAttribute("input", "precise");
-        break;
-      case "MozImprecisePointer":
-        document.getElementById("bcast_preciseInput").setAttribute("input", "imprecise");
-        break;
-      case "click":
-        this.onClick(aEvent);
-        break;
-      case "MozMousePixelScroll":
-        let viewstate = this.startUI.getAttribute("viewstate");
-        if (viewstate === "snapped" || viewstate === "portrait") {
-          window.scrollBy(0, aEvent.detail);
-        } else {
-          window.scrollBy(aEvent.detail, 0);
-        }
-
-        aEvent.preventDefault();
-        aEvent.stopPropagation();
-        break;
-      case "ToolPanelHidden":
-        // After opening panel UI (console) set disableZoom again.
-        this.chromeWin.addEventListener("MozAfterPaint", this, true);
-        break;
-
-      case "MozAfterPaint":
-        this._disableZoom();
-        this.chromeWin.removeEventListener("MozAfterPaint", this, true);
-        break;
-    }
-  },
-
-  observe: function (aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "metro_viewstate_changed":
-        this._adjustDOMforViewState(aData);
-        break;
-    }
-  },
-
-  _disableZoom: function() {
-    let utils = Util.getWindowUtils(window);
-    let viewId;
-    try {
-      viewId = utils.getViewId(document.documentElement);
-    } catch(e) {
-      return;
-    }
-
-    let presShellId = {};
-    utils.getPresShellId(presShellId);
-
-    let notificationData = [
-      presShellId.value,
-      viewId].join(",");
-
-    Services.obs.notifyObservers(null, "apzc-disable-zoom", notificationData);
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/startui-scripts.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/startui-scripts.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/startui-scripts.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/startui-scripts.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +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/. */
-
-"use strict";
-
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
-let Cr = Components.results;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
-                                  "resource://gre/modules/PlacesUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
-                                  "resource://gre/modules/NetUtil.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "NewTabUtils",
-                                  "resource://gre/modules/NewTabUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "Promise",
-                                  "resource://gre/modules/Promise.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "Task",
-                                  "resource://gre/modules/Task.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "CrossSlide",
-                                  "resource:///modules/CrossSlide.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "OS",
-                                  "resource://gre/modules/osfile.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "View",
-                                  "resource:///modules/View.jsm");
-
-XPCOMUtils.defineLazyServiceGetter(window, "gHistSvc",
-                                   "@mozilla.org/browser/nav-history-service;1",
-                                   "nsINavHistoryService",
-                                   "nsIBrowserHistory");
-
-let ScriptContexts = {};
-[
-  ["Util", "chrome://browser/content/Util.js"],
-  ["Site", "chrome://browser/content/Site.js"],
-  ["StartUI", "chrome://browser/content/StartUI.js"],
-  ["Bookmarks", "chrome://browser/content/bookmarks.js"],
-  ["BookmarksView", "chrome://browser/content/BookmarksView.js"],
-  ["HistoryView", "chrome://browser/content/HistoryView.js"],
-  ["TopSitesView", "chrome://browser/content/TopSitesView.js"],
-  ["RemoteTabsView", "chrome://browser/content/RemoteTabsView.js"],
-  ["BookmarksStartView", "chrome://browser/content/BookmarksView.js"],
-  ["HistoryStartView", "chrome://browser/content/HistoryView.js"],
-  ["TopSitesStartView", "chrome://browser/content/TopSitesView.js"],
-  ["RemoteTabsStartView", "chrome://browser/content/RemoteTabsView.js"],
-  ["ItemPinHelper", "chrome://browser/content/helperui/ItemPinHelper.js"],
-].forEach(function (aScript) {
-  let [name, script] = aScript;
-  XPCOMUtils.defineLazyGetter(window, name, function() {
-    let sandbox;
-    if (script in ScriptContexts) {
-      sandbox = ScriptContexts[script];
-    } else {
-      sandbox = ScriptContexts[script] = {};
-      Services.scriptloader.loadSubScript(script, sandbox);
-    }
-    return sandbox[name];
-  });
-});
-
-// singleton
-XPCOMUtils.defineLazyGetter(this, "TopSites", function() {
-  return StartUI.chromeWin.TopSites;
-});
-
-#ifdef MOZ_SERVICES_SYNC
-XPCOMUtils.defineLazyGetter(this, "Weave", function() {
-  Components.utils.import("resource://services-sync/main.js");
-  return Weave;
-});
-#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/Start.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/Start.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/Start.xul	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/Start.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-<?xml version="1.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/. -->
-
-<?xml-stylesheet href="chrome://browser/skin/platform.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/bindings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/tiles.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/start.css" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
-<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-%browserDTD;
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-#ifdef MOZ_SERVICES_SYNC
-<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
-%syncBrandDTD;
-<!ENTITY % syncDTD SYSTEM "chrome://browser/locale/sync.dtd">
-%syncDTD;
-#endif
-]>
-
-<!-- we're using html here so we get anonymous scrollbars on the browser element -->
-<html:html id="startui-page"
-           xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-           xmlns:html="http://www.w3.org/1999/xhtml"
-           dir="&locale.dir;">
-
-  <html:body id="startui-body" class="meta"
-             onload="StartUI.init();" onunload="StartUI.uninit();">
-
-  <script type="application/javascript" src="chrome://browser/content/startui-scripts.js"/>
-
-  <!-- mimic broadcasts in browser.xul. note browser.xul broadcasters do not propagate down here! -->
-  <broadcasterset id="broadcasterset">
-    <broadcaster id="bcast_preciseInput" input="precise"/>
-    <broadcaster id="bcast_windowState" viewstate=""/>
-  </broadcasterset>
-
-  <hbox id="start-container" class="meta-section-container"
-        observes="bcast_windowState">
-  <!-- the start-container element has a max-height set in StartUI.js -->
-      <vbox id="start-topsites" class="meta-section" expanded="true">
-        <label class="meta-section-title wide-title" value="&topSitesHeader.label;"/>
-        <html:div class="meta-section-title narrow-title" onclick="StartUI.onNarrowTitleClick('start-topsites')">
-          &narrowTopSitesHeader.label;
-        </html:div>
-        <richgrid id="start-topsites-grid" observes="bcast_windowState" set-name="topSites" rows="3" columns="3" tiletype="thumbnail" seltype="multiple" minSlots="8" fade="true" flex="1">
-          <richgriditem/>
-          <richgriditem/>
-          <richgriditem/>
-          <richgriditem/>
-          <richgriditem/>
-          <richgriditem/>
-          <richgriditem/>
-          <richgriditem/>
-          <richgriditem/>
-        </richgrid>
-      </vbox>
-
-      <vbox id="start-bookmarks" class="meta-section">
-        <label class="meta-section-title wide-title" value="&bookmarksHeader.label;"/>
-        <html:div class="meta-section-title narrow-title" onclick="StartUI.onNarrowTitleClick('start-bookmarks')">
-          &narrowBookmarksHeader.label;
-        </html:div>
-        <richgrid id="start-bookmarks-grid" observes="bcast_windowState" set-name="bookmarks" seltype="multiple" fade="true" flex="1" minSlots="3">
-          <richgriditem/>
-          <richgriditem/>
-        </richgrid>
-      </vbox>
-
-      <vbox id="start-history" class="meta-section">
-        <label class="meta-section-title wide-title" value="&recentHistoryHeader.label;"/>
-        <html:div class="meta-section-title narrow-title" onclick="StartUI.onNarrowTitleClick('start-history')">
-          &narrowRecentHistoryHeader.label;
-        </html:div>
-        <richgrid id="start-history-grid" observes="bcast_windowState" set-name="recentHistory" seltype="multiple" fade="true" flex="1">
-          <richgriditem/>
-          <richgriditem/>
-          <richgriditem/>
-        </richgrid>
-      </vbox>
-
-#ifdef MOZ_SERVICES_SYNC
-      <vbox id="start-remotetabs" class="meta-section">
-        <label class="meta-section-title wide-title" value="&remoteTabsHeader.label;"/>
-        <html:div id="snappedRemoteTabsLabel" class="meta-section-title narrow-title" onclick="StartUI.onNarrowTitleClick('start-remotetabs')">
-          &narrowRemoteTabsHeader.label;
-        </html:div>
-        <richgrid id="start-remotetabs-grid" observes="bcast_windowState" set-name="remoteTabs" seltype="multiple" fade="true" flex="1">
-          <richgriditem/>
-          <richgriditem/>
-          <richgriditem/>
-        </richgrid>
-
-      </vbox>
-#endif
-  </hbox>
-  </html:body>
-  <observes element="bcast_windowState" attribute="*"/>
-</html:html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/TopSitesView.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/TopSitesView.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/startui/TopSitesView.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/startui/TopSitesView.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,320 +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/. */
-
-"use strict"
-
-Cu.import("resource://gre/modules/PageThumbs.jsm");
-
-function TopSitesView(aGrid) {
-  View.call(this, aGrid);
-  // View monitors this for maximum tile display counts
-  this.tilePrefName = "browser.display.startUI.topsites.maxresults";
-  this.showing = this.maxTiles > 0 && !this.isFirstRun();
-
-  // clean up state when the appbar closes
-  StartUI.chromeWin.addEventListener('MozAppbarDismissing', this, false);
-  let history = Cc["@mozilla.org/browser/nav-history-service;1"].
-                getService(Ci.nsINavHistoryService);
-  history.addObserver(this, false);
-
-  Services.obs.addObserver(this, "Metro:RefreshTopsiteThumbnail", false);
-
-  NewTabUtils.allPages.register(this);
-  TopSites.prepareCache().then(function(){
-    this.populateGrid();
-  }.bind(this));
-}
-
-TopSitesView.prototype = Util.extend(Object.create(View.prototype), {
-  _set:null,
-  // _lastSelectedSites used to temporarily store blocked/removed sites for undo/restore-ing
-  _lastSelectedSites: null,
-  // isUpdating used only for testing currently
-  isUpdating: false,
-
-  // For View's showing property
-  get vbox() {
-    return document.getElementById("start-topsites");
-  },
-
-  destruct: function destruct() {
-    Services.obs.removeObserver(this, "Metro:RefreshTopsiteThumbnail");
-    NewTabUtils.allPages.unregister(this);
-    if (StartUI.chromeWin) {
-      StartUI.chromeWin.removeEventListener('MozAppbarDismissing', this, false);
-    }
-    View.prototype.destruct.call(this);
-  },
-
-  handleItemClick: function tabview_handleItemClick(aItem) {
-    let url = aItem.getAttribute("value");
-    StartUI.goToURI(url);
-  },
-
-  doActionOnSelectedTiles: function(aActionName, aEvent) {
-    let tileGroup = this._set;
-    let selectedTiles = tileGroup.selectedItems;
-    let sites = Array.map(selectedTiles, TopSites._linkFromNode);
-    let nextContextActions = new Set();
-
-    switch (aActionName){
-      case "delete":
-        for (let aNode of selectedTiles) {
-          // add some class to transition element before deletion?
-          aNode.contextActions.delete('delete');
-          // we need new context buttons to show (the tile node will go away though)
-        }
-        this._lastSelectedSites = (this._lastSelectedSites || []).concat(sites);
-        // stop the appbar from dismissing
-        aEvent.preventDefault();
-        nextContextActions.add('restore');
-        TopSites.hideSites(sites);
-        break;
-      case "restore":
-        // usually restore is an undo action, so we have to recreate the tiles and grid selection
-        if (this._lastSelectedSites) {
-          let selectedUrls = this._lastSelectedSites.map((site) => site.url);
-          // re-select the tiles once the tileGroup is done populating and arranging
-          tileGroup.addEventListener("arranged", function _onArranged(aEvent){
-            for (let url of selectedUrls) {
-              let tileNode = tileGroup.querySelector("richgriditem[value='"+url+"']");
-              if (tileNode) {
-                tileNode.setAttribute("selected", true);
-              }
-            }
-            tileGroup.removeEventListener("arranged", _onArranged, false);
-            // <sfoster> we can't just call selectItem n times on tileGroup as selecting means trigger the default action
-            // for seltype="single" grids.
-            // so we toggle the attributes and raise the selectionchange "manually"
-            let event = tileGroup.ownerDocument.createEvent("Events");
-            event.initEvent("selectionchange", true, true);
-            tileGroup.dispatchEvent(event);
-          }, false);
-
-          TopSites.restoreSites(this._lastSelectedSites);
-          // stop the appbar from dismissing,
-          // the selectionchange event will trigger re-population of the context appbar
-          aEvent.preventDefault();
-        }
-        break;
-      case "pin":
-        let pinIndices = [];
-        Array.forEach(selectedTiles, function(aNode) {
-          pinIndices.push( Array.indexOf(aNode.control.items, aNode) );
-          aNode.contextActions.delete('pin');
-          aNode.contextActions.add('unpin');
-        });
-        TopSites.pinSites(sites, pinIndices);
-        break;
-      case "unpin":
-        Array.forEach(selectedTiles, function(aNode) {
-          aNode.contextActions.delete('unpin');
-          aNode.contextActions.add('pin');
-        });
-        TopSites.unpinSites(sites);
-        break;
-      // default: no action
-    }
-    if (nextContextActions.size) {
-      // at next tick, re-populate the context appbar
-      setTimeout(function(){
-        // fire a MozContextActionsChange event to update the context appbar
-        let event = document.createEvent("Events");
-        event.actions = [...nextContextActions];
-        event.initEvent("MozContextActionsChange", true, false);
-        tileGroup.dispatchEvent(event);
-      },0);
-    }
-  },
-
-  handleEvent: function(aEvent) {
-    switch (aEvent.type){
-      case "MozAppbarDismissing":
-        // clean up when the context appbar is dismissed - we don't remember selections
-        this._lastSelectedSites = null;
-        break;
-    }
-  },
-
-  update: function() {
-    // called by the NewTabUtils.allPages.update, notifying us of data-change in topsites
-    let grid = this._set,
-        dirtySites = TopSites.dirty();
-
-    if (dirtySites.size) {
-      // we can just do a partial update and refresh the node representing each dirty tile
-      for (let site of dirtySites) {
-        let tileNode = grid.querySelector("[value='"+site.url+"']");
-        if (tileNode) {
-          this.updateTile(tileNode, new Site(site));
-        }
-      }
-    } else {
-        // flush, recreate all
-      this.isUpdating = true;
-      // destroy and recreate all item nodes, skip calling arrangeItems
-      this.populateGrid();
-    }
-  },
-
-  updateTile: function(aTileNode, aSite, aArrangeGrid) {
-    if (!(aSite && aSite.url)) {
-      throw new Error("Invalid Site object passed to TopSitesView updateTile");
-    }
-    this._updateFavicon(aTileNode, Util.makeURI(aSite.url));
-
-    Task.spawn(function() {
-      let filepath = PageThumbsStorage.getFilePathForURL(aSite.url);
-      if (yield OS.File.exists(filepath)) {
-        aSite.backgroundImage = 'url("'+PageThumbs.getThumbnailURL(aSite.url)+'")';
-        // use the setter when available to update the backgroundImage value
-        if ('backgroundImage' in aTileNode &&
-            aTileNode.backgroundImage != aSite.backgroundImage) {
-          aTileNode.backgroundImage = aSite.backgroundImage;
-        } else {
-          // just update the attribute for when the node gets the binding applied
-          aTileNode.setAttribute("customImage", aSite.backgroundImage);
-        }
-      }
-    });
-
-    aSite.applyToTileNode(aTileNode);
-    if (aTileNode.refresh) {
-      aTileNode.refresh();
-    }
-    if (aArrangeGrid) {
-      this._set.arrangeItems();
-    }
-  },
-
-  populateGrid: function populateGrid() {
-    this.isUpdating = true;
-
-    let sites = TopSites.getSites();
-
-    let tileset = this._set;
-    tileset.clearAll(true);
-
-    if (!this.maxTiles) {
-      this.isUpdating = false;
-      return;
-    } else {
-      sites = sites.slice(0, this.maxTiles);
-    }
-
-    for (let site of sites) {
-      let slot = tileset.nextSlot();
-      this.updateTile(slot, site);
-    }
-    tileset.arrangeItems();
-    this.isUpdating = false;
-  },
-
-  forceReloadOfThumbnail: function forceReloadOfThumbnail(url) {
-    let nodes = this._set.querySelectorAll('richgriditem[value="'+url+'"]');
-    for (let item of nodes) {
-      if ("isBound" in item && item.isBound) {
-        item.refreshBackgroundImage();
-      }
-    }
-  },
-
-  isFirstRun: function isFirstRun() {
-    return Services.prefs.getBoolPref("browser.firstrun.show.localepicker");
-  },
-
-  _adjustDOMforViewState: function _adjustDOMforViewState(aState) {
-    if (!this._set)
-      return;
-    if (!aState)
-      aState = this._set.getAttribute("viewstate");
-
-    View.prototype._adjustDOMforViewState.call(this, aState);
-
-    // Don't show thumbnails in snapped view.
-    if (aState == "snapped") {
-      document.getElementById("start-topsites-grid").removeAttribute("tiletype");
-    } else {
-      document.getElementById("start-topsites-grid").setAttribute("tiletype", "thumbnail");
-    }
-
-    // propogate tiletype changes down to tile children
-    let tileType = this._set.getAttribute("tiletype");
-    for (let item of this._set.children) {
-      if (tileType) {
-        item.setAttribute("tiletype", tileType);
-      } else {
-        item.removeAttribute("tiletype");
-      }
-    }
-  },
-
-  refreshView: function () {
-    this.populateGrid();
-  },
-
-  // nsIObservers
-  observe: function (aSubject, aTopic, aState) {
-    switch (aTopic) {
-      case "Metro:RefreshTopsiteThumbnail":
-        this.forceReloadOfThumbnail(aState);
-        break;
-    }
-    View.prototype.observe.call(this, aSubject, aTopic, aState);
-    this.showing = this.maxTiles > 0 && !this.isFirstRun();
-  },
-
-  // nsINavHistoryObserver
-  onBeginUpdateBatch: function() {
-  },
-
-  onEndUpdateBatch: function() {
-  },
-
-  onVisit: function(aURI, aVisitID, aTime, aSessionID,
-                    aReferringID, aTransitionType) {
-  },
-
-  onTitleChanged: function(aURI, aPageTitle) {
-  },
-
-  onDeleteURI: function(aURI) {
-  },
-
-  onClearHistory: function() {
-    if ('clearAll' in this._set)
-      this._set.clearAll();
-  },
-
-  onPageChanged: function(aURI, aWhat, aValue) {
-  },
-
-  onDeleteVisits: function (aURI, aVisitTime, aGUID, aReason, aTransitionType) {
-  },
-
-  QueryInterface: function(iid) {
-    if (iid.equals(Components.interfaces.nsINavHistoryObserver) ||
-        iid.equals(Components.interfaces.nsISupports)) {
-      return this;
-    }
-    throw Cr.NS_ERROR_NO_INTERFACE;
-  }
-
-});
-
-let TopSitesStartView = {
-  _view: null,
-  get _grid() { return document.getElementById("start-topsites-grid"); },
-
-  init: function init() {
-    this._view = new TopSitesView(this._grid);
-    this._grid.removeAttribute("fade");
-  },
-
-  uninit: function uninit() {
-    if (this._view) {
-      this._view.destruct();
-    }
-  },
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/TopSites.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/TopSites.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/TopSites.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/TopSites.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +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';
-
-/**
- * singleton to provide data-level functionality to the views
- */
-let TopSites = {
-  prepareCache: function(aForce){
-    // front to the NewTabUtils' links cache
-    //  -ensure NewTabUtils.links links are pre-cached
-
-    // avoid re-fetching links data while a fetch is in flight
-    if (this._promisedCache && !aForce) {
-      return this._promisedCache;
-    }
-    let deferred = Promise.defer();
-    this._promisedCache = deferred.promise;
-
-    NewTabUtils.links.populateCache(function () {
-      deferred.resolve();
-      this._promisedCache = null;
-      this._sites = null;  // reset our sites cache so they are built anew
-      this._sitesDirty.clear();
-    }.bind(this), true);
-    return this._promisedCache;
-  },
-
-  _sites: null,
-  _sitesDirty: new Set(),
-  getSites: function() {
-    if (this._sites) {
-      return this._sites;
-    }
-
-    let links = NewTabUtils.links.getLinks();
-    let sites = links.map(function(aLink){
-      let site = new Site(aLink);
-      return site;
-    });
-
-    // reset state
-    this._sites = sites;
-    this._sitesDirty.clear();
-    return this._sites;
-  },
-
-  /**
-   * Get list of top site as in need of update/re-render
-   * @param aSite Optionally add Site arguments to be refreshed/updated
-   */
-  dirty: function() {
-    // add any arguments for more fine-grained updates rather than invalidating the whole collection
-    for (let i=0; i<arguments.length; i++) {
-      this._sitesDirty.add(arguments[i]);
-    }
-    return this._sitesDirty;
-  },
-
-  /**
-   * Cause update of top sites
-   */
-  update: function() {
-    NewTabUtils.allPages.update();
-    // then clear all the dirty flags
-    this._sitesDirty.clear();
-  },
-
-  /**
-   * Pin top site at a given index
-   * @param aSites array of sites to be pinned
-   * @param aSlotIndices indices corresponding to the site to be pinned
-   */
-  pinSites: function(aSites, aSlotIndices) {
-    if (aSites.length !== aSlotIndices.length)
-        throw new Error("TopSites.pinSites: Mismatched sites/indices arguments");
-
-    for (let i=0; i<aSites.length && i<aSlotIndices.length; i++){
-      let site = aSites[i],
-          idx = aSlotIndices[i];
-      if (!(site && site.url)) {
-        throw Cr.NS_ERROR_INVALID_ARG
-      }
-      // pinned state is a pref, using Storage apis therefore sync
-      NewTabUtils.pinnedLinks.pin(site, idx);
-      this.dirty(site);
-    }
-    this.update();
-  },
-
-  /**
-   * Unpin top sites
-   * @param aSites array of sites to be unpinned
-   */
-  unpinSites: function(aSites) {
-    for (let site of aSites) {
-      if (!(site && site.url)) {
-        throw Cr.NS_ERROR_INVALID_ARG
-      }
-      // pinned state is a pref, using Storage apis therefore sync
-      NewTabUtils.pinnedLinks.unpin(site);
-      this.dirty(site);
-    }
-    this.update();
-  },
-
-  /**
-   * Hide (block) top sites
-   * @param aSites array of sites to be unpinned
-   */
-  hideSites: function(aSites) {
-    for (let site of aSites) {
-      if (!(site && site.url)) {
-        throw Cr.NS_ERROR_INVALID_ARG
-      }
-
-      site._restorePinIndex = NewTabUtils.pinnedLinks._indexOfLink(site);
-      // blocked state is a pref, using Storage apis therefore sync
-      NewTabUtils.blockedLinks.block(site);
-    }
-    // clear out the cache, we'll fetch and re-render
-    this._sites = null;
-    this._sitesDirty.clear();
-    this.update();
-  },
-
-  /**
-   * Un-hide (restore) top sites
-   * @param aSites array of sites to be restored
-   */
-  restoreSites: function(aSites) {
-    for (let site of aSites) {
-      if (!(site && site.url)) {
-        throw Cr.NS_ERROR_INVALID_ARG
-      }
-      NewTabUtils.blockedLinks.unblock(site);
-      let pinIndex = site._restorePinIndex;
-
-      if (!isNaN(pinIndex) && pinIndex > -1) {
-        NewTabUtils.pinnedLinks.pin(site, pinIndex);
-      }
-    }
-    // clear out the cache, we'll fetch and re-render
-    this._sites = null;
-    this._sitesDirty.clear();
-    this.update();
-  },
-
-  _linkFromNode: function _linkFromNode(aNode) {
-    return {
-      url: aNode.getAttribute("value"),
-      title: aNode.getAttribute("label")
-    };
-  }
-};
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/Util.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/Util.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/Util.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/Util.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,430 +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/. */
-
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-
-Components.utils.import("resource:///modules/ContentUtil.jsm");
-
-let Util = {
-  /*
-   * General purpose utilities
-   */
-
-  getWindowUtils: function getWindowUtils(aWindow) {
-    return aWindow.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-  },
-
-  // Put the Mozilla networking code into a state that will kick the
-  // auto-connection process.
-  forceOnline: function forceOnline() {
-    Services.io.offline = false;
-  },
-
-  /*
-   * Timing utilties
-   */
-
-  // Executes aFunc after other events have been processed.
-  executeSoon: function executeSoon(aFunc) {
-    Services.tm.mainThread.dispatch({
-      run: function() {
-        aFunc();
-      }
-    }, Ci.nsIThread.DISPATCH_NORMAL);
-  },
-
-  /*
-   * Console printing utilities
-   */
-
-  // Like dump, but each arg is handled and there's an automatic newline
-  dumpLn: function dumpLn() {
-    for (let i = 0; i < arguments.length; i++)
-      dump(arguments[i] + " ");
-    dump("\n");
-  },
-
-  /*
-   * Element utilities
-   */
-
-  transitionElementVisibility: function(aNodes, aVisible) {
-    // accept single node or a collection of nodes
-    aNodes = aNodes.length ? aNodes : [aNodes];
-    let defd = Promise.defer();
-    let pending = 0;
-    Array.forEach(aNodes, function(aNode) {
-      if (aVisible) {
-        aNode.hidden = false;
-        aNode.removeAttribute("fade"); // trigger transition to full opacity
-      } else {
-        aNode.setAttribute("fade", true); // trigger transition to 0 opacity
-      }
-      aNode.addEventListener("transitionend", function onTransitionEnd(aEvent){
-        aNode.removeEventListener("transitionend", onTransitionEnd);
-        if (!aVisible) {
-          aNode.hidden = true;
-        }
-        pending--;
-        if (!pending){
-          defd.resolve(true);
-        }
-      }, false);
-      pending++;
-    });
-    return defd.promise;
-  },
-
-  isTextInput: function isTextInput(aElement) {
-    return ((aElement instanceof Ci.nsIDOMHTMLInputElement &&
-             aElement.mozIsTextField(false)) ||
-            aElement instanceof Ci.nsIDOMHTMLTextAreaElement);
-  },
-
-  /**
-   * Checks whether aElement's content can be edited either if it(or any of its
-   * parents) has "contenteditable" attribute set to "true" or aElement's
-   * ownerDocument is in design mode.
-   */
-  isEditableContent: function isEditableContent(aElement) {
-    return !!aElement && (aElement.isContentEditable ||
-                          this.isOwnerDocumentInDesignMode(aElement));
-
-  },
-
-  isEditable: function isEditable(aElement) {
-    if (!aElement) {
-      return false;
-    }
-
-    if (this.isTextInput(aElement) || this.isEditableContent(aElement)) {
-      return true;
-    }
-
-    // If a body element is editable and the body is the child of an
-    // iframe or div we can assume this is an advanced HTML editor
-    if ((aElement instanceof Ci.nsIDOMHTMLIFrameElement ||
-         aElement instanceof Ci.nsIDOMHTMLDivElement) &&
-        aElement.contentDocument &&
-        this.isEditableContent(aElement.contentDocument.body)) {
-      return true;
-    }
-
-    return false;
-  },
-
-  /**
-   * Checks whether aElement's owner document has design mode turned on.
-   */
-  isOwnerDocumentInDesignMode: function(aElement) {
-    return !!aElement && !!aElement.ownerDocument &&
-           aElement.ownerDocument.designMode == "on";
-  },
-
-  isMultilineInput: function isMultilineInput(aElement) {
-    return (aElement instanceof Ci.nsIDOMHTMLTextAreaElement);
-  },
-
-  isLink: function isLink(aElement) {
-    return ((aElement instanceof Ci.nsIDOMHTMLAnchorElement && aElement.href) ||
-            (aElement instanceof Ci.nsIDOMHTMLAreaElement && aElement.href) ||
-            aElement instanceof Ci.nsIDOMHTMLLinkElement ||
-            aElement.getAttributeNS(kXLinkNamespace, "type") == "simple");
-  },
-
-  isText: function isText(aElement) {
-    return (aElement instanceof Ci.nsIDOMHTMLParagraphElement ||
-            aElement instanceof Ci.nsIDOMHTMLDivElement ||
-            aElement instanceof Ci.nsIDOMHTMLLIElement ||
-            aElement instanceof Ci.nsIDOMHTMLPreElement ||
-            aElement instanceof Ci.nsIDOMHTMLHeadingElement ||
-            aElement instanceof Ci.nsIDOMHTMLTableCellElement ||
-            aElement instanceof Ci.nsIDOMHTMLBodyElement);
-  },
-
-  /*
-   * Rect and nsIDOMRect utilities
-   */
-
-  getCleanRect: function getCleanRect() {
-    return {
-      left: 0, top: 0, right: 0, bottom: 0
-    };
-  },
-
-  pointWithinRect: function pointWithinRect(aX, aY, aRect) {
-    return (aRect.left < aX && aRect.top < aY &&
-            aRect.right > aX && aRect.bottom > aY);
-  },
-
-  pointWithinDOMRect: function pointWithinDOMRect(aX, aY, aRect) {
-    if (!aRect.width || !aRect.height)
-      return false;
-    return this.pointWithinRect(aX, aY, aRect);
-  },
-
-  isEmptyDOMRect: function isEmptyDOMRect(aRect) {
-    if ((aRect.bottom - aRect.top) <= 0 &&
-        (aRect.right - aRect.left) <= 0)
-      return true;
-    return false;
-  },
-
-  // Dumps the details of a dom rect to the console
-  dumpDOMRect: function dumpDOMRect(aMsg, aRect) {
-    try {
-      Util.dumpLn(aMsg,
-                  "left:" + Math.round(aRect.left) + ",",
-                  "top:" + Math.round(aRect.top) + ",",
-                  "right:" + Math.round(aRect.right) + ",",
-                  "bottom:" + Math.round(aRect.bottom) + ",",
-                  "width:" + Math.round(aRect.right - aRect.left) + ",",
-                  "height:" + Math.round(aRect.bottom - aRect.top) );
-    } catch (ex) {
-      Util.dumpLn("dumpDOMRect:", ex.message);
-    }
-  },
-
-  /*
-   * DownloadUtils.convertByteUnits returns [size, localized-unit-string]
-   * so they are joined for a single download size string.
-   */
-  getDownloadSize: function dv__getDownloadSize (aSize) {
-    let [size, units] = DownloadUtils.convertByteUnits(aSize);
-    if (aSize > 0)
-      return size + units;
-    else
-      return Strings.browser.GetStringFromName("downloadsUnknownSize");
-  },
-
-  /*
-   * URIs and schemes
-   */
-
-  makeURI: function makeURI(aURL, aOriginCharset, aBaseURI) {
-    return Services.io.newURI(aURL, aOriginCharset, aBaseURI);
-  },
-
-  makeURLAbsolute: function makeURLAbsolute(base, url) {
-    // Note:  makeURI() will throw if url is not a valid URI
-    return this.makeURI(url, null, this.makeURI(base)).spec;
-  },
-
-  isLocalScheme: function isLocalScheme(aURL) {
-    return ((aURL.indexOf("about:") == 0 &&
-             aURL != "about:blank" &&
-             aURL != "about:empty" &&
-             aURL != "about:start") ||
-            aURL.indexOf("chrome:") == 0);
-  },
-
-  // Don't display anything in the urlbar for these special URIs.
-  isURLEmpty: function isURLEmpty(aURL) {
-    return (!aURL ||
-            aURL == "about:blank" ||
-            aURL == "about:empty" ||
-            aURL == "about:home" ||
-            aURL == "about:newtab" ||
-            aURL.startsWith("about:newtab"));
-  },
-
-  // Title to use for emptyURL tabs.
-  getEmptyURLTabTitle: function getEmptyURLTabTitle() {
-    let browserStrings = Services.strings.createBundle("chrome://browser/locale/browser.properties");
-
-    return browserStrings.GetStringFromName("tabs.emptyTabTitle");
-  },
-
-  // Don't remember these pages in the session store.
-  isURLMemorable: function isURLMemorable(aURL) {
-    return !(aURL == "about:blank" ||
-             aURL == "about:empty" ||
-             aURL == "about:start");
-  },
-
-  /*
-   * Math utilities
-   */
-
-  clamp: function(num, min, max) {
-    return Math.max(min, Math.min(max, num));
-  },
-
-  /*
-   * Screen and layout utilities
-   */
-
-   /*
-    * translateToTopLevelWindow - Given an element potentially within
-    * a subframe, calculate the offsets up to the top level browser.
-    */
-  translateToTopLevelWindow: function translateToTopLevelWindow(aElement) {
-    let offsetX = 0;
-    let offsetY = 0;
-    let element = aElement;
-    while (element &&
-           element.ownerDocument &&
-           element.ownerDocument.defaultView != content) {
-      element = element.ownerDocument.defaultView.frameElement;
-      let rect = element.getBoundingClientRect();
-      offsetX += rect.left;
-      offsetY += rect.top;
-    }
-    let win = null;
-    if (element == aElement)
-      win = content;
-    else
-      win = element.contentDocument.defaultView;
-    return { targetWindow: win, offsetX: offsetX, offsetY: offsetY };
-  },
-
-  get displayDPI() {
-    delete this.displayDPI;
-    return this.displayDPI = this.getWindowUtils(window).displayDPI;
-  },
-
-  /*
-   * aViewHeight - the height of the viewable area in the browser
-   * aRect - a bounding rectangle of a selection or element.
-   *
-   * return - number of pixels for the browser to be shifted up by such
-   * that aRect is centered vertically within aViewHeight.
-   */
-  centerElementInView: function centerElementInView(aViewHeight, aRect) {
-    // If the bottom of the target bounds is higher than the new height,
-    // there's no need to adjust. It will be above the keyboard.
-    if (aRect.bottom <= aViewHeight) {
-      return 0;
-    }
-
-    // height of the target element
-    let targetHeight = aRect.bottom - aRect.top;
-    // height of the browser view.
-    let viewBottom = content.innerHeight;
-
-    // If the target is shorter than the new content height, we can go ahead
-    // and center it.
-    if (targetHeight <= aViewHeight) {
-      // Try to center the element vertically in the new content area, but
-      // don't position such that the bottom of the browser view moves above
-      // the top of the chrome. We purposely do not resize the browser window
-      // by making it taller when trying to center elements that are near the
-      // lower bounds. This would trigger reflow which can cause content to
-      // shift around.
-      let splitMargin = Math.round((aViewHeight - targetHeight) * .5);
-      let distanceToPageBounds = viewBottom - aRect.bottom;
-      let distanceFromChromeTop = aRect.bottom - aViewHeight;
-      let distanceToCenter =
-        distanceFromChromeTop + Math.min(distanceToPageBounds, splitMargin);
-      return distanceToCenter;
-    }
-  },
-
-  /*
-   * Local system utilities
-   */
-
-  copyImageToClipboard: function Util_copyImageToClipboard(aImageLoadingContent) {
-    let image = aImageLoadingContent.QueryInterface(Ci.nsIImageLoadingContent);
-    if (!image) {
-      Util.dumpLn("copyImageToClipboard error: image is not an nsIImageLoadingContent");
-      return;
-    }
-    try {
-      let xferable = Cc["@mozilla.org/widget/transferable;1"].createInstance(Ci.nsITransferable);
-      xferable.init(null);
-      let imgRequest = aImageLoadingContent.getRequest(Ci.nsIImageLoadingContent.CURRENT_REQUEST);
-      let mimeType = imgRequest.mimeType;
-      let imgContainer = imgRequest.image;
-      let imgPtr = Cc["@mozilla.org/supports-interface-pointer;1"].createInstance(Ci.nsISupportsInterfacePointer);
-      imgPtr.data = imgContainer;
-      xferable.setTransferData(mimeType, imgPtr, null);
-      let clip = Cc["@mozilla.org/widget/clipboard;1"].getService(Ci.nsIClipboard);
-      clip.setData(xferable, null, Ci.nsIClipboard.kGlobalClipboard);
-    } catch (e) {
-      Util.dumpLn(e.message);
-    }
-  },
-};
-
-
-/*
- * Timeout
- *
- * Helper class to nsITimer that adds a little more pizazz.  Callback can be an
- * object with a notify method or a function.
- */
-Util.Timeout = function(aCallback) {
-  this._callback = aCallback;
-  this._timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-  this._type = null;
-};
-
-Util.Timeout.prototype = {
-  // Timer callback. Don't call this manually.
-  notify: function notify() {
-    if (this._type == this._timer.TYPE_ONE_SHOT)
-      this._type = null;
-
-    if (this._callback.notify)
-      this._callback.notify();
-    else
-      this._callback.apply(null);
-  },
-
-  // Helper function for once and interval.
-  _start: function _start(aDelay, aType, aCallback) {
-    if (aCallback)
-      this._callback = aCallback;
-    this.clear();
-    this._timer.initWithCallback(this, aDelay, aType);
-    this._type = aType;
-    return this;
-  },
-
-  // Do the callback once.  Cancels other timeouts on this object.
-  once: function once(aDelay, aCallback) {
-    return this._start(aDelay, this._timer.TYPE_ONE_SHOT, aCallback);
-  },
-
-  // Do the callback every aDelay msecs. Cancels other timeouts on this object.
-  interval: function interval(aDelay, aCallback) {
-    return this._start(aDelay, this._timer.TYPE_REPEATING_SLACK, aCallback);
-  },
-
-  // Clear any pending timeouts.
-  clear: function clear() {
-    if (this.isPending()) {
-      this._timer.cancel();
-      this._type = null;
-    }
-    return this;
-  },
-
-  // If there is a pending timeout, call it and cancel the timeout.
-  flush: function flush() {
-    if (this.isPending()) {
-      this.notify();
-      this.clear();
-    }
-    return this;
-  },
-
-  // Return true if we are waiting for a callback.
-  isPending: function isPending() {
-    return this._type !== null;
-  }
-};
-
-// Mixin the ContentUtil module exports
-{
-  for (let name in ContentUtil) {
-    let copy = ContentUtil[name];
-    if (copy !== undefined)
-      Util[name] = copy;
-  }
-}
-
-this.Util = Util;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/WebProgress.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/WebProgress.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/content/WebProgress.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/content/WebProgress.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,244 +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/. */
-
-// Progress heartbeat timer duration (ms)
-const kHeartbeatDuration = 1000;
-// Start and end progress screen css margins as percentages
-const kProgressMarginStart = 30;
-const kProgressMarginEnd = 70;
-
-const WebProgress = {
-  get _identityBox() { return document.getElementById("identity-box"); },
-
-  init: function init() {
-    messageManager.addMessageListener("Content:StateChange", this);
-    messageManager.addMessageListener("Content:LocationChange", this);
-    messageManager.addMessageListener("Content:SecurityChange", this);
-
-    Elements.progress.addEventListener("transitionend", this, true);
-    Elements.tabList.addEventListener("TabSelect", this, true);
-
-    let urlBar = document.getElementById("urlbar-edit");
-    urlBar.addEventListener("input", this, false);
-
-    return this;
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    let json = aMessage.json;
-    let tab = Browser.getTabForBrowser(aMessage.target);
-
-    switch (aMessage.name) {
-      case "Content:StateChange": {
-        if (json.stateFlags & Ci.nsIWebProgressListener.STATE_IS_WINDOW) {
-          if (json.stateFlags & Ci.nsIWebProgressListener.STATE_START)
-            this._windowStart(json, tab);
-          else if (json.stateFlags & Ci.nsIWebProgressListener.STATE_STOP)
-            this._windowStop(json, tab);
-        }
-
-        if (json.stateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) {
-          if (json.stateFlags & Ci.nsIWebProgressListener.STATE_START)
-            this._networkStart(json, tab);
-          else if (json.stateFlags & Ci.nsIWebProgressListener.STATE_STOP)
-            this._networkStop(json, tab);
-        }
-
-        this._progressStep(tab);
-        break;
-      }
-
-      case "Content:LocationChange": {
-        this._locationChange(json, tab);
-        this._progressStep(tab);
-        break;
-      }
-
-      case "Content:SecurityChange": {
-        this._securityChange(json, tab);
-        this._progressStep(tab);
-        break;
-      }
-    }
-  },
-
-  handleEvent: function handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "transitionend":
-        this._progressTransEnd(aEvent);
-        break;
-      case "TabSelect":
-        this._onTabSelect(aEvent);
-        break;
-      case "input":
-        this._onUrlBarInput(aEvent);
-        break;
-    }
-  },
-
-  _securityChange: function _securityChange(aJson, aTab) {
-    let state = aJson.state;
-    let nsIWebProgressListener = Ci.nsIWebProgressListener;
-
-    if (state & nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL) {
-      aTab._identityState = "verifiedIdentity";
-    } else if (state & nsIWebProgressListener.STATE_IS_SECURE) {
-      aTab._identityState = "verifiedDomain";
-    } else {
-      aTab._identityState = "";
-    }
-
-    if (aTab == Browser.selectedTab) {
-      this._identityBox.className = aTab._identityState;
-    }
-  },
-
-  _locationChange: function _locationChange(aJson, aTab) {
-    let spec = aJson.location;
-    let location = spec.split("#")[0]; // Ignore fragment identifier changes.
-
-    if (aTab == Browser.selectedTab) {
-      BrowserUI.updateURI();
-      BrowserUI.update();
-      BrowserUI.updateStartURIAttributes(aJson.location);
-    }
-
-    let locationHasChanged = (location != aTab.browser.lastLocation);
-    if (locationHasChanged) {
-      Browser.getNotificationBox(aTab.browser).removeTransientNotifications();
-      aTab.browser.lastLocation = location;
-      aTab.browser.userTypedValue = "";
-      aTab.browser.appIcon = { href: null, size:-1 };
-
-#ifdef MOZ_CRASHREPORTER
-      if (CrashReporter.enabled)
-        CrashReporter.annotateCrashReport("URL", spec);
-#endif
-    }
-
-    let event = document.createEvent("UIEvents");
-    event.initUIEvent("URLChanged", true, false, window, locationHasChanged);
-    aTab.browser.dispatchEvent(event);
-  },
-
-  _networkStart: function _networkStart(aJson, aTab) {
-    aTab.startLoading();
-
-    if (aTab == Browser.selectedTab) {
-      // NO_STARTUI_VISIBILITY since the current uri for the tab has not
-      // been updated yet. If we're coming off of the start page, this
-      // would briefly show StartUI until _locationChange is called.
-      BrowserUI.update(BrowserUI.NO_STARTUI_VISIBILITY);
-    }
-  },
-
-  _networkStop: function _networkStop(aJson, aTab) {
-    aTab.endLoading();
-
-    if (aTab == Browser.selectedTab) {
-      BrowserUI.update();
-    }
-  },
-
-  _windowStart: function _windowStart(aJson, aTab) {
-    this._progressStart(aJson, aTab);
-  },
-
-  _windowStop: function _windowStop(aJson, aTab) {
-    this._progressStop(aJson, aTab);
-  },
-
-  _progressStart: function _progressStart(aJson, aTab) {
-    // We will get multiple calls from _windowStart, so
-    // only process once.
-    if (aTab._progressActive)
-      return;
-
-    aTab._progressActive = true;
-
-    // 'Whoosh' in
-    aTab._progressCount = kProgressMarginStart;
-    this._showProgressBar(aTab);
-  },
-
-  _showProgressBar: function (aTab) {
-    // display the track
-    if (aTab == Browser.selectedTab) {
-      Elements.progressContainer.removeAttribute("collapsed");
-      Elements.progress.style.width = aTab._progressCount + "%";
-      Elements.progress.removeAttribute("fade");
-    }
-
-    // Create a pulse timer to keep things moving even if we don't
-    // collect any state changes.
-    setTimeout(function() {
-      WebProgress._progressStepTimer(aTab);
-    }, kHeartbeatDuration, this);
-  },
-
-  _stepProgressCount: function _stepProgressCount(aTab) {
-    // Step toward the end margin in smaller slices as we get closer
-    let left = kProgressMarginEnd - aTab._progressCount;
-    let step = left * .05;
-    aTab._progressCount += Math.ceil(step);
-
-    // Don't go past the 'whoosh out' margin.
-    if (aTab._progressCount > kProgressMarginEnd) {
-      aTab._progressCount = kProgressMarginEnd;
-    }
-  },
-
-  _progressStep: function _progressStep(aTab) {
-    if (!aTab._progressActive)
-      return;
-    this._stepProgressCount(aTab);
-    if (aTab == Browser.selectedTab) {
-      Elements.progress.style.width = aTab._progressCount + "%";
-    }
-  },
-
-  _progressStepTimer: function _progressStepTimer(aTab) {
-    if (!aTab._progressActive)
-      return;
-    this._progressStep(aTab);
-
-    setTimeout(function() {
-      WebProgress._progressStepTimer(aTab);
-    }, kHeartbeatDuration, this);
-  },
-
-  _progressStop: function _progressStop(aJson, aTab) {
-    aTab._progressActive = false;
-    // 'Whoosh out' and fade
-    if (aTab == Browser.selectedTab) {
-      Elements.progress.style.width = "100%";
-      Elements.progress.setAttribute("fade", true);
-    }
-  },
-
-  _progressTransEnd: function _progressTransEnd(aEvent) {
-    if (!Elements.progress.hasAttribute("fade"))
-      return;
-    // Close out fade finished, reset
-    if (aEvent.propertyName == "opacity") {
-      Elements.progress.style.width = "0px";
-      Elements.progressContainer.setAttribute("collapsed", true);
-    }
-  },
-
-  _onTabSelect: function(aEvent) {
-    let tab = Browser.getTabFromChrome(aEvent.originalTarget);
-    this._identityBox.className = tab._identityState || "";
-    if (tab._progressActive) {
-      this._showProgressBar(tab);
-    } else {
-      Elements.progress.setAttribute("fade", true);
-      Elements.progressContainer.setAttribute("collapsed", true);
-    }
-  },
-
-  _onUrlBarInput: function(aEvent) {
-    Browser.selectedTab._identityState = this._identityBox.className = "";
-  },
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/jar.mn	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/jar.mn	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-chrome.jar:
-% content browser %content/
-
-  content/aboutAddons.xhtml                    (content/pages/aboutAddons.xhtml)
-  content/aboutCertError.xhtml                 (content/pages/aboutCertError.xhtml)
-  content/aboutRights.xhtml                    (content/pages/aboutRights.xhtml)
-  content/blockedSite.xhtml                    (content/pages/blockedSite.xhtml)
-  content/config.xhtml                         (content/pages/config.xhtml)
-  content/netError.xhtml                       (content/pages/netError.xhtml)
-#ifdef MOZ_CRASHREPORTER
-  content/crashprompt.xhtml                    (content/pages/crashprompt.xhtml)
-#endif
-
-  content/bindings/bindings.xml                (content/bindings/bindings.xml)
-  content/bindings/tabs.xml                    (content/bindings/tabs.xml)
-  content/bindings/toggleswitch.xml            (content/bindings/toggleswitch.xml)
-  content/bindings/browser.xml                 (content/bindings/browser.xml)
-  content/bindings/browser.js                  (content/bindings/browser.js)
-  content/bindings/console.xml                 (content/bindings/console.xml)
-  content/bindings/dialog.xml                  (content/bindings/dialog.xml)
-  content/bindings/grid.xml                    (content/bindings/grid.xml)
-  content/bindings/urlbar.xml                  (content/bindings/urlbar.xml)
-  content/bindings/appbar.xml                  (content/bindings/appbar.xml)
-  content/bindings/flyoutpanel.xml             (content/bindings/flyoutpanel.xml)
-  content/bindings/selectionoverlay.xml        (content/bindings/selectionoverlay.xml)
-  content/bindings/cssthrobber.xml             (content/bindings/cssthrobber.xml)
-  content/bindings/popup.xml                   (content/bindings/popup.xml)
-  content/bindings/circularprogress.xml        (content/bindings/circularprogress.xml)
-  content/bindings/notification.xml            (content/bindings/notification.xml)
-  content/bindings/tabprompts.xml              (content/bindings/tabprompts.xml)
-
-  content/flyoutpanels/SettingsCharm.js        (content/flyoutpanels/SettingsCharm.js)
-* content/flyoutpanels/FlyoutPanelsUI.js       (content/flyoutpanels/FlyoutPanelsUI.js)
-* content/flyoutpanels/AboutFlyoutPanel.js     (content/flyoutpanels/AboutFlyoutPanel.js)
-  content/flyoutpanels/PrefsFlyoutPanel.js     (content/flyoutpanels/PrefsFlyoutPanel.js)
-  content/flyoutpanels/SearchFlyoutPanel.js    (content/flyoutpanels/SearchFlyoutPanel.js)
-#ifdef MOZ_SERVICES_SYNC
-  content/flyoutpanels/SyncFlyoutPanel.js      (content/flyoutpanels/SyncFlyoutPanel.js)
-#endif
-
-  content/helperui/AlertsHelper.js             (content/helperui/AlertsHelper.js)
-  content/helperui/IndexedDB.js                (content/helperui/IndexedDB.js)
-  content/helperui/MenuUI.js                   (content/helperui/MenuUI.js)
-  content/helperui/OfflineApps.js              (content/helperui/OfflineApps.js)
-  content/helperui/SelectHelperUI.js           (content/helperui/SelectHelperUI.js)
-  content/helperui/SelectionHelperUI.js        (content/helperui/SelectionHelperUI.js)
-  content/helperui/ChromeSelectionHandler.js   (content/helperui/ChromeSelectionHandler.js)
-  content/helperui/FormHelperUI.js             (content/helperui/FormHelperUI.js)
-  content/helperui/FindHelperUI.js             (content/helperui/FindHelperUI.js)
-  content/helperui/ItemPinHelper.js            (content/helperui/ItemPinHelper.js)
-
-  content/contenthandlers/ContextMenuHandler.js (content/contenthandlers/ContextMenuHandler.js)
-  content/contenthandlers/SelectionHandler.js  (content/contenthandlers/SelectionHandler.js)
-  content/contenthandlers/FormHelper.js        (content/contenthandlers/FormHelper.js)
-  content/contenthandlers/ConsoleAPIObserver.js (content/contenthandlers/ConsoleAPIObserver.js)
-  content/contenthandlers/Content.js           (content/contenthandlers/Content.js)
-  content/contenthandlers/PluginHelper.js      (content/contenthandlers/PluginHelper.js)
-
-  content/library/SelectionPrototype.js        (content/library/SelectionPrototype.js)
-
-  content/ContentAreaObserver.js               (content/ContentAreaObserver.js)
-  content/BrowserTouchHandler.js               (content/BrowserTouchHandler.js)
-* content/WebProgress.js                       (content/WebProgress.js)
-  content/pages/config.js                      (content/pages/config.js)
-* content/browser.xul                          (content/browser.xul)
-  content/browser.js                           (content/browser.js)
-* content/browser-ui.js                        (content/browser-ui.js)
-* content/browser-scripts.js                   (content/browser-scripts.js)
-  content/ContextCommands.js                   (content/ContextCommands.js)
-  content/commandUtil.js                       (content/commandUtil.js)
-  content/appbar.js                            (content/appbar.js)
-  content/shell.xul                            (content/jsshell/shell.xul)
-  content/shell.html                           (content/jsshell/shell.html)
-  content/bindings.css                         (content/bindings.css)
-  content/cursor.css                           (content/cursor.css)
-  content/sanitize.js                          (content/sanitize.js)
-  content/sanitizeUI.js                        (content/sanitizeUI.js)
-  content/input.js                             (content/input.js)
-  content/Util.js                              (content/Util.js)
-  content/bookmarks.js                         (content/bookmarks.js)
-  content/exceptions.js                        (content/exceptions.js)
-  content/downloads.js                         (content/downloads.js)
-  content/Site.js                              (content/Site.js)
-  content/TopSites.js                          (content/TopSites.js)
-  content/console.js                           (content/console.js)
-  content/dbg-metro-actors.js                  (content/dbg-metro-actors.js)
-  content/NavButtonSlider.js                   (content/NavButtonSlider.js)
-  content/ContextUI.js                         (content/ContextUI.js)
-  content/apzc.js                              (content/apzc.js)
-
-* content/Start.xul                            (content/startui/Start.xul)
-* content/startui-scripts.js                   (content/startui/startui-scripts.js)
-  content/StartUI.js                           (content/startui/StartUI.js)
-  content/BookmarksView.js                     (content/startui/BookmarksView.js)
-  content/HistoryView.js                       (content/startui/HistoryView.js)
-  content/TopSitesView.js                      (content/startui/TopSitesView.js)
-  content/FirstRunOverlay.xul                  (content/startui/FirstRunOverlay.xul)
-  content/FirstRunContentOverlay.xul           (content/startui/FirstRunContentOverlay.xul)
-#ifdef MOZ_SERVICES_SYNC
-  content/RemoteTabsView.js                    (content/startui/RemoteTabsView.js)
-#endif
-
-% override chrome://global/content/config.xul chrome://browser/content/config.xhtml
-% override chrome://global/content/netError.xhtml chrome://browser/content/netError.xhtml
-% override chrome://mozapps/content/extensions/extensions.xul chrome://browser/content/aboutAddons.xhtml
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-METRO_CHROME_MANIFESTS += ['tests/mochiperf/metro.ini', 'tests/mochitest/metro.ini']
-XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
-
-DIST_SUBDIR = 'metro'
-
-DEFINES['AB_CD'] = CONFIG['MOZ_UI_LOCALE']
-DEFINES['PACKAGE'] = 'browser'
-DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_apzc.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_apzc.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_apzc.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_apzc.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,225 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function test() {
-  requestLongerTimeout(2);
-  runTests();
-}
-
-function setup() {
-  PanelUI.hide();
-
-  if (!BrowserUI.isStartTabVisible) {
-    let tab = yield addTab("about:start");
-
-    yield waitForCondition(() => BrowserUI.isStartTabVisible);
-
-    yield hideContextUI();
-  }
-
-  BookmarksTestHelper.setup();
-  HistoryTestHelper.setup();
-}
-
-function tearDown() {
-  PanelUI.hide();
-  BookmarksTestHelper.restore();
-  HistoryTestHelper.restore();
-  Browser.selectedTab
-         .browser
-         .contentWindow
-         .QueryInterface(Ci.nsIInterfaceRequestor)
-         .getInterface(Ci.nsIDOMWindowUtils).clearNativeTouchSequence();
-}
-
-/*
- * short up/down touch scroll. This test isn't affected by
- * skate or stationary apzc prefs provided the display port
- * is twice the height of the screen. Measures apzc/composition
- * perf since the display port (should) only render once.
- */
-gTests.push({
-  desc: "short up/down touch scroll",
-  run: function run() {
-    yield addTab(chromeRoot + "res/scroll_test.html");
-    yield hideContextUI();
-    yield hideNavBar();
-
-    let stopwatch = new StopWatch();
-    let win = Browser.selectedTab.browser.contentWindow;
-    let domUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-    var touchdrag = new TouchDragAndHold();
-    touchdrag.useNativeEvents = true;
-    touchdrag.stepTimeout = 5;
-    touchdrag.numSteps = 20;
-
-    stopwatch.start();
-    let recordingHandle = domUtils.startFrameTimeRecording();
-    for (let count = 0; count < 5; count++) {
-      yield touchdrag.start(win, 100, (win.innerHeight - 50), 100, 50);
-      touchdrag.end();
-      yield touchdrag.start(win, 100, 50, 100, (win.innerHeight - 50));
-      touchdrag.end();
-    }
-    let intervals = domUtils.stopFrameTimeRecording(recordingHandle);
-    let msec = stopwatch.stop();
-
-
-    PerfTest.declareTest("14C693E5-3ED3-4A5D-93BC-A31F130A8CDE",
-                          "touch scroll window", "graphics", "apzc",
-                          "Measures performance of up/down apzc scrolling within a window using FTR.");
-    PerfTest.declareFrameRateResult(intervals.length, msec, "fps");
-  }
-});
-
-/*
- * Long scroll a page of text, which will include repainting
- * content.
- */
-gTests.push({
-  desc: "touch scroll",
-  run: function run() {
-    yield addTab(chromeRoot + "res/scroll_test_tall.html");
-    yield hideContextUI();
-    yield hideNavBar();
-
-    let stopwatch = new StopWatch();
-    let win = Browser.selectedTab.browser.contentWindow;
-    let domUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-    var touchdrag = new TouchDragAndHold();
-    touchdrag.useNativeEvents = true;
-    touchdrag.stepTimeout = 5;
-    touchdrag.numSteps = 20;
-
-    stopwatch.start();
-    let recordingHandle = domUtils.startFrameTimeRecording();
-    for (let count = 0; count < 5; count++) {
-      yield touchdrag.start(win, 100, (win.innerHeight - 50), 100, 50);
-      touchdrag.end();
-    }
-    let intervals = domUtils.stopFrameTimeRecording(recordingHandle);
-    let msec = stopwatch.stop();
-
-
-    PerfTest.declareTest("4546F318-DC1B-4225-9196-D5196C87982A",
-                          "touch scroll text", "graphics", "apzc",
-                          "Measures performance of apzc scrolling for a large page of text using FTR.");
-    PerfTest.declareFrameRateResult(intervals.length, msec, "fps");
-  }
-});
-
-/*
- * Fling a page of text downward over a set of iterations
- * taking measurements for each fling. Content will repaint
- * and includes measurements that cover fling logic/prefs.
- */
-gTests.push({
-  desc: "fling scroll",
-  run: function run() {
-    yield addTab(chromeRoot + "res/scroll_test_tall.html");
-    yield hideContextUI();
-    yield hideNavBar();
-
-    let stopwatch = new StopWatch();
-    let win = Browser.selectedTab.browser.contentWindow;
-    let domUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-    var touchdrag = new TouchDragAndHold();
-    touchdrag.useNativeEvents = true;
-    touchdrag.stepTimeout = 5;
-    touchdrag.numSteps = 10;
-
-    let iterations = 3;
-    let sets = [];
-    for (let count = 0; count < iterations; count++) {
-      let obsPromise = waitForObserver("apzc-transform-end", 30000);
-      stopwatch.start();
-      let recordingHandle = domUtils.startFrameTimeRecording();
-      yield touchdrag.start(win, 100, (win.innerHeight - 50), 100, 50);
-      touchdrag.end();
-      yield obsPromise;
-      let intervals = domUtils.stopFrameTimeRecording(recordingHandle);
-      let msec = stopwatch.stop();
-      sets[count] = {
-        bands: PerfTest.computeHighLowBands(intervals, .1),
-        frameRate: intervals.length / (msec / 1000.0)
-      };
-      yield waitForMs(300);
-    }
-
-    let frameRate = 0, low = 0, ave = 0, high = 0;
-    for (let count = 0; count < iterations; count++) {
-      frameRate += sets[count].frameRate;
-      low += sets[count].bands.low;
-      ave += sets[count].bands.ave;
-      high += sets[count].bands.high;
-
-    }
-    frameRate /= iterations;
-    low /= iterations;
-    ave /= iterations;
-    high /= iterations;
-
-    PerfTest.declareTest("A8EDF0D6-562B-4C4A-AC6B-1E4900FE0EE9",
-                          "fling text", "graphics", "apzc",
-                          "Measures frame rate of apzc fling for a large page of text using FTR.");
-    PerfTest.declareNumericalResult(frameRate, "fps");
-
-    PerfTest.declareTest("F5E83238-383F-4665-8415-878AA027B4A3",
-                          "fling jank", "graphics", "apzc",
-                          "Displays the low, high, and average FTR frame intervals when flinging a page of text.");
-    PerfTest.declareNumericalResults([
-      { value: low, desc: "low" },
-      { value: high, desc: "high", shareAxis: 0 },
-      { value: ave, desc: "average", shareAxis: 0 }
-    ]);
-  }
-});
-
-/*
- * touch scroll the about:start page back and forth averaging
- * values across the entire set. Generally about:start should
- * only need to be painted once. Exercises composition and apzc.
- */
-gTests.push({
-  desc: "touch scroll start",
-  setUp: setup,
-  tearDown: tearDown,
-  run: function run() {
-    let stopwatch = new StopWatch();
-    let win = Browser.selectedTab.browser.contentWindow;
-    let domUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-
-    var touchdrag = new TouchDragAndHold();
-    touchdrag.useNativeEvents = true;
-    touchdrag.stepTimeout = 5;
-    touchdrag.numSteps = 20;
-
-    stopwatch.start();
-    let recordingHandle = domUtils.startFrameTimeRecording();
-    for (let count = 0; count < 5; count++) {
-      yield touchdrag.start(win, (win.innerWidth - 50), (win.innerHeight - 50), 50, (win.innerHeight - 50));
-      touchdrag.end();
-      yield touchdrag.start(win, 50, (win.innerHeight - 50), (win.innerWidth - 50), (win.innerHeight - 50));
-      touchdrag.end();
-    }
-    let intervals = domUtils.stopFrameTimeRecording(recordingHandle);
-    let msec = stopwatch.stop();
-
-    PerfTest.declareTest("24C693E5-3ED3-4A5D-93BC-A31F130A8CDE",
-                          "touch scroll about:start", "graphics", "apzc",
-                          "Measures performance of apzc scrolling for about:start using FTR.");
-    PerfTest.declareFrameRateResult(intervals.length, msec, "fps");
-
-    let results = PerfTest.computeHighLowBands(intervals, .1);
-    PerfTest.declareTest("2E60F8B5-8925-4628-988E-E4C0BC6B34C7",
-                          "about:start jank", "graphics", "apzc",
-                          "Displays the low, high, and average FTR frame intervals for about:start.");
-    PerfTest.declareNumericalResults([
-      { value: results.low, desc: "low" },
-      { value: results.high, desc: "high", shareAxis: 0 },
-      { value: results.ave, desc: "average", shareAxis: 0 }
-    ]);
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_deck_01.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_deck_01.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_deck_01.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_deck_01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function test() {
-  runTests();
-}
-
-gTests.push({
-  desc: "deck offset",
-  run: function run() {
-    yield addTab("about:mozilla");
-    yield hideContextUI();
-    yield hideNavBar();
-    yield waitForMs(3000);
-
-    let shiftDataSet = new Array();
-    let paintDataSet = new Array();
-    let stopwatch = new StopWatch();
-    let win = Browser.selectedTab.browser.contentWindow;
-    let domUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-
-    for (let idx = 0; idx < 10; idx++) {
-      let recordingHandle = domUtils.startFrameTimeRecording();
-      stopwatch.start();
-      let promise = waitForEvent(window, "MozDeckOffsetChanged");
-      ContentAreaObserver.shiftBrowserDeck(300);
-      yield promise;
-      promise = waitForEvent(window, "MozDeckOffsetChanged");
-      ContentAreaObserver.shiftBrowserDeck(0);
-      yield promise;
-      stopwatch.stop();
-      yield waitForMs(500);
-      let intervals = domUtils.stopFrameTimeRecording(recordingHandle);
-      shiftDataSet.push(stopwatch.time());
-      paintDataSet.push(intervals.length);
-    }
-    
-    PerfTest.declareTest("ecb5fbec-0b3d-490f-8d4a-13fa8963e54a",
-                         "shift browser deck", "browser", "ux",
-                         "Triggers multiple SKB deck shifting operations using an offset " +
-                         "value of 300px. Measures total time in milliseconds for a up/down " +
-                         "shift operation plus the total number of frames. Strips outliers.");
-    let shiftAverage = PerfTest.computeAverage(shiftDataSet, { stripOutliers: true });
-    let paintAverage = PerfTest.computeAverage(paintDataSet, { stripOutliers: true });
-    PerfTest.declareNumericalResults([
-      { value: shiftAverage, desc: "msec" },
-      { value: paintAverage, desc: "frame count" },
-    ]);
-  }
-});
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_firstx.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_firstx.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_firstx.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_firstx.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function test() {
-  runTests();
-}
-
-gTests.push({
-  desc: "first x metrics",
-  run: function run() {
-    PerfTest.declareTest("5F2A456E-2BB2-4073-A751-936F222FEAE0",
-                         "startup perf metrics", "browser", "ux",
-                         "Tracks various metrics reported by nsIAppStartup.getStartupInfo(). Values are in msec.");
-
-    let startup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup).getStartupInfo();
-    PerfTest.declareNumericalResults([
-      { value: startup['start'] - startup.process, desc: "start" },
-      { value: startup['main'] - startup.process, desc: "main", shareAxis: 0 },
-      { value: startup['startupCrashDetectionBegin'] - startup.process, desc: "startupCrashDetectionBegin", shareAxis: 0 },
-      { value: startup['firstPaint'] - startup.process, desc: "firstPaint", shareAxis: 0 },
-      { value: startup['sessionRestored'] - startup.process, desc: "sessionRestored", shareAxis: 0 },
-      { value: startup['createTopLevelWindow'] - startup.process, desc: "createTopLevelWindow", shareAxis: 0 },
-      { value: startup['firstLoadURI'] - startup.process, desc: "firstLoadURI", shareAxis: 0 },
-    ]);
-  }
-});
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_layers_01.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_layers_01.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_layers_01.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_layers_01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function test() {
-  runTests();
-}
-
-gTests.push({
-  desc: "rotating divs",
-  run: function run() {
-    yield addTab(chromeRoot + "res/divs_test.html", true);
-    yield hideContextUI();
-    yield hideNavBar();
-
-    let stopwatch = new StopWatch();
-    let win = Browser.selectedTab.browser.contentWindow;
-    let domUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-    yield waitForEvent(win, "teststarted", 5000);
-    // the test runs for five seconds
-    let recordingHandle = domUtils.startFrameTimeRecording();
-    stopwatch.start();
-    let event = yield waitForEvent(win, "testfinished", 10000);
-    let intervals = domUtils.stopFrameTimeRecording(recordingHandle);
-    let msec = stopwatch.stop();
-
-    PerfTest.declareTest("B924F3FA-4CB5-4453-B131-53E3611E0765",
-                         "rotating divs w/text", "graphics", "content",
-                         "Measures animation frames for rotating translucent divs on top of a background of text.");
-    PerfTest.declareFrameRateResult(intervals.length, msec, "fps");
-  }
-});
-
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_miscgfx_01.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_miscgfx_01.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_miscgfx_01.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_miscgfx_01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function test() {
-  requestLongerTimeout(2);
-  runTests();
-}
-
-function tapRadius() {
-  let dpi = Util.displayDPI;
-  return Services.prefs.getIntPref("ui.dragThresholdX") / 240 * dpi; // 27.999998728434246
-}
-
-gTests.push({
-  desc: "scrollBy",
-  run: function run() {
-    yield addTab(chromeRoot + "res/scroll_test.html");
-    yield hideContextUI();
-    yield hideNavBar();
-
-    let stopwatch = new StopWatch();
-    let win = Browser.selectedTab.browser.contentWindow;
-    let domUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-    let deferExit = Promise.defer();
-    let recordingHandle = domUtils.startFrameTimeRecording();
-
-    function step() {
-      if (stopwatch.time() < 5000) {
-        win.scrollBy(0, 2);
-        win.mozRequestAnimationFrame(step);
-        return;
-      }
-
-      let intervals = domUtils.stopFrameTimeRecording(recordingHandle);
-      let msec = stopwatch.stop();
-      PerfTest.declareTest("79235F74-037C-4F6B-AE47-FDCCC13458C3",
-                           "scrollBy scroll", "graphics", "content",
-                           "Measures performance of single line scrolls for a large page of text using FTR.");
-      PerfTest.declareFrameRateResult(intervals.length, msec, "fps");
-      deferExit.resolve();
-    }
-
-    stopwatch.start();
-    win.mozRequestAnimationFrame(step);
-    yield deferExit.promise;
-  }
-});
-
-gTests.push({
-  desc: "canvas perf test",
-  run: function run() {
-    yield addTab(chromeRoot + "res/ripples.html");
-    yield hideContextUI();
-    yield hideNavBar();
-
-    let win = Browser.selectedTab.browser.contentWindow;
-    let domUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-    let recordingHandle = domUtils.startFrameTimeRecording();
-    PerfTest.declareTest("6A455F96-2B2C-4B3C-B387-1AF2F1747CCF",
-                         "ripples", "graphics", "canvas",
-                         "Measures animation frames during a computationally " +
-                         "heavy graphics demo using canvas using FTR.");
-    let stopwatch = new StopWatch(true);
-    // test page runs for 5 seconds
-    let event = yield waitForEvent(win, "test", 10000);
-    let intervals = domUtils.stopFrameTimeRecording(recordingHandle);
-    let msec = stopwatch.stop();
-    PerfTest.declareFrameRateResult(intervals.length, msec, "fps");
-  }
-});
-
-gTests.push({
-  desc: "video perf test",
-  run: function run() {
-    yield addTab(chromeRoot + "res/tidevideo.html");
-    let win = Browser.selectedTab.browser.contentWindow;
-    let domUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-    let video = win.document.getElementById("videoelement");
-    video.pause();
-    yield hideContextUI();
-    yield hideNavBar();
-    yield waitForMs(1000);
-    PerfTest.declareTest("7F55F9C4-0ECF-4A13-9A9C-A38D46922C0B",
-                         "video playback (moz paints)", "graphics", "video",
-                         "Measures frames per second during five seconds of playback of an mp4.");
-
-    let recordingHandle = domUtils.startFrameTimeRecording();
-    let stopwatch = new StopWatch(true);
-    video.play();
-    yield waitForMs(5000);
-    video.pause();
-    let intervals = domUtils.stopFrameTimeRecording(recordingHandle);
-    let msec = stopwatch.stop();
-    PerfTest.declareFrameRateResult(intervals.length, msec, "fps");
-
-    PerfTest.declareTest("E132D333-4642-4597-B1F0-1E74B625DBD7",
-                         "video playback (moz stats)", "graphics", "video",
-                         "Report moz* related video performance stats during five seconds of playback of an mp4.");
-    let results = [];
-    results.push({ value: (video.mozDecodedFrames / msec) * 1000.0, desc: "mozDecodedFrames" });
-    results.push({ value: (video.mozParsedFrames / msec) * 1000.0, desc: "mozParsedFrames", shareAxis: 0 });
-    results.push({ value: (video.mozPresentedFrames / msec) * 1000.0, desc: "mozPresentedFrames", shareAxis: 0 });
-    results.push({ value: (video.mozPaintedFrames / msec) * 1000.0, desc: "mozPaintedFrames", shareAxis: 0 });
-    PerfTest.declareNumericalResults(results);
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_msgmgr_01.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_msgmgr_01.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_msgmgr_01.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_msgmgr_01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function test() {
-  runTests();
-}
-
-var EchoServer = {
-  _deferred: null,
-  _stopwatch: null,
-  _browser: null,
-
-  timeAsyncMessage: function timeAsyncMessage(aJson) {
-    if (this._stopwatch == null) {
-      this._stopwatch = new StopWatch(false);
-    }
-    this._deferred = Promise.defer();
-    messageManager.addMessageListener("Test:EchoResponse", this);
-    this._stopwatch.start();
-    this._browser.messageManager.sendAsyncMessage("Test:EchoRequest", aJson);
-    return this._deferred.promise;
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    let json = aMessage.json;
-    switch (aMessage.name) {
-      case "Test:EchoResponse":
-        let msec = this._stopwatch.stop();
-        messageManager.removeMessageListener("Test:EchoResponse", this);
-        this._deferred.resolve(msec);
-        break;
-    }
-  },
-};
-
-
-gTests.push({
-  desc: "msg manager 1",
-  run: function run() {
-    yield addTab("about:blank");
-    yield hideContextUI();
-
-    let browser = Browser.selectedTab.browser;
-    EchoServer._browser = browser;
-
-    browser.messageManager.loadFrameScript(chromeRoot + "msgmanagerecho.js", true);
-
-    yield waitForMs(1000);
-
-    let openDataSet = new Array();
-
-    for (let idx = 0; idx < 100; idx++) {
-      let msec = yield EchoServer.timeAsyncMessage({});
-      openDataSet.push(msec);
-    }
-
-    PerfTest.declareTest("A4354ACB-34DE-4796-914F-FD01EF298B1D",
-                         "msg manager 01", "platform", "",
-                         "Measures the time it takes to send/recv 100 message manager messages with an empty payload. " +
-                         "Browser displays about:blank during the test.");
-    let result = PerfTest.computeAverage(openDataSet, { stripOutliers: false });
-    PerfTest.declareNumericalResult(result, "msec");
-  }
-});
-
-gTests.push({
-  desc: "msg manager 1",
-  run: function run() {
-    yield addTab("about:blank");
-    yield hideContextUI();
-
-    let browser = Browser.selectedTab.browser;
-    EchoServer._browser = browser;
-
-    browser.messageManager.loadFrameScript(chromeRoot + "msgmanagerecho.js", true);
-
-    let ds = {};
-
-    for (let i = 0; i < 100; i++) {
-      ds["i" + i] = { idx: i };
-      let table = ds["i" + i];
-      for (let j = 0; j < 100; j++) {
-        table["j" + i] = { rnd: Math.random() };
-      }
-    }
-
-    yield waitForMs(1000);
-
-    let openDataSet = new Array();
-
-    for (let idx = 0; idx < 100; idx++) {
-      let msec = yield EchoServer.timeAsyncMessage(ds);
-      openDataSet.push(msec);
-    }
-
-    PerfTest.declareTest("B4354ACB-34DE-4796-914F-FD01EF298B1D",
-                         "msg manager 02", "platform", "",
-                         "Measures the time it takes to send/recv 100 message manager messages with a heavy payload. " +
-                         "Browser displays about:blank during the test.");
-    let result = PerfTest.computeAverage(openDataSet, { stripOutliers: false });
-    PerfTest.declareNumericalResult(result, "msec");
-  }
-});
-
-gTests.push({
-  desc: "msg manager 3",
-  run: function run() {
-    yield addTab(chromeRoot + "res/ripples.html");
-    yield hideContextUI();
-
-    let browser = Browser.selectedTab.browser;
-    EchoServer._browser = browser;
-
-    browser.messageManager.loadFrameScript(chromeRoot + "msgmanagerecho.js", true);
-
-    let ds = {};
-
-    for (let i = 0; i < 100; i++) {
-      ds["i" + i] = { idx: i };
-      let table = ds["i" + i];
-      for (let j = 0; j < 100; j++) {
-        table["j" + i] = { rnd: Math.random() };
-      }
-    }
-
-    yield waitForMs(1000);
-
-    let openDataSet = new Array();
-
-    for (let idx = 0; idx < 100; idx++) {
-      let msec = yield EchoServer.timeAsyncMessage(ds);
-      openDataSet.push(msec);
-    }
-
-    PerfTest.declareTest("C4354ACB-34DE-4796-914F-FD01EF298B1D",
-                         "msg manager 03", "platform", "",
-                         "Measures the time it takes to send/recv 100 message manager messages with a heavy payload. " +
-                         "Browser displays ripples during the test.");
-    let result = PerfTest.computeAverage(openDataSet, { stripOutliers: false });
-    PerfTest.declareNumericalResult(result, "msec");
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_tabs_01.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_tabs_01.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/browser_tabs_01.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/browser_tabs_01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function test() {
-  runTests();
-}
-
-function timeTab(aUrl) {
-  return Task.spawn(function() {
-    let stopwatch = new StopWatch(true);
-    let tab = Browser.addTab(aUrl, true);
-    yield tab.pageShowPromise;
-    stopwatch.stop();
-    Browser.closeTab(tab, { forceClose: true })
-    yield waitForMs(500);
-    throw new Task.Result(stopwatch.time());
-  });
-}
-
-gTests.push({
-  desc: "tab open",
-  run: function run() {
-    yield addTab("about:blank");
-    yield hideContextUI();
-    yield waitForMs(5000);
-
-    let openDataSet = new Array();
-    for (let idx = 0; idx < 20; idx++) {
-      let time = yield timeTab("about:blank");
-      openDataSet.push(time);
-    }
-
-    // Give the browser a little time to clean up its tabs. 2 because
-    // we open a tab above as a base to get rid of the start screen.
-    yield waitForCondition(() => Browser.tabs.length == 2);
-    
-    PerfTest.declareTest("FBD7A532-D63A-44B5-9744-5CB07CFD131A",
-                         "tab open", "browser", "ux",
-                         "Open twenty tabs in succession, closing each before the next is opened. " +
-                         "Gives the browser time to settle in between. Lets the ui react however it " +
-                         "is designed to. Strips outliers.");
-    let result = PerfTest.computeAverage(openDataSet, { stripOutliers: true });
-    PerfTest.declareNumericalResult(result, "msec");
-  }
-});
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/head.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/head.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/head.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/head.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// Load common code from ../mochitest/head.js
-let mochitestDir = getRootDirectory(gTestPath).replace('/mochiperf', '/mochitest');
-Services.scriptloader.loadSubScript(mochitestDir + "head.js", this);
-
-// Misc. constants
-const kInfoHeader = "PERF-TEST | ";
-const kDeclareId = "DECLARE ";
-const kResultsId = "RESULTS ";
-
-// Mochitest log data format version
-const kDataSetVersion = "1";
-
-/*
- * PerfTest - helper library for simple mochitest based performance tests.
- */
-
-var PerfTest = {
-  _userStartTime: 0,
-  _userStopTime: 0,
-
-  /******************************************************
-   * Declare and results
-   */
-
-  /*
-   * declareTest
-   *
-   * Declare a test which the graph server will pick up and track.
-   * Must be called by every test on startup. Graph server will
-   * search for result data between this declaration and the next.
-   *
-   * @param aUUID string for this particular test, case sensitive.
-   * @param aName The name of the test.
-   * @param aCategory Top level test calegory. For example 'General',
-   * 'Graphics', 'Startup', 'Jim's Tests'.
-   * @param aSubCategory (optional) sub category name with aCategory.
-   * @param aDescription A detailed description (sentence or two) of
-   * what the test does.
-   */
-  declareTest: function declareTest(aUUID, aName, aCategory, aSubCategory, aDescription) {
-    this._uid = aUUID;
-    this._print(kDeclareId, this._toJsonStr({
-      id: aUUID,
-      version: kDataSetVersion,
-      name: aName,
-      category: aCategory,
-      subcategory: aSubCategory,
-      description: aDescription,
-      buildid: Services.appinfo.appBuildID,
-    }));
-  },
-
-  /*
-   * declareNumericalResult
-   *
-   * Declare a simple numerical result.
-   *
-   * @param aValue numerical value to record
-   * @param aDescription string describing the value to display on the y axis.
-   */
-  declareNumericalResult: function declareNumericalResult(aValue, aDescription) {
-    this._print(kResultsId, this._toJsonStr({
-      id: this._uid,
-      version: kDataSetVersion,
-      results: {
-        r0: {
-          value: aValue,
-          desc: aDescription
-        }
-      },
-    }));
-  },
-
-  /*
-   * declareFrameRateResult
-   *
-   * Declare a frame rate for a result.
-   *
-   * @param aFrameCount numerical frame count
-   * @param aRunMs run time in miliseconds
-   * @param aDescription string describing the value to display on the y axis.
-   */
-  declareFrameRateResult: function declareFrameRateResult(aFrameCount, aRunMs, aDescription) {
-    this._print(kResultsId, this._toJsonStr({
-      id: this._uid,
-      version: kDataSetVersion,
-      results: {
-        r0: {
-          value: (aFrameCount / (aRunMs / 1000.0)),
-          desc: aDescription
-        }
-      },
-    }));
-  },
-
-  /*
-   * declareNumericalResults
-   *
-   * Declare a set of numerical results.
-   *
-   * @param aArray an array of datapoint objects of the form:
-   *
-   *  [ { value: (value), desc: "description/units" }, .. ]
-   *
-   *  optional values:
-   *    shareAxis - the 0 based index of a previous data point this point
-   *    should share a y axis with.
-   */
-  declareNumericalResults: function declareNumericalResults(aArray) {
-    let collection = new Object();
-    for (let idx = 0; idx < aArray.length; idx++) {
-      collection['r' + idx] = { value: aArray[idx].value, desc: aArray[idx].desc };
-      if (aArray[idx].shareAxis != undefined) {
-        collection['r' + idx].shareAxis = aArray[idx].shareAxis;
-      }
-    }
-    let dataset = {
-      id: this._uid,
-      version: kDataSetVersion,
-      results: collection
-    };
-    this._print(kResultsId, this._toJsonStr(dataset));
-  },
-
-  /******************************************************
-   * Perf tests
-   */
-
-  perfBoundsCheck: function perfBoundsCheck(aLow, aHigh, aValue, aTestMessage) {
-    ok(aValue < aLow || aValue > aHigh, aTestMessage);
-  },
-
-  /******************************************************
-   * Math utilities
-   */
-
-  computeMedian: function computeMedian(aArray, aOptions) {
-    aArray.sort(function (a, b) {
-      return a - b;
-    });
- 
-    var idx = Math.floor(aArray.length / 2);
- 
-    if(aArray.length % 2) {
-        return aArray[idx];
-    } else {
-        return (aArray[idx-1] + aArray[idx]) / 2;
-    }
-  },
-
-  computeAverage: function computeAverage(aArray, aOptions) {
-    let idx;
-    let count = 0, total = 0;
-    let highIdx = -1, lowIdx = -1;
-    let high = 0, low = 0;
-    if (aOptions.stripOutliers) {
-      for (idx = 0; idx < aArray.length; idx++) {
-        if (high < aArray[idx]) {
-          highIdx = idx;
-          high = aArray[idx];
-        }
-        if (low > aArray[idx]) {
-          lowIdx = idx;
-          low = aArray[idx];
-        }
-      }
-    }
-    for (idx = 0; idx < aArray.length; idx++) {
-      if (idx != high && idx != low) {
-        total += aArray[idx];
-        count++;
-      }
-    }
-    return total / count;
-  },
-
-  computeHighLowBands: function computeHighLow(aArray, aPercentage) {
-    let bandCount = Math.ceil(aArray.length * aPercentage);
-    let lowGroup = 0, highGroup = 0;
-    let idx;
-
-    function compareNumbers(a, b) {
-      return a - b;
-    }
-    aArray.sort(compareNumbers);
-    for (idx = 0; idx < bandCount; idx++) {
-      lowGroup += aArray[idx];
-    }
-    let top = aArray.length - 1;
-    for (idx = top; idx > (top - bandCount); idx--) {
-      highGroup += aArray[idx];
-    }
-    return {
-      low: lowGroup / bandCount,
-      high: highGroup / bandCount,
-      ave: this.computeAverage(aArray, {})
-    };
-  },
-
-  /******************************************************
-   * Internal
-   */
-
-  _print: function _print() {
-    let str = kInfoHeader;
-    for (let idx = 0; idx < arguments.length; idx++) {
-      str += arguments[idx];
-    }
-    info(str);
-  },
-
-  _toJsonStr: function _toJsonStr(aTable) {
-    return window.JSON.stringify(aTable);
-  },
-};
-
-/*
- * StopWatch - timing helper
- */
-
-function StopWatch(aStart) {
-  if (aStart) {
-    this.start();
-  }
-}
-
-StopWatch.prototype = {
-  /*
-   * Start timing. Resets existing clock.
-   */
-  start: function start() {
-    this.reset();
-    this._userStartTime = window.performance.now();
-  },
-
-  /*
-   * Stop timing.
-   */
-  stop: function stop() {
-    this._userStopTime = window.performance.now();
-    return this.time();
-  },
-
-  /*
-   * Resets both start and end time.
-   */
-  reset: function reset() {
-    this._userStartTime = this._userStopTime = 0;
-  },
-
-  /*
-   * Returns the total time ellapsed in milliseconds. Returns zero if
-   * no time has been accumulated.
-   */
-  time: function time() {
-    if (!this._userStartTime) {
-      return 0;
-    }
-    if (!this._userStopTime) {
-      return (window.performance.now() - this._userStartTime);
-    }
-    return this._userStopTime - this._userStartTime;
-  },
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/metro.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/metro.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/metro.ini	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/metro.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-[DEFAULT]
-# Don't run performance tests in debug builds.
-skip-if = debug
-support-files =
-  head.js
-  msgmanagerecho.js
-  res/ripples.html
-  res/scroll_test.html
-  res/scroll_test_tall.html
-  res/tidevideo.html
-  res/tide.mp4
-  res/divs_test.html
-  res/fx.png
-
-[browser_apzc.js]
-[browser_miscgfx_01.js]
-[browser_tabs_01.js]
-[browser_deck_01.js]
-[browser_msgmgr_01.js]
-[browser_layers_01.js]
-[browser_firstx.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/msgmanagerecho.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/msgmanagerecho.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/msgmanagerecho.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/msgmanagerecho.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +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/. */
-
-/*
- * TestEchoReceiver - receives json data, reserializes it and send it back.
- */ 
-
-"use strict";
-
-var TestEchoReceiver = {
-  init: function init() {
-    addMessageListener("Test:EchoRequest", this);
-  },
-
-  receiveMessage: function receiveMessage(aMessage) {
-    let json = aMessage.json;
-    switch (aMessage.name) {
-      case "Test:EchoRequest":
-        sendAsyncMessage("Test:EchoResponse", json);
-        break;
-    }
-  },
-
-};
-
-TestEchoReceiver.init();
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/divs_test.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/divs_test.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/divs_test.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/divs_test.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,278 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-#text
-{
-  position: absolute;
-  left: 1em;
-  bottom: 1em;
-}
-
-.div1
-{
-  transform:  rotate(30deg);
-  background-color: green;
-  opacity: .5;
-  position:absolute;
-  top: 10px;
-  left: 10px;
-  width: 600px;
-  height: 600px;
-}
-
-.div2
-{
-  transform:  rotate(60deg);
-  background-color: blue;
-  opacity: .5;
-  position:absolute;
-  top: 10px;
-  left: 600px;
-  width: 600px;
-  height: 600px;
-}
-
-.div3
-{
-  transform:  rotate(90deg);
-  background-image: url("fx.png");
-  opacity: .5;
-  position:absolute;
-  top: 100px;
-  left: 300px;
-  width: 640px;
-  height: 435px;
-}
-
-</style>
-</head>
-
-<script type="text/javascript">
-
-var rot = 30;
-var scale = 1;
-var scaleFactor = .01
-function render()
-{
-  rot +=2;
-  scale += scaleFactor;
-  if (scale > 1.5)
-    scaleFactor = -.01;
-  if (scale < .1)
-    scaleFactor = .01;
-  document.getElementById("div1").style.transform = "rotate(" + rot + "deg)";
-  document.getElementById("div2").style.transform = "rotate(" + (rot + 30) + "deg)";
-  document.getElementById("div3").style.transform = "rotate(" + (rot + 60) + "deg) " + "scale(" + scale + ")";
-}
-
-var frames = 0;
-
-function go() {
-  var now = new Date();
-  var evt = document.createEvent("CustomEvent");
-  evt.initCustomEvent("teststarted", true, false, {});
-  window.dispatchEvent(evt);
-  function step(timestamp) {
-    render();
-    frames++;
-    var time = new Date();
-    var diff = time.getTime() - now.getTime();
-    if (diff < 5000) {
-      window.mozRequestAnimationFrame(step);
-    } else {
-      var evt = document.createEvent("CustomEvent");
-      evt.initCustomEvent("testfinished", true, false, { frames: frames });
-      window.dispatchEvent(evt);
-    }
-  }
-  window.mozRequestAnimationFrame(step);
-}
-
-</script>
-<body onload="setTimeout(go, 2000);">
-<div id="div1" class="div1"></div>
-<div id="div2" class="div2"></div>
-<div id="div3" class="div3"></div>
-<div id="content" style="width:100%;">
-  Alice was beginning to get very tired of sitting by her sister
-on the bank, and of having nothing to do:  once or twice she had
-peeped into the book her sister was reading, but it had no
-pictures or conversations in it, `and what is the use of a book,'
-thought Alice `without pictures or conversation?'
-
-  So she was considering in her own mind (as well as she could,
-for the hot day made her feel very sleepy and stupid), whether
-the pleasure of making a daisy-chain would be worth the trouble
-of getting up and picking the daisies, when suddenly a White
-Rabbit with pink eyes ran close by her.
-
-  There was nothing so VERY remarkable in that; nor did Alice
-think it so VERY much out of the way to hear the Rabbit say to
-itself, `Oh dear!  Oh dear!  I shall be late!'  (when she thought
-it over afterwards, it occurred to her that she ought to have
-wondered at this, but at the time it all seemed quite natural);
-but when the Rabbit actually TOOK A WATCH OUT OF ITS WAISTCOAT-
-POCKET, and looked at it, and then hurried on, Alice started to
-her feet, for it flashed across her mind that she had never
-before seen a rabbit with either a waistcoat-pocket, or a watch to
-take out of it, and burning with curiosity, she ran across the
-field after it, and fortunately was just in time to see it pop
-down a large rabbit-hole under the hedge.
-
-  In another moment down went Alice after it, never once
-considering how in the world she was to get out again.
-
-  The rabbit-hole went straight on like a tunnel for some way,
-and then dipped suddenly down, so suddenly that Alice had not a
-moment to think about stopping herself before she found herself
-falling down a very deep well.
-
-  Either the well was very deep, or she fell very slowly, for she
-had plenty of time as she went down to look about her and to
-wonder what was going to happen next.  First, she tried to look
-down and make out what she was coming to, but it was too dark to
-see anything; then she looked at the sides of the well, and
-noticed that they were filled with cupboards and book-shelves;
-here and there she saw maps and pictures hung upon pegs.  She
-took down a jar from one of the shelves as she passed; it was
-labelled `ORANGE MARMALADE', but to her great disappointment it
-was empty:  she did not like to drop the jar for fear of killing
-somebody, so managed to put it into one of the cupboards as she
-fell past it.
-
-  `Well!' thought Alice to herself, `after such a fall as this, I
-shall think nothing of tumbling down stairs!  How brave they'll
-all think me at home!  Why, I wouldn't say anything about it,
-even if I fell off the top of the house!' (Which was very likely
-true.)
-
-  Down, down, down.  Would the fall NEVER come to an end!  `I
-wonder how many miles I've fallen by this time?' she said aloud.
-`I must be getting somewhere near the centre of the earth.  Let
-me see:  that would be four thousand miles down, I think--' (for,
-you see, Alice had learnt several things of this sort in her
-lessons in the schoolroom, and though this was not a VERY good
-opportunity for showing off her knowledge, as there was no one to
-listen to her, still it was good practice to say it over) `--yes,
-that's about the right distance--but then I wonder what Latitude
-or Longitude I've got to?'  (Alice had no idea what Latitude was,
-or Longitude either, but thought they were nice grand words to
-say.)
-
-  Presently she began again.  `I wonder if I shall fall right
-THROUGH the earth!  How funny it'll seem to come out among the
-people that walk with their heads downward!  The Antipathies, I
-think--' (she was rather glad there WAS no one listening, this
-time, as it didn't sound at all the right word) `--but I shall
-have to ask them what the name of the country is, you know.
-Please, Ma'am, is this New Zealand or Australia?' (and she tried
-to curtsey as she spoke--fancy CURTSEYING as you're falling
-through the air!  Do you think you could manage it?)  `And what
-an ignorant little girl she'll think me for asking!  No, it'll
-never do to ask:  perhaps I shall see it written up somewhere.'
-
-  Down, down, down.  There was nothing else to do, so Alice soon
-began talking again.  `Dinah'll miss me very much to-night, I
-should think!'  (Dinah was the cat.)  `I hope they'll remember
-her saucer of milk at tea-time.  Dinah my dear!  I wish you were
-down here with me!  There are no mice in the air, I'm afraid, but
-you might catch a bat, and that's very like a mouse, you know.
-But do cats eat bats, I wonder?'  And here Alice began to get
-rather sleepy, and went on saying to herself, in a dreamy sort of
-way, `Do cats eat bats?  Do cats eat bats?' and sometimes, `Do
-bats eat cats?' for, you see, as she couldn't answer either
-question, it didn't much matter which way she put it.  She felt
-that she was dozing off, and had just begun to dream that she
-was walking hand in hand with Dinah, and saying to her very
-earnestly, `Now, Dinah, tell me the truth:  did you ever eat a
-bat?' when suddenly, thump! thump! down she came upon a heap of
-sticks and dry leaves, and the fall was over.
-
-  Alice was not a bit hurt, and she jumped up on to her feet in a
-moment:  she looked up, but it was all dark overhead; before her
-was another long passage, and the White Rabbit was still in
-sight, hurrying down it.  There was not a moment to be lost:
-away went Alice like the wind, and was just in time to hear it
-say, as it turned a corner, `Oh my ears and whiskers, how late
-it's getting!'  She was close behind it when she turned the
-corner, but the Rabbit was no longer to be seen:  she found
-herself in a long, low hall, which was lit up by a row of lamps
-hanging from the roof.
-
-  There were doors all round the hall, but they were all locked;
-and when Alice had been all the way down one side and up the
-other, trying every door, she walked sadly down the middle,
-wondering how she was ever to get out again.
-
-  Suddenly she came upon a little three-legged table, all made of
-solid glass; there was nothing on it except a tiny golden key,
-and Alice's first thought was that it might belong to one of the
-doors of the hall; but, alas! either the locks were too large, or
-the key was too small, but at any rate it would not open any of
-them.  However, on the second time round, she came upon a low
-curtain she had not noticed before, and behind it was a little
-door about fifteen inches high:  she tried the little golden key
-in the lock, and to her great delight it fitted!
-
-  Alice opened the door and found that it led into a small
-passage, not much larger than a rat-hole:  she knelt down and
-looked along the passage into the loveliest garden you ever saw.
-How she longed to get out of that dark hall, and wander about
-among those beds of bright flowers and those cool fountains, but
-she could not even get her head though the doorway; `and even if
-my head would go through,' thought poor Alice, `it would be of
-very little use without my shoulders.  Oh, how I wish
-I could shut up like a telescope!  I think I could, if I only
-know how to begin.'  For, you see, so many out-of-the-way things
-had happened lately, that Alice had begun to think that very few
-things indeed were really impossible.
-
-  There seemed to be no use in waiting by the little door, so she
-went back to the table, half hoping she might find another key on
-it, or at any rate a book of rules for shutting people up like
-telescopes:  this time she found a little bottle on it, (`which
-certainly was not here before,' said Alice,) and round the neck
-of the bottle was a paper label, with the words `DRINK ME'
-beautifully printed on it in large letters.
-
-  It was all very well to say `Drink me,' but the wise little
-Alice was not going to do THAT in a hurry.  `No, I'll look
-first,' she said, `and see whether it's marked "poison" or not';
-for she had read several nice little histories about children who
-had got burnt, and eaten up by wild beasts and other unpleasant
-things, all because they WOULD not remember the simple rules
-their friends had taught them:  such as, that a red-hot poker
-will burn you if you hold it too long; and that if you cut your
-finger VERY deeply with a knife, it usually bleeds; and she had
-never forgotten that, if you drink much from a bottle marked
-`poison,' it is almost certain to disagree with you, sooner or
-later.
-
-  However, this bottle was NOT marked `poison,' so Alice ventured
-to taste it, and finding it very nice, (it had, in fact, a sort
-of mixed flavour of cherry-tart, custard, pine-apple, roast
-turkey, toffee, and hot buttered toast,) she very soon finished
-it off.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-  `What a curious feeling!' said Alice; `I must be shutting up
-like a telescope.'
-
-  And so it was indeed:  she was now only ten inches high, and
-her face brightened up at the thought that she was now the right
-size for going through the little door into that lovely garden.
-First, however, she waited for a few minutes to see if she was
-going to shrink any further:  she felt a little nervous about
-this; `for it might end, you know,' said Alice to herself, `in my
-going out altogether, like a candle.  I wonder what I should be
-like then?'  And she tried to fancy what the flame of a candle is
-like after the candle is blown out, for she could not remember
-ever having seen such a thing.
-</div>
-</body></html>
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/fx.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/fx.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/ripples.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/ripples.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/ripples.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/ripples.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,254 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<script type="text/javascript">
-
-var ripples = {
-	frame: 0,
-
-  get frames()  {
-    return this.frame;
-  },
-
-	// Size of buffer.
-	width: 80,
-	height: 80,
-	
-	// Render size.
-	renderWidth: 1200,
-	renderHeight: 700,
-	
-	// Canvas size.
-	canvasWidth: 1200,
-	canvasHeight: 700,
-	
-	// Ripple start points.
-	ripplePoints: [
-		{x:0.5,y:0.5,start:0},
-		{x:0.2,y:0.3,start:0},
-		{x:0.7,y:0.6,start:0},
-		{x:0.2,y:0.2,start:4000},
-		{x:0.7,y:0.2,start:6000},
-		{x:0.2,y:0.8,start:8000},
-		{x:0.5,y:0.3,start:12000},
-		{x:0.2,y:0.6,start:16000},
-		{x:0.8,y:0.2,start:20000},
-		{x:0.3,y:0.8,start:24000},
-		{x:0.6,y:0.2,start:28000}
-	],
-	
-	a: false, // previous frame
-	b: false, // frame before previous frame
-	
-	pixelWidth: 0,
-	pixelHeight: 0,
-	
-	init: function() {
-		// Get start time.
-		var d = new Date();
-		this.startTime = d.getTime();
-		
-		// Pixel sizes.
-		this.pixelWidth = Math.floor(this.renderWidth / this.width);
-		this.pixelHeight = Math.floor(this.renderHeight / this.height);
-		
-		// Top left corner position of the rendered effect.
-		this.xPosition = this.canvasWidth / 2 - (this.pixelWidth * this.width) / 2;
-		this.yPosition = this.canvasHeight / 2 - (this.pixelHeight * this.height) / 2;
-		
-		
-		// Init canvas.
-		var canvas = document.getElementById('ripples');
-		this.ctx = canvas.getContext('2d');
-
-		// Create buffers.
-		this.a = new Buffer(this.width, this.height);
-		this.b = new Buffer(this.width, this.height);
-		
-	},
-
-	processBuffers: function() {
-		var damping = 0.02;
-		for (var x = 2; x < this.width - 2; x++) {
-			for (var y = 2; y < this.height - 2; y++) {
-				this.b.set(x, y,
-						(
-						  this.a.get(x - 2, y)
-						+ this.a.get(x + 2, y)
-						+ this.a.get(x, y - 2)
-						+ this.a.get(x, y + 2)
-						+ this.a.get(x - 1, y)
-						+ this.a.get(x + 1, y)
-						+ this.a.get(x, y - 1)
-						+ this.a.get(x, y + 1)
-						+ this.a.get(x - 1, y - 1)
-						+ this.a.get(x + 1, y + 1)
-						+ this.a.get(x + 1, y - 1)
-						+ this.a.get(x - 1, y + 1)
-						) / 12 * 2  - this.b.get(x, y));
-				this.b.set(x, y, this.b.get(x, y) - this.b.get(x, y) * damping);
-			}
-		}
-	},
-	
-	render: function() {
-
-		for (var x = 2; x < this.width - 2; x++) {
-			for (var y = 2; y < this.height - 2; y++) {
-			
-				var color = this.b.get(x, y);
-
-				var progress = color / 256;
-				var rMin = 0, rMax = 255, 
-					gMin = 0, gMax = 255, 
-					bMin = 0, bMax = 255;
-
-				var rDelta = (rMax - rMin) / 2;
-				var rValue = Math.round(rMin + rDelta + rDelta * progress);
-				var gDelta = (gMax - gMin) / 2;
-				var gValue = Math.round(gMin + gDelta + gDelta * progress);
-				var bDelta = (bMax - bMin) / 2;
-				var bValue = Math.round(bMin + bDelta + bDelta * progress);
-				this.ctx.fillStyle = "rgb("+rValue+", "+gValue+", "+bValue+")";
-				this.ctx.fillRect(this.xPosition + x * this.pixelWidth, 
-									this.yPosition + y * this.pixelHeight,  
-									this.pixelWidth, 
-									this.pixelHeight);
-			}
-		}		
-	},
-	
-	swapBuffers: function() {
-		var c = this.b;
-		this.b = this.a;
-		this.a = c;
-	},
-	
-	clear: function() {
-		this.ctx.clearRect(0, 0, this.width, this.height);
-	},
-	
-	addRipple: function(time) {
-	
-		var ripplePoints = new Array();
-		for (var i = 0; i < this.ripplePoints.length; i++) {
-			if (this.ripplePoints[i].start < time) {
-				this.a.sphere(
-					Math.floor(this.width * this.ripplePoints[i].x), 
-					Math.floor(this.height * this.ripplePoints[i].y), 
-					Math.floor(this.width * 0.1), 256);
-			} else {
-				ripplePoints.push(this.ripplePoints[i]);
-			}
-		}
-		this.ripplePoints = ripplePoints;
-	
-	},
-	
-	run: function(time) {
-		this.clear();
-		this.addRipple(time);
-		this.processBuffers();
-		this.render();
-		this.swapBuffers();
-		this.frame++;
-	}
-}
-
-function Buffer(newWidth, newHeight) {
-	this.width = newWidth;
-	this.height = newHeight;
-	this.data = new Array();
-
-	for (var x = 0; x < this.width; x++) {
-		this.data[x] = new Array();
-		for (var y = 0; y < this.height; y++) {
-			this.data[x][y] = 0;
-		}
-	}
-
-	this.sphere = function(sphereX, sphereY, radius, depth) {
-		for (var x = 0; x < this.width; x++) {
-			for (var y = 0; y < this.height; y++) {
-				var d = this.distance(sphereX, sphereY, x, y);
-				if (d < radius) {
-					this.data[x][y] = this.data[x][y] + depth * ((radius - Math.sqrt(d)) / radius);
-					//this.data[x][y] = this.data[x][y] + Math.round((1 - d / radius) * 256);
-					if (this.data[x][y] > 256) this.data[x][y] = 256;
-				}
-			}
-		}
-	}
-	
-	this.ripple = function(sphereX, sphereY, radius) {
-		for (var x = 0; x < this.width; x++) {
-			for (var y = 0; y < this.height; y++) {
-				var d = this.distance(sphereX, sphereY, x, y);
-				if (d < radius) {
-					this.set(x, y, Math.sin((d / radius) * Math.PI) * 70);//Math.round((1 - d / radius) * 256);
-				}
-			}
-		}
-	}
-
-	this.hardRipple = function(sphereX, sphereY, radius) {
-		for (var x = 0; x < this.width; x++) {
-			for (var y = 0; y < this.height; y++) {
-				var d = this.distance(sphereX, sphereY, x, y);
-				if (d < radius && d > radius * 0.8) {
-					this.set(x, y, 256);//Math.round((1 - d / radius) * 256);
-				}
-			}
-		}
-	}
-	
-	this.distance = function(x1, y1, x2, y2) {
-		return Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2));
-	}
-	
-	this.get = function(x, y) {
-		if (typeof(this.data[x]) != "undefined" && typeof(this.data[x][y]) != "undefined") {
-			return this.data[x][y];
-		} else {
-			return 0;
-		}
-	}
-	
-	this.set = function(x, y, value) {
-		if (typeof(this.data[x]) != "undefined" && typeof(this.data[x][y]) != "undefined") {
-			this.data[x][y] = Math.round(value);
-		}
-	}
-}
-
-function run() {
-  ripples.init();
-  var now = new Date();
-  var start = window.mozAnimationStartTime;
-  function step(timestamp) {
-    progress = timestamp - start;
-    ripples.run(progress);
-    var time = new Date();
-    var diff = time.getTime() - now.getTime();
-    if (diff < 5000) { // five seconds
-      window.mozRequestAnimationFrame(step);
-    } else {
-      var evt = document.createEvent("CustomEvent");
-      evt.initCustomEvent("test", true, false, { testName: "ripples", frames: ripples.frames, msec: diff });
-      window.dispatchEvent(evt);
-    }
-  }
-  window.mozRequestAnimationFrame(step);
-}
-
-</script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-<style>
-</style>
-<meta charset="utf-8">
-</head>
-<body onload="setTimeout(run, 1000);">
-<div id="anchor"><canvas id="ripples" width="1200" height="700"></canvas></div>
-</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/scroll_test.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/scroll_test.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/scroll_test.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/scroll_test.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,1961 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-      #text { position: absolute; left: 1em; bottom: 1em; }
-    </style>
-  </head>
-<body>
-<div id="content" style="width:100%;">
-  Alice was beginning to get very tired of sitting by her sister
-on the bank, and of having nothing to do:  once or twice she had
-peeped into the book her sister was reading, but it had no
-pictures or conversations in it, `and what is the use of a book,'
-thought Alice `without pictures or conversation?'
-
-  So she was considering in her own mind (as well as she could,
-for the hot day made her feel very sleepy and stupid), whether
-the pleasure of making a daisy-chain would be worth the trouble
-of getting up and picking the daisies, when suddenly a White
-Rabbit with pink eyes ran close by her.
-
-  There was nothing so VERY remarkable in that; nor did Alice
-think it so VERY much out of the way to hear the Rabbit say to
-itself, `Oh dear!  Oh dear!  I shall be late!'  (when she thought
-it over afterwards, it occurred to her that she ought to have
-wondered at this, but at the time it all seemed quite natural);
-but when the Rabbit actually TOOK A WATCH OUT OF ITS WAISTCOAT-
-POCKET, and looked at it, and then hurried on, Alice started to
-her feet, for it flashed across her mind that she had never
-before seen a rabbit with either a waistcoat-pocket, or a watch to
-take out of it, and burning with curiosity, she ran across the
-field after it, and fortunately was just in time to see it pop
-down a large rabbit-hole under the hedge.
-
-  In another moment down went Alice after it, never once
-considering how in the world she was to get out again.
-
-  The rabbit-hole went straight on like a tunnel for some way,
-and then dipped suddenly down, so suddenly that Alice had not a
-moment to think about stopping herself before she found herself
-falling down a very deep well.
-
-  Either the well was very deep, or she fell very slowly, for she
-had plenty of time as she went down to look about her and to
-wonder what was going to happen next.  First, she tried to look
-down and make out what she was coming to, but it was too dark to
-see anything; then she looked at the sides of the well, and
-noticed that they were filled with cupboards and book-shelves;
-here and there she saw maps and pictures hung upon pegs.  She
-took down a jar from one of the shelves as she passed; it was
-labelled `ORANGE MARMALADE', but to her great disappointment it
-was empty:  she did not like to drop the jar for fear of killing
-somebody, so managed to put it into one of the cupboards as she
-fell past it.
-
-  `Well!' thought Alice to herself, `after such a fall as this, I
-shall think nothing of tumbling down stairs!  How brave they'll
-all think me at home!  Why, I wouldn't say anything about it,
-even if I fell off the top of the house!' (Which was very likely
-true.)
-
-  Down, down, down.  Would the fall NEVER come to an end!  `I
-wonder how many miles I've fallen by this time?' she said aloud.
-`I must be getting somewhere near the centre of the earth.  Let
-me see:  that would be four thousand miles down, I think--' (for,
-you see, Alice had learnt several things of this sort in her
-lessons in the schoolroom, and though this was not a VERY good
-opportunity for showing off her knowledge, as there was no one to
-listen to her, still it was good practice to say it over) `--yes,
-that's about the right distance--but then I wonder what Latitude
-or Longitude I've got to?'  (Alice had no idea what Latitude was,
-or Longitude either, but thought they were nice grand words to
-say.)
-
-  Presently she began again.  `I wonder if I shall fall right
-THROUGH the earth!  How funny it'll seem to come out among the
-people that walk with their heads downward!  The Antipathies, I
-think--' (she was rather glad there WAS no one listening, this
-time, as it didn't sound at all the right word) `--but I shall
-have to ask them what the name of the country is, you know.
-Please, Ma'am, is this New Zealand or Australia?' (and she tried
-to curtsey as she spoke--fancy CURTSEYING as you're falling
-through the air!  Do you think you could manage it?)  `And what
-an ignorant little girl she'll think me for asking!  No, it'll
-never do to ask:  perhaps I shall see it written up somewhere.'
-
-  Down, down, down.  There was nothing else to do, so Alice soon
-began talking again.  `Dinah'll miss me very much to-night, I
-should think!'  (Dinah was the cat.)  `I hope they'll remember
-her saucer of milk at tea-time.  Dinah my dear!  I wish you were
-down here with me!  There are no mice in the air, I'm afraid, but
-you might catch a bat, and that's very like a mouse, you know.
-But do cats eat bats, I wonder?'  And here Alice began to get
-rather sleepy, and went on saying to herself, in a dreamy sort of
-way, `Do cats eat bats?  Do cats eat bats?' and sometimes, `Do
-bats eat cats?' for, you see, as she couldn't answer either
-question, it didn't much matter which way she put it.  She felt
-that she was dozing off, and had just begun to dream that she
-was walking hand in hand with Dinah, and saying to her very
-earnestly, `Now, Dinah, tell me the truth:  did you ever eat a
-bat?' when suddenly, thump! thump! down she came upon a heap of
-sticks and dry leaves, and the fall was over.
-
-  Alice was not a bit hurt, and she jumped up on to her feet in a
-moment:  she looked up, but it was all dark overhead; before her
-was another long passage, and the White Rabbit was still in
-sight, hurrying down it.  There was not a moment to be lost:
-away went Alice like the wind, and was just in time to hear it
-say, as it turned a corner, `Oh my ears and whiskers, how late
-it's getting!'  She was close behind it when she turned the
-corner, but the Rabbit was no longer to be seen:  she found
-herself in a long, low hall, which was lit up by a row of lamps
-hanging from the roof.
-
-  There were doors all round the hall, but they were all locked;
-and when Alice had been all the way down one side and up the
-other, trying every door, she walked sadly down the middle,
-wondering how she was ever to get out again.
-
-  Suddenly she came upon a little three-legged table, all made of
-solid glass; there was nothing on it except a tiny golden key,
-and Alice's first thought was that it might belong to one of the
-doors of the hall; but, alas! either the locks were too large, or
-the key was too small, but at any rate it would not open any of
-them.  However, on the second time round, she came upon a low
-curtain she had not noticed before, and behind it was a little
-door about fifteen inches high:  she tried the little golden key
-in the lock, and to her great delight it fitted!
-
-  Alice opened the door and found that it led into a small
-passage, not much larger than a rat-hole:  she knelt down and
-looked along the passage into the loveliest garden you ever saw.
-How she longed to get out of that dark hall, and wander about
-among those beds of bright flowers and those cool fountains, but
-she could not even get her head though the doorway; `and even if
-my head would go through,' thought poor Alice, `it would be of
-very little use without my shoulders.  Oh, how I wish
-I could shut up like a telescope!  I think I could, if I only
-know how to begin.'  For, you see, so many out-of-the-way things
-had happened lately, that Alice had begun to think that very few
-things indeed were really impossible.
-
-  There seemed to be no use in waiting by the little door, so she
-went back to the table, half hoping she might find another key on
-it, or at any rate a book of rules for shutting people up like
-telescopes:  this time she found a little bottle on it, (`which
-certainly was not here before,' said Alice,) and round the neck
-of the bottle was a paper label, with the words `DRINK ME'
-beautifully printed on it in large letters.
-
-  It was all very well to say `Drink me,' but the wise little
-Alice was not going to do THAT in a hurry.  `No, I'll look
-first,' she said, `and see whether it's marked "poison" or not';
-for she had read several nice little histories about children who
-had got burnt, and eaten up by wild beasts and other unpleasant
-things, all because they WOULD not remember the simple rules
-their friends had taught them:  such as, that a red-hot poker
-will burn you if you hold it too long; and that if you cut your
-finger VERY deeply with a knife, it usually bleeds; and she had
-never forgotten that, if you drink much from a bottle marked
-`poison,' it is almost certain to disagree with you, sooner or
-later.
-
-  However, this bottle was NOT marked `poison,' so Alice ventured
-to taste it, and finding it very nice, (it had, in fact, a sort
-of mixed flavour of cherry-tart, custard, pine-apple, roast
-turkey, toffee, and hot buttered toast,) she very soon finished
-it off.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-  `What a curious feeling!' said Alice; `I must be shutting up
-like a telescope.'
-
-  And so it was indeed:  she was now only ten inches high, and
-her face brightened up at the thought that she was now the right
-size for going through the little door into that lovely garden.
-First, however, she waited for a few minutes to see if she was
-going to shrink any further:  she felt a little nervous about
-this; `for it might end, you know,' said Alice to herself, `in my
-going out altogether, like a candle.  I wonder what I should be
-like then?'  And she tried to fancy what the flame of a candle is
-like after the candle is blown out, for she could not remember
-ever having seen such a thing.
-
-  After a while, finding that nothing more happened, she decided
-on going into the garden at once; but, alas for poor Alice!
-when she got to the door, she found she had forgotten the
-little golden key, and when she went back to the table for it,
-she found she could not possibly reach it:  she could see it
-quite plainly through the glass, and she tried her best to climb
-up one of the legs of the table, but it was too slippery;
-and when she had tired herself out with trying,
-the poor little thing sat down and cried.
-
-  `Come, there's no use in crying like that!' said Alice to
-herself, rather sharply; `I advise you to leave off this minute!'
-She generally gave herself very good advice, (though she very
-seldom followed it), and sometimes she scolded herself so
-severely as to bring tears into her eyes; and once she remembered
-trying to box her own ears for having cheated herself in a game
-of croquet she was playing against herself, for this curious
-child was very fond of pretending to be two people.  `But it's no
-use now,' thought poor Alice, `to pretend to be two people!  Why,
-there's hardly enough of me left to make ONE respectable
-person!'
-
-  Soon her eye fell on a little glass box that was lying under
-the table:  she opened it, and found in it a very small cake, on
-which the words `EAT ME' were beautifully marked in currants.
-`Well, I'll eat it,' said Alice, `and if it makes me grow larger,
-I can reach the key; and if it makes me grow smaller, I can creep
-under the door; so either way I'll get into the garden, and I
-don't care which happens!'
-
-  She ate a little bit, and said anxiously to herself, `Which
-way?  Which way?', holding her hand on the top of her head to
-feel which way it was growing, and she was quite surprised to
-find that she remained the same size:  to be sure, this generally
-happens when one eats cake, but Alice had got so much into the
-way of expecting nothing but out-of-the-way things to happen,
-that it seemed quite dull and stupid for life to go on in the
-common way.
-
-  So she set to work, and very soon finished off the cake.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-
-
-
-                           CHAPTER II
-
-                        The Pool of Tears
-
-
-  `Curiouser and curiouser!' cried Alice (she was so much
-surprised, that for the moment she quite forgot how to speak good
-English); `now I'm opening out like the largest telescope that
-ever was!  Good-bye, feet!' (for when she looked down at her
-feet, they seemed to be almost out of sight, they were getting so
-far off).  `Oh, my poor little feet, I wonder who will put on
-your shoes and stockings for you now, dears?  I'm sure _I_ shan't
-be able!  I shall be a great deal too far off to trouble myself
-about you:  you must manage the best way you can; --but I must be
-kind to them,' thought Alice, `or perhaps they won't walk the
-way I want to go!  Let me see:  I'll give them a new pair of
-boots every Christmas.'
-
-  And she went on planning to herself how she would manage it.
-`They must go by the carrier,' she thought; `and how funny it'll
-seem, sending presents to one's own feet!  And how odd the
-directions will look!
-
-            ALICE'S RIGHT FOOT, ESQ.
-                HEARTHRUG,
-                    NEAR THE FENDER,
-                        (WITH ALICE'S LOVE).
-
-Oh dear, what nonsense I'm talking!'
-
-  Just then her head struck against the roof of the hall:  in
-fact she was now more than nine feet high, and she at once took
-up the little golden key and hurried off to the garden door.
-
-  Poor Alice!  It was as much as she could do, lying down on one
-side, to look through into the garden with one eye; but to get
-through was more hopeless than ever:  she sat down and began to
-cry again.
-
-  `You ought to be ashamed of yourself,' said Alice, `a great
-girl like you,' (she might well say this), `to go on crying in
-this way!  Stop this moment, I tell you!'  But she went on all
-the same, shedding gallons of tears, until there was a large pool
-all round her, about four inches deep and reaching half down the
-hall.
-
-  After a time she heard a little pattering of feet in the
-distance, and she hastily dried her eyes to see what was coming.
-It was the White Rabbit returning, splendidly dressed, with a
-pair of white kid gloves in one hand and a large fan in the
-other:  he came trotting along in a great hurry, muttering to
-himself as he came, `Oh! the Duchess, the Duchess! Oh! won't she
-be savage if I've kept her waiting!'  Alice felt so desperate
-that she was ready to ask help of any one; so, when the Rabbit
-came near her, she began, in a low, timid voice, `If you please,
-sir--'  The Rabbit started violently, dropped the white kid
-gloves and the fan, and skurried away into the darkness as hard
-as he could go.
-
-  Alice took up the fan and gloves, and, as the hall was very
-hot, she kept fanning herself all the time she went on talking:
-`Dear, dear!  How queer everything is to-day!  And yesterday
-things went on just as usual.  I wonder if I've been changed in
-the night?  Let me think:  was I the same when I got up this
-morning?  I almost think I can remember feeling a little
-different.  But if I'm not the same, the next question is, Who in
-the world am I?  Ah, THAT'S the great puzzle!'  And she began
-thinking over all the children she knew that were of the same age
-as herself, to see if she could have been changed for any of
-them.
-
-  `I'm sure I'm not Ada,' she said, `for her hair goes in such
-long ringlets, and mine doesn't go in ringlets at all; and I'm
-sure I can't be Mabel, for I know all sorts of things, and she,
-oh! she knows such a very little!  Besides, SHE'S she, and I'm I,
-and--oh dear, how puzzling it all is!  I'll try if I know all the
-things I used to know.  Let me see:  four times five is twelve,
-and four times six is thirteen, and four times seven is--oh dear!
-I shall never get to twenty at that rate!  However, the
-Multiplication Table doesn't signify:  let's try Geography.
-London is the capital of Paris, and Paris is the capital of Rome,
-and Rome--no, THAT'S all wrong, I'm certain!  I must have been
-changed for Mabel!  I'll try and say "How doth the little--"'
-and she crossed her hands on her lap as if she were saying lessons,
-and began to repeat it, but her voice sounded hoarse and
-strange, and the words did not come the same as they used to do:--
-
-            `How doth the little crocodile
-              Improve his shining tail,
-            And pour the waters of the Nile
-              On every golden scale!
-
-            `How cheerfully he seems to grin,
-              How neatly spread his claws,
-            And welcome little fishes in
-              With gently smiling jaws!'
-
-  `I'm sure those are not the right words,' said poor Alice, and
-her eyes filled with tears again as she went on, `I must be Mabel
-after all, and I shall have to go and live in that poky little
-house, and have next to no toys to play with, and oh! ever so
-many lessons to learn!  No, I've made up my mind about it; if I'm
-Mabel, I'll stay down here!  It'll be no use their putting their
-heads down and saying "Come up again, dear!"  I shall only look
-up and say "Who am I then?  Tell me that first, and then, if I
-like being that person, I'll come up:  if not, I'll stay down
-here till I'm somebody else"--but, oh dear!' cried Alice, with a
-sudden burst of tears, `I do wish they WOULD put their heads
-down!  I am so VERY tired of being all alone here!'
-
-  As she said this she looked down at her hands, and was
-surprised to see that she had put on one of the Rabbit's little
-white kid gloves while she was talking.  `How CAN I have done
-that?' she thought.  `I must be growing small again.'  She got up
-and went to the table to measure herself by it, and found that,
-as nearly as she could guess, she was now about two feet high,
-and was going on shrinking rapidly:  she soon found out that the
-cause of this was the fan she was holding, and she dropped it
-hastily, just in time to avoid shrinking away altogether.
-
-`That WAS a narrow escape!' said Alice, a good deal frightened at
-the sudden change, but very glad to find herself still in
-existence; `and now for the garden!' and she ran with all speed
-back to the little door:  but, alas! the little door was shut
-again, and the little golden key was lying on the glass table as
-before, `and things are worse than ever,' thought the poor child,
-`for I never was so small as this before, never!  And I declare
-it's too bad, that it is!'
-
-  As she said these words her foot slipped, and in another
-moment, splash! she was up to her chin in salt water.  Her first
-idea was that she had somehow fallen into the sea, `and in that
-case I can go back by railway,' she said to herself.  (Alice had
-been to the seaside once in her life, and had come to the general
-conclusion, that wherever you go to on the English coast you find
-a number of bathing machines in the sea, some children digging in
-the sand with wooden spades, then a row of lodging houses, and
-behind them a railway station.)  However, she soon made out that
-she was in the pool of tears which she had wept when she was nine
-feet high.
-
-  `I wish I hadn't cried so much!' said Alice, as she swam about,
-trying to find her way out.  `I shall be punished for it now, I
-suppose, by being drowned in my own tears!  That WILL be a queer
-thing, to be sure!  However, everything is queer to-day.'
-
-  Just then she heard something splashing about in the pool a
-little way off, and she swam nearer to make out what it was:  at
-first she thought it must be a walrus or hippopotamus, but then
-she remembered how small she was now, and she soon made out that
-it was only a mouse that had slipped in like herself.
-
-  `Would it be of any use, now,' thought Alice, `to speak to this
-mouse?  Everything is so out-of-the-way down here, that I should
-think very likely it can talk:  at any rate, there's no harm in
-trying.'  So she began:  `O Mouse, do you know the way out of
-this pool?  I am very tired of swimming about here, O Mouse!'
-(Alice thought this must be the right way of speaking to a mouse:
-she had never done such a thing before, but she remembered having
-seen in her brother's Latin Grammar, `A mouse--of a mouse--to a
-mouse--a mouse--O mouse!'  The Mouse looked at her rather
-inquisitively, and seemed to her to wink with one of its little
-eyes, but it said nothing.
-
-  `Perhaps it doesn't understand English,' thought Alice; `I
-daresay it's a French mouse, come over with William the
-Conqueror.'  (For, with all her knowledge of history, Alice had
-no very clear notion how long ago anything had happened.)  So she
-began again:  `Ou est ma chatte?' which was the first sentence in
-her French lesson-book.  The Mouse gave a sudden leap out of the
-water, and seemed to quiver all over with fright.  `Oh, I beg
-your pardon!' cried Alice hastily, afraid that she had hurt the
-poor animal's feelings.  `I quite forgot you didn't like cats.'
-
-  `Not like cats!' cried the Mouse, in a shrill, passionate
-voice.  `Would YOU like cats if you were me?'
-
-  `Well, perhaps not,' said Alice in a soothing tone:  `don't be
-angry about it.  And yet I wish I could show you our cat Dinah:
-I think you'd take a fancy to cats if you could only see her.
-She is such a dear quiet thing,' Alice went on, half to herself,
-as she swam lazily about in the pool, `and she sits purring so
-nicely by the fire, licking her paws and washing her face--and
-she is such a nice soft thing to nurse--and she's such a capital
-one for catching mice--oh, I beg your pardon!' cried Alice again,
-for this time the Mouse was bristling all over, and she felt
-certain it must be really offended.  `We won't talk about her any
-more if you'd rather not.'
-
-  `We indeed!' cried the Mouse, who was trembling down to the end
-of his tail.  `As if I would talk on such a subject!  Our family
-always HATED cats:  nasty, low, vulgar things!  Don't let me hear
-the name again!'
-
-  `I won't indeed!' said Alice, in a great hurry to change the
-subject of conversation.  `Are you--are you fond--of--of dogs?'
-The Mouse did not answer, so Alice went on eagerly:  `There is
-such a nice little dog near our house I should like to show you!
-A little bright-eyed terrier, you know, with oh, such long curly
-brown hair!  And it'll fetch things when you throw them, and
-it'll sit up and beg for its dinner, and all sorts of things--I
-can't remember half of them--and it belongs to a farmer, you
-know, and he says it's so useful, it's worth a hundred pounds!
-He says it kills all the rats and--oh dear!' cried Alice in a
-sorrowful tone, `I'm afraid I've offended it again!'  For the
-Mouse was swimming away from her as hard as it could go, and
-making quite a commotion in the pool as it went.
-
-  So she called softly after it, `Mouse dear!  Do come back
-again, and we won't talk about cats or dogs either, if you don't
-like them!'  When the Mouse heard this, it turned round and swam
-slowly back to her:  its face was quite pale (with passion, Alice
-thought), and it said in a low trembling voice, `Let us get to
-the shore, and then I'll tell you my history, and you'll
-understand why it is I hate cats and dogs.'
-
-  It was high time to go, for the pool was getting quite crowded
-with the birds and animals that had fallen into it:  there were a
-Duck and a Dodo, a Lory and an Eaglet, and several other curious
-creatures.  Alice led the way, and the whole party swam to the
-shore.
-
-
-
-                           CHAPTER III
-
-                  A Caucus-Race and a Long Tale
-
-
-  They were indeed a queer-looking party that assembled on the
-bank--the birds with draggled feathers, the animals with their
-fur clinging close to them, and all dripping wet, cross, and
-uncomfortable.
-
-  The first question of course was, how to get dry again:  they
-had a consultation about this, and after a few minutes it seemed
-quite natural to Alice to find herself talking familiarly with
-them, as if she had known them all her life.  Indeed, she had
-quite a long argument with the Lory, who at last turned sulky,
-and would only say, `I am older than you, and must know better';
-and this Alice would not allow without knowing how old it was,
-and, as the Lory positively refused to tell its age, there was no
-more to be said.
-
-  At last the Mouse, who seemed to be a person of authority among
-them, called out, `Sit down, all of you, and listen to me!  I'LL
-soon make you dry enough!'  They all sat down at once, in a large
-ring, with the Mouse in the middle.  Alice kept her eyes
-anxiously fixed on it, for she felt sure she would catch a bad
-cold if she did not get dry very soon.
-
-  `Ahem!' said the Mouse with an important air, `are you all ready?
-This is the driest thing I know.  Silence all round, if you please!
-"William the Conqueror, whose cause was favoured by the pope, was
-soon submitted to by the English, who wanted leaders, and had been
-of late much accustomed to usurpation and conquest.  Edwin and
-Morcar, the earls of Mercia and Northumbria--"'
-
-  `Ugh!' said the Lory, with a shiver.
-
-  `I beg your pardon!' said the Mouse, frowning, but very
-politely:  `Did you speak?'
-
-  `Not I!' said the Lory hastily.
-
-  `I thought you did,' said the Mouse.  `--I proceed.  "Edwin and
-Morcar, the earls of Mercia and Northumbria, declared for him:
-and even Stigand, the patriotic archbishop of Canterbury, found
-it advisable--"'
-
-  `Found WHAT?' said the Duck.
-
-  `Found IT,' the Mouse replied rather crossly:  `of course you
-know what "it" means.'
-
-  `I know what "it" means well enough, when I find a thing,' said
-the Duck:  `it's generally a frog or a worm.  The question is,
-what did the archbishop find?'
-
-  The Mouse did not notice this question, but hurriedly went on,
-`"--found it advisable to go with Edgar Atheling to meet William
-and offer him the crown.  William's conduct at first was
-moderate.  But the insolence of his Normans--"  How are you
-getting on now, my dear?' it continued, turning to Alice as it
-spoke.
-
-  `As wet as ever,' said Alice in a melancholy tone:  `it doesn't
-seem to dry me at all.'
-
-  `In that case,' said the Dodo solemnly, rising to its feet, `I
-move that the meeting adjourn, for the immediate adoption of more
-energetic remedies--'
-
-  `Speak English!' said the Eaglet.  `I don't know the meaning of
-half those long words, and, what's more, I don't believe you do
-either!'  And the Eaglet bent down its head to hide a smile:
-some of the other birds tittered audibly.
-
-  `What I was going to say,' said the Dodo in an offended tone,
-`was, that the best thing to get us dry would be a Caucus-race.'
-
-  `What IS a Caucus-race?' said Alice; not that she wanted much
-to know, but the Dodo had paused as if it thought that SOMEBODY
-ought to speak, and no one else seemed inclined to say anything.
-
-  `Why,' said the Dodo, `the best way to explain it is to do it.'
-(And, as you might like to try the thing yourself, some winter
-day, I will tell you how the Dodo managed it.)
-
-  First it marked out a race-course, in a sort of circle, (`the
-exact shape doesn't matter,' it said,) and then all the party
-were placed along the course, here and there.  There was no `One,
-two, three, and away,' but they began running when they liked,
-and left off when they liked, so that it was not easy to know
-when the race was over.  However, when they had been running half
-an hour or so, and were quite dry again, the Dodo suddenly called
-out `The race is over!' and they all crowded round it, panting,
-and asking, `But who has won?'
-
-  This question the Dodo could not answer without a great deal of
-thought, and it sat for a long time with one finger pressed upon
-its forehead (the position in which you usually see Shakespeare,
-in the pictures of him), while the rest waited in silence.  At
-last the Dodo said, `EVERYBODY has won, and all must have
-prizes.'
-
-  `But who is to give the prizes?' quite a chorus of voices
-asked.
-
-  `Why, SHE, of course,' said the Dodo, pointing to Alice with
-one finger; and the whole party at once crowded round her,
-calling out in a confused way, `Prizes! Prizes!'
-
-  Alice had no idea what to do, and in despair she put her hand
-in her pocket, and pulled out a box of comfits, (luckily the salt
-water had not got into it), and handed them round as prizes.
-There was exactly one a-piece all round.
-
-  `But she must have a prize herself, you know,' said the Mouse.
-
-  `Of course,' the Dodo replied very gravely.  `What else have
-you got in your pocket?' he went on, turning to Alice.
-
-  `Only a thimble,' said Alice sadly.
-
-  `Hand it over here,' said the Dodo.
-
-  Then they all crowded round her once more, while the Dodo
-solemnly presented the thimble, saying `We beg your acceptance of
-this elegant thimble'; and, when it had finished this short
-speech, they all cheered.
-
-  Alice thought the whole thing very absurd, but they all looked
-so grave that she did not dare to laugh; and, as she could not
-think of anything to say, she simply bowed, and took the thimble,
-looking as solemn as she could.
-
-  The next thing was to eat the comfits:  this caused some noise
-and confusion, as the large birds complained that they could not
-taste theirs, and the small ones choked and had to be patted on
-the back.  However, it was over at last, and they sat down again
-in a ring, and begged the Mouse to tell them something more.
-
-  `You promised to tell me your history, you know,' said Alice,
-`and why it is you hate--C and D,' she added in a whisper, half
-afraid that it would be offended again.
-
-  `Mine is a long and a sad tale!' said the Mouse, turning to
-Alice, and sighing.
-
-  `It IS a long tail, certainly,' said Alice, looking down with
-wonder at the Mouse's tail; `but why do you call it sad?'  And
-she kept on puzzling about it while the Mouse was speaking, so
-that her idea of the tale was something like this:--
-
-                    `Fury said to a
-                   mouse, That he
-                 met in the
-               house,
-            "Let us
-              both go to
-                law:  I will
-                  prosecute
-                    YOU.  --Come,
-                       I'll take no
-                        denial; We
-                     must have a
-                 trial:  For
-              really this
-           morning I've
-          nothing
-         to do."
-           Said the
-             mouse to the
-               cur, "Such
-                 a trial,
-                   dear Sir,
-                         With
-                     no jury
-                  or judge,
-                would be
-              wasting
-             our
-              breath."
-               "I'll be
-                 judge, I'll
-                   be jury,"
-                         Said
-                    cunning
-                      old Fury:
-                     "I'll
-                      try the
-                         whole
-                          cause,
-                             and
-                        condemn
-                       you
-                      to
-                       death."'
-
-  Alice was beginning to get very tired of sitting by her sister
-on the bank, and of having nothing to do:  once or twice she had
-peeped into the book her sister was reading, but it had no
-pictures or conversations in it, `and what is the use of a book,'
-thought Alice `without pictures or conversation?'
-
-  So she was considering in her own mind (as well as she could,
-for the hot day made her feel very sleepy and stupid), whether
-the pleasure of making a daisy-chain would be worth the trouble
-of getting up and picking the daisies, when suddenly a White
-Rabbit with pink eyes ran close by her.
-
-  There was nothing so VERY remarkable in that; nor did Alice
-think it so VERY much out of the way to hear the Rabbit say to
-itself, `Oh dear!  Oh dear!  I shall be late!'  (when she thought
-it over afterwards, it occurred to her that she ought to have
-wondered at this, but at the time it all seemed quite natural);
-but when the Rabbit actually TOOK A WATCH OUT OF ITS WAISTCOAT-
-POCKET, and looked at it, and then hurried on, Alice started to
-her feet, for it flashed across her mind that she had never
-before seen a rabbit with either a waistcoat-pocket, or a watch to
-take out of it, and burning with curiosity, she ran across the
-field after it, and fortunately was just in time to see it pop
-down a large rabbit-hole under the hedge.
-
-  In another moment down went Alice after it, never once
-considering how in the world she was to get out again.
-
-  The rabbit-hole went straight on like a tunnel for some way,
-and then dipped suddenly down, so suddenly that Alice had not a
-moment to think about stopping herself before she found herself
-falling down a very deep well.
-
-  Either the well was very deep, or she fell very slowly, for she
-had plenty of time as she went down to look about her and to
-wonder what was going to happen next.  First, she tried to look
-down and make out what she was coming to, but it was too dark to
-see anything; then she looked at the sides of the well, and
-noticed that they were filled with cupboards and book-shelves;
-here and there she saw maps and pictures hung upon pegs.  She
-took down a jar from one of the shelves as she passed; it was
-labelled `ORANGE MARMALADE', but to her great disappointment it
-was empty:  she did not like to drop the jar for fear of killing
-somebody, so managed to put it into one of the cupboards as she
-fell past it.
-
-  `Well!' thought Alice to herself, `after such a fall as this, I
-shall think nothing of tumbling down stairs!  How brave they'll
-all think me at home!  Why, I wouldn't say anything about it,
-even if I fell off the top of the house!' (Which was very likely
-true.)
-
-  Down, down, down.  Would the fall NEVER come to an end!  `I
-wonder how many miles I've fallen by this time?' she said aloud.
-`I must be getting somewhere near the centre of the earth.  Let
-me see:  that would be four thousand miles down, I think--' (for,
-you see, Alice had learnt several things of this sort in her
-lessons in the schoolroom, and though this was not a VERY good
-opportunity for showing off her knowledge, as there was no one to
-listen to her, still it was good practice to say it over) `--yes,
-that's about the right distance--but then I wonder what Latitude
-or Longitude I've got to?'  (Alice had no idea what Latitude was,
-or Longitude either, but thought they were nice grand words to
-say.)
-
-  Presently she began again.  `I wonder if I shall fall right
-THROUGH the earth!  How funny it'll seem to come out among the
-people that walk with their heads downward!  The Antipathies, I
-think--' (she was rather glad there WAS no one listening, this
-time, as it didn't sound at all the right word) `--but I shall
-have to ask them what the name of the country is, you know.
-Please, Ma'am, is this New Zealand or Australia?' (and she tried
-to curtsey as she spoke--fancy CURTSEYING as you're falling
-through the air!  Do you think you could manage it?)  `And what
-an ignorant little girl she'll think me for asking!  No, it'll
-never do to ask:  perhaps I shall see it written up somewhere.'
-
-  Down, down, down.  There was nothing else to do, so Alice soon
-began talking again.  `Dinah'll miss me very much to-night, I
-should think!'  (Dinah was the cat.)  `I hope they'll remember
-her saucer of milk at tea-time.  Dinah my dear!  I wish you were
-down here with me!  There are no mice in the air, I'm afraid, but
-you might catch a bat, and that's very like a mouse, you know.
-But do cats eat bats, I wonder?'  And here Alice began to get
-rather sleepy, and went on saying to herself, in a dreamy sort of
-way, `Do cats eat bats?  Do cats eat bats?' and sometimes, `Do
-bats eat cats?' for, you see, as she couldn't answer either
-question, it didn't much matter which way she put it.  She felt
-that she was dozing off, and had just begun to dream that she
-was walking hand in hand with Dinah, and saying to her very
-earnestly, `Now, Dinah, tell me the truth:  did you ever eat a
-bat?' when suddenly, thump! thump! down she came upon a heap of
-sticks and dry leaves, and the fall was over.
-
-  Alice was not a bit hurt, and she jumped up on to her feet in a
-moment:  she looked up, but it was all dark overhead; before her
-was another long passage, and the White Rabbit was still in
-sight, hurrying down it.  There was not a moment to be lost:
-away went Alice like the wind, and was just in time to hear it
-say, as it turned a corner, `Oh my ears and whiskers, how late
-it's getting!'  She was close behind it when she turned the
-corner, but the Rabbit was no longer to be seen:  she found
-herself in a long, low hall, which was lit up by a row of lamps
-hanging from the roof.
-
-  There were doors all round the hall, but they were all locked;
-and when Alice had been all the way down one side and up the
-other, trying every door, she walked sadly down the middle,
-wondering how she was ever to get out again.
-
-  Suddenly she came upon a little three-legged table, all made of
-solid glass; there was nothing on it except a tiny golden key,
-and Alice's first thought was that it might belong to one of the
-doors of the hall; but, alas! either the locks were too large, or
-the key was too small, but at any rate it would not open any of
-them.  However, on the second time round, she came upon a low
-curtain she had not noticed before, and behind it was a little
-door about fifteen inches high:  she tried the little golden key
-in the lock, and to her great delight it fitted!
-
-  Alice opened the door and found that it led into a small
-passage, not much larger than a rat-hole:  she knelt down and
-looked along the passage into the loveliest garden you ever saw.
-How she longed to get out of that dark hall, and wander about
-among those beds of bright flowers and those cool fountains, but
-she could not even get her head though the doorway; `and even if
-my head would go through,' thought poor Alice, `it would be of
-very little use without my shoulders.  Oh, how I wish
-I could shut up like a telescope!  I think I could, if I only
-know how to begin.'  For, you see, so many out-of-the-way things
-had happened lately, that Alice had begun to think that very few
-things indeed were really impossible.
-
-  There seemed to be no use in waiting by the little door, so she
-went back to the table, half hoping she might find another key on
-it, or at any rate a book of rules for shutting people up like
-telescopes:  this time she found a little bottle on it, (`which
-certainly was not here before,' said Alice,) and round the neck
-of the bottle was a paper label, with the words `DRINK ME'
-beautifully printed on it in large letters.
-
-  It was all very well to say `Drink me,' but the wise little
-Alice was not going to do THAT in a hurry.  `No, I'll look
-first,' she said, `and see whether it's marked "poison" or not';
-for she had read several nice little histories about children who
-had got burnt, and eaten up by wild beasts and other unpleasant
-things, all because they WOULD not remember the simple rules
-their friends had taught them:  such as, that a red-hot poker
-will burn you if you hold it too long; and that if you cut your
-finger VERY deeply with a knife, it usually bleeds; and she had
-never forgotten that, if you drink much from a bottle marked
-`poison,' it is almost certain to disagree with you, sooner or
-later.
-
-  However, this bottle was NOT marked `poison,' so Alice ventured
-to taste it, and finding it very nice, (it had, in fact, a sort
-of mixed flavour of cherry-tart, custard, pine-apple, roast
-turkey, toffee, and hot buttered toast,) she very soon finished
-it off.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-  `What a curious feeling!' said Alice; `I must be shutting up
-like a telescope.'
-
-  And so it was indeed:  she was now only ten inches high, and
-her face brightened up at the thought that she was now the right
-size for going through the little door into that lovely garden.
-First, however, she waited for a few minutes to see if she was
-going to shrink any further:  she felt a little nervous about
-this; `for it might end, you know,' said Alice to herself, `in my
-going out altogether, like a candle.  I wonder what I should be
-like then?'  And she tried to fancy what the flame of a candle is
-like after the candle is blown out, for she could not remember
-ever having seen such a thing.
-
-  After a while, finding that nothing more happened, she decided
-on going into the garden at once; but, alas for poor Alice!
-when she got to the door, she found she had forgotten the
-little golden key, and when she went back to the table for it,
-she found she could not possibly reach it:  she could see it
-quite plainly through the glass, and she tried her best to climb
-up one of the legs of the table, but it was too slippery;
-and when she had tired herself out with trying,
-the poor little thing sat down and cried.
-
-  `Come, there's no use in crying like that!' said Alice to
-herself, rather sharply; `I advise you to leave off this minute!'
-She generally gave herself very good advice, (though she very
-seldom followed it), and sometimes she scolded herself so
-severely as to bring tears into her eyes; and once she remembered
-trying to box her own ears for having cheated herself in a game
-of croquet she was playing against herself, for this curious
-child was very fond of pretending to be two people.  `But it's no
-use now,' thought poor Alice, `to pretend to be two people!  Why,
-there's hardly enough of me left to make ONE respectable
-person!'
-
-  Soon her eye fell on a little glass box that was lying under
-the table:  she opened it, and found in it a very small cake, on
-which the words `EAT ME' were beautifully marked in currants.
-`Well, I'll eat it,' said Alice, `and if it makes me grow larger,
-I can reach the key; and if it makes me grow smaller, I can creep
-under the door; so either way I'll get into the garden, and I
-don't care which happens!'
-
-  She ate a little bit, and said anxiously to herself, `Which
-way?  Which way?', holding her hand on the top of her head to
-feel which way it was growing, and she was quite surprised to
-find that she remained the same size:  to be sure, this generally
-happens when one eats cake, but Alice had got so much into the
-way of expecting nothing but out-of-the-way things to happen,
-that it seemed quite dull and stupid for life to go on in the
-common way.
-
-  So she set to work, and very soon finished off the cake.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-
-
-
-                           CHAPTER II
-
-                        The Pool of Tears
-
-
-  `Curiouser and curiouser!' cried Alice (she was so much
-surprised, that for the moment she quite forgot how to speak good
-English); `now I'm opening out like the largest telescope that
-ever was!  Good-bye, feet!' (for when she looked down at her
-feet, they seemed to be almost out of sight, they were getting so
-far off).  `Oh, my poor little feet, I wonder who will put on
-your shoes and stockings for you now, dears?  I'm sure _I_ shan't
-be able!  I shall be a great deal too far off to trouble myself
-about you:  you must manage the best way you can; --but I must be
-kind to them,' thought Alice, `or perhaps they won't walk the
-way I want to go!  Let me see:  I'll give them a new pair of
-boots every Christmas.'
-
-  And she went on planning to herself how she would manage it.
-`They must go by the carrier,' she thought; `and how funny it'll
-seem, sending presents to one's own feet!  And how odd the
-directions will look!
-
-            ALICE'S RIGHT FOOT, ESQ.
-                HEARTHRUG,
-                    NEAR THE FENDER,
-                        (WITH ALICE'S LOVE).
-
-Oh dear, what nonsense I'm talking!'
-
-  Just then her head struck against the roof of the hall:  in
-fact she was now more than nine feet high, and she at once took
-up the little golden key and hurried off to the garden door.
-
-  Poor Alice!  It was as much as she could do, lying down on one
-side, to look through into the garden with one eye; but to get
-through was more hopeless than ever:  she sat down and began to
-cry again.
-
-  `You ought to be ashamed of yourself,' said Alice, `a great
-girl like you,' (she might well say this), `to go on crying in
-this way!  Stop this moment, I tell you!'  But she went on all
-the same, shedding gallons of tears, until there was a large pool
-all round her, about four inches deep and reaching half down the
-hall.
-
-  After a time she heard a little pattering of feet in the
-distance, and she hastily dried her eyes to see what was coming.
-It was the White Rabbit returning, splendidly dressed, with a
-pair of white kid gloves in one hand and a large fan in the
-other:  he came trotting along in a great hurry, muttering to
-himself as he came, `Oh! the Duchess, the Duchess! Oh! won't she
-be savage if I've kept her waiting!'  Alice felt so desperate
-that she was ready to ask help of any one; so, when the Rabbit
-came near her, she began, in a low, timid voice, `If you please,
-sir--'  The Rabbit started violently, dropped the white kid
-gloves and the fan, and skurried away into the darkness as hard
-as he could go.
-
-  Alice took up the fan and gloves, and, as the hall was very
-hot, she kept fanning herself all the time she went on talking:
-`Dear, dear!  How queer everything is to-day!  And yesterday
-things went on just as usual.  I wonder if I've been changed in
-the night?  Let me think:  was I the same when I got up this
-morning?  I almost think I can remember feeling a little
-different.  But if I'm not the same, the next question is, Who in
-the world am I?  Ah, THAT'S the great puzzle!'  And she began
-thinking over all the children she knew that were of the same age
-as herself, to see if she could have been changed for any of
-them.
-
-  `I'm sure I'm not Ada,' she said, `for her hair goes in such
-long ringlets, and mine doesn't go in ringlets at all; and I'm
-sure I can't be Mabel, for I know all sorts of things, and she,
-oh! she knows such a very little!  Besides, SHE'S she, and I'm I,
-and--oh dear, how puzzling it all is!  I'll try if I know all the
-things I used to know.  Let me see:  four times five is twelve,
-and four times six is thirteen, and four times seven is--oh dear!
-I shall never get to twenty at that rate!  However, the
-Multiplication Table doesn't signify:  let's try Geography.
-London is the capital of Paris, and Paris is the capital of Rome,
-and Rome--no, THAT'S all wrong, I'm certain!  I must have been
-changed for Mabel!  I'll try and say "How doth the little--"'
-and she crossed her hands on her lap as if she were saying lessons,
-and began to repeat it, but her voice sounded hoarse and
-strange, and the words did not come the same as they used to do:--
-
-            `How doth the little crocodile
-              Improve his shining tail,
-            And pour the waters of the Nile
-              On every golden scale!
-
-            `How cheerfully he seems to grin,
-              How neatly spread his claws,
-            And welcome little fishes in
-              With gently smiling jaws!'
-
-  `I'm sure those are not the right words,' said poor Alice, and
-her eyes filled with tears again as she went on, `I must be Mabel
-after all, and I shall have to go and live in that poky little
-house, and have next to no toys to play with, and oh! ever so
-many lessons to learn!  No, I've made up my mind about it; if I'm
-Mabel, I'll stay down here!  It'll be no use their putting their
-heads down and saying "Come up again, dear!"  I shall only look
-up and say "Who am I then?  Tell me that first, and then, if I
-like being that person, I'll come up:  if not, I'll stay down
-here till I'm somebody else"--but, oh dear!' cried Alice, with a
-sudden burst of tears, `I do wish they WOULD put their heads
-down!  I am so VERY tired of being all alone here!'
-
-  As she said this she looked down at her hands, and was
-surprised to see that she had put on one of the Rabbit's little
-white kid gloves while she was talking.  `How CAN I have done
-that?' she thought.  `I must be growing small again.'  She got up
-and went to the table to measure herself by it, and found that,
-as nearly as she could guess, she was now about two feet high,
-and was going on shrinking rapidly:  she soon found out that the
-cause of this was the fan she was holding, and she dropped it
-hastily, just in time to avoid shrinking away altogether.
-
-`That WAS a narrow escape!' said Alice, a good deal frightened at
-the sudden change, but very glad to find herself still in
-existence; `and now for the garden!' and she ran with all speed
-back to the little door:  but, alas! the little door was shut
-again, and the little golden key was lying on the glass table as
-before, `and things are worse than ever,' thought the poor child,
-`for I never was so small as this before, never!  And I declare
-it's too bad, that it is!'
-
-  As she said these words her foot slipped, and in another
-moment, splash! she was up to her chin in salt water.  Her first
-idea was that she had somehow fallen into the sea, `and in that
-case I can go back by railway,' she said to herself.  (Alice had
-been to the seaside once in her life, and had come to the general
-conclusion, that wherever you go to on the English coast you find
-a number of bathing machines in the sea, some children digging in
-the sand with wooden spades, then a row of lodging houses, and
-behind them a railway station.)  However, she soon made out that
-she was in the pool of tears which she had wept when she was nine
-feet high.
-
-  `I wish I hadn't cried so much!' said Alice, as she swam about,
-trying to find her way out.  `I shall be punished for it now, I
-suppose, by being drowned in my own tears!  That WILL be a queer
-thing, to be sure!  However, everything is queer to-day.'
-
-  Just then she heard something splashing about in the pool a
-little way off, and she swam nearer to make out what it was:  at
-first she thought it must be a walrus or hippopotamus, but then
-she remembered how small she was now, and she soon made out that
-it was only a mouse that had slipped in like herself.
-
-  `Would it be of any use, now,' thought Alice, `to speak to this
-mouse?  Everything is so out-of-the-way down here, that I should
-think very likely it can talk:  at any rate, there's no harm in
-trying.'  So she began:  `O Mouse, do you know the way out of
-this pool?  I am very tired of swimming about here, O Mouse!'
-(Alice thought this must be the right way of speaking to a mouse:
-she had never done such a thing before, but she remembered having
-seen in her brother's Latin Grammar, `A mouse--of a mouse--to a
-mouse--a mouse--O mouse!'  The Mouse looked at her rather
-inquisitively, and seemed to her to wink with one of its little
-eyes, but it said nothing.
-
-  `Perhaps it doesn't understand English,' thought Alice; `I
-daresay it's a French mouse, come over with William the
-Conqueror.'  (For, with all her knowledge of history, Alice had
-no very clear notion how long ago anything had happened.)  So she
-began again:  `Ou est ma chatte?' which was the first sentence in
-her French lesson-book.  The Mouse gave a sudden leap out of the
-water, and seemed to quiver all over with fright.  `Oh, I beg
-your pardon!' cried Alice hastily, afraid that she had hurt the
-poor animal's feelings.  `I quite forgot you didn't like cats.'
-
-  `Not like cats!' cried the Mouse, in a shrill, passionate
-voice.  `Would YOU like cats if you were me?'
-
-  `Well, perhaps not,' said Alice in a soothing tone:  `don't be
-angry about it.  And yet I wish I could show you our cat Dinah:
-I think you'd take a fancy to cats if you could only see her.
-She is such a dear quiet thing,' Alice went on, half to herself,
-as she swam lazily about in the pool, `and she sits purring so
-nicely by the fire, licking her paws and washing her face--and
-she is such a nice soft thing to nurse--and she's such a capital
-one for catching mice--oh, I beg your pardon!' cried Alice again,
-for this time the Mouse was bristling all over, and she felt
-certain it must be really offended.  `We won't talk about her any
-more if you'd rather not.'
-
-  `We indeed!' cried the Mouse, who was trembling down to the end
-of his tail.  `As if I would talk on such a subject!  Our family
-always HATED cats:  nasty, low, vulgar things!  Don't let me hear
-the name again!'
-
-  `I won't indeed!' said Alice, in a great hurry to change the
-subject of conversation.  `Are you--are you fond--of--of dogs?'
-The Mouse did not answer, so Alice went on eagerly:  `There is
-such a nice little dog near our house I should like to show you!
-A little bright-eyed terrier, you know, with oh, such long curly
-brown hair!  And it'll fetch things when you throw them, and
-it'll sit up and beg for its dinner, and all sorts of things--I
-can't remember half of them--and it belongs to a farmer, you
-know, and he says it's so useful, it's worth a hundred pounds!
-He says it kills all the rats and--oh dear!' cried Alice in a
-sorrowful tone, `I'm afraid I've offended it again!'  For the
-Mouse was swimming away from her as hard as it could go, and
-making quite a commotion in the pool as it went.
-
-  So she called softly after it, `Mouse dear!  Do come back
-again, and we won't talk about cats or dogs either, if you don't
-like them!'  When the Mouse heard this, it turned round and swam
-slowly back to her:  its face was quite pale (with passion, Alice
-thought), and it said in a low trembling voice, `Let us get to
-the shore, and then I'll tell you my history, and you'll
-understand why it is I hate cats and dogs.'
-
-  It was high time to go, for the pool was getting quite crowded
-with the birds and animals that had fallen into it:  there were a
-Duck and a Dodo, a Lory and an Eaglet, and several other curious
-creatures.  Alice led the way, and the whole party swam to the
-shore.
-
-
-
-                           CHAPTER III
-
-                  A Caucus-Race and a Long Tale
-
-
-  They were indeed a queer-looking party that assembled on the
-bank--the birds with draggled feathers, the animals with their
-fur clinging close to them, and all dripping wet, cross, and
-uncomfortable.
-
-  The first question of course was, how to get dry again:  they
-had a consultation about this, and after a few minutes it seemed
-quite natural to Alice to find herself talking familiarly with
-them, as if she had known them all her life.  Indeed, she had
-quite a long argument with the Lory, who at last turned sulky,
-and would only say, `I am older than you, and must know better';
-and this Alice would not allow without knowing how old it was,
-and, as the Lory positively refused to tell its age, there was no
-more to be said.
-
-  At last the Mouse, who seemed to be a person of authority among
-them, called out, `Sit down, all of you, and listen to me!  I'LL
-soon make you dry enough!'  They all sat down at once, in a large
-ring, with the Mouse in the middle.  Alice kept her eyes
-anxiously fixed on it, for she felt sure she would catch a bad
-cold if she did not get dry very soon.
-
-  `Ahem!' said the Mouse with an important air, `are you all ready?
-This is the driest thing I know.  Silence all round, if you please!
-"William the Conqueror, whose cause was favoured by the pope, was
-soon submitted to by the English, who wanted leaders, and had been
-of late much accustomed to usurpation and conquest.  Edwin and
-Morcar, the earls of Mercia and Northumbria--"'
-
-  `Ugh!' said the Lory, with a shiver.
-
-  `I beg your pardon!' said the Mouse, frowning, but very
-politely:  `Did you speak?'
-
-  `Not I!' said the Lory hastily.
-
-  `I thought you did,' said the Mouse.  `--I proceed.  "Edwin and
-Morcar, the earls of Mercia and Northumbria, declared for him:
-and even Stigand, the patriotic archbishop of Canterbury, found
-it advisable--"'
-
-  `Found WHAT?' said the Duck.
-
-  `Found IT,' the Mouse replied rather crossly:  `of course you
-know what "it" means.'
-
-  `I know what "it" means well enough, when I find a thing,' said
-the Duck:  `it's generally a frog or a worm.  The question is,
-what did the archbishop find?'
-
-  The Mouse did not notice this question, but hurriedly went on,
-`"--found it advisable to go with Edgar Atheling to meet William
-and offer him the crown.  William's conduct at first was
-moderate.  But the insolence of his Normans--"  How are you
-getting on now, my dear?' it continued, turning to Alice as it
-spoke.
-
-  `As wet as ever,' said Alice in a melancholy tone:  `it doesn't
-seem to dry me at all.'
-
-  `In that case,' said the Dodo solemnly, rising to its feet, `I
-move that the meeting adjourn, for the immediate adoption of more
-energetic remedies--'
-
-  `Speak English!' said the Eaglet.  `I don't know the meaning of
-half those long words, and, what's more, I don't believe you do
-either!'  And the Eaglet bent down its head to hide a smile:
-some of the other birds tittered audibly.
-
-  `What I was going to say,' said the Dodo in an offended tone,
-`was, that the best thing to get us dry would be a Caucus-race.'
-
-  `What IS a Caucus-race?' said Alice; not that she wanted much
-to know, but the Dodo had paused as if it thought that SOMEBODY
-ought to speak, and no one else seemed inclined to say anything.
-
-  `Why,' said the Dodo, `the best way to explain it is to do it.'
-(And, as you might like to try the thing yourself, some winter
-day, I will tell you how the Dodo managed it.)
-
-  First it marked out a race-course, in a sort of circle, (`the
-exact shape doesn't matter,' it said,) and then all the party
-were placed along the course, here and there.  There was no `One,
-two, three, and away,' but they began running when they liked,
-and left off when they liked, so that it was not easy to know
-when the race was over.  However, when they had been running half
-an hour or so, and were quite dry again, the Dodo suddenly called
-out `The race is over!' and they all crowded round it, panting,
-and asking, `But who has won?'
-
-  This question the Dodo could not answer without a great deal of
-thought, and it sat for a long time with one finger pressed upon
-its forehead (the position in which you usually see Shakespeare,
-in the pictures of him), while the rest waited in silence.  At
-last the Dodo said, `EVERYBODY has won, and all must have
-prizes.'
-
-  `But who is to give the prizes?' quite a chorus of voices
-asked.
-
-  `Why, SHE, of course,' said the Dodo, pointing to Alice with
-one finger; and the whole party at once crowded round her,
-calling out in a confused way, `Prizes! Prizes!'
-
-  Alice had no idea what to do, and in despair she put her hand
-in her pocket, and pulled out a box of comfits, (luckily the salt
-water had not got into it), and handed them round as prizes.
-There was exactly one a-piece all round.
-
-  `But she must have a prize herself, you know,' said the Mouse.
-
-  `Of course,' the Dodo replied very gravely.  `What else have
-you got in your pocket?' he went on, turning to Alice.
-
-  `Only a thimble,' said Alice sadly.
-
-  `Hand it over here,' said the Dodo.
-
-  Then they all crowded round her once more, while the Dodo
-solemnly presented the thimble, saying `We beg your acceptance of
-this elegant thimble'; and, when it had finished this short
-speech, they all cheered.
-
-  Alice thought the whole thing very absurd, but they all looked
-so grave that she did not dare to laugh; and, as she could not
-think of anything to say, she simply bowed, and took the thimble,
-looking as solemn as she could.
-
-  The next thing was to eat the comfits:  this caused some noise
-and confusion, as the large birds complained that they could not
-taste theirs, and the small ones choked and had to be patted on
-the back.  However, it was over at last, and they sat down again
-in a ring, and begged the Mouse to tell them something more.
-
-  `You promised to tell me your history, you know,' said Alice,
-`and why it is you hate--C and D,' she added in a whisper, half
-afraid that it would be offended again.
-
-  `Mine is a long and a sad tale!' said the Mouse, turning to
-Alice, and sighing.
-
-  `It IS a long tail, certainly,' said Alice, looking down with
-wonder at the Mouse's tail; `but why do you call it sad?'  And
-she kept on puzzling about it while the Mouse was speaking, so
-that her idea of the tale was something like this:--
-
-                    `Fury said to a
-                   mouse, That he
-                 met in the
-               house,
-            "Let us
-              both go to
-                law:  I will
-                  prosecute
-                    YOU.  --Come,
-                       I'll take no
-                        denial; We
-                     must have a
-                 trial:  For
-              really this
-           morning I've
-          nothing
-         to do."
-           Said the
-             mouse to the
-               cur, "Such
-                 a trial,
-                   dear Sir,
-                         With
-                     no jury
-                  or judge,
-                would be
-              wasting
-             our
-              breath."
-               "I'll be
-                 judge, I'll
-                   be jury,"
-                         Said
-                    cunning
-                      old Fury:
-                     "I'll
-                      try the
-                         whole
-                          cause,
-                             and
-                        condemn
-                       you
-                      to
-                       death."'
-
-  Alice was beginning to get very tired of sitting by her sister
-on the bank, and of having nothing to do:  once or twice she had
-peeped into the book her sister was reading, but it had no
-pictures or conversations in it, `and what is the use of a book,'
-thought Alice `without pictures or conversation?'
-
-  So she was considering in her own mind (as well as she could,
-for the hot day made her feel very sleepy and stupid), whether
-the pleasure of making a daisy-chain would be worth the trouble
-of getting up and picking the daisies, when suddenly a White
-Rabbit with pink eyes ran close by her.
-
-  There was nothing so VERY remarkable in that; nor did Alice
-think it so VERY much out of the way to hear the Rabbit say to
-itself, `Oh dear!  Oh dear!  I shall be late!'  (when she thought
-it over afterwards, it occurred to her that she ought to have
-wondered at this, but at the time it all seemed quite natural);
-but when the Rabbit actually TOOK A WATCH OUT OF ITS WAISTCOAT-
-POCKET, and looked at it, and then hurried on, Alice started to
-her feet, for it flashed across her mind that she had never
-before seen a rabbit with either a waistcoat-pocket, or a watch to
-take out of it, and burning with curiosity, she ran across the
-field after it, and fortunately was just in time to see it pop
-down a large rabbit-hole under the hedge.
-
-  In another moment down went Alice after it, never once
-considering how in the world she was to get out again.
-
-  The rabbit-hole went straight on like a tunnel for some way,
-and then dipped suddenly down, so suddenly that Alice had not a
-moment to think about stopping herself before she found herself
-falling down a very deep well.
-
-  Either the well was very deep, or she fell very slowly, for she
-had plenty of time as she went down to look about her and to
-wonder what was going to happen next.  First, she tried to look
-down and make out what she was coming to, but it was too dark to
-see anything; then she looked at the sides of the well, and
-noticed that they were filled with cupboards and book-shelves;
-here and there she saw maps and pictures hung upon pegs.  She
-took down a jar from one of the shelves as she passed; it was
-labelled `ORANGE MARMALADE', but to her great disappointment it
-was empty:  she did not like to drop the jar for fear of killing
-somebody, so managed to put it into one of the cupboards as she
-fell past it.
-
-  `Well!' thought Alice to herself, `after such a fall as this, I
-shall think nothing of tumbling down stairs!  How brave they'll
-all think me at home!  Why, I wouldn't say anything about it,
-even if I fell off the top of the house!' (Which was very likely
-true.)
-
-  Down, down, down.  Would the fall NEVER come to an end!  `I
-wonder how many miles I've fallen by this time?' she said aloud.
-`I must be getting somewhere near the centre of the earth.  Let
-me see:  that would be four thousand miles down, I think--' (for,
-you see, Alice had learnt several things of this sort in her
-lessons in the schoolroom, and though this was not a VERY good
-opportunity for showing off her knowledge, as there was no one to
-listen to her, still it was good practice to say it over) `--yes,
-that's about the right distance--but then I wonder what Latitude
-or Longitude I've got to?'  (Alice had no idea what Latitude was,
-or Longitude either, but thought they were nice grand words to
-say.)
-
-  Presently she began again.  `I wonder if I shall fall right
-THROUGH the earth!  How funny it'll seem to come out among the
-people that walk with their heads downward!  The Antipathies, I
-think--' (she was rather glad there WAS no one listening, this
-time, as it didn't sound at all the right word) `--but I shall
-have to ask them what the name of the country is, you know.
-Please, Ma'am, is this New Zealand or Australia?' (and she tried
-to curtsey as she spoke--fancy CURTSEYING as you're falling
-through the air!  Do you think you could manage it?)  `And what
-an ignorant little girl she'll think me for asking!  No, it'll
-never do to ask:  perhaps I shall see it written up somewhere.'
-
-  Down, down, down.  There was nothing else to do, so Alice soon
-began talking again.  `Dinah'll miss me very much to-night, I
-should think!'  (Dinah was the cat.)  `I hope they'll remember
-her saucer of milk at tea-time.  Dinah my dear!  I wish you were
-down here with me!  There are no mice in the air, I'm afraid, but
-you might catch a bat, and that's very like a mouse, you know.
-But do cats eat bats, I wonder?'  And here Alice began to get
-rather sleepy, and went on saying to herself, in a dreamy sort of
-way, `Do cats eat bats?  Do cats eat bats?' and sometimes, `Do
-bats eat cats?' for, you see, as she couldn't answer either
-question, it didn't much matter which way she put it.  She felt
-that she was dozing off, and had just begun to dream that she
-was walking hand in hand with Dinah, and saying to her very
-earnestly, `Now, Dinah, tell me the truth:  did you ever eat a
-bat?' when suddenly, thump! thump! down she came upon a heap of
-sticks and dry leaves, and the fall was over.
-
-  Alice was not a bit hurt, and she jumped up on to her feet in a
-moment:  she looked up, but it was all dark overhead; before her
-was another long passage, and the White Rabbit was still in
-sight, hurrying down it.  There was not a moment to be lost:
-away went Alice like the wind, and was just in time to hear it
-say, as it turned a corner, `Oh my ears and whiskers, how late
-it's getting!'  She was close behind it when she turned the
-corner, but the Rabbit was no longer to be seen:  she found
-herself in a long, low hall, which was lit up by a row of lamps
-hanging from the roof.
-
-  There were doors all round the hall, but they were all locked;
-and when Alice had been all the way down one side and up the
-other, trying every door, she walked sadly down the middle,
-wondering how she was ever to get out again.
-
-  Suddenly she came upon a little three-legged table, all made of
-solid glass; there was nothing on it except a tiny golden key,
-and Alice's first thought was that it might belong to one of the
-doors of the hall; but, alas! either the locks were too large, or
-the key was too small, but at any rate it would not open any of
-them.  However, on the second time round, she came upon a low
-curtain she had not noticed before, and behind it was a little
-door about fifteen inches high:  she tried the little golden key
-in the lock, and to her great delight it fitted!
-
-  Alice opened the door and found that it led into a small
-passage, not much larger than a rat-hole:  she knelt down and
-looked along the passage into the loveliest garden you ever saw.
-How she longed to get out of that dark hall, and wander about
-among those beds of bright flowers and those cool fountains, but
-she could not even get her head though the doorway; `and even if
-my head would go through,' thought poor Alice, `it would be of
-very little use without my shoulders.  Oh, how I wish
-I could shut up like a telescope!  I think I could, if I only
-know how to begin.'  For, you see, so many out-of-the-way things
-had happened lately, that Alice had begun to think that very few
-things indeed were really impossible.
-
-  There seemed to be no use in waiting by the little door, so she
-went back to the table, half hoping she might find another key on
-it, or at any rate a book of rules for shutting people up like
-telescopes:  this time she found a little bottle on it, (`which
-certainly was not here before,' said Alice,) and round the neck
-of the bottle was a paper label, with the words `DRINK ME'
-beautifully printed on it in large letters.
-
-  It was all very well to say `Drink me,' but the wise little
-Alice was not going to do THAT in a hurry.  `No, I'll look
-first,' she said, `and see whether it's marked "poison" or not';
-for she had read several nice little histories about children who
-had got burnt, and eaten up by wild beasts and other unpleasant
-things, all because they WOULD not remember the simple rules
-their friends had taught them:  such as, that a red-hot poker
-will burn you if you hold it too long; and that if you cut your
-finger VERY deeply with a knife, it usually bleeds; and she had
-never forgotten that, if you drink much from a bottle marked
-`poison,' it is almost certain to disagree with you, sooner or
-later.
-
-  However, this bottle was NOT marked `poison,' so Alice ventured
-to taste it, and finding it very nice, (it had, in fact, a sort
-of mixed flavour of cherry-tart, custard, pine-apple, roast
-turkey, toffee, and hot buttered toast,) she very soon finished
-it off.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-  `What a curious feeling!' said Alice; `I must be shutting up
-like a telescope.'
-
-  And so it was indeed:  she was now only ten inches high, and
-her face brightened up at the thought that she was now the right
-size for going through the little door into that lovely garden.
-First, however, she waited for a few minutes to see if she was
-going to shrink any further:  she felt a little nervous about
-this; `for it might end, you know,' said Alice to herself, `in my
-going out altogether, like a candle.  I wonder what I should be
-like then?'  And she tried to fancy what the flame of a candle is
-like after the candle is blown out, for she could not remember
-ever having seen such a thing.
-
-  After a while, finding that nothing more happened, she decided
-on going into the garden at once; but, alas for poor Alice!
-when she got to the door, she found she had forgotten the
-little golden key, and when she went back to the table for it,
-she found she could not possibly reach it:  she could see it
-quite plainly through the glass, and she tried her best to climb
-up one of the legs of the table, but it was too slippery;
-and when she had tired herself out with trying,
-the poor little thing sat down and cried.
-
-  `Come, there's no use in crying like that!' said Alice to
-herself, rather sharply; `I advise you to leave off this minute!'
-She generally gave herself very good advice, (though she very
-seldom followed it), and sometimes she scolded herself so
-severely as to bring tears into her eyes; and once she remembered
-trying to box her own ears for having cheated herself in a game
-of croquet she was playing against herself, for this curious
-child was very fond of pretending to be two people.  `But it's no
-use now,' thought poor Alice, `to pretend to be two people!  Why,
-there's hardly enough of me left to make ONE respectable
-person!'
-
-  Soon her eye fell on a little glass box that was lying under
-the table:  she opened it, and found in it a very small cake, on
-which the words `EAT ME' were beautifully marked in currants.
-`Well, I'll eat it,' said Alice, `and if it makes me grow larger,
-I can reach the key; and if it makes me grow smaller, I can creep
-under the door; so either way I'll get into the garden, and I
-don't care which happens!'
-
-  She ate a little bit, and said anxiously to herself, `Which
-way?  Which way?', holding her hand on the top of her head to
-feel which way it was growing, and she was quite surprised to
-find that she remained the same size:  to be sure, this generally
-happens when one eats cake, but Alice had got so much into the
-way of expecting nothing but out-of-the-way things to happen,
-that it seemed quite dull and stupid for life to go on in the
-common way.
-
-  So she set to work, and very soon finished off the cake.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-
-
-
-                           CHAPTER II
-
-                        The Pool of Tears
-
-
-  `Curiouser and curiouser!' cried Alice (she was so much
-surprised, that for the moment she quite forgot how to speak good
-English); `now I'm opening out like the largest telescope that
-ever was!  Good-bye, feet!' (for when she looked down at her
-feet, they seemed to be almost out of sight, they were getting so
-far off).  `Oh, my poor little feet, I wonder who will put on
-your shoes and stockings for you now, dears?  I'm sure _I_ shan't
-be able!  I shall be a great deal too far off to trouble myself
-about you:  you must manage the best way you can; --but I must be
-kind to them,' thought Alice, `or perhaps they won't walk the
-way I want to go!  Let me see:  I'll give them a new pair of
-boots every Christmas.'
-
-  And she went on planning to herself how she would manage it.
-`They must go by the carrier,' she thought; `and how funny it'll
-seem, sending presents to one's own feet!  And how odd the
-directions will look!
-
-            ALICE'S RIGHT FOOT, ESQ.
-                HEARTHRUG,
-                    NEAR THE FENDER,
-                        (WITH ALICE'S LOVE).
-
-Oh dear, what nonsense I'm talking!'
-
-  Just then her head struck against the roof of the hall:  in
-fact she was now more than nine feet high, and she at once took
-up the little golden key and hurried off to the garden door.
-
-  Poor Alice!  It was as much as she could do, lying down on one
-side, to look through into the garden with one eye; but to get
-through was more hopeless than ever:  she sat down and began to
-cry again.
-
-  `You ought to be ashamed of yourself,' said Alice, `a great
-girl like you,' (she might well say this), `to go on crying in
-this way!  Stop this moment, I tell you!'  But she went on all
-the same, shedding gallons of tears, until there was a large pool
-all round her, about four inches deep and reaching half down the
-hall.
-
-  After a time she heard a little pattering of feet in the
-distance, and she hastily dried her eyes to see what was coming.
-It was the White Rabbit returning, splendidly dressed, with a
-pair of white kid gloves in one hand and a large fan in the
-other:  he came trotting along in a great hurry, muttering to
-himself as he came, `Oh! the Duchess, the Duchess! Oh! won't she
-be savage if I've kept her waiting!'  Alice felt so desperate
-that she was ready to ask help of any one; so, when the Rabbit
-came near her, she began, in a low, timid voice, `If you please,
-sir--'  The Rabbit started violently, dropped the white kid
-gloves and the fan, and skurried away into the darkness as hard
-as he could go.
-
-  Alice took up the fan and gloves, and, as the hall was very
-hot, she kept fanning herself all the time she went on talking:
-`Dear, dear!  How queer everything is to-day!  And yesterday
-things went on just as usual.  I wonder if I've been changed in
-the night?  Let me think:  was I the same when I got up this
-morning?  I almost think I can remember feeling a little
-different.  But if I'm not the same, the next question is, Who in
-the world am I?  Ah, THAT'S the great puzzle!'  And she began
-thinking over all the children she knew that were of the same age
-as herself, to see if she could have been changed for any of
-them.
-
-  `I'm sure I'm not Ada,' she said, `for her hair goes in such
-long ringlets, and mine doesn't go in ringlets at all; and I'm
-sure I can't be Mabel, for I know all sorts of things, and she,
-oh! she knows such a very little!  Besides, SHE'S she, and I'm I,
-and--oh dear, how puzzling it all is!  I'll try if I know all the
-things I used to know.  Let me see:  four times five is twelve,
-and four times six is thirteen, and four times seven is--oh dear!
-I shall never get to twenty at that rate!  However, the
-Multiplication Table doesn't signify:  let's try Geography.
-London is the capital of Paris, and Paris is the capital of Rome,
-and Rome--no, THAT'S all wrong, I'm certain!  I must have been
-changed for Mabel!  I'll try and say "How doth the little--"'
-and she crossed her hands on her lap as if she were saying lessons,
-and began to repeat it, but her voice sounded hoarse and
-strange, and the words did not come the same as they used to do:--
-
-            `How doth the little crocodile
-              Improve his shining tail,
-            And pour the waters of the Nile
-              On every golden scale!
-
-            `How cheerfully he seems to grin,
-              How neatly spread his claws,
-            And welcome little fishes in
-              With gently smiling jaws!'
-
-  `I'm sure those are not the right words,' said poor Alice, and
-her eyes filled with tears again as she went on, `I must be Mabel
-after all, and I shall have to go and live in that poky little
-house, and have next to no toys to play with, and oh! ever so
-many lessons to learn!  No, I've made up my mind about it; if I'm
-Mabel, I'll stay down here!  It'll be no use their putting their
-heads down and saying "Come up again, dear!"  I shall only look
-up and say "Who am I then?  Tell me that first, and then, if I
-like being that person, I'll come up:  if not, I'll stay down
-here till I'm somebody else"--but, oh dear!' cried Alice, with a
-sudden burst of tears, `I do wish they WOULD put their heads
-down!  I am so VERY tired of being all alone here!'
-
-  As she said this she looked down at her hands, and was
-surprised to see that she had put on one of the Rabbit's little
-white kid gloves while she was talking.  `How CAN I have done
-that?' she thought.  `I must be growing small again.'  She got up
-and went to the table to measure herself by it, and found that,
-as nearly as she could guess, she was now about two feet high,
-and was going on shrinking rapidly:  she soon found out that the
-cause of this was the fan she was holding, and she dropped it
-hastily, just in time to avoid shrinking away altogether.
-
-`That WAS a narrow escape!' said Alice, a good deal frightened at
-the sudden change, but very glad to find herself still in
-existence; `and now for the garden!' and she ran with all speed
-back to the little door:  but, alas! the little door was shut
-again, and the little golden key was lying on the glass table as
-before, `and things are worse than ever,' thought the poor child,
-`for I never was so small as this before, never!  And I declare
-it's too bad, that it is!'
-
-  As she said these words her foot slipped, and in another
-moment, splash! she was up to her chin in salt water.  Her first
-idea was that she had somehow fallen into the sea, `and in that
-case I can go back by railway,' she said to herself.  (Alice had
-been to the seaside once in her life, and had come to the general
-conclusion, that wherever you go to on the English coast you find
-a number of bathing machines in the sea, some children digging in
-the sand with wooden spades, then a row of lodging houses, and
-behind them a railway station.)  However, she soon made out that
-she was in the pool of tears which she had wept when she was nine
-feet high.
-
-  `I wish I hadn't cried so much!' said Alice, as she swam about,
-trying to find her way out.  `I shall be punished for it now, I
-suppose, by being drowned in my own tears!  That WILL be a queer
-thing, to be sure!  However, everything is queer to-day.'
-
-  Just then she heard something splashing about in the pool a
-little way off, and she swam nearer to make out what it was:  at
-first she thought it must be a walrus or hippopotamus, but then
-she remembered how small she was now, and she soon made out that
-it was only a mouse that had slipped in like herself.
-
-  `Would it be of any use, now,' thought Alice, `to speak to this
-mouse?  Everything is so out-of-the-way down here, that I should
-think very likely it can talk:  at any rate, there's no harm in
-trying.'  So she began:  `O Mouse, do you know the way out of
-this pool?  I am very tired of swimming about here, O Mouse!'
-(Alice thought this must be the right way of speaking to a mouse:
-she had never done such a thing before, but she remembered having
-seen in her brother's Latin Grammar, `A mouse--of a mouse--to a
-mouse--a mouse--O mouse!'  The Mouse looked at her rather
-inquisitively, and seemed to her to wink with one of its little
-eyes, but it said nothing.
-
-  `Perhaps it doesn't understand English,' thought Alice; `I
-daresay it's a French mouse, come over with William the
-Conqueror.'  (For, with all her knowledge of history, Alice had
-no very clear notion how long ago anything had happened.)  So she
-began again:  `Ou est ma chatte?' which was the first sentence in
-her French lesson-book.  The Mouse gave a sudden leap out of the
-water, and seemed to quiver all over with fright.  `Oh, I beg
-your pardon!' cried Alice hastily, afraid that she had hurt the
-poor animal's feelings.  `I quite forgot you didn't like cats.'
-
-  `Not like cats!' cried the Mouse, in a shrill, passionate
-voice.  `Would YOU like cats if you were me?'
-
-  `Well, perhaps not,' said Alice in a soothing tone:  `don't be
-angry about it.  And yet I wish I could show you our cat Dinah:
-I think you'd take a fancy to cats if you could only see her.
-She is such a dear quiet thing,' Alice went on, half to herself,
-as she swam lazily about in the pool, `and she sits purring so
-nicely by the fire, licking her paws and washing her face--and
-she is such a nice soft thing to nurse--and she's such a capital
-one for catching mice--oh, I beg your pardon!' cried Alice again,
-for this time the Mouse was bristling all over, and she felt
-certain it must be really offended.  `We won't talk about her any
-more if you'd rather not.'
-
-  `We indeed!' cried the Mouse, who was trembling down to the end
-of his tail.  `As if I would talk on such a subject!  Our family
-always HATED cats:  nasty, low, vulgar things!  Don't let me hear
-the name again!'
-
-  `I won't indeed!' said Alice, in a great hurry to change the
-subject of conversation.  `Are you--are you fond--of--of dogs?'
-The Mouse did not answer, so Alice went on eagerly:  `There is
-such a nice little dog near our house I should like to show you!
-A little bright-eyed terrier, you know, with oh, such long curly
-brown hair!  And it'll fetch things when you throw them, and
-it'll sit up and beg for its dinner, and all sorts of things--I
-can't remember half of them--and it belongs to a farmer, you
-know, and he says it's so useful, it's worth a hundred pounds!
-He says it kills all the rats and--oh dear!' cried Alice in a
-sorrowful tone, `I'm afraid I've offended it again!'  For the
-Mouse was swimming away from her as hard as it could go, and
-making quite a commotion in the pool as it went.
-
-  So she called softly after it, `Mouse dear!  Do come back
-again, and we won't talk about cats or dogs either, if you don't
-like them!'  When the Mouse heard this, it turned round and swam
-slowly back to her:  its face was quite pale (with passion, Alice
-thought), and it said in a low trembling voice, `Let us get to
-the shore, and then I'll tell you my history, and you'll
-understand why it is I hate cats and dogs.'
-
-  It was high time to go, for the pool was getting quite crowded
-with the birds and animals that had fallen into it:  there were a
-Duck and a Dodo, a Lory and an Eaglet, and several other curious
-creatures.  Alice led the way, and the whole party swam to the
-shore.
-
-
-
-                           CHAPTER III
-
-                  A Caucus-Race and a Long Tale
-
-
-  They were indeed a queer-looking party that assembled on the
-bank--the birds with draggled feathers, the animals with their
-fur clinging close to them, and all dripping wet, cross, and
-uncomfortable.
-
-  The first question of course was, how to get dry again:  they
-had a consultation about this, and after a few minutes it seemed
-quite natural to Alice to find herself talking familiarly with
-them, as if she had known them all her life.  Indeed, she had
-quite a long argument with the Lory, who at last turned sulky,
-and would only say, `I am older than you, and must know better';
-and this Alice would not allow without knowing how old it was,
-and, as the Lory positively refused to tell its age, there was no
-more to be said.
-
-  At last the Mouse, who seemed to be a person of authority among
-them, called out, `Sit down, all of you, and listen to me!  I'LL
-soon make you dry enough!'  They all sat down at once, in a large
-ring, with the Mouse in the middle.  Alice kept her eyes
-anxiously fixed on it, for she felt sure she would catch a bad
-cold if she did not get dry very soon.
-
-  `Ahem!' said the Mouse with an important air, `are you all ready?
-This is the driest thing I know.  Silence all round, if you please!
-"William the Conqueror, whose cause was favoured by the pope, was
-soon submitted to by the English, who wanted leaders, and had been
-of late much accustomed to usurpation and conquest.  Edwin and
-Morcar, the earls of Mercia and Northumbria--"'
-
-  `Ugh!' said the Lory, with a shiver.
-
-  `I beg your pardon!' said the Mouse, frowning, but very
-politely:  `Did you speak?'
-
-  `Not I!' said the Lory hastily.
-
-  `I thought you did,' said the Mouse.  `--I proceed.  "Edwin and
-Morcar, the earls of Mercia and Northumbria, declared for him:
-and even Stigand, the patriotic archbishop of Canterbury, found
-it advisable--"'
-
-  `Found WHAT?' said the Duck.
-
-  `Found IT,' the Mouse replied rather crossly:  `of course you
-know what "it" means.'
-
-  `I know what "it" means well enough, when I find a thing,' said
-the Duck:  `it's generally a frog or a worm.  The question is,
-what did the archbishop find?'
-
-  The Mouse did not notice this question, but hurriedly went on,
-`"--found it advisable to go with Edgar Atheling to meet William
-and offer him the crown.  William's conduct at first was
-moderate.  But the insolence of his Normans--"  How are you
-getting on now, my dear?' it continued, turning to Alice as it
-spoke.
-
-  `As wet as ever,' said Alice in a melancholy tone:  `it doesn't
-seem to dry me at all.'
-
-  `In that case,' said the Dodo solemnly, rising to its feet, `I
-move that the meeting adjourn, for the immediate adoption of more
-energetic remedies--'
-
-  `Speak English!' said the Eaglet.  `I don't know the meaning of
-half those long words, and, what's more, I don't believe you do
-either!'  And the Eaglet bent down its head to hide a smile:
-some of the other birds tittered audibly.
-
-  `What I was going to say,' said the Dodo in an offended tone,
-`was, that the best thing to get us dry would be a Caucus-race.'
-
-  `What IS a Caucus-race?' said Alice; not that she wanted much
-to know, but the Dodo had paused as if it thought that SOMEBODY
-ought to speak, and no one else seemed inclined to say anything.
-
-  `Why,' said the Dodo, `the best way to explain it is to do it.'
-(And, as you might like to try the thing yourself, some winter
-day, I will tell you how the Dodo managed it.)
-
-  First it marked out a race-course, in a sort of circle, (`the
-exact shape doesn't matter,' it said,) and then all the party
-were placed along the course, here and there.  There was no `One,
-two, three, and away,' but they began running when they liked,
-and left off when they liked, so that it was not easy to know
-when the race was over.  However, when they had been running half
-an hour or so, and were quite dry again, the Dodo suddenly called
-out `The race is over!' and they all crowded round it, panting,
-and asking, `But who has won?'
-
-  This question the Dodo could not answer without a great deal of
-thought, and it sat for a long time with one finger pressed upon
-its forehead (the position in which you usually see Shakespeare,
-in the pictures of him), while the rest waited in silence.  At
-last the Dodo said, `EVERYBODY has won, and all must have
-prizes.'
-
-  `But who is to give the prizes?' quite a chorus of voices
-asked.
-
-  `Why, SHE, of course,' said the Dodo, pointing to Alice with
-one finger; and the whole party at once crowded round her,
-calling out in a confused way, `Prizes! Prizes!'
-
-  Alice had no idea what to do, and in despair she put her hand
-in her pocket, and pulled out a box of comfits, (luckily the salt
-water had not got into it), and handed them round as prizes.
-There was exactly one a-piece all round.
-
-  `But she must have a prize herself, you know,' said the Mouse.
-
-  `Of course,' the Dodo replied very gravely.  `What else have
-you got in your pocket?' he went on, turning to Alice.
-
-  `Only a thimble,' said Alice sadly.
-
-  `Hand it over here,' said the Dodo.
-
-  Then they all crowded round her once more, while the Dodo
-solemnly presented the thimble, saying `We beg your acceptance of
-this elegant thimble'; and, when it had finished this short
-speech, they all cheered.
-
-  Alice thought the whole thing very absurd, but they all looked
-so grave that she did not dare to laugh; and, as she could not
-think of anything to say, she simply bowed, and took the thimble,
-looking as solemn as she could.
-
-  The next thing was to eat the comfits:  this caused some noise
-and confusion, as the large birds complained that they could not
-taste theirs, and the small ones choked and had to be patted on
-the back.  However, it was over at last, and they sat down again
-in a ring, and begged the Mouse to tell them something more.
-
-  `You promised to tell me your history, you know,' said Alice,
-`and why it is you hate--C and D,' she added in a whisper, half
-afraid that it would be offended again.
-
-  `Mine is a long and a sad tale!' said the Mouse, turning to
-Alice, and sighing.
-
-  `It IS a long tail, certainly,' said Alice, looking down with
-wonder at the Mouse's tail; `but why do you call it sad?'  And
-she kept on puzzling about it while the Mouse was speaking, so
-that her idea of the tale was something like this:--
-
-                    `Fury said to a
-                   mouse, That he
-                 met in the
-               house,
-            "Let us
-              both go to
-                law:  I will
-                  prosecute
-                    YOU.  --Come,
-                       I'll take no
-                        denial; We
-                     must have a
-                 trial:  For
-              really this
-           morning I've
-          nothing
-         to do."
-           Said the
-             mouse to the
-               cur, "Such
-                 a trial,
-                   dear Sir,
-                         With
-                     no jury
-                  or judge,
-                would be
-              wasting
-             our
-              breath."
-               "I'll be
-                 judge, I'll
-                   be jury,"
-                         Said
-                    cunning
-                      old Fury:
-                     "I'll
-                      try the
-                         whole
-                          cause,
-                             and
-                        condemn
-                       you
-                      to
-                       death."'
-
-</div>
-</body></html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/scroll_test_tall.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/scroll_test_tall.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/scroll_test_tall.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/scroll_test_tall.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,1961 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-      #text { position: absolute; left: 1em; bottom: 1em; }
-    </style>
-  </head>
-<body>
-<div id="content" style="width:50%;">
-  Alice was beginning to get very tired of sitting by her sister
-on the bank, and of having nothing to do:  once or twice she had
-peeped into the book her sister was reading, but it had no
-pictures or conversations in it, `and what is the use of a book,'
-thought Alice `without pictures or conversation?'
-
-  So she was considering in her own mind (as well as she could,
-for the hot day made her feel very sleepy and stupid), whether
-the pleasure of making a daisy-chain would be worth the trouble
-of getting up and picking the daisies, when suddenly a White
-Rabbit with pink eyes ran close by her.
-
-  There was nothing so VERY remarkable in that; nor did Alice
-think it so VERY much out of the way to hear the Rabbit say to
-itself, `Oh dear!  Oh dear!  I shall be late!'  (when she thought
-it over afterwards, it occurred to her that she ought to have
-wondered at this, but at the time it all seemed quite natural);
-but when the Rabbit actually TOOK A WATCH OUT OF ITS WAISTCOAT-
-POCKET, and looked at it, and then hurried on, Alice started to
-her feet, for it flashed across her mind that she had never
-before seen a rabbit with either a waistcoat-pocket, or a watch to
-take out of it, and burning with curiosity, she ran across the
-field after it, and fortunately was just in time to see it pop
-down a large rabbit-hole under the hedge.
-
-  In another moment down went Alice after it, never once
-considering how in the world she was to get out again.
-
-  The rabbit-hole went straight on like a tunnel for some way,
-and then dipped suddenly down, so suddenly that Alice had not a
-moment to think about stopping herself before she found herself
-falling down a very deep well.
-
-  Either the well was very deep, or she fell very slowly, for she
-had plenty of time as she went down to look about her and to
-wonder what was going to happen next.  First, she tried to look
-down and make out what she was coming to, but it was too dark to
-see anything; then she looked at the sides of the well, and
-noticed that they were filled with cupboards and book-shelves;
-here and there she saw maps and pictures hung upon pegs.  She
-took down a jar from one of the shelves as she passed; it was
-labelled `ORANGE MARMALADE', but to her great disappointment it
-was empty:  she did not like to drop the jar for fear of killing
-somebody, so managed to put it into one of the cupboards as she
-fell past it.
-
-  `Well!' thought Alice to herself, `after such a fall as this, I
-shall think nothing of tumbling down stairs!  How brave they'll
-all think me at home!  Why, I wouldn't say anything about it,
-even if I fell off the top of the house!' (Which was very likely
-true.)
-
-  Down, down, down.  Would the fall NEVER come to an end!  `I
-wonder how many miles I've fallen by this time?' she said aloud.
-`I must be getting somewhere near the centre of the earth.  Let
-me see:  that would be four thousand miles down, I think--' (for,
-you see, Alice had learnt several things of this sort in her
-lessons in the schoolroom, and though this was not a VERY good
-opportunity for showing off her knowledge, as there was no one to
-listen to her, still it was good practice to say it over) `--yes,
-that's about the right distance--but then I wonder what Latitude
-or Longitude I've got to?'  (Alice had no idea what Latitude was,
-or Longitude either, but thought they were nice grand words to
-say.)
-
-  Presently she began again.  `I wonder if I shall fall right
-THROUGH the earth!  How funny it'll seem to come out among the
-people that walk with their heads downward!  The Antipathies, I
-think--' (she was rather glad there WAS no one listening, this
-time, as it didn't sound at all the right word) `--but I shall
-have to ask them what the name of the country is, you know.
-Please, Ma'am, is this New Zealand or Australia?' (and she tried
-to curtsey as she spoke--fancy CURTSEYING as you're falling
-through the air!  Do you think you could manage it?)  `And what
-an ignorant little girl she'll think me for asking!  No, it'll
-never do to ask:  perhaps I shall see it written up somewhere.'
-
-  Down, down, down.  There was nothing else to do, so Alice soon
-began talking again.  `Dinah'll miss me very much to-night, I
-should think!'  (Dinah was the cat.)  `I hope they'll remember
-her saucer of milk at tea-time.  Dinah my dear!  I wish you were
-down here with me!  There are no mice in the air, I'm afraid, but
-you might catch a bat, and that's very like a mouse, you know.
-But do cats eat bats, I wonder?'  And here Alice began to get
-rather sleepy, and went on saying to herself, in a dreamy sort of
-way, `Do cats eat bats?  Do cats eat bats?' and sometimes, `Do
-bats eat cats?' for, you see, as she couldn't answer either
-question, it didn't much matter which way she put it.  She felt
-that she was dozing off, and had just begun to dream that she
-was walking hand in hand with Dinah, and saying to her very
-earnestly, `Now, Dinah, tell me the truth:  did you ever eat a
-bat?' when suddenly, thump! thump! down she came upon a heap of
-sticks and dry leaves, and the fall was over.
-
-  Alice was not a bit hurt, and she jumped up on to her feet in a
-moment:  she looked up, but it was all dark overhead; before her
-was another long passage, and the White Rabbit was still in
-sight, hurrying down it.  There was not a moment to be lost:
-away went Alice like the wind, and was just in time to hear it
-say, as it turned a corner, `Oh my ears and whiskers, how late
-it's getting!'  She was close behind it when she turned the
-corner, but the Rabbit was no longer to be seen:  she found
-herself in a long, low hall, which was lit up by a row of lamps
-hanging from the roof.
-
-  There were doors all round the hall, but they were all locked;
-and when Alice had been all the way down one side and up the
-other, trying every door, she walked sadly down the middle,
-wondering how she was ever to get out again.
-
-  Suddenly she came upon a little three-legged table, all made of
-solid glass; there was nothing on it except a tiny golden key,
-and Alice's first thought was that it might belong to one of the
-doors of the hall; but, alas! either the locks were too large, or
-the key was too small, but at any rate it would not open any of
-them.  However, on the second time round, she came upon a low
-curtain she had not noticed before, and behind it was a little
-door about fifteen inches high:  she tried the little golden key
-in the lock, and to her great delight it fitted!
-
-  Alice opened the door and found that it led into a small
-passage, not much larger than a rat-hole:  she knelt down and
-looked along the passage into the loveliest garden you ever saw.
-How she longed to get out of that dark hall, and wander about
-among those beds of bright flowers and those cool fountains, but
-she could not even get her head though the doorway; `and even if
-my head would go through,' thought poor Alice, `it would be of
-very little use without my shoulders.  Oh, how I wish
-I could shut up like a telescope!  I think I could, if I only
-know how to begin.'  For, you see, so many out-of-the-way things
-had happened lately, that Alice had begun to think that very few
-things indeed were really impossible.
-
-  There seemed to be no use in waiting by the little door, so she
-went back to the table, half hoping she might find another key on
-it, or at any rate a book of rules for shutting people up like
-telescopes:  this time she found a little bottle on it, (`which
-certainly was not here before,' said Alice,) and round the neck
-of the bottle was a paper label, with the words `DRINK ME'
-beautifully printed on it in large letters.
-
-  It was all very well to say `Drink me,' but the wise little
-Alice was not going to do THAT in a hurry.  `No, I'll look
-first,' she said, `and see whether it's marked "poison" or not';
-for she had read several nice little histories about children who
-had got burnt, and eaten up by wild beasts and other unpleasant
-things, all because they WOULD not remember the simple rules
-their friends had taught them:  such as, that a red-hot poker
-will burn you if you hold it too long; and that if you cut your
-finger VERY deeply with a knife, it usually bleeds; and she had
-never forgotten that, if you drink much from a bottle marked
-`poison,' it is almost certain to disagree with you, sooner or
-later.
-
-  However, this bottle was NOT marked `poison,' so Alice ventured
-to taste it, and finding it very nice, (it had, in fact, a sort
-of mixed flavour of cherry-tart, custard, pine-apple, roast
-turkey, toffee, and hot buttered toast,) she very soon finished
-it off.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-  `What a curious feeling!' said Alice; `I must be shutting up
-like a telescope.'
-
-  And so it was indeed:  she was now only ten inches high, and
-her face brightened up at the thought that she was now the right
-size for going through the little door into that lovely garden.
-First, however, she waited for a few minutes to see if she was
-going to shrink any further:  she felt a little nervous about
-this; `for it might end, you know,' said Alice to herself, `in my
-going out altogether, like a candle.  I wonder what I should be
-like then?'  And she tried to fancy what the flame of a candle is
-like after the candle is blown out, for she could not remember
-ever having seen such a thing.
-
-  After a while, finding that nothing more happened, she decided
-on going into the garden at once; but, alas for poor Alice!
-when she got to the door, she found she had forgotten the
-little golden key, and when she went back to the table for it,
-she found she could not possibly reach it:  she could see it
-quite plainly through the glass, and she tried her best to climb
-up one of the legs of the table, but it was too slippery;
-and when she had tired herself out with trying,
-the poor little thing sat down and cried.
-
-  `Come, there's no use in crying like that!' said Alice to
-herself, rather sharply; `I advise you to leave off this minute!'
-She generally gave herself very good advice, (though she very
-seldom followed it), and sometimes she scolded herself so
-severely as to bring tears into her eyes; and once she remembered
-trying to box her own ears for having cheated herself in a game
-of croquet she was playing against herself, for this curious
-child was very fond of pretending to be two people.  `But it's no
-use now,' thought poor Alice, `to pretend to be two people!  Why,
-there's hardly enough of me left to make ONE respectable
-person!'
-
-  Soon her eye fell on a little glass box that was lying under
-the table:  she opened it, and found in it a very small cake, on
-which the words `EAT ME' were beautifully marked in currants.
-`Well, I'll eat it,' said Alice, `and if it makes me grow larger,
-I can reach the key; and if it makes me grow smaller, I can creep
-under the door; so either way I'll get into the garden, and I
-don't care which happens!'
-
-  She ate a little bit, and said anxiously to herself, `Which
-way?  Which way?', holding her hand on the top of her head to
-feel which way it was growing, and she was quite surprised to
-find that she remained the same size:  to be sure, this generally
-happens when one eats cake, but Alice had got so much into the
-way of expecting nothing but out-of-the-way things to happen,
-that it seemed quite dull and stupid for life to go on in the
-common way.
-
-  So she set to work, and very soon finished off the cake.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-
-
-
-                           CHAPTER II
-
-                        The Pool of Tears
-
-
-  `Curiouser and curiouser!' cried Alice (she was so much
-surprised, that for the moment she quite forgot how to speak good
-English); `now I'm opening out like the largest telescope that
-ever was!  Good-bye, feet!' (for when she looked down at her
-feet, they seemed to be almost out of sight, they were getting so
-far off).  `Oh, my poor little feet, I wonder who will put on
-your shoes and stockings for you now, dears?  I'm sure _I_ shan't
-be able!  I shall be a great deal too far off to trouble myself
-about you:  you must manage the best way you can; --but I must be
-kind to them,' thought Alice, `or perhaps they won't walk the
-way I want to go!  Let me see:  I'll give them a new pair of
-boots every Christmas.'
-
-  And she went on planning to herself how she would manage it.
-`They must go by the carrier,' she thought; `and how funny it'll
-seem, sending presents to one's own feet!  And how odd the
-directions will look!
-
-            ALICE'S RIGHT FOOT, ESQ.
-                HEARTHRUG,
-                    NEAR THE FENDER,
-                        (WITH ALICE'S LOVE).
-
-Oh dear, what nonsense I'm talking!'
-
-  Just then her head struck against the roof of the hall:  in
-fact she was now more than nine feet high, and she at once took
-up the little golden key and hurried off to the garden door.
-
-  Poor Alice!  It was as much as she could do, lying down on one
-side, to look through into the garden with one eye; but to get
-through was more hopeless than ever:  she sat down and began to
-cry again.
-
-  `You ought to be ashamed of yourself,' said Alice, `a great
-girl like you,' (she might well say this), `to go on crying in
-this way!  Stop this moment, I tell you!'  But she went on all
-the same, shedding gallons of tears, until there was a large pool
-all round her, about four inches deep and reaching half down the
-hall.
-
-  After a time she heard a little pattering of feet in the
-distance, and she hastily dried her eyes to see what was coming.
-It was the White Rabbit returning, splendidly dressed, with a
-pair of white kid gloves in one hand and a large fan in the
-other:  he came trotting along in a great hurry, muttering to
-himself as he came, `Oh! the Duchess, the Duchess! Oh! won't she
-be savage if I've kept her waiting!'  Alice felt so desperate
-that she was ready to ask help of any one; so, when the Rabbit
-came near her, she began, in a low, timid voice, `If you please,
-sir--'  The Rabbit started violently, dropped the white kid
-gloves and the fan, and skurried away into the darkness as hard
-as he could go.
-
-  Alice took up the fan and gloves, and, as the hall was very
-hot, she kept fanning herself all the time she went on talking:
-`Dear, dear!  How queer everything is to-day!  And yesterday
-things went on just as usual.  I wonder if I've been changed in
-the night?  Let me think:  was I the same when I got up this
-morning?  I almost think I can remember feeling a little
-different.  But if I'm not the same, the next question is, Who in
-the world am I?  Ah, THAT'S the great puzzle!'  And she began
-thinking over all the children she knew that were of the same age
-as herself, to see if she could have been changed for any of
-them.
-
-  `I'm sure I'm not Ada,' she said, `for her hair goes in such
-long ringlets, and mine doesn't go in ringlets at all; and I'm
-sure I can't be Mabel, for I know all sorts of things, and she,
-oh! she knows such a very little!  Besides, SHE'S she, and I'm I,
-and--oh dear, how puzzling it all is!  I'll try if I know all the
-things I used to know.  Let me see:  four times five is twelve,
-and four times six is thirteen, and four times seven is--oh dear!
-I shall never get to twenty at that rate!  However, the
-Multiplication Table doesn't signify:  let's try Geography.
-London is the capital of Paris, and Paris is the capital of Rome,
-and Rome--no, THAT'S all wrong, I'm certain!  I must have been
-changed for Mabel!  I'll try and say "How doth the little--"'
-and she crossed her hands on her lap as if she were saying lessons,
-and began to repeat it, but her voice sounded hoarse and
-strange, and the words did not come the same as they used to do:--
-
-            `How doth the little crocodile
-              Improve his shining tail,
-            And pour the waters of the Nile
-              On every golden scale!
-
-            `How cheerfully he seems to grin,
-              How neatly spread his claws,
-            And welcome little fishes in
-              With gently smiling jaws!'
-
-  `I'm sure those are not the right words,' said poor Alice, and
-her eyes filled with tears again as she went on, `I must be Mabel
-after all, and I shall have to go and live in that poky little
-house, and have next to no toys to play with, and oh! ever so
-many lessons to learn!  No, I've made up my mind about it; if I'm
-Mabel, I'll stay down here!  It'll be no use their putting their
-heads down and saying "Come up again, dear!"  I shall only look
-up and say "Who am I then?  Tell me that first, and then, if I
-like being that person, I'll come up:  if not, I'll stay down
-here till I'm somebody else"--but, oh dear!' cried Alice, with a
-sudden burst of tears, `I do wish they WOULD put their heads
-down!  I am so VERY tired of being all alone here!'
-
-  As she said this she looked down at her hands, and was
-surprised to see that she had put on one of the Rabbit's little
-white kid gloves while she was talking.  `How CAN I have done
-that?' she thought.  `I must be growing small again.'  She got up
-and went to the table to measure herself by it, and found that,
-as nearly as she could guess, she was now about two feet high,
-and was going on shrinking rapidly:  she soon found out that the
-cause of this was the fan she was holding, and she dropped it
-hastily, just in time to avoid shrinking away altogether.
-
-`That WAS a narrow escape!' said Alice, a good deal frightened at
-the sudden change, but very glad to find herself still in
-existence; `and now for the garden!' and she ran with all speed
-back to the little door:  but, alas! the little door was shut
-again, and the little golden key was lying on the glass table as
-before, `and things are worse than ever,' thought the poor child,
-`for I never was so small as this before, never!  And I declare
-it's too bad, that it is!'
-
-  As she said these words her foot slipped, and in another
-moment, splash! she was up to her chin in salt water.  Her first
-idea was that she had somehow fallen into the sea, `and in that
-case I can go back by railway,' she said to herself.  (Alice had
-been to the seaside once in her life, and had come to the general
-conclusion, that wherever you go to on the English coast you find
-a number of bathing machines in the sea, some children digging in
-the sand with wooden spades, then a row of lodging houses, and
-behind them a railway station.)  However, she soon made out that
-she was in the pool of tears which she had wept when she was nine
-feet high.
-
-  `I wish I hadn't cried so much!' said Alice, as she swam about,
-trying to find her way out.  `I shall be punished for it now, I
-suppose, by being drowned in my own tears!  That WILL be a queer
-thing, to be sure!  However, everything is queer to-day.'
-
-  Just then she heard something splashing about in the pool a
-little way off, and she swam nearer to make out what it was:  at
-first she thought it must be a walrus or hippopotamus, but then
-she remembered how small she was now, and she soon made out that
-it was only a mouse that had slipped in like herself.
-
-  `Would it be of any use, now,' thought Alice, `to speak to this
-mouse?  Everything is so out-of-the-way down here, that I should
-think very likely it can talk:  at any rate, there's no harm in
-trying.'  So she began:  `O Mouse, do you know the way out of
-this pool?  I am very tired of swimming about here, O Mouse!'
-(Alice thought this must be the right way of speaking to a mouse:
-she had never done such a thing before, but she remembered having
-seen in her brother's Latin Grammar, `A mouse--of a mouse--to a
-mouse--a mouse--O mouse!'  The Mouse looked at her rather
-inquisitively, and seemed to her to wink with one of its little
-eyes, but it said nothing.
-
-  `Perhaps it doesn't understand English,' thought Alice; `I
-daresay it's a French mouse, come over with William the
-Conqueror.'  (For, with all her knowledge of history, Alice had
-no very clear notion how long ago anything had happened.)  So she
-began again:  `Ou est ma chatte?' which was the first sentence in
-her French lesson-book.  The Mouse gave a sudden leap out of the
-water, and seemed to quiver all over with fright.  `Oh, I beg
-your pardon!' cried Alice hastily, afraid that she had hurt the
-poor animal's feelings.  `I quite forgot you didn't like cats.'
-
-  `Not like cats!' cried the Mouse, in a shrill, passionate
-voice.  `Would YOU like cats if you were me?'
-
-  `Well, perhaps not,' said Alice in a soothing tone:  `don't be
-angry about it.  And yet I wish I could show you our cat Dinah:
-I think you'd take a fancy to cats if you could only see her.
-She is such a dear quiet thing,' Alice went on, half to herself,
-as she swam lazily about in the pool, `and she sits purring so
-nicely by the fire, licking her paws and washing her face--and
-she is such a nice soft thing to nurse--and she's such a capital
-one for catching mice--oh, I beg your pardon!' cried Alice again,
-for this time the Mouse was bristling all over, and she felt
-certain it must be really offended.  `We won't talk about her any
-more if you'd rather not.'
-
-  `We indeed!' cried the Mouse, who was trembling down to the end
-of his tail.  `As if I would talk on such a subject!  Our family
-always HATED cats:  nasty, low, vulgar things!  Don't let me hear
-the name again!'
-
-  `I won't indeed!' said Alice, in a great hurry to change the
-subject of conversation.  `Are you--are you fond--of--of dogs?'
-The Mouse did not answer, so Alice went on eagerly:  `There is
-such a nice little dog near our house I should like to show you!
-A little bright-eyed terrier, you know, with oh, such long curly
-brown hair!  And it'll fetch things when you throw them, and
-it'll sit up and beg for its dinner, and all sorts of things--I
-can't remember half of them--and it belongs to a farmer, you
-know, and he says it's so useful, it's worth a hundred pounds!
-He says it kills all the rats and--oh dear!' cried Alice in a
-sorrowful tone, `I'm afraid I've offended it again!'  For the
-Mouse was swimming away from her as hard as it could go, and
-making quite a commotion in the pool as it went.
-
-  So she called softly after it, `Mouse dear!  Do come back
-again, and we won't talk about cats or dogs either, if you don't
-like them!'  When the Mouse heard this, it turned round and swam
-slowly back to her:  its face was quite pale (with passion, Alice
-thought), and it said in a low trembling voice, `Let us get to
-the shore, and then I'll tell you my history, and you'll
-understand why it is I hate cats and dogs.'
-
-  It was high time to go, for the pool was getting quite crowded
-with the birds and animals that had fallen into it:  there were a
-Duck and a Dodo, a Lory and an Eaglet, and several other curious
-creatures.  Alice led the way, and the whole party swam to the
-shore.
-
-
-
-                           CHAPTER III
-
-                  A Caucus-Race and a Long Tale
-
-
-  They were indeed a queer-looking party that assembled on the
-bank--the birds with draggled feathers, the animals with their
-fur clinging close to them, and all dripping wet, cross, and
-uncomfortable.
-
-  The first question of course was, how to get dry again:  they
-had a consultation about this, and after a few minutes it seemed
-quite natural to Alice to find herself talking familiarly with
-them, as if she had known them all her life.  Indeed, she had
-quite a long argument with the Lory, who at last turned sulky,
-and would only say, `I am older than you, and must know better';
-and this Alice would not allow without knowing how old it was,
-and, as the Lory positively refused to tell its age, there was no
-more to be said.
-
-  At last the Mouse, who seemed to be a person of authority among
-them, called out, `Sit down, all of you, and listen to me!  I'LL
-soon make you dry enough!'  They all sat down at once, in a large
-ring, with the Mouse in the middle.  Alice kept her eyes
-anxiously fixed on it, for she felt sure she would catch a bad
-cold if she did not get dry very soon.
-
-  `Ahem!' said the Mouse with an important air, `are you all ready?
-This is the driest thing I know.  Silence all round, if you please!
-"William the Conqueror, whose cause was favoured by the pope, was
-soon submitted to by the English, who wanted leaders, and had been
-of late much accustomed to usurpation and conquest.  Edwin and
-Morcar, the earls of Mercia and Northumbria--"'
-
-  `Ugh!' said the Lory, with a shiver.
-
-  `I beg your pardon!' said the Mouse, frowning, but very
-politely:  `Did you speak?'
-
-  `Not I!' said the Lory hastily.
-
-  `I thought you did,' said the Mouse.  `--I proceed.  "Edwin and
-Morcar, the earls of Mercia and Northumbria, declared for him:
-and even Stigand, the patriotic archbishop of Canterbury, found
-it advisable--"'
-
-  `Found WHAT?' said the Duck.
-
-  `Found IT,' the Mouse replied rather crossly:  `of course you
-know what "it" means.'
-
-  `I know what "it" means well enough, when I find a thing,' said
-the Duck:  `it's generally a frog or a worm.  The question is,
-what did the archbishop find?'
-
-  The Mouse did not notice this question, but hurriedly went on,
-`"--found it advisable to go with Edgar Atheling to meet William
-and offer him the crown.  William's conduct at first was
-moderate.  But the insolence of his Normans--"  How are you
-getting on now, my dear?' it continued, turning to Alice as it
-spoke.
-
-  `As wet as ever,' said Alice in a melancholy tone:  `it doesn't
-seem to dry me at all.'
-
-  `In that case,' said the Dodo solemnly, rising to its feet, `I
-move that the meeting adjourn, for the immediate adoption of more
-energetic remedies--'
-
-  `Speak English!' said the Eaglet.  `I don't know the meaning of
-half those long words, and, what's more, I don't believe you do
-either!'  And the Eaglet bent down its head to hide a smile:
-some of the other birds tittered audibly.
-
-  `What I was going to say,' said the Dodo in an offended tone,
-`was, that the best thing to get us dry would be a Caucus-race.'
-
-  `What IS a Caucus-race?' said Alice; not that she wanted much
-to know, but the Dodo had paused as if it thought that SOMEBODY
-ought to speak, and no one else seemed inclined to say anything.
-
-  `Why,' said the Dodo, `the best way to explain it is to do it.'
-(And, as you might like to try the thing yourself, some winter
-day, I will tell you how the Dodo managed it.)
-
-  First it marked out a race-course, in a sort of circle, (`the
-exact shape doesn't matter,' it said,) and then all the party
-were placed along the course, here and there.  There was no `One,
-two, three, and away,' but they began running when they liked,
-and left off when they liked, so that it was not easy to know
-when the race was over.  However, when they had been running half
-an hour or so, and were quite dry again, the Dodo suddenly called
-out `The race is over!' and they all crowded round it, panting,
-and asking, `But who has won?'
-
-  This question the Dodo could not answer without a great deal of
-thought, and it sat for a long time with one finger pressed upon
-its forehead (the position in which you usually see Shakespeare,
-in the pictures of him), while the rest waited in silence.  At
-last the Dodo said, `EVERYBODY has won, and all must have
-prizes.'
-
-  `But who is to give the prizes?' quite a chorus of voices
-asked.
-
-  `Why, SHE, of course,' said the Dodo, pointing to Alice with
-one finger; and the whole party at once crowded round her,
-calling out in a confused way, `Prizes! Prizes!'
-
-  Alice had no idea what to do, and in despair she put her hand
-in her pocket, and pulled out a box of comfits, (luckily the salt
-water had not got into it), and handed them round as prizes.
-There was exactly one a-piece all round.
-
-  `But she must have a prize herself, you know,' said the Mouse.
-
-  `Of course,' the Dodo replied very gravely.  `What else have
-you got in your pocket?' he went on, turning to Alice.
-
-  `Only a thimble,' said Alice sadly.
-
-  `Hand it over here,' said the Dodo.
-
-  Then they all crowded round her once more, while the Dodo
-solemnly presented the thimble, saying `We beg your acceptance of
-this elegant thimble'; and, when it had finished this short
-speech, they all cheered.
-
-  Alice thought the whole thing very absurd, but they all looked
-so grave that she did not dare to laugh; and, as she could not
-think of anything to say, she simply bowed, and took the thimble,
-looking as solemn as she could.
-
-  The next thing was to eat the comfits:  this caused some noise
-and confusion, as the large birds complained that they could not
-taste theirs, and the small ones choked and had to be patted on
-the back.  However, it was over at last, and they sat down again
-in a ring, and begged the Mouse to tell them something more.
-
-  `You promised to tell me your history, you know,' said Alice,
-`and why it is you hate--C and D,' she added in a whisper, half
-afraid that it would be offended again.
-
-  `Mine is a long and a sad tale!' said the Mouse, turning to
-Alice, and sighing.
-
-  `It IS a long tail, certainly,' said Alice, looking down with
-wonder at the Mouse's tail; `but why do you call it sad?'  And
-she kept on puzzling about it while the Mouse was speaking, so
-that her idea of the tale was something like this:--
-
-                    `Fury said to a
-                   mouse, That he
-                 met in the
-               house,
-            "Let us
-              both go to
-                law:  I will
-                  prosecute
-                    YOU.  --Come,
-                       I'll take no
-                        denial; We
-                     must have a
-                 trial:  For
-              really this
-           morning I've
-          nothing
-         to do."
-           Said the
-             mouse to the
-               cur, "Such
-                 a trial,
-                   dear Sir,
-                         With
-                     no jury
-                  or judge,
-                would be
-              wasting
-             our
-              breath."
-               "I'll be
-                 judge, I'll
-                   be jury,"
-                         Said
-                    cunning
-                      old Fury:
-                     "I'll
-                      try the
-                         whole
-                          cause,
-                             and
-                        condemn
-                       you
-                      to
-                       death."'
-
-  Alice was beginning to get very tired of sitting by her sister
-on the bank, and of having nothing to do:  once or twice she had
-peeped into the book her sister was reading, but it had no
-pictures or conversations in it, `and what is the use of a book,'
-thought Alice `without pictures or conversation?'
-
-  So she was considering in her own mind (as well as she could,
-for the hot day made her feel very sleepy and stupid), whether
-the pleasure of making a daisy-chain would be worth the trouble
-of getting up and picking the daisies, when suddenly a White
-Rabbit with pink eyes ran close by her.
-
-  There was nothing so VERY remarkable in that; nor did Alice
-think it so VERY much out of the way to hear the Rabbit say to
-itself, `Oh dear!  Oh dear!  I shall be late!'  (when she thought
-it over afterwards, it occurred to her that she ought to have
-wondered at this, but at the time it all seemed quite natural);
-but when the Rabbit actually TOOK A WATCH OUT OF ITS WAISTCOAT-
-POCKET, and looked at it, and then hurried on, Alice started to
-her feet, for it flashed across her mind that she had never
-before seen a rabbit with either a waistcoat-pocket, or a watch to
-take out of it, and burning with curiosity, she ran across the
-field after it, and fortunately was just in time to see it pop
-down a large rabbit-hole under the hedge.
-
-  In another moment down went Alice after it, never once
-considering how in the world she was to get out again.
-
-  The rabbit-hole went straight on like a tunnel for some way,
-and then dipped suddenly down, so suddenly that Alice had not a
-moment to think about stopping herself before she found herself
-falling down a very deep well.
-
-  Either the well was very deep, or she fell very slowly, for she
-had plenty of time as she went down to look about her and to
-wonder what was going to happen next.  First, she tried to look
-down and make out what she was coming to, but it was too dark to
-see anything; then she looked at the sides of the well, and
-noticed that they were filled with cupboards and book-shelves;
-here and there she saw maps and pictures hung upon pegs.  She
-took down a jar from one of the shelves as she passed; it was
-labelled `ORANGE MARMALADE', but to her great disappointment it
-was empty:  she did not like to drop the jar for fear of killing
-somebody, so managed to put it into one of the cupboards as she
-fell past it.
-
-  `Well!' thought Alice to herself, `after such a fall as this, I
-shall think nothing of tumbling down stairs!  How brave they'll
-all think me at home!  Why, I wouldn't say anything about it,
-even if I fell off the top of the house!' (Which was very likely
-true.)
-
-  Down, down, down.  Would the fall NEVER come to an end!  `I
-wonder how many miles I've fallen by this time?' she said aloud.
-`I must be getting somewhere near the centre of the earth.  Let
-me see:  that would be four thousand miles down, I think--' (for,
-you see, Alice had learnt several things of this sort in her
-lessons in the schoolroom, and though this was not a VERY good
-opportunity for showing off her knowledge, as there was no one to
-listen to her, still it was good practice to say it over) `--yes,
-that's about the right distance--but then I wonder what Latitude
-or Longitude I've got to?'  (Alice had no idea what Latitude was,
-or Longitude either, but thought they were nice grand words to
-say.)
-
-  Presently she began again.  `I wonder if I shall fall right
-THROUGH the earth!  How funny it'll seem to come out among the
-people that walk with their heads downward!  The Antipathies, I
-think--' (she was rather glad there WAS no one listening, this
-time, as it didn't sound at all the right word) `--but I shall
-have to ask them what the name of the country is, you know.
-Please, Ma'am, is this New Zealand or Australia?' (and she tried
-to curtsey as she spoke--fancy CURTSEYING as you're falling
-through the air!  Do you think you could manage it?)  `And what
-an ignorant little girl she'll think me for asking!  No, it'll
-never do to ask:  perhaps I shall see it written up somewhere.'
-
-  Down, down, down.  There was nothing else to do, so Alice soon
-began talking again.  `Dinah'll miss me very much to-night, I
-should think!'  (Dinah was the cat.)  `I hope they'll remember
-her saucer of milk at tea-time.  Dinah my dear!  I wish you were
-down here with me!  There are no mice in the air, I'm afraid, but
-you might catch a bat, and that's very like a mouse, you know.
-But do cats eat bats, I wonder?'  And here Alice began to get
-rather sleepy, and went on saying to herself, in a dreamy sort of
-way, `Do cats eat bats?  Do cats eat bats?' and sometimes, `Do
-bats eat cats?' for, you see, as she couldn't answer either
-question, it didn't much matter which way she put it.  She felt
-that she was dozing off, and had just begun to dream that she
-was walking hand in hand with Dinah, and saying to her very
-earnestly, `Now, Dinah, tell me the truth:  did you ever eat a
-bat?' when suddenly, thump! thump! down she came upon a heap of
-sticks and dry leaves, and the fall was over.
-
-  Alice was not a bit hurt, and she jumped up on to her feet in a
-moment:  she looked up, but it was all dark overhead; before her
-was another long passage, and the White Rabbit was still in
-sight, hurrying down it.  There was not a moment to be lost:
-away went Alice like the wind, and was just in time to hear it
-say, as it turned a corner, `Oh my ears and whiskers, how late
-it's getting!'  She was close behind it when she turned the
-corner, but the Rabbit was no longer to be seen:  she found
-herself in a long, low hall, which was lit up by a row of lamps
-hanging from the roof.
-
-  There were doors all round the hall, but they were all locked;
-and when Alice had been all the way down one side and up the
-other, trying every door, she walked sadly down the middle,
-wondering how she was ever to get out again.
-
-  Suddenly she came upon a little three-legged table, all made of
-solid glass; there was nothing on it except a tiny golden key,
-and Alice's first thought was that it might belong to one of the
-doors of the hall; but, alas! either the locks were too large, or
-the key was too small, but at any rate it would not open any of
-them.  However, on the second time round, she came upon a low
-curtain she had not noticed before, and behind it was a little
-door about fifteen inches high:  she tried the little golden key
-in the lock, and to her great delight it fitted!
-
-  Alice opened the door and found that it led into a small
-passage, not much larger than a rat-hole:  she knelt down and
-looked along the passage into the loveliest garden you ever saw.
-How she longed to get out of that dark hall, and wander about
-among those beds of bright flowers and those cool fountains, but
-she could not even get her head though the doorway; `and even if
-my head would go through,' thought poor Alice, `it would be of
-very little use without my shoulders.  Oh, how I wish
-I could shut up like a telescope!  I think I could, if I only
-know how to begin.'  For, you see, so many out-of-the-way things
-had happened lately, that Alice had begun to think that very few
-things indeed were really impossible.
-
-  There seemed to be no use in waiting by the little door, so she
-went back to the table, half hoping she might find another key on
-it, or at any rate a book of rules for shutting people up like
-telescopes:  this time she found a little bottle on it, (`which
-certainly was not here before,' said Alice,) and round the neck
-of the bottle was a paper label, with the words `DRINK ME'
-beautifully printed on it in large letters.
-
-  It was all very well to say `Drink me,' but the wise little
-Alice was not going to do THAT in a hurry.  `No, I'll look
-first,' she said, `and see whether it's marked "poison" or not';
-for she had read several nice little histories about children who
-had got burnt, and eaten up by wild beasts and other unpleasant
-things, all because they WOULD not remember the simple rules
-their friends had taught them:  such as, that a red-hot poker
-will burn you if you hold it too long; and that if you cut your
-finger VERY deeply with a knife, it usually bleeds; and she had
-never forgotten that, if you drink much from a bottle marked
-`poison,' it is almost certain to disagree with you, sooner or
-later.
-
-  However, this bottle was NOT marked `poison,' so Alice ventured
-to taste it, and finding it very nice, (it had, in fact, a sort
-of mixed flavour of cherry-tart, custard, pine-apple, roast
-turkey, toffee, and hot buttered toast,) she very soon finished
-it off.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-  `What a curious feeling!' said Alice; `I must be shutting up
-like a telescope.'
-
-  And so it was indeed:  she was now only ten inches high, and
-her face brightened up at the thought that she was now the right
-size for going through the little door into that lovely garden.
-First, however, she waited for a few minutes to see if she was
-going to shrink any further:  she felt a little nervous about
-this; `for it might end, you know,' said Alice to herself, `in my
-going out altogether, like a candle.  I wonder what I should be
-like then?'  And she tried to fancy what the flame of a candle is
-like after the candle is blown out, for she could not remember
-ever having seen such a thing.
-
-  After a while, finding that nothing more happened, she decided
-on going into the garden at once; but, alas for poor Alice!
-when she got to the door, she found she had forgotten the
-little golden key, and when she went back to the table for it,
-she found she could not possibly reach it:  she could see it
-quite plainly through the glass, and she tried her best to climb
-up one of the legs of the table, but it was too slippery;
-and when she had tired herself out with trying,
-the poor little thing sat down and cried.
-
-  `Come, there's no use in crying like that!' said Alice to
-herself, rather sharply; `I advise you to leave off this minute!'
-She generally gave herself very good advice, (though she very
-seldom followed it), and sometimes she scolded herself so
-severely as to bring tears into her eyes; and once she remembered
-trying to box her own ears for having cheated herself in a game
-of croquet she was playing against herself, for this curious
-child was very fond of pretending to be two people.  `But it's no
-use now,' thought poor Alice, `to pretend to be two people!  Why,
-there's hardly enough of me left to make ONE respectable
-person!'
-
-  Soon her eye fell on a little glass box that was lying under
-the table:  she opened it, and found in it a very small cake, on
-which the words `EAT ME' were beautifully marked in currants.
-`Well, I'll eat it,' said Alice, `and if it makes me grow larger,
-I can reach the key; and if it makes me grow smaller, I can creep
-under the door; so either way I'll get into the garden, and I
-don't care which happens!'
-
-  She ate a little bit, and said anxiously to herself, `Which
-way?  Which way?', holding her hand on the top of her head to
-feel which way it was growing, and she was quite surprised to
-find that she remained the same size:  to be sure, this generally
-happens when one eats cake, but Alice had got so much into the
-way of expecting nothing but out-of-the-way things to happen,
-that it seemed quite dull and stupid for life to go on in the
-common way.
-
-  So she set to work, and very soon finished off the cake.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-
-
-
-                           CHAPTER II
-
-                        The Pool of Tears
-
-
-  `Curiouser and curiouser!' cried Alice (she was so much
-surprised, that for the moment she quite forgot how to speak good
-English); `now I'm opening out like the largest telescope that
-ever was!  Good-bye, feet!' (for when she looked down at her
-feet, they seemed to be almost out of sight, they were getting so
-far off).  `Oh, my poor little feet, I wonder who will put on
-your shoes and stockings for you now, dears?  I'm sure _I_ shan't
-be able!  I shall be a great deal too far off to trouble myself
-about you:  you must manage the best way you can; --but I must be
-kind to them,' thought Alice, `or perhaps they won't walk the
-way I want to go!  Let me see:  I'll give them a new pair of
-boots every Christmas.'
-
-  And she went on planning to herself how she would manage it.
-`They must go by the carrier,' she thought; `and how funny it'll
-seem, sending presents to one's own feet!  And how odd the
-directions will look!
-
-            ALICE'S RIGHT FOOT, ESQ.
-                HEARTHRUG,
-                    NEAR THE FENDER,
-                        (WITH ALICE'S LOVE).
-
-Oh dear, what nonsense I'm talking!'
-
-  Just then her head struck against the roof of the hall:  in
-fact she was now more than nine feet high, and she at once took
-up the little golden key and hurried off to the garden door.
-
-  Poor Alice!  It was as much as she could do, lying down on one
-side, to look through into the garden with one eye; but to get
-through was more hopeless than ever:  she sat down and began to
-cry again.
-
-  `You ought to be ashamed of yourself,' said Alice, `a great
-girl like you,' (she might well say this), `to go on crying in
-this way!  Stop this moment, I tell you!'  But she went on all
-the same, shedding gallons of tears, until there was a large pool
-all round her, about four inches deep and reaching half down the
-hall.
-
-  After a time she heard a little pattering of feet in the
-distance, and she hastily dried her eyes to see what was coming.
-It was the White Rabbit returning, splendidly dressed, with a
-pair of white kid gloves in one hand and a large fan in the
-other:  he came trotting along in a great hurry, muttering to
-himself as he came, `Oh! the Duchess, the Duchess! Oh! won't she
-be savage if I've kept her waiting!'  Alice felt so desperate
-that she was ready to ask help of any one; so, when the Rabbit
-came near her, she began, in a low, timid voice, `If you please,
-sir--'  The Rabbit started violently, dropped the white kid
-gloves and the fan, and skurried away into the darkness as hard
-as he could go.
-
-  Alice took up the fan and gloves, and, as the hall was very
-hot, she kept fanning herself all the time she went on talking:
-`Dear, dear!  How queer everything is to-day!  And yesterday
-things went on just as usual.  I wonder if I've been changed in
-the night?  Let me think:  was I the same when I got up this
-morning?  I almost think I can remember feeling a little
-different.  But if I'm not the same, the next question is, Who in
-the world am I?  Ah, THAT'S the great puzzle!'  And she began
-thinking over all the children she knew that were of the same age
-as herself, to see if she could have been changed for any of
-them.
-
-  `I'm sure I'm not Ada,' she said, `for her hair goes in such
-long ringlets, and mine doesn't go in ringlets at all; and I'm
-sure I can't be Mabel, for I know all sorts of things, and she,
-oh! she knows such a very little!  Besides, SHE'S she, and I'm I,
-and--oh dear, how puzzling it all is!  I'll try if I know all the
-things I used to know.  Let me see:  four times five is twelve,
-and four times six is thirteen, and four times seven is--oh dear!
-I shall never get to twenty at that rate!  However, the
-Multiplication Table doesn't signify:  let's try Geography.
-London is the capital of Paris, and Paris is the capital of Rome,
-and Rome--no, THAT'S all wrong, I'm certain!  I must have been
-changed for Mabel!  I'll try and say "How doth the little--"'
-and she crossed her hands on her lap as if she were saying lessons,
-and began to repeat it, but her voice sounded hoarse and
-strange, and the words did not come the same as they used to do:--
-
-            `How doth the little crocodile
-              Improve his shining tail,
-            And pour the waters of the Nile
-              On every golden scale!
-
-            `How cheerfully he seems to grin,
-              How neatly spread his claws,
-            And welcome little fishes in
-              With gently smiling jaws!'
-
-  `I'm sure those are not the right words,' said poor Alice, and
-her eyes filled with tears again as she went on, `I must be Mabel
-after all, and I shall have to go and live in that poky little
-house, and have next to no toys to play with, and oh! ever so
-many lessons to learn!  No, I've made up my mind about it; if I'm
-Mabel, I'll stay down here!  It'll be no use their putting their
-heads down and saying "Come up again, dear!"  I shall only look
-up and say "Who am I then?  Tell me that first, and then, if I
-like being that person, I'll come up:  if not, I'll stay down
-here till I'm somebody else"--but, oh dear!' cried Alice, with a
-sudden burst of tears, `I do wish they WOULD put their heads
-down!  I am so VERY tired of being all alone here!'
-
-  As she said this she looked down at her hands, and was
-surprised to see that she had put on one of the Rabbit's little
-white kid gloves while she was talking.  `How CAN I have done
-that?' she thought.  `I must be growing small again.'  She got up
-and went to the table to measure herself by it, and found that,
-as nearly as she could guess, she was now about two feet high,
-and was going on shrinking rapidly:  she soon found out that the
-cause of this was the fan she was holding, and she dropped it
-hastily, just in time to avoid shrinking away altogether.
-
-`That WAS a narrow escape!' said Alice, a good deal frightened at
-the sudden change, but very glad to find herself still in
-existence; `and now for the garden!' and she ran with all speed
-back to the little door:  but, alas! the little door was shut
-again, and the little golden key was lying on the glass table as
-before, `and things are worse than ever,' thought the poor child,
-`for I never was so small as this before, never!  And I declare
-it's too bad, that it is!'
-
-  As she said these words her foot slipped, and in another
-moment, splash! she was up to her chin in salt water.  Her first
-idea was that she had somehow fallen into the sea, `and in that
-case I can go back by railway,' she said to herself.  (Alice had
-been to the seaside once in her life, and had come to the general
-conclusion, that wherever you go to on the English coast you find
-a number of bathing machines in the sea, some children digging in
-the sand with wooden spades, then a row of lodging houses, and
-behind them a railway station.)  However, she soon made out that
-she was in the pool of tears which she had wept when she was nine
-feet high.
-
-  `I wish I hadn't cried so much!' said Alice, as she swam about,
-trying to find her way out.  `I shall be punished for it now, I
-suppose, by being drowned in my own tears!  That WILL be a queer
-thing, to be sure!  However, everything is queer to-day.'
-
-  Just then she heard something splashing about in the pool a
-little way off, and she swam nearer to make out what it was:  at
-first she thought it must be a walrus or hippopotamus, but then
-she remembered how small she was now, and she soon made out that
-it was only a mouse that had slipped in like herself.
-
-  `Would it be of any use, now,' thought Alice, `to speak to this
-mouse?  Everything is so out-of-the-way down here, that I should
-think very likely it can talk:  at any rate, there's no harm in
-trying.'  So she began:  `O Mouse, do you know the way out of
-this pool?  I am very tired of swimming about here, O Mouse!'
-(Alice thought this must be the right way of speaking to a mouse:
-she had never done such a thing before, but she remembered having
-seen in her brother's Latin Grammar, `A mouse--of a mouse--to a
-mouse--a mouse--O mouse!'  The Mouse looked at her rather
-inquisitively, and seemed to her to wink with one of its little
-eyes, but it said nothing.
-
-  `Perhaps it doesn't understand English,' thought Alice; `I
-daresay it's a French mouse, come over with William the
-Conqueror.'  (For, with all her knowledge of history, Alice had
-no very clear notion how long ago anything had happened.)  So she
-began again:  `Ou est ma chatte?' which was the first sentence in
-her French lesson-book.  The Mouse gave a sudden leap out of the
-water, and seemed to quiver all over with fright.  `Oh, I beg
-your pardon!' cried Alice hastily, afraid that she had hurt the
-poor animal's feelings.  `I quite forgot you didn't like cats.'
-
-  `Not like cats!' cried the Mouse, in a shrill, passionate
-voice.  `Would YOU like cats if you were me?'
-
-  `Well, perhaps not,' said Alice in a soothing tone:  `don't be
-angry about it.  And yet I wish I could show you our cat Dinah:
-I think you'd take a fancy to cats if you could only see her.
-She is such a dear quiet thing,' Alice went on, half to herself,
-as she swam lazily about in the pool, `and she sits purring so
-nicely by the fire, licking her paws and washing her face--and
-she is such a nice soft thing to nurse--and she's such a capital
-one for catching mice--oh, I beg your pardon!' cried Alice again,
-for this time the Mouse was bristling all over, and she felt
-certain it must be really offended.  `We won't talk about her any
-more if you'd rather not.'
-
-  `We indeed!' cried the Mouse, who was trembling down to the end
-of his tail.  `As if I would talk on such a subject!  Our family
-always HATED cats:  nasty, low, vulgar things!  Don't let me hear
-the name again!'
-
-  `I won't indeed!' said Alice, in a great hurry to change the
-subject of conversation.  `Are you--are you fond--of--of dogs?'
-The Mouse did not answer, so Alice went on eagerly:  `There is
-such a nice little dog near our house I should like to show you!
-A little bright-eyed terrier, you know, with oh, such long curly
-brown hair!  And it'll fetch things when you throw them, and
-it'll sit up and beg for its dinner, and all sorts of things--I
-can't remember half of them--and it belongs to a farmer, you
-know, and he says it's so useful, it's worth a hundred pounds!
-He says it kills all the rats and--oh dear!' cried Alice in a
-sorrowful tone, `I'm afraid I've offended it again!'  For the
-Mouse was swimming away from her as hard as it could go, and
-making quite a commotion in the pool as it went.
-
-  So she called softly after it, `Mouse dear!  Do come back
-again, and we won't talk about cats or dogs either, if you don't
-like them!'  When the Mouse heard this, it turned round and swam
-slowly back to her:  its face was quite pale (with passion, Alice
-thought), and it said in a low trembling voice, `Let us get to
-the shore, and then I'll tell you my history, and you'll
-understand why it is I hate cats and dogs.'
-
-  It was high time to go, for the pool was getting quite crowded
-with the birds and animals that had fallen into it:  there were a
-Duck and a Dodo, a Lory and an Eaglet, and several other curious
-creatures.  Alice led the way, and the whole party swam to the
-shore.
-
-
-
-                           CHAPTER III
-
-                  A Caucus-Race and a Long Tale
-
-
-  They were indeed a queer-looking party that assembled on the
-bank--the birds with draggled feathers, the animals with their
-fur clinging close to them, and all dripping wet, cross, and
-uncomfortable.
-
-  The first question of course was, how to get dry again:  they
-had a consultation about this, and after a few minutes it seemed
-quite natural to Alice to find herself talking familiarly with
-them, as if she had known them all her life.  Indeed, she had
-quite a long argument with the Lory, who at last turned sulky,
-and would only say, `I am older than you, and must know better';
-and this Alice would not allow without knowing how old it was,
-and, as the Lory positively refused to tell its age, there was no
-more to be said.
-
-  At last the Mouse, who seemed to be a person of authority among
-them, called out, `Sit down, all of you, and listen to me!  I'LL
-soon make you dry enough!'  They all sat down at once, in a large
-ring, with the Mouse in the middle.  Alice kept her eyes
-anxiously fixed on it, for she felt sure she would catch a bad
-cold if she did not get dry very soon.
-
-  `Ahem!' said the Mouse with an important air, `are you all ready?
-This is the driest thing I know.  Silence all round, if you please!
-"William the Conqueror, whose cause was favoured by the pope, was
-soon submitted to by the English, who wanted leaders, and had been
-of late much accustomed to usurpation and conquest.  Edwin and
-Morcar, the earls of Mercia and Northumbria--"'
-
-  `Ugh!' said the Lory, with a shiver.
-
-  `I beg your pardon!' said the Mouse, frowning, but very
-politely:  `Did you speak?'
-
-  `Not I!' said the Lory hastily.
-
-  `I thought you did,' said the Mouse.  `--I proceed.  "Edwin and
-Morcar, the earls of Mercia and Northumbria, declared for him:
-and even Stigand, the patriotic archbishop of Canterbury, found
-it advisable--"'
-
-  `Found WHAT?' said the Duck.
-
-  `Found IT,' the Mouse replied rather crossly:  `of course you
-know what "it" means.'
-
-  `I know what "it" means well enough, when I find a thing,' said
-the Duck:  `it's generally a frog or a worm.  The question is,
-what did the archbishop find?'
-
-  The Mouse did not notice this question, but hurriedly went on,
-`"--found it advisable to go with Edgar Atheling to meet William
-and offer him the crown.  William's conduct at first was
-moderate.  But the insolence of his Normans--"  How are you
-getting on now, my dear?' it continued, turning to Alice as it
-spoke.
-
-  `As wet as ever,' said Alice in a melancholy tone:  `it doesn't
-seem to dry me at all.'
-
-  `In that case,' said the Dodo solemnly, rising to its feet, `I
-move that the meeting adjourn, for the immediate adoption of more
-energetic remedies--'
-
-  `Speak English!' said the Eaglet.  `I don't know the meaning of
-half those long words, and, what's more, I don't believe you do
-either!'  And the Eaglet bent down its head to hide a smile:
-some of the other birds tittered audibly.
-
-  `What I was going to say,' said the Dodo in an offended tone,
-`was, that the best thing to get us dry would be a Caucus-race.'
-
-  `What IS a Caucus-race?' said Alice; not that she wanted much
-to know, but the Dodo had paused as if it thought that SOMEBODY
-ought to speak, and no one else seemed inclined to say anything.
-
-  `Why,' said the Dodo, `the best way to explain it is to do it.'
-(And, as you might like to try the thing yourself, some winter
-day, I will tell you how the Dodo managed it.)
-
-  First it marked out a race-course, in a sort of circle, (`the
-exact shape doesn't matter,' it said,) and then all the party
-were placed along the course, here and there.  There was no `One,
-two, three, and away,' but they began running when they liked,
-and left off when they liked, so that it was not easy to know
-when the race was over.  However, when they had been running half
-an hour or so, and were quite dry again, the Dodo suddenly called
-out `The race is over!' and they all crowded round it, panting,
-and asking, `But who has won?'
-
-  This question the Dodo could not answer without a great deal of
-thought, and it sat for a long time with one finger pressed upon
-its forehead (the position in which you usually see Shakespeare,
-in the pictures of him), while the rest waited in silence.  At
-last the Dodo said, `EVERYBODY has won, and all must have
-prizes.'
-
-  `But who is to give the prizes?' quite a chorus of voices
-asked.
-
-  `Why, SHE, of course,' said the Dodo, pointing to Alice with
-one finger; and the whole party at once crowded round her,
-calling out in a confused way, `Prizes! Prizes!'
-
-  Alice had no idea what to do, and in despair she put her hand
-in her pocket, and pulled out a box of comfits, (luckily the salt
-water had not got into it), and handed them round as prizes.
-There was exactly one a-piece all round.
-
-  `But she must have a prize herself, you know,' said the Mouse.
-
-  `Of course,' the Dodo replied very gravely.  `What else have
-you got in your pocket?' he went on, turning to Alice.
-
-  `Only a thimble,' said Alice sadly.
-
-  `Hand it over here,' said the Dodo.
-
-  Then they all crowded round her once more, while the Dodo
-solemnly presented the thimble, saying `We beg your acceptance of
-this elegant thimble'; and, when it had finished this short
-speech, they all cheered.
-
-  Alice thought the whole thing very absurd, but they all looked
-so grave that she did not dare to laugh; and, as she could not
-think of anything to say, she simply bowed, and took the thimble,
-looking as solemn as she could.
-
-  The next thing was to eat the comfits:  this caused some noise
-and confusion, as the large birds complained that they could not
-taste theirs, and the small ones choked and had to be patted on
-the back.  However, it was over at last, and they sat down again
-in a ring, and begged the Mouse to tell them something more.
-
-  `You promised to tell me your history, you know,' said Alice,
-`and why it is you hate--C and D,' she added in a whisper, half
-afraid that it would be offended again.
-
-  `Mine is a long and a sad tale!' said the Mouse, turning to
-Alice, and sighing.
-
-  `It IS a long tail, certainly,' said Alice, looking down with
-wonder at the Mouse's tail; `but why do you call it sad?'  And
-she kept on puzzling about it while the Mouse was speaking, so
-that her idea of the tale was something like this:--
-
-                    `Fury said to a
-                   mouse, That he
-                 met in the
-               house,
-            "Let us
-              both go to
-                law:  I will
-                  prosecute
-                    YOU.  --Come,
-                       I'll take no
-                        denial; We
-                     must have a
-                 trial:  For
-              really this
-           morning I've
-          nothing
-         to do."
-           Said the
-             mouse to the
-               cur, "Such
-                 a trial,
-                   dear Sir,
-                         With
-                     no jury
-                  or judge,
-                would be
-              wasting
-             our
-              breath."
-               "I'll be
-                 judge, I'll
-                   be jury,"
-                         Said
-                    cunning
-                      old Fury:
-                     "I'll
-                      try the
-                         whole
-                          cause,
-                             and
-                        condemn
-                       you
-                      to
-                       death."'
-
-  Alice was beginning to get very tired of sitting by her sister
-on the bank, and of having nothing to do:  once or twice she had
-peeped into the book her sister was reading, but it had no
-pictures or conversations in it, `and what is the use of a book,'
-thought Alice `without pictures or conversation?'
-
-  So she was considering in her own mind (as well as she could,
-for the hot day made her feel very sleepy and stupid), whether
-the pleasure of making a daisy-chain would be worth the trouble
-of getting up and picking the daisies, when suddenly a White
-Rabbit with pink eyes ran close by her.
-
-  There was nothing so VERY remarkable in that; nor did Alice
-think it so VERY much out of the way to hear the Rabbit say to
-itself, `Oh dear!  Oh dear!  I shall be late!'  (when she thought
-it over afterwards, it occurred to her that she ought to have
-wondered at this, but at the time it all seemed quite natural);
-but when the Rabbit actually TOOK A WATCH OUT OF ITS WAISTCOAT-
-POCKET, and looked at it, and then hurried on, Alice started to
-her feet, for it flashed across her mind that she had never
-before seen a rabbit with either a waistcoat-pocket, or a watch to
-take out of it, and burning with curiosity, she ran across the
-field after it, and fortunately was just in time to see it pop
-down a large rabbit-hole under the hedge.
-
-  In another moment down went Alice after it, never once
-considering how in the world she was to get out again.
-
-  The rabbit-hole went straight on like a tunnel for some way,
-and then dipped suddenly down, so suddenly that Alice had not a
-moment to think about stopping herself before she found herself
-falling down a very deep well.
-
-  Either the well was very deep, or she fell very slowly, for she
-had plenty of time as she went down to look about her and to
-wonder what was going to happen next.  First, she tried to look
-down and make out what she was coming to, but it was too dark to
-see anything; then she looked at the sides of the well, and
-noticed that they were filled with cupboards and book-shelves;
-here and there she saw maps and pictures hung upon pegs.  She
-took down a jar from one of the shelves as she passed; it was
-labelled `ORANGE MARMALADE', but to her great disappointment it
-was empty:  she did not like to drop the jar for fear of killing
-somebody, so managed to put it into one of the cupboards as she
-fell past it.
-
-  `Well!' thought Alice to herself, `after such a fall as this, I
-shall think nothing of tumbling down stairs!  How brave they'll
-all think me at home!  Why, I wouldn't say anything about it,
-even if I fell off the top of the house!' (Which was very likely
-true.)
-
-  Down, down, down.  Would the fall NEVER come to an end!  `I
-wonder how many miles I've fallen by this time?' she said aloud.
-`I must be getting somewhere near the centre of the earth.  Let
-me see:  that would be four thousand miles down, I think--' (for,
-you see, Alice had learnt several things of this sort in her
-lessons in the schoolroom, and though this was not a VERY good
-opportunity for showing off her knowledge, as there was no one to
-listen to her, still it was good practice to say it over) `--yes,
-that's about the right distance--but then I wonder what Latitude
-or Longitude I've got to?'  (Alice had no idea what Latitude was,
-or Longitude either, but thought they were nice grand words to
-say.)
-
-  Presently she began again.  `I wonder if I shall fall right
-THROUGH the earth!  How funny it'll seem to come out among the
-people that walk with their heads downward!  The Antipathies, I
-think--' (she was rather glad there WAS no one listening, this
-time, as it didn't sound at all the right word) `--but I shall
-have to ask them what the name of the country is, you know.
-Please, Ma'am, is this New Zealand or Australia?' (and she tried
-to curtsey as she spoke--fancy CURTSEYING as you're falling
-through the air!  Do you think you could manage it?)  `And what
-an ignorant little girl she'll think me for asking!  No, it'll
-never do to ask:  perhaps I shall see it written up somewhere.'
-
-  Down, down, down.  There was nothing else to do, so Alice soon
-began talking again.  `Dinah'll miss me very much to-night, I
-should think!'  (Dinah was the cat.)  `I hope they'll remember
-her saucer of milk at tea-time.  Dinah my dear!  I wish you were
-down here with me!  There are no mice in the air, I'm afraid, but
-you might catch a bat, and that's very like a mouse, you know.
-But do cats eat bats, I wonder?'  And here Alice began to get
-rather sleepy, and went on saying to herself, in a dreamy sort of
-way, `Do cats eat bats?  Do cats eat bats?' and sometimes, `Do
-bats eat cats?' for, you see, as she couldn't answer either
-question, it didn't much matter which way she put it.  She felt
-that she was dozing off, and had just begun to dream that she
-was walking hand in hand with Dinah, and saying to her very
-earnestly, `Now, Dinah, tell me the truth:  did you ever eat a
-bat?' when suddenly, thump! thump! down she came upon a heap of
-sticks and dry leaves, and the fall was over.
-
-  Alice was not a bit hurt, and she jumped up on to her feet in a
-moment:  she looked up, but it was all dark overhead; before her
-was another long passage, and the White Rabbit was still in
-sight, hurrying down it.  There was not a moment to be lost:
-away went Alice like the wind, and was just in time to hear it
-say, as it turned a corner, `Oh my ears and whiskers, how late
-it's getting!'  She was close behind it when she turned the
-corner, but the Rabbit was no longer to be seen:  she found
-herself in a long, low hall, which was lit up by a row of lamps
-hanging from the roof.
-
-  There were doors all round the hall, but they were all locked;
-and when Alice had been all the way down one side and up the
-other, trying every door, she walked sadly down the middle,
-wondering how she was ever to get out again.
-
-  Suddenly she came upon a little three-legged table, all made of
-solid glass; there was nothing on it except a tiny golden key,
-and Alice's first thought was that it might belong to one of the
-doors of the hall; but, alas! either the locks were too large, or
-the key was too small, but at any rate it would not open any of
-them.  However, on the second time round, she came upon a low
-curtain she had not noticed before, and behind it was a little
-door about fifteen inches high:  she tried the little golden key
-in the lock, and to her great delight it fitted!
-
-  Alice opened the door and found that it led into a small
-passage, not much larger than a rat-hole:  she knelt down and
-looked along the passage into the loveliest garden you ever saw.
-How she longed to get out of that dark hall, and wander about
-among those beds of bright flowers and those cool fountains, but
-she could not even get her head though the doorway; `and even if
-my head would go through,' thought poor Alice, `it would be of
-very little use without my shoulders.  Oh, how I wish
-I could shut up like a telescope!  I think I could, if I only
-know how to begin.'  For, you see, so many out-of-the-way things
-had happened lately, that Alice had begun to think that very few
-things indeed were really impossible.
-
-  There seemed to be no use in waiting by the little door, so she
-went back to the table, half hoping she might find another key on
-it, or at any rate a book of rules for shutting people up like
-telescopes:  this time she found a little bottle on it, (`which
-certainly was not here before,' said Alice,) and round the neck
-of the bottle was a paper label, with the words `DRINK ME'
-beautifully printed on it in large letters.
-
-  It was all very well to say `Drink me,' but the wise little
-Alice was not going to do THAT in a hurry.  `No, I'll look
-first,' she said, `and see whether it's marked "poison" or not';
-for she had read several nice little histories about children who
-had got burnt, and eaten up by wild beasts and other unpleasant
-things, all because they WOULD not remember the simple rules
-their friends had taught them:  such as, that a red-hot poker
-will burn you if you hold it too long; and that if you cut your
-finger VERY deeply with a knife, it usually bleeds; and she had
-never forgotten that, if you drink much from a bottle marked
-`poison,' it is almost certain to disagree with you, sooner or
-later.
-
-  However, this bottle was NOT marked `poison,' so Alice ventured
-to taste it, and finding it very nice, (it had, in fact, a sort
-of mixed flavour of cherry-tart, custard, pine-apple, roast
-turkey, toffee, and hot buttered toast,) she very soon finished
-it off.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-  `What a curious feeling!' said Alice; `I must be shutting up
-like a telescope.'
-
-  And so it was indeed:  she was now only ten inches high, and
-her face brightened up at the thought that she was now the right
-size for going through the little door into that lovely garden.
-First, however, she waited for a few minutes to see if she was
-going to shrink any further:  she felt a little nervous about
-this; `for it might end, you know,' said Alice to herself, `in my
-going out altogether, like a candle.  I wonder what I should be
-like then?'  And she tried to fancy what the flame of a candle is
-like after the candle is blown out, for she could not remember
-ever having seen such a thing.
-
-  After a while, finding that nothing more happened, she decided
-on going into the garden at once; but, alas for poor Alice!
-when she got to the door, she found she had forgotten the
-little golden key, and when she went back to the table for it,
-she found she could not possibly reach it:  she could see it
-quite plainly through the glass, and she tried her best to climb
-up one of the legs of the table, but it was too slippery;
-and when she had tired herself out with trying,
-the poor little thing sat down and cried.
-
-  `Come, there's no use in crying like that!' said Alice to
-herself, rather sharply; `I advise you to leave off this minute!'
-She generally gave herself very good advice, (though she very
-seldom followed it), and sometimes she scolded herself so
-severely as to bring tears into her eyes; and once she remembered
-trying to box her own ears for having cheated herself in a game
-of croquet she was playing against herself, for this curious
-child was very fond of pretending to be two people.  `But it's no
-use now,' thought poor Alice, `to pretend to be two people!  Why,
-there's hardly enough of me left to make ONE respectable
-person!'
-
-  Soon her eye fell on a little glass box that was lying under
-the table:  she opened it, and found in it a very small cake, on
-which the words `EAT ME' were beautifully marked in currants.
-`Well, I'll eat it,' said Alice, `and if it makes me grow larger,
-I can reach the key; and if it makes me grow smaller, I can creep
-under the door; so either way I'll get into the garden, and I
-don't care which happens!'
-
-  She ate a little bit, and said anxiously to herself, `Which
-way?  Which way?', holding her hand on the top of her head to
-feel which way it was growing, and she was quite surprised to
-find that she remained the same size:  to be sure, this generally
-happens when one eats cake, but Alice had got so much into the
-way of expecting nothing but out-of-the-way things to happen,
-that it seemed quite dull and stupid for life to go on in the
-common way.
-
-  So she set to work, and very soon finished off the cake.
-
-     *       *       *       *       *       *       *
-
-         *       *       *       *       *       *
-
-     *       *       *       *       *       *       *
-
-
-
-
-                           CHAPTER II
-
-                        The Pool of Tears
-
-
-  `Curiouser and curiouser!' cried Alice (she was so much
-surprised, that for the moment she quite forgot how to speak good
-English); `now I'm opening out like the largest telescope that
-ever was!  Good-bye, feet!' (for when she looked down at her
-feet, they seemed to be almost out of sight, they were getting so
-far off).  `Oh, my poor little feet, I wonder who will put on
-your shoes and stockings for you now, dears?  I'm sure _I_ shan't
-be able!  I shall be a great deal too far off to trouble myself
-about you:  you must manage the best way you can; --but I must be
-kind to them,' thought Alice, `or perhaps they won't walk the
-way I want to go!  Let me see:  I'll give them a new pair of
-boots every Christmas.'
-
-  And she went on planning to herself how she would manage it.
-`They must go by the carrier,' she thought; `and how funny it'll
-seem, sending presents to one's own feet!  And how odd the
-directions will look!
-
-            ALICE'S RIGHT FOOT, ESQ.
-                HEARTHRUG,
-                    NEAR THE FENDER,
-                        (WITH ALICE'S LOVE).
-
-Oh dear, what nonsense I'm talking!'
-
-  Just then her head struck against the roof of the hall:  in
-fact she was now more than nine feet high, and she at once took
-up the little golden key and hurried off to the garden door.
-
-  Poor Alice!  It was as much as she could do, lying down on one
-side, to look through into the garden with one eye; but to get
-through was more hopeless than ever:  she sat down and began to
-cry again.
-
-  `You ought to be ashamed of yourself,' said Alice, `a great
-girl like you,' (she might well say this), `to go on crying in
-this way!  Stop this moment, I tell you!'  But she went on all
-the same, shedding gallons of tears, until there was a large pool
-all round her, about four inches deep and reaching half down the
-hall.
-
-  After a time she heard a little pattering of feet in the
-distance, and she hastily dried her eyes to see what was coming.
-It was the White Rabbit returning, splendidly dressed, with a
-pair of white kid gloves in one hand and a large fan in the
-other:  he came trotting along in a great hurry, muttering to
-himself as he came, `Oh! the Duchess, the Duchess! Oh! won't she
-be savage if I've kept her waiting!'  Alice felt so desperate
-that she was ready to ask help of any one; so, when the Rabbit
-came near her, she began, in a low, timid voice, `If you please,
-sir--'  The Rabbit started violently, dropped the white kid
-gloves and the fan, and skurried away into the darkness as hard
-as he could go.
-
-  Alice took up the fan and gloves, and, as the hall was very
-hot, she kept fanning herself all the time she went on talking:
-`Dear, dear!  How queer everything is to-day!  And yesterday
-things went on just as usual.  I wonder if I've been changed in
-the night?  Let me think:  was I the same when I got up this
-morning?  I almost think I can remember feeling a little
-different.  But if I'm not the same, the next question is, Who in
-the world am I?  Ah, THAT'S the great puzzle!'  And she began
-thinking over all the children she knew that were of the same age
-as herself, to see if she could have been changed for any of
-them.
-
-  `I'm sure I'm not Ada,' she said, `for her hair goes in such
-long ringlets, and mine doesn't go in ringlets at all; and I'm
-sure I can't be Mabel, for I know all sorts of things, and she,
-oh! she knows such a very little!  Besides, SHE'S she, and I'm I,
-and--oh dear, how puzzling it all is!  I'll try if I know all the
-things I used to know.  Let me see:  four times five is twelve,
-and four times six is thirteen, and four times seven is--oh dear!
-I shall never get to twenty at that rate!  However, the
-Multiplication Table doesn't signify:  let's try Geography.
-London is the capital of Paris, and Paris is the capital of Rome,
-and Rome--no, THAT'S all wrong, I'm certain!  I must have been
-changed for Mabel!  I'll try and say "How doth the little--"'
-and she crossed her hands on her lap as if she were saying lessons,
-and began to repeat it, but her voice sounded hoarse and
-strange, and the words did not come the same as they used to do:--
-
-            `How doth the little crocodile
-              Improve his shining tail,
-            And pour the waters of the Nile
-              On every golden scale!
-
-            `How cheerfully he seems to grin,
-              How neatly spread his claws,
-            And welcome little fishes in
-              With gently smiling jaws!'
-
-  `I'm sure those are not the right words,' said poor Alice, and
-her eyes filled with tears again as she went on, `I must be Mabel
-after all, and I shall have to go and live in that poky little
-house, and have next to no toys to play with, and oh! ever so
-many lessons to learn!  No, I've made up my mind about it; if I'm
-Mabel, I'll stay down here!  It'll be no use their putting their
-heads down and saying "Come up again, dear!"  I shall only look
-up and say "Who am I then?  Tell me that first, and then, if I
-like being that person, I'll come up:  if not, I'll stay down
-here till I'm somebody else"--but, oh dear!' cried Alice, with a
-sudden burst of tears, `I do wish they WOULD put their heads
-down!  I am so VERY tired of being all alone here!'
-
-  As she said this she looked down at her hands, and was
-surprised to see that she had put on one of the Rabbit's little
-white kid gloves while she was talking.  `How CAN I have done
-that?' she thought.  `I must be growing small again.'  She got up
-and went to the table to measure herself by it, and found that,
-as nearly as she could guess, she was now about two feet high,
-and was going on shrinking rapidly:  she soon found out that the
-cause of this was the fan she was holding, and she dropped it
-hastily, just in time to avoid shrinking away altogether.
-
-`That WAS a narrow escape!' said Alice, a good deal frightened at
-the sudden change, but very glad to find herself still in
-existence; `and now for the garden!' and she ran with all speed
-back to the little door:  but, alas! the little door was shut
-again, and the little golden key was lying on the glass table as
-before, `and things are worse than ever,' thought the poor child,
-`for I never was so small as this before, never!  And I declare
-it's too bad, that it is!'
-
-  As she said these words her foot slipped, and in another
-moment, splash! she was up to her chin in salt water.  Her first
-idea was that she had somehow fallen into the sea, `and in that
-case I can go back by railway,' she said to herself.  (Alice had
-been to the seaside once in her life, and had come to the general
-conclusion, that wherever you go to on the English coast you find
-a number of bathing machines in the sea, some children digging in
-the sand with wooden spades, then a row of lodging houses, and
-behind them a railway station.)  However, she soon made out that
-she was in the pool of tears which she had wept when she was nine
-feet high.
-
-  `I wish I hadn't cried so much!' said Alice, as she swam about,
-trying to find her way out.  `I shall be punished for it now, I
-suppose, by being drowned in my own tears!  That WILL be a queer
-thing, to be sure!  However, everything is queer to-day.'
-
-  Just then she heard something splashing about in the pool a
-little way off, and she swam nearer to make out what it was:  at
-first she thought it must be a walrus or hippopotamus, but then
-she remembered how small she was now, and she soon made out that
-it was only a mouse that had slipped in like herself.
-
-  `Would it be of any use, now,' thought Alice, `to speak to this
-mouse?  Everything is so out-of-the-way down here, that I should
-think very likely it can talk:  at any rate, there's no harm in
-trying.'  So she began:  `O Mouse, do you know the way out of
-this pool?  I am very tired of swimming about here, O Mouse!'
-(Alice thought this must be the right way of speaking to a mouse:
-she had never done such a thing before, but she remembered having
-seen in her brother's Latin Grammar, `A mouse--of a mouse--to a
-mouse--a mouse--O mouse!'  The Mouse looked at her rather
-inquisitively, and seemed to her to wink with one of its little
-eyes, but it said nothing.
-
-  `Perhaps it doesn't understand English,' thought Alice; `I
-daresay it's a French mouse, come over with William the
-Conqueror.'  (For, with all her knowledge of history, Alice had
-no very clear notion how long ago anything had happened.)  So she
-began again:  `Ou est ma chatte?' which was the first sentence in
-her French lesson-book.  The Mouse gave a sudden leap out of the
-water, and seemed to quiver all over with fright.  `Oh, I beg
-your pardon!' cried Alice hastily, afraid that she had hurt the
-poor animal's feelings.  `I quite forgot you didn't like cats.'
-
-  `Not like cats!' cried the Mouse, in a shrill, passionate
-voice.  `Would YOU like cats if you were me?'
-
-  `Well, perhaps not,' said Alice in a soothing tone:  `don't be
-angry about it.  And yet I wish I could show you our cat Dinah:
-I think you'd take a fancy to cats if you could only see her.
-She is such a dear quiet thing,' Alice went on, half to herself,
-as she swam lazily about in the pool, `and she sits purring so
-nicely by the fire, licking her paws and washing her face--and
-she is such a nice soft thing to nurse--and she's such a capital
-one for catching mice--oh, I beg your pardon!' cried Alice again,
-for this time the Mouse was bristling all over, and she felt
-certain it must be really offended.  `We won't talk about her any
-more if you'd rather not.'
-
-  `We indeed!' cried the Mouse, who was trembling down to the end
-of his tail.  `As if I would talk on such a subject!  Our family
-always HATED cats:  nasty, low, vulgar things!  Don't let me hear
-the name again!'
-
-  `I won't indeed!' said Alice, in a great hurry to change the
-subject of conversation.  `Are you--are you fond--of--of dogs?'
-The Mouse did not answer, so Alice went on eagerly:  `There is
-such a nice little dog near our house I should like to show you!
-A little bright-eyed terrier, you know, with oh, such long curly
-brown hair!  And it'll fetch things when you throw them, and
-it'll sit up and beg for its dinner, and all sorts of things--I
-can't remember half of them--and it belongs to a farmer, you
-know, and he says it's so useful, it's worth a hundred pounds!
-He says it kills all the rats and--oh dear!' cried Alice in a
-sorrowful tone, `I'm afraid I've offended it again!'  For the
-Mouse was swimming away from her as hard as it could go, and
-making quite a commotion in the pool as it went.
-
-  So she called softly after it, `Mouse dear!  Do come back
-again, and we won't talk about cats or dogs either, if you don't
-like them!'  When the Mouse heard this, it turned round and swam
-slowly back to her:  its face was quite pale (with passion, Alice
-thought), and it said in a low trembling voice, `Let us get to
-the shore, and then I'll tell you my history, and you'll
-understand why it is I hate cats and dogs.'
-
-  It was high time to go, for the pool was getting quite crowded
-with the birds and animals that had fallen into it:  there were a
-Duck and a Dodo, a Lory and an Eaglet, and several other curious
-creatures.  Alice led the way, and the whole party swam to the
-shore.
-
-
-
-                           CHAPTER III
-
-                  A Caucus-Race and a Long Tale
-
-
-  They were indeed a queer-looking party that assembled on the
-bank--the birds with draggled feathers, the animals with their
-fur clinging close to them, and all dripping wet, cross, and
-uncomfortable.
-
-  The first question of course was, how to get dry again:  they
-had a consultation about this, and after a few minutes it seemed
-quite natural to Alice to find herself talking familiarly with
-them, as if she had known them all her life.  Indeed, she had
-quite a long argument with the Lory, who at last turned sulky,
-and would only say, `I am older than you, and must know better';
-and this Alice would not allow without knowing how old it was,
-and, as the Lory positively refused to tell its age, there was no
-more to be said.
-
-  At last the Mouse, who seemed to be a person of authority among
-them, called out, `Sit down, all of you, and listen to me!  I'LL
-soon make you dry enough!'  They all sat down at once, in a large
-ring, with the Mouse in the middle.  Alice kept her eyes
-anxiously fixed on it, for she felt sure she would catch a bad
-cold if she did not get dry very soon.
-
-  `Ahem!' said the Mouse with an important air, `are you all ready?
-This is the driest thing I know.  Silence all round, if you please!
-"William the Conqueror, whose cause was favoured by the pope, was
-soon submitted to by the English, who wanted leaders, and had been
-of late much accustomed to usurpation and conquest.  Edwin and
-Morcar, the earls of Mercia and Northumbria--"'
-
-  `Ugh!' said the Lory, with a shiver.
-
-  `I beg your pardon!' said the Mouse, frowning, but very
-politely:  `Did you speak?'
-
-  `Not I!' said the Lory hastily.
-
-  `I thought you did,' said the Mouse.  `--I proceed.  "Edwin and
-Morcar, the earls of Mercia and Northumbria, declared for him:
-and even Stigand, the patriotic archbishop of Canterbury, found
-it advisable--"'
-
-  `Found WHAT?' said the Duck.
-
-  `Found IT,' the Mouse replied rather crossly:  `of course you
-know what "it" means.'
-
-  `I know what "it" means well enough, when I find a thing,' said
-the Duck:  `it's generally a frog or a worm.  The question is,
-what did the archbishop find?'
-
-  The Mouse did not notice this question, but hurriedly went on,
-`"--found it advisable to go with Edgar Atheling to meet William
-and offer him the crown.  William's conduct at first was
-moderate.  But the insolence of his Normans--"  How are you
-getting on now, my dear?' it continued, turning to Alice as it
-spoke.
-
-  `As wet as ever,' said Alice in a melancholy tone:  `it doesn't
-seem to dry me at all.'
-
-  `In that case,' said the Dodo solemnly, rising to its feet, `I
-move that the meeting adjourn, for the immediate adoption of more
-energetic remedies--'
-
-  `Speak English!' said the Eaglet.  `I don't know the meaning of
-half those long words, and, what's more, I don't believe you do
-either!'  And the Eaglet bent down its head to hide a smile:
-some of the other birds tittered audibly.
-
-  `What I was going to say,' said the Dodo in an offended tone,
-`was, that the best thing to get us dry would be a Caucus-race.'
-
-  `What IS a Caucus-race?' said Alice; not that she wanted much
-to know, but the Dodo had paused as if it thought that SOMEBODY
-ought to speak, and no one else seemed inclined to say anything.
-
-  `Why,' said the Dodo, `the best way to explain it is to do it.'
-(And, as you might like to try the thing yourself, some winter
-day, I will tell you how the Dodo managed it.)
-
-  First it marked out a race-course, in a sort of circle, (`the
-exact shape doesn't matter,' it said,) and then all the party
-were placed along the course, here and there.  There was no `One,
-two, three, and away,' but they began running when they liked,
-and left off when they liked, so that it was not easy to know
-when the race was over.  However, when they had been running half
-an hour or so, and were quite dry again, the Dodo suddenly called
-out `The race is over!' and they all crowded round it, panting,
-and asking, `But who has won?'
-
-  This question the Dodo could not answer without a great deal of
-thought, and it sat for a long time with one finger pressed upon
-its forehead (the position in which you usually see Shakespeare,
-in the pictures of him), while the rest waited in silence.  At
-last the Dodo said, `EVERYBODY has won, and all must have
-prizes.'
-
-  `But who is to give the prizes?' quite a chorus of voices
-asked.
-
-  `Why, SHE, of course,' said the Dodo, pointing to Alice with
-one finger; and the whole party at once crowded round her,
-calling out in a confused way, `Prizes! Prizes!'
-
-  Alice had no idea what to do, and in despair she put her hand
-in her pocket, and pulled out a box of comfits, (luckily the salt
-water had not got into it), and handed them round as prizes.
-There was exactly one a-piece all round.
-
-  `But she must have a prize herself, you know,' said the Mouse.
-
-  `Of course,' the Dodo replied very gravely.  `What else have
-you got in your pocket?' he went on, turning to Alice.
-
-  `Only a thimble,' said Alice sadly.
-
-  `Hand it over here,' said the Dodo.
-
-  Then they all crowded round her once more, while the Dodo
-solemnly presented the thimble, saying `We beg your acceptance of
-this elegant thimble'; and, when it had finished this short
-speech, they all cheered.
-
-  Alice thought the whole thing very absurd, but they all looked
-so grave that she did not dare to laugh; and, as she could not
-think of anything to say, she simply bowed, and took the thimble,
-looking as solemn as she could.
-
-  The next thing was to eat the comfits:  this caused some noise
-and confusion, as the large birds complained that they could not
-taste theirs, and the small ones choked and had to be patted on
-the back.  However, it was over at last, and they sat down again
-in a ring, and begged the Mouse to tell them something more.
-
-  `You promised to tell me your history, you know,' said Alice,
-`and why it is you hate--C and D,' she added in a whisper, half
-afraid that it would be offended again.
-
-  `Mine is a long and a sad tale!' said the Mouse, turning to
-Alice, and sighing.
-
-  `It IS a long tail, certainly,' said Alice, looking down with
-wonder at the Mouse's tail; `but why do you call it sad?'  And
-she kept on puzzling about it while the Mouse was speaking, so
-that her idea of the tale was something like this:--
-
-                    `Fury said to a
-                   mouse, That he
-                 met in the
-               house,
-            "Let us
-              both go to
-                law:  I will
-                  prosecute
-                    YOU.  --Come,
-                       I'll take no
-                        denial; We
-                     must have a
-                 trial:  For
-              really this
-           morning I've
-          nothing
-         to do."
-           Said the
-             mouse to the
-               cur, "Such
-                 a trial,
-                   dear Sir,
-                         With
-                     no jury
-                  or judge,
-                would be
-              wasting
-             our
-              breath."
-               "I'll be
-                 judge, I'll
-                   be jury,"
-                         Said
-                    cunning
-                      old Fury:
-                     "I'll
-                      try the
-                         whole
-                          cause,
-                             and
-                        condemn
-                       you
-                      to
-                       death."'
-
-</div>
-</body></html>
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/tide.mp4 and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/tide.mp4 differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/tidevideo.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/tidevideo.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochiperf/res/tidevideo.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochiperf/res/tidevideo.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body style="margin: 0px; padding: 0px; background-color: black;">
-<video id="videoelement" src="tide.mp4" autoplay loop="true"></video>
-</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_apzc_basic.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_apzc_basic.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_apzc_basic.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_apzc_basic.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_snapped_tests need landscape mode to run.");
-    return;
-  }
-
-  runTests();
-}
-
-let kTransformTimeout = 5000;
-
-let gEdit = null;
-let tabAdded = false;
-
-function setUp() {
-  if (!tabAdded) {
-    yield addTab(chromeRoot + "res/textdivs01.html");
-    tabAdded = true;
-  }
-  yield hideContextUI();
-}
-
-/*
-gTests.push({
-  desc: "soft keyboard reliability",
-  setUp: setUp,
-  run: function() {
-    yield waitForMs(3000);
-
-    let edit = Browser.selectedBrowser.contentDocument.getElementById("textinput");
-    // show the soft keyboard
-    let keyboardPromise = waitForObserver("metro_softkeyboard_shown", 20000);
-    sendNativeTap(edit);
-    yield waitForMs(5000);
-    sendNativeTap(edit);
-    yield keyboardPromise;
-    yield waitForMs(5000);
-
-    // hide the soft keyboard / navbar
-    keyboardPromise = waitForObserver("metro_softkeyboard_hidden", 20000);
-    sendNativeTap(Browser.selectedBrowser.contentDocument.getElementById("first"));
-    yield keyboardPromise;
-    yield waitForMs(5000);
-  },
-  tearDown: function () {
-    clearNativeTouchSequence();
-  }
-});
-*/
-
-gTests.push({
-  desc: "native long tap works",
-  setUp: setUp,
-  run: function() {
-    let edit = Browser.selectedBrowser.contentDocument.getElementById("textinput");
-    let promise = waitForEvent(document, "popupshown");
-    sendNativeLongTap(edit);
-    yield promise;
-    ContextMenuUI.hide();
-  },
-  tearDown: function () {
-    clearNativeTouchSequence();
-  }
-});
-
-/* Double-tap is disabled (bug 950832).
-gTests.push({
-  desc: "double tap transforms",
-  setUp: setUp,
-  run: function() {
-    let beginPromise = waitForObserver("apzc-transform-begin", kTransformTimeout);
-    let endPromise = waitForObserver("apzc-transform-end", kTransformTimeout);
-
-    sendNativeDoubleTap(Browser.selectedBrowser.contentDocument.getElementById("second"));
-
-    yield beginPromise;
-    yield endPromise;
-
-    beginPromise = waitForObserver("apzc-transform-begin", kTransformTimeout);
-    endPromise = waitForObserver("apzc-transform-end", kTransformTimeout);
-
-    sendNativeDoubleTap(Browser.selectedBrowser.contentDocument.getElementById("second"));
-
-    yield beginPromise;
-    yield endPromise;
-  },
-  tearDown: function () {
-    clearNativeTouchSequence();
-  }
-});
-*/
-
-gTests.push({
-  desc: "scroll transforms",
-  setUp: setUp,
-  run: function() {
-    let beginPromise = waitForObserver("apzc-transform-begin", kTransformTimeout);
-    let endPromise = waitForObserver("apzc-transform-end", kTransformTimeout);
-
-    var touchdrag = new TouchDragAndHold();
-    touchdrag.useNativeEvents = true;
-    touchdrag.nativePointerId = 1;
-    yield touchdrag.start(Browser.selectedTab.browser.contentWindow,
-                          10, 100, 10, 10);
-    touchdrag.end();
-
-    yield beginPromise;
-    yield endPromise;
-  },
-  tearDown: function () {
-    clearNativeTouchSequence();
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_bookmarks.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_bookmarks.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_bookmarks.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_bookmarks.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,245 +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";
-
-let gStartView = null;
-
-function test() {
-  runTests();
-}
-
-function setup() {
-  PanelUI.hide();
-
-  if (!BrowserUI.isStartTabVisible) {
-    let tab = yield addTab("about:start");
-    gStartView = tab.browser.contentWindow.BookmarksStartView._view;
-
-    yield waitForCondition(() => BrowserUI.isStartTabVisible);
-
-    yield hideContextUI();
-  }
-
-  BookmarksTestHelper.setup();
-}
-
-function tearDown() {
-  PanelUI.hide();
-  BookmarksTestHelper.restore();
-}
-
-gTests.push({
-  desc: "Test bookmarks StartUI hide",
-  setUp: setup,
-  tearDown: tearDown,
-  run: function testBookmarksStartHide() {
-    let hideButton = document.getElementById("hide-selected-button");
-
-    // --------- hide item 2
-
-    let item = gStartView._getItemForBookmarkId(2);
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item, 10, 10);
-    yield promise;
-
-    ok(!hideButton.hidden, "Hide button is visible.");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    hideButton.click();
-    yield promise;
-
-    item = gStartView._getItemForBookmarkId(2);
-
-    ok(!item, "Item not in grid");
-    ok(!gStartView._pinHelper.isPinned(2), "Item hidden");
-    ok(gStartView._set.itemCount === gStartView.maxTiles, "Grid repopulated");
-
-    // --------- hide multiple items
-
-    let item1 = gStartView._getItemForBookmarkId(0);
-    let item2 = gStartView._getItemForBookmarkId(5);
-    let item3 = gStartView._getItemForBookmarkId(12);
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item1, 10, 10);
-    sendContextMenuClickToElement(window, item2, 10, 10);
-    sendContextMenuClickToElement(window, item3, 10, 10);
-    yield promise;
-
-    ok(!hideButton.hidden, "Hide button is visible.");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    EventUtils.synthesizeMouse(hideButton, 10, 10, {}, window);
-    yield promise;
-
-    item1 = gStartView._getItemForBookmarkId(0);
-    item2 = gStartView._getItemForBookmarkId(5);
-    item3 = gStartView._getItemForBookmarkId(12);
-
-    ok(!item1 && !item2 && !item3, "Items are not in grid");
-    ok(!gStartView._pinHelper.isPinned(0) && !gStartView._pinHelper.isPinned(5) && !gStartView._pinHelper.isPinned(12) , "Items hidden");
-    ok(gStartView._set.itemCount === gStartView.maxTiles - 1, "Grid repopulated");
-  }
-});
-
-gTests.push({
-  desc: "Test bookmarks StartUI delete",
-  setUp: setup,
-  tearDown: tearDown,
-  run: function testBookmarksStartDelete() {
-    let restoreButton = document.getElementById("restore-selected-button");
-    let deleteButton = document.getElementById("delete-selected-button");
-
-    // --------- delete item 2 and restore
-
-    let item = gStartView._getItemForBookmarkId(2);
-    let initialLocation = gStartView._set.getIndexOfItem(item);
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item, 10, 10);
-    yield promise;
-
-    ok(!deleteButton.hidden, "Delete button is visible.");
-
-    let promise = waitForCondition(() => !restoreButton.hidden);
-    EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
-    yield promise;
-
-    item = gStartView._getItemForBookmarkId(2);
-
-    ok(!item, "Item not in grid");
-    ok(BookmarksTestHelper._nodes[2], "Item not deleted yet");
-    ok(!restoreButton.hidden, "Restore button is visible.");
-    ok(gStartView._set.itemCount === gStartView.maxTiles, "Grid repopulated");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    EventUtils.synthesizeMouse(restoreButton, 10, 10, {}, window);
-    yield promise;
-
-    item = gStartView._getItemForBookmarkId(2);
-    ok(item, "Item back in grid");
-    ok(gStartView._set.getIndexOfItem(item) === initialLocation, "Back in same position.");
-
-    // --------- delete item 2 for realz
-
-    let item = gStartView._getItemForBookmarkId(2);
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item, 10, 10);
-    yield promise;
-
-    ok(!deleteButton.hidden, "Delete button is visible.");
-
-    let promise = waitForCondition(() => !restoreButton.hidden);
-    EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
-    yield promise;
-
-    item = gStartView._getItemForBookmarkId(2);
-
-    ok(!item, "Item not in grid");
-    ok(BookmarksTestHelper._nodes[2], "Item not deleted yet");
-    ok(!restoreButton.hidden, "Restore button is visible.");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    Elements.contextappbar.dismiss();
-    yield promise;
-
-    item = gStartView._getItemForBookmarkId(2);
-
-    ok(!item, "Item not in grid");
-    ok(!BookmarksTestHelper._nodes[2], "Item RIP");
-    ok(gStartView._set.itemCount === gStartView.maxTiles, "Grid repopulated");
-
-    // --------- delete multiple items and restore
-
-    let item1 = gStartView._getItemForBookmarkId(0);
-    let item2 = gStartView._getItemForBookmarkId(5);
-    let item3 = gStartView._getItemForBookmarkId(12);
-
-    let initialLocation1 = gStartView._set.getIndexOfItem(item1);
-    let initialLocation2 = gStartView._set.getIndexOfItem(item2);
-    let initialLocation3 = gStartView._set.getIndexOfItem(item3);
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item1, 10, 10);
-    sendContextMenuClickToElement(window, item2, 10, 10);
-    sendContextMenuClickToElement(window, item3, 10, 10);
-    yield promise;
-
-    ok(!deleteButton.hidden, "Delete button is visible.");
-
-    let promise = waitForCondition(() => !restoreButton.hidden);
-    EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
-    yield promise;
-
-    item1 = gStartView._getItemForBookmarkId(0);
-    item2 = gStartView._getItemForBookmarkId(5);
-    item3 = gStartView._getItemForBookmarkId(12);
-
-    ok(!item1 && !item2 && !item3, "Items are not in grid");
-    ok(BookmarksTestHelper._nodes[0] && BookmarksTestHelper._nodes[5] && BookmarksTestHelper._nodes[12],
-      "Items not deleted yet");
-    ok(!restoreButton.hidden, "Restore button is visible.");
-    ok(gStartView._set.itemCount === gStartView.maxTiles - 1, "Grid repopulated");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    EventUtils.synthesizeMouse(restoreButton, 10, 10, {}, window);
-    yield promise;
-
-    item1 = gStartView._getItemForBookmarkId(0);
-    item2 = gStartView._getItemForBookmarkId(5);
-    item3 = gStartView._getItemForBookmarkId(12);
-
-    ok(item1 && item2 && item3, "Items are back in grid");
-    ok(gStartView._set.getIndexOfItem(item1) === initialLocation1 &&
-      gStartView._set.getIndexOfItem(item2) === initialLocation2 &&
-      gStartView._set.getIndexOfItem(item3) === initialLocation3, "Items back in the same position.");
-    ok(gStartView._set.itemCount === gStartView.maxTiles, "Grid repopulated");
-
-    // --------- delete multiple items for good
-
-    let item1 = gStartView._getItemForBookmarkId(0);
-    let item2 = gStartView._getItemForBookmarkId(5);
-    let item3 = gStartView._getItemForBookmarkId(12);
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item1, 10, 10);
-    sendContextMenuClickToElement(window, item2, 10, 10);
-    sendContextMenuClickToElement(window, item3, 10, 10);
-    yield promise;
-
-    yield waitForCondition(() => !deleteButton.hidden);
-
-    ok(!deleteButton.hidden, "Delete button is visible.");
-
-    let promise = waitForCondition(() => !restoreButton.hidden);
-    EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
-    yield promise;
-
-    item1 = gStartView._getItemForBookmarkId(0);
-    item2 = gStartView._getItemForBookmarkId(5);
-    item3 = gStartView._getItemForBookmarkId(12);
-
-    ok(!item1 && !item2 && !item3, "Items are not in grid");
-    ok(BookmarksTestHelper._nodes[0] && BookmarksTestHelper._nodes[5] && BookmarksTestHelper._nodes[12],
-      "Items not deleted yet");
-    ok(!restoreButton.hidden, "Restore button is visible.");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    Elements.contextappbar.dismiss();
-    yield promise;
-
-    item1 = gStartView._getItemForBookmarkId(0);
-    item2 = gStartView._getItemForBookmarkId(5);
-    item3 = gStartView._getItemForBookmarkId(12);
-
-    ok(!item1 && !item2 && !item3, "Items are not in grid");
-    ok(!BookmarksTestHelper._nodes[0] && !BookmarksTestHelper._nodes[5] && !BookmarksTestHelper._nodes[12],
-      "Items are gone");
-    ok(gStartView._set.itemCount === gStartView.maxTiles - 1, "Grid repopulated");
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_canonizeURL.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_canonizeURL.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_canonizeURL.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_canonizeURL.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-/* -*- 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";
-
-function test() {
-  let testcases = [
-    ["example", {}, "example"],
-    ["example", {ctrlKey: true}, "http://www.example.com/"],
-    ["example.org", {ctrlKey: true}, "example.org"],
-    ["example", {shiftKey: true}, "http://www.example.net/"],
-    ["example", {shiftKey: true, ctrlKey: true}, "http://www.example.org/"],
-    ["  example  ", {ctrlKey: true}, "http://www.example.com/"],
-    [" example/a ", {ctrlKey: true}, "http://www.example.com/a"]
-  ];
-  for (let [input, modifiers, result] of testcases) {
-    is(BrowserUI._edit._canonizeURL(input, modifiers), result, input + " -> " + result);
-  }
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_circular_progress_indicator.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_circular_progress_indicator.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_circular_progress_indicator.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_circular_progress_indicator.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +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/. */
-
-let doc;
-
-function test() {
-  waitForExplicitFinish();
-  Task.spawn(function(){
-    info(chromeRoot + "browser_progress_indicator.xul");
-    yield addTab(chromeRoot + "browser_progress_indicator.xul");
-    doc = Browser.selectedTab.browser.contentWindow.document;
-  }).then(runTests);
-}
-
-gTests.push({
-  desc: "circular progress indicator binding is applied.",
-  run: function() {
-    ok(doc, "doc got defined");
-
-    let progressIndicator = doc.querySelector("#progress-indicator");
-    ok(progressIndicator, "progress-indicator is found");
-    is(typeof progressIndicator.reset, "function", "#progress-indicator has a reset() function");
-    is(typeof progressIndicator.updateProgress, "function", "#progress-indicator has a updateProgress() function");
-  }
-});
-
-gTests.push({
-  desc: "start and end angles are correct for various percents complete",
-  run: function() {
-    let progressIndicator = doc.querySelector("#progress-indicator");
-    ok(progressIndicator, "progress-indicator is found");
-    is(typeof progressIndicator.updateProgress, "function", "#progress-indicator has a updateProgress() function");
-
-    let expectedStartAngle = 1.5 * Math.PI;
-
-    let percentComplete = 0;
-    let [startAngle, endAngle] = progressIndicator.updateProgress(percentComplete);
-    is(startAngle, expectedStartAngle, "start angle is correct");
-    is(endAngle, startAngle + (2 * Math.PI * (percentComplete / 100)), "end angle is correct");
-
-    percentComplete = 0.05;
-    [startAngle, endAngle] = progressIndicator.updateProgress(percentComplete);
-    is(startAngle, expectedStartAngle, "start angle is correct");
-    is(endAngle, startAngle + (2 * Math.PI * (percentComplete / 100)), "end angle is correct");
-
-    percentComplete = 0.5;
-    [startAngle, endAngle] = progressIndicator.updateProgress(percentComplete);
-    is(startAngle, expectedStartAngle, "start angle is correct");
-    is(endAngle, startAngle + (2 * Math.PI * (percentComplete / 100)), "end angle is correct");
-
-    percentComplete = 1;
-    [startAngle, endAngle] = progressIndicator.updateProgress(percentComplete);
-    is(startAngle, expectedStartAngle, "start angle is correct");
-    is(endAngle, startAngle + (2 * Math.PI * (percentComplete / 100)), "end angle is correct");
-  }
-});
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_colorUtils.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_colorUtils.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_colorUtils.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_colorUtils.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* -*- 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";
-
-function test() {
-  runTests();
-}
-
-gTests.push({
-  desc: "iconColorCache purges stale entries",
-  setUp: function() {
-    Components.utils.import("resource:///modules/colorUtils.jsm", this);
-    let dayMs = 86400000;
-    let ColorUtils = this.ColorUtils;
-    this.ColorUtils.init();
-
-    // add a stale cache entry
-    ColorUtils.iconColorCache.set('http://test.old/favicon.ico', {
-      "foreground":"rgb(255,255,255)",
-      "background":"rgb(78,78,84)",
-      "timestamp":Date.now() - (2*dayMs)
-    });
-    // add a fresh cache entry
-    ColorUtils.iconColorCache.set('http://test.new/favicon.ico', {
-      "foreground":"rgb(255,255,255)",
-      "background":"rgb(78,78,84)",
-      "timestamp":Date.now()
-    });
-  },
-  run: function testIconColorCachePurge() {
-    let dayMs = 86400000;
-    let ColorUtils = this.ColorUtils;
-    let cachePurgeSpy = spyOnMethod(ColorUtils.iconColorCache, 'purge');
-
-    // notify observers, indicating a day has passed since last notification
-    Services.obs.notifyObservers(null, "idle-daily", dayMs);
-    is(cachePurgeSpy.callCount, 1);
-    cachePurgeSpy.restore();
-
-    ok(ColorUtils.iconColorCache.has('http://test.new/favicon.ico'),
-       "fresh cache entry was not removed in the purge");
-
-    ok(!ColorUtils.iconColorCache.has('http://test.old/favicon.ico'),
-       "stale cache entry was removed in the purge");
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_01.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_01.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_01.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_01.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-    </style>
-  </head>
-<body style="padding: 1px; margin: 1px;">
-<div style="margin: 0; padding: 0;">
-  <span>
-    <img id="image01" width="100" height="100" src="./res/image01.png" />
-  </span>
-</div>
-</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_02.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_02.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_02.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_02.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-    </style>
-  </head>
-<body style="padding: 10px; margin: 10px;">
-  <div style="margin: 0; padding: 5px;">
-    <span id="text1">hello, I'm sorry but I must be going.</span>
-  </div>
-  <br />
-  <div style="margin: 0; padding: 5px;">
-    <span id="text2"><a id="text2-link" href="#test">hello, I'm sorry but</a> I must be going.</span>
-  </div>
-  <br />
-  <div style="margin: 0; padding: 5px;">
-    <span id="text3"><input id="text3-input" value="hello, I'm sorry but I must be going." style="width:200px;"/></span>
-  </div>
-  <br />
-  <br />
-  <br />
-  <br />
-  <br />
-  <br />
-  <br />
-  <div style="margin: 0; padding: 5px; margin-bottom: 9999px;">
-    <span id="text4">hello, I'm sorry but I must be going.</span>
-  </div>
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_03.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_03.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_03.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_03.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<meta charset="utf-8">
-</head>
-
-<body  bgcolor=white>
-
-Hello there. <a href="#hello">hello there.</a>
-<div style="margin-left: 280px;">
-
-<iframe id="frame1" width="800" height="600" src="res/textblock01.html"></iframe>
-
-<br />
-<br />
-Hello there. <a id="rlink1" href="#hello">hello there.</a>
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-
-</div>
-</body></html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_04.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_04.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_04.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_04.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-    </style>
-  </head>
-<body style="padding: 10px; margin: 10px;">
-  <div style="margin: 0; padding: 200px 0;">
-    <span id="text1">hello, I'm sorry but I <a id="text1-link" href="#test">must be going</a>.</span>
-  </div>
-  <div style="margin: 0; padding: 200px 0;">
-    <span id="text2"><a id="text2-link" href="#test">hello, I'm sorry but</a> I must be going.</span>
-  </div>
-</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_05.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_05.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_05.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests_05.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-    </style>
-  </head>
-<body style="padding: 10px; margin: 10px;">
-  <span id="text1">Test text</span>
-  <div contenteditable="true" id="div1" style="border: 2px solid blue; width: 200px; height: 200px;">
-    <table>
-      <tr><td>Test content</td></tr>
-    </table>
-  </div>
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_menu_tests.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,959 +0,0 @@
-// -*- 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";
-
-function debugClipFlavors(aClip)
-{
-  let xfer = Cc["@mozilla.org/widget/transferable;1"].
-             createInstance(Ci.nsITransferable);
-  xfer.init(null);
-  aClip.getData(xfer, Ci.nsIClipboard.kGlobalClipboard);
-  let array = xfer.flavorsTransferableCanExport();
-  let count = array.Count();
-  info("flavors:" + count);
-  for (let idx = 0; idx < count; idx++) {
-    let string = array.GetElementAt(idx).QueryInterface(Ci.nsISupportsString);
-    info("[" + idx + "] " + string);
-  }
-}
-
-function checkContextMenuPositionRange(aElement, aMinLeft, aMaxLeft, aMinTop, aMaxTop) {
-  ok(aElement.left > aMinLeft && aElement.left < aMaxLeft,
-    "Left position is " + aElement.left + ", expected between " + aMinLeft + " and " + aMaxLeft);
-
-  ok(aElement.top > aMinTop && aElement.top < aMaxTop,
-    "Top position is " + aElement.top + ", expected between " + aMinTop + " and " + aMaxTop);
-}
-
-gTests.push({
-  desc: "text context menu",
-  run: function test() {
-    info(chromeRoot + "browser_context_menu_tests_02.html");
-    yield addTab(chromeRoot + "browser_context_menu_tests_02.html");
-
-    purgeEventQueue();
-    emptyClipboard();
-
-    let win = Browser.selectedTab.browser.contentWindow;
-
-    yield hideContextUI();
-
-    ////////////////////////////////////////////////////////////
-    // Context menu in content on selected text
-
-    // select some text
-    let span = win.document.getElementById("text1");
-    win.getSelection().selectAllChildren(span);
-
-    yield waitForMs(0);
-
-    // invoke selection context menu
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, span);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    // selected text context:
-    checkContextUIMenuItemVisibility(["context-copy",
-                                      "context-search"]);
-
-    let menuItem = document.getElementById("context-copy");
-    promise = waitForEvent(document, "popuphidden");
-    EventUtils.synthesizeMouse(menuItem, 10, 10, {}, win);
-
-    yield promise;
-
-    // The wait is needed to give time to populate the clipboard.
-    let string = "";
-    yield waitForCondition(function () {
-      string = SpecialPowers.getClipboardData("text/unicode");
-      return string === span.textContent;
-    });
-    ok(string === span.textContent, "copied selected text from span");
-
-    win.getSelection().removeAllRanges();
-
-    ////////////////////////////////////////////////////////////
-    // Context menu in content on selected text that includes a link
-
-    // invoke selection with link context menu
-    let link = win.document.getElementById("text2-link");
-    win.getSelection().selectAllChildren(link);
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, link);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    // selected text context:
-    checkContextUIMenuItemVisibility(["context-copy",
-                                      "context-search",
-                                      "context-open-in-new-tab",
-                                      "context-copy-link"]);
-
-    promise = waitForEvent(document, "popuphidden");
-    win.scrollBy(0, 1);
-    let hidden = yield promise;
-    ok(hidden && !(hidden instanceof Error), "scrolling hides the context menu");
-    win.getSelection().removeAllRanges();
-    win.scrollBy(0, -1);
-
-    ////////////////////////////////////////////////////////////
-    // Context menu in content on a link
-
-    link = win.document.getElementById("text2-link");
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, link);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    // selected text context:
-    checkContextUIMenuItemVisibility(["context-open-in-new-tab",
-                                      "context-copy-link",
-                                      "context-bookmark-link"]);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    ////////////////////////////////////////////////////////////
-    // context in input with no selection, no data on clipboard
-
-    emptyClipboard();
-
-    let input = win.document.getElementById("text3-input");
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, input);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    checkContextUIMenuItemVisibility(["context-select",
-                                      "context-select-all"]);
-
-    // copy menu item should not exist when no text is selected
-    let menuItem = document.getElementById("context-copy");
-    ok(menuItem && menuItem.hidden, "menu item is not visible");
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    ////////////////////////////////////////////////////////////
-    // context in input with selection copied to clipboard
-
-    let input = win.document.getElementById("text3-input");
-    input.value = "hello, I'm sorry but I must be going.";
-    input.setSelectionRange(0, 5);
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, input, 20);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    checkContextUIMenuItemVisibility(["context-cut",
-                                      "context-copy"]);
-
-    let menuItem = document.getElementById("context-copy");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    EventUtils.synthesizeMouse(menuItem, 10, 10, {}, win);
-
-    yield popupPromise;
-
-    // The wait is needed to give time to populate the clipboard.
-    let string = "";
-    yield waitForCondition(function () {
-      string = SpecialPowers.getClipboardData("text/unicode");
-      return string === "hello";
-    });
-
-    ok(string === "hello", "copied selected text");
-
-    emptyClipboard();
-
-    ////////////////////////////////////////////////////////////
-    // context in input with text selection, no data on clipboard
-
-    input = win.document.getElementById("text3-input");
-    input.select();
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, input, 20);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    // selected text context:
-    checkContextUIMenuItemVisibility(["context-cut",
-                                      "context-copy"]);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    ////////////////////////////////////////////////////////////
-    // context in input with no selection, data on clipboard
-
-    SpecialPowers.clipboardCopyString("foo");
-    input = win.document.getElementById("text3-input");
-    input.select();
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, input, 20);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    // selected text context:
-    checkContextUIMenuItemVisibility(["context-cut",
-                                      "context-copy",
-                                      "context-paste"]);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    ////////////////////////////////////////////////////////////
-    // context in input with selection cut to clipboard
-
-    emptyClipboard();
-
-    let input = win.document.getElementById("text3-input");
-    input.value = "hello, I'm sorry but I must be going.";
-    input.setSelectionRange(0, 5);
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, input, 20);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    checkContextUIMenuItemVisibility(["context-cut",
-                                      "context-copy"]);
-
-    let menuItem = document.getElementById("context-cut");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    EventUtils.synthesizeMouse(menuItem, 10, 10, {}, win);
-
-    yield popupPromise;
-
-    // The wait is needed to give time to populate the clipboard.
-    let string = "";
-    yield waitForCondition(function () {
-      string = SpecialPowers.getClipboardData("text/unicode");
-      return string === "hello";
-    });
-
-    let inputValue = input.value;
-    ok(string === "hello", "cut selected text in clipboard");
-    ok(inputValue === ", I'm sorry but I must be going.", "cut selected text from input value");
-
-    emptyClipboard();
-
-    ////////////////////////////////////////////////////////////
-    // context in empty input, data on clipboard (paste operation)
-
-    SpecialPowers.clipboardCopyString("foo");
-    input = win.document.getElementById("text3-input");
-    input.value = "";
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, input, 20);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    // selected text context:
-    checkContextUIMenuItemVisibility(["context-paste"]);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    ////////////////////////////////////////////////////////////
-    // context in empty input, no data on clipboard (??)
-
-    emptyClipboard();
-    ContextUI.dismiss();
-
-    input = win.document.getElementById("text3-input");
-    input.value = "";
-
-    promise = waitForEvent(Elements.tray, "transitionend");
-    sendContextMenuClickToElement(win, input, 20);
-    yield promise;
-
-    // should *not* be visible
-    ok(!ContextMenuUI._menuPopup.visible, "is visible");
-
-    // the test above will invoke the app bar
-    yield hideContextUI();
-
-    Browser.closeTab(Browser.selectedTab, { forceClose: true });
-    purgeEventQueue();
-  }
-});
-
-gTests.push({
-  desc: "checks for context menu positioning when browser shifts",
-  run: function test() {
-    info(chromeRoot + "browser_context_menu_tests_02.html");
-    yield addTab(chromeRoot + "browser_context_menu_tests_02.html");
-
-    purgeEventQueue();
-    emptyClipboard();
-
-    let browserwin = Browser.selectedTab.browser.contentWindow;
-
-    yield hideContextUI();
-
-    ////////////////////////////////////////////////////////////
-    // test for proper context menu positioning when the browser
-    // is offset by a notification box.
-
-    yield showNotification();
-
-    // select some text
-    let span = browserwin.document.getElementById("text4");
-    browserwin.getSelection().selectAllChildren(span);
-
-    // invoke selection context menu
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(browserwin, span);
-    yield promise;
-
-    // should be visible and at a specific position
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    let notificationBox = Browser.getNotificationBox();
-    let notification = notificationBox.getNotificationWithValue("popup-blocked");
-    let notificationHeight = notification.boxObject.height;
-
-    checkContextMenuPositionRange(ContextMenuUI._panel, 0, 15, 220, 230);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    Browser.closeTab(Browser.selectedTab, { forceClose: true });
-  }
-});
-
-/*
-XXX code used to diagnose bug 880739
-
-var observeLogger = {
-  observe: function (aSubject, aTopic, aData) {
-    info("observeLogger: " + aTopic);
-  },
-  QueryInterface: function (aIID) {
-    if (!aIID.equals(Ci.nsIObserver) &&
-        !aIID.equals(Ci.nsISupportsWeakReference) &&
-        !aIID.equals(Ci.nsISupports)) {
-      throw Components.results.NS_ERROR_NO_INTERFACE;
-    }
-    return this;
-  },
-  init: function init() {
-    Services.obs.addObserver(observeLogger, "dl-start", true);
-    Services.obs.addObserver(observeLogger, "dl-done", true);
-    Services.obs.addObserver(observeLogger, "dl-failed", true);
-    Services.obs.addObserver(observeLogger, "dl-scanning", true);
-    Services.obs.addObserver(observeLogger, "dl-blocked", true);
-    Services.obs.addObserver(observeLogger, "dl-dirty", true);
-    Services.obs.addObserver(observeLogger, "dl-cancel", true);
-  },
-  shutdown: function shutdown() {
-    Services.obs.removeObserver(observeLogger, "dl-start");
-    Services.obs.removeObserver(observeLogger, "dl-done");
-    Services.obs.removeObserver(observeLogger, "dl-failed");
-    Services.obs.removeObserver(observeLogger, "dl-scanning");
-    Services.obs.removeObserver(observeLogger, "dl-blocked");
-    Services.obs.removeObserver(observeLogger, "dl-dirty");
-    Services.obs.removeObserver(observeLogger, "dl-cancel");
-  }
-}
-*/
-
-// Image context menu tests
-gTests.push({
-  desc: "image context menu",
-  setUp: function() {
-    // XXX code used to diagnose bug 880739
-    //observeLogger.init();
-  },
-  tearDown: function() {
-    // XXX code used to diagnose bug 880739
-    //observeLogger.shutdown();
-  },
-  run: function test() {
-    info(chromeRoot + "browser_context_menu_tests_01.html");
-    yield addTab(chromeRoot + "browser_context_menu_tests_01.html");
-
-    let win = Browser.selectedTab.browser.contentWindow;
-
-    purgeEventQueue();
-
-    yield hideContextUI();
-
-    // If we don't do this, sometimes the first sendContextMenuClickToWindow
-    // will trigger the app bar.
-    yield waitForImageLoad(win, "image01");
-
-    ////////////////////////////////////////////////////////////
-    // Context menu options
-    /*
-    XXX disabled temporarily due to bug 880739
-
-    // image01 - 1x1x100x100
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToWindow(win, 10, 10);
-    yield promise;
-
-    purgeEventQueue();
-
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    checkContextUIMenuItemVisibility(["context-save-image-lib",
-                                      "context-copy-image",
-                                      "context-copy-image-loc",
-                                      "context-open-image-tab"]);
-
-    ////////////////////////////////////////////////////////////
-    // Save to image library
-
-    let dirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
-                           .getService(Components.interfaces.nsIProperties);
-    let saveLocationPath = dirSvc.get("Pict", Components.interfaces.nsIFile);
-    saveLocationPath.append("image01.png");
-
-    registerCleanupFunction(function () {
-      saveLocationPath.remove(false);
-    });
-
-    if (saveLocationPath.exists()) {
-      info("had to remove old image!");
-      saveLocationPath.remove(false);
-    }
-
-    let menuItem = document.getElementById("context-save-image-lib");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-
-    // dl-start, dl-failed, dl-scanning, dl-blocked, dl-dirty, dl-cancel
-    let downloadPromise = waitForObserver("dl-done", 10000);
-
-    let popupPromise = waitForEvent(document, "popuphidden");
-    EventUtils.synthesizeMouse(menuItem, 10, 10, {}, win);
-    yield popupPromise;
-    yield downloadPromise;
-
-    purgeEventQueue();
-
-    ok(saveLocationPath.exists(), "image saved");
-    */
-    ////////////////////////////////////////////////////////////
-    // Copy image
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToWindow(win, 20, 20);
-    yield promise;
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    let menuItem = document.getElementById("context-copy-image");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    EventUtils.synthesizeMouse(menuItem, 10, 10, {}, win);
-    yield popupPromise;
-
-    purgeEventQueue();
-
-    let clip = Cc["@mozilla.org/widget/clipboard;1"].getService(Ci.nsIClipboard);
-    let flavors = ["image/png"];
-    ok(clip.hasDataMatchingFlavors(flavors, flavors.length, Ci.nsIClipboard.kGlobalClipboard), "clip has my png flavor");
-
-    ////////////////////////////////////////////////////////////
-    // Copy image location
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToWindow(win, 30, 30);
-    yield promise;
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    menuItem = document.getElementById("context-copy-image-loc");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    popupPromise = waitForEvent(document, "popuphidden");
-    EventUtils.synthesizeMouse(menuItem, 10, 10, {}, win);
-    yield popupPromise;
-
-    purgeEventQueue();
-
-    let clip = Cc["@mozilla.org/widget/clipboard;1"].getService(Ci.nsIClipboard);
-    let flavors = ["text/unicode"];
-    ok(clip.hasDataMatchingFlavors(flavors, flavors.length, Ci.nsIClipboard.kGlobalClipboard), "clip has my text flavor");
-
-    let xfer = Cc["@mozilla.org/widget/transferable;1"].
-               createInstance(Ci.nsITransferable);
-    xfer.init(null);
-    xfer.addDataFlavor("text/unicode");
-    clip.getData(xfer, Ci.nsIClipboard.kGlobalClipboard);
-    let str = new Object();
-    let strLength = new Object();
-    xfer.getTransferData("text/unicode", str, strLength);
-    str = str.value.QueryInterface(Components.interfaces.nsISupportsString);
-
-    ok(str == chromeRoot + "res/image01.png", "url copied");
-
-    ////////////////////////////////////////////////////////////
-    // Open image in new tab
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToWindow(win, 40, 40);
-    yield promise;
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    menuItem = document.getElementById("context-open-image-tab");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let tabPromise = waitForEvent(document, "TabOpen");
-    popupPromise = waitForEvent(document, "popuphidden");
-    EventUtils.synthesizeMouse(menuItem, 10, 10, {}, win);
-    yield popupPromise;
-    let event = yield tabPromise;
-
-    purgeEventQueue();
-
-    let imagetab = Browser.getTabFromChrome(event.originalTarget);
-    ok(imagetab != null, "tab created");
-
-    Browser.closeTab(imagetab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "tests for subframe positioning",
-  run: function test() {
-    info(chromeRoot + "browser_context_menu_tests_03.html");
-    yield addTab(chromeRoot + "browser_context_menu_tests_03.html");
-
-    let win = Browser.selectedTab.browser.contentWindow;
-
-    // Sometimes the context ui is visible, sometimes it isn't.
-    try {
-      yield waitForCondition(function () {
-        return ContextUI.isVisible;
-      }, 500, 50);
-    } catch (ex) {}
-
-    ContextUI.dismiss();
-
-    let frame1 = win.document.getElementById("frame1");
-    let link1 = frame1.contentDocument.getElementById("link1");
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(frame1.contentDocument.defaultView, link1, 85, 10);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    checkContextMenuPositionRange(ContextMenuUI._panel, 265, 280, 175, 190);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    frame1.contentDocument.defaultView.scrollBy(0, 200);
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(frame1.contentDocument.defaultView, link1, 85, 10);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    checkContextMenuPositionRange(ContextMenuUI._panel, 265, 280, 95, 110);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    let rlink1 = win.document.getElementById("rlink1");
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, rlink1, 40, 10);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    checkContextMenuPositionRange(ContextMenuUI._panel, 295, 310, 540, 555);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    win.scrollBy(0, 200);
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(win, rlink1, 40, 10);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    checkContextMenuPositionRange(ContextMenuUI._panel, 295, 310, 340, 355);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    let link2 = frame1.contentDocument.getElementById("link2");
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(frame1.contentDocument.defaultView, link2, 85, 10);
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    checkContextMenuPositionRange(ContextMenuUI._panel, 265, 280, 110, 125);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    Browser.closeTab(Browser.selectedTab, { forceClose: true });
-  }
-});
-
-function reopenSetUp() {
-  info(chromeRoot + "browser_context_menu_tests_04.html");
-  yield addTab(chromeRoot + "browser_context_menu_tests_04.html");
-
-  // Sometimes the context UI won't actually show up.
-  // Since we're just normalizing, we don't want waitForCondition
-  // to cause an orange, so we're putting a try/catch here.
-  try {
-    yield waitForCondition(() => ContextUI.isVisible);
-    ContextUI.dismiss();
-  } catch(e) {}
-}
-
-function reopenTearDown() {
-  let promise = waitForEvent(document, "popuphidden")
-  ContextMenuUI.hide();
-  yield promise;
-  ok(!ContextMenuUI._menuPopup.visible, "popup is actually hidden");
-
-  Browser.closeTab(Browser.selectedTab, { forceClose: true });
-}
-
-function getReopenTest(aElementInputFn, aWindowInputFn) {
-  return function () {
-    let win = Browser.selectedTab.browser.contentWindow;
-    let panel = ContextMenuUI._menuPopup._panel;
-
-    let link1 = win.document.getElementById("text1-link");
-    let link2 = win.document.getElementById("text2-link");
-
-    // Show the menu on link 1
-    let showpromise = waitForEvent(panel, "popupshown");
-    aElementInputFn(win, link1);
-
-    ok((yield showpromise), "popupshown event fired");
-    ok(ContextMenuUI._menuPopup.visible, "initial popup is visible");
-
-    // Show the menu on link 2
-    let hidepromise = waitForEvent(panel, "popuphidden");
-    showpromise = waitForEvent(panel, "popupshown");
-    aElementInputFn(win, link2);
-
-    ok((yield hidepromise), "popuphidden event fired");
-    ok((yield showpromise), "popupshown event fired");
-    ok(ContextMenuUI._menuPopup.visible, "popup is still visible");
-
-    // Hide the menu
-    hidepromise = waitForEvent(panel, "popuphidden")
-    aWindowInputFn(win, 10, 10);
-
-    ok((yield hidepromise), "popuphidden event fired");
-    ok(!ContextMenuUI._menuPopup.visible, "popup is no longer visible");
-  }
-}
-
-gTests.push({
-  desc: "bug 856264 - mouse - context menu should reopen on other links",
-  setUp: reopenSetUp,
-  tearDown: reopenTearDown,
-  run: getReopenTest(sendContextMenuMouseClickToElement, sendMouseClick)
-});
-
-gTests.push({
-  desc: "bug 856264 - touch - context menu should reopen on other links",
-  setUp: reopenSetUp,
-  tearDown: reopenTearDown,
-  run: getReopenTest(sendContextMenuClickToElement, sendTap)
-});
-
-gTests.push({
-  desc: "Bug 947505 - Right-click in a designMode document should display a " +
-        "context menu",
-  run: function test() {
-    info(chromeRoot + "browser_context_menu_tests_02.html");
-    yield addTab(chromeRoot + "browser_context_menu_tests_02.html");
-
-    purgeEventQueue();
-    emptyClipboard();
-    ContextUI.dismiss();
-
-    yield waitForCondition(() => !ContextUI.navbarVisible);
-
-    let tabWindow = Browser.selectedTab.browser.contentWindow;
-    let testSpan = tabWindow.document.getElementById("text1");
-
-    // Case #1: Document isn't in design mode and nothing is selected.
-    tabWindow.document.designMode = "off";
-
-    // Simulate right mouse click to reproduce the same step as noted in the
-    // appropriate bug. It's valid for non-touch case only.
-    synthesizeNativeMouseRDown(Browser.selectedTab.browser, 10, 10);
-    synthesizeNativeMouseRUp(Browser.selectedTab.browser, 10, 10);
-
-    yield waitForCondition(() => ContextUI.navbarVisible);
-
-    ok(ContextUI.navbarVisible, "Navbar is visible on context menu action.");
-    ok(ContextUI.tabbarVisible, "Tabbar is visible on context menu action.");
-
-    ContextUI.dismiss();
-    yield waitForCondition(() => !ContextUI.navbarVisible);
-
-    // Case #2: Document isn't in design mode and text is selected.
-    tabWindow.getSelection().selectAllChildren(testSpan);
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToSelection(tabWindow);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-copy", "context-search"]);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    // Case #3: Document is in design mode and nothing is selected.
-    tabWindow.document.designMode = "on";
-    tabWindow.getSelection().removeAllRanges();
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(tabWindow, testSpan);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-select-all", "context-select"]);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    // Case #4: Document is in design mode and text is selected.
-    tabWindow.getSelection().selectAllChildren(testSpan);
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToSelection(tabWindow);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-cut", "context-copy",
-                                      "context-select-all", "context-select",
-                                      "context-search"]);
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    Browser.closeTab(Browser.selectedTab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "Bug 961702 - 'Copy' context menu action does not copy rich content " +
-        "while document in design mode (or inside container that allows to " +
-        "edit its content)",
-  run: function test() {
-    info(chromeRoot + "browser_context_menu_tests_05.html");
-    yield addTab(chromeRoot + "browser_context_menu_tests_05.html");
-
-    purgeEventQueue();
-    emptyClipboard();
-    ContextUI.dismiss();
-
-    yield waitForCondition(() => !ContextUI.navbarVisible);
-
-    let tabWindow = Browser.selectedTab.browser.contentWindow;
-    let testDiv = tabWindow.document.getElementById("div1");
-
-    // Case #1: Document is in design mode.
-    tabWindow.document.designMode = "on";
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(tabWindow, testDiv);
-    yield promise;
-
-    let selectAllMenuItem = document.getElementById("context-select-all");
-    promise = waitForEvent(document, "popuphidden");
-    sendNativeTap(selectAllMenuItem);
-    yield promise;
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToSelection(tabWindow);
-    yield promise;
-
-    let copyMenuItem = document.getElementById("context-copy");
-    promise = waitForEvent(document, "popuphidden");
-    sendNativeTap(copyMenuItem);
-    yield promise;
-
-    // The wait is needed to give time to populate the clipboard.
-    let clipboardContent = "";
-    let contentToCopy = tabWindow.document.body.innerHTML;
-    yield waitForCondition(function () {
-      clipboardContent = SpecialPowers.getClipboardData("text/html");
-      return clipboardContent == contentToCopy;
-    });
-    ok(clipboardContent == contentToCopy, "Rich content copied.");
-
-    // Case #2: Container with editable content.
-    emptyClipboard();
-    tabWindow.document.designMode = "off";
-    tabWindow.getSelection().removeAllRanges();
-
-    promise = waitForEvent(tabWindow.document.body, "focus");
-    sendNativeTap(testDiv);
-    yield promise;
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(tabWindow, testDiv);
-    yield promise;
-
-    selectAllMenuItem = document.getElementById("context-select-all");
-    promise = waitForEvent(document, "popuphidden");
-    sendNativeTap(selectAllMenuItem);
-    yield promise;
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToSelection(tabWindow);
-    yield promise;
-
-    copyMenuItem = document.getElementById("context-copy");
-    promise = waitForEvent(document, "popuphidden");
-    sendNativeTap(copyMenuItem);
-    yield promise;
-
-     // The wait is needed to give time to populate the clipboard.
-    clipboardContent = "";
-    contentToCopy = testDiv.innerHTML;
-    yield waitForCondition(function () {
-      clipboardContent = SpecialPowers.getClipboardData("text/html");
-      return clipboardContent == contentToCopy;
-    });
-    ok(clipboardContent == contentToCopy, "Rich content copied.");
-
-    Browser.closeTab(Browser.selectedTab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "Bug 963067 - 'Cut' in the cut, copy, paste menu is always active " +
-        "after a browser launch.",
-  run: function test() {
-    info(chromeRoot + "browser_context_menu_tests_02.html");
-    yield addTab(chromeRoot + "browser_context_menu_tests_02.html");
-
-    purgeEventQueue();
-    emptyClipboard();
-
-    ContextUI.dismiss();
-    yield waitForCondition(() => !ContextUI.navbarVisible);
-
-    let tabWindow = Browser.selectedTab.browser.contentWindow;
-    let input = tabWindow.document.getElementById("text3-input");
-    let cutMenuItem = document.getElementById("context-cut");
-
-    input.select();
-
-    // Emulate RichListBox's behavior and set first item selected by default.
-    cutMenuItem.selected = true;
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(tabWindow, input);
-    yield promise;
-
-    ok(!cutMenuItem.hidden && !cutMenuItem.selected,
-       "Cut menu item is visible and not selected.");
-
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-
-    Browser.closeTab(Browser.selectedTab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "Bug 867499 - Selecting 'copy' from context menu for selected text " +
-        "dismisses selection.",
-  run: function test() {
-    info(chromeRoot + "browser_context_menu_tests_02.html");
-    yield addTab(chromeRoot + "browser_context_menu_tests_02.html");
-
-    emptyClipboard();
-    ContextUI.dismiss();
-
-    yield waitForCondition(() => !ContextUI.navbarVisible);
-
-    let tabWindow = Browser.selectedTab.browser.contentWindow;
-    let testSpan = tabWindow.document.getElementById("text1");
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(tabWindow, testSpan, 5, 5);
-    yield promise;
-
-    yield waitForCondition(()=>SelectionHelperUI.isSelectionUIVisible);
-
-    promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToSelection(tabWindow);
-    yield promise;
-
-    let copyMenuItem = document.getElementById("context-copy");
-
-    ok(!copyMenuItem.hidden, "Copy menu item should be visible.");
-
-    promise = waitForEvent(document, "popuphidden");
-    sendNativeTap(copyMenuItem, 5, 5);
-    yield promise;
-    yield waitForCondition(() =>
-        !!SpecialPowers.getClipboardData("text/unicode"));
-
-    ok(SelectionHelperUI.isSelectionUIVisible,
-        "Selection monocles should stay active after copy action.");
-
-    Browser.closeTab(Browser.selectedTab, { forceClose: true });
-  }
-});
-
-function test() {
-  setDevPixelEqualToPx();
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_ui.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_ui.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_context_ui.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_context_ui.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,288 +0,0 @@
-/* -*- 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";
-
-function test() {
-  runTests();
-}
-
-function doEdgeUIGesture() {
-  let event = document.createEvent("Events");
-  event.initEvent("MozEdgeUICompleted", true, false);
-  window.dispatchEvent(event);
-}
-
-function fireTabURLChanged(tab, hasLocationChanged) {
-  let urlChangedEvent = document.createEvent("UIEvents");
-  urlChangedEvent.initUIEvent("URLChanged", true, false, window,
-      hasLocationChanged);
-  tab.browser.dispatchEvent(urlChangedEvent);
-}
-
-function getpage(idx) {
-  return "http://mochi.test:8888/metro/browser/metro/base/tests/mochitest/" + "res/blankpage" + idx + ".html";
-}
-
-gTests.push({
-  desc: "Context UI on about:start",
-  run: function testAboutStart() {
-    let tab = yield addTab("about:start");
-
-    yield waitForCondition(function () {
-      return BrowserUI.isStartTabVisible;
-      });
-
-    is(BrowserUI.isStartTabVisible, true, "Start UI is displayed on about:start");
-    is(ContextUI.navbarVisible, true, "Navbar is displayed on about:start");
-    is(ContextUI.tabbarVisible, false, "Tabbar is not displayed initially");
-    is(ContextUI.contextAppbarVisible, false, "Appbar is not displayed initially");
-
-    // toggle on
-    doEdgeUIGesture();
-    is(ContextUI.navbarVisible, true, "Navbar is still visible after one swipe");
-    is(ContextUI.tabbarVisible, true, "Tabbar is visible after one swipe");
-    is(ContextUI.contextAppbarVisible, false, "Appbar is hidden after one swipe");
-
-    // toggle off
-    doEdgeUIGesture();
-    is(ContextUI.navbarVisible, true, "Navbar is still visible after second swipe");
-    is(ContextUI.tabbarVisible, false, "Tabbar is hidden after second swipe");
-    is(ContextUI.contextAppbarVisible, false, "Appbar is hidden after second swipe");
-
-    // sanity check - toggle on again
-    doEdgeUIGesture();
-    is(ContextUI.navbarVisible, true, "Navbar is still visible after third swipe");
-    is(ContextUI.tabbarVisible, true, "Tabbar is visible after third swipe");
-    is(ContextUI.contextAppbarVisible, false, "Appbar is hidden after third swipe");
-
-    is(BrowserUI.isStartTabVisible, true, "Start UI is still visible");
-
-    Browser.closeTab(tab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "Context UI on a web page (about:)",
-  run: function testAbout() {
-    let tab = yield addTab("about:");
-    ContextUI.dismiss();
-    is(BrowserUI.isStartTabVisible, false, "Start UI is not visible on about:");
-    is(ContextUI.navbarVisible, false, "Navbar is not initially visible on about:");
-    is(ContextUI.tabbarVisible, false, "Tabbar is not initially visible on about:");
-
-    doEdgeUIGesture();
-    is(ContextUI.navbarVisible, true, "Navbar is visible after one swipe");
-    is(ContextUI.tabbarVisible, true, "Tabbar is visble after one swipe");
-
-    doEdgeUIGesture();
-    is(ContextUI.navbarVisible, false, "Navbar is not visible after second swipe");
-    is(ContextUI.tabbarVisible, false, "Tabbar is not visible after second swipe");
-
-    is(BrowserUI.isStartTabVisible, false, "Start UI is still not visible");
-
-    Browser.closeTab(tab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "Control-L keyboard shortcut",
-  run: function testAbout() {
-    let tab = yield addTab("about:");
-    ContextUI.dismiss();
-    is(ContextUI.navbarVisible, false, "Navbar is not initially visible");
-    is(ContextUI.tabbarVisible, false, "Tab bar is not initially visible");
-
-    EventUtils.synthesizeKey('l', { accelKey: true });
-    is(ContextUI.navbarVisible, true, "Navbar is visible");
-    is(ContextUI.tabbarVisible, false, "Tab bar is not visible");
-
-    let edit = document.getElementById("urlbar-edit");
-    is(edit.value, "about:", "Location field contains the page URL");
-    ok(document.commandDispatcher.focusedElement, edit.inputField, "Location field is focused");
-    is(edit.selectionStart, 0, "Location field is selected");
-    is(edit.selectionEnd, edit.value.length, "Location field is selected");
-
-    edit.selectionEnd = 0;
-    is(edit.selectionStart, 0, "Location field is unselected");
-    is(edit.selectionEnd, 0, "Location field is unselected");
-
-    EventUtils.synthesizeKey('l', { accelKey: true });
-    is(edit.selectionStart, 0, "Location field is selected again");
-    is(edit.selectionEnd, edit.value.length, "Location field is selected again");
-
-    Browser.closeTab(tab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "taps vs context ui dismissal",
-  run: function () {
-    // off by default
-    InputSourceHelper.isPrecise = false;
-    InputSourceHelper.fireUpdate();
-
-    let tab = yield addTab("about:mozilla");
-
-    ok(ContextUI.navbarVisible, "navbar visible after open");
-
-    let navButtonDisplayPromise = waitForEvent(NavButtonSlider.back, "transitionend");
-
-    yield loadUriInActiveTab(getpage(1));
-
-    is(tab.browser.currentURI.spec, getpage(1), getpage(1));
-    ok(ContextUI.navbarVisible, "navbar visible after navigate 1");
-
-    yield loadUriInActiveTab(getpage(2));
-
-    is(tab.browser.currentURI.spec, getpage(2), getpage(2));
-    ok(ContextUI.navbarVisible, "navbar visible after navigate 2");
-
-    yield loadUriInActiveTab(getpage(3));
-
-    is(tab.browser.currentURI.spec, getpage(3), getpage(3));
-    ok(ContextUI.navbarVisible, "navbar visible after navigate 3");
-
-    // These transition in after we navigate. If we click on one of
-    // them before they are visible they don't work, so wait for
-    // display to occur.
-    yield navButtonDisplayPromise;
-
-    yield navBackViaNavButton();
-    yield waitForCondition2(function () { return tab.browser.currentURI.spec == getpage(2); }, "getpage(2)");
-    yield waitForCondition2(function () { return ContextUI.navbarVisible; }, "ContextUI.navbarVisible");
-
-    is(tab.browser.currentURI.spec, getpage(2), getpage(2));
-
-    yield navForward();
-    yield waitForCondition2(function () { return tab.browser.currentURI.spec == getpage(3); }, "getpage(3)");
-
-    is(tab.browser.currentURI.spec, getpage(3), getpage(3));
-    ok(ContextUI.navbarVisible, "navbar visible after navigate");
-
-    doEdgeUIGesture();
-
-    is(ContextUI.navbarVisible, true, "Navbar is visible after swipe");
-    is(ContextUI.tabbarVisible, true, "Tabbar is visible after swipe");
-
-    yield navBackViaNavButton();
-    yield waitForCondition2(function () { return tab.browser.currentURI.spec == getpage(2); }, "getpage(2)");
-
-    is(tab.browser.currentURI.spec, getpage(2), getpage(2));
-    is(ContextUI.navbarVisible, true, "Navbar is visible after navigating back (overlay)");
-    yield waitForCondition2(function () { return !ContextUI.tabbarVisible; }, "!ContextUI.tabbarVisible");
-
-    sendElementTap(window, window.document.documentElement);
-    yield waitForCondition2(function () { return !BrowserUI.navbarVisible; }, "!BrowserUI.navbarVisible");
-
-    is(ContextUI.tabbarVisible, false, "Tabbar is hidden after content tap");
-
-    yield navForward();
-    yield waitForCondition2(function () {
-      return tab.browser.currentURI.spec == getpage(3) && ContextUI.navbarVisible;
-    }, "getpage(3)");
-
-    is(tab.browser.currentURI.spec, getpage(3), getpage(3));
-    ok(ContextUI.navbarVisible, "navbar visible after navigate");
-
-    yield navBackViaNavButton();
-    yield waitForCondition2(function () { return tab.browser.currentURI.spec == getpage(2); }, "getpage(2)");
-    yield waitForCondition2(function () { return !ContextUI.tabbarVisible; }, "!ContextUI.tabbarVisible");
-
-    is(tab.browser.currentURI.spec, getpage(2), getpage(2));
-    is(ContextUI.navbarVisible, true, "Navbar is visible after navigating back (overlay)");
-
-    ContextUI.dismiss();
-
-    let note = yield showNotification();
-    doEdgeUIGesture();
-    sendElementTap(window, note);
-
-    is(ContextUI.navbarVisible, true, "Navbar is visible after clicking notification close button");
-
-    removeNotifications();
-
-    Browser.closeTab(tab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "Bug 907244 - Opening a new tab when the page has focus doesn't correctly focus the location bar",
-  run: function () {
-    let mozTab = yield addTab("about:mozilla");
-
-    // addTab will dismiss navbar, but lets check anyway.
-    ok(!ContextUI.navbarVisible, "navbar dismissed");
-
-    BrowserUI.doCommand("cmd_newTabKey");
-    let newTab = Browser.selectedTab;
-    yield newTab.pageShowPromise;
-
-    yield waitForCondition(() => ContextUI.navbarVisible);
-    ok(ContextUI.navbarVisible, "navbar visible");
-
-    let edit = document.getElementById("urlbar-edit");
-
-    ok(edit.focused, "Edit has focus");
-
-    // Lets traverse since node.contains() doesn't work for anonymous elements.
-    let parent = document.activeElement;
-    while(parent && parent != edit) {
-      parent = parent.parentNode;
-    }
-
-    ok(parent === edit, 'Active element is a descendant of urlbar');
-
-    Browser.closeTab(newTab, { forceClose: true });
-    Browser.closeTab(mozTab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "Bug 933989 - New tab button in tab bar always sets focus to the url bar, triggering soft keyboard",
-  run: function () {
-    let mozTab = yield addTab("about:mozilla");
-
-    yield hideNavBar();
-    ok(!ContextUI.navbarVisible, "navbar dismissed");
-
-    BrowserUI.doCommand("cmd_newTab");
-    let newTab = Browser.selectedTab;
-    yield newTab.pageShowPromise;
-
-    yield waitForCondition(() => ContextUI.navbarVisible);
-    ok(ContextUI.navbarVisible, "navbar visible");
-
-    let edit = document.getElementById("urlbar-edit");
-
-    ok(!edit.focused, "Edit is not focused");
-
-    Browser.closeTab(newTab, { forceClose: true });
-    Browser.closeTab(mozTab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "Bug 956576 - Location app bar pops up when fragment identifier " +
-        "changes (URL stuff after hash / number sign).",
-  run: function () {
-    let tab = yield addTab("about:mozilla");
-    yield showNavBar();
-    ok(ContextUI.navbarVisible, "Navbar is initially visible.");
-
-    ContextUI.dismiss();
-    ok(!ContextUI.navbarVisible, "Navbar is dismissed and hidden.");
-
-    let locationHasChanged = false;
-    fireTabURLChanged(tab, locationHasChanged);
-    ok(!ContextUI.navbarVisible, "Navbar isn't shown on URL fragment change.");
-
-    locationHasChanged = true;
-    fireTabURLChanged(tab, locationHasChanged);
-    ok(ContextUI.navbarVisible, "Navbar is shown on actual URL change.");
-
-    Browser.closeTab(tab, { forceClose: true });
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_crashprompt.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_crashprompt.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_crashprompt.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_crashprompt.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,222 +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";
-
-const Ci = Components.interfaces;
-const Cm = Components.manager;
-const Cc = Components.classes;
-
-const CONTRACT_ID = "@mozilla.org/xre/runtime;1";
-
-var gAppInfoClassID, gIncOldFactory, gOldCrashSubmit, gCrashesSubmitted;
-var gMockAppInfoQueried = false;
-
-function MockAppInfo() {
-}
-
-var newFactory = {
-  createInstance: function(aOuter, aIID) {
-    if (aOuter)
-      throw Components.results.NS_ERROR_NO_AGGREGATION;
-    return new MockAppInfo().QueryInterface(aIID);
-  },
-  lockFactory: function(aLock) {
-    throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
-  },
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
-};
-
-function initMockAppInfo() {
-  var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
-  gAppInfoClassID = registrar.contractIDToCID(CONTRACT_ID);
-  gIncOldFactory = Cm.getClassObject(Cc[CONTRACT_ID], Ci.nsIFactory);
-  registrar.unregisterFactory(gAppInfoClassID, gIncOldFactory);
-  var components = [MockAppInfo];
-  registrar.registerFactory(gAppInfoClassID, "", CONTRACT_ID, newFactory);
-  gIncOldFactory = Cm.getClassObject(Cc[CONTRACT_ID], Ci.nsIFactory);
-
-  gCrashesSubmitted = 0;
-  gOldCrashSubmit = BrowserUI.CrashSubmit;
-  BrowserUI.CrashSubmit = {
-    submit: function() {
-      gCrashesSubmitted++;
-    }
-  };
-}
-
-function cleanupMockAppInfo() {
-  if (gIncOldFactory) {
-    var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
-    registrar.unregisterFactory(gAppInfoClassID, newFactory);
-    registrar.registerFactory(gAppInfoClassID, "", CONTRACT_ID, gIncOldFactory);
-  }
-  gIncOldFactory = null;
-  BrowserUI.CrashSubmit = gOldCrashSubmit;
-}
-
-MockAppInfo.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIXULRuntime]),
-  get lastRunCrashID() {
-    gMockAppInfoQueried = true;
-    return this.crashid;
-  },
-}
-
-function GetAutoSubmitPref() {
-  return Services.prefs.getBoolPref("app.crashreporter.autosubmit");
-}
-
-function SetAutoSubmitPref(aValue) {
-  Services.prefs.setBoolPref('app.crashreporter.autosubmit', aValue);
-}
-
-function GetPromptedPref() {
-  return Services.prefs.getBoolPref("app.crashreporter.prompted");
-}
-
-function SetPromptedPref(aValue) {
-  Services.prefs.setBoolPref('app.crashreporter.prompted', aValue);
-}
-
-gTests.push({
-  desc: "Pressing 'cancel' button on the crash reporter prompt",
-  setUp: initMockAppInfo,
-  tearDown: cleanupMockAppInfo,
-
-  run: function() {
-    MockAppInfo.crashid = "testid";
-    SetAutoSubmitPref(false);
-    SetPromptedPref(false);
-
-    BrowserUI.startupCrashCheck();
-    yield waitForCondition2(function () {
-      return Browser.selectedBrowser.currentURI.spec == "about:crashprompt";
-    }, "Loading crash prompt");
-
-    yield Browser.selectedTab.pageShowPromise;
-    ok(true, "Loaded crash prompt");
-
-    EventUtils.sendMouseEvent({type: "click"},
-                              "refuseButton",
-                              Browser.selectedBrowser
-                                     .contentDocument
-                                     .defaultView);
-    yield waitForCondition2(function () {
-      return Browser.selectedBrowser.currentURI.spec == "about:blank";
-    }, "Crash prompt dismissed");
-
-    ok(!GetAutoSubmitPref(), "auto-submit pref should still be false");
-    ok(GetPromptedPref(), "prompted pref should now be true");
-    is(gCrashesSubmitted, 0, "did not submit crash report");
-  }
-});
-
-gTests.push({
-  desc: "Pressing 'Send Reports' button on the crash reporter prompt",
-  setUp: initMockAppInfo,
-  tearDown: cleanupMockAppInfo,
-
-  run: function() {
-    MockAppInfo.crashid = "testid";
-    SetAutoSubmitPref(false);
-    SetPromptedPref(false);
-
-    BrowserUI.startupCrashCheck();
-    yield waitForCondition2(function () {
-      return Browser.selectedBrowser.currentURI.spec == "about:crashprompt";
-    }, "Loading crash prompt");
-
-    yield Browser.selectedTab.pageShowPromise;
-    ok(true, "Loaded crash prompt");
-
-    EventUtils.sendMouseEvent({type: "click"},
-                              "sendReportsButton",
-                              Browser.selectedBrowser
-                                     .contentDocument
-                                     .defaultView);
-    yield waitForCondition2(function () {
-      return Browser.selectedBrowser.currentURI.spec == "about:blank";
-    }, "Crash prompt dismissed");
-
-    ok(GetAutoSubmitPref(), "auto-submit pref should now be true");
-    ok(GetPromptedPref(), "prompted pref should now be true");
-    // TODO: We don't submit a crash report when the user selects
-    // 'Send Reports' but eventually we want to.
-    // is(gCrashesSubmitted, 1, "submitted 1 crash report");
-  }
-});
-
-gTests.push({
-  desc: "Already prompted, crash reporting disabled",
-  setUp: initMockAppInfo,
-  tearDown: cleanupMockAppInfo,
-
-  run: function() {
-    MockAppInfo.crashid = "testid";
-    SetAutoSubmitPref(false);
-    SetPromptedPref(true);
-
-    BrowserUI.startupCrashCheck();
-    is(Browser.selectedBrowser.currentURI.spec,
-       "about:blank",
-       "Not loading crash prompt");
-
-    ok(!GetAutoSubmitPref(), "auto-submit pref should still be false");
-    ok(GetPromptedPref(), "prompted pref should still be true");
-    is(gCrashesSubmitted, 0, "did not submit crash report");
-  }
-});
-
-gTests.push({
-  desc: "Already prompted, crash reporting enabled",
-  setUp: initMockAppInfo,
-  tearDown: cleanupMockAppInfo,
-
-  run: function() {
-    MockAppInfo.crashid = "testid";
-    SetAutoSubmitPref(true);
-    SetPromptedPref(true);
-
-    BrowserUI.startupCrashCheck();
-    is(Browser.selectedBrowser.currentURI.spec,
-       "about:blank",
-       "Not loading crash prompt");
-
-    ok(GetAutoSubmitPref(), "auto-submit pref should still be true");
-    ok(GetPromptedPref(), "prompted pref should still be true");
-    is(gCrashesSubmitted, 1, "submitted 1 crash report");
-  }
-});
-
-gTests.push({
-  desc: "Crash reporting enabled, not prompted",
-  setUp: initMockAppInfo,
-  tearDown: cleanupMockAppInfo,
-
-  run: function() {
-    MockAppInfo.crashid = "testid";
-    SetAutoSubmitPref(true);
-    SetPromptedPref(false);
-
-    BrowserUI.startupCrashCheck();
-    is(Browser.selectedBrowser.currentURI.spec,
-       "about:blank",
-       "Not loading crash prompt");
-
-    ok(GetAutoSubmitPref(), "auto-submit pref should still be true");
-    // We don't check the "prompted" pref; it's equally correct for
-    // the pref to be true or false at this point
-    is(gCrashesSubmitted, 1, "submitted 1 crash report");
-  }
-});
-
-function test() {
-  if (!CrashReporter.enabled) {
-    info("crash reporter prompt tests didn't run, CrashReporter.enabled is false.");
-    return;
-  }
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_downloads.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_downloads.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_downloads.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_downloads.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,389 +0,0 @@
-/* -*- 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";
-
-/**
- * Provides infrastructure for automated download components tests.
- * (adapted from browser/component/downloads test's head.js)
- */
-
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
-
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-                                  "resource://gre/modules/FileUtils.jsm");
-
-const nsIDM = Ci.nsIDownloadManager;
-
-////////////////////////////////////////////////////////////////////////////////
-// Test Helpers
-
-var { spawn } = Task;
-
-function equalStrings(){
-  let ref = ""+arguments[0];
-  for (let i=1; i<arguments.length; i++){
-    if (ref !== ""+arguments[i]) {
-      info("equalStrings failure: " + ref + " != " + arguments[i]);
-      return false
-    }
-  }
-  return true;
-}
-
-function equalNumbers(){
-  let ref = Number(arguments[0]);
-  for (let i=1; i<arguments.length; i++){
-    if (ref !== Number(arguments[i])) return false;
-    if (ref !== Number(arguments[i])) {
-      info("equalNumbers failure: " + ref + " != " + Number(arguments[i]));
-      return false
-    }
-  }
-  return true;
-}
-
-function getPromisedDbResult(aStatement) {
-  let dbConnection = MetroDownloadsView.manager.DBConnection;
-  let statement = ("string" == typeof aStatement) ?
-        dbConnection.createAsyncStatement(
-          aStatement
-        ) : aStatement;
-
-  let deferred = Promise.defer(),
-      resultRows = [],
-      err = null;
-  try {
-    statement.executeAsync({
-      handleResult: function(aResultSet) {
-        let row;
-        if(!aResultSet) {
-          return;
-        }
-        while ((row = aResultSet.getNextRow())){
-          resultRows.push(row);
-        }
-      },
-      handleError: function(aError) {
-        Cu.reportError(aError);
-        err = aError;
-      },
-      handleCompletion: function(){
-        if (err) {
-          deferred.reject(err);
-        } else {
-          deferred.resolve(resultRows);
-        }
-     }
-    });
-  } finally {
-    statement.finalize();
-  }
-  return deferred.promise;
-}
-
-let gTestTargetFile = FileUtils.getFile("TmpD", ["dm-ui-test.file"]);
-gTestTargetFile.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
-registerCleanupFunction(function () {
-  gTestTargetFile.remove(false);
-  PanelUI.hide();
-});
-
-/**
- * This object contains a property for each column in the downloads table.
- */
-let gDownloadRowTemplate = {
-  name: "test-download.txt",
-  source: "http://www.example.com/test-download.txt",
-  target: NetUtil.newURI(gTestTargetFile).spec,
-  startTime: 1180493839859230,
-  endTime: 1180493839859234,
-  state: nsIDM.DOWNLOAD_FINISHED,
-  currBytes: 0,
-  maxBytes: -1,
-  preferredAction: 0,
-  autoResume: 0
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Test Infrastructure
-
-function test() {
-  runTests();
-}
-
-/////////////////////////////////////
-// shared test setup
-function resetDownloads(){
-  // clear out existing and any pending downloads in the db
-  // returns a promise
-
-  let promisedResult = getPromisedDbResult(
-    "DELETE FROM moz_downloads"
-  );
-  return promisedResult.then(function(aResult){
-    // // Reset any prefs that might have been changed.
-    // Services.prefs.clearUserPref("browser.download.panel.shown");
-
-    // Ensure that data is unloaded.
-    let dlMgr = MetroDownloadsView.manager;
-    let dlsToRemove = [];
-    // Clear all completed/cancelled downloads
-    dlMgr.cleanUp();
-    dlMgr.cleanUpPrivate();
-
-    // Queue up all active ones as well
-    for (let dlsEnum of [dlMgr.activeDownloads, dlMgr.activePrivateDownloads]) {
-      while (dlsEnum.hasMoreElements()) {
-        dlsToRemove.push(dlsEnum.next());
-      }
-    }
-    // Remove any queued up active downloads
-    dlsToRemove.forEach(function (dl) {
-      dl.remove();
-    });
-  });
-}
-
-function addDownloadRow(aDataRow) {
-  let deferredInsert = Promise.defer();
-  let dataRow = aDataRow;
-
-  let dm = Cc["@mozilla.org/download-manager;1"].getService(Ci.nsIDownloadManager);
-  let db = dm.DBConnection;
-
-  let columnNames = Object.keys(gDownloadRowTemplate).join(", ");
-  let parameterNames = Object.keys(gDownloadRowTemplate)
-                             .map(function(n) ":" + n)
-                             .join(", ");
-
-  let statement = db.createAsyncStatement(
-                  "INSERT INTO moz_downloads (" + columnNames +
-                  ", guid) VALUES(" + parameterNames + ", GENERATE_GUID())");
-
-  // Populate insert parameters from the provided data.
-  for (let columnName in gDownloadRowTemplate) {
-    if (!(columnName in dataRow)) {
-      // Update the provided row object with data from the global template,
-      // for columns whose value is not provided explicitly.
-      dataRow[columnName] = gDownloadRowTemplate[columnName];
-    }
-    statement.params[columnName] = dataRow[columnName];
-  }
-
-  // Run the statement asynchronously and wait.
-  let promisedDownloads = getPromisedDbResult(
-    statement
-  );
-  yield promisedDownloads.then(function(){
-      let newItemId = db.lastInsertRowID;
-      let download = dm.getDownload(newItemId);
-      deferredInsert.resolve(download);
-  });
-}
-
-function gen_addDownloadRows(aDataRows){
-  if (!aDataRows.length) {
-    yield null;
-  }
-
-  try {
-    // Add each of the provided downloads in reverse.
-    for (let i = aDataRows.length - 1; i >= 0; i--) {
-      let dataRow = aDataRows[i];
-      let download = yield addDownloadRow(dataRow);
-
-      // At each iteration, ensure that the start and end time in the global
-      // template is distinct, as these column are used to sort each download
-      // in its category.
-      gDownloadRowTemplate.startTime++;
-      gDownloadRowTemplate.endTime++;
-    }
-  } finally {
-    info("gen_addDownloadRows, finally");
-  }
-}
-
-/////////////////////////////////////
-// Test implementations
-
-gTests.push({
-  desc: "zero downloads",
-  run: function () {
-    yield resetDownloads();
-    todo(false, "Test there are no visible notifications with an empty db.");
-  }
-});
-
-/**
- * Make sure the downloads panel can display items in the right order and
- * contains the expected data.
- */
-gTests.push({
-  desc: "Show downloads",
-  run: function(){
-    // Display one of each download state.
-    let DownloadData = [
-      { endTime: 1180493839859239, state: nsIDM.DOWNLOAD_NOTSTARTED },
-      { endTime: 1180493839859238, state: nsIDM.DOWNLOAD_DOWNLOADING },
-      { endTime: 1180493839859237, state: nsIDM.DOWNLOAD_PAUSED },
-      { endTime: 1180493839859236, state: nsIDM.DOWNLOAD_SCANNING },
-      { endTime: 1180493839859235, state: nsIDM.DOWNLOAD_QUEUED },
-      { endTime: 1180493839859234, state: nsIDM.DOWNLOAD_FINISHED },
-      { endTime: 1180493839859233, state: nsIDM.DOWNLOAD_FAILED },
-      { endTime: 1180493839859232, state: nsIDM.DOWNLOAD_CANCELED },
-      { endTime: 1180493839859231, state: nsIDM.DOWNLOAD_BLOCKED_PARENTAL },
-      { endTime: 1180493839859230, state: nsIDM.DOWNLOAD_DIRTY },
-      { endTime: 1180493839859229, state: nsIDM.DOWNLOAD_BLOCKED_POLICY }
-    ];
-
-    yield resetDownloads();
-
-    try {
-      // Populate the downloads database with the data required by this test.
-      // we're going to add stuff to the downloads db.
-      yield spawn( gen_addDownloadRows( DownloadData ) );
-
-      todo( false, "Check that MetroDownloadsView._progressNotificationInfo and MetroDownloadsView._downloadCount \
-        have the correct length (DownloadData.length) \
-        May also test that the correct notifications show up for various states.");
-
-      todo(false, "Iterate through download objects in MetroDownloadsView._progressNotificationInfo \
-        and confirm that the downloads they refer to are the same as those in \
-        DownloadData.");
-    } catch(e) {
-      info("Show downloads, some error: " + e);
-    }
-    finally {
-      // Clean up when the test finishes.
-      yield resetDownloads();
-    }
-  }
-});
-
-/**
- * Make sure the downloads can be removed with the expected result on the notifications
- */
-gTests.push({
-  desc: "Remove downloads",
-  run: function(){
-    // Push a few items into the downloads db.
-    let DownloadData = [
-      { endTime: 1180493839859239, state: nsIDM.DOWNLOAD_FINISHED },
-      { endTime: 1180493839859238, state: nsIDM.DOWNLOAD_FINISHED },
-      { endTime: 1180493839859237, state: nsIDM.DOWNLOAD_FINISHED }
-    ];
-
-    yield resetDownloads();
-
-    try {
-      // Populate the downloads database with the data required by this test.
-      yield spawn( gen_addDownloadRows( DownloadData ) );
-
-      let downloadRows = null,
-          promisedDownloads;
-      // get all the downloads from the db
-      promisedDownloads = getPromisedDbResult(
-        "SELECT guid "
-      + "FROM moz_downloads "
-      + "ORDER BY startTime DESC"
-      ).then(function(aRows){
-        downloadRows = aRows;
-      }, function(aError){
-        throw aError;
-      });
-      yield promisedDownloads;
-
-      is(downloadRows.length, 3, "Correct number of downloads in the db before removal");
-
-      todo(false, "Get some download from MetroDownloadsView._progressNotificationInfo, \
-        confirm that its file exists, then remove it.");
-
-      // remove is async(?), wait a bit
-      yield waitForMs(0);
-
-      // get all the downloads from the db
-      downloadRows = null;
-      promisedDownloads = getPromisedDbResult(
-        "SELECT guid "
-      + "FROM moz_downloads "
-      + "ORDER BY startTime DESC"
-      ).then(function(aRows){
-        downloadRows = aRows;
-      }, function(aError){
-        throw aError;
-      });
-      yield promisedDownloads;
-
-      todo(false, "confirm that the removed download is no longer in the database \
-        and its file no longer exists.");
-
-    } catch(e) {
-      info("Remove downloads, some error: " + e);
-    }
-    finally {
-      // Clean up when the test finishes.
-      yield resetDownloads();
-    }
-  }
-});
-
-/**
- * Make sure the cancelled/aborted downloads are handled correctly.
- */
-gTests.push({
-  desc: "Cancel/Abort Downloads",
-  run: function(){
-    todo(false, "Ensure that a cancelled/aborted download is in the correct state \
-      including correct values for state variables (e.g. _downloadCount, _downloadsInProgress) \
-      and the existence of the downloaded file.");
-  }
-});
-
-/**
- * Make sure download notifications are moved when we close tabs.
- */
-gTests.push({
-  desc: "Download notifications in closed tabs",
-  setUp: function() {
-    // put up a couple notifications on the initial tab
-    let notificationBox = Browser.getNotificationBox();
-    notificationBox.appendNotification("not important", "low-priority-thing", "", notificationBox.PRIORITY_INFO_LOW, []);
-    notificationBox.appendNotification("so important", "high-priority-thing", "", notificationBox.PRIORITY_CRITICAL_HIGH, []);
-
-    // open a new tab where we'll conduct the test
-    yield addTab("about:mozilla");
-  },
-  run: function(){
-    let notificationBox = Browser.getNotificationBox();
-    let notn = MetroDownloadsView.showNotification("download-progress", "test message", [],
-           notificationBox.PRIORITY_WARNING_LOW);
-    Browser.closeTab(Browser.selectedTab);
-
-    yield waitForEvent(Elements.tabList, "TabRemove");
-
-    // expected behavior when a tab is closed while a download notification is showing:
-    // * the notification remains visible as long as a next tab/browser exists
-    // * normal rules about priority apply
-    // * notifications - including any pre-existing ones - display in expected order
-    let nextBox = Browser.getNotificationBox();
-    let currentNotification;
-
-    ok(nextBox.getNotificationWithValue("download-progress"), "notification was moved to next tab");
-
-    currentNotification = nextBox.currentNotification;
-    is(currentNotification.value, "high-priority-thing", "high priority notification is current");
-    currentNotification.close();
-
-    currentNotification = nextBox.currentNotification;
-    is(currentNotification.value, "download-progress", "download notification is next");
-    currentNotification.close();
-
-    currentNotification = nextBox.currentNotification;
-    is(currentNotification.value, "low-priority-thing", "low priority notification is next");
-    currentNotification.close();
-  }
-});
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_findbar.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_findbar.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_findbar.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_findbar.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title>Find bar tests</title>
-  </head>
-  <body>
-    <p>Find bar tests</p>
-    <p style="position: absolute; bottom: 0;">bottom</p>
-  </body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_findbar.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_findbar.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_findbar.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_findbar.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,132 +0,0 @@
-/* vim: set 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";
-
-function test() {
-  runTests();
-}
-
-gTests.push({
-  desc: "Access the find bar with the keyboard",
-  run: function() {
-    let tab = yield addTab(chromeRoot + "browser_findbar.html");
-    yield waitForCondition(() => BrowserUI.ready);
-    is(Elements.findbar.isShowing, false, "Find bar is hidden by default");
-
-    EventUtils.synthesizeKey("f", { accelKey: true });
-    yield waitForEvent(Elements.findbar, "transitionend");
-    is(Elements.findbar.isShowing, true, "Show find bar with Ctrl-F");
-
-    let textbox = document.getElementById("findbar-textbox");
-    is(textbox.value, "", "Find bar is empty");
-
-    EventUtils.sendString("bar");
-    is(textbox.value, "bar", "Type 'bar' into find bar");
-
-    EventUtils.synthesizeKey("f", { accelKey: true});
-    yield waitForEvent(Elements.findbar, "transitionend");
-    ok(document.commandDispatcher.focusedElement, textbox.inputField, "textbox field is focused with Ctrl-F");
-    is(textbox.selectionStart, 0, "textbox field is selected with Ctrl-F.");
-    is(textbox.selectionEnd, textbox.value.length, "textbox field is selected with Ctrl-F.");
-    
-    EventUtils.synthesizeKey("VK_ESCAPE", { accelKey: true });
-    yield waitForEvent(Elements.findbar, "transitionend");
-    is(Elements.findbar.isShowing, false, "Hide find bar with Esc");
-
-    Browser.closeTab(tab);
-  }
-});
-
-gTests.push({
-  desc: "Findbar/navbar interaction",
-  run: function() {
-    let tab = yield addTab(chromeRoot + "browser_findbar.html");
-    yield waitForCondition(() => BrowserUI.ready);
-    is(ContextUI.navbarVisible, false, "Navbar is hidden by default");
-    is(Elements.findbar.isShowing, false, "Find bar is hidden by default");
-
-    yield showNavBar();
-    is(ContextUI.navbarVisible, true, "Navbar is visible");
-    is(Elements.findbar.isShowing, false, "Find bar is still hidden");
-
-    EventUtils.synthesizeKey("f", { accelKey: true });
-    yield Promise.all([waitForEvent(Elements.navbar, "transitionend"),
-                       waitForEvent(Elements.findbar, "transitionend")]);
-    is(ContextUI.navbarVisible, false, "Navbar is hidden");
-    is(Elements.findbar.isShowing, true, "Findbar is visible");
-
-    yield Promise.all([showNavBar(),
-                       waitForEvent(Elements.findbar, "transitionend")]);
-    is(ContextUI.navbarVisible, true, "Navbar is visible again");
-    is(Elements.findbar.isShowing, false, "Find bar is hidden again");
-
-    Browser.closeTab(tab);
-  }
-});
-
-
-gTests.push({
-  desc: "Show and hide the find bar with mouse",
-  run: function() {
-    let tab = yield addTab(chromeRoot + "browser_findbar.html");
-    yield waitForCondition(() => BrowserUI.ready);
-    is(Elements.findbar.isShowing, false, "Find bar is hidden by default");
-
-    yield showNavBar();
-    EventUtils.sendMouseEvent({ type: "click" }, "menu-button");
-    EventUtils.sendMouseEvent({ type: "click" }, "context-findinpage");
-    yield waitForEvent(Elements.findbar, "transitionend");
-    is(Elements.findbar.isShowing, true, "Show find bar with menu item");
-
-    EventUtils.synthesizeMouse(document.getElementById("findbar-close-button"), 1, 1, {});
-    yield waitForEvent(Elements.findbar, "transitionend");
-    is(Elements.findbar.isShowing, false, "Hide find bar with close button");
-
-    Browser.closeTab(tab);
-  }
-});
-
-gTests.push({
-  desc: "Text at bottom of screen is not obscured by findbar",
-  run: function() {
-    let textbox = document.getElementById("findbar-textbox");
-
-    let tab = yield addTab(chromeRoot + "browser_findbar.html");
-    yield waitForCondition(() => BrowserUI.ready);
-    is(Elements.findbar.isShowing, false, "Find bar is hidden by default");
-
-    FindHelperUI.show();
-    yield waitForCondition(() => FindHelperUI.isActive);
-
-    EventUtils.sendString("bottom");
-    let event = yield waitForEvent(window, "MozDeckOffsetChanged");
-    ok(!(event instanceof Error), "MozDeckOffsetChanged received (1)");
-    ok(event.detail > 0, "Browser deck shifted upward");
-
-    textbox.select();
-    EventUtils.sendString("bar");
-    event = yield waitForEvent(window, "MozDeckOffsetChanged");
-    ok(!(event instanceof Error), "MozDeckOffsetChanged received (2)");
-    is(event.detail, 0, "Browser deck shifted back to normal");
-
-    textbox.select();
-    EventUtils.sendString("bottom");
-    event = yield waitForEvent(window, "MozDeckOffsetChanged");
-    ok(!(event instanceof Error), "MozDeckOffsetChanged received (3)");
-    ok(event.detail > 0, "Browser deck shifted upward again");
-
-    let waitForDeckOffset = waitForEvent(window, "MozDeckOffsetChanged");
-    let waitForTransitionEnd = waitForEvent(Elements.findbar, "transitionend");
-    FindHelperUI.hide();
-    event = yield waitForDeckOffset;
-    ok(!(event instanceof Error), "MozDeckOffsetChanged received (4)");
-    is(event.detail, 0, "Browser deck shifted back to normal when findbar hides");
-
-    // Cleanup.
-    yield waitForTransitionEnd;
-    Browser.closeTab(tab);
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_flyouts.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_flyouts.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_flyouts.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_flyouts.js	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-
-"use strict";
-
-gTests.push({
-  desc: "about flyout hides navbar, clears navbar selection, doesn't leak",
-  run: function() {
-    yield showNavBar();
-
-    let edit = document.getElementById("urlbar-edit");
-    edit.value = "http://www.wikipedia.org/";
-
-    sendElementTap(window, edit);
-
-    yield waitForCondition(function () {
-      return SelectionHelperUI.isSelectionUIVisible;
-    });
-    ok(ContextUI.navbarVisible, "nav bar visible");
-
-    let promise = waitForEvent(FlyoutPanelsUI.AboutFlyoutPanel._topmostElement, "transitionend");
-    FlyoutPanelsUI.show('AboutFlyoutPanel');
-    yield promise;
-
-    yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    });
-    ok(!ContextUI.navbarVisible, "nav bar hidden");
-
-    promise = waitForEvent(FlyoutPanelsUI.AboutFlyoutPanel._topmostElement, "transitionend");
-    FlyoutPanelsUI.hide('AboutFlyoutPanel');
-    yield promise;
-  }
-});
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_selection_tests need landscape mode to run.");
-    return;
-  }
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_form_auto_complete.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_form_auto_complete.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_form_auto_complete.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_form_auto_complete.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-</style>
-</head>
-<body style="margin: 20px 20px 20px 20px;">
-<form id="form1" method="get" autocomplete="on">
-<datalist id="testdatalist">
-   <option value="one">
-   <option value="two">
-   <option value="three">
-   <option value="four">
-   <option value="five">
-</datalist> 
-<input autocomplete="on" list="testdatalist" id="textedit1" style="width:200px;" type="text" />
-</form>
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_form_auto_complete.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_form_auto_complete.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_form_auto_complete.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_form_auto_complete.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +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";
-
-function clearFormHistory() {
-  FormHistory.update({ op : "remove" });
-}
-
-function test() {
-  runTests();
-  clearFormHistory();
-}
-
-function setUp() {
-  clearFormHistory();
-  PanelUI.hide();
-  yield hideContextUI();
-}
-
-function tearDown() {
-  PanelUI.hide();
-}
-
-function checkAutofillMenuItemContents(aItemList)
-{
-  let errors = 0;
-  let found = 0;
-  for (let idx = 0; idx < AutofillMenuUI.commands.childNodes.length; idx++) {
-    let item = AutofillMenuUI.commands.childNodes[idx];
-    let label = item.firstChild.getAttribute("value");
-    let value = item.getAttribute("data");
-    if (aItemList.indexOf(value) == -1) {
-      errors++;
-      info("unexpected entry:" + value);
-    } else {
-      found++;
-    }
-  }
-  is(errors, 0, "autofill menu item list error check");
-  is(found, aItemList.length, "autofill item list length mismatch, some items were not found.");
-}
-
-gTests.push({
-  desc: "simple auto complete test to insure auto complete code doesn't break.",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    let loadedPromise, shownPromise;
-
-    yield addTab(chromeRoot + "browser_form_auto_complete.html");
-    yield waitForCondition(function () {
-      return !Browser.selectedTab.isLoading();
-    });
-
-    let tabDocument = Browser.selectedTab.browser.contentWindow.document;
-    let form = tabDocument.getElementById("form1");
-    let input = tabDocument.getElementById("textedit1");
-
-    input.value = "hellothere";
-
-    loadedPromise = waitForObserver("satchel-storage-changed", null, "formhistory-add");
-    form.submit();
-    yield loadedPromise;
-
-    // XXX Solves a problem with events not getting delivered to Content.js
-    // immediately after submitting the form.
-    yield waitForMs(500);
-
-    tabDocument = Browser.selectedTab.browser.contentWindow.document;
-    input = tabDocument.getElementById("textedit1");
-    ok(input, "input isn't null");
-    input.focus();
-
-    // Desktop and metrofx display auto-completes in response to double mouse clicks. The
-    // first click is ignored.
-    shownPromise = waitForEvent(document, "popupshown");
-    EventUtils.synthesizeMouseAtCenter(input, {}, Browser.selectedTab.browser.contentWindow);
-    EventUtils.synthesizeMouseAtCenter(input, {}, Browser.selectedTab.browser.contentWindow);
-    yield shownPromise;
-
-    checkAutofillMenuItemContents(["hellothere", "one", "two", "three", "four", "five"]);
-  }
-});
-
-gTests.push({
-  desc: "Test autocomplete selection with arrow key.",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-
-    let newTab = yield addTab(chromeRoot + "browser_form_auto_complete.html");
-    yield waitForCondition(function () {
-      return !Browser.selectedTab.isLoading();
-    });
-
-    let tabDocument = newTab.browser.contentWindow.document;
-    let input = tabDocument.getElementById("textedit1");
-    input.focus();
-
-    let shownPromise = waitForEvent(document, "popupshown");
-    EventUtils.synthesizeKey("o", {}, window);
-    yield shownPromise;
-
-    EventUtils.synthesizeKey("VK_DOWN", {}, window);
-
-    yield waitForCondition(() => input.value == "one");
-
-    is(input.value, "one", "Input updated correctly");
-
-    EventUtils.synthesizeKey("VK_DOWN", {}, window);
-
-    yield waitForCondition(() => input.value == "two");
-
-    is(input.value, "two", "Input updated correctly");
-
-    Browser.closeTab(newTab, { forceClose: true });
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_form_selects.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_form_selects.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_form_selects.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_form_selects.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<html>
-<body bgcolor=white>
-<br />
-<br />
-<br />
-<br />
-<center>
-<select id="selectelement" style="height:200px; width:150px;" multiple>
-<option id="opt1">option 1</option>
-<option id="opt2">option 2</option>
-<option id="opt3">option 3</option>
-<option id="opt4">option 4</option>
-<option id="opt5">option 5</option>
-<option id="opt6">option 6</option>
-<option id="opt7">option 7</option>
-<option id="opt8">option 8</option>
-<option id="opt9">option 9</option>
-</select>
-</center>
-</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_form_selects.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_form_selects.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_form_selects.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_form_selects.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +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";
-
-function test() {
-  runTests();
-}
-
-gTests.push({
-  desc: "form multi-select test 1",
-  setUp: function () {
-  },
-  tearDown: function () {
-  },
-  run: function () {
-    yield addTab(chromeRoot + "browser_form_selects.html");
-    yield waitForCondition(function () {
-      return !Browser.selectedTab.isLoading();
-    });
-
-    let win = Browser.selectedTab.browser.contentWindow;
-    let tabdoc = Browser.selectedTab.browser.contentWindow.document;
-    let select = tabdoc.getElementById("selectelement");
-
-    // display the touch menu
-    let promise = waitForEvent(tabdoc, "popupshown");
-    sendNativeTap(select);
-    yield promise;
-
-    // tap every option
-    for (let node of SelectHelperUI._listbox.childNodes) {
-      sendNativeTap(node);
-    }
-
-    yield waitForCondition2(function () {
-      return Browser.selectedTab.browser.contentWindow.document.getElementById("opt9").selected;
-      }, "waiting for last option to select");
-
-    // check the menu state
-    for (let node of SelectHelperUI._listbox.childNodes) {
-      ok(node.selected, "option is selected");
-    }
-
-    // check the underlying form state
-    for (let index = 1; index < 10; index++) {
-      let option = tabdoc.getElementById("opt" + index);
-      ok(option.selected, "opt" + index + " form option selected");
-    }
-
-    // tap every option again
-    for (let node of SelectHelperUI._listbox.childNodes) {
-      sendNativeTap(node);
-    }
-
-    yield waitForCondition2(function () {
-      return !Browser.selectedTab.browser.contentWindow.document.getElementById("opt9").selected;
-      }, "waiting for last option to deselect");
-
-    // check the menu state
-    for (let node of SelectHelperUI._listbox.childNodes) {
-      ok(!node.selected, "option is not selected");
-    }
-
-    // check the underlying form state
-    for (let index = 1; index < 10; index++) {
-      let option = tabdoc.getElementById("opt" + index);
-      ok(!option.selected, "opt" + index + " form option not selected");
-    }
-
-  }
-});
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_history.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_history.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_history.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_history.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,272 +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";
-
-let gStartView = null;
-
-function test() {
-  runTests();
-}
-
-function scrollToEnd() {
-  getBrowser().contentWindow.scrollBy(50000, 0);
-}
-
-function setup() {
-  PanelUI.hide();
-
-  if (!BrowserUI.isStartTabVisible) {
-    let tab = yield addTab("about:start");
-    gStartView = tab.browser.contentWindow.HistoryStartView._view;
-
-    yield waitForCondition(() => BrowserUI.isStartTabVisible);
-
-    yield hideContextUI();
-  }
-
-  HistoryTestHelper.setup();
-
-  // Scroll to make sure all tiles are visible.
-  scrollToEnd();
-}
-
-function tearDown() {
-  PanelUI.hide();
-  HistoryTestHelper.restore();
-}
-
-function uriFromIndex(aIndex) {
-  return "http://mock-history-" + aIndex + ".com.br/"
-}
-
-gTests.push({
-  desc: "Test history StartUI hide",
-  setUp: setup,
-  tearDown: tearDown,
-  run: function testHistoryStartHide() {
-    let hideButton = document.getElementById("hide-selected-button");
-
-    // --------- hide item 2
-
-    let item = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item, 10, 10);
-    yield promise;
-
-    ok(!hideButton.hidden, "Hide button is visible.");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    hideButton.click();
-    yield promise;
-
-    item = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
-
-    ok(!item, "Item not in grid");
-    ok(!gStartView._pinHelper.isPinned(uriFromIndex(2)), "Item hidden");
-    is(gStartView._set.itemCount, gStartView.maxTiles, "Grid repopulated");
-
-    // --------- hide multiple items
-
-    let item1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
-    let item2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
-    let item3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
-
-    scrollToEnd();
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item1, 10, 10);
-    sendContextMenuClickToElement(window, item2, 10, 10);
-    sendContextMenuClickToElement(window, item3, 10, 10);
-    yield promise;
-
-    ok(!hideButton.hidden, "Hide button is visible.");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    EventUtils.synthesizeMouse(hideButton, 10, 10, {}, window);
-    yield promise;
-
-    item1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
-    item2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
-    item3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
-
-    ok(!item1 && !item2 && !item3, "Items are not in grid");
-    ok(!gStartView._pinHelper.isPinned(uriFromIndex(0)) && !gStartView._pinHelper.isPinned(uriFromIndex(5)) && !gStartView._pinHelper.isPinned(uriFromIndex(12)) , "Items hidden");
-    ok(gStartView._set.itemCount === gStartView.maxTiles - 1, "Grid repopulated");
-  }
-});
-
-gTests.push({
-  desc: "Test history StartUI delete",
-  setUp: setup,
-  tearDown: tearDown,
-  run: function testHistoryStartDelete() {
-    let restoreButton = document.getElementById("restore-selected-button");
-    let deleteButton = document.getElementById("delete-selected-button");
-
-    // --------- delete item 2 and restore
-
-    let item = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
-    let initialLocation = gStartView._set.getIndexOfItem(item);
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item, 10, 10);
-    yield promise;
-
-    ok(!deleteButton.hidden, "Delete button is visible.");
-
-    let promise = waitForCondition(() => !restoreButton.hidden);
-    EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
-    yield promise;
-
-    item = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
-
-    ok(!item, "Item not in grid");
-    ok(HistoryTestHelper._nodes[uriFromIndex(2)], "Item not actually deleted yet");
-    ok(!restoreButton.hidden, "Restore button is visible.");
-    ok(gStartView._set.itemCount === gStartView.maxTiles, "Grid repopulated");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    EventUtils.synthesizeMouse(restoreButton, 10, 10, {}, window);
-    yield promise;
-
-    item = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
-    ok(item, "Item back in grid");
-    ok(gStartView._set.getIndexOfItem(item) === initialLocation, "Back in same position.");
-    ok(gStartView._set.itemCount === gStartView.maxTiles, "Grid repopulated");
-
-    // --------- delete item 2 for realz
-
-    let item = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item, 10, 10);
-    yield promise;
-
-    yield waitForCondition(() => !deleteButton.hidden);
-
-    ok(!deleteButton.hidden, "Delete button is visible.");
-
-    let promise = waitForCondition(() => !restoreButton.hidden);
-    let populateGridSpy = spyOnMethod(gStartView, "populateGrid");
-
-    EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
-    yield promise;
-
-    is(populateGridSpy.callCount, 1, "populateGrid was called in response to the deleting a tile");
-
-    item = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
-
-    ok(!item, "Item not in grid");
-    ok(HistoryTestHelper._nodes[uriFromIndex(2)], "Item not deleted yet");
-    ok(!restoreButton.hidden, "Restore button is visible.");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    Elements.contextappbar.dismiss();
-    yield promise;
-
-    is(populateGridSpy.callCount, 1, "populateGrid not called when a removed item is actually deleted");
-    populateGridSpy.restore();
-
-    item = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
-
-    ok(!item, "Item not in grid");
-    ok(!HistoryTestHelper._nodes[uriFromIndex(2)], "Item RIP");
-    is(gStartView._set.itemCount, gStartView.maxTiles, "Grid repopulated");
-
-    // --------- delete multiple items and restore
-
-    let item1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
-    let item2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
-    let item3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
-
-    let initialLocation1 = gStartView._set.getIndexOfItem(item1);
-    let initialLocation2 = gStartView._set.getIndexOfItem(item2);
-    let initialLocation3 = gStartView._set.getIndexOfItem(item3);
-
-    scrollToEnd();
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item1, 10, 10);
-    sendContextMenuClickToElement(window, item2, 10, 10);
-    sendContextMenuClickToElement(window, item3, 10, 10);
-    yield promise;
-
-    yield waitForCondition(() => !deleteButton.hidden);
-
-    ok(!deleteButton.hidden, "Delete button is visible.");
-
-    let promise = waitForCondition(() => !restoreButton.hidden);
-    EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
-    yield promise;
-
-    item1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
-    item2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
-    item3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
-
-    ok(!item1 && !item2 && !item3, "Items are not in grid");
-    ok(HistoryTestHelper._nodes[uriFromIndex(0)] && HistoryTestHelper._nodes[uriFromIndex(5)] && HistoryTestHelper._nodes[uriFromIndex(12)],
-      "Items not deleted yet");
-    ok(!restoreButton.hidden, "Restore button is visible.");
-    ok(gStartView._set.itemCount === gStartView.maxTiles - 1, "Grid repopulated");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    EventUtils.synthesizeMouse(restoreButton, 10, 10, {}, window);
-    yield promise;
-
-    item1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
-    item2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
-    item3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
-
-    ok(item1 && item2 && item3, "Items are back in grid");
-    ok(gStartView._set.getIndexOfItem(item1) === initialLocation1 &&
-      gStartView._set.getIndexOfItem(item2) === initialLocation2 &&
-      gStartView._set.getIndexOfItem(item3) === initialLocation3, "Items back in the same position.");
-    ok(gStartView._set.itemCount === gStartView.maxTiles, "Grid repopulated");
-
-    // --------- delete multiple items for good
-
-    let item1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
-    let item2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
-    let item3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
-
-    scrollToEnd();
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    sendContextMenuClickToElement(window, item1, 10, 10);
-    sendContextMenuClickToElement(window, item2, 10, 10);
-    sendContextMenuClickToElement(window, item3, 10, 10);
-    yield promise;
-
-    yield waitForCondition(() => !deleteButton.hidden);
-
-    ok(!deleteButton.hidden, "Delete button is visible.");
-
-    let promise = waitForCondition(() => !restoreButton.hidden);
-    EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
-    yield promise;
-
-    item1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
-    item2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
-    item3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
-
-    ok(!item1 && !item2 && !item3, "Items are not in grid");
-    ok(HistoryTestHelper._nodes[uriFromIndex(0)] && HistoryTestHelper._nodes[uriFromIndex(5)] && HistoryTestHelper._nodes[uriFromIndex(12)],
-      "Items not deleted yet");
-    ok(!restoreButton.hidden, "Restore button is visible.");
-    ok(gStartView._set.itemCount === gStartView.maxTiles - 1, "Grid repopulated");
-
-    let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-    Elements.contextappbar.dismiss();
-    yield promise;
-
-    item1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
-    item2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
-    item3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
-
-    ok(!item1 && !item2 && !item3, "Items are not in grid");
-    ok(!HistoryTestHelper._nodes[uriFromIndex(0)] && !HistoryTestHelper._nodes[uriFromIndex(5)] && !HistoryTestHelper._nodes[uriFromIndex(12)],
-      "Items are gone");
-    ok(gStartView._set.itemCount === gStartView.maxTiles - 1, "Grid repopulated");
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_inputsource.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_inputsource.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_inputsource.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_inputsource.js	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-
-"use strict";
-
-/*=============================================================================
-  Test cases
-=============================================================================*/
-
-function test() {
-  runTests();
-}
-
-function setUp() {
-  yield addTab("about:blank");
-}
-
-function testState(aState) {
-  let bcastValue = document.getElementById("bcast_preciseInput").getAttribute("input");
-  is(bcastValue, aState, "bcast attribute is " + aState);
-
-  if (aState == "precise") {
-    ok(InputSourceHelper.isPrecise, "InputSourceHelper");
-    let uri = Util.makeURI("chrome://browser/content/cursor.css");
-    ok(!StyleSheetSvc.sheetRegistered(uri, Ci.nsIStyleSheetService.AGENT_SHEET), "cursor stylesheet registered");
-  } else {
-    ok(!InputSourceHelper.isPrecise, "InputSourceHelper");
-    let uri = Util.makeURI("chrome://browser/content/cursor.css");
-    ok(StyleSheetSvc.sheetRegistered(uri, Ci.nsIStyleSheetService.AGENT_SHEET), "cursor stylesheet registered");
-  }
-}
-
-
-gTests.push({
-  desc: "precise/imprecise input switcher",
-  setUp: setUp,
-  run: function () {
-    notifyPrecise();
-    testState("precise");
-    notifyImprecise();
-    testState("imprecise");
-    notifyPrecise();
-    testState("precise");
-    notifyImprecise();
-    testState("imprecise");
-  }
-});
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_link_click.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_link_click.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_link_click.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_link_click.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title>link click test</title>
-  </head>
-  <body>
-    <a id="link" href="about:blank">link</a>
-  </body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_link_click.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_link_click.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_link_click.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_link_click.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +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/. */
-"use strict";
-
-function test() {
-  waitForExplicitFinish();
-  runTests();
-}
-
-gTests.push({
-  desc: "regular link click",
-  run: function () {
-    let tab = yield addTab(chromeRoot + "browser_link_click.html");
-    let tabCount = Browser.tabs.length;
-
-    EventUtils.sendMouseEvent({type: "click"}, "link", tab.browser.contentWindow);
-    yield waitForCondition(() => tab.browser.currentURI.spec == "about:blank");
-    is(Browser.tabs.length, tabCount, "link loaded in the same tab");
-  }
-});
-
-gTests.push({
-  desc: "middle-click opens link in background tab",
-  run: function () {
-    let tab = yield addTab(chromeRoot + "browser_link_click.html");
-
-    let tabOpen = waitForEvent(window, "TabOpen");
-    EventUtils.sendMouseEvent({type: "click", button: 1}, "link", tab.browser.contentWindow);
-    let event = yield tabOpen;
-
-    let newTab = Browser.getTabFromChrome(event.originalTarget);
-    yield waitForEvent(newTab.browser, "pageshow");
-
-    is(newTab.browser.currentURI.spec, "about:blank");
-    ok(newTab != Browser.selectedTab, "new tab is in the background");
-
-    Browser.closeTab(newTab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "shift-middle-click opens link in background tab",
-  run: function () {
-    let tab = yield addTab(chromeRoot + "browser_link_click.html");
-
-    let tabOpen = waitForEvent(window, "TabOpen");
-    EventUtils.sendMouseEvent({type: "click", button: 1, shiftKey: true}, "link", tab.browser.contentWindow);
-    let event = yield tabOpen;
-
-    let newTab = Browser.getTabFromChrome(event.originalTarget);
-    yield waitForEvent(newTab.browser, "pageshow");
-
-    is(newTab.browser.currentURI.spec, "about:blank");
-    ok(newTab == Browser.selectedTab, "new tab is in the foreground");
-
-    Browser.closeTab(newTab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "ctrl-click opens link in background tab",
-  run: function () {
-    let tab = yield addTab(chromeRoot + "browser_link_click.html");
-
-    let tabOpen = waitForEvent(window, "TabOpen");
-    EventUtils.sendMouseEvent({type: "click", ctrlKey: true}, "link", tab.browser.contentWindow);
-    let event = yield tabOpen;
-
-    let newTab = Browser.getTabFromChrome(event.originalTarget);
-    yield waitForEvent(newTab.browser, "pageshow");
-
-    is(newTab.browser.currentURI.spec, "about:blank");
-    ok(newTab != Browser.selectedTab, "new tab is in the background");
-
-    Browser.closeTab(newTab, { forceClose: true });
-  }
-});
-
-gTests.push({
-  desc: "shift-ctrl-click opens link in background tab",
-  run: function () {
-    let tab = yield addTab(chromeRoot + "browser_link_click.html");
-
-    let tabOpen = waitForEvent(window, "TabOpen");
-    EventUtils.sendMouseEvent({type: "click", ctrlKey: true, shiftKey: true}, "link", tab.browser.contentWindow);
-    let event = yield tabOpen;
-
-    let newTab = Browser.getTabFromChrome(event.originalTarget);
-    yield waitForEvent(newTab.browser, "pageshow");
-
-    is(newTab.browser.currentURI.spec, "about:blank");
-    ok(newTab == Browser.selectedTab, "new tab is in the foreground");
-
-    Browser.closeTab(newTab, { forceClose: true });
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_menu_hoverstate.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_menu_hoverstate.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_menu_hoverstate.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_menu_hoverstate.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_snapped_tests need landscape mode to run.");
-    return;
-  }
-
-  runTests();
-}
-let tabAdded = false;
-
-function setUp() {
-  if (!tabAdded) {
-    yield addTab(chromeRoot + "res/textdivs01.html");
-    tabAdded = true;
-  }
-  yield hideContextUI();
-}
-
-XPCOMUtils.defineLazyServiceGetter(this, "gDOMUtils",
-  "@mozilla.org/inspector/dom-utils;1", "inIDOMUtils");
-
-const kActiveState = 0x00000001;
-const kHoverState = 0x00000004;
-
-gTests.push({
-  desc: "hover states of menus",
-  setUp: setUp,
-  run: function() {
-    // Clicking on menu items should not leave the clicked menu item
-    // in the :active or :hover state.
-
-    let typesArray = [
-      "copy",
-      "paste"
-    ];
-
-    let promise = waitForEvent(document, "popupshown");
-    ContextMenuUI.showContextMenu({
-      target: null,
-      json: {
-        types: typesArray,
-        string: '',
-        xPos: 1,
-        yPos: 1,
-        leftAligned: true,
-        bottomAligned: true
-    }});
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    let menuItem = document.getElementById("context-copy");
-    promise = waitForEvent(document, "popuphidden");
-    sendNativeTap(menuItem);
-    yield promise;
-
-    for (let idx = 0; idx < ContextMenuUI.commands.childNodes.length; idx++) {
-      let item = ContextMenuUI.commands.childNodes[idx];
-      let state = gDOMUtils.getContentState(item);
-      if ((state & kHoverState) || (state & kActiveState)) {
-        ok(false, "found invalid state on context menu item (" + state.toString(2) + ")");
-      }
-    }
-
-    // Do it again, but this time check the visible menu too and
-    // click a different menu item.
-    promise = waitForEvent(document, "popupshown");
-    ContextMenuUI.showContextMenu({
-      target: null,
-      json: {
-        types: typesArray,
-        string: '',
-        xPos: 1,
-        yPos: 1,
-        leftAligned: true,
-        bottomAligned: true
-    }});
-    yield promise;
-
-    // should be visible
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    for (let idx = 0; idx < ContextMenuUI.commands.childNodes.length; idx++) {
-      let item = ContextMenuUI.commands.childNodes[idx];
-      let state = gDOMUtils.getContentState(item);
-      if ((state & kHoverState) || (state & kActiveState)) {
-        ok(false, "found invalid state on context menu item (" + state.toString(2) + ")");
-      }
-    }
-
-    menuItem = document.getElementById("context-paste");
-    promise = waitForEvent(document, "popuphidden");
-    sendNativeTap(menuItem);
-    yield promise;
-
-    for (let idx = 0; idx < ContextMenuUI.commands.childNodes.length; idx++) {
-      let item = ContextMenuUI.commands.childNodes[idx];
-      let state = gDOMUtils.getContentState(item);
-      if ((state & kHoverState) || (state & kActiveState)) {
-        ok(false, "found invalid state on context menu item (" + state.toString(2) + ")");
-      }
-    }
-  },
-  tearDown: function () {
-    clearNativeTouchSequence();
-  }
-});
-
-gTests.push({
-  desc: "hover states of nav bar buttons",
-  setUp: setUp,
-  run: function() {
-    // show nav bar
-    yield showNavBar();
-
-    // tap bookmark button
-    sendNativeTap(Appbar.starButton);
-    yield waitForMs(100);
-    
-    // check hover state
-    let state = gDOMUtils.getContentState(Appbar.starButton);
-    if ((state & kHoverState) || (state & kActiveState)) {
-      ok(false, "found invalid state on star button (" + state.toString(2) + ")");
-    }
-
-    // tap bookmark button
-    sendNativeTap(Appbar.starButton);
-    yield waitForMs(100);
-    
-    // check hover state
-    let state = gDOMUtils.getContentState(Appbar.starButton);
-    if ((state & kHoverState) || (state & kActiveState)) {
-      ok(false, "found invalid state on star button (" + state.toString(2) + ")");
-    }
-  },
-  tearDown: function () {
-    clearNativeTouchSequence();
-  }
-});
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_mouse_events.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_mouse_events.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_mouse_events.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_mouse_events.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-// from MouseEvents.h
-const leftButtonFlag = 1;
-const rightButtonFlag = 2;
-
-gTests.push({
-  desc: "Test native mouse events",
-  run: function () {
-    let tab = yield addTab("about:mozilla");
-
-    // Mousemove.
-    let waitForMove = waitForEvent(document, "mousemove");
-    synthesizeNativeMouseMove(tab.browser, 1, 1);
-    synthesizeNativeMouseMove(tab.browser, 100, 100);
-    let mousemove = yield waitForMove;
-    is(mousemove.cancelable, false, "mousemove is not cancelable");
-    is(mousemove.buttons, 0, "no buttons are down");
-
-    // Left button down.
-    let waitForDown1 = waitForEvent(document, "mousedown");
-    synthesizeNativeMouseLDown(tab.browser, 100, 100);
-    let mousedown1 = yield waitForDown1;
-    is(mousedown1.cancelable, true, "mousedown is cancelable");
-    is(mousedown1.buttons, leftButtonFlag, "left button is down");
-
-    // Right button down.
-    let waitForDown2 = waitForEvent(document, "mousedown");
-    synthesizeNativeMouseRDown(tab.browser, 100, 100);
-    let mousedown2 = yield waitForDown2;
-    is(mousedown2.buttons, leftButtonFlag | rightButtonFlag, "both buttons are down");
-
-    // Left button up.
-    let waitForUp1 = waitForEvent(document, "mouseup");
-    synthesizeNativeMouseLUp(tab.browser, 100, 100);
-    let mouseup1 = yield waitForUp1;
-    is(mouseup1.buttons, rightButtonFlag, "right button is down");
-
-    // Right button up.
-    let waitForUp2 = waitForEvent(document, "mouseup");
-    synthesizeNativeMouseRUp(tab.browser, 100, 100);
-    let mouseup2 = yield waitForUp2;
-    is(mouseup2.buttons, 0, "no buttons are down");
-
-    Browser.closeTab(tab, { forceClose: true });
-  }
-});
-
-let test = runTests;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_notifications.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_notifications.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_notifications.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_notifications.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +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/. */
-
-"use strict";
-
-function test() {
-  runTests();
-}
-
-function cleanup() {
-  let notificationBox = Browser.getNotificationBox();
-  notificationBox && notificationBox.removeAllNotifications(true);
-}
-
-const XHTML_NS = "http://www.w3.org/1999/xhtml";
-
-function createTestNotification(aLabel, aID) {
-    let notificationBox = Browser.getNotificationBox();
-    let notn = notificationBox.appendNotification(aLabel || "some label", aID || "test-notification",
-                                                  "", notificationBox.PRIORITY_INFO_LOW, []);
-    return notn;
-}
-
-gTests.push({
-  desc: "Verify notification bindings are correct",
-  run: function () {
-    let notificationBox = Browser.getNotificationBox();
-    let notn = createTestNotification();
-
-    let binding = notn && getComputedStyle(notn).MozBinding;
-    is(binding,
-       "url(\"chrome://browser/content/bindings/notification.xml#notification\")",
-       "notification has expected binding");
-
-    is(getComputedStyle(notificationBox).MozBinding,
-       "url(\"chrome://browser/content/bindings/notification.xml#notificationbox\")",
-       "notificationbox has expected binding");
-  },
-  tearDown: cleanup
-});
-
-gTests.push({
-  desc: "Check label property handling",
-  run: function () {
-    let notn = createTestNotification("the label");
-    is(notn.label, "the label");
-
-    let doc = notn.ownerDocument;
-    let fragment = doc.createDocumentFragment();
-    try {
-      let boldLabel = doc.createElementNS(XHTML_NS, "b");
-      boldLabel.innerHTML = 'The <span class="foo">label</span>';
-      fragment.appendChild(boldLabel);
-      notn.label = fragment;
-    } catch (ex) {
-      ok(!ex, "Exception creating notification label with markup: "+ex.message);
-    }
-
-    // expect to get a documentFragment back when the label has markup
-    let labelNode = notn.label;
-    is(labelNode.nodeType,
-       Components.interfaces.nsIDOMNode.DOCUMENT_FRAGMENT_NODE,
-       "notification label getter returns documentFragment nodeType "+Components.interfaces.nsIDOMNode.DOCUMENT_FRAGMENT_NODE+", when value contains markup");
-    ok(labelNode !== fragment,
-       "label fragment is a newly created fragment, not the one we assigned in the setter");
-    ok(labelNode.querySelector("b > .foo"),
-       "label fragment has the expected elements in it");
-  },
-  tearDown: cleanup
-});
-
-gTests.push({
-  desc: "Check adoptNotification does what we expect",
-  setUp: function() {
-    yield addTab("about:start");
-    yield addTab("about:mozilla");
-  },
-  run: function () {
-    let browser = getBrowser();
-    let notn = createTestNotification("label", "adopt-notification");
-    let firstBox = Browser.getNotificationBox();
-    let nextTab = Browser.getNextTab(Browser.getTabForBrowser(browser));
-    let nextBox = Browser.getNotificationBox(nextTab.browser);
-
-    ok(firstBox.getNotificationWithValue("adopt-notification"), "notificationbox has our notification intially");
-    nextBox.adoptNotification(notn);
-
-    ok(!firstBox.getNotificationWithValue("adopt-notification"), "after adoptNotification, original notificationbox no longer has our notification");
-    ok(nextBox.getNotificationWithValue("adopt-notification"), "next notificationbox has our notification");
-  },
-  // leave browser in clean state for next tests
-  tearDown: cleanUpOpenedTabs
-});
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_onscreen_keyboard.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_onscreen_keyboard.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_onscreen_keyboard.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_onscreen_keyboard.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>On-Screen Keyboard Test</title>
-    <style>
-      #text { position: absolute; left: 1em; bottom: 1em; }
-    </style>
-  </head>
-  <body>
-    <input id="text">
-  </body>
-</head>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_onscreen_keyboard.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_onscreen_keyboard.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_onscreen_keyboard.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_onscreen_keyboard.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +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() {
-  runTests();
-}
-
-gTests.push({
-  desc: "Onscreen keyboard tests",
-  run: function() {
-    // By design, Metro apps can't show the keyboard programmatically, so we
-    // can't use the real keyboard in this test:
-    // http://msdn.microsoft.com/en-us/library/windows/apps/hh465404.aspx#user-driven_invocation
-    //
-    // Instead, we will use this mock object to simulate keyboard changes.
-    let originalUtils = Services.metro;
-    Services.metro = {
-      keyboardHeight: 0,
-      keyboardVisible: false
-    };
-    registerCleanupFunction(function() {
-      Services.metro = originalUtils;
-    });
-
-    let tab = yield addTab(chromeRoot + "browser_onscreen_keyboard.html");
-    // Explicitly dismiss the toolbar at the start, because it messes with the
-    // keyboard and sizing if it's dismissed later.
-    ContextUI.dismiss();
-
-    let doc = tab.browser.contentDocument;
-    let text = doc.getElementById("text")
-    let rect0 = text.getBoundingClientRect();
-    let rect0browserY = Math.floor(tab.browser.ptClientToBrowser(rect0.left, rect0.top).y);
-
-    // Simulate touch
-    SelectionHelperUI.attachToCaret(tab.browser, rect0.left + 5, rect0.top + 5);
-
-    // "Show" the keyboard.
-    Services.metro.keyboardHeight = 100;
-    Services.metro.keyboardVisible = true;
-    Services.obs.notifyObservers(null, "metro_softkeyboard_shown", null);
-
-    let event = yield waitForEvent(window, "MozDeckOffsetChanged");
-    is(event.detail, 100, "deck offset by keyboard height");
-
-    let rect1 = text.getBoundingClientRect();
-    let rect1browserY = Math.floor(tab.browser.ptClientToBrowser(rect1.left, rect1.top).y);
-    is(rect1browserY, rect0browserY + 100, "text field moves up by 100px");
-
-    // "Hide" the keyboard.
-    Services.metro.keyboardHeight = 0;
-    Services.metro.keyboardVisible = false;
-    Services.obs.notifyObservers(null, "metro_softkeyboard_hidden", null);
-
-    yield waitForEvent(window, "MozDeckOffsetChanged");
-
-    finish();
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_prefs_ui.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_prefs_ui.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_prefs_ui.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_prefs_ui.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,212 +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";
-
-const Ci = Components.interfaces;
-const Cm = Components.manager;
-const Cc = Components.classes;
-
-const CONTRACT_ID = "@mozilla.org/xre/runtime;1";
-
-function MockAppInfo() {
-}
-
-MockAppInfo.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIXULRuntime]),
-}
-
-let newFactory = {
-  createInstance: function(aOuter, aIID) {
-    if (aOuter)
-      throw Components.results.NS_ERROR_NO_AGGREGATION;
-    return new MockAppInfo().QueryInterface(aIID);
-  },
-  lockFactory: function(aLock) {
-    throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
-  },
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
-};
-
-var SanitizeHelper = {
-  _originalSanitizer: null,
-
-  MockSanitizer: {
-    clearCalled: [],
-    clearItem: function clearItem(aItemName) {
-      info("Clear item called for: " + aItemName);
-      this.clearCalled.push(aItemName);
-    }
-  },
-
-  setUp: function setUp() {
-    SanitizeHelper._originalSanitizer = SanitizeUI._sanitizer;
-    SanitizeUI._sanitizer = SanitizeHelper.MockSanitizer;
-
-    let registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
-    this.gAppInfoClassID = registrar.contractIDToCID(CONTRACT_ID);
-    this.gIncOldFactory = Cm.getClassObject(Cc[CONTRACT_ID], Ci.nsIFactory);
-    registrar.unregisterFactory(this.gAppInfoClassID, this.gIncOldFactory);
-    let components = [MockAppInfo];
-    registrar.registerFactory(this.gAppInfoClassID, "", CONTRACT_ID, newFactory);
-    this.gIncOldFactory = Cm.getClassObject(Cc[CONTRACT_ID], Ci.nsIFactory);
-
-    this.oldPrompt = Services.prompt;
-  },
-
-  tearDown: function tearDown() {
-    SanitizeUI._sanitizer = SanitizeHelper._originalSanitizer;
-
-    if (this.gIncOldFactory) {
-      var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
-      registrar.unregisterFactory(this.gAppInfoClassID, newFactory);
-      registrar.registerFactory(this.gAppInfoClassID, "", CONTRACT_ID, this.gIncOldFactory);
-    }
-    this.gIncOldFactory = null;
-
-    Services.prompt = this.oldPrompt;
-  },
-};
-
-function getAllSelected() {
-  return document.getElementById("prefs-privdata").querySelectorAll(
-    "#prefs-privdata-history[checked], " +
-      "#prefs-privdata-other[checked] + #prefs-privdata-subitems .privdata-subitem-item[checked]");
-}
-
-gTests.push({
-  setUp: SanitizeHelper.setUp,
-  tearDown: SanitizeHelper.tearDown,
-  desc: "Test sanitizer UI",
-  run: function testSanitizeUI() {
-    // We want to be able to simulate that a specific button
-    // of the 'clear private data' prompt was pressed.
-    Services.prompt = {
-      confirmEx: function() {
-        return this.retVal;
-      }
-    };
-
-    // Show options flyout
-    let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyoutPanel._topmostElement, "PopupChanged", 2000);
-    FlyoutPanelsUI.show('PrefsFlyoutPanel');
-    yield promise;
-
-    // Make sure it's opened
-    yield waitForEvent(FlyoutPanelsUI.PrefsFlyoutPanel._topmostElement, "transitionend", 1000);
-
-    SanitizeHelper.setUp();
-
-    // Test initial state
-    let allSelected = getAllSelected();
-    // Only  history should be selected
-    ok(allSelected.length === 1 && allSelected[0].getAttribute("itemName") === "history", "History is initially selected.");
-
-    let othersCheck = document.getElementById("prefs-privdata-other");
-    othersCheck.setAttribute("checked", "true");
-
-    let othersSubitems = document.getElementById("prefs-privdata-subitems");
-    yield waitForCondition(function (){
-      return othersSubitems.style.display !== "none";
-    }, 500);
-
-    allSelected = getAllSelected();
-    // History and all checkboxes under othersSubitems should be selected
-    ok(allSelected.length === 1 + othersSubitems.querySelectorAll("checkbox").length,
-      "All checkboxes are selected.");
-
-    // Select only downloads and passwords
-    let callItems = ["downloads", "passwords"];
-    for (let checkbox of allSelected) {
-      if (callItems.indexOf(checkbox.getAttribute("itemName")) === -1) {
-        checkbox.removeAttribute("checked");
-      }
-    }
-
-    // Simulate clicking "button 1", cancel.
-    Services.prompt.retVal = 1;
-    let clearButton = document.getElementById("prefs-clear-data");
-    clearButton.doCommand();
-    ok(SanitizeHelper.MockSanitizer.clearCalled.length == 0, "Nothing was cleared");
-
-    // We will simulate that "button 0" (which should be the clear button)
-    // was pressed
-    Services.prompt.retVal = 0;
-    clearButton.doCommand();
-
-    let clearNotificationDeck = document.getElementById("clear-notification");
-    let clearNotificationDone = document.getElementById("clear-notification-done");
-
-    // Wait until command is done.
-    yield waitForCondition(function (){
-      return clearNotificationDeck.selectedPanel == clearNotificationDone;
-    }, 1000);
-
-    ok(SanitizeHelper.MockSanitizer.clearCalled.length === callItems.length, "All expected items were called");
-
-    SanitizeHelper.MockSanitizer.clearCalled.forEach(function(item) {
-      ok(callItems.indexOf(item) >= 0, "Sanitized " + item);
-    });
-
-    // hide options flyout
-    let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyoutPanel._topmostElement, "PopupChanged", 2000);
-    FlyoutPanelsUI.hide();
-    yield promise;
-  }
-});
-
-function checkDNTPrefs(aExpectedEnabled, aExpectedValue) {
-  let currentEnabled = Services.prefs.getBoolPref("privacy.donottrackheader.enabled");
-  let currentValue = Services.prefs.getIntPref("privacy.donottrackheader.value");
-
-  let enabledTestMsg = "testing privacy.donottrackheader.enabled, expected "
-    + aExpectedEnabled + " got " + currentEnabled;
-
-  ok(aExpectedEnabled === currentEnabled, enabledTestMsg);
-
-  let valueTestMsg = "testing privacy.donottrackheader.value, expected "
-    + aExpectedValue + " got " + currentValue;
-
-  ok(aExpectedValue === currentValue, valueTestMsg);
-}
-
-gTests.push({
-  desc: "Test do not track settings",
-  run: function testDNT() {
-    let noTrack = document.getElementById("prefs-dnt-notrack");
-    let noPref = document.getElementById("prefs-dnt-nopref");
-    let okTrack = document.getElementById("prefs-dnt-oktrack");
-
-    // Show options flyout
-    let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyoutPanel._topmostElement, "PopupChanged", 2000);
-    FlyoutPanelsUI.show('PrefsFlyoutPanel');
-    yield promise;
-
-    noPref.click();
-    // See https://mxr.mozilla.org/mozilla-central/source/modules/libpref/src/init/all.js?rev=0aab2bb76b45#755
-    // -1 - tell sites nothing about preferences
-    yield waitForCondition(() => Services.prefs.getIntPref("privacy.donottrackheader.value") === -1);
-    checkDNTPrefs(false, -1);
-
-    noTrack.click();
-    // 1 - tell sites tracking is unacceptable
-    yield waitForCondition(() => Services.prefs.getIntPref("privacy.donottrackheader.value") === 1);
-    checkDNTPrefs(true, 1);
-
-    okTrack.click();
-    // 0 - tell sites tracking is acceptable
-    yield waitForCondition(() => Services.prefs.getIntPref("privacy.donottrackheader.value") === 0);
-    checkDNTPrefs(true, 0);
-
-    // hide options flyout
-    let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyoutPanel._topmostElement, "PopupChanged", 2000);
-    FlyoutPanelsUI.hide();
-    yield promise;
-  }
-});
-
-function test() {
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_private_browsing.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_private_browsing.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_private_browsing.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_private_browsing.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/* vim: set 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";
-
-function test() {
-  runTests();
-}
-
-gTests.push({
-  desc: "Private tab sanity check",
-  run: function() {
-    let tab = Browser.addTab("about:mozilla");
-    is(tab.isPrivate, false, "Tabs are not private by default");
-    is(tab.chromeTab.hasAttribute("private"), false,
-      "non-private tab has no private attribute");
-
-    let child = Browser.addTab("about:mozilla", false, tab);
-    is(child.isPrivate, false, "Child of a non-private tab is not private");
-
-    Browser.closeTab(child, { forceClose: true });
-    Browser.closeTab(tab, { forceClose: true });
-
-    tab = Browser.addTab("about:mozilla", false, null, { private: true });
-    is(tab.isPrivate, true, "Create a private tab");
-    is(tab.chromeTab.getAttribute("private"), "true",
-      "private tab has private attribute");
-
-    child = Browser.addTab("about:mozilla", false, tab);
-    is(child.isPrivate, true, "Child of a private tab is private");
-
-    Browser.closeTab(child, { forceClose: true });
-    Browser.closeTab(tab, { forceClose: true });
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_progress_indicator.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_progress_indicator.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_progress_indicator.xul	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_progress_indicator.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.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/. -->
-
-<?xml-stylesheet href="chrome://browser/skin/platform.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/browser.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/bindings.css" type="text/css"?>
-
-<!DOCTYPE window []>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <circularprogressindicator id="progress-indicator" oncommand=""/>
-</window>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_prompt.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_prompt.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_prompt.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_prompt.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +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/. */
-
-"use strict";
-
-function test() {
-  waitForExplicitFinish();
-  runTests();
-}
-
-gTests.push({
-  desc: "Test getPrompt with null domWindow (bug 949333)",
-  run: function () {
-    let factory = Cc["@mozilla.org/prompter;1"].getService(Ci.nsIPromptFactory);
-    let prompter = factory.getPrompt(null, Ci.nsIPrompt);
-
-    let browser = getBrowser();
-    let dialogOpened = false;
-
-    Task.spawn(function() {
-      yield waitForEvent(browser, "DOMWillOpenModalDialog");
-      dialogOpened = true;
-
-      yield waitForMs(0);
-      let stack = browser.parentNode;
-      let dialogs = stack.getElementsByTagNameNS(XUL_NS, "tabmodalprompt");
-      is(dialogs.length, 1, "one tab-modal dialog showing");
-
-      let dialog = dialogs[0];
-      let okButton = dialog.ui.button0;
-      okButton.click();
-    });
-
-    prompter.alert("Test", "test");
-
-    ok(dialogOpened, "Dialog was opened");
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_remotetabs.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_remotetabs.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_remotetabs.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_remotetabs.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* -*- 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";
-
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
-
-Components.utils.import("resource://services-sync/main.js");
-////////////////////////////////////////////////////////////////////////////////
-//// Test(s)
-
-function test() {
-  runTests();
-}
-
-gTests.push({
-  desc: "Test sync tabs from other devices UI",
-  run: function run() {
-    if (BrowserUI.isStartTabVisible)
-      return;
-
-    yield addTab("about:start");
-    yield waitForCondition(() => BrowserUI.isStartTabVisible);
-    yield hideContextUI();
-
-    is(Weave.Status.checkSetup(), Weave.CLIENT_NOT_CONFIGURED, "Sync should be disabled on start");
-
-    let vbox = Browser.selectedBrowser.contentDocument.getElementById("start-remotetabs");
-    ok(vbox.hidden, "remote tabs in the start page should be hidden when sync is not enabled");
-
-    Browser.selectedBrowser.contentWindow.RemoteTabsStartView._view.setUIAccessVisible(true);
-
-    // start page grid should be visible
-    ok(vbox, "remote tabs grid is present on start page");
-    is(vbox.hidden, false, "remote tabs should be visible in start page when sync is enabled");
-
-    Browser.selectedBrowser.contentWindow.RemoteTabsStartView._view.setUIAccessVisible(false);
-
-    ok(vbox.hidden, "remote tabs in the start page should be hidden when sync is not enabled");
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_basic.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_basic.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_basic.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_basic.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-  </head>
-<body>
-<div style="margin: 0; padding: 0; max-width:31.25em; font-size: 95%;">
-There was nothing so VERY remarkable in that; nor did Alice think it so VERY much out of
-the way to hear the Rabbit say to itself, `Oh dear! Oh dear! I shall be late!' (when she
-thought it over afterwards, it occurred to her that she ought to have wondered at this,
-but at the time it all seemed quite natural); but when the Rabbit actually TOOK A WATCH
-OUT OF ITS WAISTCOAT- POCKET, and looked at it, and then hurried on, Alice started to her
-feet, for it flashed across her mind that she had never before seen a rabbit with either a
-waistcoat-pocket, or a watch to take out of it, and burning with curiosity, she ran across
-the field after it, and fortunately was just in time to see it pop down a large
-rabbit-hole under the hedge.
-<br>
-<br>
-In another moment down went Alice after it, never once considering how in the world she
-was to get out again.
-<br>
-<br>
-The rabbit-hole went straight on like a tunnel for some way, and then dipped suddenly
-down, so suddenly that Alice had not a moment to think about stopping herself before she
-found herself falling down a very deep well.
-<div id="seldiv" style="width:300px; height:100px;">The rabbit-hole went straight on like a tunnel for some way, and then dipped suddenly
-down, so suddenly that Alice had not a moment to think about stopping herself before she
-found herself falling down a very deep well.
-</div>
-<br />
-<br />
-<br />
-<br />
-<br />
-<div id="emptydiv" style="width:300px; height:100px; border: solid 1px black;"></div>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-</div>
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_basic.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_basic.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_basic.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_basic.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,360 +0,0 @@
-/* -*- 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";
-
-let gWindow = null;
-var gFrame = null;
-
-const kMarkerOffsetY = 6;
-const kCommonWaitMs = 5000;
-const kCommonPollMs = 100;
-
-///////////////////////////////////////////////////
-// content (non-editable) tests
-///////////////////////////////////////////////////
-
-function setUpAndTearDown() {
-  emptyClipboard();
-  if (gWindow)
-    clearSelection(gWindow);
-  if (gFrame)
-    clearSelection(gFrame);
-  yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    }, kCommonWaitMs, kCommonPollMs);
-  InputSourceHelper.isPrecise = false;
-  InputSourceHelper.fireUpdate();
-}
-
-gTests.push({
-  desc: "normalize browser",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    info(chromeRoot + "browser_selection_basic.html");
-    yield addTab(chromeRoot + "browser_selection_basic.html");
-
-    yield waitForCondition(function () {
-        return !BrowserUI.isStartTabVisible;
-      }, 10000, 100);
-
-    yield hideContextUI();
-
-    gWindow = Browser.selectedTab.browser.contentWindow;
-  },
-});
-
-gTests.push({
-  desc: "tap-hold to select",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    sendContextMenuClick(30, 20);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(getTrimmedSelection(gWindow).toString(), "There", "selection test");
-  },
-});
-
-gTests.push({
-  desc: "appbar interactions",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    sendContextMenuClick(100, 20);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(SelectionHelperUI.isActive, true, "selection active");
-    is(getTrimmedSelection(gWindow).toString(), "nothing", "selection test");
-
-    yield fireAppBarDisplayEvent();
-
-    ok(ContextUI.isVisible, true, "appbar visible");
-
-    yield hideContextUI();
-
-    ok(!ContextUI.isVisible, true, "appbar hidden");
-  },
-});
-
-gTests.push({
-  desc: "simple drag selection",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    yield waitForMs(100);
-    sendContextMenuClick(100, 20);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(SelectionHelperUI.isActive, true, "selection active");
-    is(getTrimmedSelection(gWindow).toString(), "nothing", "selection test");
-
-    let ypos = SelectionHelperUI.endMark.yPos + kMarkerOffsetY;
-
-    let touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, SelectionHelperUI.endMark.xPos, ypos, 190, ypos);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    is(SelectionHelperUI.isActive, true, "selection active");
-    is(getTrimmedSelection(gWindow).toString(), "nothing so VERY", "selection test");
-  },
-});
-
-gTests.push({
-  desc: "expand / collapse selection",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    sendContextMenuClick(30, 20);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(SelectionHelperUI.isActive, true, "initial active");
-    is(getTrimmedSelection(gWindow).toString(), "There", "initial selection test");
-
-    for (let count = 0; count < 5; count++) {
-      let ypos = SelectionHelperUI.endMark.yPos + kMarkerOffsetY;
-
-      let touchdrag = new TouchDragAndHold();
-      yield touchdrag.start(gWindow, SelectionHelperUI.endMark.xPos, ypos, 550, ypos);
-      touchdrag.end();
-
-      yield waitForCondition(function () {
-          return !SelectionHelperUI.hasActiveDrag;
-        }, kCommonWaitMs, kCommonPollMs);
-      yield SelectionHelperUI.pingSelectionHandler();
-
-      is(getTrimmedSelection(gWindow).toString(),
-        "There was nothing so VERY remarkable in that; nor did Alice think it so",
-        "long selection test");
-
-      is(SelectionHelperUI.isActive, true, "selection active");
-
-      touchdrag = new TouchDragAndHold();
-      yield touchdrag.start(gWindow, SelectionHelperUI.endMark.xPos, ypos, 40, ypos);
-      touchdrag.end();
-
-      yield waitForCondition(function () {
-          return !SelectionHelperUI.hasActiveDrag;
-        }, kCommonWaitMs, kCommonPollMs);
-      yield SelectionHelperUI.pingSelectionHandler();
-
-      is(SelectionHelperUI.isActive, true, "selection active");
-      is(getTrimmedSelection(gWindow).toString(), "There was", "short selection test");
-    }
-  },
-});
-
-gTests.push({
-  desc: "expand / collapse selection scolled content",
-  setUp: setUpAndTearDown,
-  run: function test() {
-    let scrollPromise = waitForEvent(gWindow, "scroll");
-    gWindow.scrollBy(0, 200);
-    yield scrollPromise;
-    ok(scrollPromise && !(scrollPromise instanceof Error), "scrollPromise error");
-
-    sendContextMenuClick(106, 20);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(SelectionHelperUI.isActive, true, "selection active");
-    is(getTrimmedSelection(gWindow).toString(), "moment", "selection test");
-
-    let ypos = SelectionHelperUI.endMark.yPos + kMarkerOffsetY;
-
-    let touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, SelectionHelperUI.endMark.xPos, ypos, 550, ypos);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    is(getTrimmedSelection(gWindow).toString(),
-      "moment down went Alice after it, never once considering how in",
-      "selection test");
-
-    is(SelectionHelperUI.isActive, true, "selection active");
-
-    touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, SelectionHelperUI.endMark.xPos, ypos, 150, ypos);
-    touchdrag.end();
-    
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    is(getTrimmedSelection(gWindow).toString(), "moment down went", "selection test");
-
-    touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, SelectionHelperUI.endMark.xPos, ypos, 550, ypos);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    is(getTrimmedSelection(gWindow).toString(),
-      "moment down went Alice after it, never once considering how in",
-      "selection test");
-
-    touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, SelectionHelperUI.endMark.xPos, ypos, 160, ypos);
-    touchdrag.end();
-    
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    is(getTrimmedSelection(gWindow).toString(),
-      "moment down went",
-      "selection test");
-  },
-  tearDown: function tearDown() {
-    let scrollPromise = waitForEvent(gWindow, "scroll");
-    gWindow.scrollBy(0, -200);
-    yield scrollPromise;
-    emptyClipboard();
-    if (gWindow)
-      clearSelection(gWindow);
-    if (gFrame)
-      clearSelection(gFrame);
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield hideContextUI();
-  },
-});
-
-gTests.push({
-  desc: "tap on selection clears selection in content",
-  setUp: setUpAndTearDown,
-  run: function test() {
-
-    sendContextMenuClick(30, 20);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    sendTap(gWindow, 30, 20);
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-  },
-  tearDown: setUpAndTearDown,
-});
-
-gTests.push({
-  desc: "tap off selection clears selection in content",
-  setUp: setUpAndTearDown,
-  run: function test() {
-
-    sendContextMenuClick(30, 20);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    sendTap(gWindow, 30, 100);
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-  },
-  tearDown: setUpAndTearDown,
-});
-
-gTests.push({
-  desc: "bug 903737 - right click targeting",
-  setUp: setUpAndTearDown,
-  run: function test() {
-    yield hideContextUI();
-    let range = gWindow.document.createRange();
-    range.selectNode(gWindow.document.getElementById("seldiv"));
-    gWindow.getSelection().addRange(range);
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(gWindow, gWindow.document.getElementById("seldiv"));
-    yield promise;
-    promise = waitForEvent(document, "popuphidden");
-    ContextMenuUI.hide();
-    yield promise;
-    let emptydiv = gWindow.document.getElementById("emptydiv");
-    let coords = logicalCoordsForElement(emptydiv);
-    InputSourceHelper.isPrecise = true;
-    sendContextMenuClick(coords.x, coords.y);
-    yield waitForCondition(function () {
-      return ContextUI.tabbarVisible;
-    });
-    yield hideContextUI();
-  },
-  tearDown: setUpAndTearDown,
-});
-
-gTests.push({
-  desc: "Bug 960886 - selection monocles being spilled over to other tabs " +
-        "when switching.",
-  setUp: setUpAndTearDown,
-  run: function test() {
-    let initialTab = Browser.selectedTab;
-
-    // Create additional tab to which we will switch later
-    info(chromeRoot + "browser_selection_basic.html");
-    let lastTab = yield addTab(chromeRoot + "browser_selection_basic.html");
-
-    // Switch back to the initial tab
-    let tabSelectPromise = waitForEvent(Elements.tabList, "TabSelect");
-    Browser.selectedTab = initialTab;
-    yield tabSelectPromise;
-    yield hideContextUI();
-
-    // Make selection
-    sendContextMenuClick(30, 20);
-    yield waitForCondition(()=>SelectionHelperUI.isSelectionUIVisible);
-
-    // Switch to another tab
-    tabSelectPromise = waitForEvent(Elements.tabList, "TabSelect");
-    Browser.selectedTab = lastTab;
-    yield tabSelectPromise;
-
-    yield waitForCondition(()=>!SelectionHelperUI.isSelectionUIVisible);
-
-    Browser.closeTab(Browser.selectedTab, { forceClose: true });
-  },
-  tearDown: setUpAndTearDown
-});
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_selection_tests need landscape mode to run.");
-    return;
-  }
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_caretfocus.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_caretfocus.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_caretfocus.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_caretfocus.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-  </head>
-<body>
-<input id="Text1" style="width:300px;" value="text input text input text input" type="text">
-<input id="Text2" style="width:300px;" value="text input text input text input" type="text">
-<input id="Text3" style="width:300px;" value="text input text input text input" type="text">
-<iframe id="Text4" frameborder="0" style="overflow: hidden; border: 1px solid lightgray;" height="50" src="./res/textarea01.html" width="300"></iframe>
-<textarea id="Text5" style="overflow: hidden;" name="textarea" rows="2" cols="36">text area text area text area text area text area</textarea>
-<div id="Text6" style="width:300px; border: 1px solid lightgray;">text div text div text div text div</div>
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_caretfocus.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_caretfocus.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_caretfocus.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_caretfocus.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/* -*- 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";
-
-let gWindow = null;
-
-///////////////////////////////////////////////////
-// form input tests
-///////////////////////////////////////////////////
-
-function setUpAndTearDown() {
-  emptyClipboard();
-  if (gWindow)
-    clearSelection(gWindow);
-  yield waitForCondition(function () {
-    return !SelectionHelperUI.isSelectionUIVisible;
-  });
-  InputSourceHelper.isPrecise = false;
-  InputSourceHelper.fireUpdate();
-}
-
-gTests.push({
-  desc: "normalize browser",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    info(chromeRoot + "browser_selection_caretfocus.html");
-    yield addTab(chromeRoot + "browser_selection_caretfocus.html");
-
-    yield waitForCondition(function () {
-      return !BrowserUI.isStartTabVisible;
-    });
-
-    yield hideContextUI();
-
-    gWindow = Browser.selectedTab.browser.contentWindow;
-  },
-});
-
-function tapText(aIndex) {
-  gWindow = Browser.selectedTab.browser.contentWindow;
-  let id = "Text" + aIndex;
-  info("tapping " + id);
-  let element = gWindow.document.getElementById(id);
-  if (element.contentDocument) {
-    element = element.contentDocument.getElementById("textarea");
-    gWindow = element.ownerDocument.defaultView;
-  }
-  sendElementTap(gWindow, element, 100, 10);
-  return element;
-}
-
-gTests.push({
-  desc: "focus navigation",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    for (let iteration = 0; iteration < 3; iteration++) {
-      for (let input = 1; input <= 6; input++) {
-        let element = tapText(input);
-        if (input == 6) {
-          // div
-          yield waitForCondition(function () {
-            return !SelectionHelperUI.isActive;
-          });
-        } else {
-          // input
-          yield SelectionHelperUI.pingSelectionHandler();
-          yield waitForCondition(function () {
-            return SelectionHelperUI.isCaretUIVisible;
-          });
-          ok(element == gWindow.document.activeElement, "element has focus");
-        }
-      }
-    }
-  },
-});
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_selection_tests need landscape mode to run.");
-    return;
-  }
-  // XXX need this until bugs 886624 and 859742 are fully resolved
-  setDevPixelEqualToPx();
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_contenteditable.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_contenteditable.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_contenteditable.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_contenteditable.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-  HTML {
-    height: 100%;
-    cursor: text;
-    margin: 50px;
-  }
-  BODY {
-    height: 100%;
-    border: 0;
-    margin: 0;
-  }
-  div {
-    border: solid 1px gray;
-    min-width: 800px;
-    width: 800px;
-    max-width: 800px;
-  }
-</style>
-<title>Content editable selection test page</title>
-</head>
-  <body style="font-size: 12pt;" contenteditable="true">
-  <div id="testdiv">Testing sending an email in the outlook.com email client.</div>
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_contenteditable.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_contenteditable.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_contenteditable.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_contenteditable.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/* -*- 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";
-let gWindow = null;
-
-const kCommonWaitMs = 5000;
-const kCommonPollMs = 100;
-
-///////////////////////////////////////////////////
-// content editable tests
-///////////////////////////////////////////////////
-
-gTests.push({
-  desc: "normalize browser",
-  run: function test() {
-    info(chromeRoot + "browser_selection_contenteditable.html");
-    yield addTab(chromeRoot + "browser_selection_contenteditable.html");
-    yield waitForCondition(function () {
-        return !BrowserUI.isStartTabVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    yield hideContextUI();
-
-    gWindow = Browser.selectedTab.browser.contentWindow;
-
-    InputSourceHelper.isPrecise = false;
-    InputSourceHelper.fireUpdate();
-  },
-});
-
-gTests.push({
-  desc: "simple test to make sure content editable selection works",
-  run: function test() {
-    let div = gWindow.document.getElementById("testdiv");
-    ok(div, "have the div");
-
-    sendElementTap(gWindow, div, 284); // end of 'outlook.com'
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isCaretUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    let xpos = SelectionHelperUI.caretMark.xPos;
-    let ypos = SelectionHelperUI.caretMark.yPos + 10;
-    var touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, xpos, ypos, 100, ypos); // start of 'sending'
-    touchdrag.end();
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-    let str = getTrimmedSelection(gWindow).toString();
-    is(str, "sending an email in the outlook.com", "selected string matches");
-  },
-  tearDown: function () {
-    emptyClipboard();
-    if (gWindow)
-      clearSelection(gWindow);
-    yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    }, kCommonWaitMs, kCommonPollMs);
-  }
-});
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_selection_tests need landscape mode to run.");
-    return;
-  }
-  setDevPixelEqualToPx();
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_content.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_content.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_content.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_content.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-  </head>
-<body>
-<div>
-<iframe id="frame1" style="overflow:hidden; width:50em; font-size: 95%;" height="600"  src="res/textblock01.html"></iframe>
-<br />
-<br />
-Hello there. <a id="rlink1" href="#hello">Hi!</a>
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-</div>
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_content.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_content.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_content.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_content.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,220 +0,0 @@
-/* -*- 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";
-
-let gWindow = null;
-var gFrame = null;
-
-const kMarkerOffsetY = 6;
-const kCommonWaitMs = 5000;
-const kCommonPollMs = 100;
-
-///////////////////////////////////////////////////
-// sub frame content tests
-///////////////////////////////////////////////////
-
-function setUpAndTearDown() {
-  emptyClipboard();
-  if (gWindow)
-    clearSelection(gWindow);
-  if (gFrame)
-    clearSelection(gFrame);
-  yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    }, kCommonWaitMs, kCommonPollMs);
-  InputSourceHelper.isPrecise = false;
-  InputSourceHelper.fireUpdate();
-}
-
-gTests.push({
-  desc: "normalize browser",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    info(chromeRoot + "browser_selection_frame_content.html");
-    yield addTab(chromeRoot + "browser_selection_frame_content.html");
-
-    yield waitForCondition(function () {
-      return !BrowserUI.isStartTabVisible;
-      }, 10000, 100);
-
-    yield hideContextUI();
-
-    gWindow = Browser.selectedTab.browser.contentWindow;
-    gFrame = gWindow.document.getElementById("frame1");
-  },
-});
-
-gTests.push({
-  desc: "iframe basic selection",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    gFrame.focus();
-
-    sendContextMenuClick(165, 35);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    // active state
-    is(SelectionHelperUI.isActive, true, "selection active");
-    // check text selection
-    is(getTrimmedSelection(gFrame).toString(), "Alice", "selection test");
-  },
-});
-
-gTests.push({
-  desc: "iframe expand / collapse selection",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    gFrame.focus();
-    
-    sendContextMenuClick(162, 180);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    // active state
-    is(SelectionHelperUI.isActive, true, "selection active");
-    is(getTrimmedSelection(gFrame).toString(), "Alice", "selection test");
-
-    let ypos = SelectionHelperUI.endMark.yPos + kMarkerOffsetY;
-
-    let touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, SelectionHelperUI.endMark.xPos, ypos, 640, ypos);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    is(SelectionHelperUI.isActive, true, "selection active");
-    is(getTrimmedSelection(gFrame).toString(), "Alice was beginning to get very tired of sitting by her sister on the bank",
-       "selection test");
-
-    touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, SelectionHelperUI.endMark.xPos, ypos, 320, ypos);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    is(SelectionHelperUI.isActive, true, "selection active");
-    is(getTrimmedSelection(gFrame).toString(), "Alice was beginning to get very", "selection test");
-  },
-});
-
-gTests.push({
-  desc: "scrolled iframe selection",
-  setUp: setUpAndTearDown,
-  run: function test() {
-    gFrame.focus();
-
-    let scrollPromise = waitForEvent(gFrame.contentDocument.defaultView, "scroll");
-    gFrame.contentDocument.defaultView.scrollBy(0, 200);
-    yield scrollPromise;
-
-    sendContextMenuClick(30, 240);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(SelectionHelperUI.isActive, true, "selection active");
-    is(getTrimmedSelection(gFrame).toString(), "started", "selection test");
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToSelection(gFrame.contentDocument.defaultView);
-
-    yield promise;
-    ok(promise && !(promise instanceof Error), "promise error");
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-
-    let menuItem = document.getElementById("context-copy");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-    ok(popupPromise && !(popupPromise instanceof Error), "promise error");
-
-    // The wait is needed to give time to populate the clipboard.
-    let string = "";
-    yield waitForCondition(function () {
-      string = SpecialPowers.getClipboardData("text/unicode");
-      return string === "started";
-    });
-    is(string, "started", "copy text");
-
-  },
-  tearDown: function tearDown() {
-    emptyClipboard();
-    let scrollPromise = waitForEvent(gFrame.contentDocument.defaultView, "scroll");
-    gFrame.contentDocument.defaultView.scrollBy(0, -200);
-    yield scrollPromise;
-    clearSelection(gWindow);
-    clearSelection(gFrame);
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield hideContextUI();
-  },
-});
-
-gTests.push({
-  desc: "iframe within scrolled page selection",
-  setUp: setUpAndTearDown,
-  run: function test() {
-    gFrame.focus();
-
-    let scrollPromise = waitForEvent(gWindow, "scroll");
-    gWindow.scrollBy(0, 200);
-    yield scrollPromise;
-
-    scrollPromise = waitForEvent(gFrame.contentDocument.defaultView, "scroll");
-    gFrame.contentDocument.defaultView.scrollBy(0, 200);
-    yield scrollPromise;
-
-    sendContextMenuClick(114, 130);
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(SelectionHelperUI.isActive, true, "selection active");
-    is(getTrimmedSelection(gFrame).toString(), "moment", "selection test");
-  },
-  tearDown: function tearDown() {
-    emptyClipboard();
-    clearSelection(gWindow);
-    clearSelection(gFrame);
-    let scrollPromise = waitForEvent(gFrame.contentDocument.defaultView, "scroll");
-    gFrame.contentDocument.defaultView.scrollBy(0, -200);
-    yield scrollPromise;
-    scrollPromise = waitForEvent(gWindow, "scroll");
-    gWindow.scrollBy(0, -200);
-    yield scrollPromise;
-    yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    }, kCommonWaitMs, kCommonPollMs);
-    yield hideContextUI();
-  },
-});
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_selection_tests need landscape mode to run.");
-    return;
-  }
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_inputs.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_inputs.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_inputs.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_inputs.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-</style>
-</head>
-<body style="margin: 5px 5px 5px 85px; font-size: 95%">
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<div><p>
-<iframe id="frame1" style="border: 0px;" height="200" src="res/textinput01.html" width="600"></iframe>
-</p></div>
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_inputs.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_inputs.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_inputs.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_inputs.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-/* -*- 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";
-
-let gWindow = null;
-var gFrame = null;
-var gInput = null;
-
-const kCommonWaitMs = 5000;
-const kCommonPollMs = 100;
-
-///////////////////////////////////////////////////
-// form input tests
-///////////////////////////////////////////////////
-
-function setUpAndTearDown() {
-  emptyClipboard();
-  if (gWindow)
-    clearSelection(gWindow);
-  if (gFrame)
-    clearSelection(gFrame);
-  if (gInput)
-    clearSelection(gInput);
-  yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    }, kCommonWaitMs, kCommonPollMs);
-  InputSourceHelper.isPrecise = false;
-  InputSourceHelper.fireUpdate();
-}
-
-gTests.push({
-  desc: "normalize browser",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    info(chromeRoot + "browser_selection_frame_inputs.html");
-    yield addTab(chromeRoot + "browser_selection_frame_inputs.html");
-
-    yield waitForCondition(function () {
-      return !BrowserUI.isStartTabVisible;
-      }, 10000, 100);
-
-    yield hideContextUI();
-
-    gWindow = Browser.selectedTab.browser.contentWindow;
-    gFrame = gWindow.document.getElementById("frame1");
-    gInput = gFrame.contentDocument.getElementById("textinput");
-
-    ok(gWindow != null, "gWindow");
-    ok(gFrame != null, "gFrame");
-    ok(gInput != null, "gInput");
-  },
-});
-
-gTests.push({
-  desc: "basic selection",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    gInput.focus();
-    gInput.selectionStart = gInput.selectionEnd = 0;
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(gWindow, gFrame, 135, 10);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-select",
-                                      "context-select-all"]);
-
-    let menuItem = document.getElementById("context-select");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(getTrimmedSelection(gInput).toString(), "straight", "selection test");
-
-    let rect = gFrame.getBoundingClientRect();
-    checkMonoclePositionRange("start", rect.left + 125, rect.left + 135, rect.top + 20, rect.top + 30);
-    checkMonoclePositionRange("end", rect.left + 165, rect.left + 175, rect.top + 20, rect.top + 30);
-  },
-});
-
-gTests.push({
-  desc: "drag selection",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    gInput.focus();
-    gInput.selectionStart = gInput.selectionEnd = 0;
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(gWindow, gFrame, 135, 10);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-select",
-                                      "context-select-all"]);
-
-    let menuItem = document.getElementById("context-select");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(getTrimmedSelection(gInput).toString(), "straight", "selection test");
-
-    // end marker to the right
-    let xpos = SelectionHelperUI.endMark.xPos;
-    let ypos = SelectionHelperUI.endMark.yPos + 10;
-    var touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, xpos, ypos, xpos + 350, ypos);
-    yield waitForCondition(function () {
-      return getTrimmedSelection(gInput).toString() == 
-        "straight on like a tunnel for some way and then dipped suddenly down";
-    }, 6000, 2000);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    // start marker to the left
-    let xpos = SelectionHelperUI.startMark.xPos;
-    let ypos = SelectionHelperUI.startMark.yPos + 10;
-    var touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, xpos, ypos, 10, ypos);
-    yield waitForCondition(function () {
-      return getTrimmedSelection(gInput).toString() == 
-        "The rabbit-hole went straight on like a tunnel for some way and then dipped suddenly down";
-    }, 6000, 2000);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-  },
-});
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_selection_tests need landscape mode to run.");
-    return;
-  }
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_in_scrollable_container.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_in_scrollable_container.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_in_scrollable_container.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_in_scrollable_container.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-      body {
-        padding: 40px;
-      }
-
-      .scrollable-container {
-        border: 1px solid blue;
-        overflow: auto;
-        max-height: 100px;
-        width: 200px;
-      }
-
-      .internal-frame {
-        display:block;
-        padding: 0px;
-        width: 150px;
-        visibility: visible;
-        height: 150px;
-        border: 1px solid red;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="scrollable-container">
-      <iframe id="frame1" src="res/documentindesignmode.html" tabindex="1" frameborder="0"
-              class="internal-frame">
-      </iframe>
-    </div>
-  </body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_in_scrollable_container.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_in_scrollable_container.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_in_scrollable_container.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_in_scrollable_container.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/* -*- 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";
-
-let gWindow = null;
-var gFrame = null;
-
-function setUpAndTearDown() {
-  emptyClipboard();
-
-  if (gWindow) {
-    clearSelection(gWindow);
-  }
-
-  if (gFrame) {
-    clearSelection(gFrame);
-  }
-
-  yield waitForCondition(function () {
-    return !SelectionHelperUI.isSelectionUIVisible;
-  });
-
-  InputSourceHelper.isPrecise = false;
-  InputSourceHelper.fireUpdate();
-}
-
-gTests.push({
-  desc: "Selection monocles for frame content that is located inside " +
-        "scrollable container.",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    let urlToLoad = chromeRoot +
-        "browser_selection_frame_in_scrollable_container.html";
-    info(urlToLoad);
-    yield addTab(urlToLoad);
-
-    ContextUI.dismiss();
-    yield waitForCondition(() => !ContextUI.navbarVisible);
-
-    gWindow = Browser.selectedTab.browser.contentWindow;
-    gFrame = gWindow.document.getElementById("frame1");
-
-    // Select some content inside frame.
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToWindow(gFrame.contentWindow, 10, 10);
-    yield promise;
-
-    let selectMenuItem = document.getElementById("context-select");
-    promise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, selectMenuItem);
-    yield promise;
-    yield waitForCondition(()=>SelectionHelperUI.isSelectionUIVisible);
-
-    // Scroll frame inside scrollable container.
-    let initialYPos = SelectionHelperUI.endMark.yPos;
-    let touchDrag = new TouchDragAndHold();
-    touchDrag.useNativeEvents = true;
-    yield touchDrag.start(gWindow, 100, 90, 100, 50);
-    touchDrag.end();
-
-    yield waitForCondition(() => !SelectionHelperUI.hasActiveDrag);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    yield waitForCondition(()=>SelectionHelperUI.isSelectionUIVisible);
-
-    ok(initialYPos - SelectionHelperUI.endMark.yPos > 10,
-        "Selection monocles followed scrolled content.");
-  }
-});
-
-function test() {
-  // We need this until bug 859742 is fully resolved.
-  setDevPixelEqualToPx();
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_textarea.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_textarea.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_textarea.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_textarea.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-</style>
-</head>
-<body style="margin: 5px 5px 5px 85px; font-size: 95%">
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<div><p>
-<iframe id="frame1" style="border: 0px;" height="200" src="res/textarea01.html" width="600"></iframe>
-</p></div>
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_textarea.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_textarea.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_textarea.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_frame_textarea.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,256 +0,0 @@
-/* -*- 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";
-
-let gWindow = null;
-var gFrame = null;
-var gTextArea = null;
-
-const kCommonWaitMs = 5000;
-const kCommonPollMs = 100;
-
-///////////////////////////////////////////////////
-// form input tests
-///////////////////////////////////////////////////
-
-function setUpAndTearDown() {
-  emptyClipboard();
-  if (gWindow)
-    clearSelection(gWindow);
-  if (gFrame)
-    clearSelection(gFrame);
-  if (gTextArea)
-    clearSelection(gTextArea);
-  yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    }, kCommonWaitMs, kCommonPollMs);
-  InputSourceHelper.isPrecise = false;
-  InputSourceHelper.fireUpdate();
-}
-
-gTests.push({
-  desc: "normalize browser",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    info(chromeRoot + "browser_selection_frame_textarea.html");
-    yield addTab(chromeRoot + "browser_selection_frame_textarea.html");
-
-    yield waitForCondition(function () {
-      return !BrowserUI.isStartTabVisible;
-      }, 10000, 100);
-
-    yield hideContextUI();
-
-    gWindow = Browser.selectedTab.browser.contentWindow;
-    gFrame = gWindow.document.getElementById("frame1");
-    gTextArea = gFrame.contentDocument.getElementById("textarea");
-    ok(gWindow != null, "gWindow");
-    ok(gFrame != null, "gFrame");
-    ok(gTextArea != null, "gTextArea");
-  },
-});
-
-gTests.push({
-  desc: "basic selection",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    gTextArea.focus();
-    gTextArea.selectionStart = gTextArea.selectionEnd = 0;
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(gWindow, gFrame, 220, 80);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-select",
-                                      "context-select-all"]);
-
-    let menuItem = document.getElementById("context-select");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(getTrimmedSelection(gTextArea).toString(), "wondered", "selection test");
-
-    checkMonoclePositionRange("start", 260, 280, 675, 690);
-    checkMonoclePositionRange("end", 320, 340, 675, 690);
-  },
-});
-
-gTests.push({
-  desc: "drag selection 1",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    gTextArea.focus();
-    gTextArea.selectionStart = gTextArea.selectionEnd = 0;
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(gWindow, gFrame, 220, 80);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-select",
-                                      "context-select-all"]);
-
-    let menuItem = document.getElementById("context-select");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(getTrimmedSelection(gTextArea).toString(), "wondered", "selection test");
-
-    // end marker to the right
-    let xpos = SelectionHelperUI.endMark.xPos;
-    let ypos = SelectionHelperUI.endMark.yPos + 10;
-    var touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, xpos, ypos, xpos + 150, ypos);
-    yield waitForCondition(function () {
-      return getTrimmedSelection(gTextArea).toString() == 
-        "wondered at this,";
-    }, 6000, 2000);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    // start marker up and to the left
-    let xpos = SelectionHelperUI.startMark.xPos;
-    let ypos = SelectionHelperUI.startMark.yPos + 10;
-    var touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, xpos, ypos, 40, 500);
-    yield waitForCondition(function () {
-      return getTrimmedSelection(gTextArea).toString().substring(0, 17) == 
-        "There was nothing";
-    }, 6000, 2000);
-    touchdrag.end();
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClick(250, 640);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-cut",
-                                      "context-copy"]);
-
-    let menuItem = document.getElementById("context-copy");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-
-    let string = "";
-    yield waitForCondition(function () {
-      string = SpecialPowers.getClipboardData("text/unicode");
-      return string.substring(0, 17) === "There was nothing";
-    });
-  },
-});
-
-gTests.push({
-  desc: "drag selection 2",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    gTextArea.focus();
-    gTextArea.selectionStart = gTextArea.selectionEnd = 0;
-
-    let scrollPromise = waitForEvent(gWindow, "scroll");
-    gWindow.scrollBy(0, 200);
-    yield scrollPromise;
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(gWindow, gFrame, 220, 80);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-select",
-                                      "context-select-all"]);
-
-    let menuItem = document.getElementById("context-select");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(getTrimmedSelection(gTextArea).toString(), "wondered", "selection test");
-
-    // end marker to the right
-    let xpos = SelectionHelperUI.endMark.xPos;
-    let ypos = SelectionHelperUI.endMark.yPos + 10;
-    var touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, xpos, ypos, xpos + 150, ypos);
-    yield waitForCondition(function () {
-      return getTrimmedSelection(gTextArea).toString() == 
-        "wondered at this,";
-    }, 6000, 2000);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    // start marker up and to the left
-    let xpos = SelectionHelperUI.startMark.xPos;
-    let ypos = SelectionHelperUI.startMark.yPos + 10;
-    var touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, xpos, ypos, 40, 300);
-    yield waitForCondition(function () {
-      return getTrimmedSelection(gTextArea).toString().substring(0, 17) == 
-        "There was nothing";
-    }, 6000, 2000);
-    touchdrag.end();
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClick(250, 440);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-cut",
-                                      "context-copy"]);
-
-    let menuItem = document.getElementById("context-copy");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-
-    let string = "";
-    yield waitForCondition(function () {
-      string = SpecialPowers.getClipboardData("text/unicode");
-      return string.substring(0, 17) === "There was nothing";
-    });
-  },
-});
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_selection_tests need landscape mode to run.");
-    return;
-  }
-  // XXX need this until bugs 886624 and 859742 are fully resolved
-  setDevPixelEqualToPx();
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_inputs.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_inputs.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_inputs.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_inputs.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-  </head>
-<body style="margin: 5px 5px 5px 85px;">
-<input id="a" style="width:300px; height:25px;" value="The rabbit-hole went straight on like a tunnel for some way and then dipped suddenly down" type="text">
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_inputs.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_inputs.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_inputs.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_inputs.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,296 +0,0 @@
-/* -*- 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";
-
-let gWindow = null;
-var gInput = null;
-
-const kCommonWaitMs = 7000;
-const kCommonPollMs = 200;
-
-///////////////////////////////////////////////////
-// form input tests
-///////////////////////////////////////////////////
-
-function setUpAndTearDown() {
-  emptyClipboard();
-  if (gWindow)
-    clearSelection(gWindow);
-  if (gInput)
-    clearSelection(gInput);
-  yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    }, kCommonWaitMs, kCommonPollMs);
-  InputSourceHelper.isPrecise = false;
-  InputSourceHelper.fireUpdate();
-}
-
-/*
-  5px top margin
-  25px tall text input
-  300px wide
-*/
-
-gTests.push({
-  desc: "normalize browser",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    info(chromeRoot + "browser_selection_inputs.html");
-    yield addTab(chromeRoot + "browser_selection_inputs.html");
-
-    yield waitForCondition(function () {
-      return !BrowserUI.isStartTabVisible;
-      });
-
-    yield hideContextUI();
-
-    gWindow = Browser.selectedTab.browser.contentWindow;
-    gInput = gWindow.document.getElementById("a");
-  },
-});
-
-gTests.push({
-  desc: "basic text input selection",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    gInput.blur();
-    gInput.selectionStart = gInput.selectionEnd = 0;
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClick(200, 17);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-select",
-                                      "context-select-all"]);
-
-    let menuItem = document.getElementById("context-select");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(getTrimmedSelection(gInput).toString(), "went", "selection test");
-    is(gWindow.document.activeElement, gInput, "input focused");
-  },
-});
-
-gTests.push({
-  desc: "drag left to scroll",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    gInput.selectionStart = gInput.selectionEnd = gInput.value.length;
-    yield waitForEvent(window, "scroll");
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClick(190, 17);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-select",
-                                      "context-select-all"]);
-
-    let menuItem = document.getElementById("context-select");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    // check text selection
-    is(getTrimmedSelection(gInput).toString(), "way", "selection test");
-
-    // to the left
-    let xpos = SelectionHelperUI.startMark.xPos;
-    let ypos = SelectionHelperUI.startMark.yPos + 10;
-    var touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, xpos, ypos, 10, ypos);
-    yield waitForCondition(function () {
-      return getTrimmedSelection(gInput).toString() == 
-        "The rabbit-hole went straight on like a tunnel for some way";
-    }, kCommonWaitMs, kCommonPollMs);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-  },
-});
-
-gTests.push({
-  desc: "drag right to scroll and bug 862025",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    gInput.selectionStart = gInput.selectionEnd = 0;
-    yield waitForEvent(window, "scroll");
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClick(230, 17);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-select",
-                                      "context-select-all"]);
-
-    let menuItem = document.getElementById("context-select");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    // check text selection
-    is(getTrimmedSelection(gInput).toString(), "straight", "selection test");
-
-    // to the right with scroll
-    let xpos = SelectionHelperUI.endMark.xPos;
-    let ystartpos = SelectionHelperUI.endMark.yPos + 10;
-    var touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, xpos, ystartpos, 510, ystartpos);
-    // hold the monocle in position outside the edit to trigger drag
-    yield waitForCondition(function () {
-      return getTrimmedSelection(gInput).toString() == 
-        "straight on like a tunnel for some way and then dipped suddenly down";
-    }, kCommonWaitMs, kCommonPollMs);
-    touchdrag.end();
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    // straight down - selection shouldn't change
-    let xpos = SelectionHelperUI.endMark.xPos;
-    let ypos = SelectionHelperUI.endMark.yPos + 10;
-    yield touchdrag.start(gWindow, xpos, ypos, xpos, ypos + 150);
-    // no touchend here, we want to continue the drag below
-
-    yield SelectionHelperUI.pingSelectionHandler();
-    is(getTrimmedSelection(gInput).toString(), "straight on like a tunnel for some way and then dipped suddenly down", "selection test");
-
-    // left and up with no scrolling - selection should shrink
-    yield touchdrag.move(135, ystartpos);
-    touchdrag.end();
-
-    yield SelectionHelperUI.pingSelectionHandler();
-    is(getTrimmedSelection(gInput).toString(), "straight on like a tunnel for", "selection test");
-  },
-});
-
-gTests.push({
-  desc: "Bug 858206 - Drag selection monocles should not push other monocles " +
-        "out of the way.",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    let inputOriginalValue = gInput.value;
-
-    gInput.value = "The rabbit-hole went straight on";
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(gWindow, gInput, 150);
-    yield promise;
-
-    // Make initial selection
-    promise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, document.getElementById("context-select"));
-    yield promise;
-
-    yield waitForCondition(() => SelectionHelperUI.isSelectionUIVisible,
-        kCommonWaitMs, kCommonPollMs);
-    is(getTrimmedSelection(gInput).toString(), "straight");
-
-    // Swap monocles when dragging with end monocle
-    let startXPos = SelectionHelperUI.endMark.xPos;
-    let startYPos = SelectionHelperUI.endMark.yPos + 10;
-    let touchDrag = new TouchDragAndHold();
-    yield touchDrag.start(gWindow, startXPos, startYPos, startXPos - 300,
-        startYPos);
-
-    yield waitForCondition(() => getTrimmedSelection(gInput).toString() ==
-        "The rabbit-hole went", kCommonWaitMs, kCommonPollMs);
-    touchDrag.end();
-    yield waitForCondition(() => !SelectionHelperUI.hasActiveDrag,
-        kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-     // Swap monocles when dragging with start monocle
-    startXPos = SelectionHelperUI.startMark.xPos;
-    startYPos = SelectionHelperUI.startMark.yPos + 10;
-    yield touchDrag.start(gWindow, startXPos, startYPos, startXPos + 300,
-        startYPos);
-    yield waitForCondition(() => getTrimmedSelection(gInput).toString() ==
-        "straight on", kCommonWaitMs, kCommonPollMs);
-    touchDrag.end();
-    yield waitForCondition(() => !SelectionHelperUI.hasActiveDrag,
-        kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-
-    // Swap monocles right after caret-to-selection mode switch from start
-    gInput.selectionStart = gInput.selectionEnd = 0;
-    sendElementTap(gWindow, gInput, 0, 0);
-
-    yield waitForCondition(() => !SelectionHelperUI.isSelectionUIVisible &&
-        SelectionHelperUI.isCaretUIVisible);
-
-    startXPos = SelectionHelperUI.caretMark.xPos;
-    startYPos = SelectionHelperUI.caretMark.yPos + 10;
-
-    yield touchDrag.start(gWindow, startXPos, startYPos, startXPos + 300,
-        startYPos);
-    yield waitForCondition(() => getTrimmedSelection(gInput).toString() ==
-        "The rabbit-hole went straight on", kCommonWaitMs, kCommonPollMs);
-    touchDrag.end();
-
-    sendTap(gWindow, 10, 10);
-    yield waitForCondition(() => !SelectionHelperUI.isSelectionUIVisible);
-
-    // Swap monocles right after caret-to-selection mode switch from end
-    gInput.selectionStart = gInput.selectionEnd = gInput.value.length;
-    let inputSelectionRectangle = gInput.QueryInterface(Ci.nsIDOMNSEditableElement).
-        editor.selection.getRangeAt(0).getClientRects()[0];
-    sendTap(gWindow, inputSelectionRectangle.right,
-        inputSelectionRectangle.top);
-
-    yield waitForCondition(() => SelectionHelperUI.isCaretUIVisible);
-
-    startXPos = SelectionHelperUI.caretMark.xPos;
-    startYPos = SelectionHelperUI.caretMark.yPos + 10;
-
-    yield touchDrag.start(gWindow, startXPos, startYPos, startXPos - 300,
-        startYPos);
-    yield waitForCondition(() => getTrimmedSelection(gInput).toString() ==
-        "The rabbit-hole went straight on", kCommonWaitMs, kCommonPollMs);
-    touchDrag.end();
-
-    gInput.value = inputOriginalValue;
-  }
-});
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_selection_tests need landscape mode to run.");
-    return;
-  }
-  // XXX need this until bugs 886624 and 859742 are fully resolved
-  setDevPixelEqualToPx();
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_textarea.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_textarea.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_textarea.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_textarea.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-  </head>
-<body>
-<form action="texarea.html">
-<div style="margin-left: 250px;">
-<textarea wrap="on" style="width:400px; height:75px; overflow:scroll;" id="inputtext">
-Alice was beginning to get very tired of sitting by her sister on the bank, and of having nothing to do: once or twice she had peeped into the book her sister was reading, but it had no pictures or conversations in it, `and what is the use of a book,' thought Alice `without pictures or conversation?'(end)</textarea>
-</div>
-</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_textarea.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_textarea.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_textarea.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_textarea.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-/* -*- 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";
-
-let gWindow = null;
-var gFrame = null;
-
-const kCommonWaitMs = 5000;
-const kCommonPollMs = 100;
-
-///////////////////////////////////////////////////
-// text area tests
-///////////////////////////////////////////////////
-
-function setUpAndTearDown() {
-  emptyClipboard();
-  if (gWindow)
-    clearSelection(gWindow);
-  if (gFrame)
-    clearSelection(gFrame);
-  yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    }, kCommonWaitMs, kCommonPollMs);
-  InputSourceHelper.isPrecise = false;
-  InputSourceHelper.fireUpdate();
-}
-
-gTests.push({
-  desc: "normalize browser",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    info(chromeRoot + "browser_selection_textarea.html");
-    yield addTab(chromeRoot + "browser_selection_textarea.html");
-
-    yield waitForCondition(function () {
-      return !BrowserUI.isStartTabVisible;
-      }, 10000, 100);
-
-    yield hideContextUI();
-
-    gWindow = Browser.selectedTab.browser.contentWindow;
-  },
-});
-
-gTests.push({
-  desc: "textarea selection and drag",
-  setUp: setUpAndTearDown,
-  tearDown: setUpAndTearDown,
-  run: function test() {
-    // work around for buggy context menu display
-    yield waitForMs(100);
-
-    let textarea = gWindow.document.getElementById("inputtext");
-    textarea.focus();
-
-    let promise = waitForEvent(document, "popupshown");
-    sendContextMenuClickToElement(gWindow, textarea, 20, 10);
-    yield promise;
-
-    checkContextUIMenuItemVisibility(["context-select",
-                                      "context-select-all"]);
-
-    let menuItem = document.getElementById("context-select");
-    ok(menuItem, "menu item exists");
-    ok(!menuItem.hidden, "menu item visible");
-    let popupPromise = waitForEvent(document, "popuphidden");
-    sendElementTap(gWindow, menuItem);
-    yield popupPromise;
-    ok(popupPromise && !(popupPromise instanceof Error), "promise error");
-
-    yield waitForCondition(function () {
-        return SelectionHelperUI.isSelectionUIVisible;
-      }, kCommonWaitMs, kCommonPollMs);
-
-    is(SelectionHelperUI.isActive, true, "selection active");
-    is(getTrimmedSelection(textarea).toString(), "Alice", "selection test");
-
-    let xpos = SelectionHelperUI.endMark.xPos;
-    let ypos = SelectionHelperUI.endMark.yPos + 10;
-
-    var touchdrag = new TouchDragAndHold();
-
-    // end marker and off the text area to the right
-    yield touchdrag.start(gWindow, xpos, ypos, 1200, 400);
-    let token = "(end)";
-    yield waitForCondition(function () {
-      let selection = getTrimmedSelection(textarea).toString();
-      if (selection.length < token.length ||
-          selection.substring(selection.length - token.length) != token) {
-        return false;
-      }
-      return true;
-    }, 5000, 100);
-
-    touchdrag.end();
-    touchdrag = null;
-
-    yield waitForCondition(function () {
-        return !SelectionHelperUI.hasActiveDrag;
-      }, kCommonWaitMs, kCommonPollMs);
-    yield SelectionHelperUI.pingSelectionHandler();
-  },
-});
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_selection_tests need landscape mode to run.");
-    return;
-  }
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_urlbar.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_urlbar.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_selection_urlbar.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_selection_urlbar.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,415 +0,0 @@
-/* -*- 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";
-
-let gWindow = null;
-var gFrame = null;
-
-const kCommonWaitMs = 5000;
-const kCommonPollMs = 100;
-
-///////////////////////////////////////////////////
-// text area tests
-///////////////////////////////////////////////////
-
-gTests.push({
-  desc: "normalize browser",
-  run: function test() {
-    info(chromeRoot + "res/textblock01.html");
-    yield addTab(chromeRoot + "res/textblock01.html");
-
-    yield waitForCondition(function () {
-      return !BrowserUI.isStartTabVisible;
-      });
-
-    yield hideContextUI();
-
-    InputSourceHelper.isPrecise = false;
-    InputSourceHelper.fireUpdate();
-  },
-});
-
-gTests.push({
-  desc: "nav bar display",
-  run: function test() {
-    gWindow = window;
-
-    yield showNavBar();
-
-    let edit = document.getElementById("urlbar-edit");
-
-    sendElementTap(window, edit, 100, 10);
-
-    ok(SelectionHelperUI.isSelectionUIVisible, "selection ui active");
-
-    sendElementTap(window, edit, 70, 10);
-
-    ok(SelectionHelperUI.isCaretUIVisible, "caret ui active");
-
-    // to the right
-    let xpos = SelectionHelperUI.caretMark.xPos;
-    let ypos = SelectionHelperUI.caretMark.yPos + 10;
-    var touchdrag = new TouchDragAndHold();
-    yield touchdrag.start(gWindow, xpos, ypos, 900, ypos);
-    yield waitForCondition(function () {
-      return getTrimmedSelection(edit).toString() ==
-        "mochitests/content/metro/browser/metro/base/tests/mochitest/res/textblock01.html";
-    }, kCommonWaitMs, kCommonPollMs);
-    touchdrag.end();
-    yield waitForMs(100);
-
-    ok(SelectionHelperUI.isSelectionUIVisible, "selection ui active");
-  },
-});
-
-gTests.push({
-  desc: "bug 887120 - tap & hold to paste into urlbar",
-  run: function() {
-    gWindow = window;
-
-    yield showNavBar();
-    let edit = document.getElementById("urlbar-edit");
-
-    SpecialPowers.clipboardCopyString("mozilla");
-    sendContextMenuClickToElement(window, edit);
-    yield waitForEvent(document, "popupshown");
-
-    ok(ContextMenuUI._menuPopup.visible, "is visible");
-    let paste = document.getElementById("context-paste");
-    ok(!paste.hidden, "paste item is visible");
-
-    sendElementTap(window, paste);
-    ok(edit.popup.popupOpen, "bug: popup should be showing");
-
-    clearSelection(edit);
-    yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    });
-  }
-});
-
-gTests.push({
-  desc: "bug 895284 - tap selection",
-  run: function() {
-    gWindow = window;
-
-    yield showNavBar();
-    let edit = document.getElementById("urlbar-edit");
-    edit.value = "wikipedia.org";
-    edit.select();
-
-    let editCoords = logicalCoordsForElement(edit);
-
-    // wait for popup animation to complete, it interferes with edit selection testing
-    let autocompletePopup = document.getElementById("urlbar-autocomplete-scroll");
-    yield waitForEvent(autocompletePopup, "transitionend");
-
-    SelectionHelperUI.attachEditSession(ChromeSelectionHandler, editCoords.x,
-        editCoords.y, edit);
-    ok(SelectionHelperUI.isSelectionUIVisible, "selection enabled");
-
-    let selection = edit.QueryInterface(Components.interfaces.nsIDOMXULTextBoxElement)
-                        .editor.selection;
-    let rects = selection.getRangeAt(0).getClientRects();
-    let midX = Math.ceil(((rects[0].right - rects[0].left) * .5) + rects[0].left);
-    let midY = Math.ceil(((rects[0].bottom - rects[0].top) * .5) + rects[0].top);
-
-    sendTap(window, midX, midY);
-
-    ok(SelectionHelperUI.isCaretUIVisible, "caret browsing enabled");
-
-    clearSelection(edit);
-    yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    });
-  }
-});
-
-gTests.push({
-  desc: "bug 894713 - blur shuts down selection handling",
-  run: function() {
-    gWindow = window;
-    yield showNavBar();
-    let edit = document.getElementById("urlbar-edit");
-    edit.value = "wikipedia.org";
-    edit.select();
-    let editCoords = logicalCoordsForElement(edit);
-    SelectionHelperUI.attachEditSession(ChromeSelectionHandler, editCoords.x,
-        editCoords.y, edit);
-    edit.blur();
-    ok(!SelectionHelperUI.isSelectionUIVisible, "selection no longer enabled");
-    clearSelection(edit);
-    yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    });
-  }
-});
-
-function getClipboardCondition(aExpected) {
-  return () => aExpected == SpecialPowers.getClipboardData("text/unicode");
-}
-
-gTests.push({
-  desc: "bug 894715 - URLs selected by touch are copied with trimming",
-  run: function () {
-    gWindow = window;
-    yield showNavBar();
-
-    let edit = document.getElementById("urlbar-edit");
-    edit.value = "http://www.wikipedia.org/";
-
-    sendElementTap(window, edit);
-    edit.select();
-
-    let panel = ContextMenuUI._menuPopup._panel;
-    let promise = waitForEvent(panel, "popupshown")
-    sendContextMenuClickToElement(window, edit);
-    ok((yield promise), "show context menu");
-
-    let copy = document.getElementById("context-copy");
-    ok(!copy.hidden, "copy menu item is visible")
-
-    let condition = getClipboardCondition("http://www.wikipedia.org/");
-    let promise = waitForCondition(condition);
-    sendElementTap(window, copy);
-    ok((yield promise), "copy text onto clipboard")
-
-    clearSelection(edit);
-    edit.blur();
-  }
-})
-
-gTests.push({
-  desc: "bug 965832 - selection monocles move with the nav bar",
-  run: function() {
-    yield showNavBar();
-
-    let originalUtils = Services.metro;
-    Services.metro = {
-      keyboardHeight: 0,
-      keyboardVisible: false
-    };
-    registerCleanupFunction(function() {
-      Services.metro = originalUtils;
-    });
-
-    let edit = document.getElementById("urlbar-edit");
-    edit.value = "http://www.wikipedia.org/";
-
-    sendElementTap(window, edit);
-    
-    let promise = waitForEvent(window, "MozDeckOffsetChanged");
-    Services.metro.keyboardHeight = 300;
-    Services.metro.keyboardVisible = true;
-    Services.obs.notifyObservers(null, "metro_softkeyboard_shown", null);
-    yield promise;
-
-    yield waitForCondition(function () {
-      return SelectionHelperUI.isSelectionUIVisible;
-    });
-
-    promise = waitForEvent(window, "MozDeckOffsetChanged");
-    Services.metro.keyboardHeight = 0;
-    Services.metro.keyboardVisible = false;
-    Services.obs.notifyObservers(null, "metro_softkeyboard_hidden", null);
-    yield promise;
-
-    yield waitForCondition(function () {
-      return SelectionHelperUI.isSelectionUIVisible;
-    });
-
-    clearSelection(edit);
-    edit.blur();
-
-    yield waitForCondition(function () {
-      return !SelectionHelperUI.isSelectionUIVisible;
-    });
-  }
-});
-
-gTests.push({
-  desc: "Bug 957646 - Selection monocles sometimes don't display when tapping" +
-        " text in the nav bar.",
-  run: function() {
-    yield showNavBar();
-
-    let edit = document.getElementById("urlbar-edit");
-    edit.value = "about:mozilla";
-
-    let editRectangle = edit.getBoundingClientRect();
-
-    // Tap outside the input but close enough for fluffing to take effect.
-    sendTap(window, editRectangle.left + 50, editRectangle.top - 2);
-
-    yield waitForCondition(function () {
-      return SelectionHelperUI.isSelectionUIVisible;
-    });
-  }
-});
-
-gTests.push({
-  desc: "Bug 972574 - Monocles not matching selection after double tap" +
-        " in URL text field.",
-  run: function() {
-    yield showNavBar();
-
-    let MARGIN_OF_ERROR = 15;
-    let EST_URLTEXT_WIDTH = 125;
-
-    let edit = document.getElementById("urlbar-edit");
-    edit.value = "http://www.wikipedia.org/";
-
-    // Determine a tap point centered on URL.
-    let editRectangle = edit.getBoundingClientRect();
-    let midX = editRectangle.left + Math.ceil(EST_URLTEXT_WIDTH / 2);
-    let midY = editRectangle.top + Math.ceil(editRectangle.height / 2);
-
-    // Tap inside the input for fluffing to take effect.
-    sendTap(window, midX, midY);
-
-    // Double-tap inside the input to selectALL.
-    sendDoubleTap(window, midX, midY);
-
-    // Check for start/end monocles positioned within accepted margins.
-    checkMonoclePositionRange("start",
-      Math.ceil(editRectangle.left - MARGIN_OF_ERROR),
-      Math.ceil(editRectangle.left + MARGIN_OF_ERROR),
-      Math.ceil(editRectangle.top + editRectangle.height - MARGIN_OF_ERROR),
-      Math.ceil(editRectangle.top + editRectangle.height + MARGIN_OF_ERROR));
-    checkMonoclePositionRange("end",
-      Math.ceil(editRectangle.left + EST_URLTEXT_WIDTH - MARGIN_OF_ERROR),
-      Math.ceil(editRectangle.left + EST_URLTEXT_WIDTH + MARGIN_OF_ERROR),
-      Math.ceil(editRectangle.top + editRectangle.height - MARGIN_OF_ERROR),
-      Math.ceil(editRectangle.top + editRectangle.height + MARGIN_OF_ERROR));
-  }
-});
-
-gTests.push({
-  desc: "Bug 972428 - grippers not appearing under the URL field when adding " +
-        "text.",
-  run: function() {
-    let inputField = document.getElementById("urlbar-edit").inputField;
-    let inputFieldRectangle = inputField.getBoundingClientRect();
-
-    let chromeHandlerSpy = spyOnMethod(ChromeSelectionHandler, "msgHandler");
-
-    // Reset URL to empty string
-    inputField.value = "";
-    inputField.blur();
-
-    // Activate URL input
-    sendTap(window, inputFieldRectangle.left + 50, inputFieldRectangle.top + 5);
-
-    // Wait until ChromeSelectionHandler tries to attach selection
-    yield waitForCondition(() => chromeHandlerSpy.argsForCall.some(
-        (args) => args[0] == "Browser:SelectionAttach"));
-
-    ok(!SelectHelperUI.isSelectionUIVisible && !SelectHelperUI.isCaretUIVisible,
-        "Neither CaretUI nor SelectionUI is visible on empty input.");
-
-    inputField.value = "Test text";
-
-    sendTap(window, inputFieldRectangle.left + 10, inputFieldRectangle.top + 5);
-
-    yield waitForCondition(() => SelectionHelperUI.isCaretUIVisible);
-    chromeHandlerSpy.restore();
-    inputField.blur();
-  }
-});
-
-gTests.push({
-  desc: "Bug 858206 - Drag selection monocles should not push other monocles " +
-        "out of the way.",
-  run: function test() {
-    yield showNavBar();
-
-    let edit = document.getElementById("urlbar-edit");
-    edit.value = "about:mozilla";
-
-    let editRectangle = edit.getBoundingClientRect();
-
-    sendTap(window, editRectangle.left, editRectangle.top);
-
-    yield waitForCondition(() => SelectionHelperUI.isSelectionUIVisible);
-
-    let selection = edit.QueryInterface(
-        Components.interfaces.nsIDOMXULTextBoxElement).editor.selection;
-    let selectionRectangle = selection.getRangeAt(0).getClientRects()[0];
-
-    // Place caret to the input start
-    sendTap(window, selectionRectangle.left + 2, selectionRectangle.top + 2);
-    yield waitForCondition(() => !SelectionHelperUI.isSelectionUIVisible &&
-        SelectionHelperUI.isCaretUIVisible);
-
-    let startXPos = SelectionHelperUI.caretMark.xPos;
-    let startYPos = SelectionHelperUI.caretMark.yPos + 10;
-    let touchDrag = new TouchDragAndHold();
-    yield touchDrag.start(gWindow, startXPos, startYPos, startXPos + 200,
-        startYPos);
-    yield waitForCondition(() => getTrimmedSelection(edit).toString() ==
-        "about:mozilla", kCommonWaitMs, kCommonPollMs);
-
-    touchDrag.end();
-    yield waitForCondition(() => !SelectionHelperUI.hasActiveDrag,
-        kCommonWaitMs, kCommonPollMs);
-
-    // Place caret to the input end
-    sendTap(window, selectionRectangle.right - 2, selectionRectangle.top + 2);
-    yield waitForCondition(() => !SelectionHelperUI.isSelectionUIVisible &&
-        SelectionHelperUI.isCaretUIVisible);
-
-    startXPos = SelectionHelperUI.caretMark.xPos;
-    startYPos = SelectionHelperUI.caretMark.yPos + 10;
-    yield touchDrag.start(gWindow, startXPos, startYPos, startXPos - 200,
-        startYPos);
-    yield waitForCondition(() => getTrimmedSelection(edit).toString() ==
-        "about:mozilla", kCommonWaitMs, kCommonPollMs);
-
-    touchDrag.end();
-    yield waitForCondition(() => !SelectionHelperUI.hasActiveDrag,
-        kCommonWaitMs, kCommonPollMs);
-
-    // Place caret in the middle
-    let midX = Math.ceil(((selectionRectangle.right - selectionRectangle.left) *
-        .5) + selectionRectangle.left);
-    let midY = Math.ceil(((selectionRectangle.bottom - selectionRectangle.top) *
-        .5) + selectionRectangle.top);
-
-    sendTap(window, midX, midY);
-    yield waitForCondition(() => !SelectionHelperUI.isSelectionUIVisible &&
-        SelectionHelperUI.isCaretUIVisible);
-
-    startXPos = SelectionHelperUI.caretMark.xPos;
-    startYPos = SelectionHelperUI.caretMark.yPos + 10;
-    yield touchDrag.start(gWindow, startXPos, startYPos, startXPos - 200,
-        startYPos);
-    yield waitForCondition(() => getTrimmedSelection(edit).toString() ==
-        "about:", kCommonWaitMs, kCommonPollMs);
-
-    touchDrag.end();
-    yield waitForCondition(() => !SelectionHelperUI.hasActiveDrag,
-        kCommonWaitMs, kCommonPollMs);
-
-    // Now try to swap monocles
-    startXPos = SelectionHelperUI.startMark.xPos;
-    startYPos = SelectionHelperUI.startMark.yPos + 10;
-    yield touchDrag.start(gWindow, startXPos, startYPos, startXPos + 200,
-        startYPos);
-    yield waitForCondition(() => getTrimmedSelection(edit).toString() ==
-        "mozilla", kCommonWaitMs, kCommonPollMs);
-      touchDrag.end();
-    yield waitForCondition(() => !SelectionHelperUI.hasActiveDrag &&
-        SelectionHelperUI.isSelectionUIVisible, kCommonWaitMs, kCommonPollMs);
-  }
-});
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_selection_tests need landscape mode to run.");
-    return;
-  }
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_sessionstore.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_sessionstore.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_sessionstore.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_sessionstore.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/* vim: set 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";
-
-var gSessionStore = Cc["@mozilla.org/browser/sessionstore;1"]
-                    .getService(Ci.nsISessionStore);
-
-function test() {
-  runTests();
-}
-
-function getState() {
-  return JSON.parse(gSessionStore.getBrowserState());
-}
-
-function getTabData() {
-  return getState().windows[0].tabs;
-}
-
-function isValidTabData(aData) {
-  return aData && aData.entries && aData.entries.length &&
-           typeof aData.index == "number";
-}
-
-gTests.push({
-  desc: "getBrowserState tests",
-  run: function() {
-    // Wait for Session Manager to be initialized.
-    yield waitForCondition(() => window.__SSID);
-    info(window.__SSID);
-    let tabData1 = getTabData();
-    ok(tabData1.every(isValidTabData), "Tab data starts out valid");
-
-    // Open a tab.
-    let tab = Browser.addTab("about:mozilla");
-    let tabData2 = getTabData();
-    is(tabData2.length, tabData1.length, "New tab not added yet.");
-
-    // Wait for the tab's session data to be initialized.
-    yield waitForMessage("Content:SessionHistory", tab.browser.messageManager);
-    yield waitForMs(0);
-    let tabData3 = getTabData();
-    is(tabData3.length, tabData1.length + 1, "New tab added.");
-    ok(tabData3.every(isValidTabData), "Tab data still valid");
-
-    // Close the tab.
-    Browser.closeTab(tab, { forceClose: true } );
-    let tabData4 = getTabData();
-    is(tabData4.length, tabData1.length, "Closed tab removed.");
-    ok(tabData4.every(isValidTabData), "Tab data valid again");
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_snappedState.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_snappedState.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_snappedState.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_snappedState.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,209 +0,0 @@
-// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-var gStartDoc = null;
-
-function test() {
-  if (!isLandscapeMode()) {
-    todo(false, "browser_snapped_tests need landscape mode to run.");
-    return;
-  }
-
-  runTests();
-}
-
-function showStartUI() {
-  if (!BrowserUI.isStartTabVisible) {
-    let tab = yield addTab("about:start");
-    gStartDoc = tab.browser.contentWindow.document;
-  } else {
-    gStartDoc = Browser.selectedBrowser.contentWindow.document;
-  }
-}
-
-function setUpSnapped() {
-  yield showStartUI();
-  yield setSnappedViewstate();
-}
-
-function setUpPortrait() {
-  yield showStartUI();
-  yield setPortraitViewstate();
-}
-
-function getNarrowTitle(aVboxId) {
-  let vbox = gStartDoc.getElementById(aVboxId);
-  return vbox.querySelector(".narrow-title");
-}
-
-function narrowTitleVisible(aVboxId) {
-  let title = getNarrowTitle(aVboxId);
-  let display = getComputedStyle(title).getPropertyValue("display");
-
-  return display !== "none";
-}
-
-function wideTitleVisible(aVboxId) {
-  let vbox = gStartDoc.getElementById(aVboxId);
-  let title = vbox.querySelector(".wide-title");
-  let display = getComputedStyle(title).getPropertyValue("display");
-
-  return display !== "none";
-}
-
-gTests.push({
-  desc: "Test Snapped titles",
-  setUp: setUpSnapped,
-  run: function() {
-    ok(narrowTitleVisible("start-topsites"), "topsites narrow title is visible");
-    ok(narrowTitleVisible("start-bookmarks"), "bookmarks narrow title is visible");
-    ok(narrowTitleVisible("start-history"), "history narrow title is visible");
-
-    ok(!wideTitleVisible("start-topsites"), "topsites wide title is not visible");
-    ok(!wideTitleVisible("start-bookmarks"), "bookmarks wide title is not visible");
-    ok(!wideTitleVisible("start-history"), "history wide title is not visible");
-  },
-  tearDown: restoreViewstate
-});
-
-gTests.push({
-  desc: "Test Snapped titles",
-  setUp: setUpSnapped,
-  run: function() {
-    let topsites = gStartDoc.getElementById("start-topsites");
-    let bookmarks = gStartDoc.getElementById("start-bookmarks");
-    let history = gStartDoc.getElementById("start-history");
-
-    ok(topsites.hasAttribute("expanded"), "topsites is expanded");
-    ok(!bookmarks.hasAttribute("expanded"), "bookmarks is collapsed");
-    ok(!history.hasAttribute("expanded"), "history is collapsed");
-
-    // Expand bookmarks
-    sendElementTap(Browser.selectedBrowser.contentWindow, getNarrowTitle("start-bookmarks"));
-
-    yield waitForCondition(() => bookmarks.hasAttribute("expanded"));
-
-    ok(!topsites.hasAttribute("expanded"), "topsites is collapsed");
-    ok(bookmarks.hasAttribute("expanded"), "bookmarks is expanded");
-    ok(!history.hasAttribute("expanded"), "history is collapsed");
-  },
-  tearDown: restoreViewstate
-});
-
-/* Disabled because it breaks at specific screen sizes (bug 936735).
-gTests.push({
-  desc: "Test Snapped scrolls vertically",
-  setUp: function() {
-
-    // Populate with mock data and expand bookmarks
-    BookmarksTestHelper.setup();
-    sendElementTap(Browser.selectedBrowser.contentWindow, getNarrowTitle("start-bookmarks"));
-
-    yield waitForCondition(() => gStartDoc.getElementById("start-bookmarks").hasAttribute("expanded"));
-
-    yield setUpSnapped();
-  },
-  run: function() {
-    ok(Browser.selectedBrowser.contentWindow.scrollMaxY !== 0, "Snapped scrolls vertically");
-    ok(Browser.selectedBrowser.contentWindow.scrollMaxX === 0, "Snapped does not scroll horizontally");
-  },
-  tearDown: function() {
-    BookmarksTestHelper.restore();
-    yield restoreViewstate();
-  }
-});
-*/
-
-gTests.push({
-  desc: "Test tile selection is cleared and disabled",
-  setUp: function() {
-    BookmarksTestHelper.setup();
-    HistoryTestHelper.setup();
-    showStartUI();
-  },
-  run: function() {
-    // minimal event mocking to trigger context-click handlers
-    function makeMockEvent(item) {
-      return {
-        stopPropagation: function() {},
-        target: item
-      };
-    }
-    let startWin = Browser.selectedBrowser.contentWindow;
-    // make sure the bookmarks grid is showing
-    startWin.StartUI.onNarrowTitleClick("start-bookmarks");
-    let bookmarksGrid = startWin.document.querySelector("#start-bookmarks-grid");
-    // sanity check
-    ok(bookmarksGrid, "matched bookmarks grid");
-    ok(bookmarksGrid.children[0], "bookmarks grid has items");
-    // select a tile (balancing implementation leakage with test simplicity)
-    let mockEvent = makeMockEvent(bookmarksGrid.children[0]);
-    bookmarksGrid.handleItemContextMenu(bookmarksGrid.children[0], mockEvent);
-    // check tile was selected
-    is(bookmarksGrid.selectedItems.length, 1, "Tile got selected in landscape view");
-    // switch to snapped view
-    yield setSnappedViewstate();
-    is(bookmarksGrid.selectedItems.length, 0, "grid items selection cleared in snapped view");
-    // attempt to select a tile in snapped view
-    mockEvent = makeMockEvent(bookmarksGrid.children[0]);
-    bookmarksGrid.handleItemContextMenu(bookmarksGrid.children[0], mockEvent);
-    is(bookmarksGrid.selectedItems.length, 0, "no grid item selections possible in snapped view");
-  },
-  tearDown: function() {
-    BookmarksTestHelper.restore();
-    HistoryTestHelper.restore();
-    yield restoreViewstate();
-  }
-});
-
-gTests.push({
-  desc: "Navbar contextual buttons are not shown in snapped",
-  setUp: setUpSnapped,
-  run: function() {
-    let toolbarContextual = document.getElementById("toolbar-contextual");
-    let visibility = getComputedStyle(toolbarContextual).getPropertyValue("visibility");
-    ok(visibility === "collapse" || visibility === "hidden", "Contextual buttons not shown in navbar");
-  },
-  tearDown: restoreViewstate
-});
-
-gTests.push({
-  desc: "Test Portrait titles",
-  setUp: setUpPortrait,
-  run: function() {
-    // Check title visibility
-    ok(!narrowTitleVisible("start-topsites"), "topsites narrow title is not visible");
-    ok(!narrowTitleVisible("start-bookmarks"), "bookmarks narrow title is not visible");
-    ok(!narrowTitleVisible("start-history"), "history narrow title is not visible");
-
-    ok(wideTitleVisible("start-topsites"), "topsites wide title is visible");
-    ok(wideTitleVisible("start-bookmarks"), "bookmarks wide title is visible");
-    ok(wideTitleVisible("start-history"), "history wide title is visible");
-  },
-  tearDown: restoreViewstate
-});
-
-/* Disabled because it breaks at specific screen sizes (bug 936735).
-gTests.push({
-  desc: "Test portrait scrolls vertically",
-  setUp: function() {
-    // Populate with mock data
-    BookmarksTestHelper.setup();
-    HistoryTestHelper.setup();
-
-    yield setUpPortrait();
-  },
-  run: function() {
-    ok(Browser.selectedBrowser.contentWindow.scrollMaxY !== 0, "Portrait scrolls vertically");
-    ok(Browser.selectedBrowser.contentWindow.scrollMaxX === 0, "Portrait does not scroll horizontally");
-  },
-  tearDown: function() {
-    BookmarksTestHelper.restore();
-    HistoryTestHelper.restore();
-    yield restoreViewstate();
-  }
-});
-*/
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_tabs_container.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_tabs_container.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_tabs_container.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_tabs_container.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +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";
-
-function test() {
-  runTests();
-}
-
-function setup() {
-  yield waitForCondition(function () {
-    return Elements.tabList && Elements.tabList.strip;
-  });
-
-  if (!ContextUI.tabbarVisible) {
-    ContextUI.displayTabs();
-  }
-}
-function tearDown() {
-  cleanUpOpenedTabs();
-}
-
-function isElementVisible(elm) {
-  return elm.ownerDocument.defaultView.getComputedStyle(elm).getPropertyValue("visibility") == "visible";
-}
-
-
-gTests.push({
-  desc: "No scrollbuttons when tab strip doesnt require overflow",
-  setUp: setup,
-  run: function () {
-    let tabStrip = Elements.tabList.strip;
-    let tabs = Elements.tabList.strip.querySelectorAll("documenttab");
-
-    // sanity check tab count:
-    is(tabs.length, 1, "1 tab present");
-
-    // test imprecise mode
-    let imprecisePromise = waitForObserver("metro_imprecise_input");
-    notifyImprecise();
-    yield imprecisePromise;
-
-    ok(!isElementVisible(tabStrip._scrollButtonUp), "left scrollbutton is hidden in imprecise mode");
-    ok(!isElementVisible(tabStrip._scrollButtonDown), "right scrollbutton is hidden in imprecise mode");
-
-    // test precise mode
-    let precisePromise = waitForObserver("metro_precise_input");
-    notifyPrecise();
-    yield precisePromise;
-
-    ok(!isElementVisible(tabStrip._scrollButtonUp), "Bug 952297 - left scrollbutton is hidden in precise mode");
-    ok(!isElementVisible(tabStrip._scrollButtonDown), "right scrollbutton is hidden in precise mode");
-  },
-  tearDown: tearDown
-});
-
-gTests.push({
-  desc: "Scrollbuttons not visible when tabstrip has overflow in imprecise input mode",
-  setUp: function(){
-    yield setup();
-    // ensure we're in imprecise mode
-    let imprecisePromise = waitForObserver("metro_imprecise_input");
-    notifyImprecise();
-    yield imprecisePromise;
-  },
-  run: function () {
-    // add enough tabs to get overflow in the tabstrip
-    let strip = Elements.tabList.strip;
-    ok(strip && strip.scrollClientSize && strip.scrollSize, "Sanity check tabstrip strip is present and expected properties available");
-
-    while (strip.scrollSize <= strip.scrollClientSize) {
-      yield addTab("about:mozilla");
-    }
-
-    ok(!isElementVisible(Elements.tabList.strip._scrollButtonUp), "left scrollbutton is hidden in imprecise mode");
-    ok(!isElementVisible(Elements.tabList.strip._scrollButtonDown), "right scrollbutton is hidden in imprecise mode");
-
-  }
-});
-
-gTests.push({
-  desc: "Scrollbuttons become visible when tabstrip has overflow in precise input mode",
-  setUp: function(){
-    yield setup();
-    // ensure we're in precise mode
-    let precisePromise = waitForObserver("metro_precise_input");
-    notifyPrecise();
-    yield precisePromise;
-  },
-  run: function () {
-    let strip = Elements.tabList.strip;
-    ok(strip && strip.scrollClientSize && strip.scrollSize, "Sanity check tabstrip is present and expected properties available");
-
-    // add enough tabs to get overflow in the tabstrip
-    while (strip.scrollSize <= strip.scrollClientSize) {
-      yield addTab("about:mozilla");
-    }
-
-    ok(isElementVisible(Elements.tabList.strip._scrollButtonUp), "left scrollbutton should be visible in precise mode");
-    ok(isElementVisible(Elements.tabList.strip._scrollButtonDown), "right scrollbutton should be visible in precise mode");
-
-    // select the first tab
-    Browser.selectedTab = Browser.tabs[0];
-    yield waitForMs(1000); // XXX maximum duration of arrowscrollbox _scrollAnim
-    ok(Elements.tabList.strip._scrollButtonUp.disabled, "left scrollbutton should be disabled when 1st tab is selected and tablist has overflow");
-    ok(!Elements.tabList.strip._scrollButtonDown.disabled, "right scrollbutton should be enabled when 1st tab is selected and tablist has overflow");
-
-    // select the last tab
-    Browser.selectedTab = Browser.tabs[Browser.tabs.length - 1];
-    yield waitForMs(1000); // XXX maximum duration of arrowscrollbox _scrollAnim
-    ok(!Elements.tabList.strip._scrollButtonUp.disabled, "left scrollbutton should be enabled when 1st tab is selected and tablist has overflow");
-    ok(Elements.tabList.strip._scrollButtonDown.disabled, "right scrollbutton should be disabled when last tab is selected and tablist has overflow");
-
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_tabs.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_tabs.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_tabs.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_tabs.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +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";
-
-let mockTab = function(aName, aIsClosing) {
-  this.name = aName;
-  this.isClosing = aIsClosing;
-};
-
-mockTab.prototype = {
-  get chromeTab () {
-    let getAttribute = () => this.isClosing;
-    return {
-      hasAttribute: getAttribute
-    }
-  }
-};
-
-let getMockBrowserTabs = function(aTestTabs, aSelected) {
-  let result = {
-    _tabs: aTestTabs,
-    _selectedTab: aTestTabs[aSelected || 0],
-    getTabAtIndex: function(i) this._tabs[i]
-  };
-
-  return [result, Browser.getNextTab.bind(result)];
-};
-
-gTests.push({
-  desc: "Test Browser.getNextTab",
-  run: function() {
-    let [lonlyTab, fakeGetNextTab] = getMockBrowserTabs(
-      [new mockTab("a", false)]);
-
-    ok(fakeGetNextTab(lonlyTab._selectedTab) == null, "null when only 1 tab left");
-    ok(fakeGetNextTab(new mockTab("x", false)) == null, "null when tab doesnt exist");
-
-    let [twoTabs, fakeGetNextTab] = getMockBrowserTabs(
-      [new mockTab("a", false), new mockTab("b", false)]);
-    ok(fakeGetNextTab(twoTabs._selectedTab).name == "b", "get next tab");
-    ok(fakeGetNextTab(twoTabs._tabs[1]).name == "a", "get selected tab");
-
-    let [twoTabsSecondSelected, fakeGetNextTab] = getMockBrowserTabs(
-      [new mockTab("a", false), new mockTab("b", false)], 1);
-    ok(fakeGetNextTab(twoTabsSecondSelected._selectedTab).name == "a", "get previous tab");
-
-    let [twoTabsOneClosing, fakeGetNextTab] = getMockBrowserTabs(
-      [new mockTab("a", false), new mockTab("b", true)]);
-    ok(fakeGetNextTab(twoTabsOneClosing._selectedTab) == null, "can't select closing tab");
-    ok(fakeGetNextTab(twoTabsOneClosing._tabs[1]).name == "a", "get previous tab");
-
-    let [twoTabsBothClosing, fakeGetNextTab] = getMockBrowserTabs(
-      [new mockTab("a", true), new mockTab("b", true)]);
-    ok(fakeGetNextTab(twoTabsBothClosing._selectedTab) == null, "can't select closing tab");
-    ok(fakeGetNextTab(twoTabsBothClosing._tabs[1]) == null, "can't select closing tab");
-
-    let [fiveTabsLastNotClosing, fakeGetNextTab] = getMockBrowserTabs(
-      [new mockTab("a", false), new mockTab("b", true), new mockTab("c", true), new mockTab("d", true), new mockTab("e", false)]);
-    ok(fakeGetNextTab(fiveTabsLastNotClosing._selectedTab).name == "e", "get next non-closing tab");
-
-    let [fiveTabsLastNotClosingLastSelected, fakeGetNextTab] = getMockBrowserTabs(
-      [new mockTab("a", false), new mockTab("b", true), new mockTab("c", true), new mockTab("d", true), new mockTab("e", false)], 4);
-    ok(fakeGetNextTab(fiveTabsLastNotClosingLastSelected._selectedTab).name == "a", "get previous non-closing tab");
-  }
-});
-
-function test() {
-  runTests();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_test.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_test.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_test.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_test.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-// Tests for the test functions in head.js
-
-function test() {
-  waitForExplicitFinish();
-  runTests();
-}
-
-gTests.push({
-  desc: "task sanity check",
-  run: function() {
-    let sum2plus2 = yield asyncSum(2, 2);
-    ok(sum2plus2 == 4, "asyncSum responded 2+2=4");
-
-    function asyncSum(a, b) {
-      var defd = Promise.defer();
-      setTimeout(function(){
-        defd.resolve(a+b);
-      }, 25);
-      return defd.promise;
-    }
-  }
-});
-
-gTests.push({
-  desc: "addTab",
-  run: function testAddTab() {
-    let tab = yield addTab("http://example.com/");
-    is(tab, Browser.selectedTab, "The new tab is selected");
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_tilegrid.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_tilegrid.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_tilegrid.xul	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_tilegrid.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-<?xml version="1.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/. -->
-
-<?xml-stylesheet href="chrome://browser/skin/platform.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/browser.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/bindings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/tiles.css" type="text/css"?>
-<!DOCTYPE window []>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <vbox id="alayout">
-      <richgrid id="grid_layout" seltype="single" nocontext="true" flex="1">
-      </richgrid>
-  </vbox>
-  <vbox>
-      <richgrid id="slots_grid" seltype="single" minSlots="6" flex="1"/>
-  </vbox>
-  <vbox style="height:600px">
-    <hbox>
-      <richgrid id="clearGrid" seltype="single" nocontext="true" flex="1" rows="2">
-        <richgriditem value="about:blank" id="clearGrid_item1" label="First item"/>
-        <richgriditem value="about:blank" id="clearGrid_item2" label="2nd item"/>
-        <richgriditem value="about:blank" id="clearGrid_item1" label="First item"/>
-      </richgrid>
-    </hbox>
-    <hbox>
-      <richgrid id="emptyGrid" seltype="single" flex="1" rows="2" minSlots="6">
-      </richgrid>
-    </hbox>
-    <hbox>
-      <richgrid id="grid1" seltype="single" flex="1">
-        <richgriditem value="about:blank" id="grid1_item1" label="First item"/>
-        <richgriditem value="about:blank" id="grid1_item2" label="2nd item"/>
-      </richgrid>
-    </hbox>
-    <hbox>
-      <richgrid id="emptygrid" seltype="single" flex="1"/>
-    </hbox>
-    <hbox>
-      <richgrid id="grid2" seltype="single" flex="1">
-        <richgriditem value="about:blank" id="grid2_item1" label="First item"/>
-        <richgriditem value="about:blank" id="grid2_item2" label="2nd item"/>
-      </richgrid>
-    </hbox>
-    <hbox>
-      <richgrid id="grid3" seltype="single" flex="1">
-        <richgriditem value="about:blank" id="grid3_item1" label="First item"/>
-        <richgriditem value="about:blank" id="grid3_item2" label="2nd item"/>
-      </richgrid>
-    </hbox>
-    <hbox>
-      <richgrid id="grid4" seltype="single" flex="1">
-        <richgriditem value="about:blank" id="grid4_item1" label="First item"/>
-        <richgriditem value="about:blank" id="grid4_item2" label="2nd item"/>
-      </richgrid>
-    </hbox>
-    <hbox>
-      <richgrid id="grid5" seltype="single" flex="1">
-        <richgriditem value="about:blank" id="grid5_item1" label="First item"/>
-        <richgriditem value="http://bugzilla.mozilla.org/" id="grid5_item2" label="2nd item"/>
-        <richgriditem value="about:blank" id="grid5_item3" label="3rd item"/>
-        <richgriditem value="http://bugzilla.mozilla.org/" id="grid5_item4" label="4th item"/>
-      </richgrid>
-    </hbox>
-    <hbox>
-      <richgrid id="grid6" seltype="single" flex="1">
-        <richgriditem value="about:blank" id="grid6_item1" label="First item"/>
-      </richgrid>
-    </hbox>
-    <hbox>
-      <richgrid id="grid-select1" seltype="single" flex="1">
-        <richgriditem value="about:blank" id="grid-select1_item1" label="First item"/>
-        <richgriditem value="about:blank" id="grid-select1_item2" label="2nd item"/>
-      </richgrid>
-    </hbox>
-    <hbox>
-      <richgrid id="grid-select2" seltype="multiple" flex="1">
-        <richgriditem value="about:blank" id="grid-select2_item1" label="First item"/>
-        <richgriditem value="about:blank" id="grid-select2_item2" label="2nd item"/>
-      </richgrid>
-    </hbox>
-  </vbox>
-</window>
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_tiles.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_tiles.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_tiles.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_tiles.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,675 +0,0 @@
-let doc;
-
-function test() {
-  waitForExplicitFinish();
-  Task.spawn(function(){
-    info(chromeRoot + "browser_tilegrid.xul");
-    yield addTab(chromeRoot + "browser_tilegrid.xul");
-    doc = Browser.selectedTab.browser.contentWindow.document;
-  }).then(runTests);
-}
-
-function _checkIfBoundByRichGrid_Item(expected, node, idx) {
-  let binding = node.ownerDocument.defaultView.getComputedStyle(node).MozBinding;
-  let result = ('url("chrome://browser/content/bindings/grid.xml#richgrid-item")' == binding);
-  return (result == expected);
-}
-let isBoundByRichGrid_Item = _checkIfBoundByRichGrid_Item.bind(this, true);
-let isNotBoundByRichGrid_Item = _checkIfBoundByRichGrid_Item.bind(this, false);
-
-gTests.push({
-  desc: "richgrid binding is applied",
-  run: function() {
-    ok(doc, "doc got defined");
-
-    let grid = doc.querySelector("#grid1");
-    ok(grid, "#grid1 is found");
-    is(typeof grid.clearSelection, "function", "#grid1 has the binding applied");
-    is(grid.items.length, 2, "#grid1 has a 2 items");
-    is(grid.items[0].control, grid, "#grid1 item's control points back at #grid1'");
-    ok(Array.every(grid.items, isBoundByRichGrid_Item), "All items are bound by richgrid-item");
-  }
-});
-
-gTests.push({
-  desc: "item clicks are handled",
-  run: function() {
-    let grid = doc.querySelector("#grid1");
-    is(typeof grid.handleItemClick, "function", "grid.handleItemClick is a function");
-    let handleStub = stubMethod(grid, 'handleItemClick');
-    let itemId = "grid1_item1"; // grid.items[0].getAttribute("id");
-
-    // send click to item and wait for next tick;
-    EventUtils.sendMouseEvent({type: 'click'}, itemId, doc.defaultView);
-    yield waitForMs(0);
-
-    is(handleStub.callCount, 1, "handleItemClick was called when we clicked an item");
-    handleStub.restore();
-
-    // if the grid has a controller, it should be called too
-    let gridController = {
-      handleItemClick: function() {}
-    };
-    let controllerHandleStub = stubMethod(gridController, "handleItemClick");
-    let origController = grid.controller;
-    grid.controller = gridController;
-
-    // send click to item and wait for next tick;
-    EventUtils.sendMouseEvent({type: 'click'}, itemId, doc.defaultView);
-    yield waitForMs(0);
-
-    is(controllerHandleStub.callCount, 1, "controller.handleItemClick was called when we clicked an item");
-    is(controllerHandleStub.calledWith[0], doc.getElementById(itemId), "controller.handleItemClick was passed the grid item");
-    grid.controller = origController;
-  }
-});
-
-gTests.push({
-  desc: "arrangeItems",
-  run: function() {
-     // implements an arrangeItems method, with optional cols, rows signature
-    let container = doc.getElementById("alayout");
-    let grid = doc.querySelector("#grid_layout");
-
-    is(typeof grid.arrangeItems, "function", "arrangeItems is a function on the grid");
-
-    ok(grid.tileHeight, "grid has truthy tileHeight value");
-    ok(grid.tileWidth, "grid has truthy tileWidth value");
-
-    // make the container big enough for 3 rows
-    container.style.height = 3 * grid.tileHeight + 20 + "px";
-
-    // add some items
-    grid.appendItem("test title", "about:blank", true);
-    grid.appendItem("test title", "about:blank", true);
-    grid.appendItem("test title", "about:blank", true);
-    grid.appendItem("test title", "about:blank", true);
-    grid.appendItem("test title", "about:blank", true);
-
-    grid.arrangeItems();
-    // they should all fit nicely in a 3x2 grid
-    is(grid.rowCount, 3, "rowCount is calculated correctly for a given container height and tileheight");
-    is(grid.columnCount, 2, "columnCount is calculated correctly for a given container maxWidth and tilewidth");
-
-    // squish the available height
-    // should overflow (clip) a 2x2 grid
-
-    let under3rowsHeight = (3 * grid.tileHeight -20) + "px";
-    container.style.height = under3rowsHeight;
-
-    let arrangedPromise = waitForEvent(grid, "arranged");
-    grid.arrangeItems();
-    yield arrangedPromise;
-
-    ok(true, "arranged event is fired when arrangeItems is called");
-    is(grid.rowCount, 2, "rowCount is re-calculated correctly for a given container height");
-  }
-});
-
-gTests.push({
-  desc: "clearAll",
-  run: function() {
-    let grid = doc.getElementById("clearGrid");
-    grid.arrangeItems();
-
-    // grid has rows=2 so we expect at least 2 rows and 2 columns with 3 items
-    is(typeof grid.clearAll, "function", "clearAll is a function on the grid");
-    is(grid.itemCount, 3, "grid has 3 items initially");
-    is(grid.rowCount, 2, "grid has 2 rows initially");
-    is(grid.columnCount, 2, "grid has 2 cols initially");
-
-    let arrangeSpy = spyOnMethod(grid, "arrangeItems");
-    grid.clearAll();
-
-    is(grid.itemCount, 0, "grid has 0 itemCount after clearAll");
-    is(grid.items.length, 0, "grid has 0 items after clearAll");
-    // now that we use slots, an empty grid may still have non-zero rows & columns
-
-    is(arrangeSpy.callCount, 1, "arrangeItems is called once when we clearAll");
-    arrangeSpy.restore();
-  }
-});
-
-gTests.push({
-  desc: "empty grid",
-  run: function() {
-    // XXX grids have minSlots and may not be ever truly empty
-
-    let grid = doc.getElementById("emptyGrid");
-    grid.arrangeItems();
-    yield waitForCondition(() => !grid.isArranging);
-
-    // grid has 2 rows, 6 slots, 0 items
-    ok(grid.isBound, "binding was applied");
-    is(grid.itemCount, 0, "empty grid has 0 items");
-    // minSlots attr. creates unpopulated slots
-    is(grid.rowCount, grid.getAttribute("rows"), "empty grid with rows-attribute has that number of rows");
-    is(grid.columnCount, 3, "empty grid has expected number of columns");
-
-    // remove rows attribute and allow space for the grid to find its own height
-    // for its number of slots
-    grid.removeAttribute("rows");
-    grid.parentNode.style.height = 20+(grid.tileHeight*grid.minSlots)+"px";
-
-    grid.arrangeItems();
-    yield waitForCondition(() => !grid.isArranging);
-    is(grid.rowCount, grid.minSlots, "empty grid has this.minSlots rows");
-    is(grid.columnCount, 1, "empty grid has 1 column");
-  }
-});
-
-gTests.push({
-  desc: "appendItem",
-  run: function() {
-     // implements an appendItem with signature title, uri, returns item element
-     // appendItem triggers arrangeItems
-    let grid = doc.querySelector("#emptygrid");
-
-    is(grid.itemCount, 0, "0 itemCount when empty");
-    is(grid.items.length, 0, "0 items when empty");
-    is(typeof grid.appendItem, "function", "appendItem is a function on the grid");
-
-    let arrangeStub = stubMethod(grid, "arrangeItems");
-    let newItem = grid.appendItem("test title", "about:blank");
-
-    ok(newItem && grid.items[0]==newItem, "appendItem gives back the item");
-    is(grid.itemCount, 1, "itemCount is incremented when we appendItem");
-    is(newItem.getAttribute("label"), "test title", "title ends up on label attribute");
-    is(newItem.getAttribute("value"), "about:blank", "url ends up on value attribute");
-
-    is(arrangeStub.callCount, 1, "arrangeItems is called when we appendItem");
-    arrangeStub.restore();
-  }
-});
-
-gTests.push({
-  desc: "getItemAtIndex",
-  run: function() {
-     // implements a getItemAtIndex method
-    let grid = doc.querySelector("#grid2");
-    is(typeof grid.getItemAtIndex, "function", "getItemAtIndex is a function on the grid");
-    is(grid.getItemAtIndex(0).getAttribute("id"), "grid2_item1", "getItemAtIndex retrieves the first item");
-    is(grid.getItemAtIndex(1).getAttribute("id"), "grid2_item2", "getItemAtIndex item at index 2");
-    ok(!grid.getItemAtIndex(5), "getItemAtIndex out-of-bounds index returns falsy");
-  }
-});
-
-gTests.push({
-  desc: "removeItemAt",
-  run: function() {
-     // implements a removeItemAt method, with 'index' signature
-     // removeItemAt triggers arrangeItems
-    let grid = doc.querySelector("#grid2");
-
-    is(grid.itemCount, 2, "2 items initially");
-    is(typeof grid.removeItemAt, "function", "removeItemAt is a function on the grid");
-
-    let arrangeStub = stubMethod(grid, "arrangeItems");
-    let removedItem = grid.removeItemAt(0);
-
-    ok(removedItem, "removeItemAt gives back an item");
-    is(removedItem.getAttribute("id"), "grid2_item1", "removeItemAt gives back the correct item");
-    is(grid.items[0].getAttribute("id"), "grid2_item2", "2nd item becomes the first item");
-    is(grid.itemCount, 1, "itemCount is decremented when we removeItemAt");
-
-    is(arrangeStub.callCount, 1, "arrangeItems is called when we removeItemAt");
-    arrangeStub.restore();
-  }
-});
-
-gTests.push({
-  desc: "insertItemAt",
-  run: function() {
-     // implements an insertItemAt method, with index, title, uri.spec signature
-     // insertItemAt triggers arrangeItems
-    let grid = doc.querySelector("#grid3");
-
-    is(grid.itemCount, 2, "2 items initially");
-    is(typeof grid.insertItemAt, "function", "insertItemAt is a function on the grid");
-
-    let arrangeStub = stubMethod(grid, "arrangeItems");
-    let insertedAt0 = grid.insertItemAt(0, "inserted item 0", "http://example.com/inserted0");
-    let insertedAt00 = grid.insertItemAt(0, "inserted item 00", "http://example.com/inserted00");
-
-    ok(insertedAt0 && insertedAt00, "insertItemAt gives back an item");
-
-    is(insertedAt0.getAttribute("label"), "inserted item 0", "insertItemAt creates item with the correct label");
-    is(insertedAt0.getAttribute("value"), "http://example.com/inserted0", "insertItemAt creates item with the correct url value");
-
-    is(grid.items[0], insertedAt00, "item is inserted at the correct index");
-    is(grid.children[0], insertedAt00, "first item occupies the first slot");
-    is(grid.items[1], insertedAt0, "item is inserted at the correct index");
-    is(grid.children[1], insertedAt0, "next item occupies the next slot");
-
-    is(grid.items[2].getAttribute("label"), "First item", "Old first item is now at index 2");
-    is(grid.items[3].getAttribute("label"), "2nd item", "Old 2nd item is now at index 3");
-
-    is(grid.itemCount, 4, "itemCount is incremented when we insertItemAt");
-
-    is(arrangeStub.callCount, 2, "arrangeItems is called when we insertItemAt");
-    arrangeStub.restore();
-  }
-});
-
-gTests.push({
-  desc: "getIndexOfItem",
-  run: function() {
-     // implements a getIndexOfItem method, with item (element) signature
-     // insertItemAt triggers arrangeItems
-    let grid = doc.querySelector("#grid4");
-
-    is(grid.itemCount, 2, "2 items initially");
-    is(typeof grid.getIndexOfItem, "function", "getIndexOfItem is a function on the grid");
-
-    let item = doc.getElementById("grid4_item2");
-    let badItem = doc.createElement("richgriditem");
-
-    is(grid.getIndexOfItem(item), 1, "getIndexOfItem returns the correct value for an item");
-    is(grid.getIndexOfItem(badItem), -1, "getIndexOfItem returns -1 for items it doesn't contain");
-  }
-});
-
-gTests.push({
-  desc: "getItemsByUrl",
-  run: function() {
-    let grid = doc.querySelector("#grid5");
-
-    is(grid.itemCount, 4, "4 items total");
-    is(typeof grid.getItemsByUrl, "function", "getItemsByUrl is a function on the grid");
-
-    ['about:blank', 'http://bugzilla.mozilla.org/'].forEach(function(testUrl) {
-      let items = grid.getItemsByUrl(testUrl);
-      is(items.length, 2, "2 matching items in the test grid");
-      is(items.item(0).url, testUrl, "Matched item has correct url property");
-      is(items.item(1).url, testUrl, "Matched item has correct url property");
-    });
-
-    let badUrl = 'http://gopher.well.com:70/';
-    let items = grid.getItemsByUrl(badUrl);
-    is(items.length, 0, "0 items matched url: "+badUrl);
-
-  }
-});
-
-gTests.push({
-  desc: "removeItem",
-  run: function() {
-    let grid = doc.querySelector("#grid5");
-
-    is(grid.itemCount, 4, "4 items total");
-    is(typeof grid.removeItem, "function", "removeItem is a function on the grid");
-
-    let arrangeStub = stubMethod(grid, "arrangeItems");
-    let removedFirst = grid.removeItem( grid.items[0] );
-
-    is(arrangeStub.callCount, 1, "arrangeItems is called when we removeItem");
-
-    let removed2nd = grid.removeItem( grid.items[0], true);
-    is(removed2nd.getAttribute("label"), "2nd item", "the next item was returned");
-    is(grid.itemCount, 2, "2 items remain");
-
-    // callCount should still be at 1
-    is(arrangeStub.callCount, 1, "arrangeItems is not called when we pass the truthy skipArrange param");
-
-    let otherItem = grid.ownerDocument.querySelector("#grid6_item1");
-    let removedFail = grid.removeItem(otherItem);
-    ok(!removedFail, "Falsy value returned when non-child item passed");
-    is(grid.itemCount, 2, "2 items remain");
-
-    // callCount should still be at 1
-    is(arrangeStub.callCount, 1, "arrangeItems is not called when nothing is matched");
-
-    arrangeStub.restore();
-  }
-});
-
-gTests.push({
-  desc: "selections (single)",
-  run: function() {
-     // when seltype is single,
-     //      maintains a selectedItem property
-     //      maintains a selectedIndex property
-     //     clearSelection, selectItem, toggleItemSelection methods are implemented
-     //     'select' events are implemented
-    let grid = doc.querySelector("#grid-select1");
-
-    is(typeof grid.clearSelection, "function", "clearSelection is a function on the grid");
-    is(typeof grid.selectedItems, "object", "selectedItems is a property on the grid");
-    is(typeof grid.toggleItemSelection, "function", "toggleItemSelection is function on the grid");
-    is(typeof grid.selectItem, "function", "selectItem is a function on the grid");
-
-    is(grid.itemCount, 2, "2 items initially");
-    is(grid.selectedItems.length, 0, "nothing selected initially");
-
-    grid.toggleItemSelection(grid.items[1]);
-    ok(grid.items[1].selected, "toggleItemSelection sets truthy selected prop on previously-unselected item");
-    is(grid.selectedIndex, 1, "selectedIndex is correct");
-
-    grid.toggleItemSelection(grid.items[1]);
-    ok(!grid.items[1].selected, "toggleItemSelection sets falsy selected prop on previously-selected item");
-    is(grid.selectedIndex, -1, "selectedIndex reports correctly with nothing selected");
-
-    // item selection
-    grid.selectItem(grid.items[1]);
-    ok(grid.items[1].selected, "Item selected property is truthy after grid.selectItem");
-    ok(grid.items[1].getAttribute("selected"), "Item selected attribute is truthy after grid.selectItem");
-    ok(grid.selectedItems.length, "There are selectedItems after grid.selectItem");
-
-    // select events
-    // in seltype=single mode, select is like the default action for the tile
-    // (think <a>, not <select multiple>)
-    let handler = {
-      handleEvent: function(aEvent) {}
-    };
-    let handlerStub = stubMethod(handler, "handleEvent");
-
-    grid.items[1].selected = true;
-
-    doc.defaultView.addEventListener("select", handler, false);
-    info("select listener added");
-
-    // clearSelection
-    grid.clearSelection();
-    is(grid.selectedItems.length, 0, "Nothing selected when we clearSelection");
-    is(grid.selectedIndex, -1, "selectedIndex resets after clearSelection");
-    is(handlerStub.callCount, 0, "clearSelection should not fire a selectionchange event");
-
-    info("calling selectItem, currently it is:" + grid.items[0].selected);
-    // Note: A richgrid in seltype=single mode fires "select" events from selectItem
-    grid.selectItem(grid.items[0]);
-    info("calling selectItem, now it is:" + grid.items[0].selected);
-    yield waitForMs(0);
-
-    is(handlerStub.callCount, 1, "select event handler was called when we selected an item");
-    is(handlerStub.calledWith[0].type, "select", "handler got a select event");
-    is(handlerStub.calledWith[0].target, grid, "select event had the originating grid as the target");
-    handlerStub.restore();
-    doc.defaultView.removeEventListener("select", handler, false);
-  }
-});
-
-gTests.push({
-  desc: "selections (multiple)",
-  run: function() {
-     // when seltype is multiple,
-     //      maintains a selectedItems property
-     //      clearSelection, selectItem, toggleItemSelection methods are implemented
-     //     'selectionchange' events are implemented
-    let grid = doc.querySelector("#grid-select2");
-
-    is(typeof grid.clearSelection, "function", "clearSelection is a function on the grid");
-    is(typeof grid.selectedItems, "object", "selectedItems is a property on the grid");
-    is(typeof grid.toggleItemSelection, "function", "toggleItemSelection is function on the grid");
-    is(typeof grid.selectItem, "function", "selectItem is a function on the grid");
-
-    is(grid.itemCount, 2, "2 items initially");
-    is(grid.selectedItems.length, 0, "nothing selected initially");
-
-    grid.toggleItemSelection(grid.items[1]);
-    ok(grid.items[1].selected, "toggleItemSelection sets truthy selected prop on previously-unselected item");
-    is(grid.selectedItems.length, 1, "1 item selected when we first toggleItemSelection");
-    is(grid.selectedItems[0], grid.items[1], "the right item is selected");
-    is(grid.selectedIndex, 1, "selectedIndex is correct");
-
-    grid.toggleItemSelection(grid.items[1]);
-    is(grid.selectedItems.length, 0, "Nothing selected when we toggleItemSelection again");
-
-    // selectionchange events
-    // in seltype=multiple mode, we track selected state on all items
-    // (think <select multiple> not <a>)
-    let handler = {
-      handleEvent: function(aEvent) {}
-    };
-    let handlerStub = stubMethod(handler, "handleEvent");
-    doc.defaultView.addEventListener("selectionchange", handler, false);
-    info("selectionchange listener added");
-
-    // clearSelection
-    grid.items[0].selected=true;
-    grid.items[1].selected=true;
-    is(grid.selectedItems.length, 2, "Both items are selected before calling clearSelection");
-    grid.clearSelection();
-    is(grid.selectedItems.length, 0, "Nothing selected when we clearSelection");
-    ok(!(grid.items[0].selected || grid.items[1].selected), "selected properties all falsy when we clearSelection");
-    is(handlerStub.callCount, 0, "clearSelection should not fire a selectionchange event");
-
-    info("calling toggleItemSelection, currently it is:" + grid.items[0].selected);
-    // Note: A richgrid in seltype=single mode fires "select" events from selectItem
-    grid.toggleItemSelection(grid.items[0]);
-    info("/calling toggleItemSelection, now it is:" + grid.items[0].selected);
-    yield waitForMs(0);
-
-    is(handlerStub.callCount, 1, "selectionchange event handler was called when we selected an item");
-    is(handlerStub.calledWith[0].type, "selectionchange", "handler got a selectionchange event");
-    is(handlerStub.calledWith[0].target, grid, "select event had the originating grid as the target");
-    handlerStub.restore();
-    doc.defaultView.removeEventListener("selectionchange", handler, false);
-  }
-});
-
-gTests.push({
-  desc: "selectNone",
-  run: function() {
-    let grid = doc.querySelector("#grid-select2");
-
-    is(typeof grid.selectNone, "function", "selectNone is a function on the grid");
-
-    is(grid.itemCount, 2, "2 items initially");
-
-    // selectNone should fire a selectionchange event
-    let handler = {
-      handleEvent: function(aEvent) {}
-    };
-    let handlerStub = stubMethod(handler, "handleEvent");
-    doc.defaultView.addEventListener("selectionchange", handler, false);
-    info("selectionchange listener added");
-
-    grid.items[0].selected=true;
-    grid.items[1].selected=true;
-    is(grid.selectedItems.length, 2, "Both items are selected before calling selectNone");
-    grid.selectNone();
-
-    is(grid.selectedItems.length, 0, "Nothing selected when we selectNone");
-    ok(!(grid.items[0].selected || grid.items[1].selected), "selected properties all falsy when we selectNone");
-
-    is(handlerStub.callCount, 1, "selectionchange event handler was called when we selectNone");
-    is(handlerStub.calledWith[0].type, "selectionchange", "handler got a selectionchange event");
-    is(handlerStub.calledWith[0].target, grid, "selectionchange event had the originating grid as the target");
-    handlerStub.restore();
-    doc.defaultView.removeEventListener("selectionchange", handler, false);
-  }
-});
-
-function gridSlotsSetup() {
-    let grid = this.grid = doc.createElement("richgrid");
-    grid.setAttribute("minSlots", 6);
-    doc.documentElement.appendChild(grid);
-    is(grid.ownerDocument, doc, "created grid in the expected document");
-}
-function gridSlotsTearDown() {
-    this.grid && this.grid.parentNode.removeChild(this.grid);
-}
-
-gTests.push({
-  desc: "richgrid slots init",
-  setUp: gridSlotsSetup,
-  run: function() {
-    let grid = this.grid;
-    // grid is initially populated with empty slots matching the minSlots attribute
-    is(grid.children.length, 6, "minSlots slots are created");
-    is(grid.itemCount, 0, "slots do not count towards itemCount");
-    ok(Array.every(grid.children, (node) => node.nodeName == 'richgriditem'), "slots have nodeName richgriditem");
-    ok(Array.every(grid.children, isNotBoundByRichGrid_Item), "slots aren't bound by the richgrid-item binding");
-
-    ok(!grid.isItem(grid.children[0]), "slot fails isItem validation");
-  },
-  tearDown: gridSlotsTearDown
-});
-
-gTests.push({
-  desc: "richgrid using slots for items",
-  setUp: gridSlotsSetup, // creates grid with minSlots = num. slots = 6
-  run: function() {
-    let grid = this.grid;
-    let numSlots = grid.getAttribute("minSlots");
-    is(grid.children.length, numSlots);
-    // adding items occupies those slots
-    for (let idx of [0,1,2,3,4,5,6]) {
-      let slot = grid.children[idx];
-      let item = grid.appendItem("item "+idx, "about:mozilla");
-      if (idx < numSlots) {
-        is(grid.children.length, numSlots);
-        is(slot, item, "The same node is reused when an item is assigned to a slot");
-      } else {
-        is(typeof slot, 'undefined');
-        ok(item);
-        is(grid.children.length, grid.itemCount);
-      }
-    }
-  },
-  tearDown: gridSlotsTearDown
-});
-
-gTests.push({
-  desc: "richgrid assign and release slots",
-  setUp: function(){
-    info("assign and release slots setUp");
-    this.grid = doc.getElementById("slots_grid");
-    this.grid.scrollIntoView();
-    let rect = this.grid.getBoundingClientRect();
-    info("slots grid at top: " + rect.top + ", window.pageYOffset: " + doc.defaultView.pageYOffset);
-  },
-  run: function() {
-    let grid = this.grid;
-    // start with 5 of 6 slots occupied
-    for (let idx of [0,1,2,3,4]) {
-      let item = grid.appendItem("item "+idx, "about:mozilla");
-      item.setAttribute("id", "test_item_"+idx);
-    }
-    is(grid.itemCount, 5);
-    is(grid.children.length, 6); // see setup, where we init with 6 slots
-    let firstItem = grid.items[0];
-
-    ok(firstItem.ownerDocument, "item has ownerDocument");
-    is(doc, firstItem.ownerDocument, "item's ownerDocument is the document we expect");
-
-    is(firstItem, grid.children[0], "Item and assigned slot are one and the same");
-    is(firstItem.control, grid, "Item is bound and its .control points back at the grid");
-
-    // before releasing, the grid should be nofified of clicks on that slot
-    let testWindow = grid.ownerDocument.defaultView;
-
-    let rect = firstItem.getBoundingClientRect();
-    {
-      let handleStub = stubMethod(grid, 'handleItemClick');
-      // send click to item and wait for next tick;
-      sendElementTap(testWindow, firstItem);
-      yield waitForMs(0);
-
-      is(handleStub.callCount, 1, "handleItemClick was called when we clicked an item");
-      handleStub.restore();
-    }
-    // _releaseSlot is semi-private, we don't expect consumers of the binding to call it
-    // but want to be sure it does what we expect
-    grid._releaseSlot(firstItem);
-
-    is(grid.itemCount, 4, "Releasing a slot gives us one less item");
-    is(firstItem, grid.children[0],"Released slot is still the same node we started with");
-
-    // after releasing, the grid should NOT be nofified of clicks
-    {
-      let handleStub = stubMethod(grid, 'handleItemClick');
-      // send click to item and wait for next tick;
-      sendElementTap(testWindow, firstItem);
-      yield waitForMs(0);
-
-      is(handleStub.callCount, 0, "handleItemClick was NOT called when we clicked a released slot");
-      handleStub.restore();
-    }
-
-    ok(!firstItem.matches("richgriditem[value]"), "Released slot doesn't match binding selector");
-    ok(isNotBoundByRichGrid_Item(firstItem), "Released slot is no longer bound");
-
-    waitForCondition(() => isNotBoundByRichGrid_Item(firstItem));
-    ok(true, "Slot eventually gets unbound");
-    is(firstItem, grid.children[0], "Released slot is still at expected index in children collection");
-
-    let firstSlot = grid.children[0];
-    firstItem = grid.insertItemAt(0, "New item 0", "about:blank");
-    ok(firstItem == grid.items[0], "insertItemAt 0 creates item at expected index");
-    ok(firstItem == firstSlot, "insertItemAt occupies the released slot with the new item");
-    is(grid.itemCount, 5);
-    is(grid.children.length, 6);
-    is(firstItem.control, grid,"Item is bound and its .control points back at the grid");
-
-    let nextSlotIndex = grid.itemCount;
-    let lastItem = grid.insertItemAt(9, "New item 9", "about:blank");
-    // Check we don't create sparse collection of items
-    is(lastItem, grid.children[nextSlotIndex], "Item is appended at the next index when an out of bounds index is provided");
-    is(grid.children.length, 6);
-    is(grid.itemCount, 6);
-
-    grid.appendItem("one more", "about:blank");
-    is(grid.children.length, 7);
-    is(grid.itemCount, 7);
-
-    // clearAll results in slots being emptied
-    grid.clearAll();
-    is(grid.children.length, 6, "Extra slots are trimmed when we clearAll");
-    ok(!Array.some(grid.children, (node) => node.hasAttribute("value")), "All slots have no value attribute after clearAll")
-  },
-  tearDown: gridSlotsTearDown
-});
-
-gTests.push({
-  desc: "richgrid slot management",
-  setUp: gridSlotsSetup,
-  run: function() {
-    let grid = this.grid;
-    // populate grid with some items
-    let numSlots = grid.getAttribute("minSlots");
-    for (let idx of [0,1,2,3,4,5]) {
-      let item = grid.appendItem("item "+idx, "about:mozilla");
-    }
-
-    is(grid.itemCount, 6, "Grid setup with 6 items");
-    is(grid.children.length, 6, "Full grid has the expected number of slots");
-
-    // removing an item creates a replacement slot *on the end of the stack*
-    let item = grid.removeItemAt(0);
-    is(item.getAttribute("label"), "item 0", "removeItemAt gives back the populated node");
-    is(grid.children.length, 6);
-    is(grid.itemCount, 5);
-    is(grid.items[0].getAttribute("label"), "item 1", "removeItemAt removes the node so the nextSibling takes its place");
-    ok(grid.children[5] && !grid.children[5].hasAttribute("value"), "empty slot is added at the end of the existing children");
-
-    let item1 = grid.removeItem(grid.items[0]);
-    is(grid.children.length, 6);
-    is(grid.itemCount, 4);
-    is(grid.items[0].getAttribute("label"), "item 2", "removeItem removes the node so the nextSibling takes its place");
-  },
-  tearDown: gridSlotsTearDown
-});
-
-gTests.push({
-  desc: "richgrid empty slot selection",
-  setUp: gridSlotsSetup,
-  run: function() {
-    let grid = this.grid;
-    // leave grid empty, it has 6 slots
-
-    is(grid.itemCount, 0, "Grid setup with 0 items");
-    is(grid.children.length, 6, "Empty grid has the expected number of slots");
-
-    info("slot is initially selected: " + grid.children[0].selected);
-    grid.selectItem(grid.children[0]);
-    info("after selectItem, slot is selected: " + grid.children[0].selected);
-
-    ok(!grid.children[0].selected, "Attempting to select an empty slot has no effect");
-
-    grid.toggleItemSelection(grid.children[0]);
-    ok(!grid.children[0].selected, "Attempting to toggle selection on an empty slot has no effect");
-
-  },
-  tearDown: gridSlotsTearDown
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_topsites.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_topsites.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_topsites.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_topsites.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,522 +0,0 @@
-/* -*- 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";
-
-//////////////////////////////////////////////////////////////////////////
-// Test helpers
-
-let TopSitesTestHelper = {
-  get grid() {
-    return Browser.selectedBrowser.contentDocument.getElementById("start-topsites-grid");
-  },
-  get document() {
-    return Browser.selectedBrowser.contentDocument;
-  },
-  setup: function() {
-    return Task.spawn(function(){
-      if (BrowserUI.isStartTabVisible)
-        return;
-
-      yield addTab("about:start");
-
-      yield waitForCondition(() => BrowserUI.isStartTabVisible);
-    });
-  },
-  mockLinks: function th_mockLinks(aLinks) {
-    // create link objects where index. corresponds to grid position
-    // falsy values are set to null
-    let links = (typeof aLinks == "string") ?
-                aLinks.split(/\s*,\s*/) : aLinks;
-
-    links = links.map(function (id) {
-      return (id) ? {url: "http://example.com/#" + id, title: id} : null;
-    });
-    return links;
-  },
-  siteFromNode: function th_siteFromNode(aNode) {
-    return {
-      url: aNode.getAttribute("value"),
-      title: aNode.getAttribute("label")
-    }
-  },
-  clearHistory: function th_clearHistory() {
-    PlacesUtils.history.removeAllPages();
-  },
-  fillHistory: function th_fillHistory(aLinks) {
-    return Task.spawn(function(){
-      let numLinks = aLinks.length;
-      let transitionLink = Ci.nsINavHistoryService.TRANSITION_LINK;
-
-      let updateDeferred = Promise.defer();
-
-      for (let link of aLinks.reverse()) {
-        let place = {
-          uri: Util.makeURI(link.url),
-          title: link.title,
-          visits: [{visitDate: Date.now() * 1000, transitionType: transitionLink}]
-        };
-        try {
-          PlacesUtils.asyncHistory.updatePlaces(place, {
-            handleError: function (aError) {
-              ok(false, "couldn't add visit to history");
-              throw new Task.Result(aError);
-            },
-            handleResult: function () {},
-            handleCompletion: function () {
-              if(--numLinks <= 0) {
-                updateDeferred.resolve(true);
-              }
-            }
-          });
-        } catch(e) {
-          ok(false, "because: " + e);
-        }
-      }
-      return updateDeferred.promise;
-    });
-  },
-
-  /**
-   * Allows to specify the list of pinned links (that have a fixed position in
-   * the grid.
-   * @param aLinksPattern the pattern (see below)
-   *
-   * Example: setPinnedLinks("foo,,bar")
-   * Result: 'http://example.com/#foo' is pinned in the first cell. 'http://example.com/#bar' is
-   *         pinned in the third cell.
-   */
-  setPinnedLinks: function th_setPinnedLinks(aLinks) {
-    let links = TopSitesTestHelper.mockLinks(aLinks);
-
-    // (we trust that NewTabUtils works, and test our consumption of it)
-    // clear all existing pins
-    Array.forEach(NewTabUtils.pinnedLinks.links, function(aLink){
-      if(aLink)
-        NewTabUtils.pinnedLinks.unpin(aLink);
-    });
-
-    links.forEach(function(aLink, aIndex){
-      if(aLink) {
-        NewTabUtils.pinnedLinks.pin(aLink, aIndex);
-      }
-    });
-    NewTabUtils.pinnedLinks.save();
-  },
-
-  /**
-   * Allows to provide a list of links that is used to construct the grid.
-   * @param aLinksPattern the pattern (see below)
-   * @param aPinnedLinksPattern the pattern (see below)
-   *
-   * Example: setLinks("dougal,florence,zebedee")
-   * Result: [{url: "http://example.com/#dougal", title: "dougal"},
-   *          {url: "http://example.com/#florence", title: "florence"}
-   *          {url: "http://example.com/#zebedee", title: "zebedee"}]
-   * Example: setLinks("dougal,florence,zebedee","dougal,,zebedee")
-   * Result: http://example.com/#dougal is pinned at index 0, http://example.com/#florence at index 2
-   */
-
-  setLinks: function th_setLinks(aLinks, aPinnedLinks) {
-    let links = TopSitesTestHelper.mockLinks(aLinks);
-    if (links.filter(function(aLink){
-      return !aLink;
-    }).length) {
-      throw new Error("null link objects in setLinks");
-    }
-
-    return Task.spawn(function() {
-      TopSitesTestHelper.clearHistory();
-
-      yield Task.spawn(TopSitesTestHelper.fillHistory(links));
-
-      if(aPinnedLinks) {
-        TopSitesTestHelper.setPinnedLinks(aPinnedLinks);
-      }
-
-      // reset the TopSites state, have it update its cache with the new data fillHistory put there
-      yield TopSites.prepareCache(true);
-    });
-  },
-
-  updatePagesAndWait: function th_updatePagesAndWait() {
-    let deferredUpdate = Promise.defer();
-    let updater = {
-      update: function() {
-        NewTabUtils.allPages.unregister(updater);
-        deferredUpdate.resolve(true);
-      }
-    };
-    NewTabUtils.allPages.register(updater);
-    setTimeout(function() {
-      NewTabUtils.allPages.update();
-    }, 0);
-    return deferredUpdate.promise;
-  },
-
-  tearDown: function th_tearDown() {
-    TopSitesTestHelper.clearHistory();
-  }
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-
-
-function test() {
-  registerCleanupFunction(TopSitesTestHelper.tearDown);
-  runTests();
-}
-
-gTests.push({
-  desc: "TopSites dependencies",
-  run: function() {
-    ok(NewTabUtils, "NewTabUtils is truthy");
-    ok(TopSites, "TopSites is truthy");
-  }
-});
-
-gTests.push({
-  desc: "load and display top sites",
-  setUp: function() {
-    yield TopSitesTestHelper.setup();
-    let grid = TopSitesTestHelper.grid;
-
-    // setup - set history to known state
-    yield TopSitesTestHelper.setLinks("brian,dougal,dylan,ermintrude,florence,moose,sgtsam,train,zebedee,zeebad");
-
-    let arrangedPromise = waitForEvent(grid, "arranged");
-    yield TopSitesTestHelper.updatePagesAndWait();
-    // pause until the update has fired and the view is finishd updating
-    yield arrangedPromise;
-  },
-  run: function() {
-    let grid = TopSitesTestHelper.grid;
-    let items = grid.items;
-    is(items.length, 8, "should be 8 topsites"); // i.e. not 10
-    if(items.length) {
-      let firstitem = items[0];
-      is(
-        firstitem.getAttribute("label"),
-        "brian",
-        "first item label should be 'brian': " + firstitem.getAttribute("label")
-      );
-      is(
-        firstitem.getAttribute("value"),
-        "http://example.com/#brian",
-        "first item url should be 'http://example.com/#brian': " + firstitem.getAttribute("url")
-      );
-    }
-  }
-});
-
-gTests.push({
-  desc: "pinned sites",
-  pins: "dangermouse,zebedee,,,dougal",
-  setUp: function() {
-    yield TopSitesTestHelper.setup();
-    // setup - set history to known state
-    yield TopSitesTestHelper.setLinks(
-      "brian,dougal,dylan,ermintrude,florence,moose,sgtsam,train,zebedee,zeebad",
-      this.pins
-    );
-    // pause until the update has fired and the view is finishd updating
-    let arrangedPromise = waitForEvent(TopSitesTestHelper.grid, "arranged");
-    yield TopSitesTestHelper.updatePagesAndWait();
-    yield arrangedPromise;
-  },
-  run: function() {
-    // test that pinned state of each site as rendered matches our expectations
-    let pins = this.pins.split(",");
-    let items = TopSitesTestHelper.grid.items;
-    is(items.length, 8, "should be 8 topsites in the grid");
-
-    is(TopSitesTestHelper.document.querySelectorAll("#start-topsites-grid > [pinned]").length, 3, "should be 3 children with 'pinned' attribute");
-    try {
-      Array.forEach(items, function(aItem, aIndex){
-        // pinned state should agree with the pins array
-        is(
-            aItem.hasAttribute("pinned"), !!pins[aIndex],
-            "site at index " + aIndex + " was " +aItem.hasAttribute("pinned")
-            +", should agree with " + !!pins[aIndex]
-        );
-        if (pins[aIndex]) {
-          is(
-            aItem.getAttribute("label"),
-            pins[aIndex],
-            "pinned site has correct label: " + pins[aIndex] +"=="+ aItem.getAttribute("label")
-          );
-        }
-      }, this);
-    } catch(e) {
-      ok(false, this.desc + ": Test of pinned state on items failed");
-      info("because: " + e.message + "\n" + e.stack);
-    }
-  }
-});
-
-gTests.push({
-  desc: "pin site",
-  setUp: function() {
-    yield TopSitesTestHelper.setup();
-    // setup - set history to known state
-    yield TopSitesTestHelper.setLinks("sgtsam,train,zebedee,zeebad", []); // nothing initially pinned
-    // pause until the update has fired and the view is finishd updating
-    let arrangedPromise = waitForEvent(TopSitesTestHelper.grid, "arranged");
-    yield TopSitesTestHelper.updatePagesAndWait();
-    yield arrangedPromise;
-  },
-  run: function() {
-    // pin a site
-    // test that site is pinned as expected
-    // and that sites fill positions around it
-    let grid = TopSitesTestHelper.grid,
-        items = grid.items;
-    is(items.length, 4, this.desc + ": should be 4 topsites");
-
-    let tile = grid.items[2],
-        url = tile.getAttribute("value"),
-        title = tile.getAttribute("label");
-
-    info(this.desc + ": pinning site at index 2");
-    TopSites.pinSites([{
-          url: url,
-          title: title
-        }], [2]);
-
-    // pinning shouldn't require re-arranging - just wait for isUpdating flag to flip
-    yield waitForCondition(function(){
-      return !grid.controller.isUpdating;
-    });
-
-    let thirdTile = grid.items[2];
-    ok( thirdTile.hasAttribute("pinned"), thirdTile.getAttribute("value")+ " should look pinned" );
-
-    // visit some more sites
-    yield TopSitesTestHelper.fillHistory( TopSitesTestHelper.mockLinks("brian,dougal,dylan,ermintrude,florence,moose") );
-
-    // force flush and repopulation of links cache
-    yield TopSites.prepareCache(true);
-    // pause until the update has fired and the view is finishd updating
-    let arrangedPromise = waitForEvent(grid, "arranged");
-    yield TopSitesTestHelper.updatePagesAndWait();
-    yield arrangedPromise;
-
-    // check zebedee is still pinned at index 2
-    is( items[2].getAttribute("label"), "zebedee", "Pinned site remained at its index" );
-    ok( items[2].hasAttribute("pinned"), "3rd site should still look pinned" );
-  }
-});
-
-gTests.push({
-  desc: "unpin site",
-  pins: ",zebedee",
-  setUp: function() {
-    yield TopSitesTestHelper.setup();
-    // setup - set history to known state
-    yield TopSitesTestHelper.setLinks(
-      "brian,dougal,dylan,ermintrude,florence,moose,sgtsam,train,zebedee,zeebad",
-      this.pins
-    );
-    // pause until the update has fired and the view is finishd updating
-    let arrangedPromise = waitForEvent(TopSitesTestHelper.grid, "arranged");
-    yield TopSitesTestHelper.updatePagesAndWait();
-    yield arrangedPromise;
-  },
-  run: function() {
-    // unpin a pinned site
-    // test that sites are unpinned as expected
-    let grid = TopSitesTestHelper.grid,
-        items = grid.items;
-    is(items.length, 8, this.desc + ": should be 8 topsites");
-    let site = {
-      url: items[1].getAttribute("value"),
-      title: items[1].getAttribute("label")
-    };
-    // verify assumptions before unpinning this site
-    ok( NewTabUtils.pinnedLinks.isPinned(site), "2nd item is pinned" );
-    ok( items[1].hasAttribute("pinned"), "2nd item has pinned attribute" );
-
-    // unpinning shouldn't require re-arranging - just wait for isUpdating flag to flip
-    TopSites.unpinSites([site]);
-
-    yield waitForCondition(function(){
-      return !grid.controller.isUpdating;
-    });
-
-    let secondTile = grid.items[1];
-    ok( !secondTile.hasAttribute("pinned"), "2nd item should no longer be marked as pinned" );
-    ok( !NewTabUtils.pinnedLinks.isPinned(site), "2nd item should no longer be pinned" );
-  }
-});
-
-gTests.push({
-  desc: "block/unblock sites",
-  setUp: function() {
-    yield TopSitesTestHelper.setup();
-    // setup - set topsites to known state
-    yield TopSitesTestHelper.setLinks(
-      "brian,dougal,dylan,ermintrude,florence,moose,sgtsam,train,zebedee,zeebad,basic,coral",
-      ",dougal"
-    );
-    // pause until the update has fired and the view is finishd updating
-    let arrangedPromise = waitForEvent(TopSitesTestHelper.grid, "arranged");
-    yield TopSitesTestHelper.updatePagesAndWait();
-    yield arrangedPromise;
-  },
-  run: function() {
-    try {
-      // block a site
-      // test that sites are removed from the grid as expected
-      let grid = TopSitesTestHelper.grid,
-          items = grid.items;
-      is(items.length, 8, this.desc + ": should be 8 topsites");
-
-      let brianSite = TopSitesTestHelper.siteFromNode(items[0]);
-      let dougalSite = TopSitesTestHelper.siteFromNode(items[1]);
-      let dylanSite = TopSitesTestHelper.siteFromNode(items[2]);
-
-      let arrangedPromise = waitForEvent(grid, "arranged");
-      // we'll block brian (he's not pinned)
-      TopSites.hideSites([brianSite]);
-      // pause until the update has fired and the view is finished updating
-      yield arrangedPromise;
-
-      // verify brian is blocked and removed from the grid
-      ok( (new Site(brianSite)).blocked, "Site has truthy blocked property" );
-      ok( NewTabUtils.blockedLinks.isBlocked(brianSite), "Site was blocked" );
-      is( grid.querySelectorAll("[value='"+brianSite.url+"']").length, 0, "Blocked site was removed from grid");
-
-      // make sure the empty slot was backfilled
-      is(items.length, 8, this.desc + ": should be 8 topsites");
-
-      arrangedPromise = waitForEvent(grid, "arranged");
-      // block dougal,dylan. dougal is currently pinned at index 1
-      TopSites.hideSites([dougalSite, dylanSite]);
-      // pause until the update has fired and the view is finished updating
-      yield arrangedPromise;
-
-      // verify dougal is blocked and removed from the grid
-      ok( (new Site(dougalSite)).blocked, "Site has truthy blocked property" );
-      ok( NewTabUtils.blockedLinks.isBlocked(dougalSite), "Site was blocked" );
-      ok( !NewTabUtils.pinnedLinks.isPinned(dougalSite), "Blocked Site is no longer pinned" );
-      is( grid.querySelectorAll("[value='"+dougalSite.url+"']").length, 0, "Blocked site was removed from grid");
-
-      // verify dylan is blocked and removed from the grid
-      ok( (new Site(dylanSite)).blocked, "Site has truthy blocked property" );
-      ok( NewTabUtils.blockedLinks.isBlocked(dylanSite), "Site was blocked" );
-      ok( !NewTabUtils.pinnedLinks.isPinned(dylanSite), "Blocked Site is no longer pinned" );
-      is( grid.querySelectorAll("[value='"+dylanSite.url+"']").length, 0, "Blocked site was removed from grid");
-
-      // make sure the empty slots were backfilled
-      is(items.length, 8, this.desc + ": should be 8 topsites");
-
-      arrangedPromise = waitForEvent(grid, "arranged");
-      TopSites.restoreSites([brianSite, dougalSite, dylanSite]);
-      // pause until the update has fired and the view is finished updating
-      yield arrangedPromise;
-
-      // verify brian, dougal and dyland are unblocked and back in the grid
-      ok( !NewTabUtils.blockedLinks.isBlocked(brianSite), "site was unblocked" );
-      is( grid.querySelectorAll("[value='"+brianSite.url+"']").length, 1, "Unblocked site is back in the grid");
-
-      ok( !NewTabUtils.blockedLinks.isBlocked(dougalSite), "site was unblocked" );
-      is( grid.querySelectorAll("[value='"+dougalSite.url+"']").length, 1, "Unblocked site is back in the grid");
-      // ..and that a previously pinned site is re-pinned after being blocked, then restored
-      ok( NewTabUtils.pinnedLinks.isPinned(dougalSite), "Restoring previously pinned site makes it pinned again" );
-      is( grid.items[1].getAttribute("value"), dougalSite.url, "Blocked Site restored to pinned index" );
-
-      ok( !NewTabUtils.blockedLinks.isBlocked(dylanSite), "site was unblocked" );
-      is( grid.querySelectorAll("[value='"+dylanSite.url+"']").length, 1, "Unblocked site is back in the grid");
-
-    } catch(ex) {
-
-      ok(false, this.desc+": Caught exception in test: " + ex);
-      info("trace: " + ex.stack);
-    }
-  }
-});
-
-gTests.push({
-  desc: "delete and restore site tiles",
-  pins: "brian",
-  setUp: function() {
-    yield TopSitesTestHelper.setup();
-    // setup - set history to known state
-    yield TopSitesTestHelper.setLinks(
-      "brian,dougal,dylan,ermintrude",
-      this.pins
-    );
-    // pause until the update has fired and the view is finishd updating
-    let arrangedPromise = waitForEvent(TopSitesTestHelper.grid, "arranged");
-    yield TopSitesTestHelper.updatePagesAndWait();
-    yield arrangedPromise;
-  },
-  run: function() {
-    // delete a both pinned and unpinned sites
-    // test that sites are removed from the grid
-    let grid = TopSitesTestHelper.grid,
-        items = grid.items;
-    is(items.length, 4, this.desc + ": should be 4 topsites");
-
-    let brianTile = grid.querySelector('richgriditem[value$="brian"]');
-    let dougalTile = grid.querySelector('richgriditem[value$="dougal"]')
-
-    // verify assumptions before deleting sites
-    ok( brianTile, "Tile for Brian was created");
-    ok( dougalTile, "Tile for Dougal was created");
-
-    let brianSite = TopSitesTestHelper.siteFromNode(brianTile);
-    let dougalSite = TopSitesTestHelper.siteFromNode(dougalTile);
-    ok( NewTabUtils.pinnedLinks.isPinned( brianSite ), "Brian tile is pinned" );
-
-    // select the 2 tiles
-    grid.toggleItemSelection(brianTile);
-    grid.toggleItemSelection(dougalTile);
-    is(grid.selectedItems.length, 2, "2 tiles were selected");
-
-    // pause until the update has fired and the view is finishd updating
-    let arrangedPromise = waitForEvent(grid, "arranged");
-
-    // raise a mock context-action event to trigger deletion of the selection
-    let event = document.createEvent("Events");
-    event.action = "delete";
-    event.initEvent("context-action", true, true); // is cancelable
-    grid.dispatchEvent(event);
-
-    yield arrangedPromise;
-
-    // those sites are blocked and their tiles have been removed from the grid?
-    ok( !grid.querySelector('richgriditem[value="'+brianSite.value+'"]'));
-    ok( !grid.querySelector('richgriditem[value="'+dougalSite.value+'"]'));
-    ok( NewTabUtils.blockedLinks.isBlocked(brianSite), "Brian site was blocked" );
-    ok( NewTabUtils.blockedLinks.isBlocked(dougalSite), "Dougal site was blocked" );
-    // with the tiles deleted, selection should be empty
-    is( grid.selectedItems.length, 0, "Gris selection is empty after deletion" );
-
-    // raise a mock context-action event to trigger restore
-    arrangedPromise = waitForEvent(grid, "arranged");
-    event = document.createEvent("Events");
-    event.action = "restore";
-    event.initEvent("context-action", true, true); // is cancelable
-    grid.dispatchEvent(event);
-
-    yield arrangedPromise;
-    brianTile = grid.querySelector('richgriditem[value$="brian"]');
-    dougalTile = grid.querySelector('richgriditem[value$="dougal"]');
-
-    // those tiles have been restored to the grid?
-    ok( brianTile, "First tile was restored to the grid" );
-    ok( dougalTile, "2nd tile was restored to the grid" );
-
-    is(grid.selectedItems.length, 2, "2 tiles are still selected");
-    is( grid.selectedItems[0], brianTile, "Brian is still selected" );
-    is( grid.selectedItems[1], dougalTile, "Dougal is still selected" );
-    ok( NewTabUtils.pinnedLinks.isPinned( brianSite ), "Brian tile is still pinned" );
-    ok( !NewTabUtils.blockedLinks.isBlocked(brianSite), "Brian site was unblocked" );
-    ok( !NewTabUtils.blockedLinks.isBlocked(dougalSite), "Dougal site was unblocked" );
-
-  }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_ui_telemetry.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_ui_telemetry.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_ui_telemetry.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_ui_telemetry.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +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/TelemetrySession.jsm", this);
-
-function test() {
-  runTests();
-}
-
-function getTelemetryPayload() {
-  return TelemetrySession.getPayload();
-}
-
-gTests.push({
-  desc: "Setup",
-  run: () => { yield TelemetrySession.setup(); }
-});
-
-gTests.push({
-  desc: "Test browser-ui telemetry",
-  run: function testBrowserUITelemetry() {
-    // startup should have registered simple measures function
-    is(getTelemetryPayload().info.appName, "MetroFirefox");
-
-    let simpleMeasurements = getTelemetryPayload().simpleMeasurements;
-    ok(simpleMeasurements, "simpleMeasurements are truthy");
-    ok(simpleMeasurements.UITelemetry["metro-ui"]["window-width"], "window-width measurement was captured");
-    ok(simpleMeasurements.UITelemetry["metro-ui"]["window-height"], "window-height measurement was captured");
-  }
-});
-
-gTests.push({
-  desc: "Test tab count telemetry",
-  run: function() {
-    // Wait for Session Manager to be initialized.
-    yield waitForCondition(() => window.__SSID);
-
-    Services.obs.notifyObservers(null, "reset-telemetry-vars", null);
-    yield waitForCondition(function () {
-      let simpleMeasurements = getTelemetryPayload().simpleMeasurements;
-      return simpleMeasurements.UITelemetry["metro-tabs"]["currTabCount"] == 1;
-    });
-
-    let simpleMeasurements = getTelemetryPayload().simpleMeasurements;
-    is(simpleMeasurements.UITelemetry["metro-tabs"]["currTabCount"], 1);
-    is(simpleMeasurements.UITelemetry["metro-tabs"]["maxTabCount"], 1);
-
-    let tab2 = Browser.addTab("about:mozilla");
-    simpleMeasurements = getTelemetryPayload().simpleMeasurements;
-    is(simpleMeasurements.UITelemetry["metro-tabs"]["currTabCount"], 2);
-    is(simpleMeasurements.UITelemetry["metro-tabs"]["maxTabCount"], 2);
-
-    let tab3 = Browser.addTab("about:config");
-    simpleMeasurements = getTelemetryPayload().simpleMeasurements;
-    is(simpleMeasurements.UITelemetry["metro-tabs"]["currTabCount"], 3);
-    is(simpleMeasurements.UITelemetry["metro-tabs"]["maxTabCount"], 3);
-
-    Browser.closeTab(tab2, { forceClose: true } );
-    simpleMeasurements = getTelemetryPayload().simpleMeasurements;
-    is(simpleMeasurements.UITelemetry["metro-tabs"]["currTabCount"], 2);
-    is(simpleMeasurements.UITelemetry["metro-tabs"]["maxTabCount"], 3);
-
-    Browser.closeTab(tab3, { forceClose: true } );
-    simpleMeasurements = getTelemetryPayload().simpleMeasurements;
-    is(simpleMeasurements.UITelemetry["metro-tabs"]["currTabCount"], 1);
-    is(simpleMeasurements.UITelemetry["metro-tabs"]["maxTabCount"], 3);
-  }
-});
-
-gTests.push({
-  desc: "Shutdown",
-  run: () => { yield TelemetrySession.shutdown(); }
-});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_urlbar_highlightURLs.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_urlbar_highlightURLs.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_urlbar_highlightURLs.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_urlbar_highlightURLs.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-// -*- 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 kHighlightPref = "browser.urlbar.formatting.enabled";
-var gHighlightPrefValue;
-
-function test() {
-  runTests();
-}
-
-function setUp() {
-  gHighlightPrefValue = SpecialPowers.getBoolPref(kHighlightPref);
-  SpecialPowers.setBoolPref(kHighlightPref, true);
-  yield addTab("about:blank");
-}
-
-function tearDown() {
-  SpecialPowers.setBoolPref(kHighlightPref, gHighlightPrefValue);
-  Browser.closeTab(Browser.selectedTab, { forceClose: true });
-}
-
-function testHighlight(aExpected) {
-  let urlbar = BrowserUI._edit;
-  urlbar.value = aExpected.replace(/[<>]/g, "");
-
-  let selectionController = urlbar.editor.selectionController;
-  let selection = selectionController.getSelection(selectionController.SELECTION_URLSECONDARY);
-  let value = urlbar.editor.rootElement.textContent;
-
-  let result = "";
-  for (let i = 0; i < selection.rangeCount; i++) {
-    let range = selection.getRangeAt(i).toString();
-    let pos = value.indexOf(range);
-    result += value.substring(0, pos) + "<" + range + ">";
-    value = value.substring(pos + range.length);
-  }
-  result += value;
-  is(result, aExpected, "test highight");
-}
-
-gTests.push({
-  desc: "Domain-based URIs (not in editing mode)",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    let testcases = [
-      "<https://>mozilla.org",
-      "<https://>m�zilla.org",
-      "<https://>mozilla.imaginatory",
-
-      "<https://www.>mozilla.org",
-      "<https://sub.>mozilla.org",
-      "<https://sub1.sub2.sub3.>mozilla.org",
-      "<www.>mozilla.org",
-      "<sub.>mozilla.org",
-      "<sub1.sub2.sub3.>mozilla.org",
-
-      "<http://ftp.>mozilla.org",
-      "<ftp://ftp.>mozilla.org",
-
-      "<https://sub.>mozilla.org",
-      "<https://sub1.sub2.sub3.>mozilla.org",
-      "<https://user:pass@sub1.sub2.sub3.>mozilla.org",
-      "<https://user:pass@>mozilla.org",
-
-      "<https://>mozilla.org</file.ext>",
-      "<https://>mozilla.org</sub/file.ext>",
-      "<https://>mozilla.org</sub/file.ext?foo>",
-      "<https://>mozilla.org</sub/file.ext?foo&bar>",
-      "<https://>mozilla.org</sub/file.ext?foo&bar#top>",
-      "<https://>mozilla.org</sub/file.ext?foo&bar#top>",
-
-      "<https://sub.>mozilla.org<:666/file.ext>",
-      "<sub.>mozilla.org<:666/file.ext>",
-      "localhost<:666/file.ext>",
-
-      "mailto:admin@mozilla.org",
-      "gopher://mozilla.org/",
-      "about:config",
-      "jar:http://mozilla.org/example.jar!/",
-      "view-source:http://mozilla.org/",
-      "foo9://mozilla.org/",
-      "foo+://mozilla.org/",
-      "foo.://mozilla.org/",
-      "foo-://mozilla.org/"
-    ];
-
-    testcases.forEach(testHighlight);
-  }
-});
-
-gTests.push({
-  desc: "IP-based URIs (not in editing mode)",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    let ips = [
-      "192.168.1.1",
-      "[::]",
-      "[::1]",
-      "[1::]",
-      "[::]",
-      "[::1]",
-      "[1::]",
-      "[1:2:3:4:5:6:7::]",
-      "[::1:2:3:4:5:6:7]",
-      "[1:2:a:B:c:D:e:F]",
-      "[1::8]",
-      "[1:2::8]",
-      "[fe80::222:19ff:fe11:8c76]",
-      "[0000:0123:4567:89AB:CDEF:abcd:ef00:0000]",
-      "[::192.168.1.1]",
-      "[1::0.0.0.0]",
-      "[1:2::255.255.255.255]",
-      "[1:2:3::255.255.255.255]",
-      "[1:2:3:4::255.255.255.255]",
-      "[1:2:3:4:5::255.255.255.255]",
-      "[1:2:3:4:5:6:255.255.255.255]"
-    ];
-
-    let formats = [
-      "{ip}</file.ext>",
-      "{ip}<:666/file.ext>",
-      "<https://>{ip}",
-      "<https://>{ip}</file.ext>",
-      "<https://user:pass@>{ip}<:666/file.ext>",
-      "<http://user:pass@>{ip}<:666/file.ext>"
-    ];
-
-    function testHighlightAllFormats(aIP) {
-      formats.forEach((aFormat) => testHighlight(aFormat.replace("{ip}", aIP)));
-    }
-
-    ips.forEach(testHighlightAllFormats);
-  }
-});
-
-gTests.push({
-  desc: "no highlighting (in editing mode)",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    testHighlight("<https://>mozilla.org");
-
-    BrowserUI._edit.focus();
-    testHighlight("https://mozilla.org");
-
-    Browser.selectedBrowser.focus();
-    testHighlight("<https://>mozilla.org");
-  }
-});
-
-gTests.push({
-  desc: "no higlighting (pref disabled)",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    testHighlight("<https://>mozilla.org");
-
-    SpecialPowers.setBoolPref(kHighlightPref, false);
-    testHighlight("https://mozilla.org");
-
-    SpecialPowers.setBoolPref(kHighlightPref, true);
-    testHighlight("<https://>mozilla.org");
-  }
-});
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_urlbar.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_urlbar.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_urlbar.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_urlbar.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,379 +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";
-
-var gEdit = null;
-
-/*=============================================================================
-  Search engine mocking utilities
-=============================================================================*/
-
-var gEngine = null;
-
-const kSearchEngineName = "Foo";
-const kSearchEngineURI = chromeRoot + "res/testEngine.xml";
-
-/*
- * addMockSearchDefault - adds a mock search engine to the top of the engine list.
- */
-function addMockSearchDefault(aTimeoutMs) {
-  let deferred = Promise.defer();
-  let timeoutMs = aTimeoutMs || kDefaultWait;
-  let timerID = 0;
-
-  function engineAddObserver(aSubject, aTopic, aData) {
-    if (aData != "engine-added")
-      return;
-
-    gEngine = Services.search.getEngineByName(kSearchEngineName);
-    Services.obs.removeObserver(engineAddObserver, "browser-search-engine-modified");
-    clearTimeout(timerID);
-    gEngine.hidden = false;
-    ok(gEngine, "mock engine was added");
-    deferred.resolve();
-  }
-
-  if (gEngine) {
-    deferred.resolve();
-    return deferred.promise;
-  }
-
-  timerID = setTimeout(function ids_canceller() {
-    Services.obs.removeObserver(engineAddObserver, "browser-search-engine-modified");
-    deferred.reject(new Error("search add timeout"));
-  }, timeoutMs);
-
-  Services.obs.addObserver(engineAddObserver, "browser-search-engine-modified", false);
-  Services.search.addEngine(kSearchEngineURI, Ci.nsISearchEngine.DATA_XML,
-                            "data:image/x-icon,%00", false);
-  return deferred.promise;
-}
-
-/*
- * removeMockSearchDefault - removes mock "Foo" search engine.
- */
-
-function removeMockSearchDefault(aTimeoutMs) {
-  let deferred = Promise.defer();
-  let timeoutMs = aTimeoutMs || kDefaultWait;
-  let timerID = 0;
-
-  function engineRemoveObserver(aSubject, aTopic, aData) {
-    if (aData != "engine-removed")
-      return;
-
-    clearTimeout(timerID);
-    gEngine = null;
-    Services.obs.removeObserver(engineRemoveObserver, "browser-search-engine-modified");
-    deferred.resolve();
-  }
-
-  if (!gEngine) {
-    deferred.resolve();
-    return deferred.promise;
-  }
-
-  timerID = setTimeout(function ids_canceller() {
-    Services.obs.removeObserver(engineRemoveObserver, "browser-search-engine-modified");
-    deferred.reject(new Error("search remove timeout"));
-  }, timeoutMs);
-
-  Services.obs.addObserver(engineRemoveObserver, "browser-search-engine-modified", false);
-  Services.search.removeEngine(gEngine);
-  return deferred.promise;
-}
-
-/*=============================================================================
-  Test cases
-=============================================================================*/
-
-function test() {
-  waitForExplicitFinish();
-  runTests();
-}
-
-function setUp() {
-  if (!gEdit)
-    gEdit = document.getElementById("urlbar-edit");
-
-  yield addTab("about:blank");
-  yield showNavBar();
-}
-
-function tearDown() {
-  Browser.closeTab(Browser.selectedTab, { forceClose: true });
-}
-
-gTests.push({
-  desc: "search engines update",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function testSearchEngine() {
-    // If the XBL hasn't initialized yet, open the popup so that it will.
-    if (gEdit.popup._searches == undefined) {
-      gEdit.openPopup();
-      gEdit.closePopup();
-    }
-    yield waitForCondition(() => gEdit.popup._searches.itemCount);
-
-    let numSearches = gEdit.popup._searches.itemCount;
-    function getEngineItem() {
-      return gEdit.popup._searches.querySelector("richgriditem[value="+kSearchEngineName+"]");
-    }
-
-    yield addMockSearchDefault();
-    is(gEdit.popup._searches.itemCount, numSearches + 1, "added search engine count");
-    ok(getEngineItem(), "added search engine item");
-
-    yield removeMockSearchDefault();
-    is(gEdit.popup._searches.itemCount, numSearches, "normal search engine count");
-    ok(!getEngineItem(), "added search engine item");
-  }
-});
-
-gTests.push({
-  desc: "display autocomplete while typing, handle enter",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function testUrlbarTyping() {
-    sendElementTap(window, gEdit);
-    ok(gEdit.isEditing, "focus urlbar: in editing mode");
-    ok(!gEdit.popup.popupOpen, "focus urlbar: popup not open yet");
-
-    EventUtils.sendString("about:blank", window);
-    let opened = yield waitForCondition(() => gEdit.popup.popupOpen);
-    ok(opened, "type in urlbar: popup opens");
-
-    EventUtils.synthesizeKey("VK_RETURN", {}, window);
-    let closed = yield waitForCondition(() => !gEdit.popup.popupOpen);
-    ok(closed, "hit enter in urlbar: popup closes, page loads");
-    ok(!gEdit.isEditing, "hit enter in urlbar: not in editing mode");
-  }
-});
-
-gTests.push({
-  desc: "Control-Enter in urlbar",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    sendElementTap(window, gEdit);
-    ok(gEdit.isEditing, "focus urlbar: in editing mode");
-
-    EventUtils.sendString("example", window);
-    EventUtils.synthesizeKey("VK_RETURN", { accelKey: true }, window);
-    is(gEdit.value, "www.example.com", "Control-enter adds www. and .com");
-    ok(!gEdit.isEditing, "hit enter in urlbar: not in editing mode");
-  }
-});
-
-gTests.push({
-  desc: "Shift-Enter in urlbar",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    sendElementTap(window, gEdit);
-    ok(gEdit.isEditing, "focus urlbar: in editing mode");
-
-    EventUtils.sendString("example", window);
-    EventUtils.synthesizeKey("VK_RETURN", { shiftKey: true }, window);
-    is(gEdit.value, "www.example.net", "Shift-enter adds www. and .net");
-    ok(!gEdit.isEditing, "hit enter in urlbar: not in editing mode");
-  }
-});
-
-gTests.push({
-  desc: "Control-Shift-Enter in urlbar",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    sendElementTap(window, gEdit);
-    ok(gEdit.isEditing, "focus urlbar: in editing mode");
-
-    EventUtils.sendString("example", window);
-    EventUtils.synthesizeKey("VK_RETURN", { accelKey: true, shiftKey: true }, window);
-    is(gEdit.value, "www.example.org", "Shift-enter adds www. and .org");
-    ok(!gEdit.isEditing, "hit enter in urlbar: not in editing mode");
-  }
-});
-
-gTests.push({
-  desc: "display and select a search with keyboard",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function testSearchKeyboard() {
-    yield addMockSearchDefault();
-
-    yield waitForCondition(() => !Browser.selectedTab.isLoading());
-
-    sendElementTap(window, gEdit);
-    ok(gEdit.isEditing, "focus urlbar: in editing mode");
-    ok(!gEdit.popup.popupOpen, "focus urlbar: popup not open yet");
-
-    let search = "mozilla";
-    EventUtils.sendString(search, window);
-    yield waitForCondition(() => gEdit.popup.popupOpen);
-
-    // XXX We should probably change the keyboard selection behavior entirely,
-    // given that it makes little to no sense, but that's a job for a later patch.
-
-    EventUtils.synthesizeKey("VK_DOWN", {}, window);
-    is(gEdit.popup.selectedIndex, -1, "key select search: no result selected");
-    is(gEdit.popup._searches.selectedIndex, 0, "key select search: first search selected");
-
-    let engines = Services.search.getVisibleEngines();
-    for (let i = 0, max = engines.length - 1; i < max; i++) {
-      is(gEdit.popup._searches.selectedIndex, i, "key select search: next index");
-      EventUtils.synthesizeKey("VK_DOWN", {}, window);
-    }
-
-    let existingValue = gEdit.value;
-    EventUtils.synthesizeKey("VK_RETURN", {}, window);
-
-    yield waitForCondition(() => gEdit.value != existingValue);
-
-    let closed = yield waitForCondition(() => !gEdit.popup.popupOpen);
-    ok(closed, "hit enter in urlbar: popup closes, page loads");
-    ok(!gEdit.isEditing, "hit enter in urlbar: not in editing mode");
-
-    let searchSubmission = gEngine.getSubmission(search, null);
-    let trimmedSubmission = gEdit.trimValue(searchSubmission.uri.spec);
-    is(gEdit.value, trimmedSubmission, "hit enter in urlbar: search conducted");
-
-    yield removeMockSearchDefault();
-  }
-});
-
-gTests.push({
-  desc: "display and select a search with touch",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function testUrlbarSearchesTouch() {
-    yield addMockSearchDefault();
-
-    yield waitForCondition(() => !Browser.selectedTab.isLoading());
-
-    sendElementTap(window, gEdit);
-    ok(gEdit.isEditing, "focus urlbar: in editing mode");
-    ok(!gEdit.popup.popupOpen, "focus urlbar: popup not open yet");
-
-    let search = "mozilla";
-    EventUtils.sendString(search, window);
-    yield waitForCondition(() => gEdit.popup.popupOpen);
-
-    sendElementTap(window, gEdit.popup._searches.lastChild);
-
-    let closed = yield waitForCondition(() => !gEdit.popup.popupOpen);
-    ok(closed, "tap search option: popup closes, page loads");
-    ok(!gEdit.isEditing, "tap search option: not in editing mode");
-
-    let searchSubmission = gEngine.getSubmission(search, null);
-    let trimmedSubmission = gEdit.trimValue(searchSubmission.uri.spec);
-    is(gEdit.value, trimmedSubmission, "tap search option: search conducted");
-
-    yield removeMockSearchDefault();
-  }
-});
-
-gTests.push({
-  desc: "bug 897131 - url bar update after content tap + edge swipe",
-  tearDown: tearDown,
-  run: function testUrlbarTyping() {
-    let tab = yield addTab("about:mozilla");
-    yield showNavBar();
-
-    sendElementTap(window, gEdit);
-    ok(gEdit.isEditing, "focus urlbar: in editing mode");
-    ok(!gEdit.popup.popupOpen, "focus urlbar: popup not open yet");
-
-    EventUtils.sendString("about:blank", window);
-    let opened = yield waitForCondition(() => gEdit.popup.popupOpen);
-    ok(opened, "type in urlbar: popup opens");
-
-    sendElementTap(window, tab.browser);
-
-    let closed = yield waitForCondition(() => !gEdit.popup.popupOpen);
-    ok(closed, "autocomplete closed after tap on content");
-    ok(!ContextUI.navbarVisible, "navbar closed");
-
-    let event = document.createEvent("Events");
-    event.initEvent("MozEdgeUICompleted", true, false);
-    window.dispatchEvent(event);
-
-    ok(ContextUI.navbarVisible, "navbar visible");
-    is(gEdit.value, "about:mozilla", "url bar text refreshed");
-  }
-});
-
-gTests.push({
-  desc: "Bug 916383 - Invisible autocomplete items selectable by keyboard when 'your results' not shown",
-  tearDown: tearDown,
-  run: function testBug916383() {
-    yield addTab("about:start");
-    yield showNavBar();
-
-    sendElementTap(window, gEdit);
-
-    let bookmarkItem = Browser.selectedBrowser.contentWindow.BookmarksStartView._grid.querySelector("richgriditem");
-    // Get the first bookmark item label to make sure it will show up in 'your results'
-    let label = bookmarkItem.getAttribute("label");
-
-    EventUtils.sendString(label, window);
-
-    let opened = yield waitForCondition(() => gEdit.popup.popupOpen);
-    yield waitForCondition(() => gEdit.popup._results.itemCount > 0);
-
-    ok(!gEdit.popup.hasAttribute("nomatch"), "'Popup doesnt have nomatch attribute when there are results");
-    ok(gEdit.popup._resultsContainer.getBoundingClientRect().width, "'Your results' are visible");
-    ok(gEdit.popup._results.itemCount > 0, "'Your results' are populated");
-
-    // Append a string to make sure it doesn't match anything in 'your results'
-    EventUtils.sendString("zzzzzzzzzzzzzzzzzz", window);
-
-    yield waitForCondition(() => gEdit.popup.hasAttribute("nomatch"));
-
-    is(gEdit.popup._resultsContainer.getBoundingClientRect().width, 0, "'Your results' are hidden");
-    ok(gEdit.popup._results.itemCount === 0, "'Your results' are empty");
-
-    EventUtils.synthesizeKey("VK_DOWN", {}, window);
-    is(gEdit.popup._searches.selectedIndex, 0, "key select search: first search selected");
-
-    EventUtils.synthesizeKey("VK_TAB", {}, window);
-    is(gEdit.popup._searches.selectedIndex, 1, "tab key: second search selected");
-
-    EventUtils.synthesizeKey("VK_TAB", { shiftKey: true }, window);
-    is(gEdit.popup._searches.selectedIndex, 0, "shift-tab: first search selected");
-  }
-});
-
-gTests.push({
-  desc: "Bug 891667 - Use up arrow too",
-  tearDown: tearDown,
-  run: function testBug891667() {
-    yield addTab("about:start");
-    yield showNavBar();
-
-    sendElementTap(window, gEdit);
-
-    let bookmarkItem = Browser.selectedBrowser.contentWindow.BookmarksStartView._grid.querySelector("richgriditem");
-    // Get the first bookmark item label to make sure it will show up in 'your results'
-    let label = bookmarkItem.getAttribute("label");
-
-    EventUtils.sendString(label, window);
-
-    yield waitForCondition(() => gEdit.popup.popupOpen);
-    yield waitForCondition(() => gEdit.popup._results.itemCount > 0);
-
-    ok(gEdit.popup._results.itemCount > 0, "'Your results' populated");
-
-    EventUtils.synthesizeKey("VK_UP", {}, window);
-    is(gEdit.popup._results.selectedIndex, 0, "Pressing arrow up selects first item.");
-
-    EventUtils.synthesizeKey("VK_BACK_SPACE", {}, window);
-    yield waitForEvent(document.getElementById("urlbar-edit"), "input");
-    is(gEdit.popup._results.selectedIndex, -1, "backspace: autocomplete de-selected");
-  }
-});
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_urlbar_trimURLs.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_urlbar_trimURLs.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/browser_urlbar_trimURLs.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/browser_urlbar_trimURLs.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-// -*- 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 kTrimPref = "browser.urlbar.trimURLs";
-var gTrimPrefValue;
-
-function test() {
-  runTests();
-}
-
-function setUp() {
-  gTrimPrefValue = SpecialPowers.getBoolPref(kTrimPref);
-  SpecialPowers.setBoolPref(kTrimPref, true);
-  yield addTab("about:blank");
-}
-
-function tearDown() {
-  SpecialPowers.setBoolPref(kTrimPref, gTrimPrefValue);
-  Browser.closeTab(Browser.selectedTab, { forceClose: true });
-}
-
-function testTrim(aOriginal, aTarget) {
-  let urlbar = BrowserUI._edit;
-  urlbar.value = aOriginal;
-  urlbar.valueIsTyped = false;
-  is(urlbar.value, aTarget || aOriginal, "url bar value set");
-}
-
-gTests.push({
-  desc: "URIs - trimming (pref enabled)",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    let testcases = [
-      ["http://mozilla.org/", "mozilla.org"],
-      ["https://mozilla.org/", "https://mozilla.org"],
-      ["http://m�zilla.org/", "m�zilla.org"],
-      ["http://mozilla.imaginatory/", "mozilla.imaginatory"],
-      ["http://www.mozilla.org/", "www.mozilla.org"],
-      ["http://sub.mozilla.org/", "sub.mozilla.org"],
-      ["http://sub1.sub2.sub3.mozilla.org/", "sub1.sub2.sub3.mozilla.org"],
-      ["http://mozilla.org/file.ext", "mozilla.org/file.ext"],
-      ["http://mozilla.org/sub/", "mozilla.org/sub/"],
-
-      ["http://ftp.mozilla.org/", "http://ftp.mozilla.org"],
-      ["http://ftp1.mozilla.org/", "http://ftp1.mozilla.org"],
-      ["http://ftp42.mozilla.org/", "http://ftp42.mozilla.org"],
-      ["http://ftpx.mozilla.org/", "ftpx.mozilla.org"],
-      ["ftp://ftp.mozilla.org/", "ftp://ftp.mozilla.org"],
-      ["ftp://ftp1.mozilla.org/", "ftp://ftp1.mozilla.org"],
-      ["ftp://ftp42.mozilla.org/", "ftp://ftp42.mozilla.org"],
-      ["ftp://ftpx.mozilla.org/", "ftp://ftpx.mozilla.org"],
-
-      ["https://user:pass@mozilla.org/", "https://user:pass@mozilla.org"],
-      ["http://user:pass@mozilla.org/", "http://user:pass@mozilla.org"],
-      ["http://sub.mozilla.org:666/", "sub.mozilla.org:666"],
-
-      ["https://[fe80::222:19ff:fe11:8c76]/file.ext"],
-      ["http://[fe80::222:19ff:fe11:8c76]/", "[fe80::222:19ff:fe11:8c76]"],
-      ["https://user:pass@[fe80::222:19ff:fe11:8c76]:666/file.ext"],
-      ["http://user:pass@[fe80::222:19ff:fe11:8c76]:666/file.ext"],
-
-      ["mailto:admin@mozilla.org"],
-      ["gopher://mozilla.org/"],
-      ["about:config"],
-      ["jar:http://mozilla.org/example.jar!/"],
-      ["view-source:http://mozilla.org/"]
-    ];
-
-    for (let [original, target] of testcases)
-      testTrim(original, target);
-  }
-});
-
-gTests.push({
-  desc: "URIs - no trimming (pref disabled)",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    SpecialPowers.setBoolPref(kTrimPref, false);
-    testTrim("http://mozilla.org/");
-
-    SpecialPowers.setBoolPref(kTrimPref, true);
-    testTrim("http://mozilla.org/", "mozilla.org");
-  }
-});
-
-gTests.push({
-  desc: "Loaded URI - copy/paste behavior",
-  setUp: setUp,
-  tearDown: tearDown,
-  run: function () {
-    let urlbar = BrowserUI._edit;
-
-    BrowserUI.goToURI("http://example.com/");
-    let pageLoaded = yield waitForCondition(
-      () => Browser.selectedBrowser.currentURI.spec == "http://example.com/");
-
-    ok(pageLoaded, "expected page should have loaded");
-    is(urlbar.value, "example.com", "trimmed value set");
-
-    yield showNavBar();
-
-    function clipboardCondition(aExpected) {
-      return () => aExpected == SpecialPowers.getClipboardData("text/unicode");
-    }
-
-    // Value set by browser -- should copy entire url (w/ scheme) on full select
-
-    urlbar.focus();
-    urlbar.select();
-    CommandUpdater.doCommand("cmd_copy");
-
-    let copy = yield waitForCondition(clipboardCondition("http://example.com/"));
-    ok(copy, "should copy entire url (w/ scheme) on full select");
-
-    // Value set by browser -- should copy selected text on partial select
-
-    urlbar.focus();
-    urlbar.select();
-    urlbar.selectionStart = 2;
-    CommandUpdater.doCommand("cmd_copy");
-
-    copy = yield waitForCondition(clipboardCondition("ample.com"));
-    ok(copy, "should copy selected text on partial select");
-
-    // Value set by user -- should not copy full string
-
-    urlbar.valueIsTyped = true;
-    urlbar.focus();
-    urlbar.select();
-    CommandUpdater.doCommand("cmd_copy");
-
-    copy = yield waitForCondition(clipboardCondition("example.com"));
-    ok(copy, "should not copy full string");
-  }
-});
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/head.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/head.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/head.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/head.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,1070 +0,0 @@
-/* -*- 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/ */
-
-/*=============================================================================
-  Globals
-=============================================================================*/
-XPCOMUtils.defineLazyModuleGetter(this, "Promise", "resource://gre/modules/Promise.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm");
-
-/*=============================================================================
-  Useful constants
-=============================================================================*/
-const serverRoot = "http://example.com/browser/metro/";
-const baseURI = "http://mochi.test:8888/browser/metro/";
-const chromeRoot = getRootDirectory(gTestPath);
-const kDefaultWait = 2000;
-const kDefaultInterval = 50;
-
-/*=============================================================================
-  Load Helpers
-=============================================================================*/
-
-let splitPath = chromeRoot.split('/');
-if (!splitPath[splitPath.length-1]) {
-  splitPath.pop();
-}
-// ../mochitest to make sure we're looking for the libs on the right path
-// even for mochiperf tests.
-splitPath.pop();
-splitPath.push('mochitest');
-
-const mochitestPath = splitPath.join('/') + '/';
-
-[
-  "helpers/BookmarksHelper.js",
-  "helpers/HistoryHelper.js",
-  "helpers/ViewStateHelper.js"
-].forEach(function(lib) {
-  Services.scriptloader.loadSubScript(mochitestPath + lib, this);
-}, this);
-
-/*=============================================================================
-  Metro ui helpers
-=============================================================================*/
-
-function isLandscapeMode()
-{
-  return Elements.windowState.getAttribute("viewstate") == "landscape";
-}
-
-function setDevPixelEqualToPx()
-{
-  todo(false, "test depends on devPixelsPerPx set to 1.0 - see bugs 886624 and 859742");
-  SpecialPowers.setCharPref("layout.css.devPixelsPerPx", "1.0");
-  registerCleanupFunction(function () {
-    SpecialPowers.clearUserPref("layout.css.devPixelsPerPx");
-  });
-}
-
-function checkContextUIMenuItemCount(aCount)
-{
-  let visibleCount = 0;
-  for (let idx = 0; idx < ContextMenuUI.commands.childNodes.length; idx++) {
-    if (!ContextMenuUI.commands.childNodes[idx].hidden)
-      visibleCount++;
-  }
-  is(visibleCount, aCount, "command list count");
-}
-
-function checkContextUIMenuItemVisibility(aVisibleList)
-{
-  let errors = 0;
-  for (let idx = 0; idx < ContextMenuUI.commands.childNodes.length; idx++) {
-    let item = ContextMenuUI.commands.childNodes[idx];
-    if (aVisibleList.indexOf(item.id) != -1 && item.hidden) {
-      // item should be visible
-      errors++;
-      info("should be visible:" + item.id);
-    } else if (aVisibleList.indexOf(item.id) == -1 && !item.hidden) {
-      // item should be hidden
-      errors++;
-      info("should be hidden:" + item.id);
-    }
-  }
-  is(errors, 0, "context menu item list visibility");
-}
-
-function checkMonoclePositionRange(aMonocle, aMinX, aMaxX, aMinY, aMaxY)
-{
-  let monocle = null;
-  if (aMonocle == "start")
-    monocle = SelectionHelperUI._startMark;
-  else if (aMonocle == "end")
-    monocle = SelectionHelperUI._endMark;
-  else if (aMonocle == "caret")
-    monocle = SelectionHelperUI._caretMark;
-  else
-    ok(false, "bad monocle id");
-
-  ok(monocle.xPos > aMinX && monocle.xPos < aMaxX,
-    "X position is " + monocle.xPos + ", expected between " + aMinX + " and " + aMaxX);
-  ok(monocle.yPos > aMinY && monocle.yPos < aMaxY,
-    "Y position is " + monocle.yPos + ", expected between " + aMinY + " and " + aMaxY);
-}
-
-/*
- * showNotification - displays a test notification with the current
- * browser and waits for the noticiation to be fully displayed.
- *
- * Usage: yield showNotification();
- */
-function showNotification()
-{
-  return Task.spawn(function() {
-    let strings = Strings.browser;
-    var buttons = [
-      {
-        isDefault: false,
-        label: strings.GetStringFromName("popupButtonAllowOnce2"),
-        accessKey: "",
-        callback: function() { }
-      },
-      {
-        label: strings.GetStringFromName("popupButtonAlwaysAllow3"),
-        accessKey: "",
-        callback: function() { }
-      },
-      {
-        label: strings.GetStringFromName("popupButtonNeverWarn3"),
-        accessKey: "",
-        callback: function() { }
-      }
-    ];
-    let notificationBox = Browser.getNotificationBox();
-    const priority = notificationBox.PRIORITY_WARNING_MEDIUM;
-    let note = notificationBox.appendNotification("test notification", "popup-blocked",
-                                                  "chrome://browser/skin/images/infobar-popup.png",
-                                                  priority, buttons);
-    yield waitForEvent(notificationBox, "transitionend");
-    throw new Task.Result(note);
-  });
-}
-
-function removeNotifications() {
-  Browser.getNotificationBox().removeAllNotifications(true);
-}
-
-function getSelection(aElement) {
-  if (!aElement)
-    return null;
-
-  // chrome text edit
-  if (aElement instanceof Ci.nsIDOMXULTextBoxElement) {
-    return aElement.QueryInterface(Components.interfaces.nsIDOMXULTextBoxElement)
-                   .editor.selection;
-  }
-
-  // editable content element
-  if (aElement instanceof Ci.nsIDOMNSEditableElement) {
-    return aElement.QueryInterface(Ci.nsIDOMNSEditableElement)
-                   .editor.selection;
-  }
-
-  // document or window
-  if (aElement instanceof HTMLDocument || aElement instanceof Window) {
-    return aElement.getSelection();
-  }
-
-  // browser
-  return aElement.contentWindow.getSelection();
-}
-
-function getTrimmedSelection(aElement) {
-  let sel = getSelection(aElement);
-  if (!sel)
-    return "";
-  return sel.toString().trim();
-}
-
-/*
- * clearSelection(aTarget) - clears the current selection in
- * aTarget, shuts down the selection manager and purges all
- * message manager events to insure a reset state for the ui.
- */
-function clearSelection(aTarget) {
-  SelectionHelperUI.closeEditSession(true);
-  getSelection(aTarget).removeAllRanges();
-  purgeEventQueue();
-}
-
-// Hides the tab and context app bar if they are visible
-function hideContextUI()
-{
-  purgeEventQueue();
-
-  return Task.spawn(function() {
-    if (ContextUI.tabbarVisible) {
-      let promise = waitForEvent(Elements.tray, "transitionend", null, Elements.tray);
-      if (ContextUI.dismiss()) {
-        yield promise;
-      }
-    }
-
-    if (ContextUI.contextAppbarVisible) {
-      let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
-      ContextUI.dismissContextAppbar();
-      yield promise;
-    }
-  });
-}
-
-function showNavBar()
-{
-  if (!ContextUI.navbarVisible) {
-    let promise = waitForEvent(Elements.navbar, "transitionend");
-    ContextUI.displayNavbar();
-    return promise;
-  }
-  return Promise.resolve(null);
-}
-
-function hideNavBar()
-{
-  if (ContextUI.navbarVisible) {
-    let promise = waitForEvent(Elements.navbar, "transitionend");
-    ContextUI.dismissNavbar();
-    return promise;
-  }
-  return Promise.resolve(null);
-}
-
-function fireAppBarDisplayEvent()
-{
-  let promise = waitForEvent(Elements.tray, "transitionend");
-  let event = document.createEvent("Events");
-  event.initEvent("MozEdgeUICompleted", true, false);
-  gWindow.dispatchEvent(event);
-  purgeEventQueue();
-  return promise;
-}
-
-/*=============================================================================
-  General test helpers
-=============================================================================*/
-let gOpenedTabs = [];
-
-function loadUriInActiveTab(aUri)
-{
-  return Task.spawn(function() {
-    let promise = waitForEvent(getBrowser(), "pageshow");
-    BrowserUI.goToURI(aUri);
-    yield waitForCondition(function () {
-      return getBrowser().currentURI.spec == aUri
-    }, "getBrowser().currentURI.spec == " + aUri);
-    yield promise;
-  });
-}
-
-function navForward() {
-  return Task.spawn(function() {
-    let promise = waitForEvent(getBrowser(), "pageshow");
-    EventUtils.synthesizeKey("VK_RIGHT", { altKey: true }, window);
-    yield promise;
-  });
-}
-
-function navBackViaNavButton() {
-  return Task.spawn(function() {
-    let promise = waitForEvent(getBrowser(), "pageshow");
-    let backButton = document.getElementById("overlay-back");
-    sendElementTap(window, backButton);
-    yield promise;
-  });
-}
-
-/**
- *  Loads a URL in a new tab asynchronously.
- *
- * Usage:
- *    Task.spawn(function() {
- *      let tab = yield addTab("http://example.com/");
- *      ok(Browser.selectedTab == tab, "the new tab is selected");
- *    });
- *
- * @param aUrl the URL to load
- * @returns a task that resolves to the new tab object after the URL is loaded.
- */
-function addTab(aUrl) {
-  return Task.spawn(function() {
-    info("Opening "+aUrl+" in a new tab");
-    let tab = Browser.addTab(aUrl, true);
-    yield tab.pageShowPromise;
-
-    is(tab.browser.currentURI.spec, aUrl, aUrl + " is loaded");
-
-    yield hideContextUI();
-
-    gOpenedTabs.push(tab);
-
-    throw new Task.Result(tab);
-  });
-}
-
-/**
- * Cleans up tabs left open by addTab().
- * This is being called at runTests() after the test loop.
- */
-function cleanUpOpenedTabs() {
-  let tab;
-  while(tab = gOpenedTabs.shift()) {
-    cleanupNotificationsForBrowser(tab.browser);
-    Browser.closeTab(Browser.getTabFromChrome(tab.chromeTab), { forceClose: true })
-  }
-}
-
-function cleanupNotificationsForBrowser(aBrowser) {
-  let notificationBox = Browser.getNotificationBox(aBrowser);
-  notificationBox && notificationBox.removeAllNotifications(true);
-}
-
-/**
- * Waits a specified number of miliseconds for a specified event to be
- * fired on a specified element.
- *
- * Usage:
- *    let receivedEvent = waitForEvent(element, "eventName");
- *    // Do some processing here that will cause the event to be fired
- *    // ...
- *    // Now yield until the Promise is fulfilled
- *    yield receivedEvent;
- *    if (receivedEvent && !(receivedEvent instanceof Error)) {
- *      receivedEvent.msg == "eventName";
- *      // ...
- *    }
- *
- * @param aSubject the element that should receive the event
- * @param aEventName the event to wait for
- * @param aTimeoutMs the number of miliseconds to wait before giving up
- * @returns a Promise that resolves to the received event, or to an Error
- */
-function waitForEvent(aSubject, aEventName, aTimeoutMs, aTarget) {
-  let eventDeferred = Promise.defer();
-  let timeoutMs = aTimeoutMs || kDefaultWait;
-  let stack = new Error().stack;
-  let timerID = setTimeout(function wfe_canceller() {
-    aSubject.removeEventListener(aEventName, listener);
-    eventDeferred.reject( new Error(aEventName+" event timeout at " + stack) );
-  }, timeoutMs);
-
-  var listener = function (aEvent) {
-    if (aTarget && aTarget !== aEvent.target)
-        return;
-
-    // stop the timeout clock and resume
-    clearTimeout(timerID);
-    eventDeferred.resolve(aEvent);
-  }
-
-  function cleanup(aEventOrError) {
-    // unhook listener in case of success or failure
-    aSubject.removeEventListener(aEventName, listener);
-    return aEventOrError;
-  }
-  aSubject.addEventListener(aEventName, listener, false);
-  return eventDeferred.promise.then(cleanup, cleanup);
-}
-
-/**
- * Wait for an nsIMessageManager IPC message.
- */
-function waitForMessage(aName, aMessageManager) {
-  let deferred = Promise.defer();
-  let manager = aMessageManager || messageManager;
-  function listener(aMessage) {
-    deferred.resolve(aMessage);
-  }
-  manager.addMessageListener(aName, listener);
-  function cleanup(aEventOrError) {
-    manager.removeMessageListener(aName, listener);
-  }
-  return deferred.promise.then(cleanup, cleanup);
-}
-
-/**
- * Waits a specified number of miliseconds.
- *
- * Usage:
- *    let wait = yield waitForMs(2000);
- *    ok(wait, "2 seconds should now have elapsed");
- *
- * @param aMs the number of miliseconds to wait for
- * @returns a Promise that resolves to true after the time has elapsed
- */
-function waitForMs(aMs) {
-  info("Wating for " + aMs + "ms");
-  let deferred = Promise.defer();
-  let startTime = Date.now();
-  setTimeout(done, aMs);
-
-  function done() {
-    deferred.resolve(true);
-    info("waitForMs finished waiting, waited for "
-       + (Date.now() - startTime)
-       + "ms");
-  }
-
-  return deferred.promise;
-}
-
-/**
- * Waits a specified number of miliseconds for a supplied callback to
- * return a truthy value.
- *
- * Usage:
- *     let success = yield waitForCondition(myTestFunction);
- *     if (success && !(success instanceof Error)) {
- *       // ...
- *     }
- *
- * @param aCondition the callback that must return a truthy value
- * @param aTimeoutMs the number of miliseconds to wait before giving up
- * @param aIntervalMs the number of miliseconds between calls to aCondition
- * @returns a Promise that resolves to true, or to an Error
- */
-function waitForCondition(aCondition, aTimeoutMs, aIntervalMs) {
-  let deferred = Promise.defer();
-  let timeoutMs = aTimeoutMs || kDefaultWait;
-  let intervalMs = aIntervalMs || kDefaultInterval;
-  let startTime = Date.now();
-  let stack = new Error().stack;
-
-  function testCondition() {
-    let now = Date.now();
-    if((now - startTime) > timeoutMs) {
-      deferred.reject( new Error("Timed out waiting for condition to be true at " + stack) );
-      return;
-    }
-
-    let condition;
-    try {
-      condition = aCondition();
-    } catch (e) {
-      deferred.reject( new Error("Got exception while attempting to test condition: " + e) );
-      return;
-    }
-
-    if (condition) {
-      deferred.resolve(true);
-    } else {
-      setTimeout(testCondition, intervalMs);
-    }
-  }
-
-  setTimeout(testCondition, 0);
-  return deferred.promise;
-}
-
-/**
- * same as waitForCondition but with better test output.
- *
- * @param aCondition the callback that must return a truthy value
- * @param aTestMsg test condition message printed when the test succeeds or
- * fails. Defaults to the stringified version of aCondition.
- * @param aTimeoutMs the number of miliseconds to wait before giving up
- * @param aIntervalMs the number of miliseconds between calls to aCondition
- * @returns a Promise that resolves to true, or to an Error
- */
-function waitForCondition2(aCondition, aTestMsg, aTimeoutMs, aIntervalMs) {
-  let deferred = Promise.defer();
-  let msg = aTestMsg || aCondition;
-  let timeoutMs = aTimeoutMs || kDefaultWait;
-  let intervalMs = aIntervalMs || kDefaultInterval;
-  let startTime = Date.now();
-
-  function testCondition() {
-    let now = Date.now();
-    if((now - startTime) > timeoutMs) {
-      deferred.reject( new Error("Timed out waiting for " + msg) );
-      return;
-    }
-
-    let condition;
-    try {
-      condition = aCondition();
-    } catch (e) {
-      deferred.reject( new Error("Got exception while attempting to test '" + msg + "': " + e) );
-      return;
-    }
-
-    if (condition) {
-      ok(true, msg);
-      deferred.resolve(true);
-    } else {
-      setTimeout(testCondition, intervalMs);
-    }
-  }
-
-  setTimeout(testCondition, 0);
-  return deferred.promise;
-}
-
-/*
- * Waits for an image in a page to load. Wrapper around waitForCondition.
- *
- * @param aWindow the tab or window that contains the image.
- * @param aImageId the id of the image in the page.
- * @returns a Promise that resolves to true, or to an Error
- */
-function waitForImageLoad(aWindow, aImageId) {
-  let elem = aWindow.document.getElementById(aImageId);
-  return waitForCondition(function () {
-    let request = elem.getRequest(Ci.nsIImageLoadingContent.CURRENT_REQUEST);
-    if (request && (request.imageStatus & request.STATUS_SIZE_AVAILABLE))
-      return true;
-    return false;
-  }, 5000, 100);
-}
-
-/**
- * Waits a specified number of miliseconds for an observer event.
- *
- * @param aObsEvent the observer event to wait for
- * @param aTimeoutMs the number of miliseconds to wait before giving up
- * @returns a Promise that resolves to true, or to an Error
- */
-function waitForObserver(aObsEvent, aTimeoutMs, aObsData) {
-  try {
-
-  let deferred = Promise.defer();
-  let timeoutMs = aTimeoutMs || kDefaultWait;
-  let timerID = 0;
-
-  var observeWatcher = {
-    onEvent: function () {
-      clearTimeout(timerID);
-      Services.obs.removeObserver(this, aObsEvent);
-      deferred.resolve();
-    },
-
-    onError: function () {
-      clearTimeout(timerID);
-      Services.obs.removeObserver(this, aObsEvent);
-      deferred.reject(new Error(aObsEvent + " event timeout"));
-    },
-
-    observe: function (aSubject, aTopic, aData) {
-      if (aTopic == aObsEvent &&
-        (!aObsData || (aObsData == aData))) {
-        this.onEvent();
-      }
-    },
-
-    QueryInterface: function (aIID) {
-      if (!aIID.equals(Ci.nsIObserver) &&
-          !aIID.equals(Ci.nsISupportsWeakReference) &&
-          !aIID.equals(Ci.nsISupports)) {
-        throw Components.results.NS_ERROR_NO_INTERFACE;
-      }
-      return this;
-    },
-  }
-
-  timerID = setTimeout(function wfo_canceller() {
-    observeWatcher.onError();
-  }, timeoutMs);
-
-  Services.obs.addObserver(observeWatcher, aObsEvent, true);
-  return deferred.promise;
-
-  } catch (ex) {
-    info(ex.message);
-  }
-}
-
-
-/*=============================================================================
- * Input mode helpers - these helpers notify observers to metro_precise_input
- * and metro_imprecise_input respectively, triggering the same behaviour as user touch or mouse input
- *
- * Usage: let promise = waitForObservers("metro_imprecise_input");
- *        notifyImprecise();
- *        yield promise; // you are now in imprecise mode
- *===========================================================================*/
-function notifyPrecise()
-{
-  Services.obs.notifyObservers(null, "metro_precise_input", null);
-}
-
-function notifyImprecise()
-{
-  Services.obs.notifyObservers(null, "metro_imprecise_input", null);
-}
-
-/*=============================================================================
- * Native input helpers - these helpers send input directly to the os
- * generating os level input events that get processed by widget and
- * apzc logic.
- *===========================================================================*/
-function synthesizeNativeMouse(aElement, aOffsetX, aOffsetY, aMsg) {
-  let x = aOffsetX;
-  let y = aOffsetY;
-  if (aElement) {
-    if (aElement.getBoundingClientRect) {
-      let rect = aElement.getBoundingClientRect();
-      x += rect.left;
-      y += rect.top;
-    } else if(aElement.left && aElement.top) {
-      x += aElement.left;
-      y += aElement.top;
-    }
-  }
-  Browser.windowUtils.sendNativeMouseEvent(x, y, aMsg, 0, null);
-}
-
-function synthesizeNativeMouseMove(aElement, aOffsetX, aOffsetY) {
-  synthesizeNativeMouse(aElement,
-                        aOffsetX,
-                        aOffsetY,
-                        0x0001);  // MOUSEEVENTF_MOVE
-}
-
-function synthesizeNativeMouseLDown(aElement, aOffsetX, aOffsetY) {
-  synthesizeNativeMouse(aElement,
-                        aOffsetX,
-                        aOffsetY,
-                        0x0002);  // MOUSEEVENTF_LEFTDOWN
-}
-
-function synthesizeNativeMouseLUp(aElement, aOffsetX, aOffsetY) {
-  synthesizeNativeMouse(aElement,
-                        aOffsetX,
-                        aOffsetY,
-                        0x0004);  // MOUSEEVENTF_LEFTUP
-}
-
-function synthesizeNativeMouseRDown(aElement, aOffsetX, aOffsetY) {
-  synthesizeNativeMouse(aElement,
-                        aOffsetX,
-                        aOffsetY,
-                        0x0008);  // MOUSEEVENTF_RIGHTDOWN
-}
-
-function synthesizeNativeMouseRUp(aElement, aOffsetX, aOffsetY) {
-  synthesizeNativeMouse(aElement,
-                        aOffsetX,
-                        aOffsetY,
-                        0x0010);  // MOUSEEVENTF_RIGHTUP
-}
-
-function synthesizeNativeMouseMDown(aElement, aOffsetX, aOffsetY) {
-  synthesizeNativeMouse(aElement,
-                        aOffsetX,
-                        aOffsetY,
-                        0x0020);  // MOUSEEVENTF_MIDDLEDOWN
-}
-
-function synthesizeNativeMouseMUp(aElement, aOffsetX, aOffsetY) {
-  synthesizeNativeMouse(aElement,
-                        aOffsetX,
-                        aOffsetY,
-                        0x0040);  // MOUSEEVENTF_MIDDLEUP
-}
-
-// WARNING: these calls can trigger the soft keyboard on tablets, but not
-// on test slaves (bug 947428).
-// WARNING: When testing the apzc, be careful of bug 933990. Events sent
-// shortly after loading a page may get ignored.
-
-function sendNativeLongTap(aElement, aX, aY) {
-  let coords = logicalCoordsForElement(aElement, aX, aY);
-  Browser.windowUtils.sendNativeTouchTap(coords.x, coords.y, true);
-}
-
-function sendNativeTap(aElement, aX, aY) {
-  let coords = logicalCoordsForElement(aElement, aX, aY);
-  Browser.windowUtils.sendNativeTouchTap(coords.x, coords.y, false);
-}
-
-function sendNativeDoubleTap(aElement, aX, aY) {
-  let coords = logicalCoordsForElement(aElement, aX, aY);
-  Browser.windowUtils.sendNativeTouchTap(coords.x, coords.y, false);
-  Browser.windowUtils.sendNativeTouchTap(coords.x, coords.y, false);
-}
-
-function clearNativeTouchSequence() {
-  Browser.windowUtils.clearNativeTouchSequence();
-}
-
-/*=============================================================================
- * Synthesized event helpers - these helpers synthesize input events that get
- * dispatched directly to the dom. As such widget and apzc logic is bypassed.
- *===========================================================================*/
-
-/*
- * logicalCoordsForElement - given coordinates relative to top-left of
- * given element, returns logical coordinates for window. If a non-numeric
- * X or Y value is given, a value for the center of the element in that
- * dimension is used.
- *
- * @param aElement element coordinates are relative to.
- * @param aX, aY relative coordinates.
- */
-function logicalCoordsForElement (aElement, aX, aY) {
-  let coords = { x: null, y: null };
-  let rect = aElement.getBoundingClientRect();
-
-  coords.x = isNaN(aX) ? rect.left + (rect.width / 2) : rect.left + aX;
-  coords.y = isNaN(aY) ? rect.top + (rect.height / 2) : rect.top + aY;
-
-  return coords;
-}
-
-function sendContextMenuMouseClickToElement(aWindow, aElement, aX, aY) {
-  let utils = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                     .getInterface(Ci.nsIDOMWindowUtils);
-  let coords = logicalCoordsForElement(aElement, aX, aY);
-
-  utils.sendMouseEventToWindow("mousedown", coords.x, coords.y, 2, 1, 0);
-  utils.sendMouseEventToWindow("mouseup", coords.x, coords.y, 2, 1, 0);
-  utils.sendMouseEventToWindow("contextmenu", coords.x, coords.y, 2, 1, 0);
-}
-
-function sendMouseClick(aWindow, aX, aY) {
-  EventUtils.synthesizeMouseAtPoint(aX, aY, {}, aWindow);
-}
-
-/*
- * sendContextMenuClick - simulates a press-hold touch input event. Event
- * is delivered to the main window of the application through the top-level
- * widget.
- *
- * @param aX, aY logical coordinates of the event.
- */
-function sendContextMenuClick(aX, aY) {
-  let mediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                            .getService(Components.interfaces.nsIWindowMediator);
-  let mainwin = mediator.getMostRecentWindow("navigator:browser");
-  let utils = mainwin.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                      .getInterface(Components.interfaces.nsIDOMWindowUtils);
-  utils.sendMouseEvent("contextmenu", aX, aY, 2, 1, 0, true,
-                        1, Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH);
-}
-
-/*
- * sendContextMenuClickToSelection - simulates a press-hold touch input event
- * selected text in a window.
- */
-function sendContextMenuClickToSelection(aWindow) {
-  let selection = aWindow.getSelection();
-  if (!selection || !selection.rangeCount) {
-    ok(false, "no selection to tap!");
-    return;
-  }
-  let range = selection.getRangeAt(0);
-  let rect = range.getBoundingClientRect();
-  let x = rect.left + (rect.width / 2);
-  let y = rect.top + (rect.height / 2);
-  let utils = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                      .getInterface(Components.interfaces.nsIDOMWindowUtils);
-  utils.sendMouseEventToWindow("contextmenu", x, y, 2, 1, 0, true,
-                                1, Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH);
-}
-
-/*
- * sendContextMenuClickToWindow - simulates a press-hold touch input event.
- *
- * @param aWindow window used to retrieve dom window utils, and the
- * target window for the event.
- * @param aX, aY logical coordinates of the event relative to aWindow.
- */
-function sendContextMenuClickToWindow(aWindow, aX, aY) {
-  let utils = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                      .getInterface(Components.interfaces.nsIDOMWindowUtils);
-
-  utils.sendMouseEventToWindow("contextmenu", aX, aY, 2, 1, 0, true,
-                                1, Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH);
-}
-
-function sendContextMenuClickToElement(aWindow, aElement, aX, aY) {
-  let utils = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                      .getInterface(Components.interfaces.nsIDOMWindowUtils);
-  let coords = logicalCoordsForElement(aElement, aX, aY);
-  utils.sendMouseEventToWindow("contextmenu", coords.x, coords.y, 2, 1, 0, true,
-                                1, Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH);
-}
-
-/*
- * sendDoubleTap - simulates a double click or double tap.
- */
-function sendDoubleTap(aWindow, aX, aY) {
-  EventUtils.synthesizeMouseAtPoint(aX, aY, {
-      clickCount: 1,
-      inputSource: Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH
-    }, aWindow);
-
-  EventUtils.synthesizeMouseAtPoint(aX, aY, {
-      clickCount: 2,
-      inputSource: Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH
-    }, aWindow);
-}
-
-function sendTap(aWindow, aX, aY) {
-  EventUtils.synthesizeMouseAtPoint(aX, aY, {
-      clickCount: 1,
-      inputSource: Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH
-    }, aWindow);
-}
-
-function sendElementTap(aWindow, aElement, aX, aY) {
-  let coords = logicalCoordsForElement(aElement, aX, aY);
-  EventUtils.synthesizeMouseAtPoint(coords.x, coords.y, {
-      clickCount: 1,
-      inputSource: Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH
-    }, aWindow);
-}
-
-/*
- * sendTouchDrag - sends a touch series composed of a touchstart,
- * touchmove, and touchend w3c event.
- */
-function sendTouchDrag(aWindow, aStartX, aStartY, aEndX, aEndY) {
-  EventUtils.synthesizeTouchAtPoint(aStartX, aStartY, { type: "touchstart" }, aWindow);
-  EventUtils.synthesizeTouchAtPoint(aEndX, aEndY, { type: "touchmove" }, aWindow);
-  EventUtils.synthesizeTouchAtPoint(aEndX, aEndY, { type: "touchend" }, aWindow);
-}
-
-/*
- * TouchDragAndHold - simulates a drag and hold sequence of events.
- */
-function TouchDragAndHold() {
-}
-
-TouchDragAndHold.prototype = {
-  _timeoutStep: 2,
-  _numSteps: 50,
-  _debug: false,
-  _win: null,
-  _native: false,
-  _pointerId: 1,
-  _dui: Components.interfaces.nsIDOMWindowUtils,
-
-  set useNativeEvents(aValue) {
-    this._native = aValue;
-  },
-
-  set stepTimeout(aValue) {
-    this._timeoutStep = aValue;
-  },
-
-  set numSteps(aValue) {
-    this._numSteps = aValue;
-  },
-
-  set nativePointerId(aValue) {
-    this._pointerId = aValue;
-  },
-
-  callback: function callback() {
-    if (this._win == null)
-      return;
-
-    if (this._debug) {
-      SelectionHelperUI.debugDisplayDebugPoint(this._currentPoint.xPos,
-        this._currentPoint.yPos, 5, "#FF0000", true);
-    }
-
-    if (++this._step.steps >= this._numSteps) {
-      if (this._native) {
-        this._utils.sendNativeTouchPoint(this._pointerId, this._dui.TOUCH_CONTACT,
-                                         this._endPoint.xPos, this._endPoint.yPos,
-                                         1, 90);
-      } else {
-        EventUtils.synthesizeTouchAtPoint(this._endPoint.xPos, this._endPoint.yPos,
-                                          { type: "touchmove" }, this._win);
-      }
-      this._defer.resolve();
-      return;
-    }
-    this._currentPoint.xPos += this._step.x;
-    this._currentPoint.yPos += this._step.y;
-    if (this._debug) {
-      info("[" + this._step.steps + "] touchmove " + this._currentPoint.xPos + " x " + this._currentPoint.yPos);
-    }
-
-    if (this._native) {
-      this._utils.sendNativeTouchPoint(this._pointerId, this._dui.TOUCH_CONTACT,
-                                       this._currentPoint.xPos, this._currentPoint.yPos,
-                                       1, 90);
-    } else {
-      EventUtils.synthesizeTouchAtPoint(this._currentPoint.xPos, this._currentPoint.yPos,
-                                        { type: "touchmove" }, this._win);
-    }
-
-    let self = this;
-    setTimeout(function () { self.callback(); }, this._timeoutStep);
-  },
-
-  start: function start(aWindow, aStartX, aStartY, aEndX, aEndY) {
-    this._defer = Promise.defer();
-    this._win = aWindow;
-    this._utils = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                         .getInterface(Ci.nsIDOMWindowUtils);
-    this._endPoint = { xPos: aEndX, yPos: aEndY };
-    this._currentPoint = { xPos: aStartX, yPos: aStartY };
-    this._step = { steps: 0, x: (aEndX - aStartX) / this._numSteps, y: (aEndY - aStartY) / this._numSteps };
-    if (this._debug) {
-      info("[0] touchstart " + aStartX + " x " + aStartY);
-    }
-    // flush layout, bug 914847
-    this._utils.elementFromPoint(aStartX, aStartY, false, true);
-    if (this._native) {
-      this._utils.sendNativeTouchPoint(this._pointerId, this._dui.TOUCH_CONTACT,
-                                       aStartX, aStartY, 1, 90);
-    } else {
-      EventUtils.synthesizeTouchAtPoint(aStartX, aStartY, { type: "touchstart" }, aWindow);
-    }
-    let self = this;
-    setTimeout(function () { self.callback(); }, this._timeoutStep);
-    return this._defer.promise;
-  },
-
-  move: function move(aEndX, aEndY) {
-    if (this._win == null)
-      return;
-    if (this._debug) {
-      info("[0] continuation to " + aEndX + " x " + aEndY);
-    }
-    this._defer = Promise.defer();
-    this._step = { steps: 0,
-                   x: (aEndX - this._endPoint.xPos) / this._numSteps,
-                   y: (aEndY - this._endPoint.yPos) / this._numSteps };
-    this._endPoint = { xPos: aEndX, yPos: aEndY };
-    let self = this;
-    setTimeout(function () { self.callback(); }, this._timeoutStep);
-    return this._defer.promise;
-  },
-
-  end: function end() {
-    if (this._debug) {
-      info("[" + this._step.steps + "] touchend " + this._endPoint.xPos + " x " + this._endPoint.yPos);
-      SelectionHelperUI.debugClearDebugPoints();
-    }
-    if (this._native) {
-      this._utils.sendNativeTouchPoint(this._pointerId, this._dui.TOUCH_REMOVE,
-                                       this._endPoint.xPos, this._endPoint.yPos,
-                                       1, 90);
-    } else {
-      EventUtils.synthesizeTouchAtPoint(this._endPoint.xPos, this._endPoint.yPos,
-                                        { type: "touchend" }, this._win);
-    }
-    this._win = null;
-  },
-};
-
-/*=============================================================================
-  System utilities
-=============================================================================*/
-
-/*
- * emptyClipboard - clear the windows clipboard.
- */
-function emptyClipboard() {
-  Cc["@mozilla.org/widget/clipboard;1"].getService(Ci.nsIClipboard)
-                                       .emptyClipboard(Ci.nsIClipboard.kGlobalClipboard);
-}
-
-/*
- * purgeEventQueue - purges the event queue on the calling thread.
- * Pumps latent in-process message manager events awaiting delivery.
- */
-function purgeEventQueue() {
-  let thread = Services.tm.currentThread;
-  while (thread.hasPendingEvents()) {
-    if (!thread.processNextEvent(true))
-      break;
-  }
-}
-
-/*=============================================================================
-  Test-running helpers
-=============================================================================*/
-let gCurrentTest = null;
-let gTests = [];
-
-function runTests() {
-  waitForExplicitFinish();
-
-  Task.spawn(function() {
-    while((gCurrentTest = gTests.shift())){
-      try {
-        if ('function' == typeof gCurrentTest.setUp) {
-          info("SETUP " + gCurrentTest.desc);
-          yield Task.spawn(gCurrentTest.setUp.bind(gCurrentTest));
-        }
-        try {
-          info("RUN " + gCurrentTest.desc);
-          yield Task.spawn(gCurrentTest.run.bind(gCurrentTest));
-        } finally {
-          if ('function' == typeof gCurrentTest.tearDown) {
-            info("TEARDOWN " + gCurrentTest.desc);
-            yield Task.spawn(gCurrentTest.tearDown.bind(gCurrentTest));
-          }
-        }
-      } catch (ex) {
-        ok(false, "runTests: Task failed - " + ex + ' at ' + ex.stack);
-      } finally {
-        info("END " + gCurrentTest.desc);
-      }
-    }
-
-    try {
-      cleanUpOpenedTabs();
-
-      let badTabs = [];
-      Browser.tabs.forEach(function(item, index, array) {
-        let location = item.browser.currentURI.spec;
-        if (index == 0 && location == "about:blank" || location == "about:start") {
-          return;
-        }
-        ok(false, "Left over tab after test: '" + location + "'");
-        badTabs.push(item);
-      });
-
-      badTabs.forEach(function(item, index, array) {
-        Browser.closeTab(item, { forceClose: true });
-      });
-    } catch (ex) {
-      ok(false, "Cleanup tabs failed - " + ex);
-    }
-
-    finish();
-  });
-}
-
-// wrap a method with a spy that records how and how many times it gets called
-// the spy is returned; use spy.restore() to put the original back
-function spyOnMethod(aObj, aMethod) {
-  let origFunc = aObj[aMethod];
-  let spy = function() {
-    let callArguments = Array.slice(arguments);
-    spy.callCount++;
-    spy.calledWith = callArguments;
-    spy.argsForCall.push(callArguments);
-    return (spy.returnValue = origFunc.apply(aObj, arguments));
-  };
-  spy.callCount = 0;
-  spy.argsForCall = [];
-  spy.restore = function() {
-    return (aObj[aMethod] = origFunc);
-  };
-  return (aObj[aMethod] = spy);
-}
-
-// replace a method with a stub that records how and how many times it gets called
-// the stub is returned; use stub.restore() to put the original back
-function stubMethod(aObj, aMethod) {
-  let origFunc = aObj[aMethod];
-  let func = function() {
-    func.calledWith = Array.slice(arguments);
-    func.callCount++;
-  };
-  func.callCount = 0;
-  func.restore = function() {
-    return (aObj[aMethod] = origFunc);
-  };
-  aObj[aMethod] = func;
-  return func;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/helpers/BookmarksHelper.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/helpers/BookmarksHelper.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/helpers/BookmarksHelper.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/helpers/BookmarksHelper.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-var BookmarksTestHelper = {
-  _originalNavHistoryService: null,
-  _startView:  null,
-  MockNavHistoryService: {
-    getNewQueryOptions: function () {
-      return {};
-    },
-    getNewQuery: function () {
-      return {
-        setFolders: function(){}
-      };
-    },
-    executeQuery: function () {
-      return {
-        root: {
-          get childCount() {
-            return Object.keys(BookmarksTestHelper._nodes).length;
-          },
-
-          getChild: function (aIndex) BookmarksTestHelper._nodes[Object.keys(BookmarksTestHelper._nodes)[aIndex]]
-        }
-      }
-    }
-  },
-
-  _originalBookmarkService: null,
-  MockBookmarkService: {
-    getItemIndex: function (aIndex) aIndex,
-    getBookmarkURI: function (aId) BookmarksTestHelper._nodes[aId].uri,
-    getItemTitle: function (aId) BookmarksTestHelper._nodes[aId].title,
-    removeItem: function (aId) {
-      delete BookmarksTestHelper._nodes[aId];
-
-      // Simulate observer notification
-      BookmarksTestHelper._startView._changes.onItemRemoved(aId, BookmarksTestHelper._startView._root);
-    },
-  },
-
-  Node: function (aTitle, aId) {
-    this.type = this.RESULT_TYPE_URI = 0;
-    this.title = aTitle;
-    this.itemId = aId;
-    this.uri = "http://" + aTitle + ".com.br";
-    this.pinned = true
-  },
-
-  _nodes: null,
-  createNodes: function (aMany) {
-    this._nodes = {};
-    for (let i=0; i<aMany; i++) {
-      this._nodes[i] = new this.Node("Mock-Bookmark" + i, i);
-    }
-  },
-
-  _originalPinHelper: null,
-  MockPinHelper: {
-    isPinned: function (aItem) BookmarksTestHelper._nodes[aItem].pinned,
-    setUnpinned: function (aItem) BookmarksTestHelper._nodes[aItem].pinned = false,
-    setPinned: function (aItem) BookmarksTestHelper._nodes[aItem].pinned = true,
-  },
-
-  _originalUpdateFavicon: null,
-  setup: function setup() {
-    this._startView = Browser.selectedBrowser.contentWindow.BookmarksStartView._view;
-
-    // Just enough items so that there will be one less then the limit
-    // after removing 4 items.
-    this.createNodes(this._startView.maxTiles + 3);
-
-    this._originalNavHistoryService = this._startView._navHistoryService;
-    this._startView._navHistoryService = this.MockNavHistoryService;
-
-    this._originalBookmarkService = this._startView._bookmarkService;
-    this._startView._bookmarkService= this.MockBookmarkService;
-
-    this._originalPinHelper = this._startView._pinHelper;
-    this._startView._pinHelper = this.MockPinHelper;
-
-    this._originalUpdateFavicon = this._startView._updateFavicon;
-    this._startView._updateFavicon = function () {};
-
-    this._startView.clearBookmarks();
-    this._startView.getBookmarks();
-  },
-
-  restore: function () {
-    this._startView._navHistoryService = this._originalNavHistoryService;
-    this._startView._bookmarkService= this._originalBookmarkService;
-    this._startView._pinHelper = this._originalPinHelper;
-    this._startView._updateFavicon = this._originalUpdateFavicon;
-
-    this._startView.clearBookmarks();
-    this._startView.getBookmarks();
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/helpers/HistoryHelper.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/helpers/HistoryHelper.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/helpers/HistoryHelper.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/helpers/HistoryHelper.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-var HistoryTestHelper = {
-  _originalNavHistoryService: null,
-  _startView:  null,
-  MockNavHistoryService: {
-    getNewQueryOptions: function () {
-      return {};
-    },
-    getNewQuery: function () {
-      return {
-        setFolders: function(){}
-      };
-    },
-    executeQuery: function () {
-      return {
-        root: {
-          get childCount() {
-            return Object.keys(HistoryTestHelper._nodes).length;
-          },
-
-          getChild: function (aIndex) HistoryTestHelper._nodes[Object.keys(HistoryTestHelper._nodes)[aIndex]]
-        }
-      }
-    }
-  },
-
-  _originalHistoryService: null,
-  MockHistoryService: {
-    removePage: function (aURI) {
-      delete HistoryTestHelper._nodes[aURI.spec];
-
-      // Simulate observer notification
-      HistoryTestHelper._startView.onDeleteURI(aURI);
-    },
-  },
-
-  Node: function (aTitle, aURISpec) {
-    this.title = aTitle;
-    this.uri = aURISpec;
-    this.pinned = true
-  },
-
-  _nodes: null,
-  createNodes: function (aMany) {
-    this._nodes = {};
-    for (let i=0; i<aMany; i++) {
-      let title = "mock-history-" + i;
-      let uri = "http://" + title + ".com.br/";
-
-      this._nodes[uri] = new this.Node(title, uri);
-    }
-  },
-
-  _originalPinHelper: null,
-  MockPinHelper: {
-    isPinned: function (aItem) HistoryTestHelper._nodes[aItem].pinned,
-    setUnpinned: function (aItem) HistoryTestHelper._nodes[aItem].pinned = false,
-    setPinned: function (aItem) HistoryTestHelper._nodes[aItem].pinned = true,
-  },
-
-  setup: function setup() {
-    this._startView = Browser.selectedBrowser.contentWindow.HistoryStartView._view;
-
-    // Just enough items so that there will be one less then the limit
-    // after removing 4 items.
-    this.createNodes(this._startView.maxTiles + 3);
-
-    this._originalNavHistoryService = this._startView._navHistoryService;
-    this._startView._navHistoryService = this.MockNavHistoryService;
-
-    this._originalHistoryService = this._startView._historyService;
-    this._startView._historyService= this.MockHistoryService;
-
-    this._originalPinHelper = this._startView._pinHelper;
-    this._startView._pinHelper = this.MockPinHelper;
-
-    this._startView._set.clearAll();
-    this._startView.populateGrid();
-  },
-
-  restore: function () {
-    this._startView._navHistoryService = this._originalNavHistoryService;
-    this._startView._historyService= this._originalHistoryService;
-    this._startView._pinHelper = this._originalPinHelper;
-
-    this._startView._set.clearAll();
-    this._startView.populateGrid();
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/helpers/ViewStateHelper.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/helpers/ViewStateHelper.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/helpers/ViewStateHelper.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/helpers/ViewStateHelper.js	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-
-"use strict";
-
-const snappedSize = 330;
-const portraitSize = 900;
-const maxPortraitHeight = 900;
-
-function setSnappedViewstate() {
-  ok(isLandscapeMode(), "setSnappedViewstate expects landscape mode to work.");
-
-  let browser = Browser.selectedBrowser;
-
-  // Reduce browser width to simulate small screen size.
-  let fullWidth = browser.clientWidth;
-  let padding = fullWidth - snappedSize;
-
-  browser.style.borderRight = padding + "px solid gray";
-
-  // Communicate viewstate change
-  ContentAreaObserver._updateViewState("snapped");
-  ContentAreaObserver._dispatchBrowserEvent("SizeChanged");
-  yield waitForMessage("Content:SetWindowSize:Complete", browser.messageManager);
-
-  // Make sure it renders the new mode properly
-  yield waitForMs(0);
-}
-
-function setPortraitViewstate() {
-  ok(isLandscapeMode(), "setPortraitViewstate expects landscape mode to work.");
-
-  let browser = Browser.selectedBrowser;
-
-  let fullWidth = browser.clientWidth;
-  let fullHeight = browser.clientHeight;
-  let padding = fullWidth - portraitSize;
-
-  browser.style.borderRight = padding + "px solid gray";
-
-  // cap the height to create more even surface for testing on
-  if (fullHeight > maxPortraitHeight)
-    browser.style.borderBottom = (fullHeight - maxPortraitHeight) + "px solid gray";
-
-  ContentAreaObserver._updateViewState("portrait");
-  ContentAreaObserver._dispatchBrowserEvent("SizeChanged");
-  yield waitForMessage("Content:SetWindowSize:Complete", browser.messageManager);
-
-  // Make sure it renders the new mode properly
-  yield waitForMs(0);
-}
-
-function restoreViewstate() {
-  ContentAreaObserver._updateViewState("landscape");
-  ContentAreaObserver._dispatchBrowserEvent("SizeChanged");
-  yield waitForMessage("Content:SetWindowSize:Complete", Browser.selectedBrowser.messageManager);
-
-  ok(isLandscapeMode(), "restoreViewstate should restore landscape mode.");
-
-  Browser.selectedBrowser.style.removeProperty("border-right");
-  Browser.selectedBrowser.style.removeProperty("border-bottom");
-
-  yield waitForMs(0);
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/metro.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/metro.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/metro.ini	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/metro.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-[DEFAULT]
-support-files =
-  browser_context_menu_tests_01.html
-  browser_context_menu_tests_02.html
-  browser_context_menu_tests_03.html
-  browser_context_menu_tests_04.html
-  browser_context_menu_tests_05.html
-  browser_findbar.html
-  browser_form_auto_complete.html
-  browser_form_selects.html
-  browser_link_click.html
-  browser_onscreen_keyboard.html
-  browser_progress_indicator.xul
-  browser_selection_basic.html
-  browser_selection_caretfocus.html
-  browser_selection_contenteditable.html
-  browser_selection_frame_content.html
-  browser_selection_frame_inputs.html
-  browser_selection_frame_in_scrollable_container.html
-  browser_selection_frame_textarea.html
-  browser_selection_inputs.html
-  browser_selection_textarea.html
-  browser_tilegrid.xul
-  head.js
-  helpers/BookmarksHelper.js
-  helpers/HistoryHelper.js
-  helpers/ViewStateHelper.js
-  res/image01.png
-  res/textblock01.html
-  res/textdivs01.html
-  res/textinput01.html
-  res/textarea01.html
-  res/testEngine.xml
-  res/blankpage1.html
-  res/blankpage2.html
-  res/blankpage3.html
-  res/documentindesignmode.html
-
-[browser_apzc_basic.js]
-[browser_flyouts.js]
-[browser_bookmarks.js]
-[browser_canonizeURL.js]
-[browser_circular_progress_indicator.js]
-[browser_colorUtils.js]
-[browser_crashprompt.js]
-[browser_context_menu_tests.js]
-[browser_context_ui.js]
-[browser_downloads.js]
-[browser_findbar.js]
-[browser_form_auto_complete.js]
-[browser_form_selects.js]
-[browser_history.js]
-[browser_inputsource.js]
-[browser_link_click.js]
-[browser_menu_hoverstate.js]
-[browser_mouse_events.js]
-[browser_notifications.js]
-[browser_onscreen_keyboard.js]
-[browser_prefs_ui.js]
-[browser_private_browsing.js]
-[browser_prompt.js]
-[browser_remotetabs.js]
-[browser_sessionstore.js]
-[browser_snappedState.js]
-[browser_tabs.js]
-[browser_tabs_container.js]
-[browser_test.js]
-[browser_tiles.js]
-[browser_topsites.js]
-[browser_ui_telemetry.js]
-[browser_urlbar.js]
-[browser_urlbar_highlightURLs.js]
-[browser_urlbar_trimURLs.js]
-
-# These tests have known failures in debug builds
-[browser_selection_basic.js]
-skip-if = debug
-[browser_selection_textarea.js]
-skip-if = debug
-[browser_selection_frame_content.js]
-skip-if = debug
-[browser_selection_frame_in_scrollable_container.js]
-skip-if = debug
-[browser_selection_inputs.js]
-skip-if = debug
-[browser_selection_frame_textarea.js]
-skip-if = debug
-[browser_selection_frame_inputs.js]
-skip-if = debug
-[browser_selection_urlbar.js]
-skip-if = debug
-[browser_selection_contenteditable.js]
-skip-if = debug
-[browser_selection_caretfocus.js]
-skip-if = true # Intermittent failures on opt as well, bug 900641
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/blankpage1.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/blankpage1.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/blankpage1.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/blankpage1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<style>
-body {
-padding: 0;
-margin: 0;
-}
-</style>
-</head>
-<body>
-page 1</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/blankpage2.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/blankpage2.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/blankpage2.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/blankpage2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<style>
-body {
-padding: 0;
-margin: 0;
-}
-</style>
-</head>
-<body>
-page 2</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/blankpage3.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/blankpage3.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/blankpage3.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/blankpage3.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<style>
-body {
-padding: 0;
-margin: 0;
-}
-</style>
-</head>
-<body>
-page 3</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/documentindesignmode.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/documentindesignmode.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/documentindesignmode.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/documentindesignmode.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <style>
-    body {
-      border: none;
-      background: none repeat scroll 0% 0% transparent;
-      margin: 0;
-      min-width: 0px;
-      min-height: 100px;
-      width: 100px;
-      height: 100%;
-      direction: ltr;
-      overflow: hidden;
-    }
-
-    .test-div {
-      font-size: 22px;
-    }
-  </style>
-</head>
-<body role="textbox" hidefocus="true">
-  <div class="test-div div1">1</div>
-  <div class="test-div div2">2</div>
-  <div class="test-div div3">3</div>
-  <div class="test-div div4">4</div>
-  <div class="test-div div5">5</div>
-</body>
-  <script type="text/javascript">
-    document.designMode = "on";
-  </script>
-</html>
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/image01.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/image01.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/testEngine.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/testEngine.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/testEngine.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/testEngine.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
-                       xmlns:moz="http://www.mozilla.org/2006/browser/search/">
-  <ShortName>Foo</ShortName>
-  <Description>Foo Search</Description>
-  <InputEncoding>utf-8</InputEncoding>
-  <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABGklEQVQoz2NgGB6AnZ1dUlJSXl4eSDIyMhLW4Ovr%2B%2Fr168uXL69Zs4YoG%2BLi4i5dusTExMTGxsbNzd3f37937976%2BnpmZmagbHR09J49e5YvX66kpATVEBYW9ubNm2nTphkbG7e2tp44cQLIuHfvXm5urpaWFlDKysqqu7v73LlzECMYIiIiHj58mJCQoKKicvXq1bS0NKBgW1vbjh074uPjgeqAXE1NzSdPnvDz84M0AEUvXLgAsW379u1z5swBen3jxo2zZ892cHB4%2BvQp0KlAfwI1cHJyghQFBwfv2rULokFXV%2FfixYu7d%2B8GGqGgoMDKyrpu3br9%2B%2FcDuXl5eVA%2FAEWBfoWHAdAYoNuAYQ0XAeoUERFhGDYAAPoUaT2dfWJuAAAAAElFTkSuQmCC</Image>
-  <Url type="text/html" method="GET" template="http://mochi.test:8888/browser/browser/components/search/test/?search">
-    <Param name="test" value="{searchTerms}"/>
-  </Url>
-  <moz:SearchForm>http://mochi.test:8888/browser/browser/components/search/test/</moz:SearchForm>
-  <moz:Alias>fooalias</moz:Alias>
-</OpenSearchDescription>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/textarea01.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/textarea01.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/textarea01.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/textarea01.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-body {
-padding: 0;
-margin: 0;
-}
-</style>
-</head>
-<body>
-<textarea id="textarea" style="overflow: hidden;" name="textarea" rows="10" cols="50">
-There was nothing so VERY remarkable in that; nor did Alice think it so VERY much out of
-the way to hear the Rabbit say to itself, `Oh dear! Oh dear! I shall be late!' (when she
-thought it over afterwards, it occurred to her that she ought to have wondered at this,
-but at the time it all seemed quite natural); but when the Rabbit actually TOOK A WATCH
-OUT OF ITS WAISTCOAT-POCKET, and looked at it, and then hurried on, Alice started to her
-feet, for it flashed across her mind that she had never before seen a rabbit with either a
-waistcoat-pocket, or a watch to take out of it, and burning with curiosity, she ran across
-the field after it, and fortunately was just in time to see it pop down a large rabbit-hole
-under the hedge.
-</textarea>
-</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/textblock01.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/textblock01.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/textblock01.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/textblock01.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-</head>
-<body>
-<div id="content" style="font-size: 105%">
-    <p>(start of paragraph)
-    Alice was beginning to get very (break)<br>
-    tired of sitting by her sister on the bank, and of having nothing to do: once or twice she (span)
-    <span>(start of span) had peeped into the book her sister was reading (end of span)</span>,
-    but it had no pictures or conversations in it, `and what is the use of a book,' thought Alice
-    `without pictures or conversation?' (break)<br> 
-    (end of paragraph)</p>
-    (in between paragraphs)
-    <p>(start of paragraph)
-    Alice was beginning to get very tired of sitting by her sister on the bank, and of having
-    nothing to do: once or twice she had peeped into the book her sister was reading, but it
-    had no pictures or conversations in it, `and what is the use of a book,' thought Alice
-    `without pictures or conversation?'(break)<br>
-    (end of paragraph)</p>
-
-    <p><a id="link1" href="#hello">(start of paragraph)</a>
-    So she was considering in her own mind (as well as she could, for the hot day made her
-    feel very sleepy and stupid), whether the pleasure of making a daisy-chain would be worth
-    the trouble of getting up and picking the daisies, when suddenly a White Rabbit with pink
-    eyes ran close by her. <br>
-    </p>
-
-    <p>
-    There was nothing so VERY remarkable in that; nor did Alice think it so VERY much out of
-    the way to hear the Rabbit say to itself, `Oh dear! Oh dear! I shall be late!' (when she
-    thought it over afterwards, it occurred to her that she ought to have wondered at this,
-    but at the time it all seemed quite natural); but when the Rabbit actually TOOK A WATCH
-    OUT OF ITS WAISTCOAT-POCKET, and looked at it, and then hurried on, Alice started to her
-    feet, for it flashed across her mind that she had never before seen a rabbit with either a
-    waistcoat-pocket, or a watch to take out of it, and burning with curiosity, she ran across
-    the field after it, and fortunately was just in time to see it pop down a large
-    rabbit-hole under the hedge. <br>
-    <br>
-    In another moment down went Alice after it, never once considering how in the world she
-    was to get out again. <br>
-    <br>
-    The rabbit-hole went straight on like a tunnel for some way, and then dipped suddenly
-    down, so suddenly that Alice had not a moment to think about stopping herself before she
-    found herself falling down a very deep well. <br>
-    <br><a id="link2" href="#hello">(start of paragraph)</a>
-    Either the well was very deep, or she fell very slowly, for she had plenty of time as she
-    went down to look about her and to wonder what was going to happen next. First, she tried
-    to look down and make out what she was coming to, but it was too dark to see anything;
-    then she looked at the sides of the well, and noticed that they were filled with cupboards
-    and book-shelves; here and there she saw maps and pictures hung upon pegs. She took down a
-    jar from one of the shelves as she passed; it was labelled `ORANGE MARMALADE', but to her
-    great disappointment it was empty: she did not like to drop the jar for fear of killing
-    somebody, so managed to put it into one of the cupboards as she fell past it. <br>
-    <br>
-    `Well!' thought Alice to herself, `after such a fall as this, I shall think nothing of
-    tumbling down stairs! How brave they'll all think me at home! Why, I wouldn't say anything
-    about it, even if I fell off the top of the house!' (Which was very likely true.) <br>
-    <br>
-    Down, down, down.
-    <br>
-</div>
-</body></html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/textdivs01.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/textdivs01.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/textdivs01.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/textdivs01.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-<style>
-div
-{
-  padding: 25px;
-  width: 300px;
-  display: block;
-}
-</style>
-</head>
-<body>
-<br />
-<input id="textinput" style="width:100px; height:25px;" value="The rabbit-hole went straight on like a tunnel for some way and then dipped suddenly down" type="text">
-<div id="first">
-    Alice was beginning to get very tired of sitting by her sister on the bank, and of having
-    nothing to do: once or twice she had peeped into the book her sister was reading 
-    but it had no pictures or conversations in it, `and what is the use of a book,' thought
-    Alice `without pictures or conversation?'
-</div>
-<div id="second">
-    Alice was beginning to get very tired of sitting by her sister on the bank, and of having
-    nothing to do: once or twice she had peeped into the book her sister was reading, but it
-    had no pictures or conversations in it, `and what is the use of a book,' thought Alice
-    `without pictures or conversation?'
-</div>
-<div id="third">
-    So she was considering in her own mind (as well as she could, for the hot day made her
-    feel very sleepy and stupid), whether the pleasure of making a daisy-chain would be worth
-    the trouble of getting up and picking the daisies, when suddenly a White Rabbit with pink
-    eyes ran close by her.
-</div>
-<div style="height:1000px;"></div>
-</body></html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/textinput01.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/textinput01.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/mochitest/res/textinput01.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/mochitest/res/textinput01.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-body {
-padding: 0;
-margin: 0;
-}
-</style>
-</head>
-<body>
-<input id="textinput" style="width:300px; height:25px;" value="The rabbit-hole went straight on like a tunnel for some way and then dipped suddenly down" type="text">
-</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/unit/blank.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/unit/blank.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/unit/blank.xhtml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/unit/blank.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" xml:lang="en">
-	<body>
-	</body>
-</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/unit/test_util_extend.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/unit/test_util_extend.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/unit/test_util_extend.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/unit/test_util_extend.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-"use strict";
-
-Components.utils.import("resource:///modules/ContentUtil.jsm");
-let Util = ContentUtil;
-
-function run_test() {
-  do_print("Testing Util.extend");
-
-  do_print("Check if function is defined");
-  do_check_true(!!Util.extend);
-
-  do_print("No parameter or null should return a new object");
-  let noArgRes = Util.extend();
-  do_check_true(noArgRes && typeof noArgRes == "object");
-
-  let nullRes = Util.extend(null);
-  do_check_true(nullRes && typeof nullRes == "object");
-
-  do_print("Simple extend");
-  let simpleExtend = {a: 1, b: 2};
-  let simpleExtendResult = Util.extend(simpleExtend, {b: 3, c: 4});
-
-  do_check_true(simpleExtend.a === 1 && simpleExtend.b === 3 && simpleExtend.c === 4);
-  do_check_true(simpleExtendResult === simpleExtend);
-
-  do_print("Cloning");
-  let cloneExtend = {a: 1, b: 2};
-  let cloned = Util.extend({}, cloneExtend);
-
-  do_check_true(cloneExtend.a === cloned.a && cloneExtend.b === cloned.b);
-  do_check_true(cloneExtend !== cloned);
-
-  do_print("Multiple extend");
-  let multiExtend1 = {a: 1, b: 2};
-  let multiExtend2 = {c: 3, d: 4};
-  let multiExtend3 = {b: 5, e: 6};
-  let multiExtend4 = {e: 7, a: 8};
-  let multiResult = Util.extend({}, multiExtend1, multiExtend2, multiExtend3, multiExtend4);
-
-  do_check_true(multiResult.a === 8 && multiResult.b === 5 && multiResult.c === 3 && multiResult.d === 4 && multiResult.e === 7);
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/unit/test_util_populateFragmentFromString.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/unit/test_util_populateFragmentFromString.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/unit/test_util_populateFragmentFromString.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/unit/test_util_populateFragmentFromString.js	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-
-"use strict";
-
-Components.utils.import("resource:///modules/ContentUtil.jsm");
-let Util = ContentUtil;
-
-function empty_node(node) {
-  let cnode;
-  while((cnode = node.firstChild))
-      node.removeChild(cnode);
-  return node;
-}
-
-function DOMSerializer() {
-  return Components.classes["@mozilla.org/xmlextras/xmlserializer;1"]
-          .createInstance(Components.interfaces.nsIDOMSerializer);
-}
-
-function serializeContents(node) {
-  let str = DOMSerializer().serializeToString(node);
-  return str.replace(/^<[^>]+>/, '')
-     .replace(/<\/[^>]+>$/, '');
-}
-
-function run_test() {
-  let doc, body, str, expectedResult, frag;
-
-  do_print("Testing Util.populateFragmentFromString");
-
-  do_check_true(!!Util.populateFragmentFromString);
-
-  do_print("Loading blank document");
-  doc = do_parse_document("blank.xhtml", "application/xhtml+xml");
-
-  // sanity check
-  do_check_eq(doc.nodeType, 9);
-  do_check_true(doc.documentElement.localName != "parsererror");
-
-  body = doc.documentElement.getElementsByTagName("body")[0];
-  do_check_eq(1, body.nodeType);
-
-  frag = doc.createDocumentFragment();
-
-  // test proper handling of leading and trailing text
-  str = "Before, #2, #1. After";
-  Util.populateFragmentFromString(
-                                    frag, str,
-                                    { text: "One", className: "text-one"},
-                                    { text: "Two", className: "text-two"}
-                                  );
-
-  empty_node(body);
-  body.appendChild(frag);
-
-  expectedResult = 'Before, <span class="text-two">Two</span>, <span class="text-one">One</span>. After';
-  do_check_eq(serializeContents(body), expectedResult);
-
-  // test proper handling of unspecified markers
-  str = "#8080: #1. http://localhost/#bar";
-  Util.populateFragmentFromString(
-                                    frag, str,
-                                    { text: "One" }
-                                  );
-
-  empty_node(body);
-  body.appendChild(frag);
-
-  expectedResult = '#8080: <span>One</span>. http://localhost/#bar';
-  do_check_eq(serializeContents(body), expectedResult);
-
-  // test proper handling of markup in strings
-  str = "#1 <body> tag. &copy; 2000 - Some Corp\u2122";
-  Util.populateFragmentFromString(
-                                    frag, str,
-                                    { text: "About the" }
-                                  );
-
-  empty_node(body);
-  body.appendChild(frag);
-  expectedResult = "<span>About the</span> &lt;body&gt; tag. &amp;copy; 2000 - Some Corp™"
-  do_check_eq(serializeContents(body), expectedResult);
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/unit/xpcshell.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/unit/xpcshell.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/base/tests/unit/xpcshell.ini	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/base/tests/unit/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-[DEFAULT]
-head =
-tail =
-firefox-appdir = metro
-support-files = blank.xhtml
-
-[test_util_extend.js]
-[test_util_populateFragmentFromString.js]
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/AboutRedirector.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/AboutRedirector.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/AboutRedirector.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/AboutRedirector.js	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-let modules = {
-  newtab: {
-    uri: "chrome://browser/content/Start.xul",
-    privileged: true
-  },
-  // about:blank has some bad loading behavior we can avoid, if we use an alias
-  empty: {
-    uri: "about:blank",
-    privileged: false
-  },
-  firstrun: {
-    uri: "chrome://browser/content/firstrun/firstrun.xhtml",
-    privileged: true
-  },
-  rights: {
-#ifdef MOZ_OFFICIAL_BRANDING
-    uri: "chrome://browser/content/aboutRights.xhtml",
-#else
-    uri: "chrome://global/content/aboutRights-unbranded.xhtml",
-#endif
-    privileged: false
-  },
-  blocked: {
-    uri: "chrome://browser/content/blockedSite.xhtml",
-    privileged: true
-  },
-  certerror: {
-    uri: "chrome://browser/content/aboutCertError.xhtml",
-    privileged: true
-  },
-  start: {
-    uri: "about:newtab",
-    privileged: true
-  },
-  home: {
-    uri: "about:newtab",
-    privileged: true
-  },
-#ifdef MOZ_CRASHREPORTER
-  crashprompt: {
-    uri: "chrome://browser/content/crashprompt.xhtml",
-    privileged: true
-  },
-#endif
-}
-
-function AboutGeneric() {}
-
-AboutGeneric.prototype = {
-  classID: Components.ID("{433d2d75-5923-49b0-854d-f37267b03dc7}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
-
-  _getModuleInfo: function (aURI) {
-    let moduleName = aURI.path.replace(/[?#].*/, "").toLowerCase();
-    return modules[moduleName];
-  },
-
-  getURIFlags: function(aURI) {
-    return Ci.nsIAboutModule.ALLOW_SCRIPT;
-  },
-
-  newChannel: function(aURI, aLoadInfo) {
-    let moduleInfo = this._getModuleInfo(aURI);
-
-    var ios = Cc["@mozilla.org/network/io-service;1"].
-              getService(Ci.nsIIOService);
-
-    var newURI = ios.newURI(moduleInfo.uri, null, null);
-    var channel = ios.newChannelFromURIWithLoadInfo(newURI, aLoadInfo);
-
-    if (!moduleInfo.privileged) {
-      // Setting the owner to null means that we'll go through the normal
-      // path in GetChannelPrincipal and create a codebase principal based
-      // on the channel's originalURI
-      channel.owner = null;
-    }
-
-    channel.originalURI = aURI;
-    return channel;
-  }
-};
-
-const components = [AboutGeneric];
-const NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/AlertsService.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/AlertsService.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/AlertsService.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/AlertsService.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +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/. */
-
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-// -----------------------------------------------------------------------
-// Alerts Service
-// -----------------------------------------------------------------------
-
-function AlertsService() { }
-
-AlertsService.prototype = {
-  classID: Components.ID("{fe33c107-82a4-41d6-8c64-5353267e04c9}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIAlertsService]),
-
-  showAlertNotification: function(aImageUrl, aTitle, aText, aTextClickable,
-                                  aCookie, aAlertListener, aName, aDir, aLang) {
-    let browser = Services.wm.getMostRecentWindow("navigator:browser");
-    try {
-      browser.AlertsHelper.showAlertNotification(aImageUrl, aTitle, aText, aTextClickable, aCookie, aAlertListener);
-    } catch (ex) {
-      let chromeWin = this._getChromeWindow(browser).wrappedJSObject;
-      let notificationBox = chromeWin.Browser.getNotificationBox();
-      notificationBox.appendNotification(aTitle,
-                                         aText,
-                                         aImageUrl,
-                                         notificationBox.PRIORITY_WARNING_MEDIUM,
-                                         null);
-    }
-  },
-
-  closeAlert: function(aName) {
-    let browser = Services.wm.getMostRecentWindow("navigator:browser");
-    browser.AlertsHelper.closeAlert();
-  },
-
-  _getChromeWindow: function (aWindow) {
-      let chromeWin = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                            .getInterface(Ci.nsIWebNavigation)
-                            .QueryInterface(Ci.nsIDocShellTreeItem)
-                            .rootTreeItem
-                            .QueryInterface(Ci.nsIInterfaceRequestor)
-                            .getInterface(Ci.nsIDOMWindow)
-                            .QueryInterface(Ci.nsIDOMChromeWindow);
-     return chromeWin;
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([AlertsService]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/BrowserCLH.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/BrowserCLH.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/BrowserCLH.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/BrowserCLH.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,285 +0,0 @@
-/* -*- js-indent-level: 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/. */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-const nsIBrowserSearchService = Components.interfaces.nsIBrowserSearchService;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-function openWindow(aParent, aURL, aTarget, aFeatures, aArgs) {
-  let argString = null;
-  if (aArgs && !(aArgs instanceof Ci.nsISupportsArray)) {
-    argString = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString);
-    argString.data = aArgs;
-  }
-
-  return Services.ww.openWindow(aParent, aURL, aTarget, aFeatures, argString || aArgs);
-}
-
-function resolveURIInternal(aCmdLine, aArgument) {
-  let uri = aCmdLine.resolveURI(aArgument);
-
-  if (!(uri instanceof Ci.nsIFileURL))
-    return uri;
-
-  try {
-    if (uri.file.exists())
-      return uri;
-  } catch (e) {
-    Cu.reportError(e);
-  }
-
-  try {
-    let urifixup = Cc["@mozilla.org/docshell/urifixup;1"].getService(Ci.nsIURIFixup);
-    uri = urifixup.createFixupURI(aArgument, 0);
-  } catch (e) {
-    Cu.reportError(e);
-  }
-
-  return uri;
-}
-
-/**
- * Determines whether a home page override is needed.
- * Returns:
- *  "new profile" if this is the first run with a new profile.
- *  "new version" if this is the first run with a build with a different
- *                      Gecko milestone (i.e. right after an upgrade).
- *  "none" otherwise.
- */
-function needHomepageOverride() {
-  let savedmstone = null;
-  try {
-    savedmstone = Services.prefs.getCharPref("browser.startup.homepage_override.mstone");
-  } catch (e) {}
-
-  if (savedmstone == "ignore")
-    return "none";
-
-  let ourmstone = Services.appinfo.platformVersion;
-
-  if (ourmstone != savedmstone) {
-    Services.prefs.setCharPref("browser.startup.homepage_override.mstone", ourmstone);
-
-    return (savedmstone ? "new version" : "new profile");
-  }
-
-  return "none";
-}
-
-function getHomePage() {
-  let url = "about:newtab";
-  try {
-    url = Services.prefs.getComplexValue("browser.startup.homepage", Ci.nsIPrefLocalizedString).data;
-  } catch (e) { }
-
-  return url;
-}
-
-function showPanelWhenReady(aWindow, aPage) {
-  aWindow.addEventListener("UIReadyDelayed", function(aEvent) {
-    aWindow.PanelUI.show(aPage);
-  }, false);
-}
-
-function haveSystemLocale() {
-  let localeService = Cc["@mozilla.org/intl/nslocaleservice;1"].getService(Ci.nsILocaleService);
-  let systemLocale = localeService.getSystemLocale().getCategory("NSILOCALE_CTYPE");
-  return isLocaleAvailable(systemLocale);
-}
-
-function checkCurrentLocale() {
-  if (Services.prefs.prefHasUserValue("general.useragent.locale")) {
-    // if the user has a compatible locale from a different buildid, we need to update
-    var buildID = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo).platformBuildID;
-    let localeBuildID = Services.prefs.getCharPref("extensions.compatability.locales.buildid");
-    if (buildID != localeBuildID)
-      return false;
-
-    let currentLocale = Services.prefs.getCharPref("general.useragent.locale");
-    return isLocaleAvailable(currentLocale);
-  }
-  return true;
-}
-
-function isLocaleAvailable(aLocale) {
-  let chrome = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIXULChromeRegistry);
-  chrome.QueryInterface(Ci.nsIToolkitChromeRegistry);
-  let availableLocales = chrome.getLocalesForPackage("browser");
- 
-  let locale = aLocale.split("-")[0];
-  let localeRegEx = new RegExp("^" + locale);
- 
-  while (availableLocales.hasMore()) {
-    let locale = availableLocales.getNext();
-    if (localeRegEx.test(locale))
-      return true;
-  }
-  return false;
-}
-
-function BrowserCLH() { }
-
-BrowserCLH.prototype = {
-  //
-  // nsICommandLineHandler
-  //
-  handle: function fs_handle(aCmdLine) {
-#ifdef DEBUG
-    for (var idx = 0; idx <  aCmdLine.length; idx++) {
-      dump(aCmdLine.getArgument(idx) + "\n");
-    }
-#endif
-    // Instantiate the search service so the search engine cache is created now
-    // instead when the application is running. The install process will register
-    // this component by using the --silent command line flag, thereby creating
-    // the cache during install, not runtime.
-    // NOTE: This code assumes this CLH is run before the nsDefaultCLH, which
-    // consumes the "--silent" flag.
-    if (aCmdLine.findFlag("silent", false) > -1) {
-      let searchService = Services.search;
-      let autoComplete = Cc["@mozilla.org/autocomplete/search;1?name=history"].
-                         getService(Ci.nsIAutoCompleteSearch);
-      return;
-    }
-
-    // Handle chrome windows loaded via commandline
-    let chromeParam = aCmdLine.handleFlagWithParam("chrome", false);
-    if (chromeParam) {
-      try {
-        // Only load URIs which do not inherit chrome privs
-        let features = "chrome,dialog=no,all";
-        let uri = resolveURIInternal(aCmdLine, chromeParam);
-        let netutil = Cc["@mozilla.org/network/util;1"].getService(Ci.nsINetUtil);
-        if (!netutil.URIChainHasFlags(uri, Ci.nsIHttpProtocolHandler.URI_INHERITS_SECURITY_CONTEXT)) {
-          openWindow(null, uri.spec, "_blank", features, null);
-
-          // Stop the normal commandline processing from continuing
-          aCmdLine.preventDefault = true;
-        }
-      } catch (e) {
-        Cu.reportError(e);
-      }
-      return;
-    }
-
-    // Check and remove the alert flag here, but we'll handle it a bit later - see below
-    let alertFlag = aCmdLine.handleFlagWithParam("alert", false);
-
-    // Check and remove the webapp param
-    let appFlag = aCmdLine.handleFlagWithParam("webapp", false);
-    let appURI;
-    if (appFlag)
-      appURI = resolveURIInternal(aCmdLine, appFlag);
-
-    // Keep an array of possible URL arguments
-    let uris = [];
-
-    // Check for the "url" flag
-    let uriFlag = aCmdLine.handleFlagWithParam("url", false);
-    if (uriFlag) {
-      let uri = resolveURIInternal(aCmdLine, uriFlag);
-      if (uri)
-        uris.push(uri);
-    }
-
-    // Check for the "search" flag
-    let searchParam = aCmdLine.handleFlagWithParam("search", false);
-    if (searchParam) {
-      var ss = Components.classes["@mozilla.org/browser/search-service;1"]
-                         .getService(nsIBrowserSearchService);
-      var submission = ss.defaultEngine.getSubmission(searchParam.replace(/\"/g, ""));
-      uris.push(submission.uri);
-    }
-
-    for (let i = 0; i < aCmdLine.length; i++) {
-      let arg = aCmdLine.getArgument(i);
-      if (!arg || arg[0] == '-')
-        continue;
-
-      let uri = resolveURIInternal(aCmdLine, arg);
-      if (uri)
-        uris.push(uri);
-    }
-
-    // Open the main browser window, if we don't already have one
-    let browserWin;
-    try {
-      let localeWin = Services.wm.getMostRecentWindow("navigator:localepicker");
-      if (localeWin) {
-        localeWin.focus();
-        aCmdLine.preventDefault = true;
-        return;
-      }
-
-      browserWin = Services.wm.getMostRecentWindow("navigator:browser");
-      if (!browserWin) {
-        // Default to the saved homepage
-        let defaultURL = getHomePage();
-
-        // Override the default if we have a URL passed on command line
-        if (uris.length > 0) {
-          defaultURL = uris[0].spec;
-          uris = uris.slice(1);
-        }
-
-        // Show the locale selector if we have a new profile, or if the selected locale is no longer compatible
-        let showLocalePicker = Services.prefs.getBoolPref("browser.firstrun.show.localepicker");
-        if ((needHomepageOverride() == "new profile" && showLocalePicker && !haveSystemLocale())) { // || !checkCurrentLocale()) {
-          browserWin = openWindow(null, "chrome://browser/content/localePicker.xul", "_blank", "chrome,dialog=no,all", defaultURL);
-          aCmdLine.preventDefault = true;
-          return;
-        }
-
-        browserWin = openWindow(null, "chrome://browser/content/browser.xul", "_blank", "chrome,dialog=no,all", defaultURL);
-      }
-
-      browserWin.focus();
-
-      // Stop the normal commandline processing from continuing. We just opened the main browser window
-      aCmdLine.preventDefault = true;
-    } catch (e) {
-      Cu.reportError(e);
-    }
-
-    // Assumption: All remaining command line arguments have been sent remotely (browser is already running)
-    // Action: Open any URLs we find into an existing browser window
-
-    // First, get a browserDOMWindow object
-    while (!browserWin.browserDOMWindow)
-      Services.tm.currentThread.processNextEvent(true);
-
-    // Open any URIs into new tabs
-    for (let i = 0; i < uris.length; i++)
-      browserWin.browserDOMWindow.openURI(uris[i], null, Ci.nsIBrowserDOMWindow.OPEN_NEWTAB, Ci.nsIBrowserDOMWindow.OPEN_EXTERNAL);
-
-    if (appURI)
-      browserWin.browserDOMWindow.openURI(appURI, null, browserWin.OPEN_APPTAB, Ci.nsIBrowserDOMWindow.OPEN_NEW);
-
-    // Handle the notification, if called from it
-    if (alertFlag) {
-      if (alertFlag == "update-app") {
-        // Notification was already displayed and clicked, skip it next time
-        Services.prefs.setBoolPref("app.update.skipNotification", true);
-
-        var updateService = Cc["@mozilla.org/updates/update-service;1"].getService(Ci.nsIApplicationUpdateService);
-        var updateTimerCallback = updateService.QueryInterface(Ci.nsITimerCallback);
-        updateTimerCallback.notify(null);
-      }
-    }
-  },
-
-  // QI
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler]),
-
-  // XPCOMUtils factory
-  classID: Components.ID("{be623d20-d305-11de-8a39-0800200c9a66}"),
-};
-
-var components = [ BrowserCLH ];
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/BrowserStartup.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/BrowserStartup.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/BrowserStartup.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/BrowserStartup.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +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/. */
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
-                                  "resource://gre/modules/PlacesUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
-                                  "resource://gre/modules/NetUtil.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "Task",
-                                  "resource://gre/modules/Task.jsm");
-
-// Custom factory object to ensure that we're a singleton
-const BrowserStartupServiceFactory = {
-  _instance: null,
-  createInstance: function (outer, iid) {
-    if (outer != null)
-      throw Components.results.NS_ERROR_NO_AGGREGATION;
-    return this._instance || (this._instance = new BrowserStartup());
-  }
-};
-
-function BrowserStartup() {
-  this._init();
-}
-
-BrowserStartup.prototype = {
-  // for XPCOM
-  classID: Components.ID("{1d542abc-c88b-4636-a4ef-075b49806317}"),
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
-
-  _xpcom_factory: BrowserStartupServiceFactory,
-
-  _init: function() {
-    Services.obs.addObserver(this, "places-init-complete", false);
-    Services.obs.addObserver(this, "final-ui-startup", false);
-  },
-
-  _initDefaultBookmarks: function() {
-    // We must instantiate the history service since it will tell us if we
-    // need to import or restore bookmarks due to first-run, corruption or
-    // forced migration (due to a major schema change).
-    let histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
-                  getService(Ci.nsINavHistoryService);
-
-    // If the database is corrupt or has been newly created we should
-    // import bookmarks.
-    let databaseStatus = histsvc.databaseStatus;
-    let importBookmarks = databaseStatus == histsvc.DATABASE_STATUS_CREATE ||
-                          databaseStatus == histsvc.DATABASE_STATUS_CORRUPT;
-
-    if (!importBookmarks) {
-      // Check to see whether "mobile" root already exists. This is to handle
-      // existing profiles created with pre-1.0 builds (which won't have mobile
-      // bookmarks root). We can remove this eventually when we stop
-      // caring about users migrating to current builds with pre-1.0 profiles.
-      let annos = Cc["@mozilla.org/browser/annotation-service;1"].
-                  getService(Ci.nsIAnnotationService);
-      let metroRootItems = annos.getItemsWithAnnotation("metro/bookmarksRoot", {});
-      if (metroRootItems.length > 0)
-        return; // no need to do initial import
-    }
-
-    Cu.import("resource://gre/modules/BookmarkJSONUtils.jsm");
-
-    Task.spawn(function() {
-      yield BookmarkJSONUtils.importFromURL("chrome://browser/locale/bookmarks.json", false);
-
-      // Create the new smart bookmark.
-      const MAX_RESULTS = 10;
-      const SMART_BOOKMARKS_ANNO = "Places/SmartBookmark";
-
-      // Place the Metro folder at the end of the smart bookmarks list.
-      let maxIndex =  Math.max.apply(null,
-        PlacesUtils.annotations.getItemsWithAnnotation(SMART_BOOKMARKS_ANNO).map(id => {
-          return PlacesUtils.bookmarks.getItemIndex(id);
-        }));
-      let smartBookmarkId =
-        PlacesUtils.bookmarks.insertBookmark(PlacesUtils.bookmarksMenuFolderId,
-                                             NetUtil.newURI("place:folder=" +
-                                                            PlacesUtils.annotations.getItemsWithAnnotation('metro/bookmarksRoot', {})[0] +
-                                                            "&queryType=" +
-                                                            Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS +
-                                                            "&sort=" +
-                                                            Ci.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_DESCENDING +
-                                                            "&maxResults=" + MAX_RESULTS +
-                                                            "&excludeQueries=1"),
-                                             maxIndex + 1,
-                                             PlacesUtils.getString("windows8TouchTitle"));
-      PlacesUtils.annotations.setItemAnnotation(smartBookmarkId,
-                                                SMART_BOOKMARKS_ANNO,
-                                                "Windows8Touch", 0,
-                                                PlacesUtils.annotations.EXPIRE_NEVER);
-    });
-  },
-
-  _startupActions: function() {
-  },
-
-  // nsIObserver
-  observe: function(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "places-init-complete":
-        Services.obs.removeObserver(this, "places-init-complete");
-        this._initDefaultBookmarks();
-        break;
-      case "final-ui-startup":
-        Services.obs.removeObserver(this, "final-ui-startup");
-        this._startupActions();
-        break;
-    }
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([BrowserStartup]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/components.manifest thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/components.manifest
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/components.manifest	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/components.manifest	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-# AboutRedirector.js
-component {433d2d75-5923-49b0-854d-f37267b03dc7} AboutRedirector.js
-contract @mozilla.org/network/protocol/about;1?what=start {433d2d75-5923-49b0-854d-f37267b03dc7}
-contract @mozilla.org/network/protocol/about;1?what=empty {433d2d75-5923-49b0-854d-f37267b03dc7}
-contract @mozilla.org/network/protocol/about;1?what=firefox {433d2d75-5923-49b0-854d-f37267b03dc7}
-contract @mozilla.org/network/protocol/about;1?what=rights {433d2d75-5923-49b0-854d-f37267b03dc7}
-contract @mozilla.org/network/protocol/about;1?what=certerror {433d2d75-5923-49b0-854d-f37267b03dc7}
-contract @mozilla.org/network/protocol/about;1?what=newtab {433d2d75-5923-49b0-854d-f37267b03dc7}
-contract @mozilla.org/network/protocol/about;1?what=home {433d2d75-5923-49b0-854d-f37267b03dc7}
-#ifdef MOZ_CRASHREPORTER
-contract @mozilla.org/network/protocol/about;1?what=crashprompt {433d2d75-5923-49b0-854d-f37267b03dc7}
-#endif
-#ifdef MOZ_SAFE_BROWSING
-contract @mozilla.org/network/protocol/about;1?what=blocked {433d2d75-5923-49b0-854d-f37267b03dc7}
-#endif
-
-# DirectoryProvider.js
-component {ef0f7a87-c1ee-45a8-8d67-26f586e46a4b} DirectoryProvider.js
-contract @mozilla.org/browser/directory-provider;1 {ef0f7a87-c1ee-45a8-8d67-26f586e46a4b}
-category xpcom-directory-providers browser-directory-provider @mozilla.org/browser/directory-provider;1
-
-# Sidebar.js
-component {22117140-9c6e-11d3-aaf1-00805f8a4905} Sidebar.js
-contract @mozilla.org/sidebar;1 {22117140-9c6e-11d3-aaf1-00805f8a4905}
-category wakeup-request Sidebar @mozilla.org/sidebar;1,nsISidebarExternal,getService,Sidebar:AddSearchProvider
-
-# SessionStore.js
-component {8c1f07d6-cba3-4226-a315-8bd43d67d032} SessionStore.js
-contract @mozilla.org/browser/sessionstore;1 {8c1f07d6-cba3-4226-a315-8bd43d67d032}
-category app-startup SessionStore service,@mozilla.org/browser/sessionstore;1
-
-# BrowserStartup.js
-component {1d542abc-c88b-4636-a4ef-075b49806317} BrowserStartup.js
-contract @mozilla.org/browser/browser-startup;1 {1d542abc-c88b-4636-a4ef-075b49806317}
-category app-startup BrowserStartup service,@mozilla.org/browser/browser-startup;1
-category agent-style-sheets browser-content-stylesheet chrome://browser/skin/content.css
-category agent-style-sheets browser-cursor-stylesheet chrome://browser/content/cursor.css
-
-# ContentPermissionPrompt.js
-component {C6E8C44D-9F39-4AF7-BCC0-76E38A8310F5} ContentPermissionPrompt.js
-contract @mozilla.org/content-permission/prompt;1 {C6E8C44D-9F39-4AF7-BCC0-76E38A8310F5}
-
-# AlertsService.js
-component {fe33c107-82a4-41d6-8c64-5353267e04c9} AlertsService.js
-contract @mozilla.org/system-alerts-service;1 {fe33c107-82a4-41d6-8c64-5353267e04c9}
-
-# ToasterAlertsService : alias to AlertsService
-contract @mozilla.org/toaster-alerts-service;1 {fe33c107-82a4-41d6-8c64-5353267e04c9}
-
-# DownloadManagerUI.js
-component {93db15b1-b408-453e-9a2b-6619e168324a} DownloadManagerUI.js
-contract @mozilla.org/download-manager-ui;1 {93db15b1-b408-453e-9a2b-6619e168324a}
-
-# HelperAppDialog.js
-component {e9d277a0-268a-4ec2-bb8c-10fdf3e44611} HelperAppDialog.js
-contract @mozilla.org/helperapplauncherdialog;1 {e9d277a0-268a-4ec2-bb8c-10fdf3e44611}
-
-# PromptService.js
-component {9a61149b-2276-4a0a-b79c-be994ad106cf} PromptService.js
-contract @mozilla.org/prompter;1 {9a61149b-2276-4a0a-b79c-be994ad106cf}
-contract @mozilla.org/embedcomp/prompt-service;1 {9a61149b-2276-4a0a-b79c-be994ad106cf}
-category wakeup-request PromptService @mozilla.org/embedcomp/prompt-service;1,nsIPromptService,getService,Prompt:Call
-
-# BrowserCLH.js
-component {be623d20-d305-11de-8a39-0800200c9a66} BrowserCLH.js
-contract @mozilla.org/browser/browser-clh;1 {be623d20-d305-11de-8a39-0800200c9a66}
-category command-line-handler x-browser @mozilla.org/browser/browser-clh;1
-
-# ContentDispatchChooser.js
-component {5a072a22-1e66-4100-afc1-07aed8b62fc5} ContentDispatchChooser.js
-contract @mozilla.org/content-dispatch-chooser;1 {5a072a22-1e66-4100-afc1-07aed8b62fc5}
-
-# LoginManagerPrompter.js
-component {97d12931-abe2-11df-94e2-0800200c9a66} LoginManagerPrompter.js
-contract @mozilla.org/login-manager/prompter;1 {97d12931-abe2-11df-94e2-0800200c9a66}
-
-#ifdef MOZ_SAFE_BROWSING
-# SafeBrowsing.js
-component {aadaed90-6c03-42d0-924a-fc61198ff283} SafeBrowsing.js
-contract @mozilla.org/safebrowsing/application;1 {aadaed90-6c03-42d0-924a-fc61198ff283}
-category app-startup SafeBrowsing service,@mozilla.org/safebrowsing/application;1
-#endif
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/ContentDispatchChooser.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/ContentDispatchChooser.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/ContentDispatchChooser.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/ContentDispatchChooser.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +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/. */
-
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-function ContentDispatchChooser() {}
-
-ContentDispatchChooser.prototype =
-{
-  classID: Components.ID("5a072a22-1e66-4100-afc1-07aed8b62fc5"),
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentDispatchChooser]),
-
-  ask: function ask(aHandler, aWindowContext, aURI, aReason) {
-    let window = null;
-    try {
-      if (aWindowContext)
-        window = aWindowContext.getInterface(Ci.nsIDOMWindow);
-    } catch (e) { /* it's OK to not have a window */ }
-
-    let bundle = Services.strings.createBundle("chrome://mozapps/locale/handling/handling.properties");
-
-    let title = bundle.GetStringFromName("protocol.title");
-    let message = bundle.GetStringFromName("protocol.description");
-
-    let open = Services.prompt.confirm(window, title, message);
-    if (open)
-      aHandler.launchWithURI(aURI, aWindowContext);
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentDispatchChooser]);
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/ContentPermissionPrompt.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/ContentPermissionPrompt.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/ContentPermissionPrompt.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/ContentPermissionPrompt.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +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/. */
-
-const Ci = Components.interfaces;
-const Cr = Components.results;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-const kCountBeforeWeRemember = 5;
-
-const kEntities = {
-  "geolocation": "geolocation2",
-  "indexedDB": "offlineApps"
-};
-
-const kIcons = {
-  geolocation: "chrome://browser/skin/images/infobar-geolocation.png"
-};
-
-function ContentPermissionPrompt() {}
-
-ContentPermissionPrompt.prototype = {
-  classID: Components.ID("{C6E8C44D-9F39-4AF7-BCC0-76E38A8310F5}"),
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionPrompt]),
-
-  getChromeWindow: function getChromeWindow(aWindow) {
-     let chromeWin = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                            .getInterface(Ci.nsIWebNavigation)
-                            .QueryInterface(Ci.nsIDocShellTreeItem)
-                            .rootTreeItem
-                            .QueryInterface(Ci.nsIInterfaceRequestor)
-                            .getInterface(Ci.nsIDOMWindow)
-                            .QueryInterface(Ci.nsIDOMChromeWindow);
-     return chromeWin;
-  },
-
-  getChromeWindowForRequest: function getChromeWindowForRequest(aRequest) {
-    if (aRequest.window)
-      return this.getChromeWindow(aRequest.window.top).wrappedJSObject;
-    return aRequest.element.ownerDocument.defaultView;
-  },
-
-  getNotificationBoxForRequest: function getNotificationBoxForRequest(request) {
-    let chromeWin = this.getChromeWindowForRequest(request);
-    if (request.window) {
-      let requestingWindow = request.window.top;
-      let windowID = request.window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
-      let browser = chromeWin.Browser.getBrowserForWindowId(windowID);
-      return chromeWin.getNotificationBox(browser);
-    }
-    return chromeWin.Browser.getNotificationBox(request.element);
-  },
-
-  handleExistingPermission: function handleExistingPermission(request, type) {
-    let result = Services.perms.testExactPermissionFromPrincipal(request.principal, type);
-    if (result == Ci.nsIPermissionManager.ALLOW_ACTION) {
-      request.allow();
-      return true;
-    }
-    if (result == Ci.nsIPermissionManager.DENY_ACTION) {
-      request.cancel();
-      return true;
-    }
-    return false;
-  },
-
-  prompt: function(request) {
-    // Only allow exactly one permission rquest here.
-    let types = request.types.QueryInterface(Ci.nsIArray);
-    if (types.length != 1) {
-      request.cancel();
-      return;
-    }
-    let perm = types.queryElementAt(0, Ci.nsIContentPermissionType);
-
-    // returns true if the request was handled
-    if (this.handleExistingPermission(request, perm.type))
-       return;
-
-    let pm = Services.perms;
-    let notificationBox = this.getNotificationBoxForRequest(request);
-    let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
-    
-    let notification = notificationBox.getNotificationWithValue(perm.type);
-    if (notification)
-      return;
-
-    let entityName = kEntities[perm.type];
-    let icon = kIcons[perm.type] || "";
-
-    let buttons = [{
-      label: browserBundle.GetStringFromName(entityName + ".allow"),
-      accessKey: "",
-      callback: function(notification) {
-        request.allow();
-      }
-    },
-    {
-      label: browserBundle.GetStringFromName("contentPermissions.alwaysForSite"),
-      accessKey: "",
-      callback: function(notification) {
-        Services.perms.addFromPrincipal(request.principal, perm.type, Ci.nsIPermissionManager.ALLOW_ACTION);
-        request.allow();
-      }
-    },
-    {
-      label: browserBundle.GetStringFromName("contentPermissions.neverForSite"),
-      accessKey: "",
-      callback: function(notification) {
-        Services.perms.addFromPrincipal(request.principal, perm.type, Ci.nsIPermissionManager.DENY_ACTION);
-        request.cancel();
-      }
-    }];
-
-    let message = browserBundle.formatStringFromName(entityName + ".wantsTo",
-                                                     [request.principal.URI.host], 1);
-    let newBar = notificationBox.appendNotification(message,
-                                                    perm.type,
-                                                    icon,
-                                                    notificationBox.PRIORITY_WARNING_MEDIUM,
-                                                    buttons);
-
-    if (perm.type == "geolocation") {
-      // Add the "learn more" link.
-      let link = newBar.ownerDocument.createElement("label");
-      link.setAttribute("value", browserBundle.GetStringFromName("geolocation.learnMore"));
-      link.setAttribute("class", "text-link notification-link");
-      newBar.insertBefore(link, newBar.firstChild);
-
-      let win = this.getChromeWindowForRequest(request);
-      link.addEventListener("click", function() {
-        let url = Services.urlFormatter.formatURLPref("browser.geolocation.warning.infoURL");
-        win.BrowserUI.addAndShowTab(url, win.Browser.selectedTab);
-      });
-    }
-  }
-};
-
-
-//module initialization
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPermissionPrompt]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/DirectoryProvider.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/DirectoryProvider.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/DirectoryProvider.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/DirectoryProvider.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +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/. */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-// -----------------------------------------------------------------------
-// Directory Provider for special browser folders and files
-// -----------------------------------------------------------------------
-
-const NS_APP_CACHE_PARENT_DIR = "cachePDir";
-
-function DirectoryProvider() {}
-
-DirectoryProvider.prototype = {
-  classID: Components.ID("{ef0f7a87-c1ee-45a8-8d67-26f586e46a4b}"),
-  
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider]),
-
-  getFile: function(prop, persistent) {
-    if (prop == NS_APP_CACHE_PARENT_DIR) {
-      let dirsvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
-      let profile = dirsvc.get("ProfD", Ci.nsIFile);
-
-      let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
-      let device = sysInfo.get("device");
-      switch (device) {
-        default:
-          return profile;
-      }
-    }
-
-    // We are retuning null to show failure instead for throwing an error. The
-    // interface is called quite a bit and throwing an error is noisy. Returning
-    // null works with the way the interface is called [see bug 529077]
-    return null;
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([DirectoryProvider]);
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/DownloadManagerUI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/DownloadManagerUI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/DownloadManagerUI.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/DownloadManagerUI.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +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/. */
-
-const Ci = Components.interfaces;
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-// -----------------------------------------------------------------------
-// Download Manager UI
-// -----------------------------------------------------------------------
-
-function DownloadManagerUI() { }
-
-DownloadManagerUI.prototype = {
-  classID: Components.ID("{93db15b1-b408-453e-9a2b-6619e168324a}"),
-
-  show: function show(aWindowContext, aID, aReason, aUsePrivateUI) {
-    if (!aReason)
-      aReason = Ci.nsIDownloadManagerUI.REASON_USER_INTERACTED;
-
-    let browser = Services.wm.getMostRecentWindow("navigator:browser");
-    if (browser)
-      browser.showDownloadManager(aWindowContext, aID, aReason);
-  },
-
-  get visible() {
-    // For now there is no Download Manager UI.
-    return false;
-  },
-
-  getAttention: function getAttention() {
-    if (this.visible)
-      this.show(null, null, null);
-    else
-      throw Cr.NS_ERROR_UNEXPECTED;
-  },
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDownloadManagerUI])
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([DownloadManagerUI]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/HelperAppDialog.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/HelperAppDialog.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/HelperAppDialog.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/HelperAppDialog.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,302 +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/. */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-const Cr = Components.results;
-
-const PREF_BD_USEDOWNLOADDIR = "browser.download.useDownloadDir";
-const URI_GENERIC_ICON_DOWNLOAD = "chrome://browser/skin/images/alert-downloads-30.png";
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/DownloadUtils.jsm");
-
-XPCOMUtils.defineLazyGetter(this, "ContentUtil", function() {
-  Cu.import("resource:///modules/ContentUtil.jsm");
-  return ContentUtil;
-});
-XPCOMUtils.defineLazyModuleGetter(this, "Downloads",
-                                  "resource://gre/modules/Downloads.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-                                  "resource://gre/modules/FileUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "Task",
-                                  "resource://gre/modules/Task.jsm");
-
-// -----------------------------------------------------------------------
-// HelperApp Launcher Dialog
-// -----------------------------------------------------------------------
-
-function HelperAppLauncherDialog() { }
-
-HelperAppLauncherDialog.prototype = {
-  classID: Components.ID("{e9d277a0-268a-4ec2-bb8c-10fdf3e44611}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIHelperAppLauncherDialog]),
-
-  show: function hald_show(aLauncher, aContext, aReason) {
-    // Check to see if we can open this file or not
-    // If the file is an executable then launchWithApplication will fail in
-    // /uriloader nsMIMEInfoWin.cpp code. So always download in that case.
-    if (aLauncher.MIMEInfo.hasDefaultHandler && !aLauncher.targetFileIsExecutable) {
-      aLauncher.MIMEInfo.preferredAction = Ci.nsIMIMEInfo.useSystemDefault;
-      aLauncher.launchWithApplication(null, false);
-    } else {
-      let wasClicked = false;
-      this._showDownloadInfobar(aLauncher);
-    }
-  },
-
-  _getDownloadSize: function dv__getDownloadSize (aSize) {
-    let displaySize = DownloadUtils.convertByteUnits(aSize);
-    // displaySize[0] is formatted size, displaySize[1] is units
-    if (aSize > 0)
-      return displaySize.join("");
-    else {
-      let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
-      return browserBundle.GetStringFromName("downloadsUnknownSize");
-    }
-  },
-
-  _getChromeWindow: function (aWindow) {
-      let chromeWin = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                            .getInterface(Ci.nsIWebNavigation)
-                            .QueryInterface(Ci.nsIDocShellTreeItem)
-                            .rootTreeItem
-                            .QueryInterface(Ci.nsIInterfaceRequestor)
-                            .getInterface(Ci.nsIDOMWindow)
-                            .QueryInterface(Ci.nsIDOMChromeWindow);
-     return chromeWin;
-  },
-
-  _showDownloadInfobar: function do_showDownloadInfobar(aLauncher) {
-    let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
-
-    let runButtonText =
-              browserBundle.GetStringFromName("downloadOpen");
-    let saveButtonText =
-              browserBundle.GetStringFromName("downloadSave");
-    let cancelButtonText =
-              browserBundle.GetStringFromName("downloadCancel");
-
-    let buttons = [
-      {
-        isDefault: true,
-        label: runButtonText,
-        accessKey: "",
-        callback: function() {
-          aLauncher.saveToDisk(null, false);
-          Services.obs.notifyObservers(aLauncher.targetFile, "dl-run", "true");
-        }
-      },
-      {
-        label: saveButtonText,
-        accessKey: "",
-        callback: function() {
-          aLauncher.saveToDisk(null, false);
-          Services.obs.notifyObservers(aLauncher.targetFile, "dl-run", "false");
-        }
-      },
-      {
-        label: cancelButtonText,
-        accessKey: "",
-        callback: function() { aLauncher.cancel(Cr.NS_BINDING_ABORTED); }
-      }
-    ];
-
-    let window = Services.wm.getMostRecentWindow("navigator:browser");
-    let chromeWin = this._getChromeWindow(window).wrappedJSObject;
-    let notificationBox = chromeWin.Browser.getNotificationBox();
-    let document = notificationBox.ownerDocument;
-    let downloadSize = this._getDownloadSize(aLauncher.contentLength);
-
-    let msg = browserBundle.GetStringFromName("alertDownloadSave2");
-
-    let fragment =  ContentUtil.populateFragmentFromString(
-                      document.createDocumentFragment(),
-                      msg,
-                      {
-                        text: aLauncher.suggestedFileName,
-                        className: "download-filename-text"
-                      },
-                      {
-                        text: downloadSize,
-                        className: "download-size-text"
-                      },
-                      {
-                        text: aLauncher.source.host,
-                        className: "download-host-text"
-                      }
-                    );
-    let newBar = notificationBox.appendNotification("",
-                                                    "save-download",
-                                                    URI_GENERIC_ICON_DOWNLOAD,
-                                                    notificationBox.PRIORITY_WARNING_HIGH,
-                                                    buttons);
-    let messageContainer = document.getAnonymousElementByAttribute(newBar, "anonid", "messageText");
-    messageContainer.appendChild(fragment);
-  },
-
-  promptForSaveToFileAsync: function hald_promptForSaveToFileAsync(aLauncher, aContext, aDefaultFile, aSuggestedFileExt, aForcePrompt) {
-    let file = null;
-    let prefs = Services.prefs;
-
-    Task.spawn(function() {
-      if (!aForcePrompt) {
-        // Check to see if the user wishes to auto save to the default download
-        // folder without prompting. Note that preference might not be set.
-        let autodownload = true;
-        try {
-          autodownload = prefs.getBoolPref(PREF_BD_USEDOWNLOADDIR);
-        } catch (e) { }
-
-        if (autodownload) {
-          // Retrieve the user's preferred download directory
-          let preferredDir = yield Downloads.getPreferredDownloadsDirectory();
-          let defaultFolder = new FileUtils.File(preferredDir);
-
-          try {
-            file = this.validateLeafName(defaultFolder, aDefaultFile, aSuggestedFileExt);
-          }
-          catch (e) {
-          }
-
-          // Check to make sure we have a valid directory, otherwise, prompt
-          if (file) {
-            aLauncher.saveDestinationAvailable(file);
-            return;
-          }
-        }
-      }
-
-      // Use file picker to show dialog.
-      let picker = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-      let windowTitle = "";
-      let parent = aContext.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindow);
-      picker.init(parent, windowTitle, Ci.nsIFilePicker.modeSave);
-      picker.defaultString = aDefaultFile;
-
-      if (aSuggestedFileExt) {
-        // aSuggestedFileExtension includes the period, so strip it
-        picker.defaultExtension = aSuggestedFileExt.substring(1);
-      }
-      else {
-        try {
-          picker.defaultExtension = aLauncher.MIMEInfo.primaryExtension;
-        }
-        catch (e) { }
-      }
-
-      let wildCardExtension = "*";
-      if (aSuggestedFileExt) {
-        wildCardExtension += aSuggestedFileExt;
-        picker.appendFilter(aLauncher.MIMEInfo.description, wildCardExtension);
-      }
-
-      picker.appendFilters(Ci.nsIFilePicker.filterAll);
-
-      // Default to lastDir if it is valid, otherwise use the user's preferred
-      // downloads directory.  getPreferredDownloadsDirectory should always
-      // return a valid directory string, so we can safely default to it.
-      let preferredDir = yield Downloads.getPreferredDownloadsDirectory();
-      picker.displayDirectory = new FileUtils.File(preferredDir);
-
-      // The last directory preference may not exist, which will throw.
-      try {
-        let lastDir = prefs.getComplexValue("browser.download.lastDir", Ci.nsILocalFile);
-        if (isUsableDirectory(lastDir))
-          picker.displayDirectory = lastDir;
-      }
-      catch (e) { }
-
-      picker.open(function(aResult) {
-        if (aResult == Ci.nsIFilePicker.returnCancel) {
-          // null result means user cancelled.
-          aLauncher.saveDestinationAvailable(null);
-          return;
-        }
-
-        // Be sure to save the directory the user chose through the Save As...
-        // dialog  as the new browser.download.dir since the old one
-        // didn't exist.
-        file = picker.file;
-
-        if (file) {
-          try {
-            // Remove the file so that it's not there when we ensure non-existence later;
-            // this is safe because for the file to exist, the user would have had to
-            // confirm that he wanted the file overwritten.
-            if (file.exists())
-              file.remove(false);
-          }
-          catch (e) { }
-          let newDir = file.parent.QueryInterface(Ci.nsILocalFile);
-          prefs.setComplexValue("browser.download.lastDir", Ci.nsILocalFile, newDir);
-          file = this.validateLeafName(newDir, file.leafName, null);
-        }
-        aLauncher.saveDestinationAvailable(file);
-      }.bind(this));
-    }.bind(this));
-  },
-
-  validateLeafName: function hald_validateLeafName(aLocalFile, aLeafName, aFileExt) {
-    if (!(aLocalFile && this.isUsableDirectory(aLocalFile)))
-      return null;
-
-    // Remove any leading periods, since we don't want to save hidden files
-    // automatically.
-    aLeafName = aLeafName.replace(/^\.+/, "");
-
-    if (aLeafName == "")
-      aLeafName = "unnamed" + (aFileExt ? "." + aFileExt : "");
-    aLocalFile.append(aLeafName);
-
-    this.makeFileUnique(aLocalFile);
-    return aLocalFile;
-  },
-
-  makeFileUnique: function hald_makeFileUnique(aLocalFile) {
-    try {
-      // Note - this code is identical to that in
-      //   toolkit/content/contentAreaUtils.js.
-      // If you are updating this code, update that code too! We can't share code
-      // here since this is called in a js component.
-      var collisionCount = 0;
-      while (aLocalFile.exists()) {
-        collisionCount++;
-        if (collisionCount == 1) {
-          // Append "(2)" before the last dot in (or at the end of) the filename
-          // special case .ext.gz etc files so we don't wind up with .tar(2).gz
-          if (aLocalFile.leafName.match(/\.[^\.]{1,3}\.(gz|bz2|Z)$/i))
-            aLocalFile.leafName = aLocalFile.leafName.replace(/\.[^\.]{1,3}\.(gz|bz2|Z)$/i, "(2)$&");
-          else
-            aLocalFile.leafName = aLocalFile.leafName.replace(/(\.[^\.]*)?$/, "(2)$&");
-        }
-        else {
-          // replace the last (n) in the filename with (n+1)
-          aLocalFile.leafName = aLocalFile.leafName.replace(/^(.*\()\d+\)/, "$1" + (collisionCount+1) + ")");
-        }
-      }
-      aLocalFile.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0600);
-    }
-    catch (e) {
-      dump("*** exception in validateLeafName: " + e + "\n");
-
-      if (e.result == Cr.NS_ERROR_FILE_ACCESS_DENIED)
-        throw e;
-
-      if (aLocalFile.leafName == "" || aLocalFile.isDirectory()) {
-        aLocalFile.append("unnamed");
-        if (aLocalFile.exists())
-          aLocalFile.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0600);
-      }
-    }
-  },
-
-  isUsableDirectory: function hald_isUsableDirectory(aDirectory) {
-    return aDirectory.exists() && aDirectory.isDirectory() && aDirectory.isWritable();
-  },
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([HelperAppLauncherDialog]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/LoginManagerPrompter.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/LoginManagerPrompter.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/LoginManagerPrompter.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/LoginManagerPrompter.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,522 +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/. */
-
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-/* ==================== LoginManagerPrompter ==================== */
-/*
- * LoginManagerPrompter
- *
- * Implements interfaces for prompting the user to enter/save/change auth info.
- *
- * nsILoginManagerPrompter: Used by Login Manager for saving/changing logins
- * found in HTML forms.
- */
-function LoginManagerPrompter() {
-}
-
-LoginManagerPrompter.prototype = {
-
-    classID : Components.ID("97d12931-abe2-11df-94e2-0800200c9a66"),
-    QueryInterface : XPCOMUtils.generateQI([Ci.nsILoginManagerPrompter]),
-
-    _factory       : null,
-    _window        : null,
-    _debug         : false, // mirrors signon.debug
-
-    __pwmgr : null, // Password Manager service
-    get _pwmgr() {
-        if (!this.__pwmgr)
-            this.__pwmgr = Cc["@mozilla.org/login-manager;1"].
-                           getService(Ci.nsILoginManager);
-        return this.__pwmgr;
-    },
-
-    __promptService : null, // Prompt service for user interaction
-    get _promptService() {
-        if (!this.__promptService)
-            this.__promptService =
-                Cc["@mozilla.org/embedcomp/prompt-service;1"].
-                getService(Ci.nsIPromptService2);
-        return this.__promptService;
-    },
-    
-    __strBundle : null, // String bundle for L10N
-    get _strBundle() {
-        if (!this.__strBundle) {
-            var bunService = Cc["@mozilla.org/intl/stringbundle;1"].
-                             getService(Ci.nsIStringBundleService);
-            this.__strBundle = bunService.createBundle(
-                        "chrome://browser/locale/passwordmgr.properties");
-            if (!this.__strBundle)
-                throw "String bundle for Login Manager not present!";
-        }
-
-        return this.__strBundle;
-    },
-
-    __brandBundle : null, // String bundle for L10N
-    get _brandBundle() {
-        if (!this.__brandBundle) {
-            var bunService = Cc["@mozilla.org/intl/stringbundle;1"].
-                             getService(Ci.nsIStringBundleService);
-            this.__brandBundle = bunService.createBundle(
-                        "chrome://branding/locale/brand.properties");
-            if (!this.__brandBundle)
-                throw "Branding string bundle not present!";
-        }
-
-        return this.__brandBundle;
-    },
-
-
-    __ellipsis : null,
-    get _ellipsis() {
-        if (!this.__ellipsis) {
-            this.__ellipsis = "\u2026";
-            try {
-                this.__ellipsis = Services.prefs.getComplexValue(
-                                    "intl.ellipsis", Ci.nsIPrefLocalizedString).data;
-            } catch (e) { }
-        }
-        return this.__ellipsis;
-    },
-
-
-    /*
-     * log
-     *
-     * Internal function for logging debug messages to the Error Console window.
-     */
-    log : function (message) {
-        if (!this._debug)
-            return;
-
-        dump("Pwmgr Prompter: " + message + "\n");
-        Services.console.logStringMessage("Pwmgr Prompter: " + message);
-    },
-
-
-    /* ---------- nsILoginManagerPrompter prompts ---------- */
-
-
-
-
-    /*
-     * init
-     *
-     */
-    init : function (aWindow, aFactory) {
-        this._window = aWindow;
-        this._factory = aFactory || null;
-
-        var prefBranch = Services.prefs.getBranch("signon.");
-        this._debug = prefBranch.getBoolPref("debug");
-        this.log("===== initialized =====");
-    },
-
-
-    setE10sData : function (aBrowser, aOpener) {
-      // XXX Implement me!
-      throw new Error("Not Yet Implemented");
-    },
-
-
-    /*
-     * promptToSavePassword
-     *
-     */
-    promptToSavePassword : function (aLogin) {
-        var notifyBox = this._getNotifyBox();
-        if (notifyBox)
-            this._showSaveLoginNotification(notifyBox, aLogin);
-    },
-
-
-    /*
-     * _showLoginNotification
-     *
-     * Displays a notification bar.
-     *
-     */
-    _showLoginNotification : function (aNotifyBox, aName, aText, aButtons) {
-        var oldBar = aNotifyBox.getNotificationWithValue(aName);
-        const priority = aNotifyBox.PRIORITY_INFO_MEDIUM;
-
-        this.log("Adding new " + aName + " notification bar");
-        var newBar = aNotifyBox.appendNotification(
-                                aText, aName,
-                                "chrome://browser/skin/images/infobar-key.png",
-                                priority, aButtons);
-
-        // The page we're going to hasn't loaded yet, so we want to persist
-        // across the first location change.
-        newBar.persistence++;
-
-        // Sites like Gmail perform a funky redirect dance before you end up
-        // at the post-authentication page. I don't see a good way to
-        // heuristically determine when to ignore such location changes, so
-        // we'll try ignoring location changes based on a time interval.
-        newBar.timeout = Date.now() + 20000; // 20 seconds
-
-        if (oldBar) {
-            this.log("(...and removing old " + aName + " notification bar)");
-            aNotifyBox.removeNotification(oldBar);
-        }
-    },
-
-
-    /*
-     * _showSaveLoginNotification
-     *
-     * Displays a notification bar (rather than a popup), to allow the user to
-     * save the specified login. This allows the user to see the results of
-     * their login, and only save a login which they know worked.
-     *
-     */
-    _showSaveLoginNotification : function (aNotifyBox, aLogin) {
-        // Ugh. We can't use the strings from the popup window, because they
-        // have the access key marked in the string (eg "Mo&zilla"), along
-        // with some weird rules for handling access keys that do not occur
-        // in the string, for L10N. See commonDialog.js's setLabelForNode().
-        var neverButtonText =
-              this._getLocalizedString("notifyBarNotForThisSiteButtonText");
-        var neverButtonAccessKey =
-              this._getLocalizedString("notifyBarNotForThisSiteButtonAccessKey");
-        var rememberButtonText =
-              this._getLocalizedString("notifyBarRememberPasswordButtonText");
-        var rememberButtonAccessKey =
-              this._getLocalizedString("notifyBarRememberPasswordButtonAccessKey");
-
-        var brandShortName =
-              this._brandBundle.GetStringFromName("brandShortName");
-        var displayHost = this._getShortDisplayHost(aLogin.hostname);
-        var notificationText;
-        if (aLogin.username) {
-            var displayUser = this._sanitizeUsername(aLogin.username);
-            notificationText  = this._getLocalizedString(
-                                        "saveLoginText",
-                                        [brandShortName, displayUser, displayHost]);
-        } else {
-            notificationText  = this._getLocalizedString(
-                                        "saveLoginTextNoUsername",
-                                        [brandShortName, displayHost]);
-        }
-
-        // The callbacks in |buttons| have a closure to access the variables
-        // in scope here; set one to |this._pwmgr| so we can get back to pwmgr
-        // without a getService() call.
-        var pwmgr = this._pwmgr;
-
-
-        var buttons = [
-            // "Remember" button
-            {
-                label:     rememberButtonText,
-                accessKey: rememberButtonAccessKey,
-                popup:     null,
-                callback: function(aNotificationBar, aButton) {
-                    pwmgr.addLogin(aLogin);
-                }
-            },
-
-            // "Never for this site" button
-            {
-                label:     neverButtonText,
-                accessKey: neverButtonAccessKey,
-                popup:     null,
-                callback: function(aNotificationBar, aButton) {
-                    pwmgr.setLoginSavingEnabled(aLogin.hostname, false);
-                }
-            }
-        ];
-
-        this._showLoginNotification(aNotifyBox, "password-save",
-             notificationText, buttons);
-    },
-
-
-    /*
-     * promptToChangePassword
-     *
-     * Called when we think we detect a password change for an existing
-     * login, when the form being submitted contains multiple password
-     * fields.
-     *
-     */
-    promptToChangePassword : function (aOldLogin, aNewLogin) {
-        var notifyBox = this._getNotifyBox();
-        if (notifyBox)
-            this._showChangeLoginNotification(notifyBox, aOldLogin, aNewLogin.password);
-    },
-
-    /*
-     * _showChangeLoginNotification
-     *
-     * Shows the Change Password notification bar.
-     *
-     */
-    _showChangeLoginNotification : function (aNotifyBox, aOldLogin, aNewPassword) {
-        var notificationText;
-        if (aOldLogin.username)
-            notificationText  = this._getLocalizedString(
-                                          "passwordChangeText",
-                                          [aOldLogin.username]);
-        else
-            notificationText  = this._getLocalizedString(
-                                          "passwordChangeTextNoUser");
-
-        var changeButtonText =
-              this._getLocalizedString("notifyBarChangeButtonText");
-        var changeButtonAccessKey =
-              this._getLocalizedString("notifyBarChangeButtonAccessKey");
-        var dontChangeButtonText =
-              this._getLocalizedString("notifyBarDontChangeButtonText2");
-        var dontChangeButtonAccessKey =
-              this._getLocalizedString("notifyBarDontChangeButtonAccessKey");
-
-        // The callbacks in |buttons| have a closure to access the variables
-        // in scope here; set one to |this._pwmgr| so we can get back to pwmgr
-        // without a getService() call.
-        var self = this;
-
-        var buttons = [
-            // "Yes" button
-            {
-                label:     changeButtonText,
-                accessKey: changeButtonAccessKey,
-                popup:     null,
-                callback:  function(aNotificationBar, aButton) {
-                    self._updateLogin(aOldLogin, aNewPassword);
-                }
-            },
-
-            // "No" button
-            {
-                label:     dontChangeButtonText,
-                accessKey: dontChangeButtonAccessKey,
-                popup:     null,
-                callback:  function(aNotificationBar, aButton) {
-                    // do nothing
-                }
-            }
-        ];
-
-        this._showLoginNotification(aNotifyBox, "password-change",
-             notificationText, buttons);
-    },
-
-    /*
-     * promptToChangePasswordWithUsernames
-     *
-     * Called when we detect a password change in a form submission, but we
-     * don't know which existing login (username) it's for. Asks the user
-     * to select a username and confirm the password change.
-     *
-     * Note: The caller doesn't know the username for aNewLogin, so this
-     *       function fills in .username and .usernameField with the values
-     *       from the login selected by the user.
-     * 
-     * Note; XPCOM stupidity: |count| is just |logins.length|.
-     */
-    promptToChangePasswordWithUsernames : function (logins, count, aNewLogin) {
-        const buttonFlags = Ci.nsIPrompt.STD_YES_NO_BUTTONS;
-
-        var usernames = logins.map(function (l) l.username);
-        var dialogText  = this._getLocalizedString("userSelectText");
-        var dialogTitle = this._getLocalizedString("passwordChangeTitle");
-        var selectedIndex = { value: null };
-
-        // If user selects ok, outparam.value is set to the index
-        // of the selected username.
-        var ok = this._promptService.select(null,
-                                dialogTitle, dialogText,
-                                usernames.length, usernames,
-                                selectedIndex);
-        if (ok) {
-            // Now that we know which login to use, modify its password.
-            var selectedLogin = logins[selectedIndex.value];
-            this.log("Updating password for user " + selectedLogin.username);
-            this._updateLogin(selectedLogin, aNewLogin.password);
-        }
-    },
-
-
-    /* ---------- Internal Methods ---------- */
-
-    /*
-     * _updateLogin
-     */
-    _updateLogin : function (login, newPassword) {
-        var now = Date.now();
-        var propBag = Cc["@mozilla.org/hash-property-bag;1"].
-                      createInstance(Ci.nsIWritablePropertyBag);
-        if (newPassword) {
-            propBag.setProperty("password", newPassword);
-            // Explicitly set the password change time here (even though it would
-            // be changed automatically), to ensure that it's exactly the same
-            // value as timeLastUsed.
-            propBag.setProperty("timePasswordChanged", now);
-        }
-        propBag.setProperty("timeLastUsed", now);
-        propBag.setProperty("timesUsedIncrement", 1);
-        this._pwmgr.modifyLogin(login, propBag);
-    },
-
-    /*
-     * _getNotifyWindow
-     */
-    _getNotifyWindow: function () {
-        try {
-            // Get topmost window, in case we're in a frame.
-            var notifyWin = this._window.top;
-
-            // Some sites pop up a temporary login window, when disappears
-            // upon submission of credentials. We want to put the notification
-            // bar in the opener window if this seems to be happening.
-            if (notifyWin.opener) {
-                var chromeDoc = this._getChromeWindow(notifyWin).
-                                     document.documentElement;
-                var webnav = notifyWin.
-                             QueryInterface(Ci.nsIInterfaceRequestor).
-                             getInterface(Ci.nsIWebNavigation);
-
-                // Check to see if the current window was opened with chrome
-                // disabled, and if so use the opener window. But if the window
-                // has been used to visit other pages (ie, has a history),
-                // assume it'll stick around and *don't* use the opener.
-                if (chromeDoc.getAttribute("chromehidden") &&
-                    webnav.sessionHistory.count == 1) {
-                    this.log("Using opener window for notification bar.");
-                    notifyWin = notifyWin.opener;
-                }
-            }
-
-            return notifyWin;
-
-        } catch (e) {
-            // If any errors happen, just assume no notification box.
-            this.log("Unable to get notify window");
-            return null;
-        }
-    },
-
-    /*
-     * _getChromeWindow
-     *
-     * Given a content DOM window, returns the chrome window it's in.
-     */
-    _getChromeWindow: function (aWindow) {
-        var chromeWin = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                               .getInterface(Ci.nsIWebNavigation)
-                               .QueryInterface(Ci.nsIDocShell)
-                               .chromeEventHandler.ownerDocument.defaultView;
-        return chromeWin;
-    },
-
-    /*
-     * _getNotifyBox
-     *
-     * Returns the notification box to this prompter, or null if there isn't
-     * a notification box available.
-     */
-    _getNotifyBox : function () {
-        let notifyBox = null;
-
-        try {
-            let notifyWin = this._getNotifyWindow();
-            let windowID = notifyWin.QueryInterface(Ci.nsIInterfaceRequestor)
-                                    .getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
-
-            // Get the chrome window for the content window we're using.
-            // .wrappedJSObject needed here -- see bug 422974 comment 5.
-            let chromeWin = this._getChromeWindow(notifyWin).wrappedJSObject;
-            let browser = chromeWin.Browser.getBrowserForWindowId(windowID);
-
-            notifyBox = chromeWin.getNotificationBox(browser);
-        } catch (e) {
-            Cu.reportError(e);
-        }
-
-        return notifyBox;
-    },
-
-    /*
-     * _getLocalizedString
-     *
-     * Can be called as:
-     *   _getLocalizedString("key1");
-     *   _getLocalizedString("key2", ["arg1"]);
-     *   _getLocalizedString("key3", ["arg1", "arg2"]);
-     *   (etc)
-     *
-     * Returns the localized string for the specified key,
-     * formatted if required.
-     *
-     */ 
-    _getLocalizedString : function (key, formatArgs) {
-        if (formatArgs)
-            return this._strBundle.formatStringFromName(
-                                        key, formatArgs, formatArgs.length);
-        else
-            return this._strBundle.GetStringFromName(key);
-    },
-
-
-    /*
-     * _sanitizeUsername
-     *
-     * Sanitizes the specified username, by stripping quotes and truncating if
-     * it's too long. This helps prevent an evil site from messing with the
-     * "save password?" prompt too much.
-     */
-    _sanitizeUsername : function (username) {
-        if (username.length > 30) {
-            username = username.substring(0, 30);
-            username += this._ellipsis;
-        }
-        return username.replace(/['"]/g, "");
-    },
-
-
-    /*
-     * _getShortDisplayHost
-     *
-     * Converts a login's hostname field (a URL) to a short string for
-     * prompting purposes. Eg, "http://foo.com" --> "foo.com", or
-     * "ftp://www.site.co.uk" --> "site.co.uk".
-     */
-    _getShortDisplayHost: function (aURIString) {
-        var displayHost;
-
-        var eTLDService = Cc["@mozilla.org/network/effective-tld-service;1"].
-                          getService(Ci.nsIEffectiveTLDService);
-        var idnService = Cc["@mozilla.org/network/idn-service;1"].
-                         getService(Ci.nsIIDNService);
-        try {
-            var uri = Services.io.newURI(aURIString, null, null);
-            var baseDomain = eTLDService.getBaseDomain(uri);
-            displayHost = idnService.convertToDisplayIDN(baseDomain, {});
-        } catch (e) {
-            this.log("_getShortDisplayHost couldn't process " + aURIString);
-        }
-
-        if (!displayHost)
-            displayHost = aURIString;
-
-        return displayHost;
-    },
-
-}; // end of LoginManagerPrompter implementation
-
-
-var component = [LoginManagerPrompter];
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory(component);
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-XPIDL_SOURCES += [
-    'SessionStore.idl',
-]
-
-XPIDL_MODULE = 'components'
-
-# metro/components.manifest
-EXTRA_COMPONENTS += [
-    'AlertsService.js',
-    'BrowserStartup.js',
-    'ContentDispatchChooser.js',
-    'ContentPermissionPrompt.js',
-    'DirectoryProvider.js',
-    'DownloadManagerUI.js',
-    'HelperAppDialog.js',
-    'LoginManagerPrompter.js',
-    'PromptService.js',
-    'Sidebar.js',
-]
-
-if CONFIG['MOZ_SAFE_BROWSING']:
-    EXTRA_COMPONENTS += [
-        'SafeBrowsing.js',
-    ]
-
-EXTRA_PP_COMPONENTS += [
-    'AboutRedirector.js',
-    'BrowserCLH.js',
-    'components.manifest',
-    'SessionStore.js',
-]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/PromptService.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/PromptService.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/PromptService.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/PromptService.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +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/. */
-const Ci = Components.interfaces;
-const Cc = Components.classes;
-const Cr = Components.results;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-function PromptService() {
-
-}
-
-PromptService.prototype = {
-  classID: Components.ID("{9a61149b-2276-4a0a-b79c-be994ad106cf}"),
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIPromptService, Ci.nsIPromptService2]),
-
-  /* ----------  nsIPromptFactory  ---------- */
-
-  getPrompt: function getPrompt(domWin, iid) {
-    if (!domWin) {
-      let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
-      if (!chromeWin) {
-        let msg = "PromptService.js: Attempted create a prompt but no DOM Window specified and failed to find one";
-        Cu.reportError(msg);
-        throw(msg);
-      }
-      domWin = chromeWin.getBrowser().contentWindow;
-    }
-
-    let factory =
-          Components.classesByID["{1c978d25-b37f-43a8-a2d6-0c7a239ead87}"]
-                    .createInstance(Ci.nsIPromptFactory);
-
-    let prompt = factory.getPrompt(domWin, iid);
-    try {
-      let bag = prompt.QueryInterface(Ci.nsIWritablePropertyBag2);
-      bag.setPropertyAsBool("allowTabModal", true);
-    } catch(e) {
-    }
-    return prompt;
-  },
-
-  /* ----------  private memebers  ---------- */
-
-  callProxy: function(aName, aArgs) {
-    let domWin = aArgs[0];
-    let prompt = this.getPrompt(domWin, Ci.nsIPrompt);
-    if (aName == 'promptAuth' || aName == 'promptAuthAsync') {
-      let adapterFactory =
-            Components.classesByID["{6e134924-6c3a-4d86-81ac-69432dd971dc}"]
-                      .createInstance(Ci.nsIAuthPromptAdapterFactory);
-      prompt = adapterFactory.createAdapter(prompt);
-    }
-
-    return prompt[aName].apply(prompt, Array.prototype.slice.call(aArgs, 1));
-  },
-
-  /* ----------  nsIPromptService  ---------- */
-
-  alert: function() {
-    return this.callProxy("alert", arguments);
-  },
-  alertCheck: function() {
-    return this.callProxy("alertCheck", arguments);
-  },
-  confirm: function() {
-    return this.callProxy("confirm", arguments);
-  },
-  confirmCheck: function() {
-    return this.callProxy("confirmCheck", arguments);
-  },
-  confirmEx: function() {
-    return this.callProxy("confirmEx", arguments);
-  },
-  prompt: function() {
-    return this.callProxy("prompt", arguments);
-  },
-  promptUsernameAndPassword: function() {
-    return this.callProxy("promptUsernameAndPassword", arguments);
-  },
-  promptPassword: function() {
-    return this.callProxy("promptPassword", arguments);
-  },
-  select: function() {
-    return this.callProxy("select", arguments);
-  },
-
-  /* ----------  nsIPromptService2  ---------- */
-
-  promptAuth: function() {
-    return this.callProxy("promptAuth", arguments);
-  },
-  asyncPromptAuth: function() {
-    return this.callProxy("asyncPromptAuth", arguments);
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PromptService]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/SafeBrowsing.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/SafeBrowsing.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/SafeBrowsing.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/SafeBrowsing.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,168 +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/. */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-const Cr = Components.results;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-const kPhishWardenEnabledPref = "browser.safebrowsing.enabled";
-const kMalwareWardenEnabledPref = "browser.safebrowsing.malware.enabled";
-
-// This XPCOM object doesn't have a public interface. It just works quietly in the background
-function SafeBrowsing() {
-  this.listManager = null;
-
-  // Once we register tables, their respective names will be listed here.
-  this.phishing = {
-    pref: kPhishWardenEnabledPref,
-    blackTables: [],
-    whiteTables: []
-  };
-  this.malware = {
-    pref: kMalwareWardenEnabledPref,
-    blackTables: [],
-    whiteTables: []
-  };
-
-  // Get notifications when the phishing or malware warden enabled pref changes
-  Services.prefs.addObserver(kPhishWardenEnabledPref, this, true);
-  Services.prefs.addObserver(kMalwareWardenEnabledPref, this, true);
-}
-
-SafeBrowsing.prototype = {
-  classID: Components.ID("{aadaed90-6c03-42d0-924a-fc61198ff283}"),
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISessionStore,
-                                         Ci.nsIDOMEventListener,
-                                         Ci.nsIObserver,
-                                         Ci.nsISupportsWeakReference]),
-
-  observe: function sb_observe(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "app-startup":
-        Services.obs.addObserver(this, "final-ui-startup", true);
-        Services.obs.addObserver(this, "xpcom-shutdown", true);
-        break;
-      case "final-ui-startup":
-        Services.obs.removeObserver(this, "final-ui-startup");
-        this._startup();
-        break;
-      case "xpcom-shutdown":
-        Services.obs.removeObserver(this, "xpcom-shutdown");
-        this._shutdown();
-        break;
-      case "nsPref:changed":
-        if (aData == kPhishWardenEnabledPref)
-          this.maybeToggleUpdateChecking(this.phishing);
-        else if (aData == kMalwareWardenEnabledPref)
-          this.maybeToggleUpdateChecking(this.malware);
-        break;
-    }
-  },
-
-  _startup: function sb_startup() {
-    this.listManager = Cc["@mozilla.org/url-classifier/listmanager;1"].getService(Ci.nsIUrlListManager);
-
-    // Add a test chunk to the database
-    let testData = "itisatrap.org/firefox/its-an-attack.html";
-    let testUpdate =
-      "n:1000\ni:test-malware-simple\nad:1\n" +
-      "a:1:32:" + testData.length + "\n" +
-      testData;
-
-    testData = "itisatrap.org/firefox/its-a-trap.html";
-    testUpdate +=
-      "n:1000\ni:test-phish-simple\nad:1\n" +
-      "a:1:32:" + testData.length + "\n" +
-      testData;
-
-    let dbService = Cc["@mozilla.org/url-classifier/dbservice;1"].getService(Ci.nsIUrlClassifierDBService);
-
-    let listener = {
-      QueryInterface: function(aIID) {
-        if (aIID.equals(Ci.nsISupports) || aIID.equals(Ci.nsIUrlClassifierUpdateObserver))
-          return this;
-        throw Cr.NS_ERROR_NO_INTERFACE;
-      },
-
-      updateUrlRequested: function(aURL) { },
-      streamFinished: function(aStatus) { },
-      updateError: function(aErrorCode) { },
-      updateSuccess: function(aRequestedTimeout) { }
-    };
-
-    try {
-      dbService.beginUpdate(listener, "test-malware-simple,test-phish-simple", "");
-      dbService.beginStream("", "");
-      dbService.updateStream(testUpdate);
-      dbService.finishStream();
-      dbService.finishUpdate();
-    } catch(ex) {}
-
-    this.registerBlackTable("goog-malware-shavar", this.malware);
-    this.maybeToggleUpdateChecking(this.malware);
-
-    this.registerBlackTable("goog-phish-shavar", this.phishing);
-    this.maybeToggleUpdateChecking(this.phishing);
-  },
-
-  _shutdown: function sb_shutdown() {
-    Services.prefs.removeObserver(kPhishWardenEnabledPref, this);
-    Services.prefs.removeObserver(kMalwareWardenEnabledPref, this);
-
-    this.listManager = null;
-  },
-
-  enableBlacklistTableUpdates: function sb_enableBlacklistTableUpdates(aWarden) {
-    for (let i = 0; i < aWarden.blackTables.length; ++i) {
-      this.listManager.enableUpdate(aWarden.blackTables[i]);
-    }
-  },
-
-  disableBlacklistTableUpdates: function sb_disableBlacklistTableUpdates(aWarden) {
-    for (let i = 0; i < aWarden.blackTables.length; ++i) {
-      this.listManager.disableUpdate(aWarden.blackTables[i]);
-    }
-  },
-
-  enableWhitelistTableUpdates: function sb_enableWhitelistTableUpdates(aWarden) {
-    for (let i = 0; i < this.whiteTables.length; ++i) {
-      this.listManager.enableUpdate(this.whiteTables[i]);
-    }
-  },
-
-  disableWhitelistTableUpdates: function sb_disableWhitelistTableUpdates(aWarden) {
-    for (let i = 0; i < aWarden.whiteTables.length; ++i) {
-      this.listManager.disableUpdate(aWarden.whiteTables[i]);
-    }
-  },
-
-  registerBlackTable: function sb_registerBlackTable(aTableName, aWarden) {
-    let result = this.listManager.registerTable(aTableName, false);
-    if (result)
-      aWarden.blackTables.push(aTableName);
-    return result;
-  },
-
-  registerWhiteTable: function sb_registerWhiteTable(aTableName, aWarden) {
-    let result = this.listManager.registerTable(aTableName, false);
-    if (result)
-      aWarden.whiteTables.push(aTableName);
-    return result;
-  },
-
-  maybeToggleUpdateChecking: function sb_maybeToggleUpdateChecking(aWarden) {
-    let enabled = Services.prefs.getBoolPref(aWarden.pref);
-    if (enabled)
-      this.enableBlacklistTableUpdates(aWarden);
-    else
-      this.disableBlacklistTableUpdates(aWarden);
-  }
-}
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SafeBrowsing]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/SessionStore.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/SessionStore.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/SessionStore.idl	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/SessionStore.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +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 "nsISupports.idl"
-
-interface nsIDOMWindow;
-interface nsIDOMNode;
-
-/**
- * nsISessionStore keeps track of the current browsing state.
- *
- * The nsISessionStore API operates mostly on browser windows and the browser
- * tabs contained in them.
- */
-
-[scriptable, uuid(766a09c1-d21b-4bf8-9fe3-8b34b716251a)]
-interface nsISessionStore : nsISupports
-{
-  /**
-   * Get the current browsing state.
-   * @returns a JSON string representing the session state.
-   */
-  AString getBrowserState();
-
-  /**
-   * Get the number of restore-able tabs for a browser window
-   */
-  unsigned long getClosedTabCount(in nsIDOMWindow aWindow);
-
-  /**
-   * Get closed tab data
-   *
-   * @param aWindow is the browser window for which to get closed tab data
-   * @returns a JSON string representing the list of closed tabs.
-   */
-  AString getClosedTabData(in nsIDOMWindow aWindow);
-
-  /**
-   * @param aWindow is the browser window to reopen a closed tab in.
-   * @param aIndex  is the index of the tab to be restored (FIFO ordered).
-   * @returns a reference to the reopened tab.
-   */
-  nsIDOMNode undoCloseTab(in nsIDOMWindow aWindow, in unsigned long aIndex);
-
-  /**
-   * @param aWindow is the browser window associated with the closed tab.
-   * @param aIndex  is the index of the closed tab to be removed (FIFO ordered).
-   */
-  nsIDOMNode forgetClosedTab(in nsIDOMWindow aWindow, in unsigned long aIndex);
-
-  /**
-   * @param aTab is the browser tab to get the value for.
-   * @param aKey is the value's name.
-   * 
-   * @returns A string value or an empty string if none is set.
-   */
-  AString getTabValue(in nsIDOMNode aTab, in AString aKey);
-
-  /**
-   * @param aTab         is the browser tab to set the value for.
-   * @param aKey         is the value's name.
-   * @param aStringValue is the value itself (use JSON.stringify/parse before setting JS objects).
-   */
-  void setTabValue(in nsIDOMNode aTab, in AString aKey, in AString aStringValue);
-
-  /**
-   * @param aTab is the browser tab to get the value for.
-   * @param aKey is the value's name.
-   */
-  void deleteTabValue(in nsIDOMNode aTab, in AString aKey);
-
-  /**
-   * @returns A boolean indicating we should restore previous browser session
-   */
-  boolean shouldRestore();
-
-  /**
-   * Restores the previous browser session using a fast, lightweight strategy
-   * @param aBringToFront should a restored tab be brought to the foreground?
-   */
-  void restoreLastSession(in boolean aBringToFront);
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/SessionStore.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/SessionStore.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/SessionStore.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/SessionStore.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,962 +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/. */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-const Cr = Components.results;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/WindowsPrefSync.jsm");
-
-#ifdef MOZ_CRASHREPORTER
-XPCOMUtils.defineLazyServiceGetter(this, "CrashReporter",
-  "@mozilla.org/xre/app-info;1", "nsICrashReporter");
-#endif
-
-XPCOMUtils.defineLazyModuleGetter(this, "CrashMonitor",
-  "resource://gre/modules/CrashMonitor.jsm");
-
-XPCOMUtils.defineLazyServiceGetter(this, "gUUIDGenerator",
-  "@mozilla.org/uuid-generator;1", "nsIUUIDGenerator");
-
-XPCOMUtils.defineLazyGetter(this, "NetUtil", function() {
-  Cu.import("resource://gre/modules/NetUtil.jsm");
-  return NetUtil;
-});
-
-XPCOMUtils.defineLazyModuleGetter(this, "UITelemetry",
-  "resource://gre/modules/UITelemetry.jsm");
-
-// -----------------------------------------------------------------------
-// Session Store
-// -----------------------------------------------------------------------
-
-const STATE_STOPPED = 0;
-const STATE_RUNNING = 1;
-const STATE_QUITTING = -1;
-
-function SessionStore() { }
-
-SessionStore.prototype = {
-  classID: Components.ID("{8c1f07d6-cba3-4226-a315-8bd43d67d032}"),
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISessionStore,
-                                         Ci.nsIDOMEventListener,
-                                         Ci.nsIObserver,
-                                         Ci.nsISupportsWeakReference]),
-
-  _windows: {},
-  _tabsFromOtherGroups: [],
-  _selectedWindow: 1,
-  _orderedWindows: [],
-  _lastSaveTime: 0,
-  _lastSessionTime: 0,
-  _interval: 10000,
-  _maxTabsUndo: 1,
-  _shouldRestore: false,
-
-  // Tab telemetry variables
-  _maxTabsOpen: 1,
-
-  init: function ss_init() {
-    // Get file references
-    this._sessionFile = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
-    this._sessionFileBackup = this._sessionFile.clone();
-    this._sessionCache = this._sessionFile.clone();
-    this._sessionFile.append("sessionstore.js");
-    this._sessionFileBackup.append("sessionstore.bak");
-    this._sessionCache.append("sessionstoreCache");
-
-    this._loadState = STATE_STOPPED;
-
-    try {
-      UITelemetry.addSimpleMeasureFunction("metro-tabs",
-                                          this._getTabStats.bind(this));
-    } catch (ex) {
-      // swallow exception that occurs if metro-tabs measure is already set up
-    }
-
-    CrashMonitor.previousCheckpoints.then(checkpoints => {
-      let previousSessionCrashed = false;
-
-      if (checkpoints) {
-        // If the previous session finished writing the final state, we'll
-        // assume there was no crash.
-        previousSessionCrashed = !checkpoints["sessionstore-final-state-write-complete"];
-      } else {
-        // If no checkpoints are saved, this is the first run with CrashMonitor or the
-        // metroSessionCheckpoints file was corrupted/deleted, so fallback to defining
-        // a crash as init-ing with an unexpected previousExecutionState
-        // 1 == RUNNING, 2 == SUSPENDED
-        previousSessionCrashed = Services.metro.previousExecutionState == 1 ||
-          Services.metro.previousExecutionState == 2;
-      }
-
-      Services.telemetry.getHistogramById("SHUTDOWN_OK").add(!previousSessionCrashed);
-    });
-
-    try {
-      let shutdownWasUnclean = false;
-
-      if (this._sessionFileBackup.exists()) {
-        this._sessionFileBackup.remove(false);
-        shutdownWasUnclean = true;
-      }
-
-      if (this._sessionFile.exists()) {
-        this._sessionFile.copyTo(null, this._sessionFileBackup.leafName);
-
-        switch(Services.metro.previousExecutionState) {
-          // 0 == NotRunning
-          case 0:
-            // Disable crash recovery if we have exceeded the timeout
-            this._lastSessionTime = this._sessionFile.lastModifiedTime;
-            let delta = Date.now() - this._lastSessionTime;
-            let timeout =
-              Services.prefs.getIntPref(
-                  "browser.sessionstore.resume_from_crash_timeout");
-            this._shouldRestore = shutdownWasUnclean
-                                && (delta < (timeout * 60000));
-            break;
-          // 1 == Running
-          case 1:
-            // We should never encounter this situation
-            Components.utils.reportError("SessionRestore.init called with "
-                                       + "previous execution state 'Running'");
-            this._shouldRestore = true;
-            break;
-          // 2 == Suspended
-          case 2:
-            // We should never encounter this situation
-            Components.utils.reportError("SessionRestore.init called with "
-                                       + "previous execution state 'Suspended'");
-            this._shouldRestore = true;
-            break;
-          // 3 == Terminated
-          case 3:
-            // Terminated means that Windows terminated our already-suspended
-            // process to get back some resources. When we re-launch, we want
-            // to provide the illusion that our process was suspended the
-            // whole time, and never terminated.
-            this._shouldRestore = true;
-            break;
-          // 4 == ClosedByUser
-          case 4:
-            // ClosedByUser indicates that the user performed a "close" gesture
-            // on our tile. We should act as if the browser closed normally,
-            // even if we were closed from a suspended state (in which case
-            // we'll have determined that it was an unclean shtudown)
-            this._shouldRestore = false;
-            break;
-        }
-      }
-
-      if (!this._sessionCache.exists() || !this._sessionCache.isDirectory()) {
-        this._sessionCache.create(Ci.nsIFile.DIRECTORY_TYPE, 0700);
-      }
-    } catch (ex) {
-      Cu.reportError(ex); // file was write-locked?
-    }
-
-    this._interval = Services.prefs.getIntPref("browser.sessionstore.interval");
-    this._maxTabsUndo = Services.prefs.getIntPref("browser.sessionstore.max_tabs_undo");
-
-    // Disable crash recovery if it has been turned off
-    if (!Services.prefs.getBoolPref("browser.sessionstore.resume_from_crash"))
-      this._shouldRestore = false;
-
-    // Do we need to restore session just this once, in case of a restart?
-    if (Services.prefs.getBoolPref("browser.sessionstore.resume_session_once")) {
-      Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", false);
-      this._shouldRestore = true;
-    }
-  },
-
-  _clearDisk: function ss_clearDisk() {
-    if (this._sessionFile.exists()) {
-      try {
-        this._sessionFile.remove(false);
-      } catch (ex) { dump(ex + '\n'); } // couldn't remove the file - what now?
-    }
-    if (this._sessionFileBackup.exists()) {
-      try {
-        this._sessionFileBackup.remove(false);
-      } catch (ex) { dump(ex + '\n'); } // couldn't remove the file - what now?
-    }
-
-    this._clearCache();
-  },
-
-  _clearCache: function ss_clearCache() {
-    // First, let's get a list of files we think should be active
-    let activeFiles = [];
-    this._forEachBrowserWindow(function(aWindow) {
-      let tabs = aWindow.Browser.tabs;
-      for (let i = 0; i < tabs.length; i++) {
-        let browser = tabs[i].browser;
-        if (browser.__SS_extdata && "thumbnail" in browser.__SS_extdata)
-          activeFiles.push(browser.__SS_extdata.thumbnail);
-      }
-    });
-
-    // Now, let's find the stale files in the cache folder
-    let staleFiles = [];
-    let cacheFiles = this._sessionCache.directoryEntries;
-    while (cacheFiles.hasMoreElements()) {
-      let file = cacheFiles.getNext().QueryInterface(Ci.nsILocalFile);
-      let fileURI = Services.io.newFileURI(file);
-      if (activeFiles.indexOf(fileURI) == -1)
-        staleFiles.push(file);
-    }
-
-    // Remove the stale files in a separate step to keep the enumerator from
-    // messing up if we remove the files as we collect them.
-    staleFiles.forEach(function(aFile) {
-      aFile.remove(false);
-    })
-  },
-
-  _getTabStats: function() {
-    return {
-      currTabCount: this._currTabCount,
-      maxTabCount: this._maxTabsOpen
-    };
-  },
-
-  observe: function ss_observe(aSubject, aTopic, aData) {
-    let self = this;
-    let observerService = Services.obs;
-    switch (aTopic) {
-      case "app-startup":
-        observerService.addObserver(this, "final-ui-startup", true);
-        observerService.addObserver(this, "domwindowopened", true);
-        observerService.addObserver(this, "domwindowclosed", true);
-        observerService.addObserver(this, "browser-lastwindow-close-granted", true);
-        observerService.addObserver(this, "browser:purge-session-history", true);
-        observerService.addObserver(this, "quit-application-requested", true);
-        observerService.addObserver(this, "quit-application-granted", true);
-        observerService.addObserver(this, "quit-application", true);
-        observerService.addObserver(this, "reset-telemetry-vars", true);
-        break;
-      case "final-ui-startup":
-        observerService.removeObserver(this, "final-ui-startup");
-        if (WindowsPrefSync) {
-          // Pulls in Desktop controlled prefs and pushes out Metro controlled prefs
-          WindowsPrefSync.init();
-        }
-        this.init();
-        break;
-      case "domwindowopened":
-        let window = aSubject;
-        window.addEventListener("load", function() {
-          self.onWindowOpen(window);
-          window.removeEventListener("load", arguments.callee, false);
-        }, false);
-        break;
-      case "domwindowclosed": // catch closed windows
-        this.onWindowClose(aSubject);
-        break;
-      case "browser-lastwindow-close-granted":
-        // If a save has been queued, kill the timer and save state now
-        if (this._saveTimer) {
-          this._saveTimer.cancel();
-          this._saveTimer = null;
-          this.saveState();
-        }
-
-        // Freeze the data at what we've got (ignoring closing windows)
-        this._loadState = STATE_QUITTING;
-        break;
-      case "quit-application-requested":
-        // Get a current snapshot of all windows
-        this._forEachBrowserWindow(function(aWindow) {
-          self._collectWindowData(aWindow);
-        });
-        break;
-      case "quit-application-granted":
-        // Get a current snapshot of all windows
-        this._forEachBrowserWindow(function(aWindow) {
-          self._collectWindowData(aWindow);
-        });
-
-        // Freeze the data at what we've got (ignoring closing windows)
-        this._loadState = STATE_QUITTING;
-        break;
-      case "quit-application":
-        // If we are restarting, lets restore the tabs
-        if (aData == "restart") {
-          Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true);
-
-          // Ignore purges when restarting. The notification is fired after "quit-application".
-          Services.obs.removeObserver(this, "browser:purge-session-history");
-        }
-
-        // Freeze the data at what we've got (ignoring closing windows)
-        this._loadState = STATE_QUITTING;
-
-        // No need for this back up, we are shutting down just fine
-        if (this._sessionFileBackup.exists())
-          this._sessionFileBackup.remove(false);
-
-        observerService.removeObserver(this, "domwindowopened");
-        observerService.removeObserver(this, "domwindowclosed");
-        observerService.removeObserver(this, "browser-lastwindow-close-granted");
-        observerService.removeObserver(this, "quit-application-requested");
-        observerService.removeObserver(this, "quit-application-granted");
-        observerService.removeObserver(this, "quit-application");
-        observerService.removeObserver(this, "reset-telemetry-vars");
-
-        // If a save has been queued, kill the timer and save state now
-        if (this._saveTimer) {
-          this._saveTimer.cancel();
-          this._saveTimer = null;
-        }
-        this.saveState();
-        break;
-      case "browser:purge-session-history": // catch sanitization
-        this._clearDisk();
-
-        // If the browser is shutting down, simply return after clearing the
-        // session data on disk as this notification fires after the
-        // quit-application notification so the browser is about to exit.
-        if (this._loadState == STATE_QUITTING)
-          return;
-
-        // Clear all data about closed tabs
-        for (let [ssid, win] in Iterator(this._windows))
-          win._closedTabs = [];
-
-        if (this._loadState == STATE_RUNNING) {
-          // Save the purged state immediately
-          this.saveStateNow();
-        }
-        break;
-      case "timer-callback":
-        // Timer call back for delayed saving
-        this._saveTimer = null;
-        this.saveState();
-        break;
-      case "reset-telemetry-vars":
-        // Used in mochitests only.
-        this._maxTabsOpen = 1;
-    }
-  },
-
-  updateTabTelemetryVars: function(window) {
-    this._currTabCount = window.Browser.tabs.length;
-      if (this._currTabCount > this._maxTabsOpen) {
-        this._maxTabsOpen = this._currTabCount;
-      }
-  },
-
-  handleEvent: function ss_handleEvent(aEvent) {
-    let window = aEvent.currentTarget.ownerDocument.defaultView;
-    switch (aEvent.type) {
-      case "load":
-        browser = aEvent.currentTarget;
-        if (aEvent.target == browser.contentDocument && browser.__SS_tabFormData) {
-          browser.messageManager.sendAsyncMessage("SessionStore:restoreSessionTabData", {
-            formdata: browser.__SS_tabFormData.formdata,
-            scroll: browser.__SS_tabFormData.scroll
-          });
-        }
-        break;
-      case "TabOpen":
-        this.updateTabTelemetryVars(window);
-        let browser = aEvent.originalTarget.linkedBrowser;
-        browser.addEventListener("load", this, true);
-      case "TabClose": {
-        let browser = aEvent.originalTarget.linkedBrowser;
-        if (aEvent.type == "TabOpen") {
-          this.onTabAdd(window, browser);
-        }
-        else {
-          this.onTabClose(window, browser);
-          this.onTabRemove(window, browser);
-        }
-        break;
-    }
-      case "TabRemove":
-        this.updateTabTelemetryVars(window);
-        break;
-      case "TabSelect": {
-        let browser = aEvent.originalTarget.linkedBrowser;
-        this.onTabSelect(window, browser);
-        break;
-      }
-    }
-  },
-
-  receiveMessage: function ss_receiveMessage(aMessage) {
-    let browser = aMessage.target;
-    switch (aMessage.name) {
-      case "SessionStore:collectFormdata":
-        browser.__SS_data.formdata = aMessage.json.data;
-        break;
-      case "SessionStore:collectScrollPosition":
-        browser.__SS_data.scroll = aMessage.json.data;
-        break;
-      default:
-        let window = aMessage.target.ownerDocument.defaultView;
-        this.onTabLoad(window, aMessage.target, aMessage);
-        break;
-    }
-  },
-
-  onWindowOpen: function ss_onWindowOpen(aWindow) {
-    // Return if window has already been initialized
-    if (aWindow && aWindow.__SSID && this._windows[aWindow.__SSID])
-      return;
-
-    // Ignore non-browser windows and windows opened while shutting down
-    if (aWindow.document.documentElement.getAttribute("windowtype") != "navigator:browser" || this._loadState == STATE_QUITTING)
-      return;
-
-    // Assign it a unique identifier and create its data object
-    aWindow.__SSID = "window" + gUUIDGenerator.generateUUID().toString();
-    this._windows[aWindow.__SSID] = { tabs: [], selected: 0, _closedTabs: [] };
-    this._orderedWindows.push(aWindow.__SSID);
-
-    // Perform additional initialization when the first window is loading
-    if (this._loadState == STATE_STOPPED) {
-      this._loadState = STATE_RUNNING;
-      this._lastSaveTime = Date.now();
-
-      // Nothing to restore, notify observers things are complete
-      if (!this.shouldRestore()) {
-        this._clearCache();
-        Services.obs.notifyObservers(null, "sessionstore-windows-restored", "");
-      }
-    }
-
-    // Add tab change listeners to all already existing tabs
-    let tabs = aWindow.Browser.tabs;
-    for (let i = 0; i < tabs.length; i++)
-      this.onTabAdd(aWindow, tabs[i].browser, true);
-
-    // Notification of tab add/remove/selection
-    let tabContainer = aWindow.document.getElementById("tabs");
-    tabContainer.addEventListener("TabOpen", this, true);
-    tabContainer.addEventListener("TabClose", this, true);
-    tabContainer.addEventListener("TabRemove", this, true);
-    tabContainer.addEventListener("TabSelect", this, true);
-  },
-
-  onWindowClose: function ss_onWindowClose(aWindow) {
-    // Ignore windows not tracked by SessionStore
-    if (!aWindow.__SSID || !this._windows[aWindow.__SSID])
-      return;
-
-    let tabContainer = aWindow.document.getElementById("tabs");
-    tabContainer.removeEventListener("TabOpen", this, true);
-    tabContainer.removeEventListener("TabClose", this, true);
-    tabContainer.removeEventListener("TabRemove", this, true);
-    tabContainer.removeEventListener("TabSelect", this, true);
-
-    if (this._loadState == STATE_RUNNING) {
-      // Update all window data for a last time
-      this._collectWindowData(aWindow);
-
-      // Clear this window from the list
-      delete this._windows[aWindow.__SSID];
-
-      // Save the state without this window to disk
-      this.saveStateDelayed();
-    }
-
-    let tabs = aWindow.Browser.tabs;
-    for (let i = 0; i < tabs.length; i++)
-      this.onTabRemove(aWindow, tabs[i].browser, true);
-
-    delete aWindow.__SSID;
-  },
-
-  onTabAdd: function ss_onTabAdd(aWindow, aBrowser, aNoNotification) {
-    aBrowser.messageManager.addMessageListener("pageshow", this);
-    aBrowser.messageManager.addMessageListener("Content:SessionHistory", this);
-    aBrowser.messageManager.addMessageListener("SessionStore:collectFormdata", this);
-    aBrowser.messageManager.addMessageListener("SessionStore:collectScrollPosition", this);
-
-    if (!aNoNotification)
-      this.saveStateDelayed();
-    this._updateCrashReportURL(aWindow);
-  },
-
-  onTabRemove: function ss_onTabRemove(aWindow, aBrowser, aNoNotification) {
-    aBrowser.messageManager.removeMessageListener("pageshow", this);
-    aBrowser.messageManager.removeMessageListener("Content:SessionHistory", this);
-    aBrowser.messageManager.removeMessageListener("SessionStore:collectFormdata", this);
-    aBrowser.messageManager.removeMessageListener("SessionStore:collectScrollPosition", this);
-
-    // If this browser is being restored, skip any session save activity
-    if (aBrowser.__SS_restore)
-      return;
-
-    delete aBrowser.__SS_data;
-
-    if (!aNoNotification)
-      this.saveStateDelayed();
-  },
-
-  onTabClose: function ss_onTabClose(aWindow, aBrowser) {
-    if (this._maxTabsUndo == 0)
-      return;
-
-    if (aWindow.Browser.tabs.length > 0) {
-      // Bundle this browser's data and extra data and save in the closedTabs
-      // window property
-      //
-      // NB: The access to aBrowser.__SS_extdata throws during automation (in
-      // browser_msgmgr_01). See bug 888736.
-      let data = aBrowser.__SS_data;
-      if (!data) {
-        return; // Cannot restore an empty tab.
-      }
-      try { data.extData = aBrowser.__SS_extdata; } catch (e) { }
-
-      this._windows[aWindow.__SSID]._closedTabs.unshift({ state: data });
-      let length = this._windows[aWindow.__SSID]._closedTabs.length;
-      if (length > this._maxTabsUndo)
-        this._windows[aWindow.__SSID]._closedTabs.splice(this._maxTabsUndo, length - this._maxTabsUndo);
-    }
-  },
-
-  onTabLoad: function ss_onTabLoad(aWindow, aBrowser, aMessage) {
-    // If this browser is being restored, skip any session save activity
-    if (aBrowser.__SS_restore)
-      return;
-
-    // Ignore a transient "about:blank"
-    if (!aBrowser.canGoBack && aBrowser.currentURI.spec == "about:blank")
-      return;
-
-    if (aMessage.name == "Content:SessionHistory") {
-      delete aBrowser.__SS_data;
-      this._collectTabData(aBrowser, aMessage.json);
-    }
-
-    // Save out the state as quickly as possible
-    if (aMessage.name == "pageshow")
-      this.saveStateNow();
-
-    this._updateCrashReportURL(aWindow);
-  },
-
-  onTabSelect: function ss_onTabSelect(aWindow, aBrowser) {
-    if (this._loadState != STATE_RUNNING)
-      return;
-
-    let index = aWindow.Elements.browsers.selectedIndex;
-    this._windows[aWindow.__SSID].selected = parseInt(index) + 1; // 1-based
-
-    // Restore the resurrected browser
-    if (aBrowser.__SS_restore) {
-      let data = aBrowser.__SS_data;
-      if (data.entries.length > 0) {
-        let json = {
-          uri: data.entries[data.index - 1].url,
-          flags: null,
-          entries: data.entries,
-          index: data.index
-        };
-        aBrowser.messageManager.sendAsyncMessage("WebNavigation:LoadURI", json);
-      }
-
-      delete aBrowser.__SS_restore;
-    }
-
-    this._updateCrashReportURL(aWindow);
-  },
-
-  saveStateDelayed: function ss_saveStateDelayed() {
-    if (!this._saveTimer) {
-      // Interval until the next disk operation is allowed
-      let minimalDelay = this._lastSaveTime + this._interval - Date.now();
-
-      // If we have to wait, set a timer, otherwise saveState directly
-      let delay = Math.max(minimalDelay, 2000);
-      if (delay > 0) {
-        this._saveTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-        this._saveTimer.init(this, delay, Ci.nsITimer.TYPE_ONE_SHOT);
-      } else {
-        this.saveState();
-      }
-    }
-  },
-
-  saveStateNow: function ss_saveStateNow() {
-    // Kill any queued timer and save immediately
-    if (this._saveTimer) {
-      this._saveTimer.cancel();
-      this._saveTimer = null;
-    }
-    this.saveState();
-  },
-
-  saveState: function ss_saveState() {
-    let data = this._getCurrentState();
-    // sanity check before we overwrite the session file
-    if (data.windows && data.windows.length && data.selectedWindow) {
-      this._writeFile(this._sessionFile, JSON.stringify(data));
-
-      this._lastSaveTime = Date.now();
-    } else {
-      dump("SessionStore: Not saving state with invalid data: " + JSON.stringify(data) + "\n");
-    }
-  },
-
-  _getCurrentState: function ss_getCurrentState() {
-    let self = this;
-    this._forEachBrowserWindow(function(aWindow) {
-      self._collectWindowData(aWindow);
-    });
-
-    let data = { windows: [] };
-    for (let i = 0; i < this._orderedWindows.length; i++)
-      data.windows.push(this._windows[this._orderedWindows[i]]);
-    data.selectedWindow = this._selectedWindow;
-    return data;
-  },
-
-  _collectTabData: function ss__collectTabData(aBrowser, aHistory) {
-    // If this browser is being restored, skip any session save activity
-    if (aBrowser.__SS_restore)
-      return;
-
-    aHistory = aHistory || { entries: [{ url: aBrowser.currentURI.spec, title: aBrowser.contentTitle }], index: 1 };
-
-    let tabData = {};
-    tabData.entries = aHistory.entries;
-    tabData.index = aHistory.index;
-    tabData.attributes = { image: aBrowser.mIconURL };
-
-    aBrowser.__SS_data = tabData;
-  },
-
-  _getTabData: function(aWindow) {
-    return aWindow.Browser.tabs
-      .filter(tab => !tab.isPrivate && tab.browser.__SS_data)
-      .map(tab => {
-        let browser = tab.browser;
-        let tabData = browser.__SS_data;
-        if (browser.__SS_extdata)
-          tabData.extData = browser.__SS_extdata;
-        return tabData;
-      });
-  },
-
-  _collectWindowData: function ss__collectWindowData(aWindow) {
-    // Ignore windows not tracked by SessionStore
-    if (!aWindow.__SSID || !this._windows[aWindow.__SSID])
-      return;
-
-    let winData = this._windows[aWindow.__SSID];
-
-    let index = aWindow.Elements.browsers.selectedIndex;
-    winData.selected = parseInt(index) + 1; // 1-based
-
-    let tabData = this._getTabData(aWindow);
-    winData.tabs = tabData.concat(this._tabsFromOtherGroups);
-  },
-
-  _forEachBrowserWindow: function ss_forEachBrowserWindow(aFunc) {
-    let windowsEnum = Services.wm.getEnumerator("navigator:browser");
-    while (windowsEnum.hasMoreElements()) {
-      let window = windowsEnum.getNext();
-      if (window.__SSID && !window.closed)
-        aFunc.call(this, window);
-    }
-  },
-
-  _writeFile: function ss_writeFile(aFile, aData) {
-    let stateString = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString);
-    stateString.data = aData;
-    Services.obs.notifyObservers(stateString, "sessionstore-state-write", "");
-
-    // Don't touch the file if an observer has deleted all state data
-    if (!stateString.data)
-      return;
-
-    // Initialize the file output stream.
-    let ostream = Cc["@mozilla.org/network/safe-file-output-stream;1"].createInstance(Ci.nsIFileOutputStream);
-    ostream.init(aFile, 0x02 | 0x08 | 0x20, 0600, ostream.DEFER_OPEN);
-
-    // Obtain a converter to convert our data to a UTF-8 encoded input stream.
-    let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Ci.nsIScriptableUnicodeConverter);
-    converter.charset = "UTF-8";
-
-    // Asynchronously copy the data to the file.
-    let istream = converter.convertToInputStream(aData);
-    NetUtil.asyncCopy(istream, ostream, function(rc) {
-      if (Components.isSuccessCode(rc)) {
-        if (Services.startup.shuttingDown) {
-          Services.obs.notifyObservers(null, "sessionstore-final-state-write-complete", "");
-        }
-        Services.obs.notifyObservers(null, "sessionstore-state-write-complete", "");
-      }
-    });
-  },
-
-  _updateCrashReportURL: function ss_updateCrashReportURL(aWindow) {
-#ifdef MOZ_CRASHREPORTER
-    try {
-      let currentURI = aWindow.Browser.selectedBrowser.currentURI.clone();
-      // if the current URI contains a username/password, remove it
-      try {
-        currentURI.userPass = "";
-      }
-      catch (ex) { } // ignore failures on about: URIs
-
-      CrashReporter.annotateCrashReport("URL", currentURI.spec);
-    }
-    catch (ex) {
-      // don't make noise when crashreporter is built but not enabled
-      if (ex.result != Components.results.NS_ERROR_NOT_INITIALIZED)
-        Components.utils.reportError("SessionStore:" + ex);
-    }
-#endif
-  },
-
-  getBrowserState: function ss_getBrowserState() {
-    let data = this._getCurrentState();
-    return JSON.stringify(data);
-  },
-
-  getClosedTabCount: function ss_getClosedTabCount(aWindow) {
-    if (!aWindow || !aWindow.__SSID)
-      return 0; // not a browser window, or not otherwise tracked by SS.
-
-    return this._windows[aWindow.__SSID]._closedTabs.length;
-  },
-
-  getClosedTabData: function ss_getClosedTabData(aWindow) {
-    if (!aWindow.__SSID)
-      throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG);
-
-    return JSON.stringify(this._windows[aWindow.__SSID]._closedTabs);
-  },
-
-  undoCloseTab: function ss_undoCloseTab(aWindow, aIndex) {
-    if (!aWindow.__SSID)
-      throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG);
-
-    let closedTabs = this._windows[aWindow.__SSID]._closedTabs;
-    if (!closedTabs)
-      return null;
-
-    // default to the most-recently closed tab
-    aIndex = aIndex || 0;
-    if (!(aIndex in closedTabs))
-      throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG);
-
-    // fetch the data of closed tab, while removing it from the array
-    let closedTab = closedTabs.splice(aIndex, 1).shift();
-
-    // create a new tab and bring to front
-    let tab = aWindow.Browser.addTab(closedTab.state.entries[closedTab.state.index - 1].url, true);
-
-    tab.browser.messageManager.sendAsyncMessage("WebNavigation:LoadURI", {
-      uri: closedTab.state.entries[closedTab.state.index - 1].url,
-      flags: null,
-      entries: closedTab.state.entries,
-      index: closedTab.state.index
-    });
-
-    // Put back the extra data
-    tab.browser.__SS_extdata = closedTab.extData;
-
-    return tab.chromeTab;
-  },
-
-  forgetClosedTab: function ss_forgetClosedTab(aWindow, aIndex) {
-    if (!aWindow.__SSID)
-      throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG);
-
-    let closedTabs = this._windows[aWindow.__SSID]._closedTabs;
-
-    // default to the most-recently closed tab
-    aIndex = aIndex || 0;
-    if (!(aIndex in closedTabs))
-      throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG);
-
-    // remove closed tab from the array
-    closedTabs.splice(aIndex, 1);
-  },
-
-  getTabValue: function ss_getTabValue(aTab, aKey) {
-    let browser = aTab.linkedBrowser;
-    let data = browser.__SS_extdata || {};
-    return data[aKey] || "";
-  },
-
-  setTabValue: function ss_setTabValue(aTab, aKey, aStringValue) {
-    let browser = aTab.linkedBrowser;
-
-    // Thumbnails are actually stored in the cache, so do the save and update the URI
-    if (aKey == "thumbnail") {
-      let file = this._sessionCache.clone();
-      file.append("thumbnail-" + browser.contentWindowId);
-      file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0600);
-
-      let source = Services.io.newURI(aStringValue, "UTF8", null);
-      let target = Services.io.newFileURI(file)
-
-      let persist = Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"].createInstance(Ci.nsIWebBrowserPersist);
-      persist.persistFlags = Ci.nsIWebBrowserPersist.PERSIST_FLAGS_REPLACE_EXISTING_FILES | Ci.nsIWebBrowserPersist.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
-      persist.saveURI(source, null, null, 0, null, null, file);
-
-      aStringValue = target.spec;
-    }
-
-    if (!browser.__SS_extdata)
-      browser.__SS_extdata = {};
-    browser.__SS_extdata[aKey] = aStringValue;
-    this.saveStateDelayed();
-  },
-
-  deleteTabValue: function ss_deleteTabValue(aTab, aKey) {
-    let browser = aTab.linkedBrowser;
-    if (browser.__SS_extdata && browser.__SS_extdata[aKey])
-      delete browser.__SS_extdata[aKey];
-    else
-      throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG);
-  },
-
-  shouldRestore: function ss_shouldRestore() {
-    return this._shouldRestore || (3 == Services.prefs.getIntPref("browser.startup.page"));
-  },
-
-  restoreLastSession: function ss_restoreLastSession(aBringToFront) {
-    let self = this;
-    function notifyObservers(aMessage) {
-      self._clearCache();
-      Services.obs.notifyObservers(null, "sessionstore-windows-restored", aMessage || "");
-    }
-
-    // The previous session data has already been renamed to the backup file
-    if (!this._sessionFileBackup.exists()) {
-      notifyObservers("fail")
-      return;
-    }
-
-    try {
-      let channel = NetUtil.newChannel2(this._sessionFileBackup,
-                                        null,
-                                        null,
-                                        null,      // aLoadingNode
-                                        Services.scriptSecurityManager.getSystemPrincipal(),
-                                        null,      // aTriggeringPrincipal
-                                        Ci.nsILoadInfo.SEC_NORMAL,
-                                        Ci.nsIContentPolicy.TYPE_OTHER);
-
-      channel.contentType = "application/json";
-      NetUtil.asyncFetch(channel, function(aStream, aResult) {
-        if (!Components.isSuccessCode(aResult)) {
-          Cu.reportError("SessionStore: Could not read from sessionstore.bak file");
-          notifyObservers("fail");
-          return;
-        }
-
-        // Read session state file into a string and let observers modify the state before it's being used
-        let state = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString);
-        state.data = NetUtil.readInputStreamToString(aStream, aStream.available(), { charset : "UTF-8" }) || "";
-        aStream.close();
-
-        Services.obs.notifyObservers(state, "sessionstore-state-read", "");
-
-        let data = null;
-        try {
-          data = JSON.parse(state.data);
-        } catch (ex) {
-          Cu.reportError("SessionStore: Could not parse JSON: " + ex);
-        }
-
-        if (!data || data.windows.length == 0) {
-          notifyObservers("fail");
-          return;
-        }
-
-        let window = Services.wm.getMostRecentWindow("navigator:browser");
-
-        if (typeof data.selectedWindow == "number") {
-          this._selectedWindow = data.selectedWindow;
-        }
-        let windowIndex = this._selectedWindow - 1;
-        let tabs = data.windows[windowIndex].tabs;
-        let selected = data.windows[windowIndex].selected;
-
-        let currentGroupId;
-        try {
-          currentGroupId = JSON.parse(data.windows[windowIndex].extData["tabview-groups"]).activeGroupId;
-        } catch (ex) { /* currentGroupId is undefined if user has no tab groups */ }
-
-        // Move all window data from sessionstore.js to this._windows.
-        this._orderedWindows = [];
-        for (let i = 0; i < data.windows.length; i++) {
-          let SSID;
-          if (i != windowIndex) {
-            SSID = "window" + gUUIDGenerator.generateUUID().toString();
-            this._windows[SSID] = data.windows[i];
-          } else {
-            SSID = window.__SSID;
-            this._windows[SSID].extData = data.windows[i].extData;
-            this._windows[SSID]._closedTabs =
-              this._windows[SSID]._closedTabs.concat(data.windows[i]._closedTabs);
-          }
-          this._orderedWindows.push(SSID);
-        }
-
-        if (selected > tabs.length) // Clamp the selected index if it's bogus
-          selected = 1;
-
-        for (let i=0; i<tabs.length; i++) {
-          let tabData = tabs[i];
-          let tabGroupId = (typeof currentGroupId == "number") ?
-            JSON.parse(tabData.extData["tabview-tab"]).groupID : null;
-
-          if (tabGroupId && tabGroupId != currentGroupId) {
-            this._tabsFromOtherGroups.push(tabData);
-            continue;
-          }
-
-          // We must have selected tabs as soon as possible, so we let all tabs be selected
-          // until we get the real selected tab. Then we stop selecting tabs. The end result
-          // is that the right tab is selected, but we also don't get a bunch of errors
-          let bringToFront = (i + 1 <= selected) && aBringToFront;
-          let tab = window.Browser.addTab(tabData.entries[tabData.index - 1].url, bringToFront);
-
-          // Start a real load for the selected tab
-          if (i + 1 == selected) {
-            let json = {
-              uri: tabData.entries[tabData.index - 1].url,
-              flags: null,
-              entries: tabData.entries,
-              index: tabData.index
-            };
-            tab.browser.messageManager.sendAsyncMessage("WebNavigation:LoadURI", json);
-          } else {
-            // Make sure the browser has its session data for the delay reload
-            tab.browser.__SS_data = tabData;
-            tab.browser.__SS_restore = true;
-
-            // Restore current title
-            tab.chromeTab.updateTitle(tabData.entries[tabData.index - 1].title);
-          }
-
-          tab.browser.__SS_tabFormData = tabData
-          tab.browser.__SS_extdata = tabData.extData;
-        }
-
-        notifyObservers();
-      }.bind(this));
-    } catch (ex) {
-      Cu.reportError("SessionStore: Could not read from sessionstore.bak file: " + ex);
-      notifyObservers("fail");
-    }
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SessionStore]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/Sidebar.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/Sidebar.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/components/Sidebar.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/components/Sidebar.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +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/. */
-
-const Ci = Components.interfaces;
-const Cc = Components.classes;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-const SIDEBAR_CID = Components.ID("{22117140-9c6e-11d3-aaf1-00805f8a4905}");
-const SIDEBAR_CONTRACTID = "@mozilla.org/sidebar;1";
-
-function Sidebar() {
-  // Depending on if we are in the parent or child, prepare to remote
-  // certain calls
-  var appInfo = Cc["@mozilla.org/xre/app-info;1"];
-  if (!appInfo || appInfo.getService(Ci.nsIXULRuntime).processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT) {
-    // Parent process
-
-    this.inContentProcess = false;
-
-    // Used for wakeups service. FIXME: clean up with bug 593407
-    this.wrappedJSObject = this;
-
-    // Setup listener for child messages. We don't need to call
-    // addMessageListener as the wakeup service will do that for us.
-    this.receiveMessage = function(aMessage) {
-      switch (aMessage.name) {
-        case "Sidebar:AddSearchProvider":
-          this.AddSearchProvider(aMessage.json.descriptionURL);
-      }
-    };
-  } else {
-    // Child process
-
-    this.inContentProcess = true;
-    this.messageManager = Cc["@mozilla.org/childprocessmessagemanager;1"].getService(Ci.nsISyncMessageSender);
-  }
-}
-
-Sidebar.prototype = {
-  // =========================== utility code ===========================
-  _validateSearchEngine: function validateSearchEngine(engineURL, iconURL) {
-    try {
-      // Make sure we're using HTTP, HTTPS, or FTP.
-      if (! /^(https?|ftp):\/\//i.test(engineURL))
-        throw "Unsupported search engine URL";
-    
-      // Make sure we're using HTTP, HTTPS, or FTP and refering to a
-      // .gif/.jpg/.jpeg/.png/.ico file for the icon.
-      if (iconURL &&
-          ! /^(https?|ftp):\/\/.+\.(gif|jpg|jpeg|png|ico)$/i.test(iconURL))
-        throw "Unsupported search icon URL.";
-    } catch(ex) {
-      Cu.reportError("Invalid argument passed to window.sidebar.addSearchEngine: " + ex);
-      
-      var searchBundle = Services.strings.createBundle("chrome://global/locale/search/search.properties");
-      var brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
-      var brandName = brandBundle.GetStringFromName("brandShortName");
-      var title = searchBundle.GetStringFromName("error_invalid_engine_title");
-      var msg = searchBundle.formatStringFromName("error_invalid_engine_msg",
-                                                  [brandName], 1);
-      Services.prompt.alert(null, title, msg);
-      return false;
-    }
-    
-    return true;
-  },
-
-  // The suggestedTitle and suggestedCategory parameters are ignored, but remain
-  // for backward compatibility.
-  addSearchEngine: function addSearchEngine(engineURL, iconURL, suggestedTitle,
-                                            suggestedCategory) {
-    if (!this._validateSearchEngine(engineURL, iconURL))
-      return;
-
-    // File extension for Sherlock search plugin description files
-    const SHERLOCK_FILE_EXT_REGEXP = /\.src$/i;
-
-    // OpenSearch files will likely be far more common than Sherlock files, and
-    // have less consistent suffixes, so we assume that ".src" is a Sherlock
-    // (text) file, and anything else is OpenSearch (XML).
-    var dataType;
-    if (SHERLOCK_FILE_EXT_REGEXP.test(engineURL))
-      dataType = Ci.nsISearchEngine.DATA_TEXT;
-    else
-      dataType = Ci.nsISearchEngine.DATA_XML;
-
-    Services.search.addEngine(engineURL, dataType, iconURL, true);
-  },
-
-  // This function exists to implement window.external.AddSearchProvider(),
-  // to match other browsers' APIs.  The capitalization, although nonstandard here,
-  // is therefore important.
-  AddSearchProvider: function AddSearchProvider(aDescriptionURL) {
-    if (!this._validateSearchEngine(aDescriptionURL, ""))
-      return;
-
-    if (this.inContentProcess) {
-      this.messageManager.sendAsyncMessage("Sidebar:AddSearchProvider",
-        { descriptionURL: aDescriptionURL });
-      return;
-    }
-
-    const typeXML = Ci.nsISearchEngine.DATA_XML;
-    Services.search.addEngine(aDescriptionURL, typeXML, "", true);
-  },
-
-  // This function exists to implement window.external.IsSearchProviderInstalled(),
-  // for compatibility with other browsers.  It will return an integer value
-  // indicating whether the given engine is installed for the current user.
-  // However, it is currently stubbed out due to security/privacy concerns
-  // stemming from difficulties in determining what domain issued the request.
-  // See bug 340604 and
-  // http://msdn.microsoft.com/en-us/library/aa342526%28VS.85%29.aspx .
-  // XXX Implement this!
-  IsSearchProviderInstalled: function IsSearchProviderInstalled(aSearchURL) {
-    return 0;
-  },
-
-  // =========================== nsISupports ===========================
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports]),
-
-  // XPCOMUtils stuff
-  classID: SIDEBAR_CID,
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([Sidebar]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/defs.mk thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/defs.mk
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/defs.mk	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/defs.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-XPI_ROOT_APPID={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/aboutAddons.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/aboutAddons.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/aboutAddons.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/aboutAddons.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +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/. -->
-
-<!ENTITY % brandDTD
-     SYSTEM "chrome://branding/locale/brand.dtd">
-   %brandDTD;
-
-<!ENTITY aboutAddons.title              "&brandShortName; Add-ons are a Work In Progress">
-<!ENTITY aboutAddons.messageTitle       "Uh-Oh!">
-<!ENTITY aboutAddons.message            "Sorry, &brandShortName; is busy working on supporting add-ons for you.">
-<!-- LOCALIZATION NOTE (aboutAddons.goBackToStartStart, aboutAddons.goBacktoStartLink, aboutAddons.goBacktoStartEnd):
-     These three entities form a single sentence. aboutAddons.goBackToStartStart is the start of the sentence,
-     aboutAddons.goBacktoStartLink is a clickable link the middle and aboutAddons.goBacktoStartEnd is the end of the sentence.
-     -->
-<!ENTITY aboutAddons.goBackToStartStart "Go back to the ">
-<!ENTITY aboutAddons.goBacktoStartLink  "&brandShortName; Start Page">
-<!ENTITY aboutAddons.goBacktoStartEnd   ".">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/aboutCertError.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/aboutCertError.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/aboutCertError.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/aboutCertError.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +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/. -->
-
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
-
-<!-- These strings are used by Firefox's custom about:certerror page,
-a replacement for the standard security certificate errors produced
-by NSS/PSM via netError.xhtml. -->
-
-<!ENTITY certerror.pagetitle  "Untrusted Connection">
-<!ENTITY certerror.longpagetitle "This Connection is Untrusted">
-
-<!-- Localization note (certerror.introPara1) - The string "#1" will
-be replaced at runtime with the name of the server to which the user
-was trying to connect. -->
-<!ENTITY certerror.introPara1 "You have asked &brandShortName; to connect
-securely to <b>#1</b>, but we can't confirm that your connection is secure.">
-
-<!ENTITY certerror.whatShouldIDo.heading "What Should I Do?">
-<!ENTITY certerror.whatShouldIDo.content "If you usually connect to
-this site without problems, this error could mean that someone is
-trying to impersonate the site, and you shouldn't continue.">
-<!ENTITY certerror.getMeOutOfHere.label "Get me out of here!">
-
-<!ENTITY certerror.expert.heading "I Understand the Risks">
-<!ENTITY certerror.expert.content "If you understand what's going on, you
-can tell &brandShortName; to start trusting this site's identification.
-<b>Even if you trust the site, this error could mean that someone is
-tampering with your connection.</b>">
-<!ENTITY certerror.expert.contentPara2 "Don't add an exception unless
-you know there's a good reason why this site doesn't use trusted identification.">
-<!ENTITY certerror.addTemporaryException.label "Visit site">
-<!ENTITY certerror.addPermanentException.label "Add permanent exception">
-
-<!ENTITY certerror.technical.heading "Technical Details">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/aboutPanel.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/aboutPanel.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/aboutPanel.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/aboutPanel.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +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/. -->
-
-
-<!ENTITY aboutHeader.title          "About">
-<!ENTITY aboutHeader.product.label  "&brandShortName;">
-<!ENTITY aboutHeader.company.label  "By &vendorShortName;">
-<!ENTITY aboutHeader.policy.label   "Read the &brandShortName; privacy policy online">
-<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.checkingForUpdates  "Checking for updates…">
-<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.checkingAddonCompat "Checking Add-on compatibility…">
-<!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
-<!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
-<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
-<!ENTITY update.otherInstanceHandlingUpdates      "&brandShortName; is being updated by another instance">
-
-<!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
-     update.failed.start, update.failed.linkText, and update.failed.end all go into
-     one line with linkText being wrapped in an anchor that links to a site to download
-     the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
-     one line, try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.failed.start        "Update failed. ">
-<!ENTITY update.failed.linkText     "Download the latest version">
-<!ENTITY update.failed.end          "">
-
-<!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
-     all go into one line and have an anchor in between with text that is the same as the link to a site
-     to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
-     try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.manual.start        "Updates available at ">
-<!ENTITY update.manual.end          "">
-
-<!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
-     update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
-     is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
-     the "em dash" (long dash).
-     example: Downloading update — 111 KB of 13 MB -->
-<!ENTITY update.downloading.start   "Downloading update — ">
-<!ENTITY update.downloading.end     "">
-
-<!ENTITY update.applying            "Applying update…">
-
-<!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
-     channel.description.end create one sentence, with the current channel label inserted in between.
-     example: You are currently on the _Stable_ update channel. -->
-<!ENTITY channel.description.start  "You are currently on the ">
-<!ENTITY channel.description.end    " update channel. ">
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/browser.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/browser.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/browser.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/browser.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +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/. -->
-
-<!-- NAVBAR AND AUTOCOMPLETE -->
-
-<!ENTITY urlbar.emptytext      "Enter Search or Address">
-
-<!ENTITY back.label            "Back">
-<!ENTITY forward.label         "Forward">
-<!ENTITY newtab.label          "New Tab">
-<!ENTITY newPrivateTab.label   "New Private Tab">
-<!ENTITY closetab.label        "Close Tab">
-
-<!ENTITY autocompleteResultsHeader.label  "Your Results">
-
-<!ENTITY appbarErrorConsole.label      "Open error console">
-<!ENTITY appbarJSShell.label           "Open JavaScript shell">
-<!ENTITY appbarFindInPage2.label       "Find in page">
-<!ENTITY appbarRelaunchInDesktop.label "Relaunch in Desktop">
-<!ENTITY appbarMSMetaData2.label       "Get app for this site">
-<!ENTITY appbarViewPageSource.label    "View page source">
-
-<!ENTITY topSitesHeader.label        "Top Sites">
-<!ENTITY bookmarksHeader.label       "Bookmarks">
-<!ENTITY recentHistoryHeader.label   "Recent History">
-<!ENTITY remoteTabsHeader.label      "Tabs from Other Devices">
-
-<!-- LOCALIZATION NOTE (narrowTopSitesHeader.label,
-                        narrowBookmarksHeader.label,
-                        narrowHistoryHeader.label,
-                        narrowRemoteTabsHeader.label )
-     are shortened versions of topSitesHeader.label, bookmarksHeader.label, recentHistoryHeader.label
-     and remoteTabsHeader.label. Need to be two words or shorter to fit in narrow vertical space.
-      -->
-<!ENTITY narrowTopSitesHeader.label      "Top Sites">
-<!ENTITY narrowBookmarksHeader.label     "Bookmarks">
-<!ENTITY narrowRecentHistoryHeader.label "Recent History">
-<!ENTITY narrowRemoteTabsHeader.label    "Remote Tabs">
-
-<!ENTITY downloadsHeader.label     "Downloads">
-<!ENTITY downloadShowPage.label    "Go to Page">
-<!ENTITY downloadShow2.label       "Find">
-<!ENTITY downloadOpen2.label       "Open">
-<!ENTITY downloadCancel.label      "Cancel">
-<!ENTITY downloadPause.label       "Pause">
-<!ENTITY downloadResume.label      "Resume">
-<!ENTITY downloadRetry.label       "Retry">
-<!ENTITY downloadRemove.label      "Remove">
-<!ENTITY downloadDelete.label      "Delete">
-<!ENTITY downloadFailed.label      "Failed">
-
-<!ENTITY allBookmarks.label        "See all bookmarks">
-
-<!ENTITY consoleHeader.label       "Error Console">
-<!ENTITY consoleAll.label          "All">
-<!ENTITY consoleErrors.label       "Errors">
-<!ENTITY consoleWarnings.label     "Warnings">
-<!ENTITY consoleMessages.label     "Messages">
-<!ENTITY consoleCodeEval.label     "Code:">
-<!ENTITY consoleClear.label        "Clear">
-<!ENTITY consoleCopyAll.label      "Copy">
-<!ENTITY consoleEvaluate.label     "…">
-<!ENTITY consoleErrFile.label      "Source File:">
-<!ENTITY consoleErrLine.label      "Line:">
-<!ENTITY consoleErrColumn.label    "Column:">
-<!ENTITY consoleFollowCheckbox.label "Follow">
-
-<!--  TEXT CONTEXT MENU -->
-<!ENTITY contextTextCut.label              "Cut">
-<!ENTITY contextTextCopy.label             "Copy">
-<!ENTITY contextTextPaste.label            "Paste">
-<!-- unique item that is only added to the url bar context menu -->
-<!ENTITY contextTextPasteAndGo.label       "Paste &amp; go">
-<!ENTITY contextTextSelect.label           "Select">
-<!ENTITY contextTextSelectAll.label        "Select all">
-
-<!-- LINK CONTEXT MENU -->
-<!ENTITY contextOpenLinkTab.label          "Open link in new tab">
-<!ENTITY contextCopyLinkHref.label         "Copy link">
-<!ENTITY contextBookmarkLinkHref.label     "Bookmark link">
-
-<!-- IMAGE CONTEXT MENU -->
-<!-- LOCALIZATION NOTE (contextSaveImageLib.label): saves an image to the users "pictures library"
-     (Explorer -> left hand side navigation pane -> Libraries -> Pictures) -->
-<!ENTITY contextSaveImageLib.label         "Save to picture library">
-<!ENTITY contextCopyImage.label            "Copy image">
-<!ENTITY contextCopyImageLocation.label    "Copy image location">
-<!ENTITY contextOpenImageTab.label         "Open image in new tab">
-
-<!-- VIDEO CONTEXT MENU -->
-<!ENTITY contextSaveVideoLib.label         "Save to video library">
-<!ENTITY contextCopyVideoLocation.label    "Copy video location">
-<!ENTITY contextOpenVideoTab.label         "Open video in new tab">
-
-<!-- KEYBOARD SHORTCUTS -->
-<!ENTITY reload.key "r">
-<!ENTITY focusURL.key "l">
-<!ENTITY urlbar.accesskey "d">
-<!ENTITY openFile.key "o">
-<!ENTITY savePage.key "s">
-<!ENTITY find.key "f">
-<!ENTITY findNext.key "g">
-<!ENTITY quit.key "q">
-<!ENTITY addBookmark.key "d">
-<!ENTITY newTab.key "t">
-<!ENTITY newTab2.key "n">
-<!ENTITY closeTab.key "w">
-<!-- Private browsing (control+shift+key) -->
-<!ENTITY newPrivateTab.key "p">
-
-<!-- DEVELOPER SHORTCUTS (control+shift+key) -->
-<!ENTITY jsConsole.key "j">
-<!ENTITY optionsFlyout.key "o">
-<!ENTITY syncFlyout.key "s">
-<!ENTITY aboutFlyout.key "a">
-
-<!-- FIRT RUN EXPERIENCE -->
-<!-- LOCALIZATION NOTE (firstRunTabs.label,
-                        firstRunTopSites.label,
-                        firstRunBookmarks.label,
-                        firstRunMenu.label,
-                        firstRunHistory.label )
-     These strings appear on the Firefox Start page the first time
-     Firefox for Windows 8 Touch (Metro) is launched.  Each one
-     has an arrow pointing toward the feature it references.
-     -->
-<!ENTITY firstRunTabs.label "Looking for your tabs? Just pull down or right-click">
-<!ENTITY firstRunTopSites.label "Go to the sites you visit most">
-<!ENTITY firstRunBookmarks.label "Find pages you've saved for later">
-<!ENTITY firstRunMenu.label "Access more features and options">
-<!ENTITY firstRunHistory.label "See where you've been on the Web">
-<!ENTITY firstRunWelcome.label "Welcome to &brandShortName;">
-<!ENTITY firstRunDifferent.label "Different by design">
-
-  <!-- LOCALIZATION NOTE (firstRunBack.label,
-                          firstRunNewTab.label,
-                          firstRunStar.label,
-                          firstRunPin.label,
-                          firstRunGotIt.label )
-       These strings appear as a content overlay the first time a page
-       is visited. Each one has an arrow pointing toward the feature it
-       references.
-       -->
-<!ENTITY firstRunBack.label "Tap to go back to the previous page">
-<!ENTITY firstRunNewTab.label "Add a new tab to explore a new site">
-<!ENTITY firstRunStar.label "Use bookmarks to save pages for later">
-<!ENTITY firstRunPin.label "Pin any site to your Windows Start screen for quick access">
-<!ENTITY firstRunGotIt.label "Got it!">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/browser.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/browser.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/browser.properties	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/browser.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +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/.
-
-# LOCALIZATION NOTE : FILE Capitalized phrases like "Top Sites", "Bookmarks",
-# and "Recent History" are typically used as proper noun phrases to refer to
-# the specific visual set (usually displayed as a grid) of top sites,
-# bookmarks, etc. displayed on screen, rather than those concepts in general.
-# Buttons (like with contextAppbar2.pin.topSites) refer to actions against
-# the specific on-screen sets with similarly-named headings.
-
-# LOCALIZATION NOTE (browser.search.contextTextSearchLabel2): search context
-# menu item text will be: |Search (browser.search.defaultenginename) for "string"|
-# browser.search.defaultenginename is defined in region.properties
-browser.search.contextTextSearchLabel2=Search %S for "%S"
-
-# Contextual Appbar - Button Labels
-
-contextAppbar2.pin.topSites=Pin to Top Sites
-contextAppbar2.pin.bookmarks=Pin to Bookmarks
-contextAppbar2.pin.recentHistory=Pin to Recent History
-contextAppbar2.pin.downloads=Pin to Downloads
-
-contextAppbar2.unpin.topSites=Unpin from Top Sites
-contextAppbar2.hide.bookmarks=Hide Bookmark
-contextAppbar2.hide.recentHistory=Hide
-contextAppbar2.unpin.downloads=Unpin from Downloads
-
-# LOCALIZATION NOTE (contextAppbar2.delete): Deletes selected pages.
-contextAppbar2.delete=Delete
-
-# LOCALIZATION NOTE (contextAppbar2.restore): Undoes a previous deletion.
-# Button with this label only appears immediately after a deletion.
-contextAppbar2.restore=Undo delete
-
-# LOCALIZATION NOTE (contextAppbar2.clear): Unselects pages without modification.
-contextAppbar2.clear=Clear selection
-
-# Clear private data
-clearPrivateData.clearButton=Clear
-clearPrivateData.title2=Clear private data
-# LOCALIZATION NOTE (clearPrivateData.message3): "Options" is the optionsCharm.
-clearPrivateData.message3=This will permanently delete the private data you have selected in "Options".
-
-# Settings Charms
-aboutCharm1=About
-optionsCharm=Options
-searchCharm=Search
-feedbackCharm=Feedback (online)
-helpOnlineCharm=Help (online)
-
-# General
-# LOCALIZATION NOTE (browserForSaveLocation): Title for the "Save..." file picker dialog
-browserForSaveLocation=Save Location
-# LOCALIZATION NOTE (browserForSaveLocation): Title for the "Open..." file picker dialog
-browserForOpenLocation=Open Location
-
-# Download Manager
-downloadsUnknownSize=Unknown size
-downloadOpen=Open
-downloadSave=Save
-downloadCancel=Cancel
-downloadTryAgain=Try Again
-downloadOpenNow=Open it now
-# LOCALIZATION NOTE (downloadShowInFiles): 'Files' refers to the Windows 8 file explorer
-downloadShowInFiles=Show in Files
-
-# Alerts
-alertLinkBookmarked=Bookmark added
-alertDownloads=Downloads
-alertDownloadsStart=Downloading: %S
-alertDownloadsDone=%S has finished downloading
-# LOCALIZATION NOTE (alertDownloadsStart2): Used in a notification bar for download progress
-# #1 is the file name, #2 is the amount downloaded so far / total amount to download, and #3 is seconds remaining.
-alertDownloadsStart2=Downloading #1, #2, #3
-alertDownloadsDone2=%S has been downloaded
-alertTapToSave=Tap to save this file.
-alertDownloadsSize=Download too big
-alertDownloadsNoSpace=Not enough storage space
-# LOCALIZATION NOTE (alertDownloadSave2): #1 is the file name, #2 is the file size, #3 is the file host
-alertDownloadSave2=Do you want to open or save #1 (#2) from #3?
-# LOCALIZATION NOTE (alertDownloadMultiple): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 is the number of files, #2 is (amount downloaded so far / total amount to download) and #3 is seconds remaining
-alertDownloadMultiple=Downloading one file, #2, #3;Downloading #1 files, #2, #3
-# LOCALIZATION NOTE (alertMultipleDownloadsComplete): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 is the number of downloads completed
-alertMultipleDownloadsComplete=One download has been completed;#1 downloads have been completed
-alertDownloadFailed=Sorry, downloading %S failed.
-
-# Popup Blocker
-# LOCALIZATION NOTE (popupWarning.message): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 is brandShortName and #2 is the number of pop-ups blocked.
-popupWarning.message=#1 prevented this site from opening a pop-up window.;#1 prevented this site from opening #2 pop-up windows.
-popupButtonAllowOnce2=Allow once
-popupButtonAlwaysAllow3=Always allow
-popupButtonNeverWarn3=Never allow
-
-# ContentPermissionsPrompt
-contentPermissions.alwaysForSite=Always for this site
-contentPermissions.neverForSite=Never for this site
-
-# Geolocation UI
-# LOCALIZATION NOTE (geolocation2.allow): If you're having trouble with the
-# word Share, please use Allow and Block in your language.
-geolocation2.allow=Share location
-
-# LOCALIZATION NOTE (geolocation2.wantsTo offlineApps.wantsTo):
-# %S is the domain name of the web site.
-geolocation2.wantsTo=Share your location with %S?
-
-geolocation.learnMore=Learn more…
-
-# Error Console
-typeError=Error:
-typeWarning=Warning:
-
-# Offline web applications
-offlineApps.allow=Allow
-offlineApps.wantsTo=%S wants to store data on your device for offline use.
-
-tabs.emptyTabTitle=New Tab
-
-# Open Search
-# LOCALIZATION NOTE (opensearch.search.header): %S is the word or phrase
-# typed by the user in the urlbar to search
-opensearch.search.header=Search for “%S” on:
-
-# Check for Updates in the About Panel - button labels and accesskeys
-# LOCALIZATION NOTE - all of the following update buttons labels will only be
-# displayed one at a time. So, if a button is displayed nothing else will
-# be displayed alongside of the button. The button when displayed is located
-# directly under the Firefox version in the about dialog (see bug 596813 for
-# screenshots).
-update.checkInsideButton.label=Check for Updates
-update.checkInsideButton.accesskey=C
-update.resumeButton.label=Resume Downloading %S…
-update.resumeButton.accesskey=D
-update.openUpdateUI.applyButton.label=Apply Update…
-update.openUpdateUI.applyButton.accesskey=A
-update.restart.updateButton.label=Restart to Update
-update.restart.updateButton.accesskey=R
-update.openUpdateUI.upgradeButton.label=Upgrade Now…
-update.openUpdateUI.upgradeButton.accesskey=U
-update.restart.upgradeButton.label=Upgrade Now
-update.restart.upgradeButton.accesskey=U
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/checkbox.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/checkbox.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/checkbox.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/checkbox.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +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/. -->
-
-<!ENTITY checkbox.on.label    "On">
-<!ENTITY checkbox.off.label     "Off">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/config.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/config.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/config.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/config.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +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/. -->
-
-<!ENTITY empty.label            "Search">
-<!ENTITY addpref.name           "Name">
-
-<!ENTITY cancel.label           "Cancel">
-<!ENTITY toggle.label           "Toggle">
-
-<!ENTITY integer.label          "Integer">
-<!ENTITY string.label           "String">
-<!ENTITY boolean.label          "Boolean">
-
-<!ENTITY string.placeholder     "Enter a string">
-<!ENTITY number.placeholder     "Enter a number">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/config.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/config.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/config.properties	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/config.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +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/.
-
-newPref.createButton=Create
-newPref.privateButton=Private
-newPref.changeButton=Change
-
-pref.toggleButton=Toggle
-pref.resetButton=Reset
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/crashprompt.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/crashprompt.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/crashprompt.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/crashprompt.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +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/. -->
-
-
-<!ENTITY crashprompt.title           "Would you like to send Mozilla crash reports?">
-<!ENTITY crashprompt.message         "We are sorry, &brandShortName; just recovered from a crash. Sending crash reports will help Mozilla make &brandShortName; more stable and secure. You can always change your preference in Settings/Options.">
-<!ENTITY crashprompt.detailsLink     "What's in a crash report?">
-<!ENTITY crashprompt.detailedMessage.firstParagraph "A crash report contains some details about the crash, your machine, as well as a snapshot of the state of your browser when it crashed.">
-<!ENTITY crashprompt.detailedMessage.secondParagraph "This may include things like open pages, text typed into forms and the content of open messages, recent browsing history, or geolocation shared with a site.">
-<!-- LOCALIZATION NOTE (crashprompt.detailedMessage.thirdParagraphBeforeLink, crashprompt.privacyPolicyLink, crashprompt.detailedMessage.thirdParagraphAfterLink):
-     These three entities form a single sentence. crashprompt.detailedMessage.thirdParagraphBeforeLink is the start of the sentence,
-     crashprompt.privacyPolicyLink is a clickable link the middle and crashprompt.detailedMessage.thirdParagraphAfterLink is the end of the sentence.
-     -->
-<!ENTITY crashprompt.detailedMessage.thirdParagraphBeforeLink "We use crash reports to try to fix problems and improve our products. We handle your information as we describe in our ">
-<!ENTITY crashprompt.privacyPolicyLink "&brandShortName; privacy policy">
-<!ENTITY crashprompt.detailedMessage.thirdParagraphAfterLink ".">
-<!ENTITY crashprompt.includeURLLabel "Include the address of the page I was on">
-<!ENTITY crashprompt.acceptbutton    "Send reports">
-<!ENTITY crashprompt.refusebutton    "Don't send">
-<!ENTITY crashprompt.privacyPolicy.title "&brandShortName; privacy policy">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/passwordmgr.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/passwordmgr.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/passwordmgr.properties	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/passwordmgr.properties	1970-01-01 00:00:00.000000000 +0000
@@ -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/.
-
-rememberPassword = Use Password Manager to remember this password.
-savePasswordTitle = Confirm
-# 1st string is product name, 2nd is the username for the login, 3rd is the
-#   login's hostname. Note that long usernames may be truncated.
-saveLoginText = Do you want %1$S to remember the password for "%2$S" on %3$S?
-# 1st string is product name, 2nd is the login's hostname
-saveLoginTextNoUsername = Do you want %1$S to remember this password on %2$S?
-notifyBarNotForThisSiteButtonText = Not for this site
-notifyBarNotForThisSiteButtonAccessKey =
-notifyBarRememberPasswordButtonText = Remember password
-notifyBarRememberPasswordButtonAccessKey =
-passwordChangeTitle = Confirm Password Change
-passwordChangeText = Would you like to change the stored password for %S?
-passwordChangeTextNoUser = Would you like to change the stored password for this login?
-notifyBarChangeButtonText = Change
-notifyBarChangeButtonAccessKey =
-notifyBarDontChangeButtonText2 = Don't change
-notifyBarDontChangeButtonAccessKey =
-userSelectText = Please confirm which user you are changing the password for
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/phishing.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/phishing.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/phishing.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/phishing.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +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/. -->
-
-<!ENTITY safeb.palm.accept.label "Get me out of here!">
-<!ENTITY safeb.palm.decline.label "Ignore this warning">
-<!ENTITY safeb.palm.notforgery.label2 "This isn't a web forgery…">
-<!ENTITY safeb.palm.reportPage.label "Why was this page blocked?">
-
-<!ENTITY safeb.blocked.malwarePage.title "Reported Attack Page!">
-<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
-<!ENTITY safeb.blocked.malwarePage.shortDesc "This web page at <span id='malware_sitename'/> has been reported as an attack page and has been blocked based on your security preferences.">
-<!ENTITY safeb.blocked.malwarePage.longDesc "<p>Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.</p><p>Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.</p>">
-
-<!ENTITY safeb.blocked.phishingPage.title2 "Suspected Web Forgery!">
-<!ENTITY safeb.blocked.phishingPage.shortDesc2 "Entering any personal information on this page may result in identity theft or other fraud.">
-<!ENTITY safeb.blocked.phishingPage.longDesc2 "<p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/preferences.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/preferences.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/preferences.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/preferences.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +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/. -->
-
-<!-- ## Sync Flyout Panel ## -->
-<!-- see sync.dtd -->
-
-<!-- ## Options Flyout Panel ## -->
-<!ENTITY optionsHeader.title                                     "Options">
-<!ENTITY optionsHeader.char.title                                "Character Encoding">
-<!ENTITY optionsHeader.char.autodetect.label                     "Auto-detect">
-<!ENTITY optionsHeader.char.options.label                        "Show encoding options on the App Bar">
-
-<!ENTITY clearPrivateData.title                                  "Clear Private Data">
-<!ENTITY clearPrivateData.label                                  "Clear your browsing history, passwords, cookies, and form data on this device">
-<!ENTITY clearPrivateData.button                                 "Clear">
-<!ENTITY clearPrivateData.done                                   "Done!">
-<!ENTITY clearPrivateData.history                                "Browsing history">
-<!ENTITY clearPrivateData.otherdata                              "Other data (passwords, cache, cookies, etc)">
-<!ENTITY clearPrivateData.downloadHist                           "Download history">
-<!ENTITY clearPrivateData.cookies                                "Cookies">
-<!ENTITY clearPrivateData.cache                                  "Cache">
-<!ENTITY clearPrivateData.sitePref                               "Site preferences">
-<!ENTITY clearPrivateData.formSearchHist                         "Form &amp; search history">
-<!ENTITY clearPrivateData.passwords                              "Saved passwords">
-<!ENTITY clearPrivateData.offline                                "Offline website data">
-<!ENTITY clearPrivateData.logins                                 "Active logins">
-
-<!ENTITY optionsHeader.privacy.passwords.label                   "Remember Passwords">
-<!ENTITY optionsHeader.displayOverlayButtons.label               "Show Navigation Buttons">
-<!ENTITY doNotTrack.title                                        "Do Not Track">
-<!ENTITY doNotTrack.options.doNotTrack                           "Tell websites that I do not want to be tracked">
-<!ENTITY doNotTrack.options.doTrack                              "Tell websites that I want to be tracked">
-<!ENTITY doNotTrack.options.default                              "Do not tell websites anything about my tracking preferences">
-<!ENTITY doNotTrack.learnMoreLink                                "Learn more&#x2026;">
-
-<!ENTITY optionsHeader.reporting.title                           "Crash Reporter">
-<!ENTITY optionsHeader.reporting.crashes.label                   "&brandShortName; submits crash reports to help Mozilla make your browser more stable and secure">
-<!ENTITY optionsHeader.reporting.crashes.submitURLs             "Include the address of the page I was on">
-<!ENTITY optionsHeader.telemetry.title                            "Telemetry">
-<!ENTITY optionsHeader.telemetry.label                            "Shares usage statistics about &brandShortName; with Mozilla to help us make your browser better">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/region.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/region.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/region.properties	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/region.properties	1970-01-01 00:00:00.000000000 +0000
@@ -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/.
-
-# LOCALIZATION NOTE: REVIEW_REQUIRED
-# For all locales: please do not commit any changes to this file without a
-# review from the l10n-drivers team. In order to get one, please file a bug,
-# add the "productization" keyword and CC l10n@mozilla.com.
-# en-US: if you're changing this file, please CC l10n@mozilla.com in the
-# associated bug to help us determine if these changes are relevant for other
-# locales and how to localize them.
-
-# Default search engine
-browser.search.defaultenginename=Bing
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Bing
-browser.search.order.2=Google
-browser.search.order.3=Yahoo
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/searchPanel.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/searchPanel.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/searchPanel.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/searchPanel.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +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/. -->
-
-
-<!ENTITY searchFlyoutHeader.title  "Search">
-<!ENTITY searchSetting.title  "Default Search Provider">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/sync.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/sync.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/sync.dtd	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/sync.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +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/. -->
-
-<!-- Flyout -->
-<!ENTITY sync.flyout.title                     "&syncBrand.shortName.label;">
-
-<!-- Flyout when not connected -->
-<!ENTITY sync.flyout.presetup.description1     "Access your bookmarks, passwords, and open tabs across your devices">
-<!ENTITY sync.flyout.presetup.setup.label      "Set Up &syncBrand.shortName.label;">
-
-<!-- Flyout when setting up sync -->
-<!ENTITY sync.flyout.setup.title               "Set Up &syncBrand.shortName.label;">
-<!ENTITY sync.flyout.setup.description1        "If you have a &syncBrand.shortName.label; account, select &quot;Pair a Device&quot; on your other device and enter this code.">
-<!ENTITY sync.flyout.setup.description2        "If you don&apos;t have a &syncBrand.shortName.label; account, you can create one on your &brandShortName; desktop browser.">
-<!ENTITY sync.flyout.setup.manual.label_2      "I&apos;m not near my computer…">
-<!ENTITY sync.flyout.setup.description3        "Note:">
-<!ENTITY sync.flyout.setup.description4_2      "To find &quot;Pair a Device&quot;,">
-<!ENTITY sync.flyout.setup.description5_2      "[Desktop] Open &quot;Options&quot; or &quot;Preferences&quot; and then select &quot;&syncBrand.shortName.label;&quot;">
-<!ENTITY sync.flyout.setup.description6_2      "[Android] More &gt; Settings &gt; &syncBrand.shortName.label;">
-
-<!-- Flyout when setting up manually -->
-<!ENTITY sync.flyout.manualsetup.description1_2  "Please enter your &syncBrand.shortName.label; account information and the Recovery Key generated by your computer">
-<!ENTITY sync.flyout.manualsetup.account.placeholder "Account Name">
-<!ENTITY sync.flyout.manualsetup.password.placeholder "Password">
-<!ENTITY sync.flyout.manualsetup.recoveryKey.placeholder "Recovery Key">
-<!ENTITY sync.flyout.manualsetup.connect.label           "Connect">
-
-<!-- Flyout when user has just connected -->
-<!ENTITY sync.flyout.setupsuccess.description1      "You just connected &brandShortName; to &syncBrand.shortName.label; account">
-<!ENTITY sync.flyout.setupsuccess.description2      "Your &syncBrand.shortName.label; data is now being downloaded in the background. Your synced tabs can be found on &brandShortName; Start Page">
-
-<!-- Flyout when setup failed -->
-<!ENTITY sync.flyout.setupfailure.description       "&brandShortName; could not connect to your &syncBrand.shortName.label; account.">
-<!ENTITY sync.flyout.setupfailure.cancelButton      "Cancel">
-<!ENTITY sync.flyout.setupfailure.tryAgainButton    "Try Again">
-
-<!-- Flyout when connected and functioning normally -->
-<!ENTITY sync.flyout.connected.account                    "Account:">
-<!ENTITY sync.flyout.connected.device                     "Your device:">
-<!ENTITY sync.flyout.connected.disconnect                 "Disconnect">
-<!ENTITY sync.flyout.connected.disconnectWarningHeader    "Disconnect your device with &syncBrand.shortName.label;?">
-<!ENTITY sync.flyout.connected.disconnectWarning          "All your personal data on both this device and &syncBrand.shortName.label; account will remain intact.">
-<!ENTITY sync.flyout.connected.cancel                     "Cancel">
-<!ENTITY sync.flyout.connected.pair                       "Pair a Device">
-
-<!-- Flyout when pairing a device -->
-<!ENTITY sync.flyout.pairNewDevice.description            "On the new device you want to pair with, select &quot;Set Up &syncBrand.shortName.label;&quot; and enter the code the device produces">
-<!ENTITY sync.flyout.pairNewDevice.pair                   "Pair">
-<!ENTITY sync.flyout.pairNewDevice.note1                  "Note:">
-<!ENTITY sync.flyout.pairNewDevice.note2_2                "To find the code,">
-<!ENTITY sync.flyout.pairNewDevice.note3_2                "[Desktop] Open &quot;Options&quot; or &quot;Preferences&quot; and then follow the steps: &syncBrand.shortName.label; -&gt; Set up &syncBrand.shortName.label; -&gt; I have an account">
-<!ENTITY sync.flyout.pairNewDevice.note4                  "[Android] More &gt; Settings &gt; &syncBrand.shortName.label;">
-<!ENTITY sync.flyout.pairNewDevice.failure                "Please try again">
-
-<!-- Flyout when a device has been successfully paired -->
-<!ENTITY sync.flyout.pairSuccess.description1             "The new device has been successfully added.">
-<!ENTITY sync.flyout.pairSuccess.description2             "Your &syncBrand.shortName.label; data is now being downloaded in the background. Your remote tabs can be found on &brandShortName; Start Page.">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/sync.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/sync.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/en-US/chrome/sync.properties	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/en-US/chrome/sync.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +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/.
-
-# LOCALIZATION NOTE: Used in the default os description when a new account
-# is being set up. Should be unique to Metro, so that it does not conflict
-# with Desktop. See /services/sync/modules/engines/clients.js locaName.
-sync.defaultAccountApplication=Metro %S
-
-# %S is the date and time at which the last sync successfully completed
-sync.flyout.connected.lastSynced=Last sync: %S
-# %S is the username logged in
-sync.flyout.connected.account=Account: %S
-# %S is the name that the user has chosen for this device
-sync.flyout.connected.device=Your device: %S
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/generic/profile/bookmarks.json.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/generic/profile/bookmarks.json.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/generic/profile/bookmarks.json.in	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/generic/profile/bookmarks.json.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#filter substitution
-{"type":"text/x-moz-place-container","root":"placesRoot","children":
-  [{"type":"text/x-moz-place-container","title":"@bookmarks_title@","annos":[{"name":"metro/bookmarksRoot","expires":4,"type":1,"value":1}],
-    "children":
-     [
-       {"index":1,"title":"@firefox_about@", "type":"text/x-moz-place", "uri":"http://www.mozilla.org/@AB_CD@/about/",
-        "iconUri":"data:image/x-icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AVVBO%2F1NOTv9UT07%2FVVBOAFVQTwBUT04AU05N%2F1ROTv9VT0%2F%2FVVBPAFROTgBUT04AVE5O%2F1VQTv9VUE7%2F%2F%2F%2F%2FAFVQTv9UTk7%2FVE5O%2F1NOTgBUTk4AVE9OAFRPTvdTTk7%2FVE5O%2F1NOTgBVUE4AU05OAFVQTv9UTk7%2FU05N%2F%2F%2F%2F%2FwBTTk7%2FVE5O%2F1VQTv9VUE4AVVBOAFROTgBUT073VE5O%2F1ROTv9TTk4AVE5OAFROTgBVUE7%2FVE5O%2F1VQT%2F%2F%2F%2F%2F8AVE5O%2F1VQTv9UTk7%2FVE5OAFRPTgBUTk4AVE9O91VQT%2F9UTk7%2FU05OAFRPTgBUT04AVE5O%2F1NOTv9UTk7%2F%2F%2F%2F%2FAFROTv9UTk7%2FVVBP%2F1ROTgBUTk4AVE5OAFVQTvdUTk7%2FU05N%2F1NOTQBTTk4AU05OAFVPT%2F9TTk7%2FVE5O%2F%2F%2F%2F%2FwBUTk7%2FVE9O%2F1ROTv9UTk4AVU9PAFVQTwBVT0%2F3VE9O%2F1ROTv9UTk4AVE9OAFNOTgBVUE7%2FU05O%2F1ROTv%2F%2F%2F%2F8AVE9O%2F1VQT%2F9VUE%2F%2FVE5OAFVQTgBUTk4AVE9O91ROTv9UTk7%2FVE5OAFNOTgBUTk4AVE5O%2F1NOTf9UTk7%2F%2F%2F%2F%2FAFVQTv9UT07%2FU05N%2F1ROTgBVUE4AVE5OAFVQTutVUE7%2FVE9O%2F1NOTQBUT04AVVBOAFROTv9UTk7%2FVE9O%2F1ROTiFUTk7%2FVE5O%2F1NOTf9UTk4%2B%2F%2F%2F%2FAP%2F%2F%2FwBUTk7%2FVVBO%2F1ROTv9UTk4%2BVE9OAFRPTgBTTk3%2FVE5O%2F1ROTv9UT05lU05O%2F1ROTv9VUE7%2FU05N%2F1VQToBUT06eU05O%2F1RPTv9UTk7%2FVE9O%2F1VPT51VT0%2BaVE5O%2F1ROTv9VT0%2F%2FVE5Or1VQTv9UTk7%2FU05N%2F1ROTv9TTk7%2FVVBO%2F1NOTf9TTk7%2FU05N%2BVNOTv9UTk7%2FVVBP%2F1RPTv9VUE%2F%2FU05OzP%2F%2F%2FwBUT07%2FU05N%2F1ROTo%2F%2F%2F%2F8AVE9O%2F1RPTv9UTk7%2FVE5OqFROTgBVUE5hU05O%2F1VQTv9TTk7%2FVE9O31ROTgD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2FAAD%2F%2FwAAjjgAAI44AACOOAAAjjgAAI44AACOOAAAjjgAAI44AACOOAAAgAAAAAAAAACIYQAA%2F%2F8AAP%2F%2FAAAoAAAAIAAAAEAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3wU05NAFNOTQBTTk0AU05NAFNOTQBTTk3BU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk0AU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfBTTk0AU05NAFNOTQBTTk0AU05NAFNOTbpTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTQBTTk0AU05NAFNOTQBTTk0AU05N8FNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N8FNOTQBTTk0AU05NAFNOTQBTTk0AU05NulNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NAFNOTQBTTk0AU05NAFNOTQBTTk3wU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf%2F%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3wU05NAFNOTQBTTk0AU05NAFNOTQBTTk26U05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk0AU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfBTTk0AU05NAFNOTQBTTk0AU05NAFNOTbpTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTQBTTk0AU05NAFNOTQBTTk0AU05N8FNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N8FNOTQBTTk0AU05NAFNOTQBTTk0AU05NulNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NAFNOTQBTTk0AU05NAFNOTQBTTk3wU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf%2F%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3wU05NAFNOTQBTTk0AU05NAFNOTQBTTk26U05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk0AU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfBTTk0AU05NAFNOTQBTTk0AU05NAFNOTbpTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTQBTTk0AU05NAFNOTQBTTk0AU05N8FNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N8FNOTQBTTk0AU05NAFNOTQBTTk0AU05NulNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NAFNOTQBTTk0AU05NAFNOTQBTTk3wU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf%2F%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3wU05NAFNOTQBTTk0AU05NAFNOTQBTTk26U05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk0AU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfBTTk0AU05NAFNOTQBTTk0AU05NAFNOTbpTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTQBTTk0AU05NAFNOTQBTTk0AU05N8FNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N8FNOTQBTTk0AU05NAFNOTQBTTk0AU05NulNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NAFNOTQBTTk0AU05NAFNOTQBTTk3wU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf%2F%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3wU05NAFNOTQBTTk0AU05NAFNOTQBTTk26U05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk0AU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfBTTk0AU05NAFNOTQBTTk0AU05NAFNOTbpTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTQBTTk0AU05NAFNOTQBTTk0AU05N8FNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N8FNOTQBTTk0AU05NAFNOTQBTTk0AU05NulNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NAFNOTQBTTk0AU05NAFNOTQBTTk3wU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf%2F%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk32U05NAFNOTQBTTk0AU05NAFNOTQBTTk3LU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk1WU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk32U05NkVNOTQBTTk0AU05NHFNOTftTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk29U05NHFNOTQBTTk0cU05N%2B1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2FlNOTfBTTk3%2BU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N9lNOTf5TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfb%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk1aU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N3P%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTahTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf5TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3bU05N21NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk12%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NwVNOTftTTk3%2FU05N%2F1NOTf9TTk3%2FU05NHFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N3FNOTQBTTk0AU05NqVNOTf5TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NqVNOTQD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05NAFNOTTlTTk29U05N51NOTdxTTk0AU05NAFNOTXZTTk3cU05N9lNOTf9TTk37U05N51NOTXVTTk0AU05NAFNOTQBTTk0AU05NOFNOTc9TTk32U05N%2F1NOTf9TTk3wU05Nz1NOTThTTk0AU05NAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2FwPgfA8D4HwPA%2BB8DwPgfA8D4HwPA%2BB8DwPgfA8D4HwPA%2BB8DwPgfA8D4HwPA%2BB8DwPgfA8D4HwPA%2BB8DwPgfA8A4BwPAAAADwAAAA4AAAAeBAGAH8cH4H%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F"
-       },
-       {"index":2,"title":"@firefox_feedback@", "type":"text/x-moz-place", "uri":"https://input.mozilla.org/feedback/metrofirefox",
-        "iconUri":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA0xJREFUeNpUU11sFFUYPffO3d2Z7i677NIuNM3uUJRWBEMUTLARwYAlEEwISVMDPKHiz4OgiYEmYuID+OArPvDog0Ejhgcx4UdDaCk2soiW7lpafnZp6lK3u9vd7czszNwZ72wpwZN8+e795p5zJ9/5LnFdF1/K0g8ATh41eDratWtDt1Z4J8gbm9PhVBsWMCriioifRNzwCpXx880P5LGA621+jq89UfIF+/cXRjq9/T6Dg4jct+8rHD1Qx+R3152rf2iXtxdvflErGte8M1SQ93uLtwei2Dl7e8Aje2sPuQaQr3McP/URPjmtoPddlR7e477Bg6HL6suxvqYAIdgSi0tNwt7+GFIpHxYxFJHwcdSPsWoDfYd24vXPVXTu7sa2T5+XazV6es2u1uVUouSllc/6TC1vw6no2LAp/ESsKUiBKhjKyWfgBvz4djgK9ZUE4kklUn9kHaO+AGlv75D8lu4gqC7crs8lsGzHQZw9U4J7qYI/b87i9tUHcCAhM2libs5G1/Y45ovGViZ6uCQYpWCUQKtRhF5d1RRhvkwzT08UUM5kUZsuwHYY0lkKhXIkUjLmy7ybNQwnABuQV1AMXqzB+uUGpgtNU3Ci92tY33wvrOKC5EA3CBKqhuiSEsqaBqNqMxrwkXptThCEX7GEhNawgxVCzMPAhQ/w46ZfcXxjDtWZIsxqGa915IFyCfW/H0EJEY2J/v/1T97qCS+VsHqNjIejNtalGF7YKCMo2xjJ/QucuwK74z0klTwOrc+iUTAxNVSGRJxRZnP3zMSo+WIkzpS2pIyOdTHYJkf6t3nk7priP8ZwLPgWelrG8f6OWcSlBioTFWR+l+CPxi6RkwEaUiQMMkLWb+0PQw4wcM5AZQn3y34UqwZayDySbRZUNQBdWJodruNeTqkuT7Z2SdsYMXUXt8RVb06NmUG5haBF4aCWjbhPx6qQgYQM+B3qDT5yd2yMZyyjOKlvmblXusO8Zn1m8BEx0r0mcc+nh7X2eIiis8uPSIxAV8QBMR4zUxZygwSubmvFGadHVG89eUyLOBViKx2CI47r7uaUqNxecEcOECyNUINb7rl6xR34sG7fX+T8T+BpIZGeE9H+uDQtIvs0cRH/CTAA8jZdCaXrR1kAAAAASUVORK5CYII="
-       },
-       {"index":3,"title":"@firefox_community@",  "type":"text/x-moz-place", "uri":"http://www.mozilla.org/@AB_CD@/contribute/",
-        "iconUri":"data:image/x-icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AVVBO%2F1NOTv9UT07%2FVVBOAFVQTwBUT04AU05N%2F1ROTv9VT0%2F%2FVVBPAFROTgBUT04AVE5O%2F1VQTv9VUE7%2F%2F%2F%2F%2FAFVQTv9UTk7%2FVE5O%2F1NOTgBUTk4AVE9OAFRPTvdTTk7%2FVE5O%2F1NOTgBVUE4AU05OAFVQTv9UTk7%2FU05N%2F%2F%2F%2F%2FwBTTk7%2FVE5O%2F1VQTv9VUE4AVVBOAFROTgBUT073VE5O%2F1ROTv9TTk4AVE5OAFROTgBVUE7%2FVE5O%2F1VQT%2F%2F%2F%2F%2F8AVE5O%2F1VQTv9UTk7%2FVE5OAFRPTgBUTk4AVE9O91VQT%2F9UTk7%2FU05OAFRPTgBUT04AVE5O%2F1NOTv9UTk7%2F%2F%2F%2F%2FAFROTv9UTk7%2FVVBP%2F1ROTgBUTk4AVE5OAFVQTvdUTk7%2FU05N%2F1NOTQBTTk4AU05OAFVPT%2F9TTk7%2FVE5O%2F%2F%2F%2F%2FwBUTk7%2FVE9O%2F1ROTv9UTk4AVU9PAFVQTwBVT0%2F3VE9O%2F1ROTv9UTk4AVE9OAFNOTgBVUE7%2FU05O%2F1ROTv%2F%2F%2F%2F8AVE9O%2F1VQT%2F9VUE%2F%2FVE5OAFVQTgBUTk4AVE9O91ROTv9UTk7%2FVE5OAFNOTgBUTk4AVE5O%2F1NOTf9UTk7%2F%2F%2F%2F%2FAFVQTv9UT07%2FU05N%2F1ROTgBVUE4AVE5OAFVQTutVUE7%2FVE9O%2F1NOTQBUT04AVVBOAFROTv9UTk7%2FVE9O%2F1ROTiFUTk7%2FVE5O%2F1NOTf9UTk4%2B%2F%2F%2F%2FAP%2F%2F%2FwBUTk7%2FVVBO%2F1ROTv9UTk4%2BVE9OAFRPTgBTTk3%2FVE5O%2F1ROTv9UT05lU05O%2F1ROTv9VUE7%2FU05N%2F1VQToBUT06eU05O%2F1RPTv9UTk7%2FVE9O%2F1VPT51VT0%2BaVE5O%2F1ROTv9VT0%2F%2FVE5Or1VQTv9UTk7%2FU05N%2F1ROTv9TTk7%2FVVBO%2F1NOTf9TTk7%2FU05N%2BVNOTv9UTk7%2FVVBP%2F1RPTv9VUE%2F%2FU05OzP%2F%2F%2FwBUT07%2FU05N%2F1ROTo%2F%2F%2F%2F8AVE9O%2F1RPTv9UTk7%2FVE5OqFROTgBVUE5hU05O%2F1VQTv9TTk7%2FVE9O31ROTgD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2FAAD%2F%2FwAAjjgAAI44AACOOAAAjjgAAI44AACOOAAAjjgAAI44AACOOAAAgAAAAAAAAACIYQAA%2F%2F8AAP%2F%2FAAAoAAAAIAAAAEAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3wU05NAFNOTQBTTk0AU05NAFNOTQBTTk3BU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk0AU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfBTTk0AU05NAFNOTQBTTk0AU05NAFNOTbpTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTQBTTk0AU05NAFNOTQBTTk0AU05N8FNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N8FNOTQBTTk0AU05NAFNOTQBTTk0AU05NulNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NAFNOTQBTTk0AU05NAFNOTQBTTk3wU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf%2F%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3wU05NAFNOTQBTTk0AU05NAFNOTQBTTk26U05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk0AU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfBTTk0AU05NAFNOTQBTTk0AU05NAFNOTbpTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTQBTTk0AU05NAFNOTQBTTk0AU05N8FNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N8FNOTQBTTk0AU05NAFNOTQBTTk0AU05NulNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NAFNOTQBTTk0AU05NAFNOTQBTTk3wU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf%2F%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3wU05NAFNOTQBTTk0AU05NAFNOTQBTTk26U05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk0AU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfBTTk0AU05NAFNOTQBTTk0AU05NAFNOTbpTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTQBTTk0AU05NAFNOTQBTTk0AU05N8FNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N8FNOTQBTTk0AU05NAFNOTQBTTk0AU05NulNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NAFNOTQBTTk0AU05NAFNOTQBTTk3wU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf%2F%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3wU05NAFNOTQBTTk0AU05NAFNOTQBTTk26U05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk0AU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfBTTk0AU05NAFNOTQBTTk0AU05NAFNOTbpTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTQBTTk0AU05NAFNOTQBTTk0AU05N8FNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N8FNOTQBTTk0AU05NAFNOTQBTTk0AU05NulNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NAFNOTQBTTk0AU05NAFNOTQBTTk3wU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf%2F%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3wU05NAFNOTQBTTk0AU05NAFNOTQBTTk26U05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk0AU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfBTTk0AU05NAFNOTQBTTk0AU05NAFNOTbpTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTQBTTk0AU05NAFNOTQBTTk0AU05N8FNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N8FNOTQBTTk0AU05NAFNOTQBTTk0AU05NulNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NAFNOTQBTTk0AU05NAFNOTQBTTk3wU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf%2F%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk32U05NAFNOTQBTTk0AU05NAFNOTQBTTk3LU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk1WU05NAFNOTQBTTk0AU05NAFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F%2F%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTQBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk32U05NkVNOTQBTTk0AU05NHFNOTftTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk29U05NHFNOTQBTTk0cU05N%2B1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2F%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NAFNOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2FlNOTfBTTk3%2BU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N9lNOTf5TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTfb%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk1aU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N3P%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAFNOTahTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf5TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3bU05N21NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk12%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8AU05NwVNOTftTTk3%2FU05N%2F1NOTf9TTk3%2FU05NHFNOTfBTTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05N3FNOTQBTTk0AU05NqVNOTf5TTk3%2FU05N%2F1NOTf9TTk3%2FU05N%2F1NOTf9TTk3%2FU05NqVNOTQD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwBTTk0AU05NAFNOTTlTTk29U05N51NOTdxTTk0AU05NAFNOTXZTTk3cU05N9lNOTf9TTk37U05N51NOTXVTTk0AU05NAFNOTQBTTk0AU05NOFNOTc9TTk32U05N%2F1NOTf9TTk3wU05Nz1NOTThTTk0AU05NAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2FwD%2F%2F%2F8A%2F%2F%2F%2FAP%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2FwPgfA8D4HwPA%2BB8DwPgfA8D4HwPA%2BB8DwPgfA8D4HwPA%2BB8DwPgfA8D4HwPA%2BB8DwPgfA8D4HwPA%2BB8DwPgfA8A4BwPAAAADwAAAA4AAAAeBAGAH8cH4H%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F"
-       }
-     ]
-  }]
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/import/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/import/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/import/Makefile.in	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/import/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +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/.
-
-# desktop specific resources - this defines LOCALE_SRCDIR
-relativesrcdir = browser/locales
-
-include $(topsrcdir)/config/config.mk
-
-#########################################
-# l10s prefs file
-
-# copying firefox-l10n.js over from LOCALE_SRCDIR or browser
-L10N_PREF_JS_EXPORTS = $(firstword $(wildcard $(LOCALE_SRCDIR)/firefox-l10n.js) \
-                         $(srcdir)/en-US/firefox-l10n.js )
-L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR)
-L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warnings
-PP_TARGETS += L10N_PREF_JS_EXPORTS
-
-include $(topsrcdir)/config/rules.mk
-
-#########################################
-# Search plugins
-
-# Metro reuses desktop search plugins
-libs::
-	$(MAKE) -C $(DEPTH)/browser/locales searchplugins \
-	  DIST_SUBDIR=$(DIST_SUBDIR) XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
-
-#########################################
-# Bookmarks
-
-# Pick up desktop's bookmarks.inc file
-ifdef LOCALE_MERGEDIR
-vpath book%.inc $(LOCALE_MERGEDIR)/browser/profile
-endif
-vpath book%.inc $(LOCALE_SRCDIR)/profile
-ifdef LOCALE_MERGEDIR
-vpath book%.inc @top_srcdir@/$(relativesrcdir)/en-US/profile
-endif
-
-bookmarks-src = $(srcdir)/../generic/profile/bookmarks.json.in
-
-# The resulting bookmarks.json will get picked up and packaged by the
-# processing of the jar file in the parent directory.
-bookmarks: bookmarks.inc
-	@echo 'Generating: $@'
-	$(call py_action,preprocessor, \
-	  -I $^ \
-	  -DAB_CD=$(AB_CD) \
-	  $(bookmarks-src) -o ../bookmarks.json)
-
-export:: bookmarks
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/import/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/import/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/import/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/import/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/jar.mn	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/jar.mn	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#
-# Metro jar resources
-#
-
-@AB_CD@.jar:
-% locale browser @AB_CD@ %locale/browser/
-  locale/browser/aboutCertError.dtd       (%chrome/aboutCertError.dtd)
-  locale/browser/browser.dtd              (%chrome/browser.dtd)
-  locale/browser/browser.properties       (%chrome/browser.properties)
-  locale/browser/config.dtd               (%chrome/config.dtd)
-  locale/browser/config.properties        (%chrome/config.properties)
-  locale/browser/region.properties        (%chrome/region.properties)
-  locale/browser/preferences.dtd          (%chrome/preferences.dtd)
-  locale/browser/aboutPanel.dtd           (%chrome/aboutPanel.dtd)
-  locale/browser/searchPanel.dtd          (%chrome/searchPanel.dtd)
-  locale/browser/checkbox.dtd             (%chrome/checkbox.dtd)
-  locale/browser/sync.dtd                 (%chrome/sync.dtd)
-  locale/browser/sync.properties          (%chrome/sync.properties)
-  locale/browser/passwordmgr.properties   (%chrome/passwordmgr.properties)
-  locale/browser/phishing.dtd             (%chrome/phishing.dtd)
-#ifdef MOZ_CRASHREPORTER
-  locale/browser/crashprompt.dtd          (%chrome/crashprompt.dtd)
-#endif
-  locale/browser/aboutAddons.dtd          (%chrome/aboutAddons.dtd)
-
-@AB_CD@.jar:
-% locale browser @AB_CD@ %locale/browser/
-  locale/browser/bookmarks.json           (bookmarks.json)
-
-#
-# Browser jar resources
-#
-
-@AB_CD@.jar:
-relativesrcdir browser/locales:
-  locale/browser/syncBrand.dtd            (%chrome/browser/syncBrand.dtd)
-  locale/browser/netError.dtd             (%chrome/overrides/netError.dtd)
-% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
-  locale/browser/appstrings.properties    (%chrome/overrides/appstrings.properties)
-% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/Makefile.in	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +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/.
-
-# metrofx specific resources - this defines LOCALE_SRCDIR
-relativesrcdir = browser/metro/locales
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
-
-#########################################
-# Branding
-
-# 'browser/branding/nightly' -> 'nightly'
-BRANDFOLDER = $(notdir $(MOZ_BRANDING_DIRECTORY))
-
-branding-$(BRANDFOLDER):
-	$(MAKE) -C $(DEPTH)/browser/branding/$(BRANDFOLDER) \
-	  DIST_SUBDIR=$(DIST_SUBDIR) XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
-
-libs:: branding-$(BRANDFOLDER)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/locales/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/locales/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-# Process desktop related resource we reuse here.
-DIRS += ['import']
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/Makefile.in	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -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/.
-
-include $(topsrcdir)/config/rules.mk
-
-#########################################
-# application.ini
-
-GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
-DEFINES += -DGRE_BUILDID=$(GRE_BUILDID) -DMOZ_APP_BASENAME=$(MOZ_APP_BASENAME)
-
-# 'application.ini' breaks firefox build config. So we use something different.
-metroapp.ini: metroapp.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
-	$(RM) metroapp.ini
-	$(call py_action,preprocessor,$(DEFINES) $< -o $@)
-
-libs:: metroapp.ini
-	$(INSTALL) metroapp.ini $(FINAL_TARGET)
-
-#########################################
-
-GARBAGE += metroapp.ini
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/metroapp.ini.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/metroapp.ini.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/metroapp.ini.in	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/metroapp.ini.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#filter substitution
-[App]
-Vendor=Mozilla
-Name=@MOZ_APP_BASENAME@
-UAName=Firefox
-Version=@GRE_MILESTONE@
-BuildID=@GRE_BUILDID@
-ID={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
-
-[Gecko]
-MinVersion=@GRE_MILESTONE@
-MaxVersion=@GRE_MILESTONE@
-
-[XRE]
-EnableProfileMigrator=0
-
-[Crash Reporter]
-#if MOZILLA_OFFICIAL
-Enabled=1
-#endif
-ServerURL=https://crash-reports.mozilla.com/submit?id={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}&version=@GRE_MILESTONE@&buildid=@GRE_BUILDID@
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/modules/colorUtils.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/modules/colorUtils.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/modules/colorUtils.jsm	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/modules/colorUtils.jsm	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +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';
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/Promise.jsm");
-
-const ColorAnalyzer = Components.classes["@mozilla.org/places/colorAnalyzer;1"]
-                .getService(Components.interfaces.mozIColorAnalyzer);
-
-this.EXPORTED_SYMBOLS = ["ColorUtils"];
-
-let ColorUtils = {
-  _initialized: false,
-  init: function() {
-    if (this._initialized)
-        return;
-    Services.obs.addObserver(this, "idle-daily", false);
-    Services.obs.addObserver(this, "quit-application", false);
-    this._initialized = true;
-  },
-  uninit: function() {
-    Services.obs.removeObserver(this, "idle-daily");
-    Services.obs.removeObserver(this, "quit-application");
-  },
-
-  // default to keeping icon colorInfo for max 1 day
-  iconColorCacheMaxAge: 86400000,
-
-  // in-memory store for favicon color data
-  _uriColorsMap: (function() {
-    let cache = new Map();
-    // remove stale entries
-    cache.purge = function(maxAgeMs = 0) {
-      let cuttoff = Date.now() - (maxAgeMs || ColorUtils.iconColorCacheMaxAge);
-      for (let [key, value] of this) {
-        if (value.timestamp && value.timestamp >= cuttoff) {
-          continue;
-        }
-        this.delete(key);
-      }
-    }
-    return cache;
-  })(),
-  get iconColorCache() {
-    return ColorUtils._uriColorsMap;
-  },
-
-  observe: function (aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "idle-daily":
-        this.iconColorCache.purge();
-        break;
-      case "quit-application":
-        this.uninit();
-        break;
-    }
-  },
-
-  /** Takes an icon and returns either an object with foreground and background color properties
-   *  or a promise for the same.
-   *  The foreground is the contrast color, the background is the primary/dominant one
-   */
-  getForegroundAndBackgroundIconColors: function getForegroundAndBackgroundIconColors(aIconURI) {
-    let colorKey = aIconURI.spec;
-    let colorInfo = this._uriColorsMap.get(colorKey);
-    if (colorInfo) {
-      return colorInfo;
-    }
-
-    let deferred = Promise.defer();
-    let wrappedIcon = aIconURI;
-    this._uriColorsMap.set(colorKey, deferred.promise);
-
-    ColorAnalyzer.findRepresentativeColor(wrappedIcon, (success, color) => {
-      if (!success) {
-        this._uriColorsMap.delete(colorKey);
-        deferred.reject();
-      } else {
-        colorInfo = {
-          foreground: this.bestTextColorForContrast(color),
-          background: this.convertDecimalToRgbColor(color),
-          timestamp: Date.now()
-        };
-        deferred.resolve(colorInfo);
-      }
-    });
-    return deferred.promise;
-  },
-
-  /** returns the best color for text readability on top of aColor
-   * return color is in rgb(r,g,b) format, suitable to csss
-   * The color bightness algorithm is currently: http://www.w3.org/TR/AERT#color-contrast
-   */
-  bestTextColorForContrast: function bestTextColorForContrast(aColor) {
-    let r = (aColor & 0xff0000) >> 16;
-    let g = (aColor & 0x00ff00) >> 8;
-    let b = (aColor & 0x0000ff);
-
-    let w3cContrastValue = ((r*299)+(g*587)+(b*114))/1000;
-    w3cContrastValue = Math.round(w3cContrastValue);
-    let textColor = "rgb(255,255,255)";
-
-    if (w3cContrastValue > 125) {
-      // bright/light, use black text
-      textColor = "rgb(0,0,0)";
-    }
-    return textColor;
-  },
-
-  toCSSRgbColor: function toCSSRgbColor(r, g, b, a) {
-    var values = [Math.round(r), Math.round(g), Math.round(b)];
-    if (undefined !== a && a < 1) {
-      values.push(a);
-      return 'rgba('+values.join(',')+')';
-    }
-    return 'rgb('+values.join(',')+')';
-  },
-
-  /**
-   * converts a decimal(base10) number into CSS rgb color value string
-   */
-  convertDecimalToRgbColor: function convertDecimalToRgbColor(aColor) {
-    let [r,g,b,a] = this.unpackDecimalColorWord(aColor);
-    return this.toCSSRgbColor(r,g,b,a);
-  },
-
-  /**
-   * unpack a decimal(base10) word for r,g,b,a values
-   */
-  unpackDecimalColorWord: function unpackDecimalColorWord(aColor) {
-    let a = (aColor & 0xff000000) >> 24;
-    let r = (aColor & 0x00ff0000) >> 16;
-    let g = (aColor & 0x0000ff00) >> 8;
-    let b = (aColor & 0x000000ff);
-    // NB: falsy alpha treated as undefined, fully opaque
-    return a ? [r,g,b,a/255] : [r,g,b];
-  },
-
-  /**
-   * create a decimal(base10) word for r,g,b values
-   */
-  createDecimalColorWord: function createDecimalColorWord(r, g, b, a) {
-    let rgb = 0;
-    rgb |= b;
-    rgb |= (g << 8);
-    rgb |= (r << 16);
-    // pack alpha value if one is given
-    if (undefined !== a && a < 1)
-      rgb |= (Math.round(a*255) << 24);
-    return rgb;
-  },
-
-  /**
-   * Add 2 rgb(a) colors to get a flat color
-   */
-  addRgbColors: function addRgbColors(color1, color2) {
-    let [r1, g1, b1] = this.unpackDecimalColorWord(color1);
-    let [r2, g2, b2, alpha] = this.unpackDecimalColorWord(color2);
-
-    let color = {};
-    // early return if 2nd color is opaque
-    if (!alpha || alpha >= 1)
-      return color2;
-
-    return this.createDecimalColorWord(
-      Math.min(255, alpha * r2 + (1 - alpha) * r1),
-      Math.min(255, alpha * g2 + (1 - alpha) * g1),
-      Math.min(255, alpha * b2 + (1 - alpha) * b1)
-    );
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/modules/ContentUtil.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/modules/ContentUtil.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/modules/ContentUtil.jsm	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/modules/ContentUtil.jsm	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +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/. */
-"use strict";
-
-this.EXPORTED_SYMBOLS = ["ContentUtil"];
-
-const XHTML_NS = "http://www.w3.org/1999/xhtml";
-const nsIDOMKeyEvent = Components.interfaces.nsIDOMKeyEvent;
-
-this.ContentUtil = {
-  populateFragmentFromString: function populateFragmentFromString(fragment, str) {
-    let re = /^([^#]*)#(\d+)\b([^#]*)/,
-        document = fragment.ownerDocument,
-        // the remaining arguments are our {text, className} values
-        replacements = Array.slice(arguments, 2),
-        match;
-
-    // walk over the string, building textNode/spans as nec. with replacement content
-    // note that #1,#2 etc. may not appear in numerical order in the string
-    while ((match = re.exec(str))) {
-      let [mstring,pre,num,post] = match,
-          replaceText = "",
-          replaceClass,
-          idx = num-1; // markers are 1-based, replacement indices 0 based
-
-      str = str.substring(re.lastIndex+mstring.length);
-
-      if (pre)
-          fragment.appendChild(document.createTextNode(pre));
-
-      if (replacements[idx]) {
-        replaceText = replacements[idx].text;
-        let spanNode = document.createElementNS(XHTML_NS, "span");
-        spanNode.appendChild(document.createTextNode(replaceText));
-        // add class to the span when provided
-        if(replacements[idx].className)
-          spanNode.classList.add(replacements[idx].className);
-
-        fragment.appendChild(spanNode);
-      } else {
-        // put it back if no replacement was provided
-        fragment.appendChild(document.createTextNode("#"+num));
-      }
-
-      if(post)
-        fragment.appendChild(document.createTextNode(post));
-    }
-    if(str)
-      fragment.appendChild(document.createTextNode(str));
-
-    return fragment;
-  },
-
-  // Pass several objects in and it will combine them all into the first object and return it.
-  // NOTE: Deep copy is not supported
-  extend: function extend() {
-    // copy reference to target object
-    let target = arguments[0] || {};
-    let length = arguments.length;
-
-    if (length === 1) {
-      return target;
-    }
-
-    // Handle case when target is a string or something
-    if (typeof target != "object" && typeof target != "function") {
-      target = {};
-    }
-
-    for (let i = 1; i < length; i++) {
-      // Only deal with non-null/undefined values
-      let options = arguments[i];
-      if (options != null) {
-        // Extend the base object
-        for (let name in options) {
-          let copy = options[name];
-
-          // Prevent never-ending loop
-          if (target === copy)
-            continue;
-
-          if (copy !== undefined)
-            target[name] = copy;
-        }
-      }
-    }
-
-    // Return the modified object
-    return target;
-  },
-
-  // Checks if a keycode is used for list navigation.
-  isNavigationKey: function (keyCode) {
-    let navigationKeys = [
-      nsIDOMKeyEvent.DOM_VK_DOWN,
-      nsIDOMKeyEvent.DOM_VK_UP,
-      nsIDOMKeyEvent.DOM_VK_LEFT,
-      nsIDOMKeyEvent.DOM_VK_RIGHT,
-      nsIDOMKeyEvent.DOM_VK_PAGE_UP,
-      nsIDOMKeyEvent.DOM_VK_PAGE_DOWN,
-      nsIDOMKeyEvent.DOM_VK_ESCAPE];
-
-    return navigationKeys.indexOf(keyCode) != -1;
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/modules/CrossSlide.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/modules/CrossSlide.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/modules/CrossSlide.jsm	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/modules/CrossSlide.jsm	1970-01-01 00:00:00.000000000 +0000
@@ -1,280 +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/. */
-"use strict";
-
-this.EXPORTED_SYMBOLS = ["CrossSlide"];
-
-// needs DPI adjustment?
-let CrossSlideThresholds = {
-   SELECTIONSTART: 25,
-   SPEEDBUMPSTART: 30,
-   SPEEDBUMPEND: 50,
-   REARRANGESTART: 80
-};
-
-// see: http://msdn.microsoft.com/en-us/library/windows/apps/windows.ui.input.crossslidingstate.ASPx
-let CrossSlidingState = {
-  STARTED:  0,
-  DRAGGING: 1,
-  SELECTING: 2,
-  SELECT_SPEED_BUMPING: 3,
-  SPEED_BUMPING: 4,
-  REARRANGING: 5,
-  COMPLETED: 6
-};
-
-let CrossSlidingStateNames = [
-  'started',
-  'dragging',
-  'selecting',
-  'selectSpeedBumping',
-  'speedBumping',
-  'rearranging',
-  'completed'
-];
-
-// --------------------------------
-// module helpers
-//
-
-function isSelectable(aElement) {
-  // placeholder logic
-  return aElement.nodeName == 'richgriditem' && aElement.hasAttribute("value");
-}
-function withinCone(aLen, aHeight) {
-  // check pt falls within 45deg either side of the cross axis
-  return aLen > aHeight;
-}
-function getScrollAxisFromElement(aElement) {
-  // keeping it simple - just return apparent scroll axis for the document
-  let win = aElement.ownerDocument.defaultView;
-  let scrollX = win.scrollMaxX,
-      scrollY = win.scrollMaxY;
-  // determine scroll axis from scrollable content when possible
-  if (scrollX || scrollY)
-    return scrollX >= scrollY ? 'x' : 'y';
-
-  // fall back to guessing at scroll axis from document aspect ratio
-  let docElem = aElement.ownerDocument.documentElement;
-  return  docElem.clientWidth >= docElem.clientHeight ?
-          'x' : 'y';
-}
-function pointFromTouchEvent(aEvent) {
-  let touch = aEvent.touches[0];
-  return { x: touch.clientX, y: touch.clientY };
-}
-// This damping function has these important properties:
-// f(0) = 0
-// f'(0) = 1
-// limit as x -> Infinity of f(x) = 1
-function damp(aX) {
-  return 2 / (1 + Math.exp(-2 * aX)) - 1;
-}
-function speedbump(aDelta, aStart, aEnd) {
-  let x = Math.abs(aDelta);
-  if (x <= aStart)
-    return aDelta;
-  let sign = aDelta / x;
-
-  let d = aEnd - aStart;
-  let damped = damp((x - aStart) / d);
-  return sign * (aStart + (damped * d));
-}
-
-
-this.CrossSlide = {
-  // -----------------------
-  // Gesture constants
-  Thresholds: CrossSlideThresholds,
-  State: CrossSlidingState,
-  StateNames: CrossSlidingStateNames,
-  // -----------------------
-  speedbump: speedbump
-};
-
-function CrossSlideHandler(aNode, aThresholds) {
-  this.node = aNode;
-  this.thresholds = Object.create(CrossSlideThresholds);
-  // apply per-instance threshold configuration
-  if (aThresholds) {
-    for(let key in aThresholds)
-      this.thresholds[key] = aThresholds[key];
-  }
-  aNode.addEventListener("touchstart", this, false);
-  aNode.addEventListener("touchmove", this, false);
-  aNode.addEventListener("touchend", this, false);
-  aNode.addEventListener("touchcancel", this, false);
-  aNode.ownerDocument.defaultView.addEventListener("scroll", this, false);
-}
-
-CrossSlideHandler.prototype = {
-  node: null,
-  drag: null,
-
-  getCrossSlideState: function(aCrossAxisDistance, aScrollAxisDistance) {
-    if (aCrossAxisDistance <= 0) {
-      return CrossSlidingState.STARTED;
-    }
-    if (aCrossAxisDistance < this.thresholds.SELECTIONSTART) {
-      return CrossSlidingState.DRAGGING;
-    }
-    if (aCrossAxisDistance < this.thresholds.SPEEDBUMPSTART) {
-      return CrossSlidingState.SELECTING;
-    }
-    if (aCrossAxisDistance < this.thresholds.SPEEDBUMPEND) {
-      return CrossSlidingState.SELECT_SPEED_BUMPING;
-    }
-    if (aCrossAxisDistance < this.thresholds.REARRANGESTART) {
-      return CrossSlidingState.SPEED_BUMPING;
-    }
-    // out of bounds cross-slide
-    return -1;
-  },
-
-  handleEvent: function handleEvent(aEvent) {
-    switch (aEvent.type) {
-      case "touchstart":
-        this._onTouchStart(aEvent);
-        break;
-      case "touchmove":
-        this._onTouchMove(aEvent);
-        break;
-      case "scroll":
-      case "touchcancel":
-        this.cancel(aEvent);
-        break;
-      case "touchend":
-        this._onTouchEnd(aEvent);
-        break;
-    }
-  },
-
-  cancel: function(aEvent){
-    this._fireProgressEvent("cancelled", aEvent);
-    this.drag = null;
-  },
-
-  _onTouchStart: function onTouchStart(aEvent){
-    if (aEvent.touches.length > 1)
-      return;
-    let touch = aEvent.touches[0];
-     // cross-slide is a single touch gesture
-     // the top target is the one we need here, touch.target not relevant
-    let target = aEvent.target;
-
-    if (!isSelectable(target))
-        return;
-
-    let scrollAxis = getScrollAxisFromElement(target);
-
-    this.drag = {
-      scrollAxis: scrollAxis,
-      crossAxis: (scrollAxis=='x') ? 'y' : 'x',
-      origin: pointFromTouchEvent(aEvent),
-      state: -1
-    };
-  },
-
-  _onTouchMove: function(aEvent){
-    if (!this.drag) {
-      return;
-    }
-
-    if (aEvent.touches.length!==1) {
-      // cancel if another touch point gets involved
-      return this.cancel(aEvent);
-    }
-
-    let startPt = this.drag.origin;
-    let endPt = this.drag.position = pointFromTouchEvent(aEvent);
-
-    let scrollAxis = this.drag.scrollAxis,
-        crossAxis = this.drag.crossAxis;
-
-    // distance from the origin along the axis perpendicular to scrolling
-    let crossAxisDistance = Math.abs(endPt[crossAxis] - startPt[crossAxis]);
-    // distance along the scrolling axis
-    let scrollAxisDistance = Math.abs(endPt[scrollAxis] - startPt[scrollAxis]);
-    let currState = this.drag.state;
-    let newState = this.getCrossSlideState(crossAxisDistance, scrollAxisDistance);
-
-    switch (newState) {
-      case -1 :
-        // dodgy input/out of bounds
-        return this.cancel(aEvent);
-      case CrossSlidingState.STARTED :
-        break;
-      case CrossSlidingState.DRAGGING :
-        if (scrollAxisDistance > this.thresholds.SELECTIONSTART) {
-          // looks like a pan/scroll was intended
-          return this.cancel(aEvent);
-        }
-        // else fall-thru'
-      case CrossSlidingState.SELECTING :
-      case CrossSlidingState.SELECT_SPEED_BUMPING :
-      case CrossSlidingState.SPEED_BUMPING :
-        // we're committed to a cross-slide gesture,
-        // so going out of bounds at this point means aborting
-        if (!withinCone(crossAxisDistance, scrollAxisDistance)) {
-          return this.cancel(aEvent);
-        }
-        // we're mid-gesture, consume this event
-        aEvent.stopPropagation();
-        break;
-    }
-
-    if (currState !== newState) {
-      this.drag.state = newState;
-      this._fireProgressEvent( CrossSlidingStateNames[newState], aEvent );
-    }
-  },
-  _onTouchEnd: function(aEvent){
-    if (!this.drag)
-      return;
-
-    if (this.drag.state < CrossSlidingState.SELECTING) {
-      return this.cancel(aEvent);
-    }
-
-    this._fireProgressEvent("completed", aEvent);
-    this._fireSelectEvent(aEvent);
-    this.drag = null;
-  },
-
-  /**
-   * Dispatches a custom Event on the drag node.
-   * @param aEvent The source event.
-   * @param aType The event type.
-   */
-  _fireProgressEvent: function CrossSliding_fireEvent(aState, aEvent) {
-    if (!this.drag)
-      return;
-    let event = this.node.ownerDocument.createEvent("Events");
-    let crossAxisName = this.drag.crossAxis;
-    event.initEvent("MozCrossSliding", true, true);
-    event.crossSlidingState = aState;
-    if ('position' in this.drag) {
-      event.position = this.drag.position;
-      if (crossAxisName) {
-        event.direction = crossAxisName;
-        if('origin' in this.drag) {
-          event.delta = this.drag.position[crossAxisName] - this.drag.origin[crossAxisName];
-        }
-      }
-    }
-    aEvent.target.dispatchEvent(event);
-  },
-
-  /**
-   * Dispatches a custom Event on the given target node.
-   * @param aEvent The source event.
-   */
-  _fireSelectEvent: function SelectTarget_fireEvent(aEvent) {
-    let event = this.node.ownerDocument.createEvent("Events");
-    event.initEvent("MozCrossSlideSelect", true, true);
-    event.position = this.drag.position;
-    aEvent.target.dispatchEvent(event);
-  }
-};
-this.CrossSlide.Handler = CrossSlideHandler;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/modules/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/modules/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/modules/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/modules/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-EXTRA_JS_MODULES += [
-    'colorUtils.jsm',
-    'ContentUtil.jsm',
-    'CrossSlide.jsm',
-    'View.jsm',
-]
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/modules/View.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/modules/View.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/modules/View.jsm	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/modules/View.jsm	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +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/. */
-"use strict";
-
-this.EXPORTED_SYMBOLS = ["View"];
-
-Components.utils.import("resource://gre/modules/PlacesUtils.jsm");
-Components.utils.import("resource:///modules/colorUtils.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/Task.jsm");
-
-// --------------------------------
-// module helpers
-//
-
-function makeURI(aURL, aOriginCharset, aBaseURI) {
-  return Services.io.newURI(aURL, aOriginCharset, aBaseURI);
-}
-
-// --------------------------------
-
-
-// --------------------------------
-// View prototype for shared functionality
-
-function View(aSet) {
-  this._set = aSet;
-  this._set.controller = this;
-  this._window = aSet.ownerDocument.defaultView;
-  this._maxTiles = 8;
-  this._tilePrefName = "unknown";
-
-  this.onResize = () => this._adjustDOMforViewState();
-  this._window.addEventListener("resize", this.onResize);
-
-  ColorUtils.init();
-  this._adjustDOMforViewState();
-}
-
-View.prototype = {
-  set maxTiles(aVal) {
-    this._maxTiles = aVal;
-  },
-
-  get maxTiles() {
-    return this._maxTiles;
-  },
-
-  set showing(aFlag) {
-    // 'vbox' must be defined on objects that inherit from us
-    this.vbox.setAttribute("hidden", aFlag ? "false" : "true");
-  },
-
-  set tilePrefName(aStr) {
-    // Should be called once on init by objects that inherit from us
-    this._tilePrefName = aStr;
-    this._maxTiles = Services.prefs.getIntPref(this._tilePrefName);
-    Services.prefs.addObserver(this._tilePrefName, this, false);
-  },
-
-  destruct: function () {
-    this._window.removeEventListener("resize", this.onResize);
-    if (this._tilePrefName != "unknown") {
-      Services.prefs.removeObserver(this._tilePrefName, this);
-    }
-  },
-
-  _adjustDOMforViewState: function _adjustDOMforViewState(aState) {
-    let grid = this._set;
-    if (!grid) {
-      return;
-    }
-    if (!aState) {
-      aState = grid.getAttribute("viewstate");
-    }
-    switch (aState) {
-      case "snapped":
-        grid.setAttribute("nocontext", true);
-        grid.selectNone();
-        grid.disableCrossSlide();
-        break;
-      case "portrait":
-        grid.removeAttribute("nocontext");
-        grid.setAttribute("vertical", true);
-        grid.enableCrossSlide();
-        break;
-      default:
-        grid.removeAttribute("nocontext");
-        grid.removeAttribute("vertical");
-        grid.enableCrossSlide();
-    }
-    if ("arrangeItems" in grid) {
-      grid.arrangeItems();
-    }
-  },
-
-  _updateFavicon: function pv__updateFavicon(aItem, aUri) {
-    if ("string" == typeof aUri) {
-      aUri = makeURI(aUri);
-    }
-    PlacesUtils.favicons.getFaviconURLForPage(aUri, this._gotIcon.bind(this, aItem));
-  },
-
-  _gotIcon: function pv__gotIcon(aItem, aIconUri) {
-    if (!aIconUri) {
-      aItem.removeAttribute("iconURI");
-      if (aItem.refresh) {
-        aItem.refresh();
-      }
-      return;
-    }
-    if ("string" == typeof aIconUri) {
-      aIconUri = makeURI(aIconUri);
-    }
-    let faviconURL = (PlacesUtils.favicons.getFaviconLinkForIcon(aIconUri)).spec;
-    aItem.iconSrc = faviconURL;
-
-    let xpFaviconURI = makeURI(faviconURL.replace("moz-anno:favicon:",""));
-    Task.spawn(function() {
-      let colorInfo = yield ColorUtils.getForegroundAndBackgroundIconColors(xpFaviconURI);
-      if (!(colorInfo && colorInfo.background && colorInfo.foreground)) {
-        return;
-      }
-      let { background, foreground } = colorInfo;
-      aItem.style.color = foreground; //color text
-      aItem.setAttribute("customColor", background);
-      let matteColor =  0xffffff; // white
-      let alpha = 0.04; // the tint weight
-      let [,r,g,b] = background.match(/rgb\((\d+),(\d+),(\d+)/);
-      // get the rgb value that represents this color at given opacity over a white matte
-      let tintColor = ColorUtils.addRgbColors(matteColor, ColorUtils.createDecimalColorWord(r,g,b,alpha));
-      aItem.setAttribute("tintColor", ColorUtils.convertDecimalToRgbColor(tintColor));
-      // when bound, use the setter to propogate the color change through the tile
-      if ('color' in aItem) {
-        aItem.color = background;
-      }
-    });
-  },
-
-  refreshView: function () {
-  },
-
-  observe: function (aSubject, aTopic, aState) {
-    switch (aTopic) {
-      case "nsPref:changed": {
-        if (aState == this._tilePrefName) {
-          let count = Services.prefs.getIntPref(this._tilePrefName);
-          this.maxTiles = count;
-          this.showing = this.maxTiles > 0;
-          this.refreshView();
-        }
-        break;
-      }
-    }
-  }
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-DIRS += [
-    'base',
-    'components',
-    'modules',
-    'theme',
-    'profile',
-    'locales',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DIRS += ['shell']
-
-DIST_SUBDIR = 'metro'
-
-if CONFIG['MOZILLA_OFFICIAL']:
-    DEFINES['MOZILLA_OFFICIAL'] = True
-
-DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE']
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/profile/metro.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/profile/metro.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/profile/metro.js	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/profile/metro.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,681 +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/. */
-
-#filter substitution
-
-#ifdef DEBUG
-// disable content and content script caching
-pref("nglayout.debug.disable_xul_cache", true);
-pref("nglayout.debug.disable_xul_fastload", true);
-pref("devtools.errorconsole.enabled", true);
-pref("devtools.chrome.enabled", true);
-#else
-pref("devtools.errorconsole.enabled", false);
-pref("devtools.chrome.enabled", false);
-#endif
-
-// Automatically submit crash reports
-#ifdef RELEASE_BUILD
-pref("app.crashreporter.autosubmit", false);
-pref("app.crashreporter.submitURLs", false);
-#else
-// For Nightly and Aurora we turn this on by default
-pref("app.crashreporter.autosubmit", true);
-pref("app.crashreporter.submitURLs", false);
-#endif
-// Has the user been prompted about crash reporting?
-pref("app.crashreporter.prompted", false);
-
-// Debug prefs, see input.js
-pref("metro.debug.colorizeInputOverlay", false);
-pref("metro.debug.selection.displayRanges", false);
-pref("metro.debug.selection.dumpRanges", false);
-pref("metro.debug.selection.dumpEvents", false);
-
-// Private browsing is disabled by default until implementation and testing are complete
-pref("metro.private_browsing.enabled", false);
-
-// Enable tab-modal prompts
-pref("prompts.tab_modal.enabled", true);
-
-// NewTabUtils pref related to top site thumbnail updating.
-pref("browser.newtabpage.enabled", true);
-
-// Enable off main thread compositing
-pref("layers.offmainthreadcomposition.enabled", true);
-pref("layers.async-pan-zoom.enabled", true);
-pref("layers.componentalpha.enabled", false);
-
-// Prefs to control the async pan/zoom behaviour
-pref("apz.touch_start_tolerance", "0.1"); // dpi * tolerance = pixel threshold
-pref("apz.pan_repaint_interval", 50);   // prefer 20 fps
-pref("apz.fling_repaint_interval", 50); // prefer 20 fps
-pref("apz.smooth_scroll_repaint_interval", 50); // prefer 20 fps
-pref("apz.fling_stopped_threshold", "0.2");
-pref("apz.x_skate_size_multiplier", "2.5");
-pref("apz.y_skate_size_multiplier", "2.5");
-pref("apz.min_skate_speed", "10.0");
-// 0 = free, 1 = standard, 2 = sticky
-pref("apz.axis_lock.mode", 2);
-pref("apz.cross_slide.enabled", true);
-
-// Enable Microsoft TSF support by default for imes.
-pref("intl.tsf.enable", true);
-pref("intl.tsf.support_imm", false);
-pref("intl.tsf.hack.atok.create_native_caret", false);
-
-pref("general.autoScroll", true);
-pref("general.smoothScroll", true);
-pref("general.smoothScroll.durationToIntervalRatio", 200);
-pref("mousewheel.enable_pixel_scrolling", true);
-
-// For browser.xml binding
-//
-// cacheRatio* is a ratio that determines the amount of pixels to cache. The
-// ratio is multiplied by the viewport width or height to get the displayport's
-// width or height, respectively.
-//
-// (divide integer value by 1000 to get the ratio)
-//
-// For instance: cachePercentageWidth is 1500
-//               viewport height is 500
-//               => display port height will be 500 * 1.5 = 750
-//
-pref("toolkit.browser.cacheRatioWidth", 2000);
-pref("toolkit.browser.cacheRatioHeight", 3000);
-
-// How long before a content view (a handle to a remote scrollable object)
-// expires.
-pref("toolkit.browser.contentViewExpire", 3000);
-
-
-pref("toolkit.defaultChromeURI", "chrome://browser/content/browser.xul");
-pref("browser.chromeURL", "chrome://browser/content/");
-
-// Telemetry
-#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
-pref("toolkit.telemetry.enabledPreRelease", true);
-#else
-pref("toolkit.telemetry.enabled", true);
-#endif
-pref("toolkit.telemetry.prompted", 2);
-
-pref("toolkit.screen.lock", false);
-
-// From libpref/src/init/all.js. Disabling text zoom in favor of APZ zoom. See bug 936940.
-pref("zoom.minPercent", 100);
-pref("zoom.maxPercent", 100);
-pref("toolkit.zoomManager.zoomValues", "1");
-
-// Device pixel to CSS px ratio, in percent. Set to -1 to calculate based on display density.
-pref("browser.viewport.scaleRatio", -1);
-
-// use long press to display a context menu
-pref("ui.click_hold_context_menus", false);
-
-// offline cache prefs
-pref("browser.offline-apps.notify", true);
-
-// protocol warning prefs
-pref("network.protocol-handler.warn-external.tel", false);
-pref("network.protocol-handler.warn-external.mailto", false);
-pref("network.protocol-handler.warn-external.vnd.youtube", false);
-pref("network.protocol-handler.warn-external.ms-windows-store", false);
-pref("network.protocol-handler.external.ms-windows-store", true);
-
-/* startui prefs */
-// display the overlay nav buttons
-pref("browser.display.overlaynavbuttons", true);
-// max number of top site tiles to display in the startui
-pref("browser.display.startUI.topsites.maxresults", 8);
-// max items for the bookmarks compartment in the startui
-pref("browser.display.startUI.bookmarks.maxresults", 16);
-// max items for the history compartment in the startui
-pref("browser.display.startUI.history.maxresults", 16);
-// Number of times to display firstrun instructions on new tab page
-pref("browser.firstrun.count", 3);
-// Has the content first run been dismissed
-pref("browser.firstrun-content.dismissed", false);
-
-// Backspace and Shift+Backspace behavior
-// 0 goes Back/Forward
-// 1 act like PgUp/PgDown
-// 2 and other values, nothing
-pref("browser.backspace_action", 0);
-
-// session history
-pref("browser.sessionhistory.max_entries", 50);
-
-// On startup, don't automatically restore tabs
-pref("browser.startup.page", 1);
-
-/* session store */
-pref("browser.sessionstore.resume_from_crash", true);
-pref("browser.sessionstore.resume_session_once", false);
-pref("browser.sessionstore.resume_from_crash_timeout", 60); // minutes
-// minimal interval between two save operations in milliseconds
-pref("browser.sessionstore.interval", 15000); // milliseconds
-// maximum amount of POSTDATA to be saved in bytes per history entry (-1 = all of it)
-// (NB: POSTDATA will be saved either entirely or not at all)
-pref("browser.sessionstore.postdata", 0);
-// on which sites to save text data, POSTDATA and cookies
-// 0 = everywhere, 1 = unencrypted sites, 2 = nowhere
-pref("browser.sessionstore.privacy_level", 0);
-// the same as browser.sessionstore.privacy_level, but for saving deferred session data
-pref("browser.sessionstore.privacy_level_deferred", 1);
-// how many tabs can be reopened (per window)
-pref("browser.sessionstore.max_tabs_undo", 10);
-// number of crashes that can occur before the about:sessionrestore page is displayed
-// (this pref has no effect if more than 6 hours have passed since the last crash)
-pref("browser.sessionstore.max_resumed_crashes", 1);
-// restore_on_demand overrides MAX_CONCURRENT_TAB_RESTORES (sessionstore constant)
-// and restore_hidden_tabs. When true, tabs will not be restored until they are
-// focused (also applies to tabs that aren't visible). When false, the values
-// for MAX_CONCURRENT_TAB_RESTORES and restore_hidden_tabs are respected.
-// Selected tabs are always restored regardless of this pref.
-pref("browser.sessionstore.restore_on_demand", true);
-
-/* these should help performance */
-pref("mozilla.widget.force-24bpp", true);
-pref("mozilla.widget.use-buffer-pixmap", true);
-pref("mozilla.widget.disable-native-theme", false);
-pref("layout.reflow.synthMouseMove", false);
-
-/* "Preview" of framerate increase for animations, discussed in 710563. */
-pref("layout.frame_rate.precise", true);
-
-/* download manager (don't show the window or alert) */
-pref("browser.download.useDownloadDir", true);
-pref("browser.download.folderList", 1); // Default to ~/Downloads
-pref("browser.download.manager.showAlertOnComplete", false);
-pref("browser.download.manager.showAlertInterval", 2000);
-pref("browser.download.manager.retention", 2);
-pref("browser.download.manager.showWhenStarting", false);
-pref("browser.download.manager.closeWhenDone", true);
-pref("browser.download.manager.openDelay", 0);
-pref("browser.download.manager.focusWhenStarting", false);
-pref("browser.download.manager.flashCount", 2);
-pref("browser.download.manager.addToRecentDocs", true);
-pref("browser.download.manager.displayedHistoryDays", 7);
-pref("browser.download.manager.resumeOnWakeDelay", 10000);
-pref("browser.download.manager.quitBehavior", 0);
-
-/* download alerts (disabled above) */
-pref("alerts.totalOpenTime", 6000);
-
-/* download helper */
-pref("browser.helperApps.deleteTempFileOnExit", false);
-
-/* password manager */
-pref("signon.rememberSignons", true);
-
-// this will automatically enable inline spellchecking (if it is available) for
-// editable elements in HTML
-// 0 = spellcheck nothing
-// 1 = check multi-line controls [default]
-// 2 = check multi/single line controls
-pref("layout.spellcheckDefault", 1);
-
-/* extension manager and xpinstall */
-// Completely disable extensions
-pref("extensions.defaultProviders.enabled", false);
-// Disable version checks making addons compatible by default
-pref("extensions.strictCompatibility", false);
-// Disable all add-on locations other than the profile
-pref("extensions.enabledScopes", 1);
-// Auto-disable any add-ons that are "dropped in" to the profile
-pref("extensions.autoDisableScopes", 1);
-// Disable add-on installation via the web-exposed APIs
-pref("xpinstall.enabled", false);
-pref("xpinstall.whitelist.add", "addons.mozilla.org");
-pref("extensions.autoupdate.enabled", false);
-pref("extensions.update.enabled", false);
-
-/* blocklist preferences */
-pref("extensions.blocklist.enabled", true);
-pref("extensions.blocklist.interval", 86400);
-pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
-pref("extensions.blocklist.detailsURL", "https://www.mozilla.org/%LOCALE%/blocklist/");
-pref("extensions.showMismatchUI", false);
-
-/* block popups by default, and notify the user about blocked popups */
-pref("dom.disable_open_during_load", true);
-pref("privacy.popups.showBrowserMessage", true);
-
-// Metro Firefox keeps this set to -1 when donottrackheader.enabled is false.
-pref("privacy.donottrackheader.value", -1);
-
-/* disable opening windows with the dialog feature */
-pref("dom.disable_window_open_dialog_feature", true);
-
-pref("keyword.enabled", true);
-pref("browser.fixup.domainwhitelist.localhost", true);
-
-pref("accessibility.typeaheadfind", false);
-pref("accessibility.typeaheadfind.timeout", 5000);
-pref("accessibility.typeaheadfind.flashBar", 1);
-pref("accessibility.typeaheadfind.linksonly", false);
-pref("accessibility.typeaheadfind.casesensitive", 0);
-
-// Trun on F7 caret browsing hot key
-pref("accessibility.browsewithcaret_shortcut.enabled", true);
-pref("accessibility.browsewithcaret", false);
-
-// Whether or not we show a dialog box informing the user that the update was
-// successfully applied.
-pref("app.update.showInstalledUI", false);
-
-// pointer to the default engine name
-pref("browser.search.defaultenginename", "chrome://browser/locale/region.properties");
-
-// SSL error page behaviour
-pref("browser.ssl_override_behavior", 2);
-pref("browser.xul.error_pages.expert_bad_cert", false);
-
-// disable logging for the search service by default
-pref("browser.search.log", false);
-
-// ordering of search engines in the engine list.
-pref("browser.search.order.1", "chrome://browser/locale/region.properties");
-pref("browser.search.order.2", "chrome://browser/locale/region.properties");
-pref("browser.search.order.3", "chrome://browser/locale/region.properties");
-
-// send ping to the server to update
-pref("browser.search.update", true);
-
-// disable logging for the search service update system by default
-pref("browser.search.update.log", false);
-
-// Check whether we need to perform engine updates every 6 hours
-pref("browser.search.update.interval", 21600);
-
-// enable search suggestions by default
-pref("browser.search.suggest.enabled", true);
-
-// tell the search service that we don't really expose the "current engine"
-pref("browser.search.noCurrentEngine", true);
-
-#ifdef MOZ_OFFICIAL_BRANDING
-// {moz:official} expands to "official"
-pref("browser.search.official", true);
-#endif
-
-// enable xul error pages
-pref("browser.xul.error_pages.enabled", true);
-
-// Let the faviconservice know that we display favicons as 25x25px so that it
-// uses the right size when optimizing favicons
-pref("places.favicons.optimizeToDimension", 25);
-
-// The default behavior for the urlbar can be configured to use any combination
-// of the match filters with each additional filter adding more results (union).
-pref("browser.urlbar.suggest.history",              true);
-pref("browser.urlbar.suggest.bookmark",             true);
-pref("browser.urlbar.suggest.openpage",             true);
-pref("browser.urlbar.suggest.search",               true);
-
-// Restrictions to current suggestions can also be applied (intersection).
-// Typed suggestion works only if history is set to true.
-pref("browser.urlbar.suggest.history.onlyTyped",    false);
-
-// various and sundry awesomebar prefs (should remove/re-evaluate
-// these once bug 447900 is fixed)
-pref("browser.urlbar.trimURLs", true);
-pref("browser.urlbar.formatting.enabled", true);
-pref("browser.urlbar.clickSelectsAll", true);
-pref("browser.urlbar.doubleClickSelectsAll", true);
-pref("browser.urlbar.autoFill", false);
-pref("browser.urlbar.matchOnlyTyped", false);
-pref("browser.urlbar.matchBehavior", 1);
-pref("browser.urlbar.filter.javascript", true);
-pref("browser.urlbar.maxRichResults", 8);
-pref("browser.urlbar.search.chunkSize", 1000);
-pref("browser.urlbar.search.timeout", 100);
-pref("browser.urlbar.restrict.history", "^");
-pref("browser.urlbar.restrict.bookmark", "*");
-pref("browser.urlbar.restrict.tag", "+");
-pref("browser.urlbar.match.title", "#");
-pref("browser.urlbar.match.url", "@");
-pref("browser.history.grouping", "day");
-pref("browser.history.showSessions", false);
-pref("browser.sessionhistory.max_entries", 50);
-pref("browser.history_expire_sites", 40000);
-pref("browser.places.migratePostDataAnnotations", true);
-pref("browser.places.updateRecentTagsUri", true);
-pref("places.frecency.numVisits", 10);
-pref("places.frecency.numCalcOnIdle", 50);
-pref("places.frecency.numCalcOnMigrate", 50);
-pref("places.frecency.updateIdleTime", 60000);
-pref("places.frecency.firstBucketCutoff", 4);
-pref("places.frecency.secondBucketCutoff", 14);
-pref("places.frecency.thirdBucketCutoff", 31);
-pref("places.frecency.fourthBucketCutoff", 90);
-pref("places.frecency.firstBucketWeight", 100);
-pref("places.frecency.secondBucketWeight", 70);
-pref("places.frecency.thirdBucketWeight", 50);
-pref("places.frecency.fourthBucketWeight", 30);
-pref("places.frecency.defaultBucketWeight", 10);
-pref("places.frecency.embedVisitBonus", 0);
-pref("places.frecency.linkVisitBonus", 100);
-pref("places.frecency.typedVisitBonus", 2000);
-pref("places.frecency.bookmarkVisitBonus", 150);
-pref("places.frecency.downloadVisitBonus", 0);
-pref("places.frecency.permRedirectVisitBonus", 0);
-pref("places.frecency.tempRedirectVisitBonus", 0);
-pref("places.frecency.defaultVisitBonus", 0);
-pref("places.frecency.unvisitedBookmarkBonus", 140);
-pref("places.frecency.unvisitedTypedBonus", 200);
-
-// disable color management
-pref("gfx.color_management.mode", 0);
-
-// don't allow JS to move and resize existing windows
-pref("dom.disable_window_move_resize", true);
-
-// prevent click image resizing for nsImageDocument
-pref("browser.enable_click_image_resizing", false);
-
-// open in tab preferences
-// 0=default window, 1=current window/tab, 2=new window, 3=new tab in most window
-pref("browser.link.open_external", 3);
-pref("browser.link.open_newwindow", 3);
-// 0=force all new windows to tabs, 1=don't force, 2=only force those with no features set
-pref("browser.link.open_newwindow.restriction", 0);
-
-// controls which bits of private data to clear. by default we clear them all.
-pref("privacy.item.cache", true);
-pref("privacy.item.cookies", true);
-pref("privacy.item.offlineApps", true);
-pref("privacy.item.history", true);
-pref("privacy.item.formdata", true);
-pref("privacy.item.downloads", true);
-pref("privacy.item.passwords", true);
-pref("privacy.item.sessions", true);
-pref("privacy.item.geolocation", true);
-pref("privacy.item.siteSettings", true);
-pref("privacy.item.syncAccount", true);
-
-pref("plugins.force.wmode", "opaque");
-
-// What default should we use for the time span in the sanitizer:
-// 0 - Clear everything
-// 1 - Last Hour
-// 2 - Last 2 Hours
-// 3 - Last 4 Hours
-// 4 - Today
-pref("privacy.sanitize.timeSpan", 1);
-pref("privacy.sanitize.sanitizeOnShutdown", false);
-pref("privacy.sanitize.migrateFx3Prefs",    false);
-
-// enable geo
-pref("geo.enabled", true);
-pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
-
-// snapped view
-pref("browser.ui.snapped.maxWidth", 600);
-
-// kinetic tweakables
-pref("browser.ui.kinetic.updateInterval", 16);
-pref("browser.ui.kinetic.exponentialC", 1400);
-pref("browser.ui.kinetic.polynomialC", 100);
-pref("browser.ui.kinetic.swipeLength", 160);
-pref("browser.ui.zoom.animationDuration", 200); // ms duration of double-tap zoom animation
-
-pref("ui.mouse.radius.enabled", true);
-pref("ui.touch.radius.enabled", true);
-
-// plugins
-pref("plugin.disable", true);
-pref("dom.ipc.plugins.enabled", true);
-
-// process priority
-// higher values give content process less CPU time
-pref("dom.ipc.content.nice", 1);
-
-// product URLs
-// The breakpad report server to link to in about:crashes
-pref("breakpad.reportURL", "https://crash-stats.mozilla.com/report/index/");
-// TODO: This is not the correct article for metro!!!
-pref("app.sync.tutorialURL", "https://support.mozilla.org/kb/sync-firefox-between-desktop-and-mobile");
-pref("app.support.baseURL", "https://support.mozilla.org/1/touch/%VERSION%/%OS%/%LOCALE%/");
-pref("app.support.inputURL", "https://input.mozilla.org/feedback/metrofirefox");
-pref("app.privacyURL", "http://www.mozilla.org/%LOCALE%/legal/privacy/firefox.html");
-pref("app.creditsURL", "http://www.mozilla.org/credits/");
-pref("app.channelURL", "http://www.mozilla.org/%LOCALE%/firefox/channel/");
-
-// Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
-pref("security.alternate_certificate_error_page", "certerror");
-
-pref("security.warn_viewing_mixed", false); // Warning is disabled.  See Bug 616712.
-
-// Override some named colors to avoid inverse OS themes
-
-/* app update prefs */
-
-#ifdef MOZ_UPDATER
-
-// Whether or not app updates are enabled
-pref("app.update.enabled", true);
-
-// This preference turns on app.update.mode and allows automatic download and
-// install to take place. We use a separate boolean toggle for this to make
-// the UI easier to construct.
-pref("app.update.auto", true);
-
-// See chart in nsUpdateService.js source for more details
-pref("app.update.mode", 0);
-
-// Enables update checking in the Metro environment.
-// add-on incompatibilities are ignored by updates in Metro.
-pref("app.update.metro.enabled", true);
-
-// If set to true, the Update Service will present no UI for any event.
-pref("app.update.silent", true);
-
-// If set to true, the Update Service will apply updates in the background
-// when it finishes downloading them.
-pref("app.update.staging.enabled", true);
-
-// Update service URL:
-pref("app.update.url", "https://aus4.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
-
-// Show the Update Checking/Ready UI when the user was idle for x seconds
-pref("app.update.idletime", 60);
-
-// Whether or not we show a dialog box informing the user that the update was
-// successfully applied. This is off in Firefox by default since we show a
-// upgrade start page instead! Other apps may wish to show this UI, and supply
-// a whatsNewURL field in their brand.properties that contains a link to a page
-// which tells users what's new in this new update.
-pref("app.update.showInstalledUI", false);
-
-// 0 = suppress prompting for incompatibilities if there are updates available
-//     to newer versions of installed addons that resolve them.
-// 1 = suppress prompting for incompatibilities only if there are VersionInfo
-//     updates available to installed addons that resolve them, not newer
-//     versions.
-pref("app.update.incompatible.mode", 0);
-
-// Whether or not to attempt using the service for updates.
-#ifdef MOZ_MAINTENANCE_SERVICE
-pref("app.update.service.enabled", true);
-#endif
-
-// The minimum delay in seconds for the timer to fire.
-// default=2 minutes
-pref("app.update.timerMinimumDelay", 120);
-
-// Enables some extra Application Update Logging (can reduce performance)
-pref("app.update.log", false);
-
-// The number of general background check failures to allow before notifying the
-// user of the failure. User initiated update checks always notify the user of
-// the failure.
-pref("app.update.backgroundMaxErrors", 10);
-
-// The aus update xml certificate checks for application update are disabled on
-// Windows since the mar signature check which is currently only implemented on
-// Windows is sufficient for preventing us from applying a mar that is not
-// valid.
-
-// When |app.update.cert.requireBuiltIn| is true or not specified the
-// final certificate and all certificates the connection is redirected to before
-// the final certificate for the url specified in the |app.update.url|
-// preference must be built-in.
-pref("app.update.cert.requireBuiltIn", false);
-
-// When |app.update.cert.checkAttributes| is true or not specified the
-// certificate attributes specified in the |app.update.certs.| preference branch
-// are checked against the certificate for the url specified by the
-// |app.update.url| preference.
-pref("app.update.cert.checkAttributes", false);
-
-// User-settable override to app.update.url for testing purposes.
-//pref("app.update.url.override", "");
-
-// replace newlines with spaces on paste into single-line text boxes
-pref("editor.singleLine.pasteNewlines", 2);
-
-#ifdef MOZ_SERVICES_SYNC
-// sync service
-pref("services.sync.registerEngines", "Tab,Bookmarks,Form,History,Password,Prefs");
-
-// prefs to sync by default
-pref("services.sync.prefs.sync.browser.tabs.warnOnClose", true);
-pref("services.sync.prefs.sync.devtools.errorconsole.enabled", true);
-pref("services.sync.prefs.sync.lightweightThemes.selectedThemeID", true);
-pref("services.sync.prefs.sync.lightweightThemes.usedThemes", true);
-pref("services.sync.prefs.sync.privacy.donottrackheader.enabled", true);
-pref("services.sync.prefs.sync.privacy.donottrackheader.value", true);
-pref("services.sync.prefs.sync.signon.rememberSignons", true);
-#endif
-
-// threshold where a tap becomes a drag, in 1/240" reference pixels
-// The names of the preferences are to be in sync with EventStateManager.cpp
-pref("ui.dragThresholdX", 50);
-pref("ui.dragThresholdY", 50);
-
-// prevent tooltips from showing up
-pref("browser.chrome.toolbar_tips", false);
-
-#ifdef NIGHTLY_BUILD
-// Completely disable pdf.js as an option to preview pdfs within firefox.
-// Note: if this is not disabled it does not necessarily mean pdf.js is the pdf
-// handler just that it is an option.
-pref("pdfjs.disabled", true);
-// Used by pdf.js to know the first time firefox is run with it installed so it
-// can become the default pdf viewer.
-pref("pdfjs.firstRun", true);
-// The values of preferredAction and alwaysAskBeforeHandling before pdf.js
-// became the default.
-pref("pdfjs.previousHandler.preferredAction", 0);
-pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
-#endif
-
-#ifdef NIGHTLY_BUILD
-// Shumay is currently experimental.  Toggle this pref to enable Shumway for
-// testing and development.
-pref("shumway.disabled", true);
-// When Shumway is enabled, use it all the time, not only when Flash is set to
-// click-to-play (because Metro doesn't even load the native Flash plugin).
-pref("shumway.ignoreCTP", true);
-#endif
-
-// The maximum amount of decoded image data we'll willingly keep around (we
-// might keep around more than this, but we'll try to get down to this value).
-// (This is intentionally on the high side; see bug 746055.)
-pref("image.mem.max_decoded_image_kb", 256000);
-
-// enable touch events interfaces
-pref("dom.w3c_touch_events.enabled", 1);
-pref("dom.w3c_touch_events.safetyX", 5); // escape borders in units of 1/240"
-pref("dom.w3c_touch_events.safetyY", 20); // escape borders in units of 1/240"
-
-#ifdef MOZ_SAFE_BROWSING
-// Safe browsing does nothing unless this pref is set
-pref("browser.safebrowsing.enabled", true);
-
-// Prevent loading of pages identified as malware
-pref("browser.safebrowsing.malware.enabled", true);
-
-// Non-enhanced mode (local url lists) URL list to check for updates
-pref("browser.safebrowsing.provider.0.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2&key=%GOOGLE_API_KEY%");
-
-pref("browser.safebrowsing.dataProvider", 0);
-
-// Does the provider name need to be localizable?
-pref("browser.safebrowsing.provider.0.name", "Google");
-pref("browser.safebrowsing.provider.0.reportURL", "https://safebrowsing.google.com/safebrowsing/report?");
-pref("browser.safebrowsing.provider.0.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client={moz:client}&appver={moz:version}&pver=2.2");
-
-// HTML report pages
-pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}");
-pref("browser.safebrowsing.provider.0.reportErrorURL", "http://{moz:locale}.phish-error.mozilla.com/?hl={moz:locale}");
-pref("browser.safebrowsing.provider.0.reportPhishURL", "http://{moz:locale}.phish-report.mozilla.com/?hl={moz:locale}");
-pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://{moz:locale}.malware-report.mozilla.com/?hl={moz:locale}");
-pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://{moz:locale}.malware-error.mozilla.com/?hl={moz:locale}");
-
-// FAQ URLs
-pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/geolocation/");
-
-// Name of the about: page contributed by safebrowsing to handle display of error
-// pages on phishing/malware hits.  (bug 399233)
-pref("urlclassifier.alternate_error_page", "blocked");
-
-// The number of random entries to send with a gethash request.
-pref("urlclassifier.gethashnoise", 4);
-
-// Gethash timeout for Safebrowsing.
-pref("urlclassifier.gethash.timeout_ms", 5000);
-
-// If an urlclassifier table has not been updated in this number of seconds,
-// a gethash request will be forced to check that the result is still in
-// the database.
-pref("urlclassifier.max-complete-age", 2700);
-
-// Maximum size of the sqlite3 cache during an update, in bytes
-pref("urlclassifier.updatecachemax", 41943040);
-
-// URL for checking the reason for a malware warning.
-pref("browser.safebrowsing.malware.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
-#endif
-
-// True if this is the first time we are showing about:firstrun
-pref("browser.firstrun.show.localepicker", false);
-
-// True if you always want dump() to work
-pref("javascript.options.showInConsole", true);
-pref("browser.dom.window.dump.enabled", true);
-
-// controls if we want camera support
-pref("device.camera.enabled", true);
-pref("media.realtime_decoder.enabled", true);
-
-// Metro manages state by autodetection
-pref("network.manage-offline-status", true);
-
-// Enable HTML fullscreen API in content.
-pref("full-screen-api.enabled", true);
-// But don't require approval when content enters fullscreen; we'll keep our
-// UI/chrome visible still, so there's no need to approve entering fullscreen.
-pref("full-screen-api.approval-required", false);
-// Don't allow fullscreen requests to percolate across content/chrome boundary,
-// so that our chrome/UI remains visible after content enters fullscreen.
-pref("full-screen-api.content-only", true);
-// Don't make top-level widgets fullscreen. This only applies when running in
-// "metrodesktop" mode, not when running in full metro mode. This prevents the
-// window from changing size when we go fullscreen; the content expands to fill
-// the window, the window size doesn't change. This pref has no effect when
-// running in actual Metro mode, as the widget will already be fullscreen then.
-pref("full-screen-api.ignore-widgets", true);
-
-// image visibility prefs.
-// image visibility tries to only keep images near the viewport decoded instead
-// of keeping all images decoded.
-pref("layout.imagevisibility.numscrollportwidths", 1);
-pref("layout.imagevisibility.numscrollportheights", 1);
-
-// Don't enable <input type=color> yet as we don't have a color picker
-// implemented for Windows Metro (bug 895464)
-pref("dom.forms.color", false);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/profile/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/profile/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/profile/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/profile/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-JS_PREFERENCE_FILES += [
-    'metro.js',
-]
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CEHHelper.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CEHHelper.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CEHHelper.cpp	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CEHHelper.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,182 +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 "CEHHelper.h"
-#include <tlhelp32.h>
-#include "mozilla/widget/MetroD3DCheckHelper.h"
-
-#ifdef SHOW_CONSOLE
-#include <io.h> // _open_osfhandle
-#endif
-
-HANDLE sCon;
-LPCWSTR metroDX10Available = L"MetroD3DAvailable";
-LPCWSTR metroLastAHE = L"MetroLastAHE";
-LPCWSTR cehDumpDebugStrings = L"CEHDump";
-extern const WCHAR* kFirefoxExe;
-
-void
-Log(const wchar_t *fmt, ...)
-{
-#if !defined(SHOW_CONSOLE)
-  DWORD dwRes = 0;
-  if (!GetDWORDRegKey(cehDumpDebugStrings, dwRes) || !dwRes) {
-    return;
-  }
-#endif
-  va_list a = nullptr;
-  wchar_t szDebugString[1024];
-  if(!lstrlenW(fmt))
-    return;
-  va_start(a,fmt);
-  vswprintf(szDebugString, 1024, fmt, a);
-  va_end(a);
-  if(!lstrlenW(szDebugString))
-    return;
-
-  DWORD len;
-  WriteConsoleW(sCon, szDebugString, lstrlenW(szDebugString), &len, nullptr);
-  WriteConsoleW(sCon, L"\n", 1, &len, nullptr);
-
-  OutputDebugStringW(szDebugString);
-  OutputDebugStringW(L"\n");
-}
-
-#if defined(SHOW_CONSOLE)
-void
-SetupConsole()
-{
-  FILE *fp;
-  AllocConsole();
-  sCon = GetStdHandle(STD_OUTPUT_HANDLE); 
-  int fd = _open_osfhandle(reinterpret_cast<intptr_t>(sCon), 0);
-  fp = _fdopen(fd, "w");
-  *stdout = *fp;
-  setvbuf(stdout, nullptr, _IONBF, 0);
-}
-#endif
-
-bool
-IsImmersiveProcessDynamic(HANDLE process)
-{
-  HMODULE user32DLL = LoadLibraryW(L"user32.dll");
-  if (!user32DLL) {
-    return false;
-  }
-
-  decltype(IsImmersiveProcess)* IsImmersiveProcessPtr =
-    (decltype(IsImmersiveProcess)*) GetProcAddress(user32DLL,
-                                                   "IsImmersiveProcess");
-  if (!IsImmersiveProcessPtr) {
-    FreeLibrary(user32DLL);
-    return false;
-  }
-
-  BOOL bImmersiveProcess = IsImmersiveProcessPtr(process);
-  FreeLibrary(user32DLL);
-  return bImmersiveProcess;
-}
-
-bool
-IsProcessRunning(const wchar_t *processName, bool bCheckIfMetro)
-{
-  bool exists = false;
-  PROCESSENTRY32W entry;
-  entry.dwSize = sizeof(PROCESSENTRY32W);
-
-  HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-
-  if (Process32First(snapshot, &entry)) {
-    while (!exists && Process32Next(snapshot, &entry)) {
-      if (!_wcsicmp(entry.szExeFile, processName)) {
-        HANDLE process = OpenProcess(GENERIC_READ, FALSE, entry.th32ProcessID);
-        bool isImmersiveProcess = IsImmersiveProcessDynamic(process);
-        if ((bCheckIfMetro && isImmersiveProcess) ||
-            (!bCheckIfMetro && !isImmersiveProcess)) {
-          exists = true;
-        }
-        CloseHandle(process);
-      }
-    }
-  }
-
-  CloseHandle(snapshot);
-  return exists;
-}
-
-bool
-IsMetroProcessRunning()
-{
-  return IsProcessRunning(kFirefoxExe, true);
-}
-
-bool
-IsDesktopProcessRunning()
-{
-  return IsProcessRunning(kFirefoxExe, false);
-}
-
-/*
- * Retrieve the last front end ui we launched so we can target it
- * again. This value is updated down in nsAppRunner when the browser
- * starts up.
- */
-AHE_TYPE
-GetLastAHE()
-{
-  DWORD ahe;
-  if (GetDWORDRegKey(metroLastAHE, ahe)) {
-    return (AHE_TYPE) ahe;
-  }
-  return AHE_DESKTOP;
-}
-
-bool
-IsDX10Available()
-{
-  DWORD isDX10Available;
-  if (GetDWORDRegKey(metroDX10Available, isDX10Available)) {
-    return isDX10Available;
-  }
-  bool check = D3DFeatureLevelCheck();
-  SetDWORDRegKey(metroDX10Available, check);
-  return check;
-}
-
-bool
-GetDWORDRegKey(LPCWSTR name, DWORD &value)
-{
-  HKEY key;
-  LONG result = RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Mozilla\\Firefox",
-                              0, KEY_READ, &key);
-  if (result != ERROR_SUCCESS) {
-    return false;
-  }
-
-  DWORD bufferSize = sizeof(DWORD);
-  DWORD type;
-  result = RegQueryValueExW(key, name, nullptr, &type,
-                            reinterpret_cast<LPBYTE>(&value),
-                            &bufferSize);
-  RegCloseKey(key);
-  return result == ERROR_SUCCESS;
-}
-
-bool
-SetDWORDRegKey(LPCWSTR name, DWORD value)
-{
-  HKEY key;
-  LONG result = RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Mozilla\\Firefox",
-                              0, KEY_WRITE, &key);
-  if (result != ERROR_SUCCESS) {
-    return false;
-  }
-
-  result = RegSetValueEx(key, name, 0, REG_DWORD,
-                         reinterpret_cast<LPBYTE>(&value),
-                         sizeof(DWORD));
-  RegCloseKey(key);
-  return result == ERROR_SUCCESS;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CEHHelper.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CEHHelper.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CEHHelper.h	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CEHHelper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +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/. */
-
-#undef WINVER
-#undef _WIN32_WINNT
-#define WINVER 0x602
-#define _WIN32_WINNT 0x602
-
-#include <windows.h>
-#include <atlbase.h>
-#include <shlobj.h>
-
-//#define SHOW_CONSOLE 1
-extern HANDLE sCon;
-
-void Log(const wchar_t *fmt, ...);
-
-#if defined(SHOW_CONSOLE)
-void SetupConsole();
-#endif
-
-AHE_TYPE GetLastAHE();
-bool SetLastAHE(AHE_TYPE ahe);
-bool IsDX10Available();
-bool GetDWORDRegKey(LPCWSTR name, DWORD &value);
-bool SetDWORDRegKey(LPCWSTR name, DWORD value);
-bool IsImmersiveProcessDynamic(HANDLE process);
-bool IsMetroProcessRunning();
-bool IsDesktopProcessRunning();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.cpp	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,952 +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 "CEHHelper.h"
-
-#include <objbase.h>
-#include <combaseapi.h>
-#include <atlcore.h>
-#include <atlstr.h>
-#include <wininet.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-#include <propkey.h>
-#include <propvarutil.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <strsafe.h>
-#include <io.h>
-#include <shellapi.h>
-
-#ifdef SHOW_CONSOLE
-#define DEBUG_DELAY_SHUTDOWN 1
-#endif
-
-// Heartbeat timer duration used while waiting for an incoming request.
-#define HEARTBEAT_MSEC 250
-// Total number of heartbeats we wait before giving up and shutting down.
-#define REQUEST_WAIT_TIMEOUT 30
-// Pulled from desktop browser's shell
-#define APP_REG_NAME L"Firefox"
-
-const WCHAR* kFirefoxExe = L"firefox.exe";
-static const WCHAR* kDefaultMetroBrowserIDPathKey = L"FirefoxURL";
-static const WCHAR* kMetroRestartCmdLine = L"--metro-restart";
-static const WCHAR* kMetroUpdateCmdLine = L"--metro-update";
-static const WCHAR* kDesktopRestartCmdLine = L"--desktop-restart";
-static const WCHAR* kNsisLaunchCmdLine = L"--launchmetro";
-static const WCHAR* kExplorerLaunchCmdLine = L"-Embedding";
-
-static bool GetDefaultBrowserPath(CStringW& aPathBuffer);
-
-/*
- * Retrieve our module dir path.
- *
- * @aPathBuffer Buffer to fill
- */
-static bool GetModulePath(CStringW& aPathBuffer)
-{
-  WCHAR buffer[MAX_PATH];
-  memset(buffer, 0, sizeof(buffer));
-
-  if (!GetModuleFileName(nullptr, buffer, MAX_PATH)) {
-    Log(L"GetModuleFileName failed.");
-    return false;
-  }
-
-  WCHAR* slash = wcsrchr(buffer, '\\');
-  if (!slash)
-    return false;
-  *slash = '\0';
-
-  aPathBuffer = buffer;
-  return true;
-}
-
-
-template <class T>void SafeRelease(T **ppT)
-{
-  if (*ppT) {
-    (*ppT)->Release();
-    *ppT = nullptr;
-  }
-}
-
-template <class T> HRESULT SetInterface(T **ppT, IUnknown *punk)
-{
-  SafeRelease(ppT);
-  return punk ? punk->QueryInterface(ppT) : E_NOINTERFACE;
-}
-
-class __declspec(uuid("5100FEC1-212B-4BF5-9BF8-3E650FD794A3"))
-  CExecuteCommandVerb : public IExecuteCommand,
-                        public IObjectWithSelection,
-                        public IInitializeCommand,
-                        public IObjectWithSite,
-                        public IExecuteCommandApplicationHostEnvironment
-{
-public:
-
-  CExecuteCommandVerb() :
-    mRef(0),
-    mShellItemArray(nullptr),
-    mUnkSite(nullptr),
-    mTargetIsFileSystemLink(false),
-    mTargetIsDefaultBrowser(false),
-    mTargetIsBrowser(false),
-    mRequestType(DEFAULT_LAUNCH),
-    mRequestMet(false),
-    mDelayedLaunchType(NONE),
-    mVerb(L"open")
-  {
-  }
-
-  ~CExecuteCommandVerb()
-  {
-  }
-
-  bool RequestMet() { return mRequestMet; }
-  void SetRequestMet();
-  long RefCount() { return mRef; }
-  void HeartBeat();
-
-  // IUnknown
-  IFACEMETHODIMP QueryInterface(REFIID aRefID, void **aInt)
-  {
-    static const QITAB qit[] = {
-      QITABENT(CExecuteCommandVerb, IExecuteCommand),
-      QITABENT(CExecuteCommandVerb, IObjectWithSelection),
-      QITABENT(CExecuteCommandVerb, IInitializeCommand),
-      QITABENT(CExecuteCommandVerb, IObjectWithSite),
-      QITABENT(CExecuteCommandVerb, IExecuteCommandApplicationHostEnvironment),
-      { 0 },
-    };
-    return QISearch(this, qit, aRefID, aInt);
-  }
-
-  IFACEMETHODIMP_(ULONG) AddRef()
-  {
-    return InterlockedIncrement(&mRef);
-  }
-
-  IFACEMETHODIMP_(ULONG) Release()
-  {
-    long cRef = InterlockedDecrement(&mRef);
-    if (!cRef) {
-      delete this;
-    }
-    return cRef;
-  }
-
-  // IExecuteCommand
-  IFACEMETHODIMP SetKeyState(DWORD aKeyState)
-  {
-    mKeyState = aKeyState;
-    return S_OK;
-  }
-
-  IFACEMETHODIMP SetParameters(PCWSTR aParameters)
-  {
-    Log(L"SetParameters: '%s'", aParameters);
-
-    if (!_wcsicmp(aParameters, kMetroRestartCmdLine)) {
-      mRequestType = METRO_RESTART;
-    } else if (_wcsicmp(aParameters, kMetroUpdateCmdLine) == 0) {
-      mRequestType = METRO_UPDATE;
-    } else if (_wcsicmp(aParameters, kDesktopRestartCmdLine) == 0) {
-      mRequestType = DESKTOP_RESTART;
-    } else {
-      mParameters = aParameters;
-    }
-    return S_OK;
-  }
-
-  IFACEMETHODIMP SetPosition(POINT aPoint)
-  { return S_OK; }
-
-  IFACEMETHODIMP SetShowWindow(int aShowFlag)
-  { return S_OK; }
-
-  IFACEMETHODIMP SetNoShowUI(BOOL aNoUI)
-  { return S_OK; }
-
-  IFACEMETHODIMP SetDirectory(PCWSTR aDirPath)
-  { return S_OK; }
-
-  IFACEMETHODIMP Execute();
-
-  // IObjectWithSelection
-  IFACEMETHODIMP SetSelection(IShellItemArray *aArray)
-  {
-    if (!aArray) {
-      return E_FAIL;
-    }
-
-    SetInterface(&mShellItemArray, aArray);
-
-    DWORD count = 0;
-    aArray->GetCount(&count);
-    if (!count) {
-      return E_FAIL;
-    }
-
-#ifdef SHOW_CONSOLE
-    Log(L"SetSelection param count: %d", count);
-    for (DWORD idx = 0; idx < count; idx++) {
-      IShellItem* item = nullptr;
-      if (SUCCEEDED(aArray->GetItemAt(idx, &item))) {
-        LPWSTR str = nullptr;
-        if (FAILED(item->GetDisplayName(SIGDN_FILESYSPATH, &str))) {
-          if (FAILED(item->GetDisplayName(SIGDN_URL, &str))) {
-            Log(L"Failed to get a shell item array item.");
-            item->Release();
-            continue;
-          }
-        }
-        item->Release();
-        Log(L"SetSelection param: '%s'", str);
-        CoTaskMemFree(str);
-      }
-    }
-#endif
-
-    IShellItem* item = nullptr;
-    if (FAILED(aArray->GetItemAt(0, &item))) {
-      return E_FAIL;
-    }
-
-    bool isFileSystem = false;
-    if (!SetTargetPath(item) || !mTarget.GetLength()) {
-      Log(L"SetTargetPath failed.");
-      return E_FAIL;
-    }
-    item->Release();
-
-    Log(L"SetSelection target: %s", mTarget);
-    return S_OK;
-  }
-
-  IFACEMETHODIMP GetSelection(REFIID aRefID, void **aInt)
-  {
-    *aInt = nullptr;
-    return mShellItemArray ? mShellItemArray->QueryInterface(aRefID, aInt) : E_FAIL;
-  }
-
-  // IInitializeCommand
-  IFACEMETHODIMP Initialize(PCWSTR aVerb, IPropertyBag* aPropBag)
-  {
-    if (!aVerb)
-      return E_FAIL;
-    // 'open', 'edit', etc. Based on our registry settings
-    Log(L"Initialize(%s)", aVerb);
-    mVerb = aVerb;
-    return S_OK;
-  }
-
-  // IObjectWithSite
-  IFACEMETHODIMP SetSite(IUnknown *aUnkSite)
-  {
-    SetInterface(&mUnkSite, aUnkSite);
-    return S_OK;
-  }
-
-  IFACEMETHODIMP GetSite(REFIID aRefID, void **aInt)
-  {
-    *aInt = nullptr;
-    return mUnkSite ? mUnkSite->QueryInterface(aRefID, aInt) : E_FAIL;
-  }
-
-  // IExecuteCommandApplicationHostEnvironment
-  IFACEMETHODIMP GetValue(AHE_TYPE *aLaunchType)
-  {
-    Log(L"IExecuteCommandApplicationHostEnvironment::GetValue()");
-    *aLaunchType = GetLaunchType();
-    return S_OK;
-  }
-
-  /**
-   * Choose the appropriate launch type based on the user's previously chosen
-   * host environment, along with system constraints.
-   *
-   * AHE_DESKTOP = 0, AHE_IMMERSIVE = 1
-   */
-  AHE_TYPE GetLaunchType()
-  {
-    AHE_TYPE ahe = GetLastAHE();
-    Log(L"Previous AHE: %d", ahe);
-
-    // Default launch settings from GetLastAHE() can be overriden by
-    // custom parameter values we receive. 
-    if (mRequestType == DESKTOP_RESTART) {
-      Log(L"Restarting in desktop host environment.");
-      return AHE_DESKTOP;
-    } else if (mRequestType == METRO_RESTART) {
-      Log(L"Restarting in metro host environment.");
-      ahe = AHE_IMMERSIVE;
-    } else if (mRequestType == METRO_UPDATE) {
-      // Shouldn't happen from GetValue above, but might from other calls.
-      ahe = AHE_IMMERSIVE;
-    }
-
-    if (ahe == AHE_IMMERSIVE) {
-      if (!IsDefaultBrowser()) {
-        Log(L"returning AHE_DESKTOP because we are not the default browser");
-        return AHE_DESKTOP;
-      }
-
-      if (!IsDX10Available()) {
-        Log(L"returning AHE_DESKTOP because DX10 is not available");
-        return AHE_DESKTOP;
-      }
-    }
-    return ahe;
-  }
-
-  bool DefaultLaunchIsDesktop()
-  {
-    return GetLaunchType() == AHE_DESKTOP;
-  }
-
-  bool DefaultLaunchIsMetro()
-  {
-    return GetLaunchType() == AHE_IMMERSIVE;
-  }
-
-  /*
-   * Retrieve the target path if it is the default browser
-   * or if not default, retreives the target path if it is a firefox browser
-   * or if the target is not firefox, relies on a hack to get the
-   * 'module dir path\firefox.exe'
-   * The reason why it's not good to rely on the CEH path is because there is
-   * no guarantee win8 will use the CEH at our expected path.  It has an in
-   * memory cache even if the registry is updated for the CEH path.
-   *
-   * @aPathBuffer Buffer to fill
-   */
-  bool GetDesktopBrowserPath(CStringW& aPathBuffer)
-  {
-    // If the target was the default browser itself then return early.  Otherwise
-    // rely on a hack to check CEH path and calculate it relative to it.
-
-    if (mTargetIsDefaultBrowser || mTargetIsBrowser) {
-      aPathBuffer = mTarget;
-      return true;
-    }
-
-    if (!GetModulePath(aPathBuffer))
-      return false;
-
-    // ceh.exe sits in dist/bin root with the desktop browser. Since this
-    // is a firefox only component, this hardcoded filename is ok.
-    aPathBuffer.Append(L"\\");
-    aPathBuffer.Append(kFirefoxExe);
-    return true;
-  }
-
-  bool IsDefaultBrowser()
-  {
-    IApplicationAssociationRegistration* pAAR;
-    HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
-                                  nullptr,
-                                  CLSCTX_INPROC,
-                                  IID_IApplicationAssociationRegistration,
-                                  (void**)&pAAR);
-    if (FAILED(hr))
-      return false;
-
-    BOOL res = FALSE;
-    hr = pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE,
-                                    APP_REG_NAME,
-                                    &res);
-    Log(L"QueryAppIsDefaultAll: %d", res);
-    if (!res) {
-      pAAR->Release();
-      return false;
-    }
-    // Make sure the Prog ID matches what we have
-    LPWSTR registeredApp;
-    hr = pAAR->QueryCurrentDefault(L"http", AT_URLPROTOCOL, AL_EFFECTIVE,
-                                    &registeredApp);
-    pAAR->Release();
-    Log(L"QueryCurrentDefault: %X", hr);
-    if (FAILED(hr))
-      return false;
-
-    Log(L"registeredApp=%s", registeredApp);
-    bool result = !wcsicmp(registeredApp, kDefaultMetroBrowserIDPathKey);
-    CoTaskMemFree(registeredApp);
-    if (!result)
-      return false;
-
-    // If the registry points another browser's path,
-    // activating the Metro browser will fail. So fallback to the desktop.
-    CStringW selfPath;
-    GetDesktopBrowserPath(selfPath);
-    CStringW browserPath;
-    GetDefaultBrowserPath(browserPath);
-
-    return !selfPath.CompareNoCase(browserPath);
-  }
-
-  /*
-   * Helper for nsis installer when it wants to launch the
-   * default metro browser.
-   */
-  void CommandLineMetroLaunch()
-  {
-    mTargetIsDefaultBrowser = true;
-    LaunchMetroBrowser();
-  }
-
-private:
-  void LaunchDesktopBrowser();
-  bool LaunchMetroBrowser();
-  bool SetTargetPath(IShellItem* aItem);
-  bool TestForUpdateLock();
-
-  /*
-   * Defines the type of startup request we receive.
-   */
-  enum RequestType {
-    DEFAULT_LAUNCH,
-    DESKTOP_RESTART,
-    METRO_RESTART,
-    METRO_UPDATE,
-  };
-
-  RequestType mRequestType;
-
-  /*
-   * Defines the type of delayed launch we might do.
-   */
-  enum DelayedLaunchType {
-    NONE,
-    DESKTOP,
-    METRO,
-  };
-
-  DelayedLaunchType mDelayedLaunchType;
-
-  long mRef;
-  IShellItemArray *mShellItemArray;
-  IUnknown *mUnkSite;
-  CStringW mVerb;
-  CStringW mTarget;
-  CStringW mParameters;
-  bool mTargetIsFileSystemLink;
-  bool mTargetIsDefaultBrowser;
-  bool mTargetIsBrowser;
-  DWORD mKeyState;
-  bool mRequestMet;
-};
-
-/*
- * Retrieve the current default browser's path.
- *
- * @aPathBuffer Buffer to fill
- */
-static bool GetDefaultBrowserPath(CStringW& aPathBuffer)
-{
-  WCHAR buffer[MAX_PATH];
-  DWORD length = MAX_PATH;
-
-  if (FAILED(AssocQueryStringW(ASSOCF_NOTRUNCATE | ASSOCF_INIT_IGNOREUNKNOWN,
-                               ASSOCSTR_EXECUTABLE,
-                               kDefaultMetroBrowserIDPathKey, nullptr,
-                               buffer, &length))) {
-    Log(L"AssocQueryString failed.");
-    return false;
-  }
-
-  // sanity check
-  if (lstrcmpiW(PathFindFileNameW(buffer), kFirefoxExe))
-    return false;
-
-  aPathBuffer = buffer;
-  return true;
-}
-
-/*
- * Retrieve the app model id of the firefox metro browser.
- *
- * @aPathBuffer Buffer to fill
- * @aCharLength Length of buffer to fill in characters
- */
-template <size_t N>
-static bool GetDefaultBrowserAppModelID(WCHAR (&aIDBuffer)[N])
-{
-  HKEY key;
-  if (RegOpenKeyExW(HKEY_CLASSES_ROOT, kDefaultMetroBrowserIDPathKey,
-                    0, KEY_READ, &key) != ERROR_SUCCESS) {
-    return false;
-  }
-  DWORD len = sizeof(aIDBuffer);
-  memset(aIDBuffer, 0, len);
-  if (RegQueryValueExW(key, L"AppUserModelID", nullptr, nullptr,
-                       (LPBYTE)aIDBuffer, &len) != ERROR_SUCCESS || !len) {
-    RegCloseKey(key);
-    return false;
-  }
-  RegCloseKey(key);
-  return true;
-}
-
-namespace {
-  const FORMATETC kPlainTextFormat =
-    {CF_TEXT, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
-  const FORMATETC kPlainTextWFormat =
-    {CF_UNICODETEXT, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
-}
-
-bool HasPlainText(IDataObject* aDataObj) {
-  return SUCCEEDED(aDataObj->QueryGetData((FORMATETC*)&kPlainTextWFormat)) ||
-      SUCCEEDED(aDataObj->QueryGetData((FORMATETC*)&kPlainTextFormat));
-}
-
-bool GetPlainText(IDataObject* aDataObj, CStringW& cstrText)
-{
-  if (!HasPlainText(aDataObj))
-    return false;
-
-  STGMEDIUM store;
-
-  // unicode text
-  if (SUCCEEDED(aDataObj->GetData((FORMATETC*)&kPlainTextWFormat, &store))) {
-    // makes a copy
-    cstrText = static_cast<LPCWSTR>(GlobalLock(store.hGlobal));
-    GlobalUnlock(store.hGlobal);
-    ReleaseStgMedium(&store);
-    return true;
-  }
-
-  // ascii text
-  if (SUCCEEDED(aDataObj->GetData((FORMATETC*)&kPlainTextFormat, &store))) {
-    // makes a copy
-    cstrText = static_cast<char*>(GlobalLock(store.hGlobal));
-    GlobalUnlock(store.hGlobal);
-    ReleaseStgMedium(&store);
-    return true;
-  }
-
-  return false;
-}
-
-/*
- * Updates the current target based on the contents of
- * a shell item.
- */
-bool CExecuteCommandVerb::SetTargetPath(IShellItem* aItem)
-{
-  if (!aItem)
-    return false;
-
-  CString cstrText;
-  CComPtr<IDataObject> object;
-  // Check the underlying data object first to insure we get
-  // absolute uri. See chromium bug 157184.
-  if (SUCCEEDED(aItem->BindToHandler(nullptr, BHID_DataObject,
-                                     IID_IDataObject,
-                                     reinterpret_cast<void**>(&object))) &&
-      GetPlainText(object, cstrText)) {
-    wchar_t scheme[16];
-    URL_COMPONENTS components = {0};
-    components.lpszScheme = scheme;
-    components.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]);
-    components.dwStructSize = sizeof(components);
-    // note, more advanced use may have issues with paths with spaces.
-    if (!InternetCrackUrlW(cstrText, 0, 0, &components)) {
-      Log(L"Failed to identify object text '%s'", cstrText);
-      return false;
-    }
-
-    mTargetIsFileSystemLink = (components.nScheme == INTERNET_SCHEME_FILE);
-    mTarget = cstrText;
-
-    return true;
-  }
-
-  Log(L"No data object or data object has no text.");
-
-  // Use the shell item display name
-  LPWSTR str = nullptr;
-  mTargetIsFileSystemLink = true;
-  if (FAILED(aItem->GetDisplayName(SIGDN_FILESYSPATH, &str))) {
-    mTargetIsFileSystemLink = false;
-    if (FAILED(aItem->GetDisplayName(SIGDN_URL, &str))) {
-      Log(L"Failed to get parameter string.");
-      return false;
-    }
-  }
-  mTarget = str;
-  CoTaskMemFree(str);
-
-  CStringW defaultPath;
-  GetDefaultBrowserPath(defaultPath);
-  mTargetIsDefaultBrowser = !mTarget.CompareNoCase(defaultPath);
-
-  size_t browserEXELen = wcslen(kFirefoxExe);
-  mTargetIsBrowser = mTarget.GetLength() >= browserEXELen &&
-                     !mTarget.Right(browserEXELen).CompareNoCase(kFirefoxExe);
-
-  return true;
-}
-
-/*
- * Desktop launch - Launch the destop browser to display the current
- * target using shellexecute.
- */
-void LaunchDesktopBrowserWithParams(CStringW& aBrowserPath, CStringW& aVerb,
-                                    CStringW& aTarget, CStringW& aParameters,
-                                    bool aTargetIsDefaultBrowser, bool aTargetIsBrowser)
-{
-  // If a taskbar shortcut, link or local file is clicked, the target will
-  // be the browser exe or file.  Don't pass in -url for the target if the
-  // target is known to be a browser.  Otherwise, one instance of Firefox
-  // will try to open another instance.
-  CStringW params;
-  if (!aTargetIsDefaultBrowser && !aTargetIsBrowser && !aTarget.IsEmpty()) {
-    // Fallback to the module path if it failed to get the default browser.
-    GetDefaultBrowserPath(aBrowserPath);
-    params += "-url ";
-    params += "\"";
-    params += aTarget;
-    params += "\"";
-  }
-
-  // Tack on any extra parameters we received (for example --profilemanager)
-  if (!aParameters.IsEmpty()) {
-    params += " ";
-    params += aParameters;
-  }
-
-  Log(L"Desktop Launch: verb:'%s' exe:'%s' params:'%s'", aVerb, aBrowserPath, params);
-
-  // Relaunch in Desktop mode uses a special URL to trick Windows into
-  // switching environments. We shouldn't actually try to open this URL.
-  if (!_wcsicmp(aTarget, L"http://-desktop/")) {
-    // Ignore any params and just launch on desktop
-    params.Empty();
-  }
-
-  PROCESS_INFORMATION procInfo;
-  STARTUPINFO startInfo;
-  memset(&procInfo, 0, sizeof(PROCESS_INFORMATION));
-  memset(&startInfo, 0, sizeof(STARTUPINFO));
-
-  startInfo.cb = sizeof(STARTUPINFO);
-  startInfo.dwFlags = STARTF_USESHOWWINDOW;
-  startInfo.wShowWindow = SW_SHOWNORMAL;
-
-  BOOL result =
-    CreateProcessW(aBrowserPath, static_cast<LPWSTR>(params.GetBuffer()),
-                   NULL, NULL, FALSE, 0, NULL, NULL, &startInfo, &procInfo);
-  if (!result) {
-    Log(L"CreateProcess failed! (%d)", GetLastError());
-    return;
-  }
-  // Hand off foreground/focus rights to the browser we create. If we don't
-  // do this the ceh will keep ownership causing desktop firefox to launch
-  // deactivated.
-  if (!AllowSetForegroundWindow(procInfo.dwProcessId)) {
-    Log(L"AllowSetForegroundWindow failed! (%d)", GetLastError());
-  }
-  CloseHandle(procInfo.hThread);
-  CloseHandle(procInfo.hProcess);
-  Log(L"Desktop browser process id: %d", procInfo.dwProcessId);
-}
-
-void
-CExecuteCommandVerb::LaunchDesktopBrowser()
-{
-  CStringW browserPath;
-  if (!GetDesktopBrowserPath(browserPath)) {
-    return;
-  }
-
-  LaunchDesktopBrowserWithParams(browserPath, mVerb, mTarget, mParameters,
-                                 mTargetIsDefaultBrowser, mTargetIsBrowser);
-}
-
-void
-CExecuteCommandVerb::HeartBeat()
-{
-  if (mRequestType == METRO_UPDATE && mDelayedLaunchType == DESKTOP &&
-      !IsMetroProcessRunning()) {
-    mDelayedLaunchType = NONE;
-    LaunchDesktopBrowser();
-    SetRequestMet();
-  }
-  if (mDelayedLaunchType == METRO && !TestForUpdateLock()) {
-    mDelayedLaunchType = NONE;
-    LaunchMetroBrowser();
-    SetRequestMet();
-  }
-}
-
-bool
-CExecuteCommandVerb::TestForUpdateLock()
-{
-  CStringW browserPath;
-  if (!GetDefaultBrowserPath(browserPath)) {
-    return false;
-  }
-
-  HANDLE hFile = CreateFileW(browserPath,
-                             FILE_EXECUTE, FILE_SHARE_READ|FILE_SHARE_WRITE,
-                             nullptr, OPEN_EXISTING, 0, nullptr);
-  if (hFile != INVALID_HANDLE_VALUE) {
-    CloseHandle(hFile);
-    return false;
-  }
-  return true;
-}
-
-bool
-CExecuteCommandVerb::LaunchMetroBrowser()
-{
-  HRESULT hr;
-
-  CComPtr<IApplicationActivationManager> activateMgr;
-  hr = activateMgr.CoCreateInstance(CLSID_ApplicationActivationManager,
-                                    nullptr, CLSCTX_LOCAL_SERVER);
-  if (FAILED(hr)) {
-    Log(L"CoCreateInstance failed, launching on desktop.");
-    return false;
-  }
-
-  // Hand off focus rights to the out-of-process activation server. This will
-  // fail if we don't have the rights to begin with. Log but don't bail.
-  hr = CoAllowSetForegroundWindow(activateMgr, nullptr);
-  if (FAILED(hr)) {
-    Log(L"CoAllowSetForegroundWindow result %X", hr);
-  }
-
-  WCHAR appModelID[256];
-  if (!GetDefaultBrowserAppModelID(appModelID)) {
-    Log(L"GetDefaultBrowserAppModelID failed.");
-    return false;
-  }
-
-  Log(L"Metro Launch: verb:'%s' appid:'%s' params:'%s'", mVerb, appModelID, mTarget);
-
-  // shortcuts to the application
-  DWORD processID;
-  if (mTargetIsDefaultBrowser) {
-    hr = activateMgr->ActivateApplication(appModelID, L"", AO_NONE, &processID);
-    Log(L"ActivateApplication result %X", hr);
-  // files
-  } else if (mTargetIsFileSystemLink) {
-    hr = activateMgr->ActivateForFile(appModelID, mShellItemArray, mVerb, &processID);
-    Log(L"ActivateForFile result %X", hr);
-  // protocols
-  } else {
-    hr = activateMgr->ActivateForProtocol(appModelID, mShellItemArray, &processID);
-    Log(L"ActivateForProtocol result %X", hr);
-  }
-  return true;
-}
-
-void CExecuteCommandVerb::SetRequestMet()
-{
-  SafeRelease(&mShellItemArray);
-  SafeRelease(&mUnkSite);
-  mRequestMet = true;
-  Log(L"Request met, exiting.");
-}
-
-IFACEMETHODIMP CExecuteCommandVerb::Execute()
-{
-  Log(L"Execute()");
-
-  if (!mTarget.GetLength()) {
-    // We shut down when this flips to true
-    SetRequestMet();
-    return E_FAIL;
-  }
-
-  if (!IsDX10Available()) {
-    Log(L"Can't launch in metro due to missing hardware acceleration features.");
-    mRequestType = DESKTOP_RESTART;
-  } 
-
-  // Deal with metro restart for an update - launch desktop with a command
-  // that tells it to run updater then launch the metro browser.
-  if (mRequestType == METRO_UPDATE) {
-    // We'll complete this in the heart beat callback from the main msg loop.
-    // We do this because the last browser instance makes this call to Execute
-    // sync. So we want to make sure it's completely shutdown before we do
-    // the update.
-    mParameters = kMetroUpdateCmdLine;
-    mDelayedLaunchType = DESKTOP;
-    return S_OK;
-  }
-
-  // Launch on the desktop
-  if (mRequestType == DESKTOP_RESTART ||
-      (mRequestType == DEFAULT_LAUNCH && DefaultLaunchIsDesktop())) {
-    LaunchDesktopBrowser();
-    SetRequestMet();
-    return S_OK;
-  }
-
-  // If we have an update in the works, don't try to activate yet,
-  // delay until the lock is removed.
-  if (TestForUpdateLock()) {
-    mDelayedLaunchType = METRO;
-    return S_OK;
-  }
-
-  LaunchMetroBrowser();
-  SetRequestMet();
-  return S_OK;
-}
-
-class ClassFactory : public IClassFactory 
-{
-public:
-  ClassFactory(IUnknown *punkObject);
-  ~ClassFactory();
-  STDMETHODIMP Register(CLSCTX classContent, REGCLS classUse);
-  STDMETHODIMP QueryInterface(REFIID riid, void **ppv);
-  STDMETHODIMP_(ULONG) AddRef() { return 2; }
-  STDMETHODIMP_(ULONG) Release() { return 1; }
-  STDMETHODIMP CreateInstance(IUnknown *punkOuter, REFIID riid, void **ppv);
-  STDMETHODIMP LockServer(BOOL);
-private:
-  IUnknown* mUnkObject;
-  DWORD mRegID;
-};
-
-ClassFactory::ClassFactory(IUnknown* aUnkObj) :
-  mUnkObject(aUnkObj),
-  mRegID(0)
-{
-  if (mUnkObject) {
-    mUnkObject->AddRef();
-  }
-}
-
-ClassFactory::~ClassFactory()
-{
-  if (mRegID) {
-    CoRevokeClassObject(mRegID);
-  }
-  mUnkObject->Release();
-}
-
-STDMETHODIMP
-ClassFactory::Register(CLSCTX aClass, REGCLS aUse)
-{
-  return CoRegisterClassObject(__uuidof(CExecuteCommandVerb),
-                               static_cast<IClassFactory *>(this),
-                               aClass, aUse, &mRegID);
-}
-
-STDMETHODIMP
-ClassFactory::QueryInterface(REFIID riid, void **ppv)
-{
-  IUnknown *punk = nullptr;
-  if (riid == IID_IUnknown || riid == IID_IClassFactory) {
-    punk = static_cast<IClassFactory*>(this);
-  }
-  *ppv = punk;
-  if (punk) {
-    punk->AddRef();
-    return S_OK;
-  } else {
-    return E_NOINTERFACE;
-  }
-}
-
-STDMETHODIMP
-ClassFactory::CreateInstance(IUnknown *punkOuter, REFIID riid, void **ppv)
-{
-  *ppv = nullptr;
-  if (punkOuter)
-    return CLASS_E_NOAGGREGATION;
-  return mUnkObject->QueryInterface(riid, ppv);
-}
-
-LONG gObjRefCnt;
-
-STDMETHODIMP
-ClassFactory::LockServer(BOOL fLock)
-{
-  if (fLock)
-    InterlockedIncrement(&gObjRefCnt);
-  else
-    InterlockedDecrement(&gObjRefCnt);
-  Log(L"ClassFactory::LockServer() %d", gObjRefCnt);
-  return S_OK;
-}
-
-int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR pszCmdLine, int)
-{
-#if defined(SHOW_CONSOLE)
-  SetupConsole();
-#endif
-
-  // nsis installer uses this as a helper to launch metro
-  if (pszCmdLine && StrStrI(pszCmdLine, kNsisLaunchCmdLine))
-  {
-    CoInitialize(nullptr);
-    CExecuteCommandVerb *pHandler = new CExecuteCommandVerb();
-    if (!pHandler)
-      return E_OUTOFMEMORY;
-    pHandler->CommandLineMetroLaunch();
-    delete pHandler;
-    CoUninitialize();
-    return 0;
-  }
-
-  if (!wcslen(pszCmdLine) || StrStrI(pszCmdLine, kExplorerLaunchCmdLine))
-  {
-      CoInitialize(nullptr);
-
-      CExecuteCommandVerb *pHandler = new CExecuteCommandVerb();
-      if (!pHandler)
-        return E_OUTOFMEMORY;
-
-      IUnknown* ppi;
-      pHandler->QueryInterface(IID_IUnknown, (void**)&ppi);
-      if (!ppi)
-        return E_FAIL;
-
-      ClassFactory classFactory(ppi);
-      ppi->Release();
-      ppi = nullptr;
-
-      // REGCLS_SINGLEUSE insures we only get used once and then discarded.
-      if (FAILED(classFactory.Register(CLSCTX_LOCAL_SERVER, REGCLS_SINGLEUSE)))
-        return -1;
-
-      if (!SetTimer(nullptr, 1, HEARTBEAT_MSEC, nullptr)) {
-        Log(L"Failed to set timer, can't process request.");
-        return -1;
-      }
-
-      MSG msg;
-      long beatCount = 0;
-      while (GetMessage(&msg, 0, 0, 0) > 0) {
-        if (msg.message == WM_TIMER) {
-          pHandler->HeartBeat();
-          if (++beatCount > REQUEST_WAIT_TIMEOUT ||
-              (pHandler->RequestMet() && pHandler->RefCount() < 2)) {
-            break;
-          }
-        }
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-      }
-
-#ifdef DEBUG_DELAY_SHUTDOWN
-      Sleep(10000);
-#endif
-      CoUninitialize();
-      return 0;
-  }
-  return 0;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.def thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.def
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.def	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.def	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-LIBRARY        CommandExecuteHandler.dll
-
-EXPORTS
-   DllCanUnloadNow      PRIVATE
-   DllGetClassObject    PRIVATE
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.exe.manifest thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.exe.manifest
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.exe.manifest	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.exe.manifest	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
-   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
-
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity
-        version="1.0.0.0"
-        processorArchitecture="*"
-        name="Mozilla.FirefoxCEH"
-        type="win32"
-/>
-<description>Firefox Launcher</description>
-<ms_asmv3:trustInfo xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
-  <ms_asmv3:security>
-    <ms_asmv3:requestedPrivileges>
-      <ms_asmv3:requestedExecutionLevel level="asInvoker" uiAccess="false" />
-    </ms_asmv3:requestedPrivileges>
-  </ms_asmv3:security>
-</ms_asmv3:trustInfo>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-    </application>
-  </compatibility>
-</assembly>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.rc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.rc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.rc	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.rc	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +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/. */
-
-1 24 "CommandExecuteHandler.exe.manifest"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/Makefile.in	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +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/.
-
-ifndef MOZ_WINCONSOLE
-MOZ_WINCONSOLE = 0
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-DIST_PROGRAM = CommandExecuteHandler$(BIN_SUFFIX)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/commandexecutehandler/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/commandexecutehandler/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-Program('CommandExecuteHandler')
-
-SOURCES += [
-    'CEHHelper.cpp',
-    'CommandExecuteHandler.cpp',
-]
-
-# We want this exe in dist/bin
-DIST_SUBDIR = ''
-
-for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM'):
-    DEFINES[var] = True
-
-NO_PGO = True
-
-RCINCLUDE = 'CommandExecuteHandler.rc'
-
-OS_LIBS += [
-    'kernel32',
-    'user32',
-    'ole32',
-    'shlwapi',
-    'propsys',
-    'advapi32',
-    'wininet',
-]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/linktool/linktool.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/linktool/linktool.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/linktool/linktool.cpp	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/linktool/linktool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,296 +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/. */
-
-#undef WINVER
-#undef _WIN32_WINNT
-#define WINVER 0x602
-#define _WIN32_WINNT 0x602
-
-#include <windows.h>
-#include <shobjidl.h>
-#include <objbase.h>
-#include <shlguid.h>
-#include <shlobj.h>
-#define INITGUID
-#include <propvarutil.h>
-#include <propkey.h>
-#include <stdio.h>
-
-//  Indicates that an application supports dual desktop and immersive modes. In Windows 8, this property is only applicable for web browsers.
-//DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDualMode, 0x9F4C2855, 0x9F79, 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 11);
-
-void DumpParameters(LPCWSTR aTargetPath, LPCWSTR aShortcutPath, LPCWSTR aAppModelID, LPCWSTR aDescription)
-{
-  if (aTargetPath)
-    wprintf(L"target path: '%s'\n", aTargetPath);
-  if (aShortcutPath)
-    wprintf(L"shortcut path: '%s'\n", aShortcutPath);
-  if (aAppModelID)
-    wprintf(L"app id: '%s'\n", aAppModelID);
-  if (aDescription)
-    wprintf(L"description: '%s'\n", aDescription);
-}
-
-HRESULT
-SetShortcutProps(LPCWSTR aShortcutPath, LPCWSTR aAppModelID, bool aSetID, bool aSetMode) 
-{
-  HRESULT hres; 
-  ::CoInitialize(nullptr);
-
-  IPropertyStore *m_pps = nullptr;
-  if (FAILED(hres = SHGetPropertyStoreFromParsingName(aShortcutPath,
-                                                      nullptr,
-                                                      GPS_READWRITE,
-                                                      IID_PPV_ARGS(&m_pps)))) {
-    printf("SHGetPropertyStoreFromParsingName failed\n");
-    goto Exit;
-  }
-
-  if (aSetMode) {
-    PROPVARIANT propvar;
-    if (FAILED(hres = InitPropVariantFromBoolean(true, &propvar)) ||
-        FAILED(hres = m_pps->SetValue(PKEY_AppUserModel_IsDualMode, propvar))) {
-      goto Exit;
-    }
-    PropVariantClear(&propvar);
-  }
-
-  if (aSetID && aAppModelID) {
-    PROPVARIANT propvar;
-    if (FAILED(hres = InitPropVariantFromString(aAppModelID, &propvar)) ||
-        FAILED(hres = m_pps->SetValue(PKEY_AppUserModel_ID, propvar))) {
-      goto Exit;
-    }
-    PropVariantClear(&propvar);
-  }
-
-  hres = m_pps->Commit();
-
-  Exit:
-
-  if (m_pps) {
-    m_pps->Release();
-  }
-
-  CoUninitialize();
-  return hres;
-}
-
-HRESULT
-PrintShortcutProps(LPCWSTR aTargetPath) 
-{
-  HRESULT hres; 
-  ::CoInitialize(nullptr);
-
-  IPropertyStore *m_pps = nullptr;
-  if (FAILED(hres = SHGetPropertyStoreFromParsingName(aTargetPath,
-                                                      nullptr,
-                                                      GPS_READWRITE,
-                                                      IID_PPV_ARGS(&m_pps)))) {
-    printf("SHGetPropertyStoreFromParsingName failed\n");
-    goto Exit;
-  }
-
-  bool found = false;
-
-  PROPVARIANT propvar;
-  if (SUCCEEDED(hres = m_pps->GetValue(PKEY_AppUserModel_IsDualMode, &propvar)) && propvar.vt == VT_BOOL && propvar.boolVal == -1) {
-    printf("PKEY_AppUserModel_IsDualMode found\n");
-    PropVariantClear(&propvar);
-    found = true;
-  }
-
-  if (SUCCEEDED(hres = m_pps->GetValue(PKEY_AppUserModel_ID, &propvar)) && propvar.pwszVal) {
-    printf("PKEY_AppUserModel_ID found ");
-    wprintf(L"value: '%s'\n", propvar.pwszVal);
-    PropVariantClear(&propvar);
-    found = true;
-  }
-
-  if (!found) {
-    printf("no known properties found.\n");
-  }
-
-  Exit:
-
-  if (m_pps) {
-    m_pps->Release();
-  }
-
-  CoUninitialize();
-  return hres;
-}
-
-HRESULT
-CreateLink(LPCWSTR aTargetPath, LPCWSTR aShortcutPath, LPCWSTR aDescription) 
-{ 
-    HRESULT hres;
-    IShellLink* psl;
- 
-    wprintf(L"creating shortcut: '%s'\n",  aShortcutPath);
-
-    CoInitialize(nullptr);
-
-    hres = CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER,
-                            IID_IShellLink, (LPVOID*)&psl);
-    if (FAILED(hres)) {
-      CoUninitialize();
-      return hres;
-    }
-    psl->SetPath(aTargetPath);
-    if (aDescription) {
-      psl->SetDescription(aDescription);
-    } else {
-      psl->SetDescription(L"");
-    }
- 
-    IPersistFile* ppf = nullptr;
-    hres = psl->QueryInterface(IID_IPersistFile, (LPVOID*)&ppf);
- 
-    if (SUCCEEDED(hres)) {
-        hres = ppf->Save(aShortcutPath, TRUE);
-        ppf->Release();
-    }
-    psl->Release();
-    CoUninitialize();
-    return hres;
-}
-
-void DumpCommands()
-{
-  printf("control options:\n");
-  printf("  /CREATE     create a shortcut for the target file.\n");
-  printf("  /UPDATE     update properties on the target file.\n");
-  printf("  /PRINT      print the known properties set on the target file.\n");
-  printf("parameters:\n");
-  printf("  /T(path)    the full path and filename of the target file.\n");
-  printf("  /S(path)    with CREATE, the full path and filename of the shortcut to create.\n");
-  printf("  /D(string)  with CREATE, adds a description to the shortcut.\n");
-  printf("  /A(id)      the app model id to assign to the shortcut or target file.\n");
-  printf("  /M          enable support for dual desktop and immersive modes on the shortcut or target file.\n");
-}
-
-int wmain(int argc, WCHAR* argv[])
-{
-  WCHAR shortcutPathStr[MAX_PATH];
-  WCHAR targetPathStr[MAX_PATH];
-  WCHAR appModelIDStr[MAX_PATH];
-  WCHAR descriptionStr[MAX_PATH];
-  
-  shortcutPathStr[0] = '\0';
-  targetPathStr[0] = '\0';
-  appModelIDStr[0] = '\0';
-  descriptionStr[0] = '\0';
-
-  bool createShortcutFound = false;
-  bool updateFound = false;
-  bool shortcutPathFound = false;
-  bool targetPathFound = false;
-  bool appModelIDFound = false;
-  bool modeFound = false;
-  bool descriptionFound = false;
-  bool printFound = false;
-
-  int idx;
-  for (idx = 1; idx < argc; idx++) {
-    if (!wcscmp(L"/CREATE", argv[idx])) {
-      createShortcutFound = true;
-      continue;
-    }
-    if (!wcscmp(L"/UPDATE", argv[idx])) {
-      updateFound = true;
-      continue;
-    }
-    if (!wcscmp(L"/PRINT", argv[idx])) {
-      printFound = true;
-      continue;
-    }
-
-    if (!wcsncmp(L"/S", argv[idx], 2) && wcslen(argv[idx]) > 2) {
-      wcscpy_s(shortcutPathStr, MAX_PATH, (argv[idx]+2));
-      shortcutPathFound = true;
-      continue;
-    }
-    if (!wcsncmp(L"/T", argv[idx], 2) && wcslen(argv[idx]) > 2) {
-      wcscpy_s(targetPathStr, MAX_PATH, (argv[idx]+2));
-      targetPathFound = true;
-      continue;
-    }
-    if (!wcsncmp(L"/A", argv[idx], 2) && wcslen(argv[idx]) > 2) {
-      wcscpy_s(appModelIDStr, MAX_PATH, (argv[idx]+2));
-      appModelIDFound = true;
-      continue;
-    }
-    if (!wcsncmp(L"/D", argv[idx], 2) && wcslen(argv[idx]) > 2 && wcslen(argv[idx]) < MAX_PATH) {
-      wcscpy_s(descriptionStr, MAX_PATH, (argv[idx]+2));
-      descriptionFound = true;
-      continue;
-    }
-    if (!wcscmp(L"/M", argv[idx])) {
-      modeFound = true;
-      continue;
-    }
-  }
-
-  DumpParameters(targetPathStr, shortcutPathStr, appModelIDStr, descriptionStr);
-
-  if (!createShortcutFound && !updateFound && !printFound) {
-    DumpCommands();
-    return 0;
-  }
-
-  if (!targetPathFound) {
-    printf("missing target file path.\n");
-    return -1;
-  }
-
-  HRESULT hres;
-
-  if (printFound) {
-    if (FAILED(hres = PrintShortcutProps(targetPathStr))) {
-      printf("failed printing target props HRESULT=%X\n", hres);
-      return -1;
-    }
-    return 0;
-  }
-
-  if (createShortcutFound && !shortcutPathFound) {
-    printf("missing shortcut file path.\n");
-    return -1;
-  }
-
-  if (updateFound && !appModelIDFound && !modeFound) {
-    printf("no properties selected.\n");
-    return -1;
-  }
-
-  if (createShortcutFound) {
-    if (FAILED(hres = CreateLink(targetPathStr,
-                                 shortcutPathStr,
-                                 (descriptionFound ? descriptionStr : nullptr)))) {
-      printf("failed creating shortcut HRESULT=%X\n", hres);
-      return -1;
-    }
-  }
-
-  LPCWSTR target;
-  if (createShortcutFound) {
-    target = shortcutPathStr;
-  } else {
-    target = targetPathStr;
-  }
-
-  if (appModelIDFound || modeFound) {
-    if (FAILED(hres = SetShortcutProps(target,
-                                       (appModelIDFound ? appModelIDStr : nullptr),
-                                       appModelIDFound, modeFound))) {
-      printf("failed adding property HRESULT=%X\n", hres);
-      return -1;
-    }
-  }
-
-	return 0;
-}
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/linktool/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/linktool/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/linktool/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/linktool/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-Program('linktool')
-
-SOURCES += [
-    'linktool.cpp',
-]
-
-DIST_SUBDIR = 'metro/install'
-
-for var in ('UNICODE', '_UNICODE'):
-    DEFINES[var] = True
-
-NO_PGO = True
-
-OS_LIBS += [
-    'kernel32',
-    'user32',
-    'ole32',
-    'shlwapi',
-    'shell32',
-    'propsys',
-]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/Makefile.in	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +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/.
-
-export::
-	$(NSINSTALL) $(srcdir)/resources.pri $(DIST)/bin
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-DIRS += [
-    'commandexecutehandler',
-    'linktool',
-]
-
-TEST_DIRS += ['testing']
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/priconfig.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/priconfig.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/priconfig.xml	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/priconfig.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<resources>
-	<index root="\" startIndexAt="layout.resfiles">
-		<default>
-			<qualifier name="Language" value="en-US"/>
-      <!--
-			<qualifier name="Contrast" value="standard"/>
-			<qualifier name="Scale" value="100"/>
-			<qualifier name="HomeRegion" value="001"/>
-			<qualifier name="TargetSize" value="256"/>
-			<qualifier name="LayoutDirection" value="LTR"/>
-			<qualifier name="Configuration" value=""/>
-			<qualifier name="AlternateForm" value=""/>
-      -->
-		</default>
-    <indexer-config type="RESFILES" qualifierDelimiter="." />
-    <!--
-		<indexer-config type="folder" foldernameAsQualifier="true" filenameAsQualifier="true" qualifierDelimiter="."/>
-
-		<indexer-config type="PRI"/>
-    -->
-	</index>
-
-  <index root="\" startIndexAt="resources.resfiles">
-    <default>
-      <qualifier name="language" value="en-US" />
-    </default>
-    <indexer-config type="RESW" convertDotsToSlashes="true" />
-    <indexer-config type="RESJSON" />
-    <indexer-config type="RESFILES" qualifierDelimiter="." />
-  </index>
-  <index root="\" startIndexAt="pri.resfiles">
-    <default>
-      <qualifier name="language" value="en-US" />
-    </default>
-    <indexer-config type="PRI" />
-    <indexer-config type="RESFILES" qualifierDelimiter="." />
-  </index>
-  
-	<!--<index startIndexAt="Start Index Here" root="Root Here">-->
-	<!--        <indexer-config type="resfiles" qualifierDelimiter="."/>-->
-	<!--        <indexer-config type="priinfo" emitStrings="true" emitPaths="true"/>-->
-	<!--</index>-->
-</resources>
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/resources.pri and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/resources.pri differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/testing/metrotestharness.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/testing/metrotestharness.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/testing/metrotestharness.cpp	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/testing/metrotestharness.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,398 +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/. */
-
-#undef WINVER
-#undef _WIN32_WINNT
-#define WINVER 0x602
-#define _WIN32_WINNT 0x602
-
-#include <windows.h>
-#include <objbase.h>
-#include <combaseapi.h>
-#include <atlcore.h>
-#include <atlstr.h>
-#include <wininet.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-#include <propkey.h>
-#include <propvarutil.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <strsafe.h>
-#include <io.h>
-#include <shellapi.h>
-
-static const WCHAR* kFirefoxExe = L"firefox.exe";
-static const WCHAR* kDefaultMetroBrowserIDPathKey = L"FirefoxURL";
-
-// Logging pipe handle
-HANDLE gTestOutputPipe = INVALID_HANDLE_VALUE;
-// Logging pipe read buffer
-#define PIPE_BUFFER_SIZE 4096
-char buffer[PIPE_BUFFER_SIZE + 1];
-
-CString sAppParams;
-CString sFirefoxPath;
-
-// The tests file we write out for firefox.exe which contains test
-// startup command line paramters.
-#define kMetroTestFile "tests.ini"
-
-// Process exit codes for buildbotcustom logic. These are currently ignored, but
-// at some point releng expects to use these.
-#define SUCCESS   0
-#define WARNINGS  1
-#define FAILURE   2
-#define EXCEPTION 3
-#define RETRY     4
-
-static void Log(const wchar_t *fmt, ...)
-{
-  va_list a = nullptr;
-  wchar_t szDebugString[1024];
-  if(!lstrlenW(fmt))
-    return;
-  va_start(a,fmt);
-  vswprintf(szDebugString, 1024, fmt, a);
-  va_end(a);
-  if(!lstrlenW(szDebugString))
-    return;
-
-  wprintf(L"INFO | metrotestharness.exe | %s\n", szDebugString);
-  fflush(stdout);
-}
-
-static void Fail(bool aRequestRetry, const wchar_t *fmt, ...)
-{
-  va_list a = nullptr;
-  wchar_t szDebugString[1024];
-  if(!lstrlenW(fmt))
-    return;
-  va_start(a,fmt);
-  vswprintf(szDebugString, 1024, fmt, a);
-  va_end(a);
-  if(!lstrlenW(szDebugString))
-    return;
-  if (aRequestRetry) {
-    wprintf(L"FAIL-SHOULD-RETRY | metrotestharness.exe | %s\n", szDebugString);
-  } else {
-    wprintf(L"TEST-UNEXPECTED-FAIL | metrotestharness.exe | %s\n", szDebugString);
-  }
-  fflush(stdout);
-}
-
-/*
- * Retrieve our module dir path.
- *
- * @aPathBuffer Buffer to fill
- */
-static bool GetModulePath(CStringW& aPathBuffer)
-{
-  WCHAR buffer[MAX_PATH];
-  memset(buffer, 0, sizeof(buffer));
-
-  if (!GetModuleFileName(nullptr, buffer, MAX_PATH)) {
-    Fail(false, L"GetModuleFileName failed.");
-    return false;
-  }
-
-  WCHAR* slash = wcsrchr(buffer, '\\');
-  if (!slash)
-    return false;
-  *slash = '\0';
-
-  aPathBuffer = buffer;
-  return true;
-}
-
-/*
- * Retrieve 'module dir path\firefox.exe'
- *
- * @aPathBuffer Buffer to fill
- */
-static bool GetDesktopBrowserPath(CStringW& aPathBuffer)
-{
-  if (!GetModulePath(aPathBuffer))
-    return false;
-
-  // ceh.exe sits in dist/bin root with the desktop browser. Since this
-  // is a firefox only component, this hardcoded filename is ok.
-  aPathBuffer.Append(L"\\");
-  aPathBuffer.Append(kFirefoxExe);
-  return true;
-}
-
-/*
- * Retrieve the app model id of the firefox metro browser.
- *
- * @aPathBuffer Buffer to fill
- * @aCharLength Length of buffer to fill in characters
- */
-static bool GetDefaultBrowserAppModelID(WCHAR* aIDBuffer,
-                                        long aCharLength)
-{
-  if (!aIDBuffer || aCharLength <= 0)
-    return false;
-
-  memset(aIDBuffer, 0, (sizeof(WCHAR)*aCharLength));
-
-  HKEY key;
-  if (RegOpenKeyExW(HKEY_CLASSES_ROOT, kDefaultMetroBrowserIDPathKey,
-                    0, KEY_READ, &key) != ERROR_SUCCESS) {
-    return false;
-  }
-  DWORD len = aCharLength * sizeof(WCHAR);
-  memset(aIDBuffer, 0, len);
-  if (RegQueryValueExW(key, L"AppUserModelID", nullptr, nullptr,
-                       (LPBYTE)aIDBuffer, &len) != ERROR_SUCCESS || !len) {
-    RegCloseKey(key);
-    return false;
-  }
-  RegCloseKey(key);
-  return true;
-}
-
-// Tests.ini file cleanup helper
-class DeleteTestFileHelper
-{
-  CStringA mTestFile;
-public:
-  DeleteTestFileHelper(CStringA& aTestFile) :
-    mTestFile(aTestFile) {}
-  ~DeleteTestFileHelper() {
-    if (mTestFile.GetLength()) {
-      Log(L"Deleting %s", CStringW(mTestFile));
-      DeleteFileA(mTestFile);
-    }
-  }
-};
-
-static bool SetupTestOutputPipe()
-{
-  SECURITY_ATTRIBUTES saAttr;
-  saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
-  saAttr.bInheritHandle = TRUE;
-  saAttr.lpSecurityDescriptor = nullptr;
-
-  gTestOutputPipe =
-    CreateNamedPipeW(L"\\\\.\\pipe\\metrotestharness",
-                     PIPE_ACCESS_INBOUND,
-                     PIPE_TYPE_BYTE|PIPE_WAIT,
-                     1,
-                     PIPE_BUFFER_SIZE,
-                     PIPE_BUFFER_SIZE, 0, nullptr);
-
-  if (gTestOutputPipe == INVALID_HANDLE_VALUE) {
-    Log(L"Failed to create named logging pipe.");
-    return false;
-  }
-  return true;
-}
-
-static void ReadPipe()
-{
-  DWORD numBytesRead;
-  while (ReadFile(gTestOutputPipe, buffer, PIPE_BUFFER_SIZE,
-                  &numBytesRead, nullptr) &&
-         numBytesRead) {
-    buffer[numBytesRead] = '\0';
-    printf("%s", buffer);
-    fflush(stdout);
-  }
-}
-
-static int Launch()
-{
-  Log(L"Launching browser...");
-
-  DWORD processID;
-
-  // The interface that allows us to activate the browser
-  CComPtr<IApplicationActivationManager> activateMgr;
-  if (FAILED(CoCreateInstance(CLSID_ApplicationActivationManager, nullptr,
-                              CLSCTX_LOCAL_SERVER,
-                              IID_IApplicationActivationManager,
-                              (void**)&activateMgr))) {
-    Fail(false, L"CoCreateInstance CLSID_ApplicationActivationManager failed.");
-    return FAILURE;
-  }
-  
-  HRESULT hr;
-  WCHAR appModelID[256];
-  // Activation is based on the browser's registered app model id
-  if (!GetDefaultBrowserAppModelID(appModelID, (sizeof(appModelID)/sizeof(WCHAR)))) {
-    Fail(false, L"GetDefaultBrowserAppModelID failed.");
-    return FAILURE;
-  }
-  Log(L"App model id='%s'", appModelID);
-
-  // Hand off focus rights if the terminal has focus to the out-of-process
-  // activation server (explorer.exe). Without this the metro interface
-  // won't launch.
-  hr = CoAllowSetForegroundWindow(activateMgr, nullptr);
-  if (FAILED(hr)) {
-    // Log but don't fail. This has happened on vms with certain terminals run by
-    // QA during mozmill testing.
-    Log(L"Windows focus rights hand off failed (HRESULT=0x%X). Ignoring.", hr);
-  }
-
-  Log(L"Harness process id: %d", GetCurrentProcessId());
-
-  // If provided, validate the firefox path passed in.
-  int binLen = wcslen(kFirefoxExe);
-  if (sFirefoxPath.GetLength() && sFirefoxPath.Right(binLen) != kFirefoxExe) {
-    Log(L"firefoxpath is missing a valid bin name! Assuming '%s'.", kFirefoxExe);
-    if (sFirefoxPath.Right(1) != L"\\") {
-      sFirefoxPath += L"\\";
-    }
-    sFirefoxPath += kFirefoxExe;
-  }
-
-  // Because we can't pass command line args, we store params in a
-  // tests.ini file in dist/bin which the browser picks up on launch.
-  CStringA testFilePath;
-  if (sFirefoxPath.GetLength()) {
-    // Use the firefoxpath passed to us by the test harness
-    int index = sFirefoxPath.ReverseFind('\\');
-    if (index == -1) {
-      Fail(false, L"Bad firefoxpath path");
-      return FAILURE;
-    }
-    testFilePath = sFirefoxPath.Mid(0, index);
-    testFilePath += "\\";
-    testFilePath += kMetroTestFile;
-  } else {
-    // Use the module path
-    char path[MAX_PATH];
-    if (!GetModuleFileNameA(nullptr, path, MAX_PATH)) {
-      Fail(false, L"GetModuleFileNameA errorno=%d", GetLastError());
-      return FAILURE;
-    }
-    char* slash = strrchr(path, '\\');
-    if (!slash)
-      return FAILURE;
-    *slash = '\0'; // no trailing slash
-    testFilePath = path;
-    testFilePath += "\\";
-    sFirefoxPath = testFilePath;
-    sFirefoxPath += kFirefoxExe;
-    testFilePath += kMetroTestFile;
-  }
-
-  // Make sure the firefox bin exists
-  if (GetFileAttributesW(sFirefoxPath) == INVALID_FILE_ATTRIBUTES) {
-    Fail(false, L"Invalid bin path: '%s'", sFirefoxPath);
-    return FAILURE;
-  }
-
-  Log(L"Using bin path: '%s'", sFirefoxPath);
-
-  Log(L"Writing out tests.ini to: '%s'", CStringW(testFilePath));
-  HANDLE hTestFile = CreateFileA(testFilePath, GENERIC_WRITE,
-                                 0, nullptr, CREATE_ALWAYS,
-                                 FILE_ATTRIBUTE_NORMAL,
-                                 nullptr);
-  if (hTestFile == INVALID_HANDLE_VALUE) {
-    Fail(false, L"CreateFileA errorno=%d", GetLastError());
-    return FAILURE;
-  }
-
-  DeleteTestFileHelper dtf(testFilePath);
-
-  // nsAppRunner expects the first param to be the bin path, just like a
-  // normal startup. So prepend our bin path to our param string we write.
-  CStringA asciiParams = sFirefoxPath;
-  asciiParams += " ";
-  asciiParams += sAppParams;
-  asciiParams.Trim();
-  Log(L"Browser command line args: '%s'", CString(asciiParams));
-  if (!WriteFile(hTestFile, asciiParams, asciiParams.GetLength(),
-                 nullptr, 0)) {
-    CloseHandle(hTestFile);
-    Fail(false, L"WriteFile errorno=%d", GetLastError());
-    return FAILURE;
-  }
-  FlushFileBuffers(hTestFile);
-  CloseHandle(hTestFile);
-
-  // Create a named stdout pipe for the browser
-  if (!SetupTestOutputPipe()) {
-    Fail(false, L"SetupTestOutputPipe failed (errno=%d)", GetLastError());
-    return FAILURE;
-  }
-
-  // Launch firefox
-  hr = activateMgr->ActivateApplication(appModelID, L"", AO_NOERRORUI, &processID);
-  if (FAILED(hr)) {
-    Fail(true, L"ActivateApplication result %X", hr);
-    return RETRY;
-  }
-
-  Log(L"Activation succeeded.");
-
-  // automation.py picks up on this, don't mess with it.
-  Log(L"METRO_BROWSER_PROCESS=%d", processID);
-
-  HANDLE child = OpenProcess(SYNCHRONIZE, FALSE, processID);
-  if (!child) {
-    Fail(false, L"Couldn't find child process. (%d)", GetLastError());
-    return FAILURE;
-  }
-
-  Log(L"Waiting on child process...");
-
-  MSG msg;
-  DWORD waitResult = WAIT_TIMEOUT;
-  HANDLE handles[2] = { child, gTestOutputPipe };
-  while ((waitResult = MsgWaitForMultipleObjects(2, handles, FALSE, INFINITE, QS_ALLINPUT)) != WAIT_OBJECT_0) {
-    if (waitResult == WAIT_FAILED) {
-      Log(L"Wait failed (errno=%d)", GetLastError());
-      break;
-    } else if (waitResult == WAIT_OBJECT_0 + 1) {
-      ReadPipe();
-    } else if (waitResult == WAIT_OBJECT_0 + 2 &&
-               PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) {
-      TranslateMessage(&msg);
-      DispatchMessage(&msg);
-    }
-  }
-
-  ReadPipe();
-  CloseHandle(gTestOutputPipe);
-  CloseHandle(child);
-
-  Log(L"Exiting.");
-  return SUCCESS;
-}
-
-int wmain(int argc, WCHAR* argv[])
-{
-  CoInitialize(nullptr);
-
-  int idx;
-  bool firefoxParam = false;
-  for (idx = 1; idx < argc; idx++) {
-    CString param = argv[idx];
-    param.Trim();
-
-    // Pickup the firefox path param and store it, we'll need this
-    // when we create the tests.ini file.
-    if (param == "-firefoxpath") {
-      firefoxParam = true;
-      continue;
-    } else if (firefoxParam) {
-      firefoxParam = false;
-      sFirefoxPath = param;
-      continue;
-    }
-
-    sAppParams.Append(argv[idx]);
-    sAppParams.Append(L" ");
-  }
-  sAppParams.Trim();
-  int res = Launch();
-  CoUninitialize();
-  return res;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/testing/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/testing/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/testing/moz.build	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/testing/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-Program('metrotestharness')
-
-SOURCES += [
-    'metrotestharness.cpp',
-]
-
-# We want this exe in dist/bin
-DIST_SUBDIR = ''
-
-for var in ('UNICODE', '_UNICODE'):
-    DEFINES[var] = True
-
-NO_PGO = True
-
-# static win runtime linking
-USE_STATIC_LIBS = True
-
-OS_LIBS += [
-    'kernel32',
-    'user32',
-    'ole32',
-    'shlwapi',
-    'propsys',
-    'advapi32',
-]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/tileresources/layout.resfiles thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/tileresources/layout.resfiles
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/tileresources/layout.resfiles	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/tileresources/layout.resfiles	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-images\PinnedSiteLogo.png
-images\PinnedSiteLogo.scale-100.png
-images\PinnedSiteLogo.scale-140.png
-images\PinnedSiteLogo.scale-180.png
-images\PinnedSiteLogo.scale-80.png
-images\PinnedSiteSmallLogo.png
-images\PinnedSiteSmallLogo.scale-100.png
-images\PinnedSiteSmallLogo.scale-140.png
-images\PinnedSiteSmallLogo.scale-180.png
-images\PinnedSiteSmallLogo.scale-80.png
-images\smallLogo.contrast-black_scale-100.png
-images\smallLogo.contrast-black_scale-140.png
-images\smallLogo.contrast-black_scale-180.png
-images\smallLogo.contrast-black_scale-80.png
-images\smallLogo.contrast-white_scale-100.png
-images\smallLogo.contrast-white_scale-140.png
-images\smallLogo.contrast-white_scale-180.png
-images\smallLogo.contrast-white_scale-80.png
-images\smallLogo.png
-images\smallLogo.scale-100.png
-images\smallLogo.scale-140.png
-images\smallLogo.scale-180.png
-images\smallLogo.scale-80.png
-images\splashscreen.contrast-black_scale-100.png
-images\splashscreen.contrast-black_scale-140.png
-images\splashscreen.contrast-black_scale-180.png
-images\splashscreen.contrast-white_scale-100.png
-images\splashscreen.contrast-white_scale-140.png
-images\splashscreen.contrast-white_scale-180.png
-images\splashscreen.png
-images\splashscreen.scale-100.png
-images\splashscreen.scale-140.png
-images\splashscreen.scale-180.png
-images\tileLogo.contrast-black_scale-100.png
-images\tileLogo.contrast-black_scale-140.png
-images\tileLogo.contrast-black_scale-180.png
-images\tileLogo.contrast-black_scale-80.png
-images\tileLogo.contrast-white_scale-100.png
-images\tileLogo.contrast-white_scale-140.png
-images\tileLogo.contrast-white_scale-180.png
-images\tileLogo.contrast-white_scale-80.png
-images\tileLogo.png
-images\tileLogo.scale-100.png
-images\tileLogo.scale-140.png
-images\images\tileLogo.scale-180.png
-images\tileLogo.scale-80.png
-xaml\MainPage.xaml
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/tileresources/resources.resfiles thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/tileresources/resources.resfiles
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/tileresources/resources.resfiles	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/tileresources/resources.resfiles	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Resources.resw
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/tileresources/Resources.resw thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/tileresources/Resources.resw
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/shell/tileresources/Resources.resw	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/shell/tileresources/Resources.resw	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="customStringName" xml:space="preserve">
-    <value>Custom String Value</value>
-  </data>
-</root>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/aboutAddons.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/aboutAddons.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/aboutAddons.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/aboutAddons.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +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/. */
-
-html, body {
-  height: 100%;
-  padding: 0;
-  margin: 0;
-}
-
-body {
-  display: flex;
-}
-
-#aboutAddonsTextTitle {
-  font-weight: bold;
-}
-
-#floatingTextBox {
-  flex: 1;
-  
-  position: relative;
-  top: 20%;
-  left: 60%;
-
-  width: 375px;
-  padding: 20px;
-  font-family: "Segoe UI", sans-serif;
-  font-size: 25px;
-  text-align: left;
-  word-wrap: normal;
-}
-
-#fox {
-  flex: 1;
-  background-image:url('chrome://browser/skin/images/aboutAddonsBackground.png'), url('chrome://browser/skin/images/aboutAddonsBackgroundFillSlice.png');
-  background-size: contain;
-  background-position: bottom center;
-  background-repeat: no-repeat, repeat-x;
-  background-color: rgb(230, 230, 230); /*color hand sampled from image*/
-
-}
-
-/* Snapped-view variation */
-@media (max-width: 330px) {
-  #floatingTextBox {
-    top: 20%;
-    left: 5%;
-    width: 90%;
-    padding: 0;
-  }
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/about.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/about.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/about.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/about.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +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/. */
-
-html {
-  background: #f0f0f0;
-  padding: 0 1em;
-  font-family: "Nokia Sans", Tahoma, sans-serif !important;
-  font-size: 100% !important;
-}
-
-body {
-  color: black;
-  position: relative;
-  min-width: 330px;
-  max-width: 50em;
-  margin: 1em auto;
-  border: 1px solid gray;
-  border-radius: 10px;
-  padding: 3em;
-  -moz-padding-start: 30px;
-  background: white;
-}
-
-.aboutPageWideContainer {
-  max-width: 80%;
-}
-
-#aboutLogoContainer {
-  border: 1px solid lightgray;
-  width: 300px;
-  margin-bottom: 2em;
-}
-
-img {
-  border: 0;
-}
-
-#version {
-  font-weight: bold;
-  color: #909090;
-  margin: -24px 0 9px 17px;
-}
-
-ul {
-  margin: 0;
-  -moz-margin-start: 1.5em;
-  padding: 0;
-  list-style: square;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/aboutPage.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/aboutPage.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/aboutPage.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/aboutPage.css	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-
-#aboutLogoContainer {
-  width: 300px;
-}
-
-#version {
-  font-weight: bold;
-  color: #909090;
-  margin: -24px 20px 0 118px;
-}
-
-#update {
-  float: right;
-  padding: 8px;
-  margin-top: -32px;
-}
-
-body[dir="rtl"] #update {
-  float: left;
-}
-
-#update-message-checking,
-#update-message-none,
-#update-message-found {
-  display: none;
-  float: right;
-  padding: 8px;
-  margin-top: -32px;
-}
-
-body[dir="rtl"] #update-message-checking,
-body[dir="rtl"] #update-message-none,
-body[dir="rtl"] #update-message-found {
-  float: left;
-}
-
-#aboutLinks {
-  background-color: white;
-  padding: 5px;
-  border: 2px solid #e6e5e3;
-  font-size: 24px;
-}
-
-#aboutLinks > li {
-  clear: both;
-  border-bottom: 2px solid #e6e5e3;
-  list-style: none;
-  -moz-padding-end: 16px;
-}
-
-#aboutLinks > li:last-child {
-  border-bottom: 0;
-}
-
-#aboutLinks > li > a {
-  padding: 16px;
-  display: block;
-  color: #3a3834;
-  background: url("images/arrowright-16.png") right center no-repeat;
-}
-
-body[dir="rtl"] #aboutLinks > li > a {
-  background: url("images/arrowleft-16.png") left center no-repeat;
-}
-
-#aboutDetails {
-  margin-top: 15px;
-  font-size: 18px;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/browser.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/browser.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/browser.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/browser.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,1402 +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/. */
-
-%filter substitution
-%include defines.inc
-
-%define forward_transition_length 200ms
-%define forward_spacing 50px
-
-/* Tab/StartUI tray ======================================================== */
-
-#tray {
-  transition: transform @metro_animation_duration@ @metro_animation_easing@;
-  transform: translateY(-@tabs_height@);
-  width: 100%;
-}
-
-#tray {
-  position: fixed;
-}
-
-#tray[expanded]:not([viewstate="snapped"]) {
-  transform: none;
-}
-
-/* Tabs -------------------------------------------------------------------- */
-
-#tabs-container {
-  background: @panel_dark_color@ @panel_dark_background@;
-  padding: 0;
-  -moz-padding-start: @metro_spacing_normal@;
-  width: 100%;
-}
-
-#tabs {
-  -moz-padding-start: 0;
-}
-
-#tabs .tabs-list {
-  display: block;
-  -moz-user-focus: ignore;
-  padding: 0;
-  background-color: transparent;
-  margin: 0;
-  overflow: auto;
-}
-
-.tabs-scrollbox > .scrollbutton-up[collapsed],
-.tabs-scrollbox > .scrollbutton-down[collapsed],
-#tabs[input="imprecise"] > .tabs-scrollbox > .scrollbutton-up,
-#tabs[input="imprecise"] > .tabs-scrollbox > .scrollbutton-down {
-  visibility: hidden !important;
-  pointer-events: none;
-}
-
-#tabs > .tabs-scrollbox > .scrollbutton-down:-moz-locale-dir(rtl),
-#tabs > .tabs-scrollbox > .scrollbutton-up {
-  list-style-image: url("images/tab-arrows.png") !important;
-  -moz-image-region: rect(15px 58px 63px 14px) !important;
-  padding-right: 15px;
-  width: @tabs_scrollarrow_width@;
-}
-#tabs > .tabs-scrollbox > .scrollbutton-down:hover:-moz-locale-dir(rtl),
-#tabs > .tabs-scrollbox > .scrollbutton-up:hover {
-  -moz-image-region: rect(14px 102px 62px 58px) !important;
-}
-#tabs > .tabs-scrollbox > .scrollbutton-down:active:-moz-locale-dir(rtl),
-#tabs > .tabs-scrollbox > .scrollbutton-up:active {
-  -moz-image-region: rect(14px 152px 62px 108px) !important;
-}
-#tabs > .tabs-scrollbox > .scrollbutton-down[disabled]:-moz-locale-dir(rtl),
-#tabs > .tabs-scrollbox > .scrollbutton-up[disabled] {
-  -moz-image-region: rect(15px 196px 63px 152px) !important;
-}
-
-#tabs > .tabs-scrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
-#tabs > .tabs-scrollbox > .scrollbutton-down {
-  list-style-image: url("images/tab-arrows.png") !important;
-  -moz-image-region: rect(73px 58px 121px 14px) !important;
-  padding-left: 15px;
-  width: @tabs_scrollarrow_width@;
-}
-#tabs > .tabs-scrollbox > .scrollbutton-up:hover:-moz-locale-dir(rtl),
-#tabs > .tabs-scrollbox > .scrollbutton-down:hover {
-  -moz-image-region: rect(72px 102px 120px 58px) !important;
-}
-#tabs > .tabs-scrollbox > .scrollbutton-up:active:-moz-locale-dir(rtl),
-#tabs > .tabs-scrollbox > .scrollbutton-down:active {
-  -moz-image-region: rect(72px 152px 120px 108px) !important;
-}
-#tabs > .tabs-scrollbox > .scrollbutton-up[disabled]:-moz-locale-dir(rtl),
-#tabs > .tabs-scrollbox > .scrollbutton-down[disabled] {
-  -moz-image-region: rect(73px 196px 121px 152px) !important;
-}
-
-.tabs-scrollbox > .scrollbutton-up:not([disabled]):not([collapsed]):-moz-locale-dir(rtl)::after {
-  right: calc(@tabs_scrollarrow_width@ + @metro_spacing_normal@);
-}
-
-.tabs-scrollbox > .scrollbutton-down:not([disabled]):not([collapsed]):-moz-locale-dir(rtl)::before {
-  right: auto;
-  left: calc(@tabs_scrollarrow_width@ + @newtab_button_width@);
-}
-
-.tabs-scrollbox > .scrollbutton-up:not([disabled]):not([collapsed])::after {
-  content: "";
-  visibility: visible;
-  display: block;
-  background-color: rgb(90, 91, 95);
-  position: absolute;
-  top: 0;
-  left: calc(@tabs_scrollarrow_width@ + @metro_spacing_normal@); /* .scrollbutton-up width + #tabs-container left padding */
-  width: 1px;
-  height: @tabs_height@;
-}
-
-.tabs-scrollbox > .scrollbutton-down:not([disabled]):not([collapsed])::before {
-  content: "";
-  visibility: visible;
-  display: block;
-  background-color: rgb(90, 91, 95);
-  position: absolute;
-  top: 0;
-  right: calc(@tabs_scrollarrow_width@ + @newtab_button_width@); /* .scrollbutton-down width + #newtab-button width */
-  width: 1px;
-  height: @tabs_height@;
-}
-
-/* Hack for bug 965550 */
-.tabs-scrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox {
-  -moz-padding-start: calc(2 * @tabs_scrollarrow_width@);
-  -moz-margin-start: calc(-2 * @tabs_scrollarrow_width@);
-}
-
-#tabs-container[viewstate="snapped"] {
-  visibility: hidden;
-}
-
-@-moz-keyframes open-documenttab {
-  0% {
-    opacity: 0;
-    transform: scale(0, 0);
-  }
-
-  100% {
-    opacity: 1;
-    transform: scale(1, 1);
-  }
-}
-
-@-moz-keyframes close-documenttab {
-  0% {
-    opacity: 1;
-    transform: scale(1, 1);
-  }
-
-  100% {
-    opacity: 0;
-    transform: scale(0, 0);
-  }
-}
-
-.documenttab-container {
-  animation: open-documenttab 0.4s ease-out;
-}
-
-documenttab[closing] > .documenttab-container {
-  animation: close-documenttab 0.4s ease-out;
-  animation-fill-mode: forwards;
-}
-
-.documenttab-favicon {
-  visibility: collapse;
-}
-
-.documenttab-thumbnail {
-  margin: @metro_spacing_normal@ @metro_spacing_snormal@;
-  background: white none center top no-repeat;
-  background-size: cover;
-  min-width: @thumbnail_width@;
-  width: @thumbnail_width@;
-  height: @thumbnail_height@;
-}
-#tray:not([expanded]) .documenttab-thumbnail {
-  background-image: none!important;
-}
-
-/* TODO: Decide how and where to display private tabs.
- * For now, display them in the main tab strip but hide the thumbnail. */
-documenttab[private] .documenttab-thumbnail {
-  background-color: purple;
-}
-
-.documenttab-title {
-  margin: @metro_spacing_normal@ @metro_spacing_snormal@;
-  margin-top: 0;
-  font-size: @metro_font_normal@;
-  width: @thumbnail_width@;
-  padding: 4px @metro_spacing_snormal@ 8px;
-
-  background: #000;
-  opacity: 0.95;
-  color: #fff;
-  box-shadow: 0 0 @metro_spacing_snormal@ rgba(0, 0, 0, 0.25);
-}
-
-.documenttab-crop {
-  background: transparent url("chrome://browser/skin/images/tab-crop.png") 50% 50% no-repeat;
-}
-
-.documenttab-selection {
-  background: transparent -moz-image-rect(url("chrome://browser/skin/images/tab-overlay.png"), 0%, 100%, 50%, 0%) 50% 50% no-repeat;
-}
-
-documenttab[selected] .documenttab-selection {
-  background: transparent -moz-image-rect(url("chrome://browser/skin/images/tab-overlay.png"), 50%, 100%, 100%, 0%) 50% 50% no-repeat;
-}
-
-.documenttab-crop:-moz-locale-dir(rtl),
-.documenttab-selection:-moz-locale-dir(rtl),
-documenttab[selected] .documenttab-selection:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
-}
-
-.documenttab-close {
-  background: none !important;
-  padding: @metro_spacing_small@ !important;
-  margin-top: @metro_spacing_snormal@;
-  -moz-margin-end: @metro_spacing_xsmall@;
-  border-color: transparent !important;
-  list-style-image: url("chrome://browser/skin/images/closetab-default.png");
-}
-
-.documenttab-close > .button-box > .button-text {
-  display: none;
-}
-
-#tabs-controls {
-  -moz-box-align: start;
-  -moz-box-orient: vertical;
-}
-
-#newtab-button {
-  list-style-image: url(chrome://browser/skin/images/newtab-default.png);
-
-  /* Add some extra padding for a larger target */
-  padding: 18px 20px 30px 20px;
-  width: @newtab_button_width@;
-}
-
-/* Start UI ----------------------------------------------------------------- */
-
-#urlbar-autocomplete[viewstate="snapped"],
-#urlbar-autocomplete[viewstate="portrait"]{
-  -moz-box-orient: vertical;
-}
-
-#autocomplete-overlay {
-  display: none;
-  background-color: black;
-  opacity: .3;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
-#stack[autocomplete] > #page > #content-viewport > #autocomplete-overlay {
-  display: -moz-box;
-}
-
-/* Browser Content Areas ==================================================== */
-
-/* a 'margin-top' is applied dynamically in ContentAreaObserver */
-#browsers {
-  background: white;
-  transition-property: margin-top;
-  transition-duration: .3s;
-  transition-timing-function: ease-in-out;
-}
-#browsers browser {
-  /* unset padding-bottom immediately */
-  transition-duration: 0s;
-  transition-delay:    0s;
-  transition-property: padding-bottom;
-}
-/* Selection overlay and monocles */
-#page,
-.selection-overlay {
-  -moz-stack-sizing: ignore;
-}
-
-.selection-overlay {
-  pointer-events: none;
-}
-
-.selection-overlay:-moz-focusring {
-  outline: 0 !important;
-}
-
-.selection-overlay-hidden {
-  display: none;
-}
-
-.selectionhandle {
-  background-image: url("chrome://browser/skin/images/selection-monocle.png");
-  background-repeat: no-repeat;
-  background-size: 18px 18px;
-  padding: 0px;
-  margin-top: -19px;
-  margin-left: -9px;
-  pointer-events: auto;
-}
-
-@media (min-resolution: @min_res_140pc@) {
-  /* Load 140% image when scaled by 140% */
-  .selectionhandle {
-    background-image: url("chrome://browser/skin/images/selection-monocle@1.4x.png");
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  /* Load 180% image when scaled by 180% */
-  .selectionhandle {
-    background-image: url("chrome://browser/skin/images/selection-monocle@1.8x.png");
-  }
-}
-
-/* content scrollbars */
-.scroller {
-  opacity: 0;
-  background-color: rgba(0, 0, 0, 0.4) !important;
-  -moz-border-top-colors: none !important;
-  -moz-border-bottom-colors: none !important;
-  -moz-border-right-colors: none !important;
-  -moz-border-left-colors: none !important;
-  border-radius: @border_radius_tiny@;
-  border: @border_width_tiny@ solid rgba(255, 255, 255, 0.4) !important;
-}
-
-.scroller[panning] {
-  opacity: 1;
-}
-
-.scroller[orient="vertical"] {
-  min-width: @scroller_thickness@;
-  width: @scroller_thickness@;
-  min-height: @scroller_minimum@;
-}
-
-.scroller[orient="horizontal"] {
-  min-height: @scroller_thickness@;
-  height: @scroller_thickness@;
-  min-width: @scroller_minimum@;
-}
-
-/* overlay buttons */
-
-.overlay-button {
-  position: fixed;
-  top: 50%;
-  margin-top: -65px;
-  width: 118px;
-  height: 118px;
-  background-color: hsla(210,30%,10%,.2);
-  background-size: 60px;
-  background-repeat: no-repeat;
-  background-origin: padding-box;
-  background-clip: padding-box;
-  border: 6px solid hsla(0,0%,100%,.7);
-  border-radius: 50%;
-  box-shadow: 0 0 0 1px hsla(0,0%,0%,.04),
-              0 0 9px 0 hsla(0,0%,0%,.1);
-  transition-property: left, right, transform, background-position,
-                       background-color, background-size, border-color,
-                       visibility, box-shadow, top;
-  transition-duration: 550ms;
-  transition-timing-function: cubic-bezier(0.1, 0.9, 0.2, 1);
-}
-
-#overlay-back {
-  background-image: url(chrome://browser/skin/images/overlay-back.png);
-}
-
-#overlay-plus {
-  background-image: url(chrome://browser/skin/images/overlay-plus.png);
-}
-
-@media (min-resolution: @min_res_140pc@) {
-  #overlay-back {
-    background-image: url(chrome://browser/skin/images/overlay-back@1.4x.png);
-  }
-
-  #overlay-plus {
-    background-image: url(chrome://browser/skin/images/overlay-plus@1.4x.png);
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  #overlay-back {
-    background-image: url(chrome://browser/skin/images/overlay-back@1.8x.png);
-  }
-
-  #overlay-plus {
-    background-image: url(chrome://browser/skin/images/overlay-plus@1.8x.png);
-  }
-}
-
-#overlay-back:-moz-locale-dir(ltr),
-#overlay-plus:-moz-locale-dir(rtl) {
-  left: -70px;
-  background-position: right 6px center;
-}
-
-#overlay-plus:-moz-locale-dir(ltr) {
-  right: -70px;
-  background-position: left 6px center;
-}
-
-#stack[viewstate="snapped"] > .overlay-button,
-#stack[keyboardVisible] > .overlay-button,
-#stack[autocomplete] > .overlay-button,
-#stack[fullscreen] > .overlay-button,
-#appbar[visible] ~ .overlay-button,
-.overlay-button[disabled] {
-  box-shadow: none;
-  visibility: collapse;
-}
-
-#stack[keyboardVisible] > #overlay-back:-moz-locale-dir(ltr),
-#stack[keyboardVisible] > #overlay-plus:-moz-locale-dir(rtl),
-#stack[autocomplete] > #overlay-back:-moz-locale-dir(ltr),
-#stack[autocomplete] > #overlay-plus:-moz-locale-dir(rtl),
-#stack[fullscreen] > #overlay-back:-moz-locale-dir(ltr),
-#stack[fullscreen] > #overlay-plus:-moz-locale-dir(rtl),
-#appbar[visible] ~ #overlay-back:-moz-locale-dir(ltr),
-#appbar[visible] ~ #overlay-plus:-moz-locale-dir(rtl),
-#overlay-back[disabled]:-moz-locale-dir(ltr),
-#overlay-plus[disabled]:-moz-locale-dir(rtl) {
-  transform: translateX(-60px);
-}
-
-#stack[keyboardVisible] > #overlay-plus:-moz-locale-dir(ltr),
-#stack[keyboardVisible] > #overlay-back:-moz-locale-dir(rtl),
-#stack[autocomplete] > #overlay-plus:-moz-locale-dir(ltr),
-#stack[autocomplete] > #overlay-back:-moz-locale-dir(rtl),
-#stack[fullscreen] > #overlay-plus:-moz-locale-dir(ltr),
-#stack[fullscreen] > #overlay-back:-moz-locale-dir(rtl),
-#appbar[visible] ~ #overlay-plus:-moz-locale-dir(ltr),
-#appbar[visible] ~ #overlay-back:-moz-locale-dir(rtl),
-#overlay-plus[disabled]:-moz-locale-dir(ltr),
-#overlay-back[disabled]:-moz-locale-dir(rtl) {
-  transform: translateX(60px);
-}
-
-.overlay-button:hover {
-  background-color: hsla(210,30%,10%,.4);
-  background-size: 90px;
-  border-color: hsla(0,0%,100%,.9);
-}
-
-#overlay-back:-moz-locale-dir(ltr):hover,
-#overlay-plus:-moz-locale-dir(rtl):hover {
-  background-position: right 12px center;
-  transform: translateX(40px) scale(1.2);
-}
-
-#overlay-plus:-moz-locale-dir(ltr):hover {
-  background-position: left 12px center;
-  transform: translateX(-40px) scale(1.2);
-}
-
-#overlay-back:-moz-locale-dir(rtl):hover {
-  transform: translateX(-40px) scale(1.2) scaleX(-1);
-}
-
-#overlay-back:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
-  right: -70px;
-  background-position: right 9px center;
-}
-
-#overlay-back[mousedrag],
-#overlay-plus[mousedrag] {
-  transition-property: left, right, transform, background-position,
-                       background-color, background-size, border-color,
-                       visibility, box-shadow;
-}
-
-/* Navigation bar ========================================================== */
-
-/* Most appbars are hidden by default, but we want to keep #navbar visible so
- * we can show the progress bar at all times.  Instead, we hide only the
- * toolbar portion of the navbar. */
-#navbar {
-  visibility: visible;
-}
-#navbar:not([hiding]):not([visible]) > #toolbar-overlay {
-  visibility: hidden;
-}
-
-#content-viewport[navbar="visible"] .active-tab-notificationbox:not([count="0"]):not([notificationsVisible="false"]) {
-  padding-bottom: @toolbar_height@;
-}
-
-
-/* Progress meter ---------------------------------------------------------- */
-
-#progress-container {
-  display: block;
-  position: absolute;
-  top: -@progress_height@;
-  height: @progress_height@;
-  width: 100%;
-  background-color: hsla(210,5%,80%,1);
-  box-shadow: 0 1px 0 hsla(210,5%,50%,.1) inset;
-  -moz-user-focus: ignore;
-}
-#progress-container[startpage] {
-  visibility: collapse;
-}
-
-#progress-control {
-  display: block;
-  height: @progress_height@;
-  background-image: -moz-linear-gradient(left, hsla(200,100%,83%,.5),
-                                         hsla(200,100%,83%,0)),
-                    -moz-linear-gradient(top, #1ab2ff, #0091ff);
-  border-right: 1px solid #0082e5;
-  transition: width .3s ease-in;
-  -moz-user-focus: ignore;
-}
-
-#progress-control:-moz-dir(rtl) {
-  transform: scaleX(-1);
-}
-
-#progress-control[fade] {
-  opacity: 0;
-  transition: width .3s ease-in, .5s opacity ease-in;
-}
-
-/* Toolbar ----------------------------------------------------------------- */
-
-#toolbar-overlay {
-  background-color: @panel_light_color@;
-}
-
-#urlbar-autocomplete {
-  padding-top: 0;
-}
-
-#toolbar {
-  padding: 0 @toolbar_horizontal_padding@;
-}
-
-#toolbar[viewstate="snapped"] {
-  padding: 0 @toolbar_snapped_horizontal_padding@;
-}
-
-#toolbar[viewstate="snapped"] > toolbarbutton {
-  margin: 0 @toolbar_snapped_horizontal_spacing@;
-}
-
-/* Combined back/forward buttons */
-
-#back-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-back.png);
-  position: relative;
-  z-index: 1;
-  transition: opacity @forward_transition_length@ ease-out;
-}
-
-#back-button:-moz-locale-dir(rtl),
-#forward-button:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
-}
-
-#back-button[disabled] {
-  visibility: visible;
-  opacity: 0.5;
-}
-
-#forward-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-forward.png);
-  transition: margin @forward_transition_length@ ease-out,
-              visibility @forward_transition_length@ ease-out,
-              opacity @forward_transition_length@ ease-out;
-}
-
-#forward-button[disabled] {
-  -moz-margin-start: -@forward_spacing@ !important;
-  visibility: hidden;
-  opacity: 0;
-  pointer-events: none;
-}
-
-@media (min-resolution: @min_res_140pc@) {
-  #back-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-back@1.4x.png);
-  }
-
-  #forward-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-forward@1.4x.png);
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  #back-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-back@1.8x.png);
-  }
-
-  #forward-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-forward@1.8x.png);
-  }
-}
-
-/* URL bar */
-#urlbar {
-  border: @metro_border_thick@ solid @urlbar_border_color@;
-  margin: 0 @toolbar_horizontal_spacing@;
-  padding: 0;
-  background-color: @field_background_color@;
-  overflow: hidden;
-}
-
-#urlbar[editing] {
-  border-color: @metro_orange@;
-}
-
-/* Identity widget */
-#identity-icon {
-  margin: 0;
-  padding: 0 @metro_spacing_snormal@;
-  list-style-image: url("chrome://browser/skin/images/identity-icons-generic.png");
-}
-
-#identity-box.verifiedDomain > #identity-icon {
-  list-style-image: url("chrome://browser/skin/images/identity-icons-https.png");
-}
-
-#identity-box.verifiedIdentity > #identity-icon {
-  list-style-image: url("chrome://browser/skin/images/identity-icons-https-ev.png");
-}
-
-#toolbar[startpage] > #urlbar:not([autocomplete]) > #identity-box > #identity-icon {
-  list-style-image: url("chrome://browser/skin/images/icons-identity-firefox.png");
-}
-
-#urlbar[autocomplete] > #identity-box > #identity-icon {
-  list-style-image: url("chrome://browser/skin/images/icon-autocomplete-search.png");
-}
-
-/* Main URL textbox */
-#urlbar-edit {
-  margin: 0 !important;
-  min-height: @urlbar_edit_height@;
-  -moz-appearance: none !important;
-  border-radius: 0;
-  border: 0 none !important;
-  padding: 0 !important;
-}
-
-#urlbar-edit > hbox > .textbox-input-box > .textbox-input:invalid {
-  /* Hide error glow around the address bar that shows by default
-   * when URLs are made invalid by trmming. */
-  box-shadow: none !important;
-}
-
-/* Combined stop-reload button */
-.urlbar-button {
-  margin: 0;
-  -moz-image-region: rect(0px, 30px, 30px, 0px);
-}
-
-.urlbar-button:hover:not(:active) {
-  -moz-image-region: rect(0px, 60px, 30px, 30px);
-  background-color: #dedfdf;
-}
-
-.urlbar-button:active {
-  -moz-image-region: rect(0px, 90px, 30px, 60px);
-  background-color: #6d7073;
-}
-
-.urlbar-button  > .toolbarbutton-icon {
-  width: 30px;
-  height: 30px;
-}
-
-#go-button {
-  list-style-image: url(chrome://browser/skin/images/urlbar-go.png)
-}
-
-#reload-button {
-  list-style-image: url(chrome://browser/skin/images/urlbar-reload.png);
-}
-
-#stop-button {
-  list-style-image: url(chrome://browser/skin/images/urlbar-stop.png);
-}
-
-@media (min-resolution: @min_res_140pc@) {
-  .urlbar-button {
-    -moz-image-region: rect(0px, 42px, 42px, 0px);
-  }
-
-  .urlbar-button:hover:not(:active) {
-    -moz-image-region: rect(0px, 84px, 42px, 42px);
-  }
-
-  .urlbar-button:active {
-    -moz-image-region: rect(0px, 126px, 42px, 84px);
-  }
-
-  #go-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-go@1.4x.png)
-  }
-
-  #reload-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-reload@1.4x.png);
-  }
-
-  #stop-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-stop@1.4x.png);
-  }
-
-  #toolbar[startpage] > #urlbar:not([autocomplete]) > #identity-box > #identity-icon {
-    list-style-image: url("chrome://browser/skin/images/icons-identity-firefox@1.4x.png");
-  }
-
-  #urlbar[autocomplete] > #identity-box > #identity-icon {
-    list-style-image: url("chrome://browser/skin/images/icon-autocomplete-search@1.4x.png");
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  .urlbar-button {
-    -moz-image-region: rect(0px, 54px, 54px, 0px);
-  }
-
-  .urlbar-button:hover:not(:active) {
-    -moz-image-region: rect(0px, 108px, 54px, 54px);
-  }
-
-  .urlbar-button:active {
-    -moz-image-region: rect(0px, 162px, 54px, 108px);
-  }
-
-  #go-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-go@1.8x.png)
-  }
-
-  #reload-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-reload@1.8x.png);
-  }
-
-  #stop-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-stop@1.8x.png);
-  }
-
-  #toolbar[startpage] > #urlbar:not([autocomplete]) > #identity-box > #identity-icon {
-    list-style-image: url("chrome://browser/skin/images/icons-identity-firefox@1.8x.png");
-  }
-
-  #urlbar[autocomplete] > #identity-box > #identity-icon {
-    list-style-image: url("chrome://browser/skin/images/icon-autocomplete-search@1.8x.png");
-  }
-}
-
-/* navbar edit button: one button out of three - when editing: go, when !editing,
-   loading: stop, when !editing, !loading: reload */
-
-#go-button, #reload-button, #stop-button  {
-  visibility: collapse;
-}
-
-#urlbar[editing] > #go-button,
-#urlbar:not([editing])[loading] > #stop-button,
-#urlbar:not([editing]):not([loading]) > #reload-button {
-  visibility: visible;
-}
-
-/* Contextual toolbar controls */
-
-#toolbar-context-autocomplete,
-.hide-on-start,
-#toolbar-context-page {
-  transition-property: opacity, visibility;
-  transition-duration: @forward_transition_length@;
-  transition-timing-function: @metro_animation_easing@;
-}
-
-#toolbar-contextual:not([autocomplete]) #toolbar-context-autocomplete,
-#toolbar-contextual[startpage] .hide-on-start,
-#toolbar-contextual[autocomplete] #toolbar-context-page {
-  opacity: 0;
-  visibility: hidden;
-  pointer-events: none;
-}
-
-#toolbar[viewstate="snapped"] #toolbar-contextual {
-  visibility: collapse;
-}
-
-#download-progress:not([progress]) {
-  visibility: collapse;
-}
-
-#download-progress {
-  list-style-image: url(chrome://browser/skin/images/navbar-download.png);
-}
-
-#download-progress[progress="100"] {
-  list-style-image: url(chrome://browser/skin/images/navbar-download-finished.png);
-}
-
-#pin-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-pin.png);
-}
-
-#star-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-star.png);
-}
-
-#menu-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-menu.png);
-}
-
-#close-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-close.png);
-}
-
-@media (min-resolution: @min_res_140pc@) {
-  #download-progress {
-    list-style-image: url(chrome://browser/skin/images/navbar-download@1.4x.png);
-  }
-
-  #download-progress[progress="100"] {
-    list-style-image: url(chrome://browser/skin/images/navbar-download-finished@1.4x.png);
-  }
-
-  #pin-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-pin@1.4x.png);
-  }
-
-  #star-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-star@1.4x.png);
-  }
-
-  #menu-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-menu@1.4x.png);
-  }
-
-  #close-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-close@1.4x.png);
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  #download-progress {
-    list-style-image: url(chrome://browser/skin/images/navbar-download@1.8x.png);
-  }
-
-  #download-progress[progress="100"] {
-    list-style-image: url(chrome://browser/skin/images/navbar-download-finished@1.8x.png);
-  }
-
-  #pin-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-pin@1.8x.png);
-  }
-
-  #star-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-star@1.8x.png);
-  }
-
-  #menu-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-menu@1.8x.png);
-  }
-
-  #close-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-close@1.8x.png);
-  }
-}
-
-/* Panel UI ================================================================ */
-
-#panel-container {
-  padding: 60px 40px;
-}
-
-#panel-container[viewstate="snapped"] .canSnapTiles .richgrid-item-content {
-  -moz-box-orient: horizontal;
-}
-
-#panel-close-button {
-  -moz-margin-end: 40px;
-  list-style-image: url(chrome://browser/skin/images/navbar-back.png);
-  -moz-box-pack: center;
-}
-
-#panel-close-button:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
-}
-
-@media (min-resolution: @min_res_140pc@) {
-  #panel-close-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-back@1.4x.png);
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  #panel-close-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-back@1.8x.png);
-  }
-}
-
-#panel-items {
-  padding-top: 20px;
-  -moz-padding-start: 88px;
-}
-
-#panel-container[viewstate="snapped"] #panel-items {
-  padding-left: 0px;
-}
-
-/* Console Section - Panel UI ---------------------------------------------- */
-
-#console-filter-warnings,
-#console-filter-messages {
-  visibility: visible;
-}
-
-@media (max-width: 499px) {
-  #console-filter-warnings,
-  #console-filter-messages {
-    visibility: collapse;
-  }
-}
-
-.console-error-msg,
-.console-msg-text {
-  white-space: pre-wrap;
-}
-
-/* Find bar ================================================================ */
-
-#findbar {
-  background-color: @metro_orange@;
-  padding: 0;
-}
-
-#findbar > toolbar {
-  min-height: @findbar_height@ !important;
-}
-
-#findbar-textbox {
-  border: none !important;
-  width: 20em;
-}
-
-/* Override the default box ordering and make the find textbox appear to the
-   right of the icon */
-#findbar-textbox input {
-  -moz-box-ordinal-group: 2
-}
-
-#findbar-textbox[status="1"] { /* Ci.nsITypeAheadFind.FIND_NOTFOUND */
-  background: rgb(255,200,200);
-}
-
-#findbar-textbox:hover:active {
-  background: #8db8d8;
-}
-
-.textbox-search-icon {
-  list-style-image: url("chrome://browser/skin/images/search-glass-30.png");
-  -moz-image-region: auto;
-}
-
-#findbar-previous-button {
-  -moz-image-region: rect(0px, 400px, 40px, 360px);
-}
-
-#findbar-previous-button:hover:not(:active) {
-  -moz-image-region: rect(40px, 400px, 80px, 360px);
-}
-
-#findbar-previous-button:active {
-  -moz-image-region: rect(80px, 400px, 120px, 360px);
-}
-
-#findbar-next-button {
-  -moz-image-region: rect(0px, 440px, 40px, 400px);
-}
-
-#findbar-next-button:hover:not(:active) {
-  -moz-image-region: rect(40px, 440px, 80px, 400px);
-}
-
-#findbar-next-button:active {
-  -moz-image-region: rect(80px, 440px, 120px, 400px);
-}
-
-#findbar-close-button {
-  -moz-image-region: rect(0px, 480px, 40px, 440px);
-}
-
-#findbar-close-button:hover:not(:active) {
-  -moz-image-region: rect(40px, 480px, 80px, 440px);
-}
-
-#findbar-close-button:active {
-  -moz-image-region: rect(80px, 480px, 120px, 440px);
-}
-
-/* Contextual appbar ======================================================= */
-
-#contextualactions-tray {
-  background-color: @metro_orange@;
-}
-
-#contextualactions-tray > toolbarbutton {
-  opacity: 1;
-}
-#contextualactions-tray > toolbarbutton[fade] {
-  opacity: 0;
-}
-#contextualactions-tray > toolbarbutton:not([immediate]) {
-  transition-property: opacity;
-  transition-duration: .3s;
-  transition-timing-function: ease-in;
-  transition-delay: 80ms;
-}
-#contextualactions-tray > toolbarbutton > .toolbarbutton-text {
-  color: white;
-}
-
-#pin-selected-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-contextual-pin.png);
-}
-
-#unpin-selected-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-contextual-unpin.png);
-}
-
-#hide-selected-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-contextual-hide.png);
-}
-
-#delete-selected-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-contextual-delete.png);
-}
-
-#clear-selected-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-contextual-clear.png);
-}
-
-#restore-selected-button {
-  list-style-image: url(chrome://browser/skin/images/navbar-contextual-restore.png);
-}
-
-@media (min-resolution: @min_res_140pc@) {
-  #pin-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-pin@1.4x.png);
-  }
-
-  #unpin-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-unpin@1.4x.png);
-  }
-
-  #hide-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-hide@1.4x.png);
-  }
-
-  #delete-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-delete@1.4x.png);
-  }
-
-  #clear-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-clear@1.4x.png);
-  }
-
-  #restore-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-restore@1.4x.png);
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  #pin-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-pin@1.8x.png);
-  }
-
-  #unpin-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-unpin@1.8x.png);
-  }
-
-  #hide-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-hide@1.8x.png);
-  }
-
-  #delete-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-delete@1.8x.png);
-  }
-
-  #clear-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-clear@1.8x.png);
-  }
-
-  #restore-selected-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-contextual-restore@1.8x.png);
-  }
-}
-
-/* Download notifications ======================================================= */
-
-.download-filename-text {
-  font-weight: bold;
-}
-.download-host-text {
-  font-weight: bold;
-}
-
-/* Autoscroll popup ======================================================== */
-
-.autoscroller {
-  height: 28px;
-  width: 28px;
-  border: none;
-  margin: -14px;
-  padding: 0;
-  background-image: url("chrome://browser/skin/images/autoscroll.png");
-  background-color: transparent;
-  position: fixed;
-  visibility: hidden;
-  background-repeat: no-repeat;
-  background-origin: padding-box;
-  background-clip: padding-box;
-  background-position: right top;
-  -moz-appearance: none;
-}
-
-.autoscroller[scrolldir="NS"] {
-  background-position: right center;
-}
-
-.autoscroller[scrolldir="EW"] {
-  background-position: right bottom;
-}
-
-/* Flyouts ================================================================= */
-
-/* don't add a margin to the very top settings entry in flyouts */
-flyoutpanel > settings:first-child {
-  margin-top: 0px;
-}
-
-/* Sync flyout pane -------------------------------------------------------- */
-
-#sync-flyoutpanel {
-  font-size: @metro_font_normal@;
-  font-weight: 400;
-}
-
-#sync-flyoutpanel button {
-  font-weight: 700;
-}
-
-#sync-flyoutpanel .syncHeader {
-  font-weight: 600;
-}
-
-#sync-flyoutpanel .syncSecondaryText {
-  font-weight: 100;
-  font-size: @metro_font_snormal@;
-}
-
-#sync-flyoutpanel .syncInstructionText {
-  font-style: italic;
-}
-
-.syncThrobber .progressBall {
-   margin: 2px;
-   width: 22px;
-   height: 22px;
- }
-
-.syncThrobber .progressBallInner {
-  width: 5px;
-  height: 5px;
-  border-radius: 3px;
-}
-
-#sync-flyoutpanel .syncErrorText {
-  color: red;
-}
-
-#sync-flyoutpanel textbox {
-  margin: @metro_spacing_small@;
-  padding: @metro_spacing_xsmall@ @metro_spacing_snormal@;
-  background: @field_background_color@;
-  border: @metro_border_thick@ solid @field_mid_foreground_color@ !important;
-  color: @field_foreground_color@;
-}
-
-#sync-setup-throbber {
-  margin-top: 15px;
-  margin-left: 25px;
-}
-
-#sync-connected-device {
-  width: 200px;
-}
-
-#sync-manualsetup-failure {
-  width: 200px;
-}
-
-#sync-flyoutpanel .syncJPAKECode {
-  margin: @metro_spacing_small@;
-  padding: @metro_spacing_xsmall@ @metro_spacing_snormal@;
-  background: @field_background_color@;
-  border: @metro_border_thick@ solid @field_mid_foreground_color@ !important;
-  color: @field_foreground_color@;
-  display: block !important;
-  font-size: @metro_font_large@ !important;
-  font-weight: 600;
-  letter-spacing: 0.4em;
-  text-align: center;
-  width: 175px;
-}
-
-#sync-connected-device {
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-#sync-connected-lastSynced {
-  margin-top: 0px;
-  padding-top: 0px;
-}
-
-#sync-connected-throbber {
-  margin-top: 12px;
-  margin-left: 15px;
-}
-
-/* About flyout pane ------------------------------------------------------- */
-
-/* Colors are defined in /browser/branding/<dir>/content/metro-about.css */
-
-#about-flyoutpanel {
-  background-image: url('chrome://branding/content/metro-about-footer.png');
-  background-repeat: no-repeat;
-  background-attachment: fixed;
-  background-position: right bottom;
-}
-
-#about-flyoutpanel .text-link {
-  color: inherit;
-}
-
-#about-flyoutpanel > .flyoutpanel-wrapper > .flyoutpanel-header,
-#about-flyoutpanel > .flyoutpanel-wrapper > .flyoutpanel-contents {
-  background-color: inherit;
-  border: none;
-}
-
-#about-policy-label {
-  padding: 1.5em @metro_spacing_large@;
-  margin: 1em -@metro_spacing_large@;
-}
-
-#about-version-label {
- margin-top: 11pt;
-}
-
-#currentChannel {
-  margin: 0;
-  padding: 0;
-  font-weight: bold;
-}
-
-/* Preferences flyout pane ------------------------------------------------- */
-
-/* Lay out each <setting> in a single row */
-setting {
-  min-height: @touch_row@; /* row size */
-  -moz-box-align: center;
-  -moz-box-orient: horizontal;
-}
-
-/* ...except for some exceptions */
-.setting-expanded {
-  -moz-box-align: start;
-  -moz-box-orient: vertical;
-}
-
-setting > vbox {
-  -moz-box-flex: 1;
-}
-
-settings {
-  margin-top: 32px;
-}
-
-.settings-title {
-  font-weight: bold;
-}
-
-/* <setting> elements that are not in a <settings> group get special treatment */
-#prefs-flyoutpanel > setting,
-#sync-flyoutpanel > setting {
-  margin-top: 16px;
-}
-
-#prefs-flyoutpanel > setting .preferences-title {
-  font-weight: bold;
-}
-
-setting[type="integer"] > .preferences-alignment,
-setting[type="string"] > .preferences-alignment {
-  -moz-box-flex: 3;
-}
-
-setting[type="file"] > .preferences-alignment,
-setting[type="directory"] > .preferences-alignment {
-  -moz-box-align: center;
-}
-
-/* Removes the left side title vbox on radio setting */
-setting[type="radio"] > vbox {
-  display: none;
-}
-
-#prefs-homepage-options, #prefs-homepage-popup {
-  min-width: 200px;
-}
-
-.options-box {
-  -moz-margin-start: 28px;  /* sized based on the 32px addon image */
-}
-
-.options-box > setting:last-child {
-  border-bottom: 0;
-}
-
-.preferences-description {
-  font-size: @font_small@ !important;
-  color: grey;
-}
-
-.preferences-description:empty {
-  display: none;
-}
-
-/* Clear private data prefs */
-
-/* hide subitems when other data checkbox is not checked */
-#prefs-privdata-other:not([checked]) + #prefs-privdata-subitems {
-  display: none;
-}
-
-#prefs-privdata-subitems {
-  display: block;
-  padding-left: @metro_spacing_xnormal@;
-  font-size: @metro_font_snormal@;
-}
-
-/* arrange sub-items in two columns */
-.privdata-subitem-item {
-  display: inline-block;
-  vertical-align: middle;
-  margin: 0;
-  width: 50%;
-}
-
-#clear-notification {
-  max-height: 25px;
-}
-
-#clearprivacythrobber {
-  max-width: 25px;
-  max-height: 25px;
-}
-
-#clearprivacythrobber .progressContainer {
-  width: 25px;
-  height: 25px;
-}
-
-#clearprivacythrobber .progressBall {
-  margin: 2px;
-  width: 22px;
-  height: 22px;
-}
-
-#clear-notification-done {
-  font-weight: bold;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/circularprogress.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/circularprogress.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/circularprogress.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/circularprogress.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +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/. */
-
-%filter substitution
-%include defines.inc
-
-.circularprogressindicator-progressButton,
-.circularprogressindicator-progressRing,
-.circularprogressindicator-progressTrack,
-.circularprogressindicator-progressNotification {
-  margin: 0 @toolbar_horizontal_spacing@;
-}
-
-.circularprogressindicator-progressRing,
-.circularprogressindicator-progressTrack {
-  pointer-events:none;
-  position: absolute;
-}
-
-.circularprogressindicator-progressTrack {
-  width: 40px;
-  height: 40px;
-  background-repeat: no-repeat;
-  background-size: 40px 40px;
-  background-image: url(chrome://browser/skin/images/progresscircle-bg.png);
-}
-
-.circularprogressindicator-progressNotification {
-    width: 40px;
-    height: 40px;
-    background-image: url(chrome://browser/skin/images/navbar-download-finished.png);
-    visibility: hidden;
-}
-
-.circularprogressindicator-progressNotification.progressNotification-active {
-  visibility: visible;
-  opacity: 0;
-  transform: scale(2);
-  transition: opacity @metro_animation_duration@,
-              transform @metro_animation_duration@;
-}
-
-.circularprogressindicator-progressRing:not([progress]),
-.circularprogressindicator-progressRing[progress="100"],
-.circularprogressindicator-progressTrack:not([progress]),
-.circularprogressindicator-progressTrack[progress="100"] {
-  visibility: hidden;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/config.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/config.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/config.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/config.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,345 +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/. */
-
-html,
-body {
-    margin: 0;
-    padding: 0;
-    background-color: #ced7de;
-    -moz-user-select: none;
-    font-family: "Segoe UI", sans-serif;
-    -moz-text-size-adjust: none;
-}
-
-.toolbar {
-    width: 100%;
-    height: 3em;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 10;
-    box-shadow: 0 0 3px #444;
-    background-color: #ced7de;
-    color: #000000;
-    font-weight: bold;
-    border-bottom: 2px solid;
-    -moz-border-bottom-colors: #ff9100 #f27900;
-}
-
-.toolbar-container {
-    max-width: 40em;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-#filter-container {
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-    margin-right: 0.5em;
-    height: 2em;
-    border: 1px solid transparent;
-    border-image-source: url("chrome://browser/skin/images/textfield.png");
-    border-image-slice: 1 1 3 1;
-    border-image-width: 1px 1px 3px 1px;
-    overflow: hidden;
-    display: flex;
-    flex-direction: row;
-}
-
-#filter-input {
-    -moz-appearance: none;
-    border: none;
-    background-image: none;
-    background-color: transparent;
-    display: inline-block;
-    width: 12em;
-    min-width: 0;
-    color: #000000;
-    opacity: 1;
-    flex: 1 1 auto;
-}
-
-#filter-input:-moz-placeholder {
-    color: rgba(255,255,255,0.5);
-}
-
-.toolbar input {
-    display: inline-block;
-    height: 100%;
-    min-width: 3em;
-    box-sizing: border-box;
-    opacity: 0.75;
-}
-
-#new-pref-toggle-button {
-    background-position: center center;
-    background-image: url("chrome://browser/skin/images/reader-plus-icon-xhdpi.png");
-    background-size: 48px 48px;
-    height: 48px;
-    width: 48px;
-    display: inline-block;
-    outline-style: none;
-}
-
-#filter-search-button {
-    background-image: url("chrome://browser/skin/images/search.png");
-    background-size: 32px 32px;
-    height: 32px;
-    width: 32px;
-    display: inline-block;
-    outline-style: none;
-}
-
-#filter-input-clear-button {
-    background-image: url("chrome://browser/skin/images/search-clear-30.png");
-    background-size: 32px 32px;
-    height: 32px;
-    width: 32px;
-    display: inline-block;
-    outline-style: none;
-}
-
-#filter-input[value=""] + #filter-input-clear-button {
-    display: none;
-}
-
-.toolbar-item {
-    display: inline-block;
-    height: 3em;
-    min-width: 3em;
-    float: right;
-}
-
-#content {
-    position: relative;
-    margin: 0;
-    margin-left: auto;
-    margin-right: auto;
-    padding-top: 3em;
-    padding-left: 0;
-    padding-right: 0;
-    min-height: 100%;
-    max-width: 40em;
-}
-
-ul {
-    list-style-position: inside;
-    border: 1px solid #808080;
-    background-color: #ffffff;
-    min-height: 100%;
-    width: 100%;
-    padding-top: 0;
-    margin: 0;
-    padding-left: 0;
-    box-sizing: border-box;
-    box-shadow: 0 0 5px #000000;
-    overflow-x: hidden;
-}
-
-#new-pref-container {
-    width: 100%;
-    margin: 0;
-    background-color: #ffffff;
-    box-sizing: border-box;
-    box-shadow: 0 0 5px #000000;
-    overflow-x: hidden;
-    max-width: 40em;
-    max-height: 100%;
-    position: fixed;
-    top: 3em;
-    left: auto;
-    display: none;
-    z-index: 5;
-}
-
-#new-pref-container input,
-#new-pref-container select {
-    border: none;
-    background-image: none;
-}
-
-#new-pref-container.show {
-    display: block;
-}
-
-li {
-    list-style-type: none;
-    border-bottom: 1px solid #d3d3d3;
-    opacity: 1;
-    background-color: #ffffff;
-    cursor: pointer;
-}
-
-#new-pref-line-boolean,
-#new-pref-value-string,
-#new-pref-value-int {
-    display: none;
-}
-#new-pref-item[typestyle="boolean"] #new-pref-line-boolean,
-#new-pref-item[typestyle="string"] #new-pref-value-string,
-#new-pref-item[typestyle="int"] #new-pref-value-int {
-    display: block;
-}
-
-.pref-name,
-.pref-value {
-    padding: 15px 10px;
-    text-align: left;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    background-image: none;
-}
-
-.pref-value {
-    color: rgba(0,0,0,0.5);
-    flex: 1 1 auto;
-    border: none;
-    -moz-appearance: none;
-    background-image: none;
-    background-color: transparent;
-}
-
-.pref-name[locked] {
-    padding-right: 20px;
-    background-image: url("chrome://browser/skin/images/lock.png");
-    background-repeat: no-repeat;
-    background-position: right 50%;
-    background-size: auto 60%;
-}
-
-#new-pref-name {
-    width: 30em;
-}
-
-#new-pref-type {
-    display: inline-block !important;
-    border-left: 1px solid #d3d3d3;
-    width: 10em;
-    text-align: right;
-}
-
-.pref-item-line {
-    border-top: 1px solid rgba(0,0,0,0.05);
-    color: rgba(0,0,0,0.5);
-    display: flex;
-    flex-direction: row;
-}
-
-#new-pref-value-boolean {
-    flex: 1 1 auto;
-}
-
-/* Disable newPref dialog spinbuttons, use custom version from Android */
-/* Filed Bug 962359 to enhance the default spinbutton style to be touch-friendly */
-#new-pref-value-int {
-    -moz-appearance: textfield;
-}
-
-#new-pref-container .pref-button.toggle {
-    display: inline-block;
-    opacity: 1;
-    flex: 0 1 auto;
-    float: right;
-}
-
-#new-pref-container .pref-button.cancel,
-#new-pref-container .pref-button.create {
-    display: inline-block;
-    opacity: 1;
-    flex: 1 1 auto;
-}
-
-.pref-item-line {
-    pointer-events: none;
-}
-
-#new-pref-container .pref-item-line,
-.pref-item.selected .pref-item-line,
-.pref-item:not(.selected) .pref-button.reset {
-    pointer-events: auto;
-}
-
-#new-pref-container .pref-button.create[disabled] {
-    color: #d3d3d3;
-}
-
-.pref-item.selected {
-    background-color: rgba(0,0,255,0.05);
-}
-
-.pref-button {
-    display: inline-block;
-    box-sizing: border-box;
-    text-align: center;
-    padding: 10px 1em;
-    border-left: 1px solid rgba(0,0,0,0.1);
-    opacity: 0;
-    transition-property: opacity;
-    transition-duration: 500ms;
-}
-
-.pref-item.selected .pref-item-line .pref-button {
-    opacity: 1;
-}
-
-.pref-item:not(.selected) .pref-item-line .pref-button:not(.reset) {
-    display: none;
-}
-
-.pref-item:not(.selected) .pref-button.reset {
-    opacity: 1;
-}
-
-/* Disable detail list item spinbuttons, use custom version from Android */
-/* Filed Bug 962359 to enhance the default spinbutton style to be touch-friendly */
-.pref-item input[type="number"] {
-    -moz-appearance: textfield;
-}
-
-.pref-button:active {
-    background-color: rgba(0,0,255,0.2);
-}
-
-.pref-button[disabled] {
-    display: none;
-}
-
-.pref-button.up {
-    background-image: url("chrome://browser/skin/images/arrowup-16.png");
-    background-position: center center;
-    background-repeat: no-repeat;
-}
-
-.pref-button.down {
-    background-image: url("chrome://browser/skin/images/arrowdown-16.png");
-    background-position: center center;
-    background-repeat: no-repeat;
-}
-
-#prefs-shield {
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0,0,0,0.5);
-    position: fixed;
-    top: 0;
-    left: 0;
-    opacity: 0;
-    transition-property: opacity;
-    transition-duration: 500ms;
-    display: none;
-}
-
-#prefs-shield[shown] {
-    display: block;
-    opacity: 1;
-}
-
-#loading-container > li {
-    background-image: url(chrome://global/skin/media/throbber.png);
-    background-position: center center;
-    background-repeat: no-repeat;
-    padding-left: 40px;
-    height: 3em;
-    width: 100%;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/content.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/content.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/content.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/content.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +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/. */
-
-%filter substitution
-%include defines.inc
-
-@namespace url("http://www.w3.org/1999/xhtml");
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* Typography & General Styling -------------------------------------------- */
-
-::-moz-selection {
-  color: white;
-  background-color: @metro_orange@;
-}
-
-*:-moz-any-link:focus {
-  outline-offset: -2px;
-}
-
-/* Input Styling -------------------------------------------- */
-
-select:not([size]):not([multiple]) > xul|scrollbar,
-select[size="1"] > xul|scrollbar,
-select:not([size]):not([multiple]) xul|scrollbarbutton,
-select[size="1"] xul|scrollbarbutton {
-  display: block;
-  margin-left: 0;
-  min-width: 16px;
-}
-
-select[size],
-select[multiple],
-select[size][multiple],
-* > input:not([type="image"]) {
-  border-style: solid;
-  border-color: #7d7d7d;
-  color: #414141;
-}
-
-/* For both mouse and touch, single-selects are handled by the SelectHelper popup.
- * Suppress mouse events on the popup itself. See also ../base/content/cursor.css */
-select[size="1"] :-moz-any(option, optgroup),
-select:not([size]):not([multiple]) :-moz-any(option, optgroup) {
-  pointer-events: none;
-}
-
-input:-moz-placeholder {
-  color: GrayText;
-}
-
-select:not([size]):not([multiple]),
-select[size="0"],
-select[size="1"],
-* > input[type="button"],
-* > input[type="submit"],
-* > input[type="reset"],
-button {
-  border-style: solid;
-  border-color: #7d7d7d;
-  color: #414141;
-}
-
-input[type="checkbox"] {
-  background: white linear-gradient(rgba(115,115,115,0.5) 0, rgba(215,215,215,0.5) 2px, rgba(255,255,255,0.2) 6px);
-}
-
-input[type="radio"] {
-  background: radial-gradient(at 6px 6px, rgba(255,255,255,0.2) 3px, rgba(195,195,195,0.5) 5px, rgba(115,115,115,0.5) 100%);
-}
-
-select {
-  border-width: 1px;
-  padding: 1px;
-}
-
-select:not([size]):not([multiple]),
-select[size="0"],
-select[size="1"] {
-  padding: 0 1px 0 1px;
-}
-
-* > input:not([type="image"]) {
-  border-width: 1px;
-  padding: 1px;
-}
-
-input[type="button"],
-input[type="submit"],
-input[type="reset"],
-button {
-  border-width: 1px;
-  padding: 0 7px 0 7px;
-}
-
-input[type="radio"],
-input[type="checkbox"] {
-  max-width: 14px;
-  max-height: 14px;
-  border: 1px solid #a7a7a7 !important;
-  padding: 2px 1px 2px 1px;
-}
-
-select > button {
-  border-width: 1px !important;
-  margin: 0px !important;
-  padding: 0px !important;
-  border-radius: 0;
-  color: #414141;
-  position: relative !important;
-  font-size: inherit;
-}
-
-input[type="checkbox"]:focus,
-input[type="radio"]:focus {
-  border-color: #99c6e0 !important;
-}
-
-input[type="checkbox"]:focus {
-  background: white linear-gradient(rgba(27,113,177,0.5) 0, rgba(198,225,246,0.2) 2px, rgba(255,255,255,0.2) 6px);
-}
-
-input[type="radio"]:focus {
-  background: radial-gradient(at 6px 6px, rgba(255,255,255,0.2) 3px, rgba(198,225,246,0.2) 5px, rgba(27,113,177,0.5) 100%);
-}
-
-/* we need to be specific for selects because the above rules are specific too */
-select[size][disabled],
-select[multiple][disabled],
-select[size][multiple][disabled],
-select:not([size]):not([multiple])[disabled],
-select[size="0"][disabled],
-select[size="1"][disabled],
-button[disabled],
-* > input:not([type="image"])[disabled] {
-  color: rgba(0,0,0,0.3);
-  border-color: rgba(125,125,125,0.4);
-  border-style: solid;
-  border-width: 1px;
-  background: transparent linear-gradient(rgba(185,185,185,0.4) 0, rgba(235,235,235,0.4) 3px, rgba(255,255,255,0.4) 100%);
-}
-
-select:not([size]):not([multiple])[disabled],
-select[size="0"][disabled],
-select[size="1"][disabled] {
-  background: transparent linear-gradient(rgba(255,255,255,0.4) 0, rgba(235,235,235,0.4) 3px, rgba(185,185,185,0.4) 100%);
-}
-
-input[type="button"][disabled],
-input[type="submit"][disabled],
-input[type="reset"][disabled],
-button[disabled] {
-  padding: 0 7px 0 7px;
-  background: transparent linear-gradient(rgba(255,255,255,0.4) 0, rgba(235,235,235,0.4) 3px, rgba(185,185,185,0.4) 100%);
-}
-
-input[type="radio"][disabled],
-input[type="radio"][disabled]:active,
-input[type="radio"][disabled]:hover,
-input[type="radio"][disabled]:hover:active,
-input[type="checkbox"][disabled],
-input[type="checkbox"][disabled]:active,
-input[type="checkbox"][disabled]:hover,
-input[type="checkbox"][disabled]:hover:active {
-  border:1px solid rgba(125,125,125,0.4) !important;
-}
-
-select[disabled] > button {
-  opacity: 0.6;
-  padding: 1px 7px 1px 7px;
-}
-
-/* -moz-touch-enabled? media elements */
-video > xul|videocontrols,
-audio > xul|videocontrols {
-  -moz-binding: url("chrome://global/content/bindings/videocontrols.xml#touchControls");
-}
-
-/*
- * Enforce nearest scaling for video in order not to lose too much performance
- * after fixing bug 598736 ("Use higher-quality imageinterpolation on mobile")
- */
-video {
-    image-rendering: -moz-crisp-edges;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/crashprompt.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/crashprompt.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/crashprompt.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/crashprompt.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +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/. */
-
-%filter substitution
-%include defines.inc
-
-body {
-  background-color: #F4F4F4;
-  margin-left: 16%;
-  margin-right: 23%;
-  margin-top: 115px;
-}
-
-a {
-  text-decoration: none;
-}
-
-#detailsLink {
-  color: black;
-  display: table-row;
-}
-
-#detailsGrid {
-  display: table;
-}
-
-#detailsContainer {
-  display: table-row;
-}
-
-#detailsLinkLabel {
-  display: table-cell;
-}
-
-.detailsSpacer {
-  display: table-cell;
-  padding-right: 8px;
-}
-
-#crashpromptDetailedMessage {
-  font-size: @metro_font_snormal@;
-  display: table-cell;
-}
-
-#crashPromptTitle {
-  color: #737980;
-  font-weight: normal;
-}
-
-.hidden {
-  display: none !important;
-}
-
-#crashPromptButtonContainer {
-  margin-top: 40px;
-}
-
-#lightboxBackdrop {
-  position: fixed;
-  top: 0%;
-  left: 0%;
-  width: 100%;
-  height: 100%;
-  z-index: 1001;
-  background-color: rgba(0,0,0,0.7);
-}
-
-#lightbox {
-  position: fixed;
-  top: 20%;
-  left: 15%;
-  width: 70%;
-  height: 60%;
-  padding-bottom: 1%;
-  padding-top: 1%;
-  background-color: white;
-  z-index: 1002;
-}
-
-#privacyPolicyTitle {
-  margin-left: 10%;
-}
-
-#privacyPolicyBody {
-  margin-left: 10%;
-  margin-right: 10%;
-  padding-right: 20px;
-  max-height: 75%;
-  overflow: auto;
-}
-
-#lightboxCloseButton {
-  background-image: -moz-image-rect(url("chrome://browser/skin/images/infobar-close.png"), 0, 40, 40, 0);
-  width: 40px;
-  height: 40px;
-  float: right;
-  margin-right: 30px;
-  margin-top: 10px;
-}
-
-button {
-  color: #FFFFFF;
-}
-
-button:not([disabled]):hover {
-  color: #FFFFFF;
-}
-
-#refuseButton {
-  background: #847F7C;
-}
-
-#refuseButton:hover {
-  background: #B0B0B0;
-}
-
-hr {
-  border: 1px solid #C7C7C7;
-}
-
-#privacyPolicyLink {
-  color: #649FEF;
-}
-
-.button-default {
-  background: #649FEF;
-  border-color: #9DCFF2;
-}
-
-.button-default:not([disabled]):hover {
-  background: #2990D9;
-  border-color: #8DBAD9;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/cssthrobber.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/cssthrobber.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/cssthrobber.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/cssthrobber.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +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/. */
-
-%filter substitution
-%include defines.inc
-
-#container[enabled] .progressBall {
-  position: absolute;
-  opacity: 0;
-  transform: rotate(225deg);
-  animation: orbit 7.15s infinite;
-}
-
-#container[enabled] .progressBall:nth-child(1) {
-  animation-delay: 1.56s;
-}
-
-#container[enabled] .progressBall:nth-child(2) {
-  animation-delay: 0.31s;
-}
-
-#container[enabled] .progressBall:nth-child(3) {
-  animation-delay: 0.62s;
-}
-
-#container[enabled] .progressBall:nth-child(4) {
-  animation-delay: 0.94s;
-}
-
-#container[enabled] .progressBall:nth-child(5) {
-  animation-delay: 1.25s;
-}
-
-#container[enabled] .progressBall:nth-child(1)::after,
-#container[enabled] .progressBall:nth-child(2)::after,
-#container[enabled] .progressBall:nth-child(3)::after,
-#container[enabled] .progressBall:nth-child(4)::after,
-#container[enabled] .progressBall:nth-child(5)::after {
-  content: "";
-  display: block;
-  width: 5px;
-  height: 5px;
-  border-radius: 5px;
-  position: absolute;
-  background: #0095dd;
-  left: 0;
-  top: 0;
-}
-
-
-@keyframes orbit {
-  0% {
-    opacity: 1;
-    z-index: 99;
-    transform: rotate(180deg);
-    animation-timing-function: ease-out;
-  }
-
-  7% {
-    opacity: 1;
-    transform: rotate(300deg);
-    animation-timing-function: linear;
-  }
-
-  30% {
-    opacity: 1;
-    transform: rotate(410deg);
-    animation-timing-function: ease-in-out;
-  }
-
-  39% {
-    opacity: 1;
-    transform: rotate(645deg);
-    animation-timing-function: linear;
-  }
-
-  70% {
-    opacity: 1;
-    transform: rotate(770deg);
-    animation-timing-function: ease-out;
-  }
-
-  75% {
-    opacity: 1;
-    transform: rotate(900deg);
-    animation-timing-function: ease-out;
-  }
-
-  76%, 100% {
-    opacity: 0;
-    transform: rotate(900deg);
-  }
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/defines.inc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/defines.inc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/defines.inc	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/defines.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-%filter substitution
-
-%define panel_dark_color #41464C
-%define panel_dark_background url(chrome://browser/skin/images/panel-dark.png)
-%define panel_light_color #F1F1F1
-
-%define field_sizing 30px
-%define field_foreground_color #000000
-%define field_disabled_foreground_color #999999
-%define field_mid_foreground_color #bababa
-%define field_background_color #FFFFFF
-
-%define border_color #BFC6CE
-%define selected_color #FF8000
-
-%define urlbar_border_color #BFC6CC
-%define urlbar_edit_height 36px
-
-%define toolbar_vertical_spacing 5px
-%define toolbar_horizontal_spacing 17px
-%define toolbar_horizontal_padding 21px
-%define toolbar_snapped_horizontal_padding 10px
-%define toolbar_snapped_horizontal_spacing 10px
-
-% XXX Per UX mockups, this should be 68px, but we need to make this
-% one pixel higher to reduce button clipping until bug 905453 is resolved
-%define toolbar_height 69px
-%define labelled_toolbar_height 90px
-%define tabs_height 178px
-%define newtab_button_width 63px
-%define tabs_scrollarrow_width 64px
-%define findbar_height 54px
-
-%define progress_height 5px
-
-%define metro_orange #FF8000
-
-%define thumbnail_width 232px
-%define thumbnail_height 148px
-
-%define grid_column_width 131px
-%define grid_double_column_width 262px
-%define grid_row_height 86px
-%define grid_double_row_height 172px
-%define grid_search_width 86px
-
-%define compactgrid_column_width 62px
-%define compactgrid_row_height 62px
-
-%define tile_border_color #dbdcde
-%define tile_spacing 12px
-%define tile_side_margin 6px
-
-%define scroller_thickness 4px
-%define scroller_minimum 8px
-
-%define metro_spacing_xsmall 3px
-%define metro_spacing_small 5px
-%define metro_spacing_snormal 10px
-%define metro_spacing_normal 15px
-%define metro_spacing_xnormal 20px
-%define metro_spacing_xxnormal 25px
-%define metro_spacing_xxxnormal 30px
-%define metro_spacing_large 40px
-
-%define metro_border_thin 1px
-%define metro_border_thick 2px
-%define metro_border_xthick 4px
-
-%define metro_font_snormal 14px
-%define metro_font_normal 15px
-%define metro_font_large 25px
-%define metro_font_xlarge 35px
-%define metro_font_xxlarge 45px
-
-%define font_normal 16px
-%define font_snormal 15px
-%define font_small 12px
-%define font_xsmall 11px
-
-%define touch_row 47px
-%define touch_button_small 37px
-%define touch_action_minwidth 133px
-%define touch_action_snapped_minwidth 80px
-
-%define margin_large 16px
-%define margin_xnormal 7px
-%define margin_normal 5px
-
-%define padding_xxnormal 8px
-%define padding_xnormal 7px
-%define padding_normal 5px
-
-%define border_width_large 2px
-%define border_width_small 1px
-%define border_width_tiny 1px
-
-%define border_radius_normal 5px
-%define border_radius_tiny 1px
-
-%define shadow_width_small 1px
-
-% easing function and duration for animations match winJS showPanel method
-%define metro_animation_duration 550ms
-%define metro_animation_easing cubic-bezier(0.1, 0.9, 0.2, 1)
-
-% duration and easing function to approximately match system keyboard
-% as animation cant be in lock-step with system OSK animation, some mismatch is inevitable
-% so we match velocity/cadence but delay to bring appbars in a tad after OSK
-%define appbar_keyboard_slideup_duration 420ms
-%define appbar_keyboard_slideup_delay 90ms
-%define appbar_keyboard_slideup_easing cubic-bezier(0, 1, 0.4, 0.96)
-
-% minimum resolution cutoffs for displaying 1.4x and 1.8x versions of icons
-% XXX currently, there's some weirdness with the dppx unit, as documented in
-% bug 895277. Because of that, we have to use 1.39dppx instead of 1.4dppx.
-%define min_res_140pc 1.39dppx
-%define min_res_180pc 1.8dppx
-
-% error page style constants
-%define error_page_background_color #eee
-%define error_page_warning_color #efd400
-%define error_page_error_color #bf0000
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/firstruncontent.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/firstruncontent.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/firstruncontent.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/firstruncontent.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +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/. */
-
-%filter substitution
-%include defines.inc
-
-/* Disable firstrun in some cases */
-#stack[startpage] .firstrun-content {
-  display: none;
-}
-
-@media (max-width: 900px) {
-  .firstrun-content {
-    display: none;
-  }
-}
-
-/* bg transparent pane --------------- */
-
-#firstrun-bg-pane {
-  position: absolute;
-  background-color: rgba(0, 0, 0, .8);
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-}
-
-/* Got it button ---------------------- */
-
-#firstrun-gotit {
-  position: fixed;
-  bottom: calc(@toolbar_height@ + 64px);
-  left: 64px;
-}
-
-#firstrun-gotit:-moz-locale-dir(rtl) {
-  left: auto;
-  right: 64px;
-}
-
-.firstrun-button {
-  padding: 15px 45px;
-  font-family: "Segoe UI", sans-serif;
-  font-size: 25px;
-  background-image: -moz-linear-gradient(0deg, rgb(255, 128, 0) 0%, rgb(255, 149, 0) 100%);
-  border: 0;
-  color: #FFF;
-}
-
-/* Instructions arrows ---------------- */
-
-.instruction-arrow {
-  width: 76px;
-  height: 76px;
-  background-repeat: no-repeat;
-}
-
-.instruction-arrow.arrow-top,
-.instruction-arrow.arrow-down,
-.instruction-arrow.arrow-down-reverse {
-  background-image: url("chrome://browser/skin/images/arrow-top-light.png");
-}
-
-.instruction-arrow.arrow-down,
-.instruction-arrow.arrow-down-reverse:-moz-locale-dir(rtl) {
-  transform: rotate(180deg);
-}
-
-.instruction-arrow.arrow-down-reverse,
-.instruction-arrow.arrow-down:-moz-locale-dir(rtl) {
-  transform: rotate(180deg) scaleX(-1);
-}
-
-.instruction-arrow.arrow-back,
-.instruction-arrow.arrow-forward {
-  background-image: url("chrome://browser/skin/images/arrow-left-light.png");
-}
-
-.instruction-arrow.arrow-forward,
-.instruction-arrow.arrow-back:-moz-locale-dir(rtl) {
-  transform: rotate(180deg) scaleY(-1);
-}
-
-.instruction-arrow.arrow-forward:-moz-locale-dir(rtl) {
-  transform: none;
-}
-
-/* Instructions text ------------------ */
-
-.instruction-content-container {
-  width: 380px;
-  vertical-align: bottom;
-}
-
-#instruction-back .instruction-content-container,
-#instruction-plus .instruction-content-container {
-  width: 320px;
-}
-
-.instruction-label {
-  font-size: 18px;
-  color: #BBB;
-  line-height: 22px;
-}
-
-#instruction-tabs {
-  position: fixed;
-  top: 10px;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-#instruction-back {
-  position: fixed;
-  top: 50%;
-  left: 100px;
-}
-
-#instruction-back:-moz-locale-dir(rtl)  {
-  left: auto;
-  right: 100px;
-}
-
-#instruction-plus {
-  position: fixed;
-  top: 50%;
-  right: 100px;
-}
-
-#instruction-plus:-moz-locale-dir(rtl)  {
-  right: auto;
-  left: 100px;
-}
-
-#instruction-star {
-  position: fixed;
-  bottom: @toolbar_height@;
-  right: 145px;
-}
-
-#instruction-star:-moz-locale-dir(rtl)  {
-  right: auto;
-  left: 145px;
-}
-
-#instruction-star .instruction-label {
-  max-width: 250px;
-}
-
-#instruction-star .instruction-content-container:-moz-locale-dir(rtl) {
-  -moz-box-align: start;
-  vertical-align: top;
-}
-
-#instruction-pin {
-  position: fixed;
-  bottom: @toolbar_height@;
-  right: 10px;
-}
-
-#instruction-pin:-moz-locale-dir(rtl)  {
-  right: auto;
-  left: 10px;
-}
-
-#instruction-pin .instruction-label {
-  max-width: 250px;
-  margin-bottom: 20px;
-}
-
-#instruction-pin .instruction-arrow {
-  -moz-margin-end: 65px;
-}
-
-/* Higher resolution images ---------------------- */
-
-@media (min-resolution: @min_res_140pc@) {
-  /* Load 140% image when scaled by 140% */
-  .instruction-arrow.arrow-top,
-  .instruction-arrow.arrow-down,
-  .instruction-arrow.arrow-down-reverse {
-    background-image: url("chrome://browser/skin/images/arrow-top-light@1.4x.png");
-  }
-
-  .instruction-arrow.arrow-back,
-  .instruction-arrow.arrow-forward {
-    background-image: url("chrome://browser/skin/images/arrow-left-light@1.4x.png");
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  /* Load 180% image when scaled by 180% */
-  .instruction-arrow.arrow-top,
-  .instruction-arrow.arrow-down,
-  .instruction-arrow.arrow-down-reverse {
-    background-image: url("chrome://browser/skin/images/arrow-top-light@1.8x.png");
-  }
-
-  .instruction-arrow.arrow-back,
-  .instruction-arrow.arrow-forward {
-    background-image: url("chrome://browser/skin/images/arrow-left-light@1.8x.png");
-  }
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/firstrun.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/firstrun.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/firstrun.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/firstrun.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,265 +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/. */
-
-/* Rearrange about:start ---------------------- */
-
-/* Disable all instructions in snapped mode */
-#start-container[viewstate="snapped"] .firstrun {
-  display: none;
-}
-
-/* Keep only first column of tiles */
-#start-container[viewstate="landscape"] #start-topsites-grid .richgrid-grid,
-#start-container:not([viewstate="snapped"]) #start-bookmarks-grid .richgrid-grid,
-#start-container:not([viewstate="snapped"]) #start-history-grid .richgrid-grid {
-  -moz-column-count: 1 !important;
-}
-
-/* Add some bottom padding to make sure bottom tile will not be
-below instruction */
-#start-container[viewstate="landscape"] #start-topsites-grid .richgrid-grid {
-  padding-bottom: 30px;
-}
-
-/* Keep only first few items */
-#start-container:not([viewstate="snapped"]) #start-history-grid richgriditem:nth-child(n+3),
-#start-container:not([viewstate="snapped"]) #start-bookmarks-grid richgriditem:nth-child(n+3),
-#start-container[viewstate="portrait"] #start-topsites-grid richgriditem:nth-child(n+4) {
-  display: none;
-}
-
-/* Add some space for the instructions */
-#start-container[viewstate="portrait"] {
-  padding-top: 120px;
-  padding-bottom: 120px;
-}
-
-/* Remove watermark */
-.meta {
-  background-image: none;
-}
-
-
-/* Welcome pane ---------------------- */
-
-/* Logo and welcome message */
-#firstrun-welcome {
-  width: 550px;
-  font-family: "Segoe UI", sans-serif;
-  padding: 30px 0;
-}
-
-.welcome-image {
-  background-image: url("chrome://branding/content/metro_firstrun_logo.png");
-
-  width: 220px;
-  height: 220px;
-}
-
-#firstrun-welcome .welcome-title {
-  font-size: 25px;
-  color: #4d4e53;
-  line-height: 30px;
-  padding-top: 20px;
-}
-
-#firstrun-welcome .welcome-subtitle {
-  font-size: 16px;
-  color: #808080;
-  line-height: 22px;
-  padding-top: 10px;
-}
-
-/* Instructions ---------------------- */
-
-.instruction-content-container {
-    width: 380px;
-}
-
-.instruction-label {
-  font-size: 16px;
-  color: #808080;
-  line-height: 22px;
-}
-
-.instruction-arrow {
-  width: 76px;
-  height: 76px;
-}
-
-.instruction-arrow.arrow-top,
-.instruction-arrow.arrow-down {
-  background-image: url("chrome://browser/skin/images/arrow-top.png");
-}
-
-.instruction-arrow.arrow-down {
-  transform: rotate(180deg);
-}
-.instruction-arrow.arrow-down:-moz-locale-dir(rtl) {
-  transform: scaleY(-1);
-}
-
-.instruction-arrow.arrow-back,
-.instruction-arrow.arrow-forward,
-.instruction-arrow.arrow-back-straight,
-.instruction-arrow.arrow-forward-straight {
-  background-image: url("chrome://browser/skin/images/arrow-left.png");
-}
-
-.instruction-arrow.arrow-back,
-.instruction-arrow.arrow-forward:-moz-locale-dir(rtl) {
-  transform: rotate(0) scaleY(1);
-}
-
-.instruction-arrow.arrow-forward,
-.instruction-arrow.arrow-back:-moz-locale-dir(rtl) {
-  transform: rotate(180deg) scaleY(-1);
-}
-
-.instruction-arrow.arrow-back-straight,
-.instruction-arrow.arrow-forward-straight:-moz-locale-dir(rtl) {
-  transform: rotate(220deg) scaleX(-1);
-}
-
-.instruction-arrow.arrow-forward-straight,
-.instruction-arrow.arrow-back-straight:-moz-locale-dir(rtl) {
-  transform: rotate(-220deg);
-}
-
-#instruction-tabs {
-  position: absolute;
-  top: 10px;
-  transform: translateX(calc(630px - 50%));
-}
-#instruction-tabs:-moz-locale-dir(rtl) {
-  right: 0;
-  left: auto;
-  transform: translateX(calc(50% - 630px));
-}
-
-#start-container[viewstate="portrait"] #instruction-tabs {
-  transform: translateX(calc(50vw - 50%));
-}
-#start-container[viewstate="portrait"] #instruction-tabs:-moz-locale-dir(rtl) {
-  transform: translateX(calc(-50vw + 50%));
-}
-
-#start-container[viewstate="landscape"] #instruction-topsites {
-  position: absolute;
-  bottom: 15%;
-}
-
-#start-container[viewstate="landscape"] #instruction-topsites .instruction-content-container {
-  -moz-box-align: start;
-}
-
-#start-container[viewstate="portrait"] #instruction-topsites-box {
-  margin-bottom: 20px;
-}
-
-#start-container[viewstate="portrait"] #instruction-topsites .instruction-content-container {
-  -moz-box-align: center;
-}
-
-#start-container[viewstate="portrait"] #instruction-topsites .arrow-back-straight {
-  display: none;
-}
-
-#start-container[viewstate="portrait"] #instruction-topsites .arrow-back {
-  display: block;
-}
-
-#start-container[viewstate="landscape"] #instruction-topsites .arrow-back-straight {
-  display: block;
-}
-
-#start-container[viewstate="landscape"] #instruction-topsites .arrow-back {
-  display: none;
-}
-
-#start-container[viewstate="landscape"] #instruction-history,
-#start-container[viewstate="landscape"] #instruction-bookmarks {
-  position: absolute;
-  top: 310px;
-  transform: translateX(calc(-300px - 50%));
-}
-#start-container[viewstate="landscape"] #instruction-history:-moz-locale-dir(rtl),
-#start-container[viewstate="landscape"] #instruction-bookmarks:-moz-locale-dir(rtl) {
-  transform: translateX(calc(300px + 50%));
-}
-
-#start-container[viewstate="portrait"] #instruction-history,
-#start-container[viewstate="portrait"] #instruction-bookmarks,
-#start-container[viewstate="portrait"] #instruction-topsites {
-  transform: translateX(-55px);
-}
-#start-container[viewstate="portrait"] #instruction-history:-moz-locale-dir(rtl),
-#start-container[viewstate="portrait"] #instruction-bookmarks:-moz-locale-dir(rtl),
-#start-container[viewstate="portrait"] #instruction-topsites:-moz-locale-dir(rtl) {
-  transform: translateX(55px);
-}
-
-#start-container[viewstate="landscape"] #instruction-menu {
-  position: fixed;
-  bottom: 16px;
-  right: 37px;
-}
-#start-container[viewstate="landscape"] #instruction-menu:-moz-locale-dir(rtl) {
-  left: 37px;
-  right: auto;
-}
-
-#start-container[viewstate="portrait"] #instruction-menu {
-  position: absolute;
-  right: 37px;
-  transform: translateY(40px);
-}
-#start-container[viewstate="portrait"] #instruction-menu:-moz-locale-dir(rtl) {
-  left: 37px;
-  right: auto;
-}
-
-#start-container #instruction-menu .instruction-label {
-    max-width: 300px;
-}
-
-#start-container[viewstate="landscape"] #start-history {
-  padding-left: 50px;
-}
-
-/* Higher resolution images ---------------------- */
-
-@media (min-resolution: @min_res_140pc@) {
-  /* Load 140% image when scaled by 140% */
-  .instruction-arrow.arrow-top,
-  .instruction-arrow.arrow-down {
-    background-image: url("chrome://browser/skin/images/arrow-top@1.4x.png");
-  }
-
-  .instruction-arrow.arrow-back,
-  .instruction-arrow.arrow-forward {
-    background-image: url("chrome://browser/skin/images/arrow-left@1.4x.png");
-  }
-
-  .welcome-image {
-    background-image: url("chrome://branding/content/metro_firstrun_logo@1.4x.png");
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  /* Load 180% image when scaled by 180% */
-  .instruction-arrow.arrow-top,
-  .instruction-arrow.arrow-down {
-    background-image: url("chrome://browser/skin/images/arrow-top@1.8x.png");
-  }
-
-  .instruction-arrow.arrow-back,
-  .instruction-arrow.arrow-forward {
-    background-image: url("chrome://browser/skin/images/arrow-left@1.8x.png");
-  }
-
-  .welcome-image {
-    background-image: url("chrome://branding/content/metro_firstrun_logo@1.8x.png");
-  }
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/flyoutpanel.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/flyoutpanel.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/flyoutpanel.css	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/flyoutpanel.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +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/. */
-
-%filter substitution
-%include defines.inc
-
-flyoutpanel {
-  height: 100%;
-  background-color: #ffffff;
-  visibility: collapse;
-  position: fixed;
-  transition: transform @metro_animation_duration@ @metro_animation_easing@;
-  transform: translateX(100%);
-  font-size: 11pt;
-  right: 0;
-}
-
-flyoutpanel:-moz-dir(rtl) {
-  left: 0;
-  right: auto;
-  transform: translateX(-100%);
-}
-
-.flyoutpanel-slide-in {
-  transform: translateX(0);
-}
-
-flyoutpanel[visible] {
-  visibility: visible;
-}
-
-/* XUL flexbox layout doesn't work in a position:fixed container, so we have
- * this normally-positioned inside for layout purposes. */
-.flyoutpanel-wrapper {
-  height: 100%;
-  width: 100%;
-}
-
-.flyoutpanel-header {
-  border-width: 1px;
-  -moz-border-start-style: solid;
-  border-color: #1b1b1b;
-  background-color: #002147;
-  height: 80px;
-  width: 100%;
-  color: #ffffff;
-  font-weight: lighter;
-  font-size: 20pt;
-}
-
-.flyout-close-button {
-  margin-top: 30px !important;
-  -moz-margin-start: 40px !important;
-}
-
-.flyout-header-label {
-  margin-top: 30px !important;
-  -moz-margin-start: 10px !important;
-}
-
-.flyoutpanel-contents {
-  border-width: 1px;
-  -moz-border-start-style: solid;
-  border-color: #c2c2c2;
-  padding: @metro_spacing_large@;
-  width: 100%;
-}
-
-.flyoutpanel-contents[input="precise"] {
-  overflow-y: scroll;
-  overflow-x: hidden;
-}
-
-.flyout-close-button {
-  border: 0 none;
-  -moz-appearance: none;
-  list-style-image: url(chrome://browser/skin/images/flyout-back-button.png);
-  -moz-image-region: rect(0 32px 32px 0);
-}
-
-.flyout-close-button:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
-}
-
-.flyout-close-button:hover {
-  -moz-image-region: rect(0 64px 32px 32px);
-}
-
-.flyout-close-button:active {
-  -moz-image-region: rect(0 96px 32px 64px);
-}
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/aboutAddonsBackgroundFillSlice.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/aboutAddonsBackgroundFillSlice.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/aboutAddonsBackground.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/aboutAddonsBackground.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/alert-downloads-30.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/alert-downloads-30.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/appbar-icons.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/appbar-icons.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowbox-down-blue-filled@2x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowbox-down-blue-filled@2x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowbox-down-blue-filled.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowbox-down-blue-filled.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowbox-horiz-blue-filled@2x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowbox-horiz-blue-filled@2x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowbox-horiz-blue-filled.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowbox-horiz-blue-filled.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowdown-16.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowdown-16.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowdowndark-16.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowdowndark-16.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-left@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-left@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowleft-16.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowleft-16.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-left@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-left@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowleftdark-16.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowleftdark-16.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-left-light@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-left-light@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-left-light@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-left-light@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-left-light.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-left-light.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-left.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-left.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowright-16.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowright-16.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowrightdark-16.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowrightdark-16.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-top@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-top@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-top@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-top@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-top-light@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-top-light@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-top-light@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-top-light@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-top-light.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-top-light.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrow-top.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrow-top.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowup-16.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowup-16.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/arrowupdark-16.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/arrowupdark-16.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/autoscroll.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/autoscroll.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/closetab-default.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/closetab-default.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/errorpage-blocked-site@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/errorpage-blocked-site@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/errorpage-blocked-site@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/errorpage-blocked-site@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/errorpage-blocked-site.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/errorpage-blocked-site.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/errorpage-cert-untrusted@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/errorpage-cert-untrusted@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/errorpage-cert-untrusted@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/errorpage-cert-untrusted@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/errorpage-cert-untrusted.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/errorpage-cert-untrusted.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/errorpage-warning@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/errorpage-warning@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/errorpage-warning@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/errorpage-warning@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/errorpage-warning.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/errorpage-warning.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/exitfullscreen-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/exitfullscreen-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/favicon-default-32.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/favicon-default-32.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/firefox-watermark.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/firefox-watermark.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/flyout-back-button.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/flyout-back-button.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/fullscreen-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/fullscreen-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/icon-autocomplete-search@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/icon-autocomplete-search@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/icon-autocomplete-search@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/icon-autocomplete-search@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/icon-autocomplete-search.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/icon-autocomplete-search.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/icons-identity-firefox@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/icons-identity-firefox@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/icons-identity-firefox@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/icons-identity-firefox@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/icons-identity-firefox.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/icons-identity-firefox.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/identity-icons-generic.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/identity-icons-generic.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/identity-icons-https-ev.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/identity-icons-https-ev.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/identity-icons-https-mixed.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/identity-icons-https-mixed.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/identity-icons-https.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/identity-icons-https.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/infobar-close.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/infobar-close.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/infobar-geolocation.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/infobar-geolocation.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/infobar-key.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/infobar-key.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/infobar-popup.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/infobar-popup.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/lock.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/lock.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/mute-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/mute-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-back@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-back@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-back@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-back@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-back.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-back.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-close@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-close@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-close@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-close@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-close.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-close.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-clear@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-clear@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-clear@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-clear@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-clear.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-clear.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-delete@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-delete@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-delete@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-delete@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-delete.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-delete.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-hide@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-hide@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-hide@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-hide@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-hide.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-hide.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-pin@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-pin@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-pin@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-pin@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-pin.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-pin.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-restore@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-restore@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-restore@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-restore@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-restore.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-restore.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-unpin@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-unpin@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-unpin@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-unpin@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-contextual-unpin.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-contextual-unpin.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-download@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-download@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-download@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-download@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-download-finished@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-download-finished@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-download-finished@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-download-finished@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-download-finished.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-download-finished.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-download.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-download.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-forward@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-forward@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-forward@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-forward@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-forward.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-forward.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-menu@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-menu@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-menu@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-menu@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-menu.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-menu.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-pin@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-pin@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-pin@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-pin@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-pin.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-pin.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-star@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-star@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-star@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-star@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/navbar-star.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/navbar-star.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/newtab-default.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/newtab-default.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/overlay-back@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/overlay-back@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/overlay-back@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/overlay-back@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/overlay-back.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/overlay-back.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/overlay-plus@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/overlay-plus@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/overlay-plus@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/overlay-plus@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/overlay-plus.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/overlay-plus.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/panel-dark.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/panel-dark.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/pause-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/pause-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/pinned-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/pinned-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/pinned.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/pinned.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/play-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/play-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/plus-24.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/plus-24.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/plus-34.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/plus-34.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/popup-bg-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/popup-bg-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/popup-selected-item-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/popup-selected-item-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/progresscircle-bg.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/progresscircle-bg.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/progresscircle.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/progresscircle.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/reader-plus-icon-xhdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/reader-plus-icon-xhdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/scrubber-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/scrubber-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/search-clear-30.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/search-clear-30.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/search-glass-30.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/search-glass-30.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/search.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/search.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/selection-monocle@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/selection-monocle@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/selection-monocle@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/selection-monocle@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/selection-monocle.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/selection-monocle.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/tab-arrows.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/tab-arrows.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/tab-crop.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/tab-crop.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/tab-overlay.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/tab-overlay.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/textfield.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/textfield.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/tile-selected-check-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/tile-selected-check-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/tile-selected-check-rtl-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/tile-selected-check-rtl-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/unmute-hdpi.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/unmute-hdpi.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/urlbar-go@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/urlbar-go@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/urlbar-go@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/urlbar-go@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/urlbar-go.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/urlbar-go.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/urlbar-reload@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/urlbar-reload@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/urlbar-reload@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/urlbar-reload@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/urlbar-reload.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/urlbar-reload.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/urlbar-stop@1.4x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/urlbar-stop@1.4x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/urlbar-stop@1.8x.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/urlbar-stop@1.8x.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/images/urlbar-stop.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/images/urlbar-stop.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/jar.mn	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/jar.mn	1970-01-01 00:00:00.000000000 +0000
@@ -1,176 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-chrome.jar:
-% skin browser classic/1.0 %skin/
-  skin/aboutPage.css                        (aboutPage.css)
-  skin/aboutAddons.css                      (aboutAddons.css)
-  skin/about.css                            (about.css)
-* skin/flyoutpanel.css                      (flyoutpanel.css)
-#ifdef MOZ_CRASHREPORTER
-* skin/crashprompt.css                      (crashprompt.css)
-#endif
-* skin/circularprogress.css                 (circularprogress.css)
-* skin/cssthrobber.css                      (cssthrobber.css)
-* skin/browser.css                          (browser.css)
-* skin/content.css                          (content.css)
-  skin/config.css                           (config.css)
-* skin/platform.css                         (platform.css)
-* skin/tiles.css                            (tiles.css)
-  skin/touchcontrols.css                    (touchcontrols.css)
-* skin/netError.css                         (netError.css)
-  skin/firstrun.css                         (firstrun.css)
-* skin/firstruncontent.css                  (firstruncontent.css)
-* skin/start.css                            (start.css)
-% override chrome://global/skin/about.css chrome://browser/skin/about.css
-% override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css
-% override chrome://global/skin/netError.css chrome://browser/skin/netError.css
-
-  skin/images/panel-dark.png                (images/panel-dark.png)
-  skin/images/navbar-back.png               (images/navbar-back.png)
-  skin/images/navbar-back@1.4x.png          (images/navbar-back@1.4x.png)
-  skin/images/navbar-back@1.8x.png          (images/navbar-back@1.8x.png)
-  skin/images/navbar-close.png              (images/navbar-close.png)
-  skin/images/navbar-close@1.4x.png         (images/navbar-close@1.4x.png)
-  skin/images/navbar-close@1.8x.png         (images/navbar-close@1.8x.png)
-  skin/images/navbar-contextual-clear.png (images/navbar-contextual-clear.png)
-  skin/images/navbar-contextual-clear@1.4x.png (images/navbar-contextual-clear@1.4x.png)
-  skin/images/navbar-contextual-clear@1.8x.png (images/navbar-contextual-clear@1.8x.png)
-  skin/images/navbar-contextual-delete.png (images/navbar-contextual-delete.png)
-  skin/images/navbar-contextual-delete@1.4x.png (images/navbar-contextual-delete@1.4x.png)
-  skin/images/navbar-contextual-delete@1.8x.png (images/navbar-contextual-delete@1.8x.png)
-  skin/images/navbar-contextual-hide.png (images/navbar-contextual-hide.png)
-  skin/images/navbar-contextual-hide@1.4x.png (images/navbar-contextual-hide@1.4x.png)
-  skin/images/navbar-contextual-hide@1.8x.png (images/navbar-contextual-hide@1.8x.png)
-  skin/images/navbar-contextual-pin.png (images/navbar-contextual-pin.png)
-  skin/images/navbar-contextual-pin@1.4x.png (images/navbar-contextual-pin@1.4x.png)
-  skin/images/navbar-contextual-pin@1.8x.png (images/navbar-contextual-pin@1.8x.png)
-  skin/images/navbar-contextual-restore.png (images/navbar-contextual-restore.png)
-  skin/images/navbar-contextual-restore@1.4x.png (images/navbar-contextual-restore@1.4x.png)
-  skin/images/navbar-contextual-restore@1.8x.png (images/navbar-contextual-restore@1.8x.png)
-  skin/images/navbar-contextual-unpin.png (images/navbar-contextual-unpin.png)
-  skin/images/navbar-contextual-unpin@1.4x.png (images/navbar-contextual-unpin@1.4x.png)
-  skin/images/navbar-contextual-unpin@1.8x.png (images/navbar-contextual-unpin@1.8x.png)
-  skin/images/navbar-download.png           (images/navbar-download.png)
-  skin/images/navbar-download@1.4x.png      (images/navbar-download@1.4x.png)
-  skin/images/navbar-download@1.8x.png      (images/navbar-download@1.8x.png)
-  skin/images/navbar-download-finished.png           (images/navbar-download-finished.png)
-  skin/images/navbar-download-finished@1.4x.png      (images/navbar-download-finished@1.4x.png)
-  skin/images/navbar-download-finished@1.8x.png      (images/navbar-download-finished@1.8x.png)
-  skin/images/navbar-forward.png            (images/navbar-forward.png)
-  skin/images/navbar-forward@1.4x.png       (images/navbar-forward@1.4x.png)
-  skin/images/navbar-forward@1.8x.png       (images/navbar-forward@1.8x.png)
-  skin/images/navbar-star.png               (images/navbar-star.png)
-  skin/images/navbar-star@1.4x.png          (images/navbar-star@1.4x.png)
-  skin/images/navbar-star@1.8x.png          (images/navbar-star@1.8x.png)
-  skin/images/navbar-pin.png                (images/navbar-pin.png)
-  skin/images/navbar-pin@1.4x.png           (images/navbar-pin@1.4x.png)
-  skin/images/navbar-pin@1.8x.png           (images/navbar-pin@1.8x.png)
-  skin/images/navbar-menu.png               (images/navbar-menu.png)
-  skin/images/navbar-menu@1.4x.png          (images/navbar-menu@1.4x.png)
-  skin/images/navbar-menu@1.8x.png          (images/navbar-menu@1.8x.png)
-  skin/images/urlbar-go.png                 (images/urlbar-go.png)
-  skin/images/urlbar-go@1.4x.png            (images/urlbar-go@1.4x.png)
-  skin/images/urlbar-go@1.8x.png            (images/urlbar-go@1.8x.png)
-  skin/images/urlbar-reload.png             (images/urlbar-reload.png)
-  skin/images/urlbar-reload@1.4x.png        (images/urlbar-reload@1.4x.png)
-  skin/images/urlbar-reload@1.8x.png        (images/urlbar-reload@1.8x.png)
-  skin/images/urlbar-stop.png               (images/urlbar-stop.png)
-  skin/images/urlbar-stop@1.4x.png          (images/urlbar-stop@1.4x.png)
-  skin/images/urlbar-stop@1.8x.png          (images/urlbar-stop@1.8x.png)
-  skin/images/newtab-default.png            (images/newtab-default.png)
-  skin/images/closetab-default.png          (images/closetab-default.png)
-  skin/images/tab-arrows.png                (images/tab-arrows.png)
-  skin/images/tab-crop.png                  (images/tab-crop.png)
-  skin/images/tab-overlay.png               (images/tab-overlay.png)
-  skin/images/identity-icons-generic.png    (images/identity-icons-generic.png)
-  skin/images/identity-icons-https-ev.png   (images/identity-icons-https-ev.png)
-  skin/images/identity-icons-https-mixed.png  (images/identity-icons-https-mixed.png)
-  skin/images/identity-icons-https.png      (images/identity-icons-https.png)
-  skin/images/icon-autocomplete-search.png  (images/icon-autocomplete-search.png)
-  skin/images/icon-autocomplete-search@1.4x.png  (images/icon-autocomplete-search@1.4x.png)
-  skin/images/icon-autocomplete-search@1.8x.png  (images/icon-autocomplete-search@1.8x.png)
-  skin/images/icons-identity-firefox.png    (images/icons-identity-firefox.png)
-  skin/images/icons-identity-firefox@1.4x.png  (images/icons-identity-firefox@1.4x.png)
-  skin/images/icons-identity-firefox@1.8x.png  (images/icons-identity-firefox@1.8x.png)
-  skin/images/infobar-close.png             (images/infobar-close.png)
-  skin/images/infobar-geolocation.png       (images/infobar-geolocation.png)
-  skin/images/infobar-key.png               (images/infobar-key.png)
-  skin/images/infobar-popup.png             (images/infobar-popup.png)
-  skin/images/firefox-watermark.png         (images/firefox-watermark.png)
-  skin/images/aboutAddonsBackground.png     (images/aboutAddonsBackground.png)
-  skin/images/aboutAddonsBackgroundFillSlice.png     (images/aboutAddonsBackgroundFillSlice.png)
-  skin/images/flyout-back-button.png        (images/flyout-back-button.png)
-  skin/images/arrowleft-16.png              (images/arrowleft-16.png)
-  skin/images/arrowright-16.png             (images/arrowright-16.png)
-  skin/images/arrowup-16.png                (images/arrowup-16.png)
-  skin/images/arrowdown-16.png              (images/arrowdown-16.png)
-  skin/images/arrowleftdark-16.png          (images/arrowleftdark-16.png)
-  skin/images/arrowrightdark-16.png         (images/arrowrightdark-16.png)
-  skin/images/arrowupdark-16.png            (images/arrowupdark-16.png)
-  skin/images/arrowdowndark-16.png          (images/arrowdowndark-16.png)
-  skin/images/popup-bg-hdpi.png             (images/popup-bg-hdpi.png)
-  skin/images/popup-selected-item-hdpi.png  (images/popup-selected-item-hdpi.png)
-  skin/images/arrowbox-horiz-blue-filled.png (images/arrowbox-horiz-blue-filled.png)
-  skin/images/arrowbox-down-blue-filled.png (images/arrowbox-down-blue-filled.png)
-  skin/images/favicon-default-32.png        (images/favicon-default-32.png)
-  skin/images/errorpage-warning.png         (images/errorpage-warning.png)
-  skin/images/errorpage-warning@1.4x.png    (images/errorpage-warning@1.4x.png)
-  skin/images/errorpage-warning@1.8x.png    (images/errorpage-warning@1.8x.png)
-  skin/images/errorpage-cert-untrusted.png  (images/errorpage-cert-untrusted.png)
-  skin/images/errorpage-cert-untrusted@1.4x.png (images/errorpage-cert-untrusted@1.4x.png)
-  skin/images/errorpage-cert-untrusted@1.8x.png (images/errorpage-cert-untrusted@1.8x.png)
-  skin/images/errorpage-blocked-site.png        (images/errorpage-blocked-site.png)
-  skin/images/errorpage-blocked-site@1.4x.png   (images/errorpage-blocked-site@1.4x.png)
-  skin/images/errorpage-blocked-site@1.8x.png   (images/errorpage-blocked-site@1.8x.png)
-  skin/images/alert-downloads-30.png        (images/alert-downloads-30.png)
-  skin/images/search-glass-30.png           (images/search-glass-30.png)
-  skin/images/play-hdpi.png                 (images/play-hdpi.png)
-  skin/images/pause-hdpi.png                (images/pause-hdpi.png)
-  skin/images/mute-hdpi.png                 (images/mute-hdpi.png)
-  skin/images/unmute-hdpi.png               (images/unmute-hdpi.png)
-  skin/images/fullscreen-hdpi.png           (images/fullscreen-hdpi.png)
-  skin/images/exitfullscreen-hdpi.png       (images/exitfullscreen-hdpi.png)
-  skin/images/scrubber-hdpi.png             (images/scrubber-hdpi.png)
-  skin/images/selection-monocle.png         (images/selection-monocle.png)
-  skin/images/selection-monocle@1.4x.png    (images/selection-monocle@1.4x.png)
-  skin/images/selection-monocle@1.8x.png    (images/selection-monocle@1.8x.png)
-  skin/images/appbar-icons.png              (images/appbar-icons.png)
-  skin/images/pinned-hdpi.png               (images/pinned-hdpi.png)
-  skin/images/tile-selected-check-hdpi.png  (images/tile-selected-check-hdpi.png)
-  skin/images/tile-selected-check-rtl-hdpi.png  (images/tile-selected-check-rtl-hdpi.png)
-  skin/images/plus-34.png                   (images/plus-34.png)
-  skin/images/plus-24.png                   (images/plus-24.png)
-  skin/images/progresscircle.png            (images/progresscircle.png)
-  skin/images/progresscircle-bg.png         (images/progresscircle-bg.png)
-
-  skin/images/overlay-back.png              (images/overlay-back.png)
-  skin/images/overlay-back@1.4x.png         (images/overlay-back@1.4x.png)
-  skin/images/overlay-back@1.8x.png         (images/overlay-back@1.8x.png)
-  skin/images/overlay-plus.png              (images/overlay-plus.png)
-  skin/images/overlay-plus@1.4x.png         (images/overlay-plus@1.4x.png)
-  skin/images/overlay-plus@1.8x.png         (images/overlay-plus@1.8x.png)
-  skin/images/autoscroll.png                (images/autoscroll.png)
-
-  skin/images/arrow-top.png                 (images/arrow-top.png)
-  skin/images/arrow-top@1.4x.png            (images/arrow-top@1.4x.png)
-  skin/images/arrow-top@1.8x.png            (images/arrow-top@1.8x.png)
-  skin/images/arrow-left.png                (images/arrow-left.png)
-  skin/images/arrow-left@1.4x.png           (images/arrow-left@1.4x.png)
-  skin/images/arrow-left@1.8x.png           (images/arrow-left@1.8x.png)
-  skin/images/arrow-top-light.png           (images/arrow-top-light.png)
-  skin/images/arrow-top-light@1.4x.png      (images/arrow-top-light@1.4x.png)
-  skin/images/arrow-top-light@1.8x.png      (images/arrow-top-light@1.8x.png)
-  skin/images/arrow-left-light.png          (images/arrow-left-light.png)
-  skin/images/arrow-left-light@1.4x.png     (images/arrow-left-light@1.4x.png)
-  skin/images/arrow-left-light@1.8x.png     (images/arrow-left-light@1.8x.png)
-
-# AboutConfig specific:
-  skin/images/textfield.png                 (images/textfield.png)
-  skin/images/reader-plus-icon-xhdpi.png    (images/reader-plus-icon-xhdpi.png)
-  skin/images/search.png                    (images/search.png)
-  skin/images/search-clear-30.png           (images/search-clear-30.png)
-  skin/images/lock.png                      (images/lock.png)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/moz.build	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/netError.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/netError.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/netError.css	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/netError.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,275 +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 defines the look-and-feel styling of the error pages.
- *  (see: netError.xhtml)
- *
- *  Original styling by William Price <bugzilla@mob.rice.edu>
- *  Updated for mobile by: Wes Johnston <wjohnston@mozilla.com>
- */
-
-%filter substitution
-%include defines.inc
-%include platform.css
-
-/*
- * In-browser content styles,
- * XXX: should be extracted and consolidated into a shared stylesheet for all in-browser content
- */
-body {
-  background-color: #F4F4F4;
-  color: rgb(51,51,51);
-  font-family: "Segoe UI", sans-serif;
-  font-size: @font_normal@;
-  line-height: 23px;
-}
-
-h1 {
-  font-size: @metro_font_xlarge@;
-  font-weight: normal;
-  line-height: @metro_spacing_large@;
-}
-h2 {
-  font-size: @metro_font_large@;
-  line-height: @metro_spacing_xxxnormal@;
-  font-weight: normal;
-}
-h3 {
-  font-size: @font_normal@;
-  line-height: @metro_spacing_xxnormal@;
-}
-h4 {
-  font-size: @font_normal@;
-  line-height: @metro_spacing_xxnormal@;
-  font-style: italic;
-  display: inline;
-}
-
-/*
- * Net error page styles
- */
-
-a {
-  text-decoration: none;
-}
-
-ul {
-  margin: 0px;
-  padding: 0px 0px 0px 1em;
-}
-
-li {
-  margin: 0px;
-  padding: 8px 0px;
-}
-
-#errorPage.certerror, #errorPage.blockedsite {
-  background-color: @error_page_background_color@;
-}
-
-#errorPage button {
-    margin: 5px 10px 5px 0;
-}
-
-#errorPage > .top-decoration {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 25px;
-}
-
-#errorPage.certerror > .top-decoration {
-   background: linear-gradient(-45deg,
-                    @error_page_background_color@ 25%,
-                    @error_page_warning_color@ 25%,
-                    @error_page_warning_color@ 50%,
-                    @error_page_background_color@ 50%,
-                    @error_page_background_color@ 75%,
-                    @error_page_warning_color@ 75%,
-                    @error_page_warning_color@) repeat scroll 0% 0% /
-                    80px 80px transparent;
-}
-
-#errorPage.blockedsite > .top-decoration {
-  background: linear-gradient(-45deg,
-                    @error_page_background_color@ 25%,
-                    @error_page_error_color@ 25%,
-                    @error_page_error_color@ 50%,
-                    @error_page_background_color@ 50%,
-                    @error_page_background_color@ 75%,
-                    @error_page_error_color@ 75%,
-                    @error_page_error_color@) repeat scroll 0% 0% /
-                    80px 80px transparent;
-}
-
-#errorPage #cert_domain_link {
-    color: #0095dd;
-}
-
-#errorPage.certerror #errorPageContainer > .section-header,
-#errorPage.blockedsite #errorPageContainer > .section-header {
-  border-bottom: @metro_border_thin@ solid rgb(133,137,140);
-}
-
-#errorPageContainer {
-  max-width: 628px;
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 60px;
-  -moz-padding-start: 40px;
-  -moz-padding-end: 24px;
-}
-
-#errorTitleIcon {
-  background-image: url("chrome://browser/skin/images/errorpage-warning.png");
-  background-position: center center;
-  background-repeat: no-repeat;
-  background-size: 40px 40px;
-  background-origin: content-box;
-  display: inline-block;
-  -moz-margin-start: -64px;
-  -moz-margin-end: 24px;
-  height: 40px;
-  vertical-align: middle;
-  width: 40px;
-}
-
-#errorPage.certerror #errorTitleIcon,  #errorPage.blockedsite #errorTitleIcon {
-  background-size: 60px 60px;
-  width: 60px;
-  height: 60px;
-  -moz-margin-start: -80px;
-  -moz-margin-end: 10px;
-}
-
-#errorPage.certerror #errorTitleIcon {
-  background-image: url("chrome://browser/skin/images/errorpage-cert-untrusted.png");
-}
-
-#errorPage.blockedsite #errorTitleIcon {
-  background-image: url("chrome://browser/skin/images/errorpage-blocked-site.png");
-}
-
-@media (min-resolution: @min_res_140pc@) {
-  /* Load 140% image when scaled by 140% */
-  #errorTitleIcon {
-    background-image: url("chrome://browser/skin/images/errorpage-warning@1.4x.png");
-  }
-
-  #errorPage.certerror #errorTitleIcon {
-    background-image: url("chrome://browser/skin/images/errorpage-cert-untrusted@1.4x.png");
-  }
-
-  #errorPage.blockedsite #errorTitleIcon {
-    background-image: url("chrome://browser/skin/images/errorpage-blocked-site@1.4x.png");
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  /* Load 180% image when scaled by 180% */
-  #errorTitleIcon {
-    background-image: url("chrome://browser/skin/images/errorpage-warning@1.8x.png");
-  }
-
-  #errorPage.certerror #errorTitleIcon {
-    background-image: url("chrome://browser/skin/images/errorpage-cert-untrusted@1.8x.png");
-  }
-
-  #errorPage.blockedsite #errorTitleIcon {
-    background-image: url("chrome://browser/skin/images/errorpage-blocked-site@1.8x.png");
-  }
-}
-
-@media (max-width: 760px) {
-  #errorPage.certerror #errorTitleIcon, #errorPage.blockedsite #errorTitleIcon {
-    display: block;
-    -moz-margin-start: 0;
-    -moz-margin-end: 0;
-  }
-}
-
-.errorTitleText {
-  padding: 0;
-  display: inline-block;
-  vertical-align: middle;
-}
-
-#errorPageContainer > .section-header {
-  border-bottom: @metro_border_thin@ solid @border_color@;
-  margin-top: @metro_spacing_xxxnormal@;
-  padding-bottom: @metro_spacing_snormal@;
-}
-
-#errorPageContainer > .section-details {
-  margin-top: @metro_spacing_xxxnormal@;
-  padding-bottom: @metro_spacing_xxxnormal@;
-}
-
-#errorPageContainer > .section-footer {
-  padding-bottom: @metro_spacing_xxxnormal@;
-}
-
-#errorShortDesc > p:empty {
-  display: none;
-}
-
-#errorShortDesc > p {
-  overflow: auto;
-  padding-bottom: 1em;
-  margin: 0;
-}
-
-#errorPage.blockedsite #errorShortDesc > p {
-  font-weight: bold;
-  border-bottom: none;
-  padding-bottom: 0px;
-}
-
-
-#detailsLink {
-  color: black;
-  display: table-row;
-}
-
-#detailsGrid {
-  display: table;
-}
-
-#detailsContainer {
-  display: table-row;
-}
-
-#detailsLinkLabel {
-  display: table-cell;
-}
-
-.detailsSpacer {
-  display: table-cell;
-  padding-right: 8px;
-}
-
-#securityOverrideDiv {
-  padding-top: 10px;
-}
-
-.expandable-section {
-  background: url("chrome://browser/skin/images/arrowdown-16.png") no-repeat left 0.6em;
-  background-size: 11px 11px;
-}
-
-.expandable-section[collapsed] {
-  background-image: url("chrome://browser/skin/images/arrowright-16.png");
-}
-
-.expandable-section[collapsed] > .expandable-content {
-  display: none;
-}
-
-.expandable-section > .expandable-heading {
-    cursor: pointer;
-    -moz-padding-start: 15px;
-    -moz-user-select: none;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/platform.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/platform.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/platform.css	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/platform.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,926 +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/. */
-
-/* Global Skin ------------------------------------------------------------- */
-
-@import url(chrome://global/skin/);
-
-%filter substitution
-%include defines.inc
-
-/* Typography & General Styling -------------------------------------------- */
-
-::-moz-selection {
-  color: white;
-  background-color: @metro_orange@;
-}
-
-:root {
-  font-family: "Segoe UI", sans-serif !important;
-  font-size: @font_normal@;
-}
-
-.text-link {
-  color: @metro_orange@;
-  text-decoration: none;
-}
-
-textbox,
-menulist {
-  -moz-appearance: none;
-  min-width: @field_sizing@; /* button size */
-  min-height: @field_sizing@; /* button size */
-  margin: @metro_spacing_small@;
-  padding: @metro_spacing_xsmall@ @metro_spacing_small@;
-
-  font-size: @metro_font_normal@;
-  font-weight: normal !important;
-
-  color: @field_foreground_color@;
-  background: @field_background_color@;
-  border: @metro_border_thick@ solid @field_foreground_color@ !important;
-  border-radius: 0;
-}
-
-textbox[disabled],
-menulist[disabled] {
-  border-color: @field_disabled_foreground_color@ !important;
-  color: @field_disabled_foreground_color@;
-}
-
-menulist:not([disabled]):hover:active {
-  color: @field_background_color@;
-  background: @field_foreground_color@;
-}
-
-/* Button ------------------------------------------------------------------ */
-
-button {
-  -moz-appearance: none;
-  border: 1px solid;
-  font-size: @metro_font_normal@;
-  font-weight: normal;
-  margin: @metro_spacing_small@;
-  min-width: @field_sizing@;
-  min-height: 32px;
-  padding: 3px 16px;
-}
-
-/* Non-default button colors */
-
-button {
-  background: linear-gradient(to bottom, hsl(210, 5%, 89%), hsl(210, 5%, 87%));
-  border-color: hsl(220, 5%, 86%);
-  color: hsl(0, 0%, 10%);
-}
-
-button:not([disabled]):hover {
-  background: linear-gradient(to bottom, hsl(210, 5%, 75%), hsl(210, 5%, 73%));
-  border-color: hsl(210, 5%, 71%);
-  color: hsl(0, 0%, 10%);
-}
-
-/* Default button colors */
-
-button[default],
-.notification-button-default {
-  background: linear-gradient(to bottom, hsl(35, 100%, 50%), hsl(30, 100%, 50%));
-  border-color: hsl(30, 100%, 48%);
-  color: white;
-}
-
-button[default]:not([disabled]):hover,
-.notification-button-default:not([disabled]):hover {
-  background: linear-gradient(to bottom, hsl(25, 100%, 47%), hsl(25, 100%, 45%));
-  border-color: hsl(25, 100%, 43%);
-  color: white;
-}
-
-/* Pushed button colors (both default and non-default */
-
-/* Note: these need enough specificity to override all the :hover rules above. */
-button:not([disabled]):hover:active,
-button:not([disabled])[checked="true"],
-button[default]:not([disabled])[checked="true"],
-.notification-button-default:not([disabled])[checked="true"] {
-  background: linear-gradient(to bottom, hsl(210, 5%, 28%), hsl(210, 5%, 25%));
-  border-color: hsl(216, 4%, 27%);
-  color: white;
-}
-
-/* Disabled button colors (both default and non-default */
-
-button[disabled] {
-  background: linear-gradient(to bottom, hsl(210, 3%, 93%), hsl(210, 3%, 92%));
-  border-color: hsl(210, 3%, 91%);
-  color: hsl(0, 0%, 60%);
-}
-
-/* Textbox ----------------------------------------------------------------- */
-
-textbox[isempty="true"] {
-  color: @field_mid_foreground_color@;
-}
-
-spinbuttons {
-  border: none;
-}
-
-.spinbuttons-box {
-  border: none;
-  -moz-box-orient: horizontal;
-  -moz-box-direction: reverse;
-}
-
-.spinbuttons-down,
-.spinbuttons-up {
-  border: none !important;
-}
-
-.spinbuttons-down {
-  list-style-image: url("chrome://browser/skin/images/arrowdown-16.png");
-}
-
-.spinbuttons-up {
-  list-style-image: url("chrome://browser/skin/images/arrowup-16.png");
-}
-
-/* Menu List --------------------------------------------------------------- */
-
-menulist {
-  -moz-user-focus: ignore;
-  padding: @metro_spacing_xsmall@ 0;
-  -moz-padding-start: @metro_spacing_small@;
-  border-color: @field_disabled_foreground_color@ !important;
-}
-
-/* Popup Menus ------------------------------------------------------------- */
-
-.menu-container {
-  position: absolute;
-  opacity: 0;
-}
-
-.menu-container[showingfrom="below"] {
-  transform: translateY(@metro_spacing_normal@);
-}
-
-.menu-container[showingfrom="above"] {
-  transform: translateY(-@metro_spacing_normal@);
-}
-
-.menu-container[hiding],
-.menu-container[showing] {
-  transition: opacity ease-out 0.2s,
-              transform ease-out 0.2s;
-}
-
-.menu-container[showing] {
-  opacity: 1;
-  transform: none;
-}
-
-.menu-popup > richlistbox {
-  padding: 3px 0;
-  border: #000 solid @metro_border_thick@;
-  -moz-appearance: none;
-  display: -moz-box;
-}
-
-.menu-popup > richlistbox > scrollbox {
-  width: 100%;
-  overflow-x: hidden !important;
-}
-
-.menu-popup richlistitem {
-  width: 100%;
-  min-height: @touch_button_small@;
-  min-width: @touch_action_minwidth@; /* keep the button from being too narrow */
-  border: 0 none;
-  -moz-box-align: center;
-  font-weight: 600;
-}
-.menu-popup > richlistbox > richlistitem {
-  -moz-padding-end: 50px;
-}
-/* Additional styles applied to popups for form <select> elements. */
-#select-container {
-  padding: 0;
-  position: absolute;
-  background-color: transparent;
-}
-
-#select-commands {
-  -moz-appearance: none;
-  background-color: white;
-  border: #000 solid @metro_border_thick@;
-  display: -moz-box;
-  -moz-user-focus: ignore;
-  -moz-box-align: stretch;
-  width: 100%;
-}
-
-/* ensure click events are dispatched targetting the select option not the label */
-#select-commands > .option-command > label {
-  pointer-events: none;
-}
-
-/* listcell element doesn't have flex="1" so we need to force it */
-.option-command > listcell {
-  -moz-box-flex: 1 !important;
-}
-
-.option-command {
-  min-height: @touch_button_small@;
-  min-width: @touch_action_minwidth@; /* keep the button from being too narrow */
-  border: 0 none;
-}
-
-.option-command.optgroup {
-  font-weight: bold;
-  font-style: italic;
-  pointer-events: none;
-}
-
-.select-popup > richlistbox > scrollbox {
-  width: 100%;
-  overflow-x: hidden !important;
-}
-
-/* Toolbar Button --------------------------------------------------------- */
-
-toolbarbutton {
-  min-width: @metro_spacing_large@; /* primary button size */
-  min-height: @metro_spacing_large@; /* primary button size */
-  -moz-appearance: none;
-  margin: 0;
-  padding: @metro_spacing_xsmall@;
-}
-
-toolbarbutton:not(.show-text) .toolbarbutton-text {
-  display: none;
-}
-
-.toolbarbutton-icon[label]:not([label=""]),
-.toolbarbutton-icon[type="menu"] {
-  -moz-margin-end: @metro_spacing_xsmall@;
-}
-
-toolbarbutton:not(.show-text) .toolbarbutton-icon,
-toolbarbutton:not([image]) .toolbarbutton-icon,
-toolbarbutton[image=''] .toolbarbutton-icon {
-  -moz-margin-end: 0;
-}
-
-toolbarbutton:hover,
-toolbarbutton:hover:active,
-toolbarbutton[open="true"] {
-  border-color: transparent;
-}
-
-/* Toggleswitch ------------------------------------------------------------ */
-
-checkbox.toggleswitch {
-  margin: @metro_spacing_small@;
-  min-height: @metro_spacing_normal@;
-  font-weight: bold;
-}
-
-checkbox.toggleswitch hbox {
-  -moz-box-align: center;
-}
-
-checkbox.toggleswitch:not([checked]) .onlabel,
-checkbox.toggleswitch[checked] .offlabel {
-  display: none;
-}
-
-checkbox.toggleswitch radiogroup {
-  border: @metro_border_thick@ solid @field_disabled_foreground_color@;
-  -moz-box-orient: horizontal;
-}
-
-checkbox.toggleswitch radio {
-  -moz-appearance: none;
-  margin: 0;
-  border: 0 none;
-  border-radius: 0;
-  background: 0 none;
-  padding: 0;
-  min-height: @metro_spacing_normal@;
-  height: @metro_spacing_normal@;
-}
-
-checkbox.toggleswitch[checked] radio.checkbox-radio-on,
-checkbox.toggleswitch:not([checked]) radio.checkbox-radio-off {
-  width: @metro_spacing_normal@;
-  min-width: @metro_spacing_normal@;
-  background: #000;
-  margin: -@metro_border_thick@;
-}
-
-checkbox.toggleswitch[checked] radio.checkbox-radio-off,
-checkbox.toggleswitch:not([checked]) radio.checkbox-radio-on {
-  width: @metro_spacing_xxxnormal@;
-  min-width: @metro_spacing_xxxnormal@;
-  margin: @metro_border_thin@;
-}
-
-checkbox.toggleswitch:not([checked]) radio.checkbox-radio-on {
-  background: @field_disabled_foreground_color@;
-}
-
-checkbox.toggleswitch[checked] radio.checkbox-radio-off {
-  background: @selected_color@;
-}
-
-checkbox.toggleswitch[checked] radio:last-child {
-  -moz-margin-start: 0;
-}
-
-checkbox.toggleswitch[checked] radio:first-child {
-  -moz-margin-end: 0;
-}
-
-/* Color Picker ------------------------------------------------------------ */
-
-colorpicker > panel {
-  background-color: #767973;
-}
-
-colorpicker > vbox {
-  background-color: #767973;
-}
-
-/* Rich List Box ---------------------------------------------------------- */
-
-richlistbox {
-  -moz-user-focus: ignore;
-  margin: 0;
-}
-
-richlistitem {
-  -moz-user-focus: ignore;
-  min-height: @metro_spacing_normal@; /* row size */
-  padding: @metro_spacing_small@;
-}
-
-richlistitem label.normal,
-richlistitem description.normal,
-richlistitem label.normal-black,
-richlistitem description.normal-black,
-richlistitem label.normal-bold,
-richlistitem description.normal-bold{
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-
-richlistitem label.normal,
-richlistitem description.normal {
-  color: gray;
-}
-
-richlistitem label.normal-bold,
-richlistitem description.normal-bold {
-  font-weight: bold;
-}
-
-richlistitem[selected],
-richlistitem:not([disabled]):not([selected]):active {
-  background-color: @metro_orange@;
-  color: #fff;
-}
-
-richlistitem:not([disabled]):not([selected]):hover {
-  background-color: #ccc;
-}
-
-richlistitem.section-header,
-richlistitem[selected].section-header {
-  font-weight: bold;
-  color: #000;
-  background-color: lightgray;
-}
-
-richlistitem[selected] .hide-on-select,
-richlistitem .show-on-select {
-  visibility: collapse;
-}
-
-richlistitem[selected] .show-on-select,
-richlistitem .hide-on-select {
-  visibility: visible;
-}
-
-richlistitem[typeName="message"] {
-  border-bottom: 0;
-}
-
-/* Notification box ("info app bar") ---------------------------------------- */
-
-notification {
-  background: hsl(0, 0%, 98%);
-  border-bottom: 1px solid hsla(0, 0%, 0%, .07);
-  box-shadow: 0 0 10px hsla(0, 0%, 0%, .1);
-  min-height: 64px;
-}
-
-notificationbox[count="0"] .notification-layer,
-notificationbox[count="1"] .notification-layer,
-notificationbox[count="2"] .notification-layer[anonid="layer2"] {
-  visibility: collapse;
-}
-
-notificationbox[count="2"] .notification-layer[anonid="layer1"],
-notificationbox[count="3"] .notification-layer[anonid="layer1"],
-notificationbox[count="3"] .notification-layer[anonid="layer2"] {
-  visibility: visible;
-}
-
-.notification-layer {
-  border: @metro_border_thin@ solid @field_disabled_foreground_color@;
-  border-bottom: none;
-  height:5px
-}
-
-.notification-inner {
-  border-style: none;
-  border: @metro_border_thin@ solid @field_disabled_foreground_color@;
-}
-
-.notification-button {
-  -moz-margin-start: 0;
-  -moz-margin-end: 20px;
-}
-
-.messageImage {
-  width: 32px;
-  height: 32px;
-  -moz-margin-start: 40px;
-  -moz-margin-end: 16px;
-}
-
-/* If there is no image set, collapse the image but keep the starting margin */
-.messageImage:not([src]) {
-  width: 0;
-  -moz-margin-end: 0;
-}
-
-.messageText {
-  margin: 0;
-}
-
-.messageCloseButton {
-  list-style-image: url("chrome://browser/skin/images/infobar-close.png");
-  padding: 0;
-  -moz-margin-start: 0;
-  -moz-margin-end: 40px;
-  -moz-image-region: rect(0, 40px, 40px, 0);
-}
-
-.messageCloseButton > .toolbarbutton-icon {
-  margin: 0;
-}
-
-.messageCloseButton:hover {
-  -moz-image-region: rect(0, 80px, 40px, 40px);
-}
-
-.messageCloseButton:hover:active {
-  -moz-image-region: rect(0, 120px, 40px, 80px);
-}
-
-.notification-link {
-  /* Make the link take up all the space before the buttons. */
-  -moz-box-flex: 9999;
-}
-
-/* ensure the notification children pick up snapped-view box property overrides */
-.notification-button.box-inherit {
-  -moz-margin-start: inherit;
-  -moz-margin-end: inherit;
-  width: inherit;
-  display: inherit;
-  overflow: inherit;
-}
-
-@media (max-width: 330px) {
-  /* notifications need layout tweaks in narrow viewport
-   */
-  .notification-button {
-      display: block;
-      width: calc(100% - 40px);
-      overflow: visible;
-      -moz-margin-start: 40px;
-      -moz-margin-end: 0;
-  }
-
-  .notification-inner {
-    display: block;
-    padding: @metro_spacing_xnormal@;
-  }
-  .notification-inner > [anonid="details"] {
-    display: inline-block;
-    width: calc(100% - 48px);
-  }
-
-  .notification-inner > .messageCloseButton {
-    display: inline-block;
-    vertical-align: top;
-    -moz-margin-start: 8px;
-    -moz-margin-end: 0;
-  }
-  .notification-inner > [anonid="details"] > .messageImage {
-    display: inline;
-    vertical-align: top;
-    -moz-margin-start: 0;
-    -moz-margin-end: 8px;
-  }
-  .notification-inner > [anonid="details"] > .messageText {
-    display: inline-block;
-    width: calc(100% - 40px);
-    overflow: visible;
-  }
-
-}
-
-/* Prompts ----------------------------------------------------------------- */
-
-.mainContainer {
-  padding: 5vh 10vw;
-}
-
-.info\.title {
-  font-size: @metro_font_large@;
-  border-bottom: 1px solid #C7C7C7;
-  padding-bottom: @metro_spacing_normal@;
-  width: 100%;
-  margin-left: 0;
-  margin-right: 0;
-}
-
-.info\.body {
-  font-size: @metro_font_normal@;
-  padding-bottom: @metro_spacing_normal@;
-  height: 100%;
-  max-height: 30vh;
-  max-width: 55vw;
-}
-
-.buttonContainer {
-  background-color: transparent;
-  border: none;
-}
-
-.buttonContainer > button {
-  min-width: @touch_action_minwidth@;
-  margin: 5px 0 5px @metro_spacing_xnormal@;
-}
-
-/* set all the things to display block to allow body to grow with content and
-  obey overflow auto. Except on authentication prompts because a grid is used to
-  align labels and textboxes. */
-tabmodalprompt:not([promptType="promptUserAndPass"]) .info\.body,
-tabmodalprompt:not([promptType="promptUserAndPass"]) .infoContainer,
-tabmodalprompt:not([promptType="promptUserAndPass"]) .topContainer,
-tabmodalprompt:not([promptType="promptUserAndPass"]) .topContainer > rows > row:not([hidden]),
-tabmodalprompt:not([promptType="promptUserAndPass"]) .topContainer > rows {
-  display: block;
-}
-
-tabmodalprompt:not([promptType="promptUserAndPass"]) .infoContainer {
-  overflow: auto;
-}
-
-.topContainer > rows > row > label {
-  margin-left: 0;
-}
-
-.topContainer > rows > row > checkbox {
-  -moz-margin-start: 0;
-  -moz-padding-start: 0;
-}
-
-.topContainer > rows > row > textbox {
-  font-size: @metro_font_normal@;
-  height: 40px;
-  margin: 5px 0;
-  width: 100%;
-}
-
-.topContainer > rows > row > textbox[focused] {
-  border-color: @metro_orange@ !important;
-}
-
-#stack[keyboardVisible] tabmodalprompt > spacer {
-  min-height: 20px;
-  max-height: 20px;
-}
-
-#stack[keyboardVisible] tabmodalprompt .info\.body {
-  max-height: 15vh;
-}
-
-@media (max-width: 600px) {
-  .mainContainer {
-    padding: 5vh 5vw;
-    width: 90vw;
-  }
-
-  .buttonContainer > button {
-    min-width: @touch_action_snapped_minwidth@;
-  }
-}
-
-/*.meta -------------------------------------------------------------------- */
-
-.meta {
-  background-color: @panel_light_color@;
-}
-
-/* needs to observe the viewstate */
-.meta-section-container {
-  padding: 45px 75px 0;
-  -moz-box-orient: horizontal;
-}
-
-.meta-section-container[viewstate="snapped"],
-.meta-section-container[viewstate="portrait"] {
-  -moz-box-orient: vertical;
-  -moz-box-flex: 1;
-}
-
-.meta-section-container[viewstate="snapped"] {
-  padding: 0;
-}
-
-.meta-section {
-  margin: 0 @metro_spacing_large@;
-}
-
-.meta-section-container[viewstate="snapped"] > .meta-section {
-  margin: 0 @metro_spacing_xnormal@;
-}
-
-.meta-section-title {
-  margin: @metro_spacing_normal@ @tile_side_margin@;
-  font-size: @metro_font_large@;
-  font-weight: 100;
-  cursor: default;
-}
-
-.meta-section-title.wide-title {
-  font-size: @metro_font_xlarge@;
-  margin-bottom: calc(40px - @tile_side_margin@);
-}
-
-.meta-section:not([expanded]) > .meta-section-title.narrow-title:after {
-  content: ">";
-}
-
-.meta-section-container:not([viewstate="snapped"]) .meta-section-title.narrow-title,
-.meta-section-container[viewstate="snapped"] .meta-section-title.wide-title {
-  display: none;
-}
-
-.meta-section-container[viewstate="snapped"] .meta-section-title,
-.meta-section-container[viewstate="snapped"] richgrid {
-  margin-top: @metro_spacing_xnormal@;
-  padding: 0;
-}
-
-.meta-section > richgrid {
-  opacity: 1;
-  transform: translateX(0) translateY(0);
-  transition-duration: 367ms;
-  transition-delay: 500ms;
-  transition-timing-function: @metro_animation_easing@;
-}
-
-.meta-section:nth-child(2) > richgrid {
-  transition-delay: 600ms;
-}
-.meta-section:nth-child(3) > richgrid {
-  transition-delay: 700ms;
-}
-.meta-section:nth-child(4) > richgrid {
-  transition-delay: 800ms;
-}
-
-.meta-section > richgrid[fade] {
-  opacity: 0;
-  transform: translateX(150px) translateY(25px);
-}
-
-#start-container[viewstate="snapped"] .meta-section > richgrid {
-  transition-property: none;
-}
-
-/* Autocomplete ----------------------------------------------------------------- */
-
-#urlbar-autocomplete-scroll:not([autocomplete]) {
-  transform: translateY(calc(3 * @grid_row_height@ + 64px));
-  visibility: collapse;
-}
-
-#urlbar-autocomplete-scroll[autocomplete] {
-  height: calc(3 * @grid_row_height@ + 64px);
-  max-height: calc(3 * @grid_row_height@ + 64px);
-  transform: translateY(0);
-  transition-timing-function: @metro_animation_easing@;
-  transition-property: transform;
-  transition-duration: @metro_animation_duration@;
-  transition-delay: 0s;
-  visibility: visible;
-}
-
-#urlbar-autocomplete-scroll:not([autocomplete]) > .meta-section-container > .meta-section {
-  opacity: 0;
-}
-
-#urlbar-autocomplete > .meta-section {
-  opacity: 1;
-  transition-property: opacity;
-  transition-timing-function: @metro_animation_easing@;
-  transition-duration: @metro_animation_duration@;
-  transition-delay: 0s;
-  visibility: visible;
-}
-
-#urlbar-autocomplete[nomatch] > .meta-section[anonid="results-container"] {
-  opacity: 0;
-  visibility: collapse;
-}
-
-#urlbar-autocomplete richgriditem:not([value]) {
-  visibility: collapse;
-}
-
-/* App bars ----------------------------------------------------------------- */
-
-appbar {
-  display: block;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  transform: translateY(100%);
-  transition: transform @metro_animation_duration@ @metro_animation_easing@;
-  font-size: 0;
-  visibility: hidden;
-}
-
-appbar[hiding],
-appbar[visible] {
-  visibility: visible;
-}
-
-appbar[visible] {
-  transform: none;
-}
-
-#stack[keyboardVisible] > appbar {
-  /* Slow the bottom up transition since it's impossible to match the system's
-     soft keyboard movement. */
-  transition: transform @metro_animation_duration@ @metro_animation_easing@,
-              bottom @appbar_keyboard_slideup_duration@ @appbar_keyboard_slideup_easing@ @appbar_keyboard_slideup_delay@;
-}
-
-
-appbar toolbar {
-  -moz-appearance: none;
-  -moz-box-align: center;
-  border: 0;
-  width: 100%;
-  min-height: @toolbar_height@;
-  font-size: 1rem;
-}
-
-appbar toolbar toolbarbutton {
-  border: 0;
-  margin: 0 @toolbar_horizontal_spacing@;
-  padding: 0;
-  /* Don't inherit background-color from toolbarbutton[checked="true"] */
-  background-color: transparent;
-}
-
-appbar toolbar toolbarbutton[disabled] {
-  visibility: collapse;
-}
-
-appbar toolbar[labelled] {
-  min-height: @labelled_toolbar_height@;
-}
-
-appbar toolbar[labelled] toolbarbutton {
-  -moz-box-orient: vertical;
-}
-
-appbar toolbar[labelled] toolbarbutton > .toolbarbutton-text {
-  display: block;
-  padding-top: @metro_spacing_small@;
-  font-size: 0.75rem;
-}
-
-/* Sprites */
-
-.appbar-primary .toolbarbutton-icon,
-.appbar-secondary .toolbarbutton-icon {
-  width: 40px;
-  height: 40px;
-}
-
-/* Primary sprite format: one button per sprite.
-
-   States from left to right:
-   normal, hover, active/toggled, toggled+hover, toggled+active. */
-
-.appbar-primary {
-  -moz-image-region: rect(0 40px 40px 0);
-}
-
-.appbar-primary:not([checked]):hover:not(:active):not([disabled]) {
-  -moz-image-region: rect(0 80px 40px 40px);
-}
-
-.appbar-primary:not([checked]):active:not([disabled]),
-.appbar-primary[checked] {
-  -moz-image-region: rect(0 120px 40px 80px);
-}
-
-.appbar-primary[checked]:hover:not(:active):not([disabled]) {
-  -moz-image-region: rect(0 160px 40px 120px);
-}
-
-.appbar-primary[checked]:active:not([disabled]) {
-  -moz-image-region: rect(0 200px 40px 160px);
-}
-
-@media (min-resolution: @min_res_140pc@) {
-  .appbar-primary {
-    -moz-image-region: rect(0 56px 56px 0);
-  }
-
-  .appbar-primary:not([checked]):hover:not(:active):not([disabled]) {
-    -moz-image-region: rect(0 112px 56px 56px);
-  }
-
-  .appbar-primary:not([checked]):active:not([disabled]),
-  .appbar-primary[checked] {
-    -moz-image-region: rect(0 168px 56px 112px);
-  }
-
-  .appbar-primary[checked]:hover:not(:active):not([disabled]) {
-    -moz-image-region: rect(0 224px 56px 168px);
-  }
-
-  .appbar-primary[checked]:active:not([disabled]) {
-    -moz-image-region: rect(0 280px 56px 224px);
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  .appbar-primary {
-    -moz-image-region: rect(0 72px 72px 0);
-  }
-
-  .appbar-primary:not([checked]):hover:not(:active):not([disabled]) {
-    -moz-image-region: rect(0 144px 72px 72px);
-  }
-
-  .appbar-primary:not([checked]):active:not([disabled]),
-  .appbar-primary[checked] {
-    -moz-image-region: rect(0 216px 72px 144px);
-  }
-
-  .appbar-primary[checked]:hover:not(:active):not([disabled]) {
-    -moz-image-region: rect(0 288px 72px 216px);
-  }
-
-  .appbar-primary[checked]:active:not([disabled]) {
-    -moz-image-region: rect(0 360px 72px 288px);
-  }
-}
-
-/* Secondary sprite format: one sprite for everything */
-
-.appbar-secondary {
-  list-style-image: url(chrome://browser/skin/images/appbar-icons.png);
-}
-
-/* Flyout panels (sidebars) ------------------------------------------------- */
-
-.flyout-narrow {
-  width: 346px;
-}
-
-/* Some elements don't resize to fit their container properly for some reason.
- * Setting max-width on the element or a child fixes it. */
-.flyout-narrow .flyoutpanel-hack {
-  max-width: calc(346px - 2 * 40px);
-}
-
-.console-row-code {
-   padding-top: 2px;
-   font-size: small;
-}
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/start.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/start.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/start.css	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/start.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +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/. */
-
-%filter substitution
-%include defines.inc
-
-/* Start UI ----------------------------------------------------------------- */
-
-#startui-page {
-  overflow-x: scroll;
-  overflow-y: hidden;
-  height: 100%;
-}
-
-#startui-page[viewstate="snapped"],
-#startui-page[viewstate="portrait"] {
-  overflow-x: hidden;
-  overflow-y: scroll;
-}
-
-#startui-body {
-  height: 100%;
-  margin: 0;
-}
-
-#start-container {
-  height: 100%;
-}
-
-#start-container[viewstate="snapped"],
-#start-container[viewstate="portrait"] {
-  width: 100%;
-  max-width: 100%; /* ensure page doesn't expand, messing up @media rules */
-  height: auto;
-}
-
-#start-container[viewstate="snapped"] .meta-section:not([expanded]) > richgrid {
-  visibility: collapse;
-}
-
-/* Watermark */
-#startui-body::after {
-  content: '';
-  width: 256px;
-  height: 256px;
-  position: fixed;
-  left: 50%;
-  top: 50%;
-  margin-top: -128px;
-  margin-left: -128px;
-  z-index: -1;
-  background-image: url("chrome://browser/skin/images/firefox-watermark.png");
-  background-repeat: no-repeat;
-  background-position: center center;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/tiles.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/tiles.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/tiles.css	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/tiles.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,431 +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/. */
-
-/* Tile grid  ------------------------------------------------------------- */
-
-%filter substitution
-%include defines.inc
-
-/*
- *****************************************************
-  The following rules define the key tile dimensions
-  They are (also) snarfed via the CSSOM as the dimensions used in the #richgrid binding
- *****************************************************
- */
-richgriditem {
-  width: @grid_double_column_width@;
-  height: @grid_row_height@;
-}
-richgriditem[tiletype="thumbnail"] {
-  width: @grid_double_column_width@;
-  height: @grid_double_row_height@;
-}
-richgriditem[search] {
-  width: @grid_search_width@;
-  height: @grid_row_height@;
-}
-richgriditem[compact] {
-  width: auto;
-  height: @compactgrid_row_height@;
-}
-/*
- *****************************************************
- */
-richgrid {
-  display: -moz-box;
-  overflow: hidden;
-}
-
-richgrid > .richgrid-grid {
-  -moz-column-width: @grid_double_column_width@; /* tile width (2x unit + gutter) */
-  min-width: @grid_double_column_width@; /* min 1 column */
-  min-height: @grid_double_row_height@; /* 2 rows (or 1 double rows) minimum; multiple of tile_height */
-  -moz-column-fill: auto; /* do not attempt to balance content between columns */
-  -moz-column-gap: 0;
-  -moz-column-count: auto;
-  display: block;
-  box-sizing: content-box;
-  overflow-x: hidden; /* clipping will only kick in if an explicit width is set */
-  transition: 100ms transform ease-out;
-}
-
-richgrid[search] > .richgrid-grid {
-  -moz-column-width: auto;
-  min-width: 0;
-}
-
-richgriditem {
-  display: block;
-  position: relative;
-  width: @grid_double_column_width@;
-  height: @grid_row_height@;
-  box-sizing: border-box;
-  -moz-column-gap: 0;
-  overflow:hidden;
-  cursor: default;
-}
-
-.tile-content {
-  display: block;
-  position: absolute;
-  /* background-color colors the tile-edge,
-     and will normally be overridden with a favicon-based color */
-  background-color: #ccc;
-  background-origin: padding-box;
-  /* content positioning within the grid "cell"
-     gives us the gutters/spacing between tiles */
-  top: 2px; right: @tile_side_margin@; bottom: 10px; left: @tile_side_margin@;
-  border: @metro_border_thin@ solid @tile_border_color@;
-  box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.1);
-  transition: 150ms transform ease-out,
-              @metro_animation_duration@ background-color @metro_animation_easing@;
-}
-
-.tile-start-container {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  left: 10px;
-  padding: 8px;
-  background-color: #fff;
-}
-richgriditem:-moz-locale-dir(rtl) .tile-start-container {
-  right: 10px;
-  left: 0;
-}
-
-richgriditem[search] .tile-start-container {
-  background-color: transparent;
-}
-
-richgriditem:not([tiletype="thumbnail"]) .tile-start-container {
-  background-image: none!important;
-}
-
-.tile-icon-box {
-  position: absolute;
-  top: 50%;
-  margin-top: -17px;
-  padding: 8px;
-  /* default color, may be overriden by a favicon-based color */
-  background-color: white;
-  border: 1px solid #ccc;
-  border-radius: 1px;
-  opacity: 1.0;
-}
-
-.tile-icon-box > image {
-  display: block;
-  width: 16px;
-  height: 16px;
-  list-style-image: url("chrome://browser/skin/images/identity-icons-generic.png");
-}
-
-/* for larger favicons (which includes the fallback icon) */
-richgriditem:not([iconURI]) .tile-icon-box,
-richgriditem[iconURI=""] .tile-icon-box,
-richgriditem[iconsize="large"] .tile-icon-box {
-  border-color: transparent!important;
-  padding: 4px;
-}
-
-richgriditem[iconsize="large"] .tile-icon-box > image,
-.tile-icon-box > image[src=""] {
-  width: 24px;
-  height: 24px;
-}
-
-richgriditem[search] .tile-icon-box {
-  padding: 0;
-  border: 0;
-  left: 50%;
-  -moz-margin-start: -13px;
-  margin-top: -8px;
-}
-
-richgriditem[search]:-moz-locale-dir(rtl) .tile-icon-box {
-  right: 50%;
-  left: auto;
-}
-
-
-richgriditem[search][iconsize="large"] .tile-icon-box {
-  left: 0;
-  top: 0;
-  margin: 0;
-}
-richgriditem[search][iconsize="large"]:-moz-locale-dir(rtl) .tile-icon-box {
-  right: 0;
-  left: auto;
-}
-
-richgriditem[search][iconsize="large"] .tile-start-container {
-  left: 0;
-  padding: 0;
-}
-richgriditem[search][iconsize="large"]:-moz-locale-dir(rtl) .tile-start-container {
-  left: auto;
-  right: 0;
-}
-
-richgriditem[search][iconsize="large"] .tile-icon-box > image {
-  width: 74px;
-  height: 74px;
-}
-
-richgriditem[search] .tile-desc {
-  display: none;
-}
-
-richgriditem[search] .tile-content {
-  border: 0;
-}
-
-.tile-desc {
-  display: block;
-  position: absolute;
-  top: 6px;
-  left: 52px; /* label goes to the end (right) of the favicon */
-  right: 0;
-  padding-top: 1em;
-  -moz-padding-end: 6px;
-  padding-bottom: 6px;
-  -moz-padding-start: 12px;
-  background: white;
-  color: #333;
-  margin: 0;
-  -moz-margin-start: 0;
-  display: block;
-  font-size: 16px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  transition: @metro_animation_duration@ background-color @metro_animation_easing@;
-}
-richgriditem:-moz-locale-dir(rtl) .tile-desc {
-  right: 52px; /* label goes to the end (left) of the favicon */
-  left: 0;
-}
-
-richgriditem:not([tiletype="thumbnail"]) .tile-desc {
-  background-color: transparent!important;
-}
-
-
-richgriditem.collapsed {
-  height: 0!important;
-  overflow: hidden;
-  opacity: 0;
-}
-
-richgriditem.collapsed > .tile-content {
-  transform: scaleY(0);
-  transition: 150ms transform ease-out 150ms;
-}
-
-richgriditem:active {
-  z-index: 2;
-}
-
-/* thumbnail variation */
-
-richgriditem[tiletype="thumbnail"] {
-  width: @grid_double_column_width@;
-  height: @grid_double_row_height@;
-  -moz-box-pack: end;
-  padding: 0px;
-  color: #1a1a1a;
-}
-
-richgriditem[tiletype="thumbnail"] .tile-desc {
-  margin: 0;
-  top: auto;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  padding-top: 4px;
-  -moz-padding-end: 8px;
-  padding-bottom: 4px;
-  -moz-padding-start: 56px;
-}
-
-richgriditem[tiletype="thumbnail"] > .tile-content > .tile-desc {
-  /* ensure thumbnail labels get their color from the parent richgriditem element */
-  color: inherit;
-}
-
-/* thumbnail tiles use a screenshot thumbnail as the background */
-
-richgriditem[tiletype="thumbnail"] > .tile-content > .tile-start-container,
-richgriditem[tiletype="thumbnail"] > .tile-content > .tile-start-container::after {
-  background-size: cover;
-  background-position: top left;
-  background-repeat: no-repeat;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  left: 0;
-}
-
-richgriditem[tiletype="thumbnail"] > .tile-content > .tile-start-container::after {
-  pointer-events:none;
-  content: "";
-  display: block;
-  opacity: 0;
-  background-color: #fff;
-  background-image: url("chrome://browser/skin/images/firefox-watermark.png")!important;
-  transition: @metro_animation_duration@ opacity ease-in;
-}
-
-richgriditem[tiletype="thumbnail"]:not([customImage]) > .tile-content > .tile-start-container::after {
-  opacity: 1;
-}
-
-richgriditem[tiletype="thumbnail"] .tile-icon-box {
-  top: auto;
-  left: 10px;
-  bottom: 6px;
-  margin-top: 0;
-  z-index: 1;
-  box-shadow: 0px 0px 2px 2px rgba(0, 0, 0, 0.05), 0px 2px 0px rgba(0, 0, 0, 0.1);
-}
-richgriditem[tiletype="thumbnail"]:-moz-locale-dir(rtl) .tile-icon-box {
-  left: auto;
-  right: 10px;
-}
-
-/* selected tile indicator */
-richgriditem[selected] > .tile-content::after {
-  content: "";
-  pointer-events: none;
-  display: block;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1;
-  background-image: url(chrome://browser/skin/images/tile-selected-check-hdpi.png);
-  background-origin: border-box;
-  background-repeat: no-repeat;
-  background-position: right 0 top 0;
-  /* scale the image whatever the dppx */
-  background-size: 35px 35px;
-  border: @metro_border_xthick@ solid @selected_color@;
-}
-richgriditem[selected]:-moz-locale-dir(rtl) > .tile-content::after {
-  background-position: left 0 top 0;
-  background-image: url(chrome://browser/skin/images/tile-selected-check-rtl-hdpi.png);
-}
-
-richgriditem[crosssliding] {
-  z-index: 10;
-}
-
-/* ease the return to original position when cross-sliding */
-richgriditem:not([crosssliding]) {
-  transition: transform ease-out 0.2s;
-}
-
-
-/* tile pinned-state indication */
-richgriditem[pinned] > .tile-content::before {
-  pointer-events:none;
-  content: "";
-  display: block;
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: auto;
-  z-index: 1;
-  width: 35px;
-  height: 35px;
-  background-image: url(chrome://browser/skin/images/pinned-hdpi.png);
-  background-position: center;
-  background-repeat: no-repeat;
-  /* scale the image whatever the dppx */
-  background-size: 70px 70px;
-}
-richgriditem[pinned]:-moz-locale-dir(rtl) > .tile-content::before {
-  left: 0;
-  right: auto;
-  -moz-transform: scaleX(-1);
-}
-
-
-/* Selected _and_ pinned tiles*/
-richgriditem[selected][pinned] > .tile-content::before {
-  background-position: right -@metro_border_xthick@ top -@metro_border_xthick@;
-  width: 70px;
-  height: 70px;
-}
-richgriditem[selected][pinned]:-moz-locale-dir(rtl) > .tile-content::before {
-  background-position: left -@metro_border_xthick@ top -@metro_border_xthick@;
-}
-
-richgriditem[customColor] {
-  color: #f1f1f1;
-}
-
-richgriditem[bending] > .tile-content {
-  transform-origin: center center;
-}
-
-richgriditem[tiletype="thumbnail"]:not([value]) {
-  visibility: visible;
-}
-richgriditem:not([value]) > .tile-content {
-  padding: 10px 14px;
-}
-/* Empty/unused tiles */
-richgriditem:not([value]) > .tile-content {
-  box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.05);
-  background-image: url("chrome://browser/skin/images/firefox-watermark.png");
-  background-origin: content-box;
-  background-repeat: no-repeat;
-  background-color: rgba(255,255,255, 0.2);
-  background-position: center center;
-  background-size: @compactgrid_row_height@;
-}
-richgriditem[tiletype="thumbnail"]:not([value]) > .tile-content {
-  background-size: @grid_row_height@;
-}
-
-/* Snapped-view variation
-   We use the compact, single-column grid treatment for <=320px */
-
-@media (max-width: 330px) {
-
-  richgrid:not([search]) > .richgrid-grid {
-    -moz-column-width: auto!important; /* let it flow */
-    -moz-column-count: auto!important; /* let it flow */
-    height: auto; /* let it flow */
-    min-width: 280px;
-    transition: 100ms transform ease-out;
-  }
-
-  richgriditem {
-    width: @grid_double_column_width@;
-    overflow: hidden;
-    height: @compactgrid_row_height@;
-  }
-
-  .tile-desc {
-    padding-top: 0.5em;
-    -moz-padding-end: 4px;
-    padding-bottom: 4px;
-    -moz-padding-start: 4px;
-  }
-
-  richgriditem:not([search]) > .tile-content {
-    left: 0;
-    right: 0;
-  }
-
-  richgriditem {
-    width: auto;
-  }
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/touchcontrols.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/touchcontrols.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/metro/theme/touchcontrols.css	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/metro/theme/touchcontrols.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,213 +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/. */
-
-@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-
-/* video controls */
-.controlsOverlay {
-  -moz-box-pack: center;
-  -moz-box-align: end;
-  padding: 20px;
-  -moz-box-flex: 1;
-  -moz-box-orient: horizontal;
-}
-
-.controlBar {
-  -moz-box-flex: 1;
-  font-size: 16pt;
-  padding: 10px;
-  background-color: #34353a;
-  border-radius: 8px;
-  width: 100%;
-}
-
-.controlsSpacer {
-  display: none;
-  -moz-box-flex: 0;
-}
-
-.fullscreenButton,
-.playButton,
-.castingButton,
-.muteButton {
-  -moz-appearance: none;
-  min-height: 42px;
-  min-width: 42px;
-  border: none !important;
-}
-
-.fullscreenButton {
-  background: url("chrome://browser/skin/images/fullscreen-hdpi.png") no-repeat center;
-}
-
-.fullscreenButton[fullscreened="true"] {
-  background: url("chrome://browser/skin/images/exitfullscreen-hdpi.png") no-repeat center;
-}
-
-.controlBar[fullscreen-unavailable] .fullscreenButton {
-  display: none;
-}
-
-.playButton {
-  background: url("chrome://browser/skin/images/pause-hdpi.png") no-repeat center;
-}
-
-/*
- * Normally the button bar has fullscreen spacer play spacer mute, but if
- * this is an audio control rather than a video control, the fullscreen button
- * is hidden by videocontrols.xml, and that alters the position of the
- * play button.  This workaround moves it back to center.
- */
-.controlBar[fullscreen-unavailable] .playButton {
-  transform: translateX(28px);
-}
-
-.playButton[paused="true"] {
-  background: url("chrome://browser/skin/images/play-hdpi.png") no-repeat center;
-}
-
-.castingButton {
-  display: none;
-}
-
-.muteButton {
-  background: url("chrome://browser/skin/images/mute-hdpi.png") no-repeat center;
-}
-
-.muteButton[muted="true"] {
-  background: url("chrome://browser/skin/images/unmute-hdpi.png") no-repeat center;
-}
-
-/* bars */
-.scrubberStack {
-  width: 100%;
-  min-height: 32px;
-  max-height: 32px;
-  padding: 0px 8px;
-  margin: 0px;
-}
-
-.bufferBar,
-.bufferBar .progress-bar,
-.progressBar,
-.progressBar .progress-bar,
-.scrubber,
-.scrubber .scale-slider,
-.scrubber .scale-thumb {
-  -moz-appearance: none;
-  border: none;
-  padding: 0px;
-  margin: 0px;
-  background-color: transparent;
-}
-
-.bufferBar {
-  border: 1px solid #5e6166;
-}
-
-.bufferBar,
-.progressBar {
-  margin: 9px 0px 11px 0px;
-  height: 8px
-}
-
-.bufferBar .progress-bar {
-  background-color: #5e6166;
-}
-
-.progressBar .progress-bar {
-  background-color: white;
-}
-
-.scrubber {
-  margin-left: -16px;
-  margin-right: -16px;
-}
-
-.scrubber .scale-thumb {
-  display: -moz-box;
-  background: url("chrome://browser/skin/images/scrubber-hdpi.png") no-repeat;
-  height: 32px;
-  width: 32px;
-}
-
-.durationBox {
-  -moz-box-orient: horizontal;
-  -moz-box-pack: start;
-  -moz-box-align: center;
-  color: white;
-  font-weight: bold;
-  padding: 0px 8px;
-  margin-top: -6px;
-}
-
-.positionLabel {
-  -moz-box-flex: 1;
-}
-
-.statusOverlay {
-  -moz-box-align: center;
-  -moz-box-pack: center;
-  background-color: rgb(50,50,50);
-}
-
-.statusIcon {
-  margin-bottom: 28px;
-  width: 36px;
-  height: 36px;
-}
-
-.statusIcon[type="throbber"] {
-  background: url(chrome://global/skin/media/throbber.png) no-repeat center;
-}
-
-.statusIcon[type="error"] {
-  background: url(chrome://global/skin/media/error.png) no-repeat center;
-}
-
-/* CSS Transitions */
-.controlBar:not([immediate]) {
-  transition-property: opacity;
-  transition-duration: 200ms;
-}
-
-.controlBar[fadeout] {
-  opacity: 0;
-}
-
-.statusOverlay:not([immediate]) {
-  transition-property: opacity;
-  transition-duration: 300ms;
-  transition-delay: 750ms;
-}
-
-.statusOverlay[fadeout] {
-  opacity: 0;
-}
-
-.volumeStack,
-.controlBar[firstshow="true"] .muteButton,
-.controlBar[firstshow="true"] .scrubberStack,
-.controlBar[firstshow="true"] .durationBox,
-.timeLabel {
-  display: none;
-}
-
-.controlBar[firstshow="true"] .playButton {
-  transform: none;
-}
-
-/* Error description formatting */
-.errorLabel {
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 11px;
-  color: #bbb;
-  text-shadow:
-    -1px -1px 0 #000,
-    1px -1px 0 #000,
-    -1px 1px 0 #000,
-    1px 1px 0 #000;
-  padding: 0 10px;
-  text-align: center;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/modules/BrowserUITelemetry.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/modules/BrowserUITelemetry.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/modules/BrowserUITelemetry.jsm	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/modules/BrowserUITelemetry.jsm	2015-04-24 19:30:59.000000000 +0000
@@ -77,10 +77,6 @@
     result["PanelUI-contents"].push("characterencoding-button");
   }
 
-  if (Services.metro && Services.metro.supported) {
-    result["PanelUI-contents"].push("switch-to-metro-button");
-  }
-
   return result;
 });
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/modules/SelfSupportBackend.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/modules/SelfSupportBackend.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/modules/SelfSupportBackend.jsm	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/modules/SelfSupportBackend.jsm	2015-04-24 19:30:59.000000000 +0000
@@ -240,6 +240,10 @@
     // Fetch the Self Support URL from the preferences.
     let unformattedURL = Preferences.get(PREF_URL, null);
     let url = Services.urlFormatter.formatURL(unformattedURL);
+    if (!url.startsWith("https:")) {
+      this._log.error("_loadSelfSupport - Non HTTPS URL provided: " + url);
+      return;
+    }
 
     this._log.config("_loadSelfSupport - URL " + url);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/modules/test/browser_SelfSupportBackend.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/modules/test/browser_SelfSupportBackend.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/modules/test/browser_SelfSupportBackend.js	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/modules/test/browser_SelfSupportBackend.js	2015-04-24 19:30:59.000000000 +0000
@@ -18,6 +18,7 @@
 const TEST_WAIT_RETRIES = 60;
 
 const TEST_PAGE_URL = getRootDirectory(gTestPath) + "uitour.html";
+const TEST_PAGE_URL_HTTPS = TEST_PAGE_URL.replace("chrome://mochitests/content/", "https://example.com/");
 
 /**
  * Find a browser, with an IFRAME as parent, who has aURL as the source attribute.
@@ -104,9 +105,14 @@
   // is enabled.
   Preferences.set(PREF_SELFSUPPORT_ENABLED, true);
   Preferences.set(PREF_UITOUR_ENABLED, true);
-  Preferences.set(PREF_SELFSUPPORT_URL, TEST_PAGE_URL);
+  Preferences.set(PREF_SELFSUPPORT_URL, TEST_PAGE_URL_HTTPS);
+
+  // Whitelist the HTTPS page to use UITour.
+  let pageURI = Services.io.newURI(TEST_PAGE_URL_HTTPS, null, null);
+  Services.perms.add(pageURI, "uitour", Services.perms.ALLOW_ACTION);
 
   registerCleanupFunction(() => {
+    Services.perms.remove("example.com", "uitour");
     Preferences.set(PREF_SELFSUPPORT_ENABLED, selfSupportEnabled);
     Preferences.set(PREF_UITOUR_ENABLED, uitourEnabled);
     Preferences.set(PREF_SELFSUPPORT_URL, selfSupportURL);
@@ -126,7 +132,7 @@
 
   // Wait for the SelfSupport page to load.
   info("Waiting for the SelfSupport local page to load.");
-  let selfSupportBrowser = yield promiseSelfSupportLoad(TEST_PAGE_URL);
+  let selfSupportBrowser = yield promiseSelfSupportLoad(TEST_PAGE_URL_HTTPS);
   Assert.ok(!!selfSupportBrowser, "SelfSupport browser must exist.");
 
   // Get a reference to the UITour API.
@@ -146,13 +152,34 @@
 
   // Wait until SelfSupport closes.
   info("Waiting for the SelfSupport to close.");
-  yield promiseSelfSupportClose(TEST_PAGE_URL);
+  yield promiseSelfSupportClose(TEST_PAGE_URL_HTTPS);
 
   // Find the SelfSupport browser, again. We don't expect to find it.
-  selfSupportBrowser = findSelfSupportBrowser(TEST_PAGE_URL);
+  selfSupportBrowser = findSelfSupportBrowser(TEST_PAGE_URL_HTTPS);
   Assert.ok(!selfSupportBrowser, "SelfSupport browser must not exist.");
 
   // We shouldn't need this, but let's keep it to make sure closing SelfSupport twice
   // doesn't create any problem.
   SelfSupportBackend.uninit();
 });
+
+/**
+ * Test that SelfSupportBackend only allows HTTPS.
+ */
+add_task(function* test_selfSupport_noHTTPS() {
+  Preferences.set(PREF_SELFSUPPORT_URL, TEST_PAGE_URL);
+
+  SelfSupportBackend.init();
+
+  // SelfSupportBackend waits for "sessionstore-windows-restored" to start loading. Send it.
+  info("Sending sessionstore-windows-restored");
+  Services.obs.notifyObservers(null, "sessionstore-windows-restored", null);
+
+  // Find the SelfSupport browser. We don't expect to find it since we are not using https.
+  let selfSupportBrowser = findSelfSupportBrowser(TEST_PAGE_URL);
+  Assert.ok(!selfSupportBrowser, "SelfSupport browser must not exist.");
+
+  // We shouldn't need this, but let's keep it to make sure closing SelfSupport twice
+  // doesn't create any problem.
+  SelfSupportBackend.uninit();
+})
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/moz.build	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/moz.build	2015-04-24 19:30:59.000000000 +0000
@@ -24,9 +24,6 @@
     'app',
 ]
 
-if CONFIG['MOZ_METRO']:
-    DIRS += ['metro']
-
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/linux/devtools/floating-scrollbars.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/linux/devtools/floating-scrollbars.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/linux/devtools/floating-scrollbars.css	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/linux/devtools/floating-scrollbars.css	2015-04-24 19:30:59.000000000 +0000
@@ -9,10 +9,8 @@
   padding: 2px;
 }
 
-/* Scrollbar code will reset the margin to the correct side depending on
-   layout.scrollbar.side pref */
 scrollbar[orient="vertical"] {
-  margin-left: -10px;
+  -moz-margin-start: -10px;
   min-width: 10px;
   max-width: 10px;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/osx/devtools/floating-scrollbars.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/osx/devtools/floating-scrollbars.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/osx/devtools/floating-scrollbars.css	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/osx/devtools/floating-scrollbars.css	2015-04-24 19:30:59.000000000 +0000
@@ -10,10 +10,8 @@
   padding: 2px;
 }
 
-/* Scrollbar code will reset the margin to the correct side depending on
-   layout.scrollbar.side pref */
 scrollbar[orient="vertical"] {
-  margin-left: -8px;
+  -moz-margin-start: -8px;
   min-width: 8px;
   max-width: 8px;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/shared/browser.inc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/shared/browser.inc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/shared/browser.inc	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/shared/browser.inc	2015-04-24 19:30:59.000000000 +0000
@@ -2,7 +2,7 @@
 
 % Note that zoom-reset-button is a bit different since it doesn't use an image and thus has the image with display: none.
 %define nestedButtons #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button
-%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button
+%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button
 
 %ifdef XP_MACOSX
 % Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button to exit fullscreen
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/shared/customizableui/panelUIOverlay.inc.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/shared/customizableui/panelUIOverlay.inc.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/shared/customizableui/panelUIOverlay.inc.css	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/shared/customizableui/panelUIOverlay.inc.css	2015-04-24 19:30:59.000000000 +0000
@@ -17,6 +17,7 @@
 %define menuStateHover :not(:-moz-any([disabled],:active))[_moz-menuactive]
 %define buttonStateActive :not([disabled]):-moz-any([open],:hover:active)
 %define menuStateActive :not([disabled])[_moz-menuactive]:active
+%define menuStateMenuActive :not([disabled])[_moz-menuactive]
 
 %include ../browser.inc
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/shared/devtools/toolbars.inc.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/shared/devtools/toolbars.inc.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/shared/devtools/toolbars.inc.css	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/shared/devtools/toolbars.inc.css	2015-04-24 19:30:59.000000000 +0000
@@ -26,8 +26,7 @@
 
 /* Toolbars */
 .devtools-toolbar,
-.devtools-sidebar-tabs tabs,
-.devtools-sidebar-alltabs {
+.devtools-sidebar-tabs tabs {
   -moz-appearance: none;
   padding: 0;
   border-width: 0;
@@ -509,13 +508,17 @@
 }
 
 .devtools-sidebar-alltabs {
+  -moz-appearance: none;
+  height: 24px;
+  line-height: 24px;
+  padding: 0 4px;
   margin: 0;
   border-width: 0 0 1px 0;
   -moz-border-start-width: 1px;
   border-style: solid;
 }
 
-.devtools-sidebar-alltabs dropmarker {
+.devtools-sidebar-alltabs .toolbarbutton-icon {
   display: none;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/browser.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/browser.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/browser.css	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/browser.css	2015-04-24 19:31:00.000000000 +0000
@@ -2466,19 +2466,6 @@
 
 /* Social toolbar item */
 
-#switch-to-metro-button[cui-areatype="toolbar"] {
-  list-style-image: url(chrome://browser/skin/Metro_Glyph.png);
-}
-
-toolbar[brighttext] #switch-to-metro-button[cui-areatype="toolbar"] {
-  list-style-image: url(chrome://browser/skin/Metro_Glyph-inverted.png);
-}
-
-#switch-to-metro-button[cui-areatype="menu-panel"],
-toolbarpaletteitem[place="palette"] > #switch-to-metro-button {
-  list-style-image: url(chrome://browser/skin/Metro_Glyph-menuPanel.png);
-}
-
 #social-undoactivation-button {
   -moz-margin-start: 0; /* override default label margin to match description margin */
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/customizableui/panelUIOverlay.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/customizableui/panelUIOverlay.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/customizableui/panelUIOverlay.css	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/customizableui/panelUIOverlay.css	2015-04-24 19:31:00.000000000 +0000
@@ -233,13 +233,13 @@
     color: ButtonText;
   }
 
-  .subviewbutton@menuStateHover@,
+  .subviewbutton@menuStateMenuActive@,
   menuitem.panel-subview-footer@menuStateHover@,
   .subviewbutton.panel-subview-footer@buttonStateHover@,
   .subviewbutton.panel-subview-footer@buttonStateActive@,
   .subviewbutton@menuStateHover@ > .menu-accel-container,
   .PanelUI-subView .subviewbutton[shortcut]@buttonStateHover@::after,
-  #BMB_bookmarksPopup .panel-subview-footer@menuStateHover@ > .menu-text {
+  #BMB_bookmarksPopup .panel-subview-footer@menuStateMenuActive@ > .menu-text {
     background-color: Highlight;
     color: highlighttext !important;
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/devtools/floating-scrollbars.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/devtools/floating-scrollbars.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/devtools/floating-scrollbars.css	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/devtools/floating-scrollbars.css	2015-04-24 19:31:00.000000000 +0000
@@ -9,10 +9,8 @@
   padding: 2px;
 }
 
-/* Scrollbar code will reset the margin to the correct side depending on
-   layout.scrollbar.side pref */
 scrollbar[orient="vertical"] {
-  margin-left: -10px;
+  -moz-margin-start: -10px;
   min-width: 10px;
   max-width: 10px;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/jar.mn	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/jar.mn	2015-04-24 19:31:00.000000000 +0000
@@ -65,9 +65,6 @@
         skin/classic/browser/menuPanel-help.png
         skin/classic/browser/menuPanel-small.png
         skin/classic/browser/menuPanel-small-aero.png
-        skin/classic/browser/Metro_Glyph.png
-        skin/classic/browser/Metro_Glyph-inverted.png
-        skin/classic/browser/Metro_Glyph-menuPanel.png
         skin/classic/browser/bad-content-blocked-16.png             (../shared/bad-content-blocked-16.png)
         skin/classic/browser/bad-content-blocked-16@2x.png          (../shared/bad-content-blocked-16@2x.png)
         skin/classic/browser/bad-content-blocked-64.png             (../shared/bad-content-blocked-64.png)
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/Metro_Glyph-inverted.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/Metro_Glyph-inverted.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/Metro_Glyph-menuPanel.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/Metro_Glyph-menuPanel.png differ
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/browser/themes/windows/Metro_Glyph.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/browser/themes/windows/Metro_Glyph.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/autoconf/icu.m4 thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/autoconf/icu.m4
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/autoconf/icu.m4	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/autoconf/icu.m4	2015-04-24 19:31:00.000000000 +0000
@@ -19,6 +19,22 @@
 if test -n "$MOZ_NATIVE_ICU"; then
     PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
     MOZ_SHARED_ICU=1
+elif test -n "$gonkdir" -a "$ANDROID_VERSION" -ge 17; then
+    dnl Use system's ICU since version is 50.1+.
+    if test -d "$gonkdir/external/icu/icu4c/source"; then
+        dnl gonk-L (API version is 21)
+        MOZ_ICU_GONK_PATH="$gonkdir/external/icu/icu4c/source"
+    elif test -d "$gonkdir/external/icu4c"; then
+        MOZ_ICU_GONK_PATH="$gonkdir/external/icu4c"
+    else
+        AC_MSG_ERROR([Cannot find ICU source code under gonk])
+    fi
+    MOZ_ICU_CFLAGS="-I$MOZ_ICU_GONK_PATH/common -I$MOZ_ICU_GONK_PATH/i18n"
+    dnl icudata is a datafile under /usr/icu/icudt<version number>l.dat,
+    dnl not shared library.  So we don't link to icudata on B2G.
+    MOZ_ICU_LIBS='-licui18n -licuuc'
+    MOZ_NATIVE_ICU=1
+    MOZ_SHARED_ICU=1
 else
     MOZ_ICU_CFLAGS='-I$(topsrcdir)/intl/icu/source/common -I$(topsrcdir)/intl/icu/source/i18n'
     AC_SUBST_LIST(MOZ_ICU_CFLAGS)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/automation.py.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/automation.py.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/automation.py.in	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/automation.py.in	2015-04-24 19:31:00.000000000 +0000
@@ -706,12 +706,6 @@
 
         (line, didTimeout) = self.readWithTimeout(logsource, timeout)
 
-        if "METRO_BROWSER_PROCESS" in line:
-          index = line.find("=")
-          if index:
-            browserProcessId = line[index+1:].rstrip()
-            self.log.info("INFO | automation.py | metro browser sub process id detected: %s", browserProcessId)
-
         if not hitMaxTime and maxTime and datetime.now() - startTime > timedelta(seconds = maxTime):
           # Kill the application.
           hitMaxTime = True
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/automationutils.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/automationutils.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/automationutils.py	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/automationutils.py	2015-04-24 19:31:00.000000000 +0000
@@ -101,12 +101,15 @@
   """Process a single leak log.
   """
 
-  #                  Per-Inst  Leaked      Total  Rem ...
-  #   0 TOTAL              17     192  419115886    2 ...
-  # 833 nsTimerImpl        60     120      24726    2 ...
-  lineRe = re.compile(r"^\s*\d+\s+(?P<name>\S+)\s+"
-                      r"(?P<size>-?\d+)\s+(?P<bytesLeaked>-?\d+)\s+"
-                      r"-?\d+\s+(?P<numLeaked>-?\d+)")
+  #     |              |Per-Inst  Leaked|     Total  Rem|
+  #   0 |TOTAL         |      17     192| 419115886    2|
+  # 833 |nsTimerImpl   |      60     120|     24726    2|
+  # 930 |Foo<Bar, Bar> |      32       8|       100    1|
+  lineRe = re.compile(r"^\s*\d+ \|"
+                      r"(?P<name>[^|]+)\|"
+                      r"\s*(?P<size>-?\d+)\s+(?P<bytesLeaked>-?\d+)\s*\|"
+                      r"\s*-?\d+\s+(?P<numLeaked>-?\d+)")
+  # The class name can contain spaces. We remove trailing whitespace later.
 
   processString = "%s process:" % processType
   crashedOnPurpose = False
@@ -125,7 +128,7 @@
         # eg: the leak table header row
         log.info(line.rstrip())
         continue
-      name = matches.group("name")
+      name = matches.group("name").rstrip()
       size = int(matches.group("size"))
       bytesLeaked = int(matches.group("bytesLeaked"))
       numLeaked = int(matches.group("numLeaked"))
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/clang-plugin/clang-plugin.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/clang-plugin/clang-plugin.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/clang-plugin/clang-plugin.cpp	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/clang-plugin/clang-plugin.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -84,6 +84,11 @@
     virtual void run(const MatchFinder::MatchResult &Result);
   };
 
+  class ExplicitOperatorBoolChecker : public MatchFinder::MatchCallback {
+  public:
+    virtual void run(const MatchFinder::MatchResult &Result);
+  };
+
   ScopeChecker stackClassChecker;
   ScopeChecker globalClassChecker;
   NonHeapClassChecker nonheapClassChecker;
@@ -92,16 +97,17 @@
   NaNExprChecker nanExprChecker;
   NoAddRefReleaseOnReturnChecker noAddRefReleaseOnReturnChecker;
   RefCountedInsideLambdaChecker refCountedInsideLambdaChecker;
+  ExplicitOperatorBoolChecker explicitOperatorBoolChecker;
   MatchFinder astMatcher;
 };
 
 namespace {
 
-bool isInIgnoredNamespace(const Decl *decl) {
+std::string getDeclarationNamespace(const Decl *decl) {
   const DeclContext *DC = decl->getDeclContext()->getEnclosingNamespaceContext();
   const NamespaceDecl *ND = dyn_cast<NamespaceDecl>(DC);
   if (!ND) {
-    return false;
+    return "";
   }
 
   while (const DeclContext *ParentDC = ND->getParent()) {
@@ -112,8 +118,15 @@
   }
 
   const auto& name = ND->getName();
+  return name;
+}
+
+bool isInIgnoredNamespaceForImplicitCtor(const Decl *decl) {
+  std::string name = getDeclarationNamespace(decl);
+  if (name == "") {
+    return false;
+  }
 
-  // namespace std and icu are ignored for now
   return name == "std" ||              // standard C++ lib
          name == "__gnu_cxx" ||        // gnu C++ lib
          name == "boost" ||            // boost
@@ -129,7 +142,19 @@
          name == "testing";            // gtest
 }
 
-bool isIgnoredPath(const Decl *decl) {
+bool isInIgnoredNamespaceForImplicitConversion(const Decl *decl) {
+  std::string name = getDeclarationNamespace(decl);
+  if (name == "") {
+    return false;
+  }
+
+  return name == "std" ||              // standard C++ lib
+         name == "__gnu_cxx" ||        // gnu C++ lib
+         name == "google_breakpad" ||  // breakpad
+         name == "testing";            // gtest
+}
+
+bool isIgnoredPathForImplicitCtor(const Decl *decl) {
   decl = decl->getCanonicalDecl();
   SourceLocation Loc = decl->getLocation();
   const SourceManager &SM = decl->getASTContext().getSourceManager();
@@ -150,9 +175,30 @@
   return false;
 }
 
-bool isInterestingDecl(const Decl *decl) {
-  return !isInIgnoredNamespace(decl) &&
-         !isIgnoredPath(decl);
+bool isIgnoredPathForImplicitConversion(const Decl *decl) {
+  decl = decl->getCanonicalDecl();
+  SourceLocation Loc = decl->getLocation();
+  const SourceManager &SM = decl->getASTContext().getSourceManager();
+  SmallString<1024> FileName = SM.getFilename(Loc);
+  llvm::sys::fs::make_absolute(FileName);
+  llvm::sys::path::reverse_iterator begin = llvm::sys::path::rbegin(FileName),
+                                    end   = llvm::sys::path::rend(FileName);
+  for (; begin != end; ++begin) {
+    if (begin->compare_lower(StringRef("graphite2")) == 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool isInterestingDeclForImplicitCtor(const Decl *decl) {
+  return !isInIgnoredNamespaceForImplicitCtor(decl) &&
+         !isIgnoredPathForImplicitCtor(decl);
+}
+
+bool isInterestingDeclForImplicitConversion(const Decl *decl) {
+  return !isInIgnoredNamespaceForImplicitConversion(decl) &&
+         !isIgnoredPathForImplicitConversion(decl);
 }
 
 }
@@ -232,7 +278,7 @@
       }
     }
 
-    if (!d->isAbstract() && isInterestingDecl(d)) {
+    if (!d->isAbstract() && isInterestingDeclForImplicitCtor(d)) {
       for (CXXRecordDecl::ctor_iterator ctor = d->ctor_begin(),
            e = d->ctor_end(); ctor != e; ++ctor) {
         // Ignore non-converting ctors
@@ -416,6 +462,16 @@
   return clazz ? isClassRefCounted(clazz) : RegularClass;
 }
 
+template<class T>
+bool IsInSystemHeader(const ASTContext &AC, const T &D) {
+  auto &SourceManager = AC.getSourceManager();
+  auto ExpansionLoc = SourceManager.getExpansionLoc(D.getLocStart());
+  if (ExpansionLoc.isInvalid()) {
+    return false;
+  }
+  return SourceManager.isInSystemHeader(ExpansionLoc);
+}
+
 }
 
 namespace clang {
@@ -515,12 +571,7 @@
 /// isExpansionInSystemHeader in newer clangs, but modified in order to work
 /// with old clangs that we use on infra.
 AST_MATCHER(BinaryOperator, isInSystemHeader) {
-  auto &SourceManager = Finder->getASTContext().getSourceManager();
-  auto ExpansionLoc = SourceManager.getExpansionLoc(Node.getLocStart());
-  if (ExpansionLoc.isInvalid()) {
-    return false;
-  }
-  return SourceManager.isInSystemHeader(ExpansionLoc);
+  return IsInSystemHeader(Finder->getASTContext(), Node);
 }
 
 /// This matcher will match locations in SkScalar.h.  This header contains a
@@ -649,6 +700,13 @@
             hasDescendant(declRefExpr(hasType(pointerType(pointee(isRefCounted())))).bind("node"))
         ),
     &refCountedInsideLambdaChecker);
+
+  // Older clang versions such as the ones used on the infra recognize these
+  // conversions as 'operator _Bool', but newer clang versions recognize these
+  // as 'operator bool'.
+  astMatcher.addMatcher(methodDecl(anyOf(hasName("operator bool"),
+                                         hasName("operator _Bool"))).bind("node"),
+    &explicitOperatorBoolChecker);
 }
 
 void DiagnosticsMatcher::ScopeChecker::run(
@@ -861,6 +919,25 @@
   Diag.Report(node->getLocStart(), noteID);
 }
 
+void DiagnosticsMatcher::ExplicitOperatorBoolChecker::run(
+    const MatchFinder::MatchResult &Result) {
+  DiagnosticsEngine &Diag = Result.Context->getDiagnostics();
+  unsigned errorID = Diag.getDiagnosticIDs()->getCustomDiagID(
+      DiagnosticIDs::Error, "bad implicit conversion operator for %0");
+  unsigned noteID = Diag.getDiagnosticIDs()->getCustomDiagID(
+      DiagnosticIDs::Note, "consider adding the explicit keyword to %0");
+  const CXXConversionDecl *method = Result.Nodes.getNodeAs<CXXConversionDecl>("node");
+  const CXXRecordDecl *clazz = method->getParent();
+
+  if (!method->isExplicitSpecified() &&
+      !MozChecker::hasCustomAnnotation(method, "moz_implicit") &&
+      !IsInSystemHeader(method->getASTContext(), *method) &&
+      isInterestingDeclForImplicitConversion(method)) {
+    Diag.Report(method->getLocStart(), errorID) << clazz;
+    Diag.Report(method->getLocStart(), noteID) << "'operator bool'";
+  }
+}
+
 class MozCheckAction : public PluginASTAction {
 public:
   ASTConsumerPtr CreateASTConsumer(CompilerInstance &CI, StringRef fileName) override {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/clang-plugin/tests/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/clang-plugin/tests/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/clang-plugin/tests/moz.build	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/clang-plugin/tests/moz.build	2015-04-24 19:31:00.000000000 +0000
@@ -7,6 +7,7 @@
 SOURCES += [
     'TestBadImplicitConversionCtor.cpp',
     'TestCustomHeap.cpp',
+    'TestExplicitOperatorBool.cpp',
     'TestGlobalClass.cpp',
     'TestMustOverride.cpp',
     'TestNANTestingExpr.cpp',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/clang-plugin/tests/TestExplicitOperatorBool.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/clang-plugin/tests/TestExplicitOperatorBool.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/clang-plugin/tests/TestExplicitOperatorBool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/clang-plugin/tests/TestExplicitOperatorBool.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -0,0 +1,11 @@
+#define MOZ_IMPLICIT __attribute__((annotate("moz_implicit")))
+
+struct Bad {
+  operator bool(); // expected-error {{bad implicit conversion operator for 'Bad'}} expected-note {{consider adding the explicit keyword to 'operator bool'}}
+};
+struct Good {
+  explicit operator bool();
+};
+struct Okay {
+  MOZ_IMPLICIT operator bool();
+};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/mobile/remoteautomation.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/mobile/remoteautomation.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/mobile/remoteautomation.py	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/mobile/remoteautomation.py	2015-04-24 19:31:00.000000000 +0000
@@ -180,7 +180,13 @@
         self.checkForANRs()
         self.checkForTombstones()
 
-        logcat = self._devicemanager.getLogcat(filterOutRegexps=fennecLogcatFilters)
+        try:
+            logcat = self._devicemanager.getLogcat(filterOutRegexps=fennecLogcatFilters)
+        except DMError:
+            print "getLogcat threw DMError; re-trying just once..."
+            time.sleep(1)
+            logcat = self._devicemanager.getLogcat(filterOutRegexps=fennecLogcatFilters)
+
         javaException = mozcrash.check_for_java_exception(logcat)
         if javaException:
             return True
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/pgo/server-locations.txt thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/pgo/server-locations.txt
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/pgo/server-locations.txt	2015-04-22 13:05:38.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/pgo/server-locations.txt	2015-04-24 19:31:00.000000000 +0000
@@ -8,7 +8,7 @@
 # It is referred to by the following page, so if this file moves, that page must
 # be modified accordingly:
 #
-# http://developer.mozilla.org/en/docs/Mochitest#How_do_I_test_issues_which_only_show_up_when_tests_are_run_across_domains.3F
+# https://developer.mozilla.org/en/docs/Mochitest#How_do_I_test_issues_which_only_show_up_when_tests_are_run_across_domains.3F
 #
 # Empty lines and lines which begin with "#" are ignored and may be used for
 # storing comments.  All other lines consist of an origin followed by whitespace
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/win32/mozconfig.vs2010-win64 thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/win32/mozconfig.vs2010-win64
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/win32/mozconfig.vs2010-win64	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/win32/mozconfig.vs2010-win64	2015-04-24 19:31:01.000000000 +0000
@@ -9,8 +9,8 @@
 ## SDK redist ##
 export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC100.CRT
 
-## includes: win8 sdk includes, winrt headers for metro, msvc 10 std library, directx sdk for d3d9 ##
-export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/um:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt/wrl:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt/wrl/wrappers:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
+## includes: win8 sdk includes, msvc 10 std library, directx sdk for d3d9 ##
+export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
 
 ## libs: win8 sdk x86 (32-bit) libs, msvc 10 (32-bit) std library, msvc 10 atl libs, directx sdk (32-bit) for d3d9  ##
 export LIBPATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/Lib/win8/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/win32/mozconfig.vs2013-win64 thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/win32/mozconfig.vs2013-win64
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/win32/mozconfig.vs2013-win64	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/win32/mozconfig.vs2013-win64	2015-04-24 19:31:01.000000000 +0000
@@ -1,8 +1,8 @@
 _VSPATH="/c/tools/vs2013"
 export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC120.CRT
 
-## includes: win8.1 sdk includes, winrt headers for metro, msvc std library, directx sdk for d3d9 ##
-export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/um:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt/wrl:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt/wrl/wrappers:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
+## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ##
+export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
 
 ## libs: win8.1 sdk x86 (32-bit) libs, msvc (32-bit) std library, msvc atl libs, directx sdk (32-bit) for d3d9  ##
 export LIBPATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Lib/winv6.3/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/win64/mozconfig.vs2010 thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/win64/mozconfig.vs2010
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/win64/mozconfig.vs2010	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/win64/mozconfig.vs2010	2015-04-24 19:31:01.000000000 +0000
@@ -9,8 +9,8 @@
 ## SDK redist ##
 export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x64/Microsoft.VC100.CRT
 
-## includes: win8 sdk includes, winrt headers for metro, msvc 10 std library, directx sdk for d3d9 ##
-export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/um:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt/wrl:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt/wrl/wrappers:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
+## includes: win8 sdk includes, msvc 10 std library, directx sdk for d3d9 ##
+export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
 
 ## libs: win8 sdk x64 (64-bit) libs, msvc 10 (64-bit) std library, msvc 10 atl libs, directx sdk (64-bit) for d3d9  ##
 export LIBPATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/Lib/win8/um/x64:${_VSPATH}/vc/lib/amd64:${_VSPATH}/vc/atlmfc/lib/amd64:/c/tools/sdks/dx10/lib/x64
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/win64/mozconfig.vs2013 thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/win64/mozconfig.vs2013
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/build/win64/mozconfig.vs2013	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/build/win64/mozconfig.vs2013	2015-04-24 19:31:01.000000000 +0000
@@ -1,8 +1,8 @@
 _VSPATH="/c/tools/vs2013"
 export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x64/Microsoft.VC120.CRT
 
-## includes: win8.1 sdk includes, winrt headers for metro, msvc std library, directx sdk for d3d9 ##
-export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/um:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt/wrl:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt/wrl/wrappers:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
+## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ##
+export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
 
 ## libs: win8.1 sdk x64 (64-bit) libs, msvc (64-bit) std library, msvc atl libs, directx sdk (64-bit) for d3d9  ##
 export LIBPATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Lib/winv6.3/um/x64:${_VSPATH}/vc/lib/amd64:${_VSPATH}/vc/atlmfc/lib/amd64:/c/tools/sdks/dx10/lib/x64
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/caps/DomainPolicy.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/caps/DomainPolicy.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/caps/DomainPolicy.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/caps/DomainPolicy.h	2015-04-24 19:31:01.000000000 +0000
@@ -13,10 +13,6 @@
 
 namespace mozilla {
 
-namespace dom {
-class nsIContentParent;
-};
-
 namespace ipc {
 class URIParams;
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/caps/nsJSPrincipals.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/caps/nsJSPrincipals.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/caps/nsJSPrincipals.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/caps/nsJSPrincipals.h	2015-04-24 19:31:01.000000000 +0000
@@ -9,8 +9,6 @@
 #include "jsapi.h"
 #include "nsIPrincipal.h"
 
-class nsCString;
-
 struct nsJSPrincipals : nsIPrincipal, JSPrincipals
 {
   static bool Subsume(JSPrincipals *jsprin, JSPrincipals *other);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/caps/nsPrincipal.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/caps/nsPrincipal.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/caps/nsPrincipal.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/caps/nsPrincipal.h	2015-04-24 19:31:01.000000000 +0000
@@ -15,9 +15,6 @@
 #include "nsNetUtil.h"
 #include "nsScriptSecurityManager.h"
 
-class nsIObjectInputStream;
-class nsIObjectOutputStream;
-
 class nsBasePrincipal : public nsJSPrincipals
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/caps/nsScriptSecurityManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/caps/nsScriptSecurityManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/caps/nsScriptSecurityManager.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/caps/nsScriptSecurityManager.h	2015-04-24 19:31:01.000000000 +0000
@@ -17,13 +17,10 @@
 
 #include <stdint.h>
 
-class nsIDocShell;
 class nsCString;
-class nsIClassInfo;
 class nsIIOService;
 class nsIStringBundle;
 class nsSystemPrincipal;
-class ClassInfoData;
 
 /////////////////////////////
 // nsScriptSecurityManager //
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/CLOBBER thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/CLOBBER
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/CLOBBER	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/CLOBBER	2015-04-24 19:30:50.000000000 +0000
@@ -22,8 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1155718: Merge Bluetooth v1/v2 files for all simple cases
-
-This patch set renames source files. This requires updating the
-build system's dependency information from scratch. The issue has
-been reported in bug 1154232.
+Bug 1039866: Removing the metro browser
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/config/external/nss/nss.def thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/config/external/nss/nss.def
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/config/external/nss/nss.def	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/config/external/nss/nss.def	2015-04-24 19:31:01.000000000 +0000
@@ -111,6 +111,7 @@
 CERT_GetDefaultCertDB
 CERT_GetFirstEmailAddress
 CERT_GetGeneralNameTypeFromString
+CERT_GetImposedNameConstraints
 CERT_GetLocalityName
 CERT_GetNextEmailAddress
 CERT_GetNextGeneralName
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/config/recurse.mk thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/config/recurse.mk
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/config/recurse.mk	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/config/recurse.mk	2015-04-24 19:31:01.000000000 +0000
@@ -49,7 +49,7 @@
 # The rules here are doing directory traversal, so we don't want further
 # recursion to happen when running make -C subdir $tier. But some make files
 # further call make -C something else, and sometimes expect recursion to
-# happen in that case (see browser/metro/locales/Makefile.in for example).
+# happen in that case.
 # Conveniently, every invocation of make increases MAKELEVEL, so only stop
 # recursion from happening at current MAKELEVEL + 1.
 ifdef CURRENT_TIER
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/configure.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/configure.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/configure.in	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/configure.in	2015-04-24 19:31:01.000000000 +0000
@@ -448,20 +448,6 @@
 dnl Special win32 checks
 dnl ========================================================
 
-MOZ_ARG_ENABLE_BOOL(metro,
-[  --enable-metro           Enable Windows Metro build targets],
-    MOZ_METRO=1,
-    MOZ_METRO=)
-if test -n "$MOZ_METRO"; then
-    AC_DEFINE(MOZ_METRO)
-    # toolkit/library/makefile.in needs these, see nsDllMain.
-    CRTDLLVERSION=110
-    CRTEXPDLLVERSION=1-1-0
-fi
-
-AC_SUBST(CRTDLLVERSION)
-AC_SUBST(CRTEXPDLLVERSION)
-
 # Target the Windows 8.1 SDK by default
 WINSDK_TARGETVER=603
 WINVER=502
@@ -574,16 +560,6 @@
           WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd`
         fi
 
-        dnl Confirm we have the pri tools on win8 builds
-        if test -n "$MOZ_METRO"; then
-          AC_MSG_CHECKING([for makepri])
-          AC_CHECK_PROGS(MAKEPRI, makepri, "")
-          if test -z "MAKEPRI" ; then
-              AC_MSG_ERROR([makepri.exe is required for generating metro browser install components. It should be in the Win8 SDK.])
-          fi
-          AC_SUBST(MAKEPRI)
-        fi
-
         dnl Ensure that mt.exe is 'Microsoft (R) Manifest Tool',
         dnl not something else like "magnetic tape manipulation utility".
         MSMT_TOOL=`${MT-mt} 2>&1|grep 'Microsoft (R) Manifest Tool'`
@@ -3912,6 +3888,7 @@
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_ANDROID_SHARE_OVERLAY=
+MOZ_INSTALL_TRACKING=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_SIMPLEPUSH=
@@ -4051,6 +4028,13 @@
 AC_SUBST(MOZ_BING_API_CLIENTID)
 AC_SUBST(MOZ_BING_API_KEY)
 
+# Allow specifying an Adjust SDK key file that contains the app token used for
+# Adjust SDK requests.
+MOZ_ARG_WITH_STRING(adjust-sdk-keyfile,
+[  --with-adjust-sdk-keyfile=file   Use the app token contained in the given keyfile for Adjust SDK requests],
+  MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN=`cat $withval`)
+AC_SUBST(MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN)
+
 # Whether to include optional-but-large font files in the final APK.
 # We want this in mobile/android/confvars.sh, so it goes early.
 MOZ_ARG_DISABLE_BOOL(android-include-fonts,
@@ -4977,6 +4961,13 @@
 fi
 
 dnl ========================================================
+dnl = Include install tracking on Android
+dnl ========================================================
+if test -n "$MOZ_INSTALL_TRACKING"; then
+    AC_DEFINE(MOZ_INSTALL_TRACKING)
+fi
+
+dnl ========================================================
 dnl = Enable IPDL's "expensive" unit tests
 dnl ========================================================
 MOZ_IPDL_TESTS=
@@ -8466,8 +8457,6 @@
 AC_SUBST(MOZ_D3DCOMPILER_XP_DLL)
 AC_SUBST(MOZ_D3DCOMPILER_XP_CAB)
 
-AC_SUBST(MOZ_METRO)
-
 AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_ANDROID_BEAM)
@@ -8480,6 +8469,7 @@
 AC_SUBST(MOZ_ANDROID_TAB_QUEUE)
 AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
 AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
+AC_SUBST(MOZ_INSTALL_TRACKING)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)
@@ -9214,6 +9204,7 @@
 export JS_STANDALONE=no
 export MOZ_LINKER
 export ZLIB_IN_MOZGLUE
+export MOZ_MEMORY
 
 if ! test -e js; then
     mkdir js
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/IHistory.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/IHistory.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/IHistory.h	2015-04-22 13:05:41.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/IHistory.h	2015-04-24 19:31:01.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsISupports.h"
 
 class nsIURI;
-class nsString;
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/LoadContext.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/LoadContext.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/LoadContext.h	2015-04-22 13:05:41.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/LoadContext.h	2015-04-24 19:31:01.000000000 +0000
@@ -14,8 +14,6 @@
 #include "nsIInterfaceRequestor.h"
 #include "nsILoadContext.h"
 
-class mozIApplication;
-
 namespace mozilla {
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/nsDocShell.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/nsDocShell.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/nsDocShell.cpp	2015-04-22 13:05:41.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/nsDocShell.cpp	2015-04-24 19:31:01.000000000 +0000
@@ -5087,7 +5087,8 @@
       }
     }
   } else if (NS_ERROR_PHISHING_URI == aError ||
-             NS_ERROR_MALWARE_URI == aError) {
+             NS_ERROR_MALWARE_URI == aError ||
+             NS_ERROR_UNWANTED_URI == aError) {
     nsAutoCString host;
     aURI->GetHost(host);
     CopyUTF8toUTF16(host, formatStrs[0]);
@@ -5106,14 +5107,19 @@
       error.AssignLiteral("phishingBlocked");
       bucketId = IsFrame() ? nsISecurityUITelemetry::WARNING_PHISHING_PAGE_FRAME
                            : nsISecurityUITelemetry::WARNING_PHISHING_PAGE_TOP;
-    } else {
+    } else if (NS_ERROR_MALWARE_URI == aError) {
       error.AssignLiteral("malwareBlocked");
       bucketId = IsFrame() ? nsISecurityUITelemetry::WARNING_MALWARE_PAGE_FRAME
                            : nsISecurityUITelemetry::WARNING_MALWARE_PAGE_TOP;
+    } else {
+      error.AssignLiteral("unwantedBlocked");
+      bucketId = IsFrame() ? nsISecurityUITelemetry::WARNING_UNWANTED_PAGE_FRAME
+                           : nsISecurityUITelemetry::WARNING_UNWANTED_PAGE_TOP;
     }
 
-    if (errorPage.EqualsIgnoreCase("blocked"))
+    if (errorPage.EqualsIgnoreCase("blocked")) {
       Telemetry::Accumulate(Telemetry::SECURITY_UI, bucketId);
+    }
 
     cssClass.AssignLiteral("blacklist");
   } else if (NS_ERROR_CONTENT_CRASHED == aError) {
@@ -7824,6 +7830,7 @@
              aStatus == NS_ERROR_OFFLINE ||
              aStatus == NS_ERROR_MALWARE_URI ||
              aStatus == NS_ERROR_PHISHING_URI ||
+             aStatus == NS_ERROR_UNWANTED_URI ||
              aStatus == NS_ERROR_UNSAFE_CONTENT_TYPE ||
              aStatus == NS_ERROR_REMOTE_XUL ||
              aStatus == NS_ERROR_OFFLINE ||
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/nsDocShell.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/nsDocShell.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/nsDocShell.h	2015-04-22 13:05:41.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/nsDocShell.h	2015-04-24 19:31:01.000000000 +0000
@@ -88,7 +88,6 @@
 class nsIURILoader;
 class nsIWebBrowserFind;
 class nsIWidget;
-class ProfilerMarkerTracing;
 
 /* load commands were moved to nsIDocShell.h */
 /* load types were moved to nsDocShellLoadTypes.h */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/nsIContentViewerEdit.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/nsIContentViewerEdit.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/nsIContentViewerEdit.idl	2015-04-22 13:05:41.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/nsIContentViewerEdit.idl	2015-04-24 19:31:01.000000000 +0000
@@ -6,7 +6,9 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(AF13EA3A-D488-4308-B843-526E055AB943)]
+interface nsIDOMNode;
+
+[scriptable, uuid(35BE2D7E-F29B-48EC-BF7E-80A30A724DE3)]
 interface nsIContentViewerEdit : nsISupports
 {
 	void clearSelection();
@@ -27,4 +29,8 @@
 
 	AString getContents(in string aMimeType, in boolean aSelectionOnly);
 	readonly attribute boolean canGetContents;
+
+	// Set the node that will be the subject of the editing commands above.
+	// Usually this will be the node that was context-clicked.
+	void setCommandNode(in nsIDOMNode aNode);
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/nsILinkHandler.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/nsILinkHandler.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/base/nsILinkHandler.h	2015-04-22 13:05:41.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/base/nsILinkHandler.h	2015-04-24 19:31:01.000000000 +0000
@@ -13,7 +13,6 @@
 class nsIDocShell;
 class nsIInputStream;
 class nsIRequest;
-class nsString;
 
 // Interface ID for nsILinkHandler
 #define NS_ILINKHANDLER_IID \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/resources/content/netError.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/resources/content/netError.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/docshell/resources/content/netError.xhtml	2015-04-22 13:05:41.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/docshell/resources/content/netError.xhtml	2015-04-24 19:31:01.000000000 +0000
@@ -291,6 +291,7 @@
         <h1 id="et_nssFailure2">&nssFailure2.title;</h1>
         <h1 id="et_nssBadCert">&nssBadCert.title;</h1>
         <h1 id="et_malwareBlocked">&malwareBlocked.title;</h1>
+        <h1 id="et_unwantedBlocked">&unwantedBlocked.title;</h1>
         <h1 id="et_cspBlocked">&cspBlocked.title;</h1>
         <h1 id="et_remoteXUL">&remoteXUL.title;</h1>
         <h1 id="et_corruptedContentError">&corruptedContentError.title;</h1>
@@ -317,6 +318,7 @@
         <div id="ed_nssFailure2">&nssFailure2.longDesc2;</div>
         <div id="ed_nssBadCert">&nssBadCert.longDesc2;</div>
         <div id="ed_malwareBlocked">&malwareBlocked.longDesc;</div>
+        <div id="ed_unwantedBlocked">&unwantedBlocked.longDesc;</div>
         <div id="ed_cspBlocked">&cspBlocked.longDesc;</div>
         <div id="ed_remoteXUL">&remoteXUL.longDesc;</div>
         <div id="ed_corruptedContentError">&corruptedContentError.longDesc;</div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/Animation.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/Animation.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/Animation.cpp	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/Animation.cpp	2015-04-24 19:31:01.000000000 +0000
@@ -218,6 +218,32 @@
 }
 
 void
+Animation::Finish(ErrorResult& aRv)
+{
+  // https://w3c.github.io/web-animations/#finish-an-animation
+
+  if (mPlaybackRate == 0 ||
+      (mPlaybackRate > 0 && EffectEnd() == TimeDuration::Forever())) {
+    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    return;
+  }
+
+  TimeDuration limit =
+    mPlaybackRate > 0 ? TimeDuration(EffectEnd()) : TimeDuration(0);
+
+  SetCurrentTime(limit);
+
+  if (mPendingState == PendingState::PlayPending) {
+    CancelPendingTasks();
+    if (mReady) {
+      mReady->MaybeResolve(this);
+    }
+  }
+  UpdateFinishedState(true);
+  PostUpdate();
+}
+
+void
 Animation::Play(LimitBehavior aLimitBehavior)
 {
   DoPlay(aLimitBehavior);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/Animation.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/Animation.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/Animation.h	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/Animation.h	2015-04-24 19:31:01.000000000 +0000
@@ -94,6 +94,7 @@
   AnimationPlayState PlayState() const;
   virtual Promise* GetReady(ErrorResult& aRv);
   virtual Promise* GetFinished(ErrorResult& aRv);
+  virtual void Finish(ErrorResult& aRv);
   virtual void Play(LimitBehavior aLimitBehavior);
   virtual void Pause();
   bool IsRunningOnCompositor() const { return mIsRunningOnCompositor; }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-animations/test_animation-currenttime.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-animations/test_animation-currenttime.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-animations/test_animation-currenttime.html	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-animations/test_animation-currenttime.html	2015-04-24 19:31:01.000000000 +0000
@@ -83,112 +83,6 @@
 const FIFTY_PCT_POSITION = 150;
 const END_POSITION = 200;
 
-/**
- * CSS animation events fire asynchronously after we set 'startTime'. This
- * helper class allows us to handle such events using Promises.
- *
- * To use this class:
- *
- *   var eventWatcher = new EventWatcher(watchedNode, eventTypes);
- *   eventWatcher.waitForEvent(eventType).then(function() {
- *     // Promise fulfilled
- *     checkStuff();
- *     makeSomeChanges();
- *     return eventWatcher.waitForEvent(nextEventType);
- *   }).then(function() {
- *     // Promise fulfilled
- *     checkMoreStuff();
- *     eventWatcher.stopWatching(); // all done - stop listening for events
- *   });
- *
- * This class will assert_unreached() if an event occurs when there is no
- * Promise created by a waitForEvent() call waiting to be fulfilled, or if the
- * event is of a different type to the type passed to waitForEvent. This helps
- * provide test coverage to ensure that only events that are expected occur, in
- * the correct order and with the correct timing. It also helps vastly simplify
- * the already complex code below by avoiding lots of gnarly error handling
- * code.
- */
-function EventWatcher(watchedNode, eventTypes)
-{
-  if (typeof eventTypes == 'string') {
-    eventTypes = [eventTypes];
-  }
-
-  var waitingFor = null;
-
-  function eventHandler(evt) {
-    if (!waitingFor) {
-      assert_unreached('Not expecting event, but got: ' + evt.type +
-        ' targeting element #' + evt.target.getAttribute('id'));
-      return;
-    }
-    if (evt.type != waitingFor.types[0]) {
-      assert_unreached('Expected ' + waitingFor.types[0] + ' event but got ' +
-                        evt.type + ' event');
-      return;
-    }
-    if (waitingFor.types.length > 1) {
-      // Pop first event from array
-      waitingFor.types.shift();
-      return;
-    }
-    // We need to null out waitingFor before calling the resolve function since
-    // the Promise's resolve handlers may call waitForEvent() which will need
-    // to set waitingFor.
-    var resolveFunc = waitingFor.resolve;
-    waitingFor = null;
-    resolveFunc(evt);
-  }
-
-  for (var i = 0; i < eventTypes.length; i++) {
-    watchedNode.addEventListener(eventTypes[i], eventHandler);
-  }
-
-  this.waitForEvent = function(type) {
-    if (typeof type != 'string') {
-      return Promise.reject('Event type not a string');
-    }
-    return this.waitForEvents([type]);
-  };
-
-  /**
-   * This is useful when two events are expected to fire one immediately after
-   * the other. This happens when we skip over the entire active interval for
-   * instance. In this case an 'animationstart' and an 'animationend' are fired
-   * and due to the asynchronous nature of Promise callbacks this won't work:
-   *
-   *   eventWatcher.waitForEvent('animationstart').then(function() {
-   *     return waitForEvent('animationend');
-   *   }).then(...);
-   *
-   * It doesn't work because the 'animationend' listener is added too late,
-   * because the resolve handler for the first Promise is called asynchronously
-   * some time after the 'animationstart' event is called, rather than at the
-   * time the event reaches the watched element.
-   */
-  this.waitForEvents = function(types) {
-    if (waitingFor) {
-      return Promise.reject('Already waiting for an event');
-    }
-    return new Promise(function(resolve, reject) {
-      waitingFor = {
-        types: types,
-        resolve: resolve,
-        reject: reject
-      };
-    });
-  };
-
-  this.stopWatching = function() {
-    for (var i = 0; i < eventTypes.length; i++) {
-      watchedNode.removeEventListener(eventTypes[i], eventHandler);
-    }
-  };
-
-  return this;
-}
-
 // The terms used for the naming of the following helper functions refer to
 // terms used in the Web Animations specification for specific phases of an
 // animation. The terms can be found here:
@@ -336,7 +230,7 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
 
   div.style.animation = ANIM_PROPERTY_VAL;
 
@@ -347,7 +241,7 @@
 
     animation.currentTime =
       currentTimeForStartOfActiveInterval(animation.timeline);
-    return eventWatcher.waitForEvent('animationstart');
+    return eventWatcher.wait_for('animationstart');
   })).then(t.step_func(function() {
     checkStateAtActiveIntervalStartTime(animation);
 
@@ -357,11 +251,9 @@
 
     animation.currentTime =
       currentTimeForEndOfActiveInterval(animation.timeline);
-    return eventWatcher.waitForEvent('animationend');
+    return eventWatcher.wait_for('animationend');
   })).then(t.step_func(function() {
     checkStateAtActiveIntervalEndTime(animation);
-
-    eventWatcher.stopWatching();
   })).catch(t.step_func(function(reason) {
     assert_unreached(reason);
   })).then(function() {
@@ -372,7 +264,7 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
 
   div.style.animation = ANIM_PROPERTY_VAL;
 
@@ -389,8 +281,8 @@
   // an 'animationend' event. We need to wait for these events before we start
   // testing going backwards since EventWatcher will fail the test if it gets
   // an event that we haven't told it about.
-  eventWatcher.waitForEvents(['animationstart',
-                              'animationend']).then(t.step_func(function() {
+  eventWatcher.wait_for(['animationstart',
+                         'animationend']).then(t.step_func(function() {
     assert_true(document.timeline.currentTime - previousTimelineTime <
                   ANIM_DUR_MS,
                 'Sanity check that seeking worked rather than the events ' +
@@ -410,9 +302,9 @@
     //
     // Calling checkStateAtFiftyPctOfActiveInterval will check computed style,
     // causing computed style to be updated and the 'animationstart' event to
-    // be dispatched synchronously. We need to call waitForEvent first
+    // be dispatched synchronously. We need to call wait_for first
     // otherwise eventWatcher will assert that the event was unexpected.
-    var promise = eventWatcher.waitForEvent('animationstart');
+    var promise = eventWatcher.wait_for('animationstart');
     checkStateAtFiftyPctOfActiveInterval(animation);
     return promise;
   })).then(t.step_func(function() {
@@ -424,11 +316,9 @@
     // Despite going backwards from just after the active interval starts to
     // the animation start time, we now expect an animationend event
     // because we went from inside to outside the active interval.
-    return eventWatcher.waitForEvent('animationend');
+    return eventWatcher.wait_for('animationend');
   })).then(t.step_func(function() {
     checkStateOnReadyPromiseResolved(animation);
-
-    eventWatcher.stopWatching();
   })).catch(t.step_func(function(reason) {
     assert_unreached(reason);
   })).then(function() {
@@ -454,7 +344,7 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
@@ -462,14 +352,13 @@
   animation.currentTime = currentTimeForBeforePhase(animation.timeline);
 
   waitForAnimationFrames(2).then(function() {
-    eventWatcher.stopWatching();
     t.done();
   });
 }, 'Redundant change, before -> active, then back');
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
@@ -477,23 +366,21 @@
   animation.currentTime = currentTimeForBeforePhase(animation.timeline);
 
   waitForAnimationFrames(2).then(function() {
-    eventWatcher.stopWatching();
     t.done();
   });
 }, 'Redundant change, before -> after, then back');
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
-  eventWatcher.waitForEvent('animationstart').then(function() {
+  eventWatcher.wait_for('animationstart').then(function() {
     animation.currentTime = currentTimeForBeforePhase(animation.timeline);
     animation.currentTime = currentTimeForActivePhase(animation.timeline);
 
     waitForAnimationFrames(2).then(function() {
-      eventWatcher.stopWatching();
       t.done();
     });
   });
@@ -503,16 +390,15 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
-  eventWatcher.waitForEvent('animationstart').then(function() {
+  eventWatcher.wait_for('animationstart').then(function() {
     animation.currentTime = currentTimeForAfterPhase(animation.timeline);
     animation.currentTime = currentTimeForActivePhase(animation.timeline);
 
     waitForAnimationFrames(2).then(function() {
-      eventWatcher.stopWatching();
       t.done();
     });
   });
@@ -522,17 +408,16 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
-  eventWatcher.waitForEvents(['animationstart',
-                              'animationend']).then(function() {
+  eventWatcher.wait_for(['animationstart',
+                         'animationend']).then(function() {
     animation.currentTime = currentTimeForBeforePhase(animation.timeline);
     animation.currentTime = currentTimeForAfterPhase(animation.timeline);
 
     waitForAnimationFrames(2).then(function() {
-      eventWatcher.stopWatching();
       t.done();
     });
   });
@@ -542,17 +427,16 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
-  eventWatcher.waitForEvents(['animationstart',
-                              'animationend']).then(function() {
+  eventWatcher.wait_for(['animationstart',
+                         'animationend']).then(function() {
     animation.currentTime = currentTimeForActivePhase(animation.timeline);
     animation.currentTime = currentTimeForAfterPhase(animation.timeline);
 
     waitForAnimationFrames(2).then(function() {
-      eventWatcher.stopWatching();
       t.done();
     });
   });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-animations/test_animation-finished.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-animations/test_animation-finished.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-animations/test_animation-finished.html	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-animations/test_animation-finished.html	2015-04-24 19:31:01.000000000 +0000
@@ -77,7 +77,7 @@
 
   animation.currentTime = ANIM_DURATION;
 
-  animation.finished.then(function() {
+  animation.finished.then(t.step_func(function() {
     previousFinishedPromise = animation.finished;
     animation.playbackRate = -1;
     assert_not_equals(animation.finished, previousFinishedPromise,
@@ -85,7 +85,7 @@
                       'finished promise');
     animation.currentTime = 0;
     return animation.finished;
-  }).then(t.step_func(function() {
+  })).then(t.step_func(function() {
     previousFinishedPromise = animation.finished;
     animation.play();
     assert_not_equals(animation.finished, previousFinishedPromise,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-animations/test_animation-finish.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-animations/test_animation-finish.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-animations/test_animation-finish.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-animations/test_animation-finish.html	2015-04-24 19:31:01.000000000 +0000
@@ -0,0 +1,160 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../testcommon.js"></script>
+<div id="log"></div>
+<style>
+
+.animated-div {
+  margin-left: 10px;
+}
+
+@keyframes anim {
+  from { margin-left: 100px; }
+  to { margin-left: 200px; }
+}
+
+</style>
+<script>
+
+'use strict';
+
+const ANIM_PROP_VAL = 'anim 100s';
+const ANIM_DURATION = 100000; // ms
+
+test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL;
+  var animation = div.getAnimations()[0];
+
+  animation.playbackRate = 0;
+
+  var threw = false;
+  try {
+    animation.finish();
+  } catch (e) {
+    threw = true;
+    assert_equals(e.name, 'InvalidStateError',
+                  'Exception should be an InvalidStateError exception when ' +
+                  'trying to finish an animation with playbackRate == 0');
+  }
+  assert_true(threw,
+              'Expect InvalidStateError exception trying to finish an ' +
+              'animation with playbackRate == 0');
+}, 'Test exceptions when finishing non-running animation');
+
+test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL;
+  div.style.animationIterationCount = 'infinite';
+  var animation = div.getAnimations()[0];
+
+  var threw = false;
+  try {
+    animation.finish();
+  } catch (e) {
+    threw = true;
+    assert_equals(e.name, 'InvalidStateError',
+                  'Exception should be an InvalidStateError exception when ' +
+                  'trying to finish an infinite animation');
+  }
+  assert_true(threw,
+              'Expect InvalidStateError exception trying to finish an ' +
+              'infinite animation');
+}, 'Test exceptions when finishing infinite animation');
+
+test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL;
+  var animation = div.getAnimations()[0];
+
+  animation.finish();
+  assert_equals(animation.currentTime, ANIM_DURATION,
+                'After finishing, the currentTime should be set to the end ' +
+                'of the active duration');
+}, 'Test finishing of animation');
+
+test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL;
+  var animation = div.getAnimations()[0];
+
+  animation.currentTime = ANIM_DURATION + 1000; // 1s past effect end
+
+  animation.finish();
+  assert_equals(animation.currentTime, ANIM_DURATION,
+                'After finishing, the currentTime should be set back to the ' +
+                'end of the active duration');
+}, 'Test finishing of animation with a current time past the effect end');
+
+async_test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL;
+  var animation = div.getAnimations()[0];
+
+  animation.currentTime = ANIM_DURATION;
+
+  animation.finished.then(t.step_func(function() {
+    animation.playbackRate = -1;
+    animation.finish();
+    assert_equals(animation.currentTime, 0,
+                  'After finishing a reversed animation the currentTime ' +
+                  'should be set to zero');
+    t.done();
+  }));
+}, 'Test finishing of reversed animation');
+
+async_test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL;
+  var animation = div.getAnimations()[0];
+
+  animation.currentTime = ANIM_DURATION;
+
+  animation.finished.then(t.step_func(function() {
+    animation.playbackRate = -1;
+
+    animation.currentTime = -1000;
+
+    animation.finish();
+    assert_equals(animation.currentTime, 0,
+                  'After finishing a reversed animation the currentTime ' +
+                  'should be set back to zero');
+    t.done();
+  }));
+}, 'Test finishing of reversed animation with with a current time less ' +
+   'than zero');
+
+async_test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL;
+  var animation = div.getAnimations()[0];
+
+  animation.pause();
+
+  animation.ready.then(t.step_func(function() {
+    animation.finish();
+    assert_equals(animation.playState, 'paused',
+                  'The play state of a paused animation should remain ' +
+                  '"paused" even after finish() is called');
+    t.done();
+  }));
+}, 'Test paused state after finishing of animation');
+
+async_test(function(t) {
+  var div = addDiv(t, {'class': 'animated-div'});
+  div.style.animation = ANIM_PROP_VAL;
+  var animation = div.getAnimations()[0];
+
+  animation.ready.then(t.step_func(function() {
+    animation.finish();
+    var marginLeft = parseFloat(getComputedStyle(div).marginLeft);
+    assert_equals(marginLeft, 10,
+                  'The computed style should be reset when finish() is ' +
+                  'called');
+    t.done();
+  }));
+}, 'Test resetting of computed style');
+
+</script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-animations/test_animation-ready.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-animations/test_animation-ready.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-animations/test_animation-ready.html	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-animations/test_animation-ready.html	2015-04-24 19:31:02.000000000 +0000
@@ -44,13 +44,13 @@
   var animation = div.getAnimations()[0];
 
   var originalReadyPromise = animation.ready;
-  animation.ready.then(function() {
+  animation.ready.then(t.step_func(function() {
     div.style.animationPlayState = 'running';
     assert_not_equals(animation.ready, originalReadyPromise,
                       'After updating animation-play-state a new ready promise'
                       + ' object is created');
     t.done();
-  });
+  }));
 }, 'A new ready promise is created when setting animation-play-state: running');
 
 async_test(function(t) {
@@ -58,14 +58,14 @@
   div.style.animation = 'abc 100s';
   var animation = div.getAnimations()[0];
 
-  animation.ready.then(function() {
+  animation.ready.then(t.step_func(function() {
     var promiseBeforeCallingPlay = animation.ready;
     animation.play();
     assert_equals(animation.ready, promiseBeforeCallingPlay,
                   'Ready promise has same object identity after redundant call'
                   + ' to play()');
     t.done();
-  });
+  }));
 }, 'Redundant calls to play() do not generate new ready promise objects');
 
 async_test(function(t) {
@@ -73,12 +73,12 @@
   div.style.animation = 'abc 100s';
   var animation = div.getAnimations()[0];
 
-  animation.ready.then(function(resolvedAnimation) {
+  animation.ready.then(t.step_func(function(resolvedAnimation) {
     assert_equals(resolvedAnimation, animation,
                   'Object identity of Animation passed to Promise callback'
                   + ' matches the Animation object owning the Promise');
     t.done();
-  });
+  }));
 }, 'The ready promise is fulfilled with its Animation');
 
 async_test(function(t) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-animations/test_animation-starttime.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-animations/test_animation-starttime.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-animations/test_animation-starttime.html	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-animations/test_animation-starttime.html	2015-04-24 19:31:02.000000000 +0000
@@ -83,112 +83,6 @@
 const FIFTY_PCT_POSITION = 150;
 const END_POSITION = 200;
 
-/**
- * CSS animation events fire asynchronously after we set 'startTime'. This
- * helper class allows us to handle such events using Promises.
- *
- * To use this class:
- *
- *   var eventWatcher = new EventWatcher(watchedNode, eventTypes);
- *   eventWatcher.waitForEvent(eventType).then(function() {
- *     // Promise fulfilled
- *     checkStuff();
- *     makeSomeChanges();
- *     return eventWatcher.waitForEvent(nextEventType);
- *   }).then(function() {
- *     // Promise fulfilled
- *     checkMoreStuff();
- *     eventWatcher.stopWatching(); // all done - stop listening for events
- *   });
- *
- * This class will assert_unreached() if an event occurs when there is no
- * Promise created by a waitForEvent() call waiting to be fulfilled, or if the
- * event is of a different type to the type passed to waitForEvent. This helps
- * provide test coverage to ensure that only events that are expected occur, in
- * the correct order and with the correct timing. It also helps vastly simplify
- * the already complex code below by avoiding lots of gnarly error handling
- * code.
- */
-function EventWatcher(watchedNode, eventTypes)
-{
-  if (typeof eventTypes == 'string') {
-    eventTypes = [eventTypes];
-  }
-
-  var waitingFor = null;
-
-  function eventHandler(evt) {
-    if (!waitingFor) {
-      assert_unreached('Not expecting event, but got: ' + evt.type +
-        ' targeting element #' + evt.target.getAttribute('id'));
-      return;
-    }
-    if (evt.type != waitingFor.types[0]) {
-      assert_unreached('Expected ' + waitingFor.types[0] + ' event but got ' +
-                        evt.type + ' event');
-      return;
-    }
-    if (waitingFor.types.length > 1) {
-      // Pop first event from array
-      waitingFor.types.shift();
-      return;
-    }
-    // We need to null out waitingFor before calling the resolve function since
-    // the Promise's resolve handlers may call waitForEvent() which will need
-    // to set waitingFor.
-    var resolveFunc = waitingFor.resolve;
-    waitingFor = null;
-    resolveFunc(evt);
-  }
-
-  for (var i = 0; i < eventTypes.length; i++) {
-    watchedNode.addEventListener(eventTypes[i], eventHandler);
-  }
-
-  this.waitForEvent = function(type) {
-    if (typeof type != 'string') {
-      return Promise.reject('Event type not a string');
-    }
-    return this.waitForEvents([type]);
-  };
-
-  /**
-   * This is useful when two events are expected to fire one immediately after
-   * the other. This happens when we skip over the entire active interval for
-   * instance. In this case an 'animationstart' and an 'animationend' are fired
-   * and due to the asynchronous nature of Promise callbacks this won't work:
-   *
-   *   eventWatcher.waitForEvent('animationstart').then(function() {
-   *     return waitForEvent('animationend');
-   *   }).then(...);
-   *
-   * It doesn't work because the 'animationend' listener is added too late,
-   * because the resolve handler for the first Promise is called asynchronously
-   * some time after the 'animationstart' event is called, rather than at the
-   * time the event reaches the watched element.
-   */
-  this.waitForEvents = function(types) {
-    if (waitingFor) {
-      return Promise.reject('Already waiting for an event');
-    }
-    return new Promise(function(resolve, reject) {
-      waitingFor = {
-        types: types,
-        resolve: resolve,
-        reject: reject
-      };
-    });
-  };
-
-  this.stopWatching = function() {
-    for (var i = 0; i < eventTypes.length; i++) {
-      watchedNode.removeEventListener(eventTypes[i], eventHandler);
-    }
-  };
-
-  return this;
-}
-
 // The terms used for the naming of the following helper functions refer to
 // terms used in the Web Animations specification for specific phases of an
 // animation. The terms can be found here:
@@ -390,7 +284,7 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
 
   div.style.animation = ANIM_PROPERTY_VAL;
 
@@ -400,7 +294,7 @@
     checkStateOnReadyPromiseResolved(animation);
 
     animation.startTime = startTimeForStartOfActiveInterval(animation.timeline);
-    return eventWatcher.waitForEvent('animationstart');
+    return eventWatcher.wait_for('animationstart');
   })).then(t.step_func(function() {
     checkStateAtActiveIntervalStartTime(animation);
 
@@ -409,11 +303,9 @@
     checkStateAtFiftyPctOfActiveInterval(animation);
 
     animation.startTime = startTimeForEndOfActiveInterval(animation.timeline);
-    return eventWatcher.waitForEvent('animationend');
+    return eventWatcher.wait_for('animationend');
   })).then(t.step_func(function() {
     checkStateAtActiveIntervalEndTime(animation);
-
-    eventWatcher.stopWatching();
   })).catch(t.step_func(function(reason) {
     assert_unreached(reason);
   })).then(function() {
@@ -424,7 +316,7 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
 
   div.style.animation = ANIM_PROPERTY_VAL;
 
@@ -438,8 +330,8 @@
   // an 'animationend' event. We need to wait for these events before we start
   // testing going backwards since EventWatcher will fail the test if it gets
   // an event that we haven't told it about.
-  eventWatcher.waitForEvents(['animationstart',
-                              'animationend']).then(t.step_func(function() {
+  eventWatcher.wait_for(['animationstart',
+                         'animationend']).then(t.step_func(function() {
     assert_true(document.timeline.currentTime - previousTimelineTime <
                   ANIM_DUR_MS,
                 'Sanity check that seeking worked rather than the events ' +
@@ -459,9 +351,9 @@
     //
     // Calling checkStateAtFiftyPctOfActiveInterval will check computed style,
     // causing computed style to be updated and the 'animationstart' event to
-    // be dispatched synchronously. We need to call waitForEvent first
+    // be dispatched synchronously. We need to call wait_for first
     // otherwise eventWatcher will assert that the event was unexpected.
-    var promise = eventWatcher.waitForEvent('animationstart');
+    var promise = eventWatcher.wait_for('animationstart');
     checkStateAtFiftyPctOfActiveInterval(animation);
     return promise;
   })).then(t.step_func(function() {
@@ -472,11 +364,9 @@
     // Despite going backwards from just after the active interval starts to
     // the animation start time, we now expect an animationend event
     // because we went from inside to outside the active interval.
-    return eventWatcher.waitForEvent('animationend');
+    return eventWatcher.wait_for('animationend');
   })).then(t.step_func(function() {
     checkStateOnReadyPromiseResolved(animation);
-
-    eventWatcher.stopWatching();
   })).catch(t.step_func(function(reason) {
     assert_unreached(reason);
   })).then(function() {
@@ -502,7 +392,7 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
@@ -510,14 +400,13 @@
   animation.startTime = startTimeForBeforePhase(animation.timeline);
 
   waitForAnimationFrames(2).then(function() {
-    eventWatcher.stopWatching();
     t.done();
   });
 }, 'Redundant change, before -> active, then back');
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
@@ -525,23 +414,21 @@
   animation.startTime = startTimeForBeforePhase(animation.timeline);
 
   waitForAnimationFrames(2).then(function() {
-    eventWatcher.stopWatching();
     t.done();
   });
 }, 'Redundant change, before -> after, then back');
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
-  eventWatcher.waitForEvent('animationstart').then(function() {
+  eventWatcher.wait_for('animationstart').then(function() {
     animation.startTime = startTimeForBeforePhase(animation.timeline);
     animation.startTime = startTimeForActivePhase(animation.timeline);
 
     waitForAnimationFrames(2).then(function() {
-      eventWatcher.stopWatching();
       t.done();
     });
   });
@@ -551,16 +438,15 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
-  eventWatcher.waitForEvent('animationstart').then(function() {
+  eventWatcher.wait_for('animationstart').then(function() {
     animation.startTime = startTimeForAfterPhase(animation.timeline);
     animation.startTime = startTimeForActivePhase(animation.timeline);
 
     waitForAnimationFrames(2).then(function() {
-      eventWatcher.stopWatching();
       t.done();
     });
   });
@@ -570,17 +456,16 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
-  eventWatcher.waitForEvents(['animationstart',
-                              'animationend']).then(function() {
+  eventWatcher.wait_for(['animationstart',
+                         'animationend']).then(function() {
     animation.startTime = startTimeForBeforePhase(animation.timeline);
     animation.startTime = startTimeForAfterPhase(animation.timeline);
 
     waitForAnimationFrames(2).then(function() {
-      eventWatcher.stopWatching();
       t.done();
     });
   });
@@ -590,17 +475,16 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+  var eventWatcher = new EventWatcher(t, div, CSS_ANIM_EVENTS);
   div.style.animation = ANIM_PROPERTY_VAL;
   var animation = div.getAnimations()[0];
 
-  eventWatcher.waitForEvents(['animationstart',
-                              'animationend']).then(function() {
+  eventWatcher.wait_for(['animationstart',
+                         'animationend']).then(function() {
     animation.startTime = startTimeForActivePhase(animation.timeline);
     animation.startTime = startTimeForAfterPhase(animation.timeline);
 
     waitForAnimationFrames(2).then(function() {
-      eventWatcher.stopWatching();
       t.done();
     });
   });
@@ -623,11 +507,11 @@
     return animation.ready;
   })).catch(t.step_func(function(reason) {
     assert_unreached(reason);
-  })).then(function() {
+  })).then(t.step_func(function() {
     assert_equals(animation.currentTime, storedCurrentTime,
       'Test that hold time is correct');
     t.done();
-  });
+  }));
 }, 'Setting startTime to null');
 
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-transitions/test_animation-currenttime.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-transitions/test_animation-currenttime.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-transitions/test_animation-currenttime.html	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-transitions/test_animation-currenttime.html	2015-04-24 19:31:02.000000000 +0000
@@ -73,111 +73,6 @@
 const FIFTY_PCT_POSITION = 150;
 const END_POSITION = 200;
 
-/**
- * CSS animation events fire asynchronously after we set 'startTime'. This
- * helper class allows us to handle such events using Promises.
- *
- * To use this class:
- *
- *   var eventWatcher = new EventWatcher(watchedNode, eventTypes);
- *   eventWatcher.waitForEvent(eventType).then(function() {
- *     // Promise fulfilled
- *     checkStuff();
- *     makeSomeChanges();
- *     return eventWatcher.waitForEvent(nextEventType);
- *   }).then(function() {
- *     // Promise fulfilled
- *     checkMoreStuff();
- *     eventWatcher.stopWatching(); // all done - stop listening for events
- *   });
- *
- * This class will assert_unreached() if an event occurs when there is no
- * Promise created by a waitForEvent() call waiting to be fulfilled, or if the
- * event is of a different type to the type passed to waitForEvent. This helps
- * provide test coverage to ensure that only events that are expected occur, in
- * the correct order and with the correct timing. It also helps vastly simplify
- * the already complex code below by avoiding lots of gnarly error handling
- * code.
- */
-function EventWatcher(watchedNode, eventTypes)
-{
-  if (typeof eventTypes == 'string') {
-    eventTypes = [eventTypes];
-  }
-
-  var waitingFor = null;
-
-  function eventHandler(evt) {
-    if (!waitingFor) {
-      assert_unreached('Not expecting event, but got: ' + evt.type +
-        ' targeting element #' + evt.target.getAttribute('id'));
-      return;
-    }
-    if (evt.type != waitingFor.types[0]) {
-      assert_unreached('Expected ' + waitingFor.types[0] + ' event but got ' +
-                        evt.type + ' event');
-      return;
-    }
-    if (waitingFor.types.length > 1) {
-      // Pop first event from array
-      waitingFor.types.shift();
-      return;
-    }
-    // We need to null out waitingFor before calling the resolve function since
-    // the Promise's resolve handlers may call waitForEvent() which will need
-    // to set waitingFor.
-    var resolveFunc = waitingFor.resolve;
-    waitingFor = null;
-    resolveFunc(evt);
-  }
-
-  for (var i = 0; i < eventTypes.length; i++) {
-    watchedNode.addEventListener(eventTypes[i], eventHandler);
-  }
-
-  this.waitForEvent = function(type) {
-    if (typeof type != 'string') {
-      return Promise.reject('Event type not a string');
-    }
-    return this.waitForEvents([type]);
-  };
-
-  /**
-   * This is useful when two events are expected to fire one immediately after
-   * the other. This happens when we skip over the entire active interval for
-   * instance. In this case an 'animationstart' and an 'animationend' are fired
-   * and due to the asynchronous nature of Promise callbacks this won't work:
-   *
-   *   eventWatcher.waitForEvent('animationstart').then(function() {
-   *     return waitForEvent('animationend');
-   *   }).then(...);
-   *
-   * It doesn't work because the 'animationend' listener is added too late,
-   * because the resolve handler for the first Promise is called asynchronously
-   * some time after the 'animationstart' event is called, rather than at the
-   * time the event reaches the watched element.
-   */
-  this.waitForEvents = function(types) {
-    if (waitingFor) {
-      return Promise.reject('Already waiting for an event');
-    }
-    return new Promise(function(resolve, reject) {
-      waitingFor = {
-        types: types,
-        resolve: resolve,
-        reject: reject
-      };
-    });
-  };
-
-  this.stopWatching = function() {
-    for (var i = 0; i < eventTypes.length; i++) {
-      watchedNode.removeEventListener(eventTypes[i], eventHandler);
-    }
-  };
-
-  return this;
-}
 
 // The terms used for the naming of the following helper functions refer to
 // terms used in the Web Animations specification for specific phases of an
@@ -300,7 +195,7 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, 'transitionend');
+  var eventWatcher = new EventWatcher(t, div, 'transitionend');
 
   flushComputedStyle(div);
   div.style.marginLeft = '200px'; // initiate transition
@@ -317,11 +212,9 @@
     checkStateAtFiftyPctOfActiveInterval(animation);
 
     animation.currentTime = currentTimeForEndOfActiveInterval();
-    return eventWatcher.waitForEvent('transitionend');
+    return eventWatcher.wait_for('transitionend');
   })).then(t.step_func(function() {
     checkStateAtActiveIntervalEndTime(animation);
-
-    eventWatcher.stopWatching();
   })).catch(t.step_func(function(reason) {
     assert_unreached(reason);
   })).then(function() {
@@ -332,7 +225,7 @@
 
 test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, 'transitionend');
+  var eventWatcher = new EventWatcher(t, div, 'transitionend');
 
   flushComputedStyle(div);
   div.style.marginLeft = '200px'; // initiate transition
@@ -356,10 +249,9 @@
     //
     // Calling checkStateAtActiveIntervalStartTime will check computed style,
     // causing computed style to be updated and the 'transitionend' event to
-    // be dispatched synchronously. We need to call waitForEvent first
+    // be dispatched synchronously. We need to call wait_for first
     // otherwise eventWatcher will assert that the event was unexpected.
-    eventWatcher.waitForEvent('transitionend').then(function() {
-      eventWatcher.stopWatching();
+    eventWatcher.wait_for('transitionend').then(function() {
       t.done();
     });
     checkStateAtActiveIntervalStartTime(animation);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-transitions/test_animation-finished.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-transitions/test_animation-finished.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-transitions/test_animation-finished.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-transitions/test_animation-finished.html	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,61 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../testcommon.js"></script>
+<div id="log"></div>
+<style>
+
+.animated-div {
+  margin-left: 100px;
+  transition: margin-left 1000s linear 1000s;
+}
+
+</style>
+<script>
+
+'use strict';
+
+const ANIM_DELAY_MS = 1000000; // 1000s
+const ANIM_DUR_MS = 1000000; // 1000s
+
+async_test(function(t) {
+  var div = addDiv(t, {'class': 'animated-div'});
+  flushComputedStyle(div);
+  div.style.marginLeft = '200px'; // initiate transition
+
+  var animation = div.getAnimations()[0];
+
+  animation.finish();
+
+  animation.finished.then(t.step_func(function() {
+    animation.play();
+    assert_equals(animation.currentTime, 0,
+                  'Replaying a finished transition should reset its ' +
+                  'currentTime');
+    t.done();
+  }));
+}, 'Test restarting a finished transition');
+
+async_test(function(t) {
+  var div = addDiv(t, {'class': 'animated-div'});
+  flushComputedStyle(div);
+  div.style.marginLeft = '200px'; // initiate transition
+
+  var animation = div.getAnimations()[0];
+
+  animation.ready.then(function() {
+    animation.playbackRate = -1;
+    return animation.finished;
+  }).then(t.step_func(function() {
+    animation.play();
+    // FIXME: once animation.effect.computedTiming.endTime is available (bug
+    // 1108055) we should use that here.
+    assert_equals(animation.currentTime, ANIM_DELAY_MS + ANIM_DUR_MS,
+                  'Replaying a finished reversed transition should reset ' +
+                  'its currentTime to the end of the effect');
+    t.done();
+  }));
+}, 'Test restarting a reversed finished transition');
+
+</script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-transitions/test_animation-starttime.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-transitions/test_animation-starttime.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/css-transitions/test_animation-starttime.html	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/css-transitions/test_animation-starttime.html	2015-04-24 19:31:02.000000000 +0000
@@ -73,112 +73,6 @@
 const FIFTY_PCT_POSITION = 150;
 const END_POSITION = 200;
 
-/**
- * CSS animation events fire asynchronously after we set 'startTime'. This
- * helper class allows us to handle such events using Promises.
- *
- * To use this class:
- *
- *   var eventWatcher = new EventWatcher(watchedNode, eventTypes);
- *   eventWatcher.waitForEvent(eventType).then(function() {
- *     // Promise fulfilled
- *     checkStuff();
- *     makeSomeChanges();
- *     return eventWatcher.waitForEvent(nextEventType);
- *   }).then(function() {
- *     // Promise fulfilled
- *     checkMoreStuff();
- *     eventWatcher.stopWatching(); // all done - stop listening for events
- *   });
- *
- * This class will assert_unreached() if an event occurs when there is no
- * Promise created by a waitForEvent() call waiting to be fulfilled, or if the
- * event is of a different type to the type passed to waitForEvent. This helps
- * provide test coverage to ensure that only events that are expected occur, in
- * the correct order and with the correct timing. It also helps vastly simplify
- * the already complex code below by avoiding lots of gnarly error handling
- * code.
- */
-function EventWatcher(watchedNode, eventTypes)
-{
-  if (typeof eventTypes == 'string') {
-    eventTypes = [eventTypes];
-  }
-
-  var waitingFor = null;
-
-  function eventHandler(evt) {
-    if (!waitingFor) {
-      assert_unreached('Not expecting event, but got: ' + evt.type +
-        ' targeting element #' + evt.target.getAttribute('id'));
-      return;
-    }
-    if (evt.type != waitingFor.types[0]) {
-      assert_unreached('Expected ' + waitingFor.types[0] + ' event but got ' +
-                        evt.type + ' event');
-      return;
-    }
-    if (waitingFor.types.length > 1) {
-      // Pop first event from array
-      waitingFor.types.shift();
-      return;
-    }
-    // We need to null out waitingFor before calling the resolve function since
-    // the Promise's resolve handlers may call waitForEvent() which will need
-    // to set waitingFor.
-    var resolveFunc = waitingFor.resolve;
-    waitingFor = null;
-    resolveFunc(evt);
-  }
-
-  for (var i = 0; i < eventTypes.length; i++) {
-    watchedNode.addEventListener(eventTypes[i], eventHandler);
-  }
-
-  this.waitForEvent = function(type) {
-    if (typeof type != 'string') {
-      return Promise.reject('Event type not a string');
-    }
-    return this.waitForEvents([type]);
-  };
-
-  /**
-   * This is useful when two events are expected to fire one immediately after
-   * the other. This happens when we skip over the entire active interval for
-   * instance. In this case an 'animationstart' and an 'animationend' are fired
-   * and due to the asynchronous nature of Promise callbacks this won't work:
-   *
-   *   eventWatcher.waitForEvent('animationstart').then(function() {
-   *     return waitForEvent('animationend');
-   *   }).then(...);
-   *
-   * It doesn't work because the 'animationend' listener is added too late,
-   * because the resolve handler for the first Promise is called asynchronously
-   * some time after the 'animationstart' event is called, rather than at the
-   * time the event reaches the watched element.
-   */
-  this.waitForEvents = function(types) {
-    if (waitingFor) {
-      return Promise.reject('Already waiting for an event');
-    }
-    return new Promise(function(resolve, reject) {
-      waitingFor = {
-        types: types,
-        resolve: resolve,
-        reject: reject
-      };
-    });
-  };
-
-  this.stopWatching = function() {
-    for (var i = 0; i < eventTypes.length; i++) {
-      watchedNode.removeEventListener(eventTypes[i], eventHandler);
-    }
-  };
-
-  return this;
-}
-
 // The terms used for the naming of the following helper functions refer to
 // terms used in the Web Animations specification for specific phases of an
 // animation. The terms can be found here:
@@ -277,7 +171,7 @@
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, 'transitionend');
+  var eventWatcher = new EventWatcher(t, div, 'transitionend');
 
   flushComputedStyle(div);
   div.style.marginLeft = '200px'; // initiate transition
@@ -295,11 +189,9 @@
     checkStateAtFiftyPctOfActiveInterval(animation);
 
     animation.startTime = startTimeForEndOfActiveInterval(animation.timeline);
-    return eventWatcher.waitForEvent('transitionend');
+    return eventWatcher.wait_for('transitionend');
   })).then(t.step_func(function() {
     checkStateAtActiveIntervalEndTime(animation);
-
-    eventWatcher.stopWatching();
   })).catch(t.step_func(function(reason) {
     assert_unreached(reason);
   })).then(function() {
@@ -310,7 +202,7 @@
 
 test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
-  var eventWatcher = new EventWatcher(div, 'transitionend');
+  var eventWatcher = new EventWatcher(t, div, 'transitionend');
 
   flushComputedStyle(div);
   div.style.marginLeft = '200px'; // initiate transition
@@ -336,8 +228,7 @@
   // causing computed style to be updated and the 'transitionend' event to
   // be dispatched synchronously. We need to call waitForEvent first
   // otherwise eventWatcher will assert that the event was unexpected.
-  eventWatcher.waitForEvent('transitionend').then(function() {
-    eventWatcher.stopWatching();
+  eventWatcher.wait_for('transitionend').then(function() {
     t.done();
   });
   checkStateAtActiveIntervalStartTime(animation);
@@ -360,11 +251,11 @@
     return animation.ready;
   })).catch(t.step_func(function(reason) {
     assert_unreached(reason);
-  })).then(function() {
+  })).then(t.step_func(function() {
     assert_equals(animation.currentTime, storedCurrentTime,
       'Test that hold time is correct');
     t.done();
-  });
+  }));
 }, 'Setting startTime to null');
 
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/animation/test/mochitest.ini	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/animation/test/mochitest.ini	2015-04-24 19:31:02.000000000 +0000
@@ -3,9 +3,10 @@
   testcommon.js
 
 [css-animations/test_animations-dynamic-changes.html]
-[css-animations/test_animation-pausing.html]
 [css-animations/test_animation-currenttime.html]
+[css-animations/test_animation-finish.html]
 [css-animations/test_animation-finished.html]
+[css-animations/test_animation-pausing.html]
 [css-animations/test_animation-playstate.html]
 [css-animations/test_animation-ready.html]
 [css-animations/test_animation-starttime.html]
@@ -13,8 +14,9 @@
 [css-animations/test_effect-target.html]
 [css-animations/test_element-get-animations.html]
 skip-if = buildapp == 'mulet'
-[css-transitions/test_animation-pausing.html]
 [css-transitions/test_animation-currenttime.html]
+[css-transitions/test_animation-finished.html]
+[css-transitions/test_animation-pausing.html]
 [css-transitions/test_animation-ready.html]
 [css-transitions/test_animation-starttime.html]
 [css-transitions/test_effect-name.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/DirectionalityUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/DirectionalityUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/DirectionalityUtils.h	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/DirectionalityUtils.h	2015-04-24 19:31:02.000000000 +0000
@@ -10,8 +10,6 @@
 #include "nscore.h"
 
 class nsIContent;
-class nsIDocument;
-class nsINode;
 class nsAString;
 class nsAttrValue;
 class nsTextNode;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/Element.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/Element.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/Element.h	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/Element.h	2015-04-24 19:31:02.000000000 +0000
@@ -37,16 +37,11 @@
 #include "mozilla/dom/ElementBinding.h"
 #include "Units.h"
 
-class nsIDOMEventListener;
 class nsIFrame;
 class nsIDOMMozNamedAttrMap;
-class nsIDOMCSSStyleDeclaration;
 class nsIURI;
-class nsIControllers;
-class nsEventChainVisitor;
 class nsIScrollableFrame;
 class nsAttrValueOrString;
-class ContentUnbinder;
 class nsContentList;
 class nsDOMSettableTokenList;
 class nsDOMTokenList;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/EventSource.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/EventSource.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/EventSource.cpp	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/EventSource.cpp	2015-04-24 19:31:02.000000000 +0000
@@ -796,7 +796,7 @@
 
   nsRefPtr<nsCORSListenerProxy> listener =
     new nsCORSListenerProxy(this, mPrincipal, mWithCredentials);
-  rv = listener->Init(mHttpChannel);
+  rv = listener->Init(mHttpChannel, DataURIHandling::Allow);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Start reading from the channel
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/File.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/File.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/File.h	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/File.h	2015-04-24 19:31:02.000000000 +0000
@@ -29,10 +29,8 @@
 #include "nsWrapperCache.h"
 #include "nsWeakReference.h"
 
-class nsDOMMultipartFile;
 class nsIFile;
 class nsIInputStream;
-class nsIClassInfo;
 
 #define FILEIMPL_IID \
   { 0xbccb3275, 0x6778, 0x4ac5, \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/ImportManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/ImportManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/ImportManager.cpp	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/ImportManager.cpp	2015-04-24 19:31:02.000000000 +0000
@@ -504,7 +504,7 @@
   nsRefPtr<nsCORSListenerProxy> corsListener =
     new nsCORSListenerProxy(this, principal,
                             /* aWithCredentials */ false);
-  rv = corsListener->Init(channel, true);
+  rv = corsListener->Init(channel, DataURIHandling::Allow);
   NS_ENSURE_SUCCESS_VOID(rv);
 
   rv = channel->AsyncOpen(corsListener, nullptr);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/ImportManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/ImportManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/ImportManager.h	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/ImportManager.h	2015-04-24 19:31:02.000000000 +0000
@@ -49,7 +49,6 @@
 #include "nsURIHashKey.h"
 
 class nsIDocument;
-class nsIChannel;
 class nsIPrincipal;
 class nsINode;
 class AutoError;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/moz.build	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/moz.build	2015-04-24 19:31:02.000000000 +0000
@@ -388,6 +388,13 @@
     'SlowScriptDebug.manifest',
 ]
 
+# Firefox for Android provides an alternate version of this component
+if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
+    EXTRA_COMPONENTS += [
+        'SiteSpecificUserAgent.js',
+        'SiteSpecificUserAgent.manifest',
+    ]
+
 EXTRA_JS_MODULES += [
     'DOMRequestHelper.jsm',
     'IndexedDBHelper.jsm',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/Navigator.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/Navigator.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/Navigator.cpp	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/Navigator.cpp	2015-04-24 19:31:02.000000000 +0000
@@ -118,6 +118,10 @@
 #include "mozilla/EMEUtils.h"
 #endif
 
+#ifdef MOZ_WIDGET_GONK
+#include <cutils/properties.h>
+#endif
+
 namespace mozilla {
 namespace dom {
 
@@ -1221,7 +1225,7 @@
                                                                principal,
                                                                true);
 
-  rv = cors->Init(channel, true);
+  rv = cors->Init(channel, DataURIHandling::Allow);
   NS_ENSURE_SUCCESS(rv, false);
 
   nsCOMPtr<nsINetworkInterceptController> interceptController = do_QueryInterface(docShell);
@@ -1453,6 +1457,17 @@
   } // hardware.memory
 #endif
 
+#ifdef MOZ_WIDGET_GONK
+  if (aName.EqualsLiteral("acl.version")) {
+    char value[PROPERTY_VALUE_MAX];
+    uint32_t len = property_get("persist.acl.version", value, nullptr);
+    if (len > 0) {
+      p->MaybeResolve(NS_ConvertUTF8toUTF16(value));
+      return p.forget();
+    }
+  }
+#endif
+
   p->MaybeResolve(JS::UndefinedHandleValue);
   return p.forget();
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsContentAreaDragDrop.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsContentAreaDragDrop.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsContentAreaDragDrop.h	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsContentAreaDragDrop.h	2015-04-24 19:31:02.000000000 +0000
@@ -12,15 +12,11 @@
 #include "nsIDOMEventListener.h"
 #include "nsITransferable.h"
 
-class nsIDOMNode;
 class nsPIDOMWindow;
-class nsIDOMDragEvent;
 class nsISelection;
 class nsITransferable;
 class nsIContent;
-class nsIURI;
 class nsIFile;
-class nsISimpleEnumerator;
 
 namespace mozilla {
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsContentCreatorFunctions.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsContentCreatorFunctions.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsContentCreatorFunctions.h	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsContentCreatorFunctions.h	2015-04-24 19:31:02.000000000 +0000
@@ -15,10 +15,8 @@
  * (mozilla/content and mozilla/layout).
  */
 
-class nsAString;
 class nsIContent;
 class imgRequestProxy;
-class nsNodeInfoManager;
 class nsGenericHTMLElement;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsContentSink.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsContentSink.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsContentSink.h	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsContentSink.h	2015-04-24 19:31:02.000000000 +0000
@@ -31,11 +31,9 @@
 class nsIURI;
 class nsIChannel;
 class nsIDocShell;
-class nsIParser;
 class nsIAtom;
 class nsIChannel;
 class nsIContent;
-class nsViewManager;
 class nsNodeInfoManager;
 class nsScriptLoader;
 class nsIApplicationCache;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsContentUtils.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsContentUtils.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsContentUtils.cpp	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsContentUtils.cpp	2015-04-24 19:31:02.000000000 +0000
@@ -7303,24 +7303,25 @@
             RefPtr<mozilla::gfx::SourceSurface> surface =
               image->GetFrame(imgIContainer::FRAME_CURRENT,
                               imgIContainer::FLAG_SYNC_DECODE);
+            if (surface) {
+              mozilla::RefPtr<mozilla::gfx::DataSourceSurface> dataSurface =
+                surface->GetDataSurface();
+              size_t length;
+              int32_t stride;
+              mozilla::UniquePtr<char[]> surfaceData =
+                nsContentUtils::GetSurfaceData(dataSurface, &length, &stride);
+              
+              IPCDataTransferItem* item = aIPCDataTransfer->items().AppendElement();
+              item->flavor() = nsCString(flavorStr);
+              item->data() = nsCString(surfaceData.get(), length);
 
-            mozilla::RefPtr<mozilla::gfx::DataSourceSurface> dataSurface =
-              surface->GetDataSurface();
-            size_t length;
-            int32_t stride;
-            mozilla::UniquePtr<char[]> surfaceData =
-              nsContentUtils::GetSurfaceData(dataSurface, &length, &stride);
-            
-            IPCDataTransferItem* item = aIPCDataTransfer->items().AppendElement();
-            item->flavor() = nsCString(flavorStr);
-            item->data() = nsCString(surfaceData.get(), length);
-
-            IPCDataTransferImage& imageDetails = item->imageDetails();
-            mozilla::gfx::IntSize size = dataSurface->GetSize();
-            imageDetails.width() = size.width;
-            imageDetails.height() = size.height;
-            imageDetails.stride() = stride;
-            imageDetails.format() = static_cast<uint8_t>(dataSurface->GetFormat());
+              IPCDataTransferImage& imageDetails = item->imageDetails();
+              mozilla::gfx::IntSize size = dataSurface->GetSize();
+              imageDetails.width() = size.width;
+              imageDetails.height() = size.height;
+              imageDetails.stride() = stride;
+              imageDetails.format() = static_cast<uint8_t>(dataSurface->GetFormat());
+            }
 
             continue;
           }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsContentUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsContentUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsContentUtils.h	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsContentUtils.h	2015-04-24 19:31:02.000000000 +0000
@@ -51,18 +51,14 @@
 class nsIContent;
 class nsIContentPolicy;
 class nsIContentSecurityPolicy;
-class nsIDocShell;
 class nsIDocument;
 class nsIDocumentLoaderFactory;
-class nsIDocumentObserver;
 class nsIDOMDocument;
 class nsIDOMDocumentFragment;
 class nsIDOMEvent;
-class nsIDOMHTMLFormElement;
 class nsIDOMHTMLInputElement;
 class nsIDOMKeyEvent;
 class nsIDOMNode;
-class nsIDOMScriptObjectFactory;
 class nsIDOMWindow;
 class nsIDragSession;
 class nsIEditor;
@@ -71,7 +67,6 @@
 class nsIImageLoadingContent;
 class nsIInterfaceRequestor;
 class nsIIOService;
-class nsIJSRuntimeService;
 class nsILineBreaker;
 class nsIMessageBroadcaster;
 class nsNameSpaceManager;
@@ -83,7 +78,6 @@
 class nsIRequest;
 class nsIRunnable;
 class nsIScriptContext;
-class nsIScriptGlobalObject;
 class nsIScriptSecurityManager;
 class nsIStringBundle;
 class nsIStringBundleService;
@@ -96,7 +90,6 @@
 class nsNodeInfoManager;
 class nsPIDOMWindow;
 class nsPresContext;
-class nsScriptObjectTracer;
 class nsStringBuffer;
 class nsStringHashKey;
 class nsTextFragment;
@@ -1885,7 +1878,7 @@
    *
    * Making the fullscreen API content only is useful on platforms where we
    * still want chrome to be visible or accessible while content is
-   * fullscreen, like on Windows 8 in Metro mode.
+   * fullscreen.
    *
    * Note that if the fullscreen API is content only, chrome can still go
    * fullscreen by setting the "fullScreen" attribute on its XUL window.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsDocument.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsDocument.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsDocument.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsDocument.h	2015-04-24 19:31:02.000000000 +0000
@@ -76,17 +76,12 @@
 
 
 class nsDOMStyleSheetSetList;
-class nsIOutputStream;
 class nsDocument;
-class nsIDTD;
 class nsIRadioVisitor;
 class nsIFormControl;
 struct nsRadioGroupStruct;
 class nsOnloadBlocker;
 class nsUnblockOnloadEvent;
-class nsChildContentList;
-class nsHTMLStyleSheet;
-class nsHTMLCSSStyleSheet;
 class nsDOMNavigationTiming;
 class nsWindowSizes;
 class nsHtml5TreeOpExecutor;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsDOMClassInfo.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsDOMClassInfo.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsDOMClassInfo.h	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsDOMClassInfo.h	2015-04-24 19:31:02.000000000 +0000
@@ -18,11 +18,8 @@
 #undef GetClassName
 #endif
 
-class nsContentList;
-class nsDocument;
 struct nsGlobalNameStruct;
 class nsGlobalWindow;
-class nsIScriptSecurityManager;
 
 struct nsDOMClassInfoData;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsDOMMutationObserver.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsDOMMutationObserver.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsDOMMutationObserver.cpp	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsDOMMutationObserver.cpp	2015-04-24 19:31:02.000000000 +0000
@@ -64,6 +64,13 @@
 
 // Observer
 
+bool
+nsMutationReceiverBase::IsObservable(nsIContent* aContent)
+{
+  return !aContent->ChromeOnlyAccess() &&
+    (Observer()->IsChrome() || !aContent->IsInAnonymousSubtree());
+}
+
 NS_IMPL_ADDREF(nsMutationReceiver)
 NS_IMPL_RELEASE(nsMutationReceiver)
 
@@ -111,8 +118,7 @@
                                         int32_t aModType)
 {
   if (nsAutoMutationBatch::IsBatching() ||
-      !ObservesAttr(aElement, aNameSpaceID, aAttribute) ||
-      aElement->ChromeOnlyAccess()) {
+      !ObservesAttr(RegisterTarget(), aElement, aNameSpaceID, aAttribute)) {
     return;
   }
 
@@ -147,14 +153,16 @@
                                             CharacterDataChangeInfo* aInfo)
 {
   if (nsAutoMutationBatch::IsBatching() ||
-      !CharacterData() || !(Subtree() || aContent == Target()) ||
-      aContent->ChromeOnlyAccess()) {
+      !CharacterData() ||
+      (!Subtree() && aContent != Target()) ||
+      (Subtree() && RegisterTarget()->SubtreeRoot() != aContent->SubtreeRoot()) ||
+      !IsObservable(aContent)) {
     return;
   }
-  
+
   nsDOMMutationRecord* m =
     Observer()->CurrentRecord(nsGkAtoms::characterData);
- 
+
   NS_ASSERTION(!m->mTarget || m->mTarget == aContent,
                "Wrong target!");
 
@@ -173,8 +181,11 @@
                                     int32_t aNewIndexInContainer)
 {
   nsINode* parent = NODE_FROM(aContainer, aDocument);
-  bool wantsChildList = ChildList() && (Subtree() || parent == Target());
-  if (!wantsChildList || aFirstNewContent->ChromeOnlyAccess()) {
+  bool wantsChildList =
+    ChildList() &&
+    ((Subtree() && RegisterTarget()->SubtreeRoot() == parent->SubtreeRoot()) ||
+     parent == Target());
+  if (!wantsChildList || !IsObservable(aFirstNewContent)) {
     return;
   }
 
@@ -211,8 +222,11 @@
                                     int32_t aIndexInContainer)
 {
   nsINode* parent = NODE_FROM(aContainer, aDocument);
-  bool wantsChildList = ChildList() && (Subtree() || parent == Target());
-  if (!wantsChildList || aChild->ChromeOnlyAccess()) {
+  bool wantsChildList =
+    ChildList() &&
+    ((Subtree() && RegisterTarget()->SubtreeRoot() == parent->SubtreeRoot()) ||
+     parent == Target());
+  if (!wantsChildList || !IsObservable(aChild)) {
     return;
   }
 
@@ -243,11 +257,14 @@
                                    int32_t aIndexInContainer,
                                    nsIContent* aPreviousSibling)
 {
-  if (aChild->ChromeOnlyAccess()) {
+  if (!IsObservable(aChild)) {
     return;
   }
 
   nsINode* parent = NODE_FROM(aContainer, aDocument);
+  if (Subtree() && parent->SubtreeRoot() != RegisterTarget()->SubtreeRoot()) {
+    return;
+  }
   if (nsAutoMutationBatch::IsBatching()) {
     if (nsAutoMutationBatch::IsRemovalDone()) {
       // This can happen for example if HTML parser parses to
@@ -265,7 +282,7 @@
     }
 
     return;
-  }                                                                   
+  }
 
   if (Subtree()) {
     // Try to avoid creating transient observer if the node
@@ -714,8 +731,9 @@
     return nullptr;
   }
   MOZ_ASSERT(window->IsInnerWindow());
+  bool isChrome = nsContentUtils::IsChromeDoc(window->GetExtantDoc());
   nsRefPtr<nsDOMMutationObserver> observer =
-    new nsDOMMutationObserver(window.forget(), aCb);
+    new nsDOMMutationObserver(window.forget(), aCb, isChrome);
   return observer.forget();
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsDOMMutationObserver.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsDOMMutationObserver.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsDOMMutationObserver.h	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsDOMMutationObserver.h	2015-04-24 19:31:02.000000000 +0000
@@ -248,14 +248,20 @@
     mRegisterTarget->OwnerDoc()->SetMayHaveDOMMutationObservers();
   }
 
-  bool ObservesAttr(mozilla::dom::Element* aElement,
+  bool IsObservable(nsIContent* aContent);
+
+  bool ObservesAttr(nsINode* aRegisterTarget,
+                    mozilla::dom::Element* aElement,
                     int32_t aNameSpaceID,
                     nsIAtom* aAttr)
   {
     if (mParent) {
-      return mParent->ObservesAttr(aElement, aNameSpaceID, aAttr);
+      return mParent->ObservesAttr(aRegisterTarget, aElement, aNameSpaceID, aAttr);
     }
-    if (!Attributes() || (!Subtree() && aElement != Target())) {
+    if (!Attributes() ||
+        (!Subtree() && aElement != Target()) ||
+        (Subtree() && aRegisterTarget->SubtreeRoot() != aElement->SubtreeRoot()) ||
+        !IsObservable(aElement)) {
       return false;
     }
     if (AllAttributes()) {
@@ -447,9 +453,10 @@
 {
 public:
   nsDOMMutationObserver(already_AddRefed<nsPIDOMWindow>&& aOwner,
-                        mozilla::dom::MutationCallback& aCb)
+                        mozilla::dom::MutationCallback& aCb,
+                        bool aChrome)
   : mOwner(aOwner), mLastPendingMutation(nullptr), mPendingMutationCount(0),
-    mCallback(&aCb), mWaitingForRun(false), mId(++sCount)
+    mCallback(&aCb), mWaitingForRun(false), mIsChrome(aChrome), mId(++sCount)
   {
   }
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -471,6 +478,11 @@
     return mOwner;
   }
 
+  bool IsChrome()
+  {
+    return mIsChrome;
+  }
+
   void Observe(nsINode& aTarget,
                const mozilla::dom::MutationObserverInit& aOptions,
                mozilla::ErrorResult& aRv);
@@ -571,6 +583,7 @@
   nsRefPtr<mozilla::dom::MutationCallback>           mCallback;
 
   bool                                               mWaitingForRun;
+  bool                                               mIsChrome;
 
   uint64_t                                           mId;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsDOMWindowUtils.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsDOMWindowUtils.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsDOMWindowUtils.cpp	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsDOMWindowUtils.cpp	2015-04-24 19:31:02.000000000 +0000
@@ -2354,12 +2354,15 @@
     }
   }
 
-  nsRefreshDriver* driver = GetPresContext()->RefreshDriver();
-  driver->AdvanceTimeAndRefresh(aMilliseconds);
+  nsPresContext* presContext = GetPresContext();
+  if (presContext) {
+    nsRefreshDriver* driver = presContext->RefreshDriver();
+    driver->AdvanceTimeAndRefresh(aMilliseconds);
 
-  RefPtr<LayerTransactionChild> transaction = GetLayerTransaction();
-  if (transaction && transaction->IPCOpen()) {
-    transaction->SendSetTestSampleTime(driver->MostRecentRefresh());
+    RefPtr<LayerTransactionChild> transaction = GetLayerTransaction();
+    if (transaction && transaction->IPCOpen()) {
+      transaction->SendSetTestSampleTime(driver->MostRecentRefresh());
+    }
   }
 
   return NS_OK;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsFrameLoader.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsFrameLoader.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsFrameLoader.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsFrameLoader.h	2015-04-24 19:31:02.000000000 +0000
@@ -50,9 +50,6 @@
 #if defined(MOZ_WIDGET_GTK)
 typedef struct _GtkWidget GtkWidget;
 #endif
-#ifdef MOZ_WIDGET_QT
-class QX11EmbedContainer;
-#endif
 
 class nsFrameLoader final : public nsIFrameLoader,
                             public nsStubMutationObserver,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsFrameMessageManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsFrameMessageManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsFrameMessageManager.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsFrameMessageManager.h	2015-04-24 19:31:02.000000000 +0000
@@ -124,8 +124,6 @@
 } // namespace dom
 } // namespace mozilla
 
-class nsAXPCNativeCallContext;
-
 struct nsMessageListenerInfo
 {
   bool operator==(const nsMessageListenerInfo& aOther) const
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsGenericDOMDataNode.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsGenericDOMDataNode.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsGenericDOMDataNode.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsGenericDOMDataNode.h	2015-04-24 19:31:02.000000000 +0000
@@ -23,12 +23,7 @@
 #include "mozilla/dom/ShadowRoot.h"
 
 class nsIDocument;
-class nsIDOMAttr;
-class nsIDOMEventListener;
-class nsIDOMNodeList;
-class nsIFrame;
 class nsIDOMText;
-class nsURI;
 
 #define DATA_NODE_FLAG_BIT(n_) NODE_FLAG_BIT(NODE_TYPE_SPECIFIC_BITS_OFFSET + (n_))
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsGkAtomList.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsGkAtomList.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsGkAtomList.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsGkAtomList.h	2015-04-24 19:31:02.000000000 +0000
@@ -845,6 +845,8 @@
 GK_ATOM(onpopupshowing, "onpopupshowing")
 GK_ATOM(onpopupshown, "onpopupshown")
 GK_ATOM(onpreviewstatechange, "onpreviewstatechange")
+GK_ATOM(onpush, "onpush")
+GK_ATOM(onpushsubscriptionchange, "onpushsubscriptionchange")
 GK_ATOM(onpschange, "onpschange")
 GK_ATOM(onptychange, "onptychange")
 GK_ATOM(onradiostatechange, "onradiostatechange")
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsGlobalWindow.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsGlobalWindow.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsGlobalWindow.cpp	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsGlobalWindow.cpp	2015-04-24 19:31:02.000000000 +0000
@@ -187,6 +187,7 @@
 #include "mozilla/dom/StructuredCloneTags.h"
 
 #ifdef MOZ_GAMEPAD
+#include "mozilla/dom/Gamepad.h"
 #include "mozilla/dom/GamepadService.h"
 #endif
 
@@ -13367,6 +13368,15 @@
 nsGlobalWindow::AddGamepad(uint32_t aIndex, Gamepad* aGamepad)
 {
   MOZ_ASSERT(IsInnerWindow());
+  // Create the index we will present to content based on which indices are
+  // already taken, as required by the spec.
+  // https://w3c.github.io/gamepad/gamepad.html#widl-Gamepad-index
+  int index = 0;
+  while(mGamepadIndexSet.Contains(index)) {
+    ++index;
+  }
+  mGamepadIndexSet.Put(index);
+  aGamepad->SetIndex(index);
   mGamepads.Put(aIndex, aGamepad);
 }
 
@@ -13374,6 +13384,12 @@
 nsGlobalWindow::RemoveGamepad(uint32_t aIndex)
 {
   MOZ_ASSERT(IsInnerWindow());
+  nsRefPtr<Gamepad> gamepad;
+  if (!mGamepads.Get(aIndex, getter_AddRefs(gamepad))) {
+    return;
+  }
+  // Free up the index we were using so it can be reused
+  mGamepadIndexSet.Remove(gamepad->Index());
   mGamepads.Remove(aIndex);
 }
 
@@ -13384,8 +13400,8 @@
 {
   nsTArray<nsRefPtr<Gamepad> >* array =
     static_cast<nsTArray<nsRefPtr<Gamepad> >*>(aUserArg);
-  array->EnsureLengthAtLeast(aKey + 1);
-  (*array)[aKey] = aData;
+  array->EnsureLengthAtLeast(aData->Index() + 1);
+  (*array)[aData->Index()] = aData;
   return PL_DHASH_NEXT;
 }
 
@@ -13404,6 +13420,7 @@
 {
   MOZ_ASSERT(IsInnerWindow());
   nsRefPtr<Gamepad> gamepad;
+
   if (mGamepads.Get(aIndex, getter_AddRefs(gamepad))) {
     return gamepad.forget();
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsGlobalWindow.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsGlobalWindow.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsGlobalWindow.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsGlobalWindow.h	2015-04-24 19:31:02.000000000 +0000
@@ -52,6 +52,7 @@
 #include "Units.h"
 #include "nsComponentManagerUtils.h"
 #include "nsSize.h"
+#include "nsCheapSets.h"
 
 #define DEFAULT_HOME_PAGE "www.mozilla.org"
 #define PREF_BROWSER_STARTUP_HOMEPAGE "browser.startup.homepage"
@@ -1590,6 +1591,7 @@
   // Indicates whether this window wants gamepad input events
   bool                   mHasGamepad : 1;
 #ifdef MOZ_GAMEPAD
+  nsCheapSet<nsUint32HashKey> mGamepadIndexSet;
   nsRefPtrHashtable<nsUint32HashKey, mozilla::dom::Gamepad> mGamepads;
   bool mHasSeenGamepadInput;
 #endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsHostObjectProtocolHandler.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsHostObjectProtocolHandler.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsHostObjectProtocolHandler.cpp	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsHostObjectProtocolHandler.cpp	2015-04-24 19:31:02.000000000 +0000
@@ -163,6 +163,43 @@
     return PL_DHASH_NEXT;
   }
 
+  static void BuildPath(nsAutoCString& path,
+                        nsCStringHashKey::KeyType aKey,
+                        DataInfo* aInfo,
+                        bool anonymize)
+  {
+    nsCOMPtr<nsIURI> principalURI;
+    nsAutoCString url, owner;
+    if (NS_SUCCEEDED(aInfo->mPrincipal->GetURI(getter_AddRefs(principalURI))) &&
+        principalURI != nullptr &&
+        NS_SUCCEEDED(principalURI->GetSpec(owner)) &&
+        !owner.IsEmpty()) {
+      owner.ReplaceChar('/', '\\');
+      path += "owner(";
+      if (anonymize) {
+        path += "<anonymized>";
+      } else {
+        path += owner;
+      }
+      path += ")";
+    } else {
+      path += "owner unknown";
+    }
+    path += "/";
+    if (anonymize) {
+      path += "<anonymized-stack>";
+    } else {
+      path += aInfo->mStack;
+    }
+    url = aKey;
+    url.ReplaceChar('/', '\\');
+    if (anonymize) {
+      path += "<anonymized-url>";
+    } else {
+      path += url;
+    }
+  }
+
   static PLDHashOperator ReportCallback(nsCStringHashKey::KeyType aKey,
                                         DataInfo* aInfo,
                                         void* aUserArg)
@@ -195,34 +232,8 @@
       }
 
       path = isMemoryFile ? "memory-blob-urls/" : "file-blob-urls/";
-      if (NS_SUCCEEDED(aInfo->mPrincipal->GetURI(getter_AddRefs(principalURI))) &&
-          principalURI != nullptr &&
-          NS_SUCCEEDED(principalURI->GetSpec(owner)) &&
-          !owner.IsEmpty()) {
-        owner.ReplaceChar('/', '\\');
-        path += "owner(";
-        if (envp->mAnonymize) {
-          path += "<anonymized>";
-        } else {
-          path += owner;
-        }
-        path += ")";
-      } else {
-        path += "owner unknown";
-      }
-      path += "/";
-      if (envp->mAnonymize) {
-        path += "<anonymized-stack>";
-      } else {
-        path += aInfo->mStack;
-      }
-      url = aKey;
-      url.ReplaceChar('/', '\\');
-      if (envp->mAnonymize) {
-        path += "<anonymized-url>";
-      } else {
-        path += url;
-      }
+      BuildPath(path, aKey, aInfo, envp->mAnonymize);
+
       if (refCount > 1) {
         nsAutoCString addrStr;
 
@@ -268,7 +279,27 @@
             descString,
             envp->mData);
       }
+    } else {
+      // Just report the path for the DOMMediaStream or MediaSource.
+      nsCOMPtr<mozilla::dom::MediaSource> ms(do_QueryInterface(aInfo->mObject));
+      nsAutoCString path;
+      path = ms ? "media-source-urls/" : "dom-media-stream-urls/";
+      BuildPath(path, aKey, aInfo, envp->mAnonymize);
+
+      NS_NAMED_LITERAL_CSTRING
+        (desc, "An object URL allocated with URL.createObjectURL; the referenced "
+               "data cannot be freed until all URLs for it have been explicitly "
+               "invalidated with URL.revokeObjectURL.");
+
+      envp->mCallback->Callback(EmptyCString(),
+          path,
+          KIND_OTHER,
+          UNITS_COUNT,
+          1,
+          desc,
+          envp->mData);
     }
+
     return PL_DHASH_NEXT;
   }
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsHostObjectProtocolHandler.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsHostObjectProtocolHandler.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsHostObjectProtocolHandler.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsHostObjectProtocolHandler.h	2015-04-24 19:31:02.000000000 +0000
@@ -17,7 +17,6 @@
 #define FONTTABLEURI_SCHEME "moz-fonttable"
 #define RTSPURI_SCHEME "rtsp"
 
-class nsIDOMBlob;
 class nsIPrincipal;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsIAttribute.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsIAttribute.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsIAttribute.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsIAttribute.h	2015-04-24 19:31:02.000000000 +0000
@@ -9,7 +9,6 @@
 #include "nsINode.h"
 
 class nsDOMAttributeMap;
-class nsIContent;
 
 #define NS_IATTRIBUTE_IID  \
 { 0x233a9c4d, 0xb27f, 0x4662, \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsIDocument.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsIDocument.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsIDocument.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsIDocument.h	2015-04-24 19:31:02.000000000 +0000
@@ -49,7 +49,6 @@
 class nsIDocumentEncoder;
 class nsIDocumentObserver;
 class nsIDOMDocument;
-class nsIDOMDocumentFragment;
 class nsIDOMDocumentType;
 class nsIDOMElement;
 class nsIDOMNodeFilter;
@@ -119,7 +118,6 @@
 class FontFaceSet;
 class FrameRequestCallback;
 class ImportManager;
-class OverfillCallback;
 class HTMLBodyElement;
 struct LifecycleCallbackArgs;
 class Link;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsIDocumentObserver.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsIDocumentObserver.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsIDocumentObserver.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsIDocumentObserver.h	2015-04-24 19:31:02.000000000 +0000
@@ -9,11 +9,9 @@
 #include "nsISupports.h"
 #include "nsIMutationObserver.h"
 
-class nsIAtom;
 class nsIContent;
 class nsIStyleSheet;
 class nsIStyleRule;
-class nsString;
 class nsIDocument;
 
 #define NS_IDOCUMENT_OBSERVER_IID \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsIDOMScriptObjectFactory.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsIDOMScriptObjectFactory.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsIDOMScriptObjectFactory.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsIDOMScriptObjectFactory.h	2015-04-24 19:31:02.000000000 +0000
@@ -14,10 +14,6 @@
 { 0x2a50e17c, 0x46ff, 0x4150, \
   { 0xbb, 0x46, 0xd8, 0x07, 0xb3, 0x36, 0xde, 0xab } }
 
-class nsIScriptContext;
-class nsIScriptGlobalObject;
-class nsIDOMEventListener;
-
 typedef nsXPCClassInfo* (*nsDOMClassInfoExternalConstructorFnc)
   (const char* aName);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsImageLoadingContent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsImageLoadingContent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsImageLoadingContent.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsImageLoadingContent.h	2015-04-24 19:31:02.000000000 +0000
@@ -27,8 +27,6 @@
 
 class nsIURI;
 class nsIDocument;
-class imgILoader;
-class nsIIOService;
 class nsPresContext;
 class nsIContent;
 class imgRequestProxy;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsINode.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsINode.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsINode.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsINode.h	2015-04-24 19:31:02.000000000 +0000
@@ -48,7 +48,6 @@
 class nsIURI;
 class nsNodeSupportsWeakRefTearoff;
 class nsNodeWeakReference;
-class nsXPCClassInfo;
 class nsDOMMutationObserver;
 
 namespace mozilla {
@@ -73,7 +72,6 @@
 class DOMRectReadOnly;
 class Element;
 class EventHandlerNonNull;
-class OnErrorEventHandlerNonNull;
 template<typename T> class Optional;
 class Text;
 class TextOrElementOrDocument;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsIScriptContext.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsIScriptContext.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsIScriptContext.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsIScriptContext.h	2015-04-24 19:31:02.000000000 +0000
@@ -14,16 +14,6 @@
 #include "js/GCAPI.h"
 
 class nsIScriptGlobalObject;
-class nsIScriptSecurityManager;
-class nsIPrincipal;
-class nsIAtom;
-class nsIArray;
-class nsIVariant;
-class nsIObjectInputStream;
-class nsIObjectOutputStream;
-class nsIScriptObjectPrincipal;
-class nsIDOMWindow;
-class nsIURI;
 
 #define NS_ISCRIPTCONTEXT_IID \
 { 0x901f0d5e, 0x217a, 0x45fa, \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsJSEnvironment.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsJSEnvironment.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsJSEnvironment.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsJSEnvironment.h	2015-04-24 19:31:02.000000000 +0000
@@ -19,9 +19,7 @@
 #include "xpcpublic.h"
 
 class nsICycleCollectorListener;
-class nsIXPConnectJSObjectHolder;
 class nsScriptNameSpaceManager;
-class nsCycleCollectionNoteRootCallback;
 
 namespace JS {
 class AutoValueVector;
@@ -173,8 +171,6 @@
   static bool DOMOperationCallback(JSContext *cx);
 };
 
-class nsIJSRuntimeService;
-class nsIPrincipal;
 class nsPIDOMWindow;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsMappedAttributes.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsMappedAttributes.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsMappedAttributes.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsMappedAttributes.h	2015-04-24 19:31:03.000000000 +0000
@@ -19,7 +19,6 @@
 
 class nsIAtom;
 class nsHTMLStyleSheet;
-class nsRuleWalker;
 
 class nsMappedAttributes final : public nsIStyleRule
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsNameSpaceManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsNameSpaceManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsNameSpaceManager.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsNameSpaceManager.h	2015-04-24 19:31:03.000000000 +0000
@@ -11,7 +11,6 @@
 
 #include "mozilla/StaticPtr.h"
 
-class nsIAtom;
 class nsAString;
 
 class nsNameSpaceKey : public PLDHashEntryHdr
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsNodeUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsNodeUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsNodeUtils.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsNodeUtils.h	2015-04-24 19:31:03.000000000 +0000
@@ -12,8 +12,6 @@
 #include "nsCOMArray.h"
 
 struct CharacterDataChangeInfo;
-class nsIVariant;
-class nsIDOMNode;
 template<class E> class nsCOMArray;
 class nsCycleCollectionTraversalCallback;
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsObjectLoadingContent.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsObjectLoadingContent.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsObjectLoadingContent.cpp	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsObjectLoadingContent.cpp	2015-04-24 19:31:03.000000000 +0000
@@ -3195,6 +3195,16 @@
     sPrefsInitialized = true;
   }
 
+  if (XRE_GetProcessType() == GeckoProcessType_Default &&
+      (Preferences::GetBool("browser.tabs.remote.autostart", false) ||
+       Preferences::GetBool("browser.tabs.remote.autostart.1", false) ||
+       Preferences::GetBool("browser.tabs.remote.autostart.2", false))) {
+    // Plugins running OOP from the chrome process along with plugins running
+    // OOP from the content process will hang. Let's prevent that situation.
+    aReason = eFallbackDisabled;
+    return false;
+  }
+
   nsRefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst();
 
   nsCOMPtr<nsIPluginPlayPreviewInfo> playPreviewInfo;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsPIDOMWindow.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsPIDOMWindow.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsPIDOMWindow.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsPIDOMWindow.h	2015-04-24 19:31:03.000000000 +0000
@@ -25,7 +25,6 @@
 class nsIDocShell;
 class nsIDocument;
 class nsIIdleObserver;
-class nsIPrincipal;
 class nsIScriptTimeoutHandler;
 class nsIURI;
 class nsPerformance;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsReferencedElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsReferencedElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsReferencedElement.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsReferencedElement.h	2015-04-24 19:31:03.000000000 +0000
@@ -15,7 +15,6 @@
 #include "nsAutoPtr.h"
 
 class nsIURI;
-class nsCycleCollectionCallback;
 
 /**
  * Class to track what element is referenced by a given ID.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsScriptLoader.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsScriptLoader.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsScriptLoader.cpp	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsScriptLoader.cpp	2015-04-24 19:31:03.000000000 +0000
@@ -347,7 +347,7 @@
     nsRefPtr<nsCORSListenerProxy> corsListener =
       new nsCORSListenerProxy(listener, mDocument->NodePrincipal(),
                               withCredentials);
-    rv = corsListener->Init(channel);
+    rv = corsListener->Init(channel, DataURIHandling::Allow);
     NS_ENSURE_SUCCESS(rv, rv);
     listener = corsListener;
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsScriptNameSpaceManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsScriptNameSpaceManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsScriptNameSpaceManager.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsScriptNameSpaceManager.h	2015-04-24 19:31:03.000000000 +0000
@@ -79,11 +79,7 @@
   mozilla::dom::ConstructorEnabled* mConstructorEnabled;
 };
 
-
-class nsIScriptContext;
 class nsICategoryManager;
-class GlobalNameMapEntry;
-
 
 class nsScriptNameSpaceManager : public nsIObserver,
                                  public nsSupportsWeakReference,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsStructuredCloneContainer.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsStructuredCloneContainer.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsStructuredCloneContainer.cpp	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsStructuredCloneContainer.cpp	2015-04-24 19:31:03.000000000 +0000
@@ -48,16 +48,9 @@
   NS_ENSURE_STATE(!mData);
 
   uint64_t* jsBytes = nullptr;
-  bool success = false;
-  if (aData.isPrimitive()) {
-    success = JS_WriteStructuredClone(aCx, aData, &jsBytes, &mSize,
-                                      nullptr, nullptr,
-                                      JS::UndefinedHandleValue);
-  } else {
-    success = JS_WriteStructuredClone(aCx, aData, &jsBytes, &mSize,
-                                      nullptr, nullptr,
-                                      JS::UndefinedHandleValue);
-  }
+  bool success = JS_WriteStructuredClone(aCx, aData, &jsBytes, &mSize,
+                                           nullptr, nullptr,
+                                           JS::UndefinedHandleValue);
   NS_ENSURE_STATE(success);
   NS_ENSURE_STATE(jsBytes);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsSyncLoadService.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsSyncLoadService.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsSyncLoadService.cpp	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsSyncLoadService.cpp	2015-04-24 19:31:03.000000000 +0000
@@ -189,7 +189,7 @@
     if (aLoaderPrincipal) {
         nsRefPtr<nsCORSListenerProxy> corsListener =
           new nsCORSListenerProxy(listener, aLoaderPrincipal, false);
-        rv = corsListener->Init(mChannel);
+        rv = corsListener->Init(mChannel, DataURIHandling::Disallow);
         NS_ENSURE_SUCCESS(rv, rv);
         listener = corsListener;
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsTextFragment.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsTextFragment.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsTextFragment.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsTextFragment.h	2015-04-24 19:31:03.000000000 +0000
@@ -19,7 +19,6 @@
 #include "nsISupportsImpl.h"
 
 class nsString;
-class nsCString;
 
 // XXX should this normalize the code to keep a \u0000 at the end?
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsWindowRoot.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsWindowRoot.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsWindowRoot.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsWindowRoot.h	2015-04-24 19:31:03.000000000 +0000
@@ -8,15 +8,9 @@
 #define nsWindowRoot_h__
 
 class nsPIDOMWindow;
-class nsIDOMEventListener;
 class nsIDOMEvent;
 class nsIGlobalObject;
 
-namespace mozilla {
-class EventChainPostVisitor;
-class EventChainPreVisitor;
-} // namespace mozilla
-
 #include "mozilla/Attributes.h"
 #include "mozilla/EventListenerManager.h"
 #include "nsIDOMEventTarget.h"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsWrapperCache.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsWrapperCache.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsWrapperCache.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsWrapperCache.h	2015-04-24 19:31:03.000000000 +0000
@@ -23,7 +23,6 @@
 class SandboxPrivate;
 class nsInProcessTabChildGlobal;
 class nsWindowRoot;
-class XPCWrappedNativeScope;
 
 #define NS_WRAPPERCACHE_IID \
 { 0x6f3179a1, 0x36f7, 0x4a5c, \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsXMLContentSerializer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsXMLContentSerializer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsXMLContentSerializer.h	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsXMLContentSerializer.h	2015-04-24 19:31:03.000000000 +0000
@@ -23,7 +23,6 @@
 #define kEndTag NS_LITERAL_STRING("</")
 
 class nsIAtom;
-class nsIDOMNode;
 class nsINode;
 
 class nsXMLContentSerializer : public nsIContentSerializer {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsXMLHttpRequest.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsXMLHttpRequest.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/nsXMLHttpRequest.cpp	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/nsXMLHttpRequest.cpp	2015-04-24 19:31:03.000000000 +0000
@@ -2889,7 +2889,7 @@
     // a same-origin request right now, since it could be redirected.
     nsRefPtr<nsCORSListenerProxy> corsListener =
       new nsCORSListenerProxy(listener, mPrincipal, withCredentials);
-    rv = corsListener->Init(mChannel, true);
+    rv = corsListener->Init(mChannel, DataURIHandling::Allow);
     NS_ENSURE_SUCCESS(rv, rv);
     listener = corsListener;
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/ShadowRoot.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/ShadowRoot.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/ShadowRoot.h	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/ShadowRoot.h	2015-04-24 19:31:02.000000000 +0000
@@ -15,10 +15,7 @@
 
 class nsIAtom;
 class nsIContent;
-class nsIDocument;
-class nsPIDOMWindow;
 class nsXBLPrototypeBinding;
-class nsTagNameMapEntry;
 
 namespace mozilla {
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/test/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/test/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/test/mochitest.ini	2015-04-22 13:05:45.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/test/mochitest.ini	2015-04-24 19:31:03.000000000 +0000
@@ -780,3 +780,4 @@
 [test_bug1118689.html]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [test_integer_attr_with_leading_zero.html]
+[test_script_loader_crossorigin_data_url.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/test/test_mutationobservers.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/test/test_mutationobservers.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/test/test_mutationobservers.html	2015-04-22 13:05:46.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/test/test_mutationobservers.html	2015-04-24 19:31:03.000000000 +0000
@@ -20,6 +20,8 @@
 
 /** Test for Bug 641821 **/
 
+SimpleTest.requestFlakyTimeout("requestFlakyTimeout is silly. (But make sure marquee has time to initialize itself.)");
+
 var div = document.createElement("div");
 
 var M;
@@ -580,7 +582,7 @@
   var m2 = new M(function(records, observer) {
     is(observer.expandoProperty, true);
     observer.disconnect();
-    then(testStyleCreate);
+    then(testOutsideShadowDOM);
   });
   m2.expandoProperty = true;
   m2.observe(div, { attributes: true });
@@ -596,6 +598,74 @@
   div.setAttribute("foo", "bar2");
 }
 
+function testOutsideShadowDOM() {
+  var m = new M(function(records, observer) {
+    is(records.length, 1);
+    is(records[0].type, "attributes", "Should have got attributes");
+    observer.disconnect();
+    then(testInsideShadowDOM);
+  });
+  m.observe(div, {
+      attributes: true,
+      childList: true,
+      characterData: true,
+      subtree: true
+    })
+  var sr = div.createShadowRoot();
+  sr.innerHTML = "<div" + ">text</" + "div>";
+  sr.firstChild.setAttribute("foo", "bar");
+  sr.firstChild.firstChild.data = "text2";
+  sr.firstChild.appendChild(document.createElement("div"));
+  div.setAttribute("foo", "bar");
+}
+
+function testInsideShadowDOM() {
+  var m = new M(function(records, observer) {
+    is(records.length, 4);
+    is(records[0].type, "childList");
+    is(records[1].type, "attributes");
+    is(records[2].type, "characterData");
+    is(records[3].type, "childList");
+    observer.disconnect();
+    then(testMarquee);
+  });
+  var sr = div.createShadowRoot();
+  m.observe(sr, {
+      attributes: true,
+      childList: true,
+      characterData: true,
+      subtree: true
+    });
+
+  sr.innerHTML = "<div" + ">text</" + "div>";
+  sr.firstChild.setAttribute("foo", "bar");
+  sr.firstChild.firstChild.data = "text2";
+  sr.firstChild.appendChild(document.createElement("div"));
+  div.setAttribute("foo", "bar2");
+
+}
+
+function testMarquee() {
+  var m = new M(function(records, observer) {
+    is(records.length, 1);
+    is(records[0].type, "attributes");
+    is(records[0].attributeName, "ok");
+    is(records[0].oldValue, null);
+    observer.disconnect();
+    then(testStyleCreate);
+  });
+  var marquee = document.createElement("marquee");
+  m.observe(marquee, {
+    attributes: true,
+    attributeOldValue: true,
+    childList: true,
+    characterData: true,
+    subtree: true
+  });
+  document.body.appendChild(marquee);
+  setTimeout(function() {marquee.setAttribute("ok", "ok")}, 500);
+}
+
 function testStyleCreate() {
   m = new M(function(records, observer) {
     is(records.length, 1, "number of records");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/test/test_script_loader_crossorigin_data_url.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/test/test_script_loader_crossorigin_data_url.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/test/test_script_loader_crossorigin_data_url.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/test/test_script_loader_crossorigin_data_url.html	2015-04-24 19:31:03.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test for handling of 'crossorigin' attribute on script with data: URL</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+  // We're going to mess with window.onerror.
+  setup({ allow_uncaught_exception: true });
+</script>
+<!-- First check that data: scripts with @crossorigin run at all -->
+<script>
+  var ran = false;
+</script>
+<script crossorigin src="data:application/javascript,ran = true"></script>
+<script>
+test(function() {
+  assert_true(ran);
+}, "script@crossorigin with data: src should have run");
+</script>
+<!-- Then check that their syntax errors are not sanitized -->
+<script>
+var errorFired = false;
+ran = false;
+window.onerror = function(message, uri, line) {
+  errorFired = true;
+  test(function() {
+    assert_equals(line, 3);
+  }, "Should have a useful line number for exception in script@crossorigin with data: src");
+}
+</script>
+<script crossorigin src="data:application/javascript,var%20a;%0aran=true%0anoSuchFunctionHere()"></script>
+<script>
+  test(function() {
+    assert_true(ran, "Script with error should have run");
+    assert_true(errorFired, "Script with error should have fired onerror");
+  }, "Should run and correctly fire onerror");
+</script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/ThirdPartyUtil.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/ThirdPartyUtil.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/ThirdPartyUtil.h	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/ThirdPartyUtil.h	2015-04-24 19:31:02.000000000 +0000
@@ -12,8 +12,6 @@
 #include "mozilla/Attributes.h"
 
 class nsIURI;
-class nsIChannel;
-class nsIDOMWindow;
 
 class ThirdPartyUtil final : public mozIThirdPartyUtil
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/URL.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/URL.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/URL.h	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/URL.h	2015-04-24 19:31:02.000000000 +0000
@@ -11,8 +11,6 @@
 #include "nsAutoPtr.h"
 #include "nsString.h"
 
-class nsIDOMBlob;
-class nsIPrincipal;
 class nsISupports;
 class nsIURI;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/WebSocket.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/WebSocket.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/base/WebSocket.h	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/base/WebSocket.h	2015-04-24 19:31:02.000000000 +0000
@@ -28,10 +28,6 @@
 namespace mozilla {
 namespace dom {
 
-namespace workers {
-class WorkerPrivate;
-}
-
 class File;
 
 class WebSocketImpl;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/battery/BatteryManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/battery/BatteryManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/battery/BatteryManager.h	2015-04-22 13:05:46.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/battery/BatteryManager.h	2015-04-24 19:31:04.000000000 +0000
@@ -12,7 +12,6 @@
 #include "nsCycleCollectionParticipant.h"
 
 class nsPIDOMWindow;
-class nsIScriptContext;
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bindings/Bindings.conf thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bindings/Bindings.conf
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bindings/Bindings.conf	2015-04-22 13:05:46.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bindings/Bindings.conf	2015-04-24 19:31:04.000000000 +0000
@@ -659,11 +659,6 @@
     'notflattened': True
 },
 
-'InstallEvent': {
-    'headerFile': 'ServiceWorkerEvents.h',
-    'nativeType': 'mozilla::dom::workers::InstallEvent',
-},
-
 'KeyEvent': {
     'concrete': False
 },
@@ -979,6 +974,15 @@
     'workers': True,
 },
 
+'ServiceWorkerRegistration': [{
+    'nativeType': 'mozilla::dom::ServiceWorkerRegistrationMainThread',
+    'headerFile': 'mozilla/dom/ServiceWorkerRegistration.h',
+}, {
+    'workers': True,
+    'nativeType': 'mozilla::dom::ServiceWorkerRegistrationWorkerThread',
+    'headerFile': 'mozilla/dom/ServiceWorkerRegistration.h',
+}],
+
 'SharedWorker': {
     'nativeType': 'mozilla::dom::workers::SharedWorker',
     'headerFile': 'mozilla/dom/workers/bindings/SharedWorker.h',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bindings/CallbackObject.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bindings/CallbackObject.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bindings/CallbackObject.h	2015-04-22 13:05:46.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bindings/CallbackObject.h	2015-04-24 19:31:04.000000000 +0000
@@ -305,7 +305,7 @@
   }
 
   // Boolean conversion operator so people can use this in boolean tests
-  operator bool() const
+  explicit operator bool() const
   {
     return GetISupports();
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bindings/Codegen.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bindings/Codegen.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bindings/Codegen.py	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bindings/Codegen.py	2015-04-24 19:31:04.000000000 +0000
@@ -476,6 +476,7 @@
                 nullptr,               /* setProperty */
                 ${enumerate}, /* enumerate */
                 ${resolve}, /* resolve */
+                nullptr,               /* mayResolve */
                 nullptr,               /* convert */
                 ${finalize}, /* finalize */
                 ${call}, /* call */
@@ -616,6 +617,7 @@
                 nullptr,               /* setProperty */
                 nullptr,               /* enumerate */
                 nullptr,               /* resolve */
+                nullptr,               /* mayResolve */
                 nullptr,               /* convert */
                 nullptr,               /* finalize */
                 nullptr,               /* call */
@@ -709,6 +711,7 @@
                 nullptr,               /* setProperty */
                 nullptr,               /* enumerate */
                 nullptr,               /* resolve */
+                nullptr,               /* mayResolve */
                 nullptr,               /* convert */
                 nullptr,               /* finalize */
                 ${ctorname}, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bindings/test/TestCImplementedInterface.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bindings/test/TestCImplementedInterface.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bindings/test/TestCImplementedInterface.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bindings/test/TestCImplementedInterface.h	2015-04-24 19:31:04.000000000 +0000
@@ -9,8 +9,6 @@
 
 #include "../TestJSImplGenBinding.h"
 
-class nsPIDOMWindow;
-
 namespace mozilla {
 namespace dom {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h	2015-04-24 19:31:04.000000000 +0000
@@ -15,8 +15,6 @@
 
 using namespace mozilla::ipc;
 
-class BlutoothDaemonInterface;
-
 class BluetoothDaemonSocketModule
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothGattHALInterface.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothGattHALInterface.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothGattHALInterface.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothGattHALInterface.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -514,7 +514,9 @@
 BluetoothGattClientHALInterface::Scan(
   int aClientIf, bool aStart, BluetoothGattClientResultHandler* aRes)
 {
-#if ANDROID_VERSION >= 19
+#if ANDROID_VERSION >= 21
+  int status = mInterface->scan(aStart);
+#elif ANDROID_VERSION >= 19
   int status = mInterface->scan(aClientIf, aStart);
 #else
   int status = BT_STATUS_UNSUPPORTED;
@@ -530,10 +532,21 @@
 void
 BluetoothGattClientHALInterface::Connect(
   int aClientIf, const nsAString& aBdAddr,
-  bool aIsDirect, BluetoothGattClientResultHandler* aRes)
+  bool aIsDirect, BluetoothTransport aTransport,
+  BluetoothGattClientResultHandler* aRes)
 {
   bt_status_t status;
-#if ANDROID_VERSION >= 19
+#if ANDROID_VERSION >= 21
+  bt_bdaddr_t bdAddr;
+  btgatt_transport_t transport;
+
+  if (NS_SUCCEEDED(Convert(aBdAddr, bdAddr)) ||
+      NS_SUCCEEDED(Convert(aTransport, transport))) {
+    status = mInterface->connect(aClientIf, &bdAddr, aIsDirect, transport);
+  } else {
+    status = BT_STATUS_PARM_INVALID;
+  }
+#elif ANDROID_VERSION >= 19
   bt_bdaddr_t bdAddr;
 
   if (NS_SUCCEEDED(Convert(aBdAddr, bdAddr))) {
@@ -1019,10 +1032,34 @@
   int aServerIf, bool aIsScanRsp, bool aIsNameIncluded,
   bool aIsTxPowerIncluded, int aMinInterval, int aMaxInterval, int aApperance,
   uint8_t aManufacturerLen, const ArrayBuffer& aManufacturerData,
+  uint8_t aServiceDataLen, const ArrayBuffer& aServiceData,
+  uint8_t aServiceUUIDLen, const ArrayBuffer& aServiceUUID,
   BluetoothGattClientResultHandler* aRes)
 {
+  /* FIXME: This method allocates a large amount of memory on the
+   * stack. It should be rewritten to prevent the pending stack
+   * overflow. Additionally |ArrayBuffer| seems like the wrong data
+   * type here. Why not use plain pointers instead?
+   */
+
   bt_status_t status;
-#if ANDROID_VERSION >= 19
+#if ANDROID_VERSION >= 21
+  char manufacturerData[aManufacturerLen + 1];
+  char serviceData[aServiceDataLen + 1];
+  char serviceUUID[aServiceUUIDLen + 1];
+
+  if (NS_SUCCEEDED(Convert(aManufacturerData, manufacturerData)) ||
+      NS_SUCCEEDED(Convert(aServiceData, serviceData)) ||
+      NS_SUCCEEDED(Convert(aServiceUUID, serviceUUID))) {
+    status = mInterface->set_adv_data(
+      aServerIf, aIsScanRsp, aIsNameIncluded, aIsTxPowerIncluded,
+      aMinInterval, aMaxInterval, aApperance,
+      aManufacturerLen, manufacturerData,
+      aServiceDataLen, serviceData, aServiceUUIDLen, serviceUUID);
+  } else {
+    status = BT_STATUS_PARM_INVALID;
+  }
+#elif ANDROID_VERSION >= 19
   char value[aManufacturerLen + 1];
 
   if (NS_SUCCEEDED(Convert(aManufacturerData, value))) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothGattHALInterface.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothGattHALInterface.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothGattHALInterface.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothGattHALInterface.h	2015-04-24 19:31:04.000000000 +0000
@@ -38,6 +38,7 @@
   void Connect(int aClientIf,
                const nsAString& aBdAddr,
                bool aIsDirect, /* auto connect */
+               BluetoothTransport aTransport,
                BluetoothGattClientResultHandler* aRes);
   void Disconnect(int aClientIf,
                   const nsAString& aBdAddr,
@@ -139,6 +140,8 @@
                   int aApperance,
                   uint8_t aManufacturerLen,
                   const ArrayBuffer& aManufacturerData,
+                  uint8_t aServiceDataLen, const ArrayBuffer& aServiceData,
+                  uint8_t aServiceUUIDLen, const ArrayBuffer& aServiceUUID,
                   BluetoothGattClientResultHandler* aRes);
 
 protected:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothGattManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothGattManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothGattManager.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothGattManager.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -139,21 +139,6 @@
   , mConnId(0)
   { }
 
-  ~BluetoothGattClient()
-  {
-    mConnectRunnable = nullptr;
-    mDisconnectRunnable = nullptr;
-    mDiscoverRunnable = nullptr;
-    mUnregisterClientRunnable = nullptr;
-    mReadRemoteRssiRunnable = nullptr;
-    mRegisterNotificationsRunnable = nullptr;
-    mDeregisterNotificationsRunnable = nullptr;
-    mReadCharacteristicState.Reset();
-    mWriteCharacteristicState.Reset();
-    mReadDescriptorState.Reset();
-    mWriteDescriptorState.Reset();
-  }
-
   void NotifyDiscoverCompleted(bool aSuccess)
   {
     MOZ_ASSERT(!mAppUuid.IsEmpty());
@@ -209,6 +194,10 @@
   nsTArray<BluetoothGattServiceId> mIncludedServices;
   nsTArray<BluetoothGattCharAttribute> mCharacteristics;
   nsTArray<BluetoothGattId> mDescriptors;
+
+private:
+  ~BluetoothGattClient()
+  { }
 };
 
 NS_IMPL_ISUPPORTS0(BluetoothGattClient)
@@ -557,6 +546,7 @@
     sBluetoothGattClientInterface->Connect(client->mClientIf,
                                            aDeviceAddr,
                                            true, // direct connect
+                                           TRANSPORT_AUTO,
                                            new ConnectResultHandler(client));
   } else {
     BluetoothUuid uuid;
@@ -1267,6 +1257,7 @@
   if (client->mConnectRunnable) {
     sBluetoothGattClientInterface->Connect(
       aClientIf, client->mDeviceAddr, true /* direct connect */,
+      TRANSPORT_AUTO,
       new ConnectResultHandler(client));
   }
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothGattManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothGattManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothGattManager.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothGattManager.h	2015-04-24 19:31:04.000000000 +0000
@@ -26,7 +26,6 @@
   static BluetoothGattManager* Get();
   static void InitGattInterface(BluetoothProfileResultHandler* aRes);
   static void DeinitGattInterface(BluetoothProfileResultHandler* aRes);
-  virtual ~BluetoothGattManager();
 
   void Connect(const nsAString& aAppUuid,
                const nsAString& aDeviceAddr,
@@ -86,6 +85,8 @@
     BluetoothReplyRunnable* aRunnable);
 
 private:
+  ~BluetoothGattManager();
+
   class CleanupResultHandler;
   class CleanupResultHandlerRunnable;
   class InitGattResultHandler;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothHALHelpers.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothHALHelpers.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothHALHelpers.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothHALHelpers.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -122,7 +122,6 @@
   return NS_OK;
 }
 
-#ifdef MOZ_B2G_BT_API_V2
 nsresult
 Convert(const BluetoothUuid& aIn, bt_uuid_t& aOut)
 {
@@ -134,9 +133,6 @@
 
   return NS_OK;
 }
-#else
-// TODO: Support GATT
-#endif
 
 nsresult
 Convert(const nsAString& aIn, bt_pin_code_t& aOut)
@@ -202,6 +198,13 @@
   return NS_OK;
 }
 
+nsresult
+Convert(const uint8_t* aIn, BluetoothGattAdvData& aOut)
+{
+  memcpy(aOut.mAdvData, aIn, sizeof(aOut.mAdvData));
+  return NS_OK;
+}
+
 #if ANDROID_VERSION >= 18
 nsresult
 Convert(const BluetoothAvrcpElementAttribute& aIn, btrc_element_attr_val_t& aOut)
@@ -227,14 +230,6 @@
 }
 #endif // ANDROID_VERSION >= 18
 
-#ifdef MOZ_B2G_BT_API_V2
-nsresult
-Convert(const uint8_t* aIn, BluetoothGattAdvData& aOut)
-{
-  memcpy(aOut.mAdvData, aIn, sizeof(aOut.mAdvData));
-  return NS_OK;
-}
-
 #if ANDROID_VERSION >= 19
 nsresult
 Convert(const BluetoothGattId& aIn, btgatt_gatt_id_t& aOut)
@@ -326,12 +321,25 @@
   return NS_OK;
 }
 #endif // ANDROID_VERSION >= 19
-#else
-// TODO: Support GATT
-#endif
 
 #if ANDROID_VERSION >= 21
 nsresult
+Convert(const BluetoothTransport& aIn, btgatt_transport_t& aOut)
+{
+  static const btgatt_transport_t sTransport[] = {
+    CONVERT(TRANSPORT_AUTO, GATT_TRANSPORT_AUTO),
+    CONVERT(TRANSPORT_BREDR, GATT_TRANSPORT_BREDR),
+    CONVERT(TRANSPORT_LE, GATT_TRANSPORT_LE)
+  };
+  if (aIn >= MOZ_ARRAY_LENGTH(sTransport)) {
+    aOut = static_cast<btgatt_transport_t>(0); // silence compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sTransport[aIn];
+  return NS_OK;
+}
+
+nsresult
 Convert(const bt_activity_energy_info& aIn, BluetoothActivityEnergyInfo& aOut)
 {
   nsresult rv = Convert(aIn.status, aOut.mStatus);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothHALHelpers.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothHALHelpers.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothHALHelpers.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothHALHelpers.h	2015-04-24 19:31:04.000000000 +0000
@@ -14,21 +14,13 @@
 #if ANDROID_VERSION >= 18
 #include <hardware/bt_rc.h>
 #endif
-#ifdef MOZ_B2G_BT_API_V2
 #if ANDROID_VERSION >= 19
 #include <hardware/bt_gatt.h>
 #endif
-#else
-// Support GATT
-#endif
 #include "BluetoothCommon.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
-#ifdef MOZ_B2G_BT_API_V2
 #include "mozilla/dom/TypedArray.h"
-#else
-// Support GATT
-#endif
 #include "nsThreadUtils.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
@@ -154,12 +146,8 @@
 nsresult
 Convert(const bt_uuid_t& aIn, BluetoothUuid& aOut);
 
-#ifdef MOZ_B2G_BT_API_V2
 nsresult
 Convert(const BluetoothUuid& aIn, bt_uuid_t& aOut);
-#else
-// TODO: Support GATT
-#endif
 
 nsresult
 Convert(const nsAString& aIn, bt_pin_code_t& aOut);
@@ -779,7 +767,6 @@
 }
 #endif // ANDROID_VERSION >= 19
 
-#ifdef MOZ_B2G_BT_API_V2
 inline nsresult
 Convert(int aIn, BluetoothGattStatus& aOut)
 {
@@ -875,6 +862,14 @@
   return NS_OK;
 }
 
+inline nsresult
+Convert(const ArrayBuffer& aIn, char* aOut)
+{
+  aIn.ComputeLengthAndData();
+  memcpy(aOut, aIn.Data(), aIn.Length());
+  return NS_OK;
+}
+
 #if ANDROID_VERSION >= 19
 nsresult
 Convert(const BluetoothGattId& aIn, btgatt_gatt_id_t& aOut);
@@ -898,18 +893,10 @@
 Convert(const btgatt_notify_params_t& aIn, BluetoothGattNotifyParam& aOut);
 #endif // ANDROID_VERSION >= 19
 
-inline nsresult
-Convert(const ArrayBuffer& aIn, char* aOut)
-{
-  aIn.ComputeLengthAndData();
-  memcpy(aOut, aIn.Data(), aIn.Length());
-  return NS_OK;
-}
-#else
-// TODO: Support GATT
-#endif
-
 #if ANDROID_VERSION >= 21
+nsresult
+Convert(const BluetoothTransport& aIn, btgatt_transport_t& aOut);
+
 inline nsresult
 Convert(BluetoothTransport aIn, int& aOut)
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -8,11 +8,7 @@
 #include "BluetoothHALHelpers.h"
 #include "BluetoothA2dpHALInterface.h"
 #include "BluetoothAvrcpHALInterface.h"
-#ifdef MOZ_B2G_BT_API_V2
 #include "BluetoothGattHALInterface.h"
-#else
-// TODO: Support GATT
-#endif
 #include "BluetoothHandsfreeHALInterface.h"
 #include "BluetoothSocketHALInterface.h"
 
@@ -68,7 +64,6 @@
 };
 #endif
 
-#ifdef MOZ_B2G_BT_API_V2
 #if ANDROID_VERSION >= 19
 template<>
 struct interface_traits<BluetoothGattHALInterface>
@@ -81,9 +76,6 @@
   }
 };
 #endif
-#else
-// TODO: Support GATT
-#endif
 
 typedef
   BluetoothHALInterfaceRunnable0<BluetoothResultHandler, void>
@@ -1020,7 +1012,6 @@
 }
 #endif
 
-#ifdef MOZ_B2G_BT_API_V2
 #if ANDROID_VERSION < 19
 /*
  * Versions that we don't support GATT will call this function
@@ -1036,9 +1027,6 @@
   return new BluetoothGattHALInterface();
 }
 #endif
-#else
-// TODO: Support GATT
-#endif
 
 template <class T>
 T*
@@ -1082,12 +1070,7 @@
 BluetoothGattInterface*
 BluetoothHALInterface::GetBluetoothGattInterface()
 {
-#ifdef MOZ_B2G_BT_API_V2
   return GetProfileInterface<BluetoothGattHALInterface>();
-#else
-  // TODO: Support GATT
-  return nullptr;
-#endif
 }
 
 END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -876,7 +876,7 @@
 }
 
 bool
-BluetoothOppManager::ComposePacket(uint8_t aOpCode, UnixSocketRawData* aMessage)
+BluetoothOppManager::ComposePacket(uint8_t aOpCode, UnixSocketBuffer* aMessage)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aMessage);
@@ -926,7 +926,7 @@
 }
 
 void
-BluetoothOppManager::ServerDataHandler(UnixSocketRawData* aMessage)
+BluetoothOppManager::ServerDataHandler(UnixSocketBuffer* aMessage)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -1053,7 +1053,7 @@
 }
 
 void
-BluetoothOppManager::ClientDataHandler(UnixSocketRawData* aMessage)
+BluetoothOppManager::ClientDataHandler(UnixSocketBuffer* aMessage)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -1165,12 +1165,12 @@
 // Virtual function of class SocketConsumer
 void
 BluetoothOppManager::ReceiveSocketData(BluetoothSocket* aSocket,
-                                       nsAutoPtr<UnixSocketRawData>& aMessage)
+                                       nsAutoPtr<UnixSocketBuffer>& aBuffer)
 {
   if (mIsServer) {
-    ServerDataHandler(aMessage);
+    ServerDataHandler(aBuffer);
   } else {
-    ClientDataHandler(aMessage);
+    ClientDataHandler(aBuffer);
   }
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.h	2015-04-24 19:31:04.000000000 +0000
@@ -48,8 +48,8 @@
   static const int MAX_PACKET_LENGTH = 0xFFFE;
 
   static BluetoothOppManager* Get();
-  void ClientDataHandler(mozilla::ipc::UnixSocketRawData* aMessage);
-  void ServerDataHandler(mozilla::ipc::UnixSocketRawData* aMessage);
+  void ClientDataHandler(mozilla::ipc::UnixSocketBuffer* aMessage);
+  void ServerDataHandler(mozilla::ipc::UnixSocketBuffer* aMessage);
 
   bool Listen();
 
@@ -71,7 +71,7 @@
   // The following functions are inherited from BluetoothSocketObserver
   void ReceiveSocketData(
     BluetoothSocket* aSocket,
-    nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aMessage) override;
+    nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aMessage) override;
   virtual void OnSocketConnectSuccess(BluetoothSocket* aSocket) override;
   virtual void OnSocketConnectError(BluetoothSocket* aSocket) override;
   virtual void OnSocketDisconnect(BluetoothSocket* aSocket) override;
@@ -128,7 +128,7 @@
    *         length.
    */
   bool ComposePacket(uint8_t aOpCode,
-                     mozilla::ipc::UnixSocketRawData* aMessage);
+                     mozilla::ipc::UnixSocketBuffer* aMessage);
 
   /**
    * OBEX session status.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothSocket.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothSocket.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothSocket.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothSocket.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -86,9 +86,9 @@
     MOZ_ASSERT(NS_IsMainThread());
   }
 
-  void Send(UnixSocketRawData* aData)
+  void Send(UnixSocketIOBuffer* aBuffer)
   {
-    EnqueueData(aData);
+    EnqueueData(aBuffer);
     AddWatchers(WRITE_WATCHER, false);
   }
 
@@ -656,27 +656,25 @@
   NotifyDisconnect();
 }
 
-bool
-BluetoothSocket::SendSocketData(UnixSocketRawData* aData)
+void
+BluetoothSocket::SendSocketData(UnixSocketIOBuffer* aBuffer)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  NS_ENSURE_TRUE(mImpl, false);
-
+  MOZ_ASSERT(mImpl);
   MOZ_ASSERT(!mImpl->IsShutdownOnMainThread());
 
   XRE_GetIOMessageLoop()->PostTask(
     FROM_HERE,
-    new SocketIOSendTask<DroidSocketImpl, UnixSocketRawData>(mImpl, aData));
-
-  return true;
+    new SocketIOSendTask<DroidSocketImpl, UnixSocketIOBuffer>(mImpl, aBuffer));
 }
 
 void
-BluetoothSocket::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage)
+BluetoothSocket::ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(mObserver);
-  mObserver->ReceiveSocketData(this, aMessage);
+
+  mObserver->ReceiveSocketData(this, aBuffer);
 }
 
 void
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothSocket.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothSocket.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/BluetoothSocket.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/BluetoothSocket.h	2015-04-24 19:31:04.000000000 +0000
@@ -32,15 +32,15 @@
                     const BluetoothUuid& aServiceUuid,
                     int aChannel);
 
-  void CloseSocket();
+  void CloseSocket() override;
 
-  bool SendSocketData(mozilla::ipc::UnixSocketRawData* aData);
+  void SendSocketData(mozilla::ipc::UnixSocketIOBuffer* aBuffer) override;
 
   virtual void OnConnectSuccess() override;
   virtual void OnConnectError() override;
   virtual void OnDisconnect() override;
   virtual void ReceiveSocketData(
-    nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aMessage) override;
+    nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aBuffer) override;
 
   inline void GetAddress(nsAString& aDeviceAddress)
   {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h	2015-04-24 19:31:04.000000000 +0000
@@ -17,7 +17,6 @@
 
 BEGIN_BLUETOOTH_NAMESPACE
 
-class BluetoothReplyRunnable;
 class BluetoothSocket;
 class Call;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth1/BluetoothDevice.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth1/BluetoothDevice.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth1/BluetoothDevice.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth1/BluetoothDevice.h	2015-04-24 19:31:04.000000000 +0000
@@ -18,7 +18,6 @@
 class BluetoothNamedValue;
 class BluetoothValue;
 class BluetoothSignal;
-class BluetoothSocket;
 
 class BluetoothDevice : public DOMEventTargetHelper
                       , public BluetoothSignalObserver
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth1/BluetoothPropertyContainer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth1/BluetoothPropertyContainer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth1/BluetoothPropertyContainer.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth1/BluetoothPropertyContainer.h	2015-04-24 19:31:04.000000000 +0000
@@ -10,7 +10,6 @@
 #include "BluetoothCommon.h"
 #include "BluetoothReplyRunnable.h"
 
-class nsIDOMDOMRequest;
 class nsPIDOMWindow;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth1/BluetoothService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth1/BluetoothService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth1/BluetoothService.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth1/BluetoothService.h	2015-04-24 19:31:04.000000000 +0000
@@ -27,7 +27,6 @@
 
 BEGIN_BLUETOOTH_NAMESPACE
 
-class BluetoothManager;
 class BluetoothNamedValue;
 class BluetoothReplyRunnable;
 class BluetoothSignal;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -404,11 +404,12 @@
    * - adapter is already enabled, and
    * - BluetoothService is available
    */
-  BT_ENSURE_TRUE_REJECT(!mDiscovering, NS_ERROR_DOM_INVALID_STATE_ERR);
+  BT_ENSURE_TRUE_REJECT(!mDiscovering, promise, NS_ERROR_DOM_INVALID_STATE_ERR);
   BT_ENSURE_TRUE_REJECT(mState == BluetoothAdapterState::Enabled,
+                        promise,
                         NS_ERROR_DOM_INVALID_STATE_ERR);
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   BT_API2_LOGR();
 
@@ -423,6 +424,7 @@
   nsRefPtr<BluetoothReplyRunnable> result =
     new StartDiscoveryTask(this, promise);
   BT_ENSURE_TRUE_REJECT(NS_SUCCEEDED(bs->StartDiscoveryInternal(result)),
+                        promise,
                         NS_ERROR_DOM_OPERATION_ERR);
 
   return promise.forget();
@@ -446,11 +448,12 @@
    * - adapter is already enabled, and
    * - BluetoothService is available
    */
-  BT_ENSURE_TRUE_RESOLVE(mDiscovering, JS::UndefinedHandleValue);
+  BT_ENSURE_TRUE_RESOLVE(mDiscovering, promise, JS::UndefinedHandleValue);
   BT_ENSURE_TRUE_REJECT(mState == BluetoothAdapterState::Enabled,
+                        promise,
                         NS_ERROR_DOM_INVALID_STATE_ERR);
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   BT_API2_LOGR();
 
@@ -459,6 +462,7 @@
                                    promise,
                                    NS_LITERAL_STRING("StopDiscovery"));
   BT_ENSURE_TRUE_REJECT(NS_SUCCEEDED(bs->StopDiscoveryInternal(result)),
+                        promise,
                         NS_ERROR_DOM_OPERATION_ERR);
 
   return promise.forget();
@@ -482,11 +486,14 @@
    * - adapter is already enabled, and
    * - BluetoothService is available
    */
-  BT_ENSURE_TRUE_RESOLVE(!mName.Equals(aName), JS::UndefinedHandleValue);
+  BT_ENSURE_TRUE_RESOLVE(!mName.Equals(aName),
+                         promise,
+                         JS::UndefinedHandleValue);
   BT_ENSURE_TRUE_REJECT(mState == BluetoothAdapterState::Enabled,
+                        promise,
                         NS_ERROR_DOM_INVALID_STATE_ERR);
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   // Wrap property to set and runnable to handle result
   nsString name(aName);
@@ -499,6 +506,7 @@
   BT_ENSURE_TRUE_REJECT(
     NS_SUCCEEDED(bs->SetProperty(BluetoothObjectType::TYPE_ADAPTER,
                                  property, result)),
+    promise,
     NS_ERROR_DOM_OPERATION_ERR);
 
   return promise.forget();
@@ -523,11 +531,13 @@
    * - BluetoothService is available
    */
   BT_ENSURE_TRUE_RESOLVE(mDiscoverable != aDiscoverable,
+                         promise,
                          JS::UndefinedHandleValue);
   BT_ENSURE_TRUE_REJECT(mState == BluetoothAdapterState::Enabled,
+                        promise,
                         NS_ERROR_DOM_INVALID_STATE_ERR);
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   // Wrap property to set and runnable to handle result
   BluetoothNamedValue property(NS_LITERAL_STRING("Discoverable"),
@@ -539,6 +549,7 @@
   BT_ENSURE_TRUE_REJECT(
     NS_SUCCEEDED(bs->SetProperty(BluetoothObjectType::TYPE_ADAPTER,
                                  property, result)),
+    promise,
     NS_ERROR_DOM_OPERATION_ERR);
 
   return promise.forget();
@@ -603,11 +614,13 @@
    * - BluetoothService is available.
    */
   BT_ENSURE_TRUE_REJECT(!aDeviceAddress.IsEmpty(),
+                        promise,
                         NS_ERROR_DOM_INVALID_STATE_ERR);
   BT_ENSURE_TRUE_REJECT(mState == BluetoothAdapterState::Enabled,
+                        promise,
                         NS_ERROR_DOM_INVALID_STATE_ERR);
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsresult rv;
   if (aPair) {
@@ -625,7 +638,7 @@
                                      NS_LITERAL_STRING("Unpair"));
     rv = bs->RemoveDeviceInternal(aDeviceAddress, result);
   }
-  BT_ENSURE_TRUE_REJECT(NS_SUCCEEDED(rv), NS_ERROR_DOM_OPERATION_ERR);
+  BT_ENSURE_TRUE_REJECT(NS_SUCCEEDED(rv), promise, NS_ERROR_DOM_OPERATION_ERR);
 
   return promise.forget();
 }
@@ -660,9 +673,10 @@
    * - BluetoothService is available.
    */
   BT_ENSURE_TRUE_REJECT(mState == BluetoothAdapterState::Disabled,
+                        promise,
                         NS_ERROR_DOM_INVALID_STATE_ERR);
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   // Set adapter state "Enabling"
   SetAdapterState(BluetoothAdapterState::Enabling);
@@ -700,9 +714,10 @@
    * - BluetoothService is available.
    */
   BT_ENSURE_TRUE_REJECT(mState == BluetoothAdapterState::Enabled,
+                        promise,
                         NS_ERROR_DOM_INVALID_STATE_ERR);
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   // Set adapter state "Disabling"
   SetAdapterState(BluetoothAdapterState::Disabling);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothDevice.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothDevice.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothDevice.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothDevice.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -170,7 +170,7 @@
   NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsRefPtr<BluetoothReplyRunnable> result =
     new FetchUuidsTask(promise,
@@ -178,7 +178,7 @@
                        this);
 
   nsresult rv = bs->FetchUuidsInternal(mAddress, result);
-  BT_ENSURE_TRUE_REJECT(NS_SUCCEEDED(rv), NS_ERROR_DOM_OPERATION_ERR);
+  BT_ENSURE_TRUE_REJECT(NS_SUCCEEDED(rv), promise, NS_ERROR_DOM_OPERATION_ERR);
 
   return promise.forget();
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothDevice.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothDevice.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothDevice.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothDevice.h	2015-04-24 19:31:04.000000000 +0000
@@ -27,7 +27,6 @@
 class BluetoothNamedValue;
 class BluetoothValue;
 class BluetoothSignal;
-class BluetoothSocket;
 
 class BluetoothDevice final : public DOMEventTargetHelper
                             , public BluetoothSignalObserver
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h	2015-04-24 19:31:04.000000000 +0000
@@ -16,7 +16,6 @@
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothDevice;
-class BluetoothValue;
 
 class BluetoothDiscoveryHandle final : public DOMEventTargetHelper
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -75,8 +75,8 @@
   NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
-  BT_ENSURE_TRUE_REJECT(mService, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(mService, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsRefPtr<BluetoothReplyRunnable> result =
     new BluetoothVoidReplyRunnable(
@@ -104,8 +104,8 @@
   NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
-  BT_ENSURE_TRUE_REJECT(mService, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(mService, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsRefPtr<BluetoothReplyRunnable> result =
     new BluetoothVoidReplyRunnable(
@@ -251,10 +251,11 @@
   NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
 
   BT_ENSURE_TRUE_REJECT(mProperties & GATT_CHAR_PROP_BIT_READ,
+                        promise,
                         NS_ERROR_NOT_AVAILABLE);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsRefPtr<BluetoothReplyRunnable> result = new ReadValueTask(this, promise);
   bs->GattClientReadCharacteristicValueInternal(mService->GetAppUuid(),
@@ -282,6 +283,7 @@
                           (GATT_CHAR_PROP_BIT_WRITE_NO_RESPONSE ||
                            GATT_CHAR_PROP_BIT_WRITE ||
                            GATT_CHAR_PROP_BIT_SIGNED_WRITE),
+                        promise,
                         NS_ERROR_NOT_AVAILABLE);
 
   aValue.ComputeLengthAndData();
@@ -290,7 +292,7 @@
   value.AppendElements(aValue.Data(), aValue.Length());
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsRefPtr<BluetoothReplyRunnable> result = new BluetoothVoidReplyRunnable(
     nullptr, promise, NS_LITERAL_STRING("GattClientWriteCharacteristicValue"));
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothGatt.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothGatt.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothGatt.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothGatt.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -111,14 +111,16 @@
 
   BT_ENSURE_TRUE_REJECT(
     mConnectionState == BluetoothConnectionState::Disconnected,
+    promise,
     NS_ERROR_DOM_INVALID_STATE_ERR);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   if (mAppUuid.IsEmpty()) {
     GenerateUuid(mAppUuid);
     BT_ENSURE_TRUE_REJECT(!mAppUuid.IsEmpty(),
+                          promise,
                           NS_ERROR_DOM_OPERATION_ERR);
     bs->RegisterBluetoothSignalHandler(mAppUuid, this);
   }
@@ -149,10 +151,11 @@
 
   BT_ENSURE_TRUE_REJECT(
     mConnectionState == BluetoothConnectionState::Connected,
+    promise,
     NS_ERROR_DOM_INVALID_STATE_ERR);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   UpdateConnectionState(BluetoothConnectionState::Disconnecting);
   nsRefPtr<BluetoothReplyRunnable> result =
@@ -201,10 +204,11 @@
 
   BT_ENSURE_TRUE_REJECT(
     mConnectionState == BluetoothConnectionState::Connected,
+    promise,
     NS_ERROR_DOM_INVALID_STATE_ERR);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsRefPtr<BluetoothReplyRunnable> result =
     new ReadRemoteRssiTask(promise);
@@ -228,10 +232,11 @@
   BT_ENSURE_TRUE_REJECT(
     mConnectionState == BluetoothConnectionState::Connected &&
     !mDiscoveringServices,
+    promise,
     NS_ERROR_DOM_INVALID_STATE_ERR);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   mDiscoveringServices = true;
   nsRefPtr<BluetoothReplyRunnable> result =
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -157,7 +157,7 @@
   NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsRefPtr<BluetoothReplyRunnable> result = new ReadValueTask(this, promise);
   bs->GattClientReadDescriptorValueInternal(
@@ -189,7 +189,7 @@
   value.AppendElements(aValue.Data(), aValue.Length());
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsRefPtr<BluetoothReplyRunnable> result = new BluetoothVoidReplyRunnable(
     nullptr, promise, NS_LITERAL_STRING("GattClientWriteDescriptorValue"));
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.h	2015-04-24 19:31:04.000000000 +0000
@@ -20,7 +20,6 @@
 
 class BluetoothGattCharacteristic;
 class BluetoothSignal;
-class BluetoothValue;
 
 class BluetoothGattDescriptor final : public nsISupports
                                     , public nsWrapperCache
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothGatt.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothGatt.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothGatt.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothGatt.h	2015-04-24 19:31:04.000000000 +0000
@@ -22,8 +22,6 @@
 
 BEGIN_BLUETOOTH_NAMESPACE
 
-class BluetoothReplyRunnable;
-class BluetoothService;
 class BluetoothSignal;
 class BluetoothValue;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingHandle.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingHandle.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingHandle.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingHandle.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -76,10 +76,11 @@
   NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
 
   BT_ENSURE_TRUE_REJECT(mType.EqualsLiteral(PAIRING_REQ_TYPE_ENTERPINCODE),
+                        promise,
                         NS_ERROR_DOM_INVALID_STATE_ERR);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsRefPtr<BluetoothReplyRunnable> result =
     new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */,
@@ -104,13 +105,16 @@
 
   BT_ENSURE_TRUE_REJECT(mType.EqualsLiteral(PAIRING_REQ_TYPE_CONFIRMATION) ||
                         mType.EqualsLiteral(PAIRING_REQ_TYPE_CONSENT),
+                        promise,
                         NS_ERROR_DOM_INVALID_STATE_ERR);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   BluetoothSspVariant variant;
-  BT_ENSURE_TRUE_REJECT(GetSspVariant(variant), NS_ERROR_DOM_OPERATION_ERR);
+  BT_ENSURE_TRUE_REJECT(GetSspVariant(variant),
+                        promise,
+                        NS_ERROR_DOM_OPERATION_ERR);
 
   nsRefPtr<BluetoothReplyRunnable> result =
     new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */,
@@ -135,7 +139,7 @@
   NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
 
   BluetoothService* bs = BluetoothService::Get();
-  BT_ENSURE_TRUE_REJECT(bs, NS_ERROR_NOT_AVAILABLE);
+  BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   nsRefPtr<BluetoothReplyRunnable> result =
     new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */,
@@ -147,7 +151,9 @@
       mDeviceAddress, false /* aAccept */, EmptyString(), result);
   } else { // Ssp request
     BluetoothSspVariant variant;
-    BT_ENSURE_TRUE_REJECT(GetSspVariant(variant), NS_ERROR_DOM_OPERATION_ERR);
+    BT_ENSURE_TRUE_REJECT(GetSspVariant(variant),
+                          promise,
+                          NS_ERROR_DOM_OPERATION_ERR);
 
     bs->SspReplyInternal(
       mDeviceAddress, variant, false /* aAccept */, result);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingHandle.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingHandle.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingHandle.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingHandle.h	2015-04-24 19:31:04.000000000 +0000
@@ -19,8 +19,6 @@
 
 BEGIN_BLUETOOTH_NAMESPACE
 
-class BluetoothDevice;
-
 class BluetoothPairingHandle final : public nsISupports
                                    , public nsWrapperCache
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingListener.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingListener.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingListener.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothPairingListener.h	2015-04-24 19:31:04.000000000 +0000
@@ -13,7 +13,6 @@
 
 BEGIN_BLUETOOTH_NAMESPACE
 
-class BluetoothDevice;
 class BluetoothSignal;
 
 class BluetoothPairingListener final : public DOMEventTargetHelper
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothProfileController.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothProfileController.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothProfileController.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothProfileController.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -39,12 +39,12 @@
     MOZ_ASSERT(aController);
   }
 
+private:
   virtual ~CheckProfileStatusCallback()
   {
     mController = nullptr;
   }
 
-private:
   nsRefPtr<BluetoothProfileController> mController;
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothService.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothService.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluetooth2/BluetoothService.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluetooth2/BluetoothService.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -167,6 +167,10 @@
     BT_WARNING("Unable to get value for '" BLUETOOTH_ENABLED_SETTING "'");
     return NS_OK;
   }
+
+private:
+  ~StartupTask()
+  { }
 };
 
 NS_IMPL_ISUPPORTS(BluetoothService::StartupTask, nsISettingsServiceCallback);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/BluetoothCommon.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/BluetoothCommon.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/BluetoothCommon.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/BluetoothCommon.h	2015-04-24 19:31:04.000000000 +0000
@@ -124,26 +124,26 @@
   } while(0)                                                         \
 
 /**
- * Resolve promise with |ret| if |x| is false.
+ * Resolve |promise| with |ret| if |x| is false.
  */
-#define BT_ENSURE_TRUE_RESOLVE(x, ret)                               \
+#define BT_ENSURE_TRUE_RESOLVE(x, promise, ret)                      \
   do {                                                               \
     if (MOZ_UNLIKELY(!(x))) {                                        \
       BT_API2_LOGR("BT_ENSURE_TRUE_RESOLVE(" #x ") failed");         \
-      promise->MaybeResolve(ret);                                    \
-      return promise.forget();                                       \
+      (promise)->MaybeResolve(ret);                                  \
+      return (promise).forget();                                     \
     }                                                                \
   } while(0)
 
 /**
- * Reject promise with |ret| if |x| is false.
+ * Reject |promise| with |ret| if |x| is false.
  */
-#define BT_ENSURE_TRUE_REJECT(x, ret)                                \
+#define BT_ENSURE_TRUE_REJECT(x, promise, ret)                       \
   do {                                                               \
     if (MOZ_UNLIKELY(!(x))) {                                        \
       BT_API2_LOGR("BT_ENSURE_TRUE_REJECT(" #x ") failed");          \
-      promise->MaybeReject(ret);                                     \
-      return promise.forget();                                       \
+      (promise)->MaybeReject(ret);                                   \
+      return (promise).forget();                                     \
     }                                                                \
   } while(0)
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/BluetoothInterface.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/BluetoothInterface.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/BluetoothInterface.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/BluetoothInterface.h	2015-04-24 19:31:04.000000000 +0000
@@ -712,6 +712,7 @@
   virtual void Connect(int aClientIf,
                        const nsAString& aBdAddr,
                        bool aIsDirect, /* auto connect */
+                       BluetoothTransport aTransport,
                        BluetoothGattClientResultHandler* aRes) = 0;
   virtual void Disconnect(int aClientIf,
                           const nsAString& aBdAddr,
@@ -816,6 +817,10 @@
                           int aApperance,
                           uint8_t aManufacturerLen,
                           const ArrayBuffer& aManufacturerData,
+                          uint8_t aServiceDataLen,
+                          const ArrayBuffer& aServiceData,
+                          uint8_t aServiceUUIDLen,
+                          const ArrayBuffer& aServiceUUID,
                           BluetoothGattClientResultHandler* aRes) = 0;
 
 protected:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/BluetoothSocketObserver.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/BluetoothSocketObserver.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/BluetoothSocketObserver.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/BluetoothSocketObserver.h	2015-04-24 19:31:04.000000000 +0000
@@ -19,7 +19,7 @@
 public:
   virtual void ReceiveSocketData(
     BluetoothSocket* aSocket,
-    nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aMessage) = 0;
+    nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aBuffer) = 0;
 
    /**
     * A callback function which would be called when a socket connection
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothHfpManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothHfpManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothHfpManager.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothHfpManager.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -750,7 +750,7 @@
 // Virtual function of class SocketConsumer
 void
 BluetoothHfpManager::ReceiveSocketData(BluetoothSocket* aSocket,
-                                       nsAutoPtr<UnixSocketRawData>& aMessage)
+                                       nsAutoPtr<UnixSocketBuffer>& aMessage)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aSocket);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothHfpManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothHfpManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothHfpManager.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothHfpManager.h	2015-04-24 19:31:04.000000000 +0000
@@ -90,7 +90,7 @@
   // The following functions are inherited from BluetoothSocketObserver
   virtual void ReceiveSocketData(
     BluetoothSocket* aSocket,
-    nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aMessage) override;
+    nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aMessage) override;
   virtual void OnSocketConnectSuccess(BluetoothSocket* aSocket) override;
   virtual void OnSocketConnectError(BluetoothSocket* aSocket) override;
   virtual void OnSocketDisconnect(BluetoothSocket* aSocket) override;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothOppManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothOppManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothOppManager.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothOppManager.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -832,7 +832,7 @@
 }
 
 bool
-BluetoothOppManager::ComposePacket(uint8_t aOpCode, UnixSocketRawData* aMessage)
+BluetoothOppManager::ComposePacket(uint8_t aOpCode, UnixSocketBuffer* aMessage)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aMessage);
@@ -881,7 +881,7 @@
 }
 
 void
-BluetoothOppManager::ServerDataHandler(UnixSocketRawData* aMessage)
+BluetoothOppManager::ServerDataHandler(UnixSocketBuffer* aMessage)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -1008,7 +1008,7 @@
 }
 
 void
-BluetoothOppManager::ClientDataHandler(UnixSocketRawData* aMessage)
+BluetoothOppManager::ClientDataHandler(UnixSocketBuffer* aMessage)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -1120,7 +1120,7 @@
 // Virtual function of class SocketConsumer
 void
 BluetoothOppManager::ReceiveSocketData(BluetoothSocket* aSocket,
-                                       nsAutoPtr<UnixSocketRawData>& aMessage)
+                                       nsAutoPtr<UnixSocketBuffer>& aMessage)
 {
   if (mIsServer) {
     ServerDataHandler(aMessage);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothOppManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothOppManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothOppManager.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothOppManager.h	2015-04-24 19:31:04.000000000 +0000
@@ -44,8 +44,8 @@
   static const int MAX_PACKET_LENGTH = 0xFFFE;
 
   static BluetoothOppManager* Get();
-  void ClientDataHandler(mozilla::ipc::UnixSocketRawData* aMessage);
-  void ServerDataHandler(mozilla::ipc::UnixSocketRawData* aMessage);
+  void ClientDataHandler(mozilla::ipc::UnixSocketBuffer* aMessage);
+  void ServerDataHandler(mozilla::ipc::UnixSocketBuffer* aMessage);
 
   bool Listen();
 
@@ -67,7 +67,7 @@
   // The following functions are inherited from BluetoothSocketObserver
   void ReceiveSocketData(
     BluetoothSocket* aSocket,
-    nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aMessage) override;
+    nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aMessage) override;
   virtual void OnSocketConnectSuccess(BluetoothSocket* aSocket) override;
   virtual void OnSocketConnectError(BluetoothSocket* aSocket) override;
   virtual void OnSocketDisconnect(BluetoothSocket* aSocket) override;
@@ -118,7 +118,7 @@
    *         length.
    */
   bool ComposePacket(uint8_t aOpCode,
-                     mozilla::ipc::UnixSocketRawData* aMessage);
+                     mozilla::ipc::UnixSocketBuffer* aMessage);
 
   /**
    * OBEX session status.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothSocket.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothSocket.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothSocket.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothSocket.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -67,7 +67,7 @@
    */
   void Connect();
 
-  void Send(UnixSocketRawData* aData);
+  void Send(UnixSocketIOBuffer* aBuffer);
 
   // I/O callback methods
   //
@@ -301,9 +301,9 @@
 }
 
 void
-BluetoothSocket::BluetoothSocketIO::Send(UnixSocketRawData* aData)
+BluetoothSocket::BluetoothSocketIO::Send(UnixSocketIOBuffer* aBuffer)
 {
-  EnqueueData(aData);
+  EnqueueData(aBuffer);
   AddWatchers(WRITE_WATCHER, false);
 }
 
@@ -607,11 +607,12 @@
 }
 
 void
-BluetoothSocket::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage)
+BluetoothSocket::ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(mObserver);
-  mObserver->ReceiveSocketData(this, aMessage);
+
+  mObserver->ReceiveSocketData(this, aBuffer);
 }
 
 void
@@ -638,20 +639,16 @@
   mObserver->OnSocketDisconnect(this);
 }
 
-bool
-BluetoothSocket::SendSocketData(UnixSocketRawData* aData)
+void
+BluetoothSocket::SendSocketData(UnixSocketIOBuffer* aBuffer)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (!mIO) {
-    return false;
-  }
-
+  MOZ_ASSERT(mIO);
   MOZ_ASSERT(!mIO->IsShutdownOnMainThread());
+
   XRE_GetIOMessageLoop()->PostTask(
     FROM_HERE,
-    new SocketIOSendTask<BluetoothSocketIO, UnixSocketRawData>(mIO, aData));
-
-  return true;
+    new SocketIOSendTask<BluetoothSocketIO, UnixSocketIOBuffer>(mIO, aBuffer));
 }
 
 bool
@@ -661,14 +658,7 @@
     return false;
   }
 
-  nsAutoPtr<UnixSocketRawData> data(
-    new UnixSocketRawData(aStr.BeginReading(), aStr.Length()));
-
-  if (!SendSocketData(data)) {
-    return false;
-  }
-
-  unused << data.forget();
+  SendSocketData(new UnixSocketRawData(aStr.BeginReading(), aStr.Length()));
 
   return true;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothSocket.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothSocket.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/bluez/BluetoothSocket.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/bluez/BluetoothSocket.h	2015-04-24 19:31:04.000000000 +0000
@@ -45,7 +45,7 @@
   virtual void OnConnectError() override;
   virtual void OnDisconnect() override;
   virtual void ReceiveSocketData(
-    nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aMessage) override;
+    nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aBuffer) override;
 
   inline void GetAddress(nsAString& aDeviceAddress)
   {
@@ -56,11 +56,9 @@
    * Queue data to be sent to the socket on the IO thread. Can only be called on
    * originating thread.
    *
-   * @param aMessage Data to be sent to socket
-   *
-   * @return true if data is queued, false otherwise (i.e. not connected)
+   * @param aBuffer Data to be sent to socket
    */
-  bool SendSocketData(mozilla::ipc::UnixSocketRawData* aMessage);
+  void SendSocketData(mozilla::ipc::UnixSocketIOBuffer* aBuffer) override;
 
   /**
    * Convenience function for sending strings to the socket (common in bluetooth
@@ -101,7 +99,7 @@
    * Queues the internal representation of socket for deletion. Can be called
    * from main thread.
    */
-  void CloseSocket();
+  void CloseSocket() override;
 
   /**
    * Get the current sockaddr for the socket
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/bluetooth/moz.build	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/bluetooth/moz.build	2015-04-24 19:31:04.000000000 +0000
@@ -98,6 +98,7 @@
                 'bluedroid/BluetoothDaemonInterface.cpp',
                 'bluedroid/BluetoothDaemonSetupInterface.cpp',
                 'bluedroid/BluetoothDaemonSocketInterface.cpp',
+                'bluedroid/BluetoothGattHALInterface.cpp',
                 'bluedroid/BluetoothHALHelpers.cpp',
                 'bluedroid/BluetoothHALInterface.cpp',
                 'bluedroid/BluetoothHandsfreeHALInterface.cpp',
@@ -127,7 +128,6 @@
                 ]
             if CONFIG['MOZ_B2G_BT_API_V2']:
                 SOURCES += [
-                    'bluedroid/BluetoothGattHALInterface.cpp',
                     'bluedroid/BluetoothGattManager.cpp',
                 ]
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/browser-element/BrowserElementChildPreload.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/browser-element/BrowserElementChildPreload.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/browser-element/BrowserElementChildPreload.js	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/browser-element/BrowserElementChildPreload.js	2015-04-24 19:31:04.000000000 +0000
@@ -1292,6 +1292,9 @@
           case Cr.NS_ERROR_MALWARE_URI :
             sendAsyncMsg('error', { type: 'malwareBlocked' });
             return;
+          case Cr.NS_ERROR_UNWANTED_URI :
+            sendAsyncMsg('error', { type: 'unwantedBlocked' });
+            return;
 
           case Cr.NS_ERROR_OFFLINE :
             sendAsyncMsg('error', { type: 'offline' });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/browser-element/mochitest/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/browser-element/mochitest/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/browser-element/mochitest/mochitest.ini	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/browser-element/mochitest/mochitest.ini	2015-04-24 19:31:04.000000000 +0000
@@ -162,7 +162,6 @@
 [test_browserElement_inproc_GetScreenshot.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only
 [test_browserElement_inproc_GetScreenshotDppx.html]
-skip-if = (toolkit == 'windows')
 [test_browserElement_inproc_Iconchange.html]
 [test_browserElement_inproc_LoadEvents.html]
 [test_browserElement_inproc_Manifestchange.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/browser-element/mochitest/mochitest-oop.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/browser-element/mochitest/mochitest-oop.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/browser-element/mochitest/mochitest-oop.ini	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/browser-element/mochitest/mochitest-oop.ini	2015-04-24 19:31:04.000000000 +0000
@@ -44,7 +44,6 @@
 skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_oop_GetScreenshot.html]
 [test_browserElement_oop_GetScreenshotDppx.html]
-skip-if = (toolkit == 'windows')
 [test_browserElement_oop_Iconchange.html]
 [test_browserElement_oop_LoadEvents.html]
 [test_browserElement_oop_Manifestchange.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/cache/OfflineStorage.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/cache/OfflineStorage.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/cache/OfflineStorage.h	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/cache/OfflineStorage.h	2015-04-24 19:31:05.000000000 +0000
@@ -13,8 +13,6 @@
 #include "nsIOfflineStorage.h"
 #include "nsTArray.h"
 
-class nsIThread;
-
 namespace mozilla {
 namespace dom {
 namespace cache {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/cache/ReadStream.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/cache/ReadStream.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/cache/ReadStream.h	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/cache/ReadStream.h	2015-04-24 19:31:05.000000000 +0000
@@ -15,8 +15,6 @@
 #include "nsRefPtr.h"
 #include "nsTArrayForwardDeclare.h"
 
-class nsIThread;
-
 namespace mozilla {
 namespace dom {
 namespace cache {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/camera/GonkCameraControl.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/camera/GonkCameraControl.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/camera/GonkCameraControl.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/camera/GonkCameraControl.h	2015-04-24 19:31:05.000000000 +0000
@@ -49,9 +49,6 @@
   class ImageContainer;
 }
 
-class GonkRecorderProfile;
-class GonkRecorderProfileManager;
-
 class nsGonkCameraControl : public CameraControlImpl
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/camera/ICameraControl.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/camera/ICameraControl.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/camera/ICameraControl.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/camera/ICameraControl.h	2015-04-24 19:31:05.000000000 +0000
@@ -13,8 +13,6 @@
 
 struct DeviceStorageFileDescriptor;
 
-class nsIFile;
-
 namespace mozilla {
 
 class CameraControlListener;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/CanvasRenderingContext2D.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/CanvasRenderingContext2D.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/CanvasRenderingContext2D.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/CanvasRenderingContext2D.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -1334,7 +1334,8 @@
 
    // Check that the dimensions are sane
   IntSize size(mWidth, mHeight);
-  if (size.width <= 0xFFFF && size.height <= 0xFFFF &&
+  if (size.width <= gfxPrefs::MaxCanvasSize() &&
+      size.height <= gfxPrefs::MaxCanvasSize() &&
       size.width >= 0 && size.height >= 0) {
     SurfaceFormat format = GetSurfaceFormat();
     nsIDocument* ownerDoc = nullptr;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/CanvasRenderingContext2D.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/CanvasRenderingContext2D.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/CanvasRenderingContext2D.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/CanvasRenderingContext2D.h	2015-04-24 19:31:05.000000000 +0000
@@ -42,7 +42,6 @@
 class StringOrCanvasGradientOrCanvasPattern;
 class OwningStringOrCanvasGradientOrCanvasPattern;
 class TextMetrics;
-class SVGMatrix;
 class CanvasFilterChainObserver;
 class CanvasPath;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/CanvasUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/CanvasUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/CanvasUtils.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/CanvasUtils.h	2015-04-24 19:31:05.000000000 +0000
@@ -15,10 +15,6 @@
 
 namespace mozilla {
 
-namespace gfx {
-class Matrix;
-}
-
 namespace dom {
 class HTMLCanvasElement;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/nsICanvasRenderingContextInternal.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/nsICanvasRenderingContextInternal.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/nsICanvasRenderingContextInternal.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/nsICanvasRenderingContextInternal.h	2015-04-24 19:31:05.000000000 +0000
@@ -19,7 +19,6 @@
 { 0x3cc9e801, 0x1806, 0x4ff6, \
   { 0x86, 0x14, 0xf9, 0xd0, 0xf4, 0xfb, 0x3b, 0x08 } }
 
-class gfxContext;
 class gfxASurface;
 class nsDisplayListBuilder;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGL1Context.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGL1Context.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGL1Context.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGL1Context.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -31,6 +31,13 @@
     return dom::WebGLRenderingContextBinding::Wrap(cx, this, aGivenProto);
 }
 
+bool
+WebGL1Context::ValidateQueryTarget(GLenum target, const char* info)
+{
+    // TODO: Implement this for EXT_disjoint_timer
+    return false;
+}
+
 } // namespace mozilla
 
 nsresult
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGL1Context.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGL1Context.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGL1Context.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGL1Context.h	2015-04-24 19:31:05.000000000 +0000
@@ -35,7 +35,7 @@
     virtual bool ValidateBufferIndexedTarget(GLenum target, const char* info) override;
     virtual bool ValidateBufferForTarget(GLenum target, WebGLBuffer* buffer, const char* info) override;
     virtual bool ValidateBufferUsageEnum(GLenum usage, const char* info) override;
-    
+    virtual bool ValidateQueryTarget(GLenum target, const char* info) override;
     virtual bool ValidateUniformMatrixTranspose(bool transpose, const char* info) override;
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGL2ContextBuffers.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGL2ContextBuffers.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGL2ContextBuffers.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGL2ContextBuffers.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -151,14 +151,87 @@
 
 void
 WebGL2Context::GetBufferSubData(GLenum target, GLintptr offset,
-                                const dom::ArrayBuffer& returnedData)
+                                const dom::Nullable<dom::ArrayBuffer>& maybeData)
 {
-    MOZ_CRASH("Not Implemented.");
-}
+    if (IsContextLost())
+        return;
+    
+    // For the WebGLBuffer bound to the passed target, read
+    // returnedData.byteLength bytes from the buffer starting at byte
+    // offset offset and write them to returnedData.
 
-void
-WebGL2Context::GetBufferSubData(GLenum target, GLintptr offset,
-                                const dom::ArrayBufferView& returnedData)
-{
-    MOZ_CRASH("Not Implemented.");
+    // If zero is bound to target, an INVALID_OPERATION error is
+    // generated.
+    if (!ValidateBufferTarget(target, "getBufferSubData"))
+        return;
+
+    // If offset is less than zero, an INVALID_VALUE error is
+    // generated.
+    if (offset < 0)
+        return ErrorInvalidValue("getBufferSubData: negative offset"); 
+
+    // If returnedData is null then an INVALID_VALUE error is
+    // generated.
+    if (maybeData.IsNull())
+        return ErrorInvalidValue("getBufferSubData: returnedData is null");
+
+    WebGLRefPtr<WebGLBuffer>& bufferSlot = GetBufferSlotByTarget(target);
+    WebGLBuffer* boundBuffer = bufferSlot.get();
+    if (!boundBuffer)
+        return ErrorInvalidOperation("getBufferSubData: no buffer bound");
+    
+    // If offset + returnedData.byteLength would extend beyond the end
+    // of the buffer an INVALID_VALUE error is generated.
+    const dom::ArrayBuffer& data = maybeData.Value();
+    data.ComputeLengthAndData();
+
+    CheckedInt<WebGLsizeiptr> neededByteLength = CheckedInt<WebGLsizeiptr>(offset) + data.Length();
+    if (!neededByteLength.isValid()) {
+        ErrorInvalidValue("getBufferSubData: Integer overflow computing the needed"
+                          " byte length.");
+        return;
+    }
+
+    if (neededByteLength.value() > boundBuffer->ByteLength()) {
+        ErrorInvalidValue("getBufferSubData: Not enough data. Operation requires"
+                          " %d bytes, but buffer only has %d bytes.",
+                          neededByteLength.value(), boundBuffer->ByteLength());
+        return;
+    }
+
+    // If target is TRANSFORM_FEEDBACK_BUFFER, and any transform
+    // feedback object is currently active, an INVALID_OPERATION error
+    // is generated.
+    WebGLTransformFeedback* currentTF = mBoundTransformFeedback;
+    if (target == LOCAL_GL_TRANSFORM_FEEDBACK_BUFFER && currentTF) {
+        if (currentTF->mIsActive)
+            return ErrorInvalidOperation("getBufferSubData: Currently bound transform"
+                                         " feedback is active");
+
+        // https://github.com/NVIDIA/WebGL/commit/63aff5e58c1d79825a596f0f4aa46174b9a5f72c
+        // Performing reads and writes on a buffer that is currently
+        // bound for transform feedback causes undefined results in
+        // GLES3.0 and OpenGL 4.5. In practice results of reads and
+        // writes might be consistent as long as transform feedback
+        // objects are not active, but neither GLES3.0 nor OpenGL 4.5
+        // spec guarantees this - just being bound for transform
+        // feedback is sufficient to cause undefined results.
+
+        BindTransformFeedback(LOCAL_GL_TRANSFORM_FEEDBACK, nullptr);
+    }
+
+    /* If the buffer is written and read sequentially by other
+     * operations and getBufferSubData, it is the responsibility of
+     * the WebGL API to ensure that data are access
+     * consistently. This applies even if the buffer is currently
+     * bound to a transform feedback binding point.
+     */
+
+    void* ptr = gl->fMapBufferRange(target, offset, data.Length(), LOCAL_GL_MAP_READ_BIT);
+    memcpy(data.Data(), ptr, data.Length());
+    gl->fUnmapBuffer(target);
+
+    if (target == LOCAL_GL_TRANSFORM_FEEDBACK_BUFFER && currentTF) {
+        BindTransformFeedback(LOCAL_GL_TRANSFORM_FEEDBACK, currentTF);
+    }
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGL2Context.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGL2Context.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGL2Context.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGL2Context.h	2015-04-24 19:31:05.000000000 +0000
@@ -44,8 +44,9 @@
 
     void CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
                            GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-    void GetBufferSubData(GLenum target, GLintptr offset, const dom::ArrayBuffer& returnedData);
-    void GetBufferSubData(GLenum target, GLintptr offset, const dom::ArrayBufferView& returnedData);
+    void GetBufferSubData(GLenum target, GLintptr offset,
+                          const dom::Nullable<dom::ArrayBuffer>& maybeData);
+
 
     // -------------------------------------------------------------------------
     // Framebuffer objects - WebGL2ContextFramebuffers.cpp
@@ -355,6 +356,8 @@
 
     JS::Value GetTexParameterInternal(const TexTarget& target, GLenum pname) override;
 
+    void UpdateBoundQuery(GLenum target, WebGLQuery* query);
+
     bool ValidateSizedInternalFormat(GLenum internalFormat, const char* info);
     bool ValidateTexStorage(GLenum target, GLsizei levels, GLenum internalformat,
                                 GLsizei width, GLsizei height, GLsizei depth,
@@ -365,7 +368,7 @@
     virtual bool ValidateBufferIndexedTarget(GLenum target, const char* info) override;
     virtual bool ValidateBufferForTarget(GLenum target, WebGLBuffer* buffer, const char* info) override;
     virtual bool ValidateBufferUsageEnum(GLenum usage, const char* info) override;
-
+    virtual bool ValidateQueryTarget(GLenum target, const char* info) override;
     virtual bool ValidateUniformMatrixTranspose(bool transpose, const char* info) override;
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGL2ContextQueries.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGL2ContextQueries.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGL2ContextQueries.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGL2ContextQueries.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -7,8 +7,7 @@
 #include "GLContext.h"
 #include "WebGLQuery.h"
 
-using namespace mozilla;
-using namespace mozilla::dom;
+namespace mozilla {
 
 /*
  * We fake ANY_SAMPLES_PASSED and ANY_SAMPLES_PASSED_CONSERVATIVE with
@@ -26,14 +25,14 @@
 {
     switch (target)
     {
-        case LOCAL_GL_ANY_SAMPLES_PASSED:
-            return "ANY_SAMPLES_PASSED";
-        case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
-            return "ANY_SAMPLES_PASSED_CONSERVATIVE";
-        case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
-            return "TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN";
-        default:
-            break;
+    case LOCAL_GL_ANY_SAMPLES_PASSED:
+        return "ANY_SAMPLES_PASSED";
+    case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
+        return "ANY_SAMPLES_PASSED_CONSERVATIVE";
+    case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
+        return "TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN";
+    default:
+        break;
     }
 
     MOZ_ASSERT(false, "Unknown query `target`.");
@@ -56,19 +55,23 @@
     return LOCAL_GL_SAMPLES_PASSED;
 }
 
-WebGLRefPtr<WebGLQuery>*
-WebGLContext::GetQueryTargetSlot(GLenum target)
+WebGLRefPtr<WebGLQuery>&
+WebGLContext::GetQuerySlotByTarget(GLenum target)
 {
+    /* This function assumes that target has been validated for either
+     * WebGL1 or WebGL2.
+     */
     switch (target) {
-        case LOCAL_GL_ANY_SAMPLES_PASSED:
-        case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
-            return &mActiveOcclusionQuery;
+    case LOCAL_GL_ANY_SAMPLES_PASSED:
+    case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
+        return mActiveOcclusionQuery;
 
-        case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
-            return &mActiveTransformFeedbackQuery;
-    }
+    case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
+        return mActiveTransformFeedbackQuery;
 
-    return nullptr;
+    default:
+        MOZ_CRASH("Should not get here.");
+    }
 }
 
 
@@ -152,11 +155,8 @@
     if (IsContextLost())
         return;
 
-    WebGLRefPtr<WebGLQuery>* targetSlot = GetQueryTargetSlot(target);
-    if (!targetSlot) {
-        ErrorInvalidEnum("beginQuery: unknown query target");
+    if (!ValidateQueryTarget(target, "beginQuery"))
         return;
-    }
 
     if (!query) {
         /* From GLES's EXT_occlusion_query_boolean:
@@ -193,10 +193,10 @@
         return;
     }
 
-    if (*targetSlot) {
-        ErrorInvalidOperation("beginQuery: An other query already active.");
-        return;
-    }
+    WebGLRefPtr<WebGLQuery>& querySlot = GetQuerySlotByTarget(target);
+    WebGLQuery* activeQuery = querySlot.get();
+    if (activeQuery)
+        return ErrorInvalidOperation("beginQuery: An other query already active.");
 
     if (!query->HasEverBeenActive())
         query->mType = target;
@@ -211,7 +211,7 @@
                         query->mGLName);
     }
 
-    *targetSlot = query;
+    UpdateBoundQuery(target, query);
 }
 
 void
@@ -220,14 +220,13 @@
     if (IsContextLost())
         return;
 
-    WebGLRefPtr<WebGLQuery>* targetSlot = GetQueryTargetSlot(target);
-    if (!targetSlot) {
-        ErrorInvalidEnum("endQuery: unknown query target");
+    if (!ValidateQueryTarget(target, "endQuery"))
         return;
-    }
 
-    if (!*targetSlot ||
-        target != (*targetSlot)->mType)
+    WebGLRefPtr<WebGLQuery>& querySlot = GetQuerySlotByTarget(target);
+    WebGLQuery* activeQuery = querySlot.get();
+
+    if (!activeQuery || target != activeQuery->mType)
     {
         /* From GLES's EXT_occlusion_query_boolean:
          *     marks the end of the sequence of commands to be tracked for the
@@ -255,7 +254,7 @@
         gl->fEndQuery(SimulateOcclusionQueryTarget(gl, target));
     }
 
-    *targetSlot = nullptr;
+    UpdateBoundQuery(target, nullptr);
 }
 
 already_AddRefed<WebGLQuery>
@@ -264,11 +263,8 @@
     if (IsContextLost())
         return nullptr;
 
-    WebGLRefPtr<WebGLQuery>* targetSlot = GetQueryTargetSlot(target);
-    if (!targetSlot) {
-        ErrorInvalidEnum("getQuery: unknown query target");
+    if (!ValidateQueryTarget(target, "getQuery"))
         return nullptr;
-    }
 
     if (pname != LOCAL_GL_CURRENT_QUERY) {
         /* OpenGL ES 3.0 spec 6.1.7:
@@ -278,7 +274,9 @@
         return nullptr;
     }
 
-    nsRefPtr<WebGLQuery> tmp = targetSlot->get();
+    WebGLRefPtr<WebGLQuery>& targetSlot = GetQuerySlotByTarget(target);
+
+    nsRefPtr<WebGLQuery> tmp = targetSlot.get();
     return tmp.forget();
 }
 
@@ -353,3 +351,27 @@
 
     ErrorInvalidEnum("getQueryObject: `pname` must be QUERY_RESULT{_AVAILABLE}.");
 }
+
+void
+WebGL2Context::UpdateBoundQuery(GLenum target, WebGLQuery* query)
+{
+    WebGLRefPtr<WebGLQuery>& querySlot = GetQuerySlotByTarget(target);
+    querySlot = query;
+}
+
+bool
+WebGL2Context::ValidateQueryTarget(GLenum target, const char* info)
+{
+    switch (target) {
+    case LOCAL_GL_ANY_SAMPLES_PASSED:
+    case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
+    case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
+        return true;
+
+    default:
+        ErrorInvalidEnumInfo(info, target);
+        return false;
+    }
+}
+
+} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLContext.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLContext.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLContext.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLContext.h	2015-04-24 19:31:05.000000000 +0000
@@ -68,7 +68,6 @@
 namespace mozilla {
 
 class WebGLActiveInfo;
-class WebGLContextBoundObject;
 class WebGLContextLossHandler;
 class WebGLBuffer;
 class WebGLExtensionBase;
@@ -84,7 +83,6 @@
 class WebGLTransformFeedback;
 class WebGLUniformLocation;
 class WebGLVertexArray;
-struct WebGLVertexAttribData;
 
 namespace dom {
 class Element;
@@ -936,7 +934,7 @@
 // -----------------------------------------------------------------------------
 // Queries (WebGL2ContextQueries.cpp)
 protected:
-    WebGLRefPtr<WebGLQuery>* GetQueryTargetSlot(GLenum target);
+    WebGLRefPtr<WebGLQuery>& GetQuerySlotByTarget(GLenum target);
 
     WebGLRefPtr<WebGLQuery> mActiveOcclusionQuery;
     WebGLRefPtr<WebGLQuery> mActiveTransformFeedbackQuery;
@@ -1389,6 +1387,7 @@
     virtual bool ValidateBufferIndexedTarget(GLenum target, const char* info) = 0;
     virtual bool ValidateBufferForTarget(GLenum target, WebGLBuffer* buffer, const char* info) = 0;
     virtual bool ValidateBufferUsageEnum(GLenum usage, const char* info) = 0;
+    virtual bool ValidateQueryTarget(GLenum usage, const char* info) = 0;
     virtual bool ValidateUniformMatrixTranspose(bool transpose, const char* info) = 0;
 
 protected:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLContextValidate.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLContextValidate.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLContextValidate.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLContextValidate.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -1949,6 +1949,21 @@
     mDefaultVertexArray->mAttribs.SetLength(mGLMaxVertexAttribs);
     mBoundVertexArray = mDefaultVertexArray;
 
+    // OpenGL core profiles remove the default VAO object from version
+    // 4.0.0. We create a default VAO for all core profiles,
+    // regardless of version.
+    //
+    // GL Spec 4.0.0:
+    // (https://www.opengl.org/registry/doc/glspec40.core.20100311.pdf)
+    // in Section E.2.2 "Removed Features", pg 397: "[...] The default
+    // vertex array object (the name zero) is also deprecated. [...]"
+
+    if (gl->IsCoreProfile()) {
+        MakeContextCurrent();
+        mDefaultVertexArray->GenVertexArray();
+        mDefaultVertexArray->BindVertexArray();
+    }
+
     if (mLoseContextOnMemoryPressure)
         mContextObserver->RegisterMemoryPressureEvent();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLFramebuffer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLFramebuffer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLFramebuffer.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLFramebuffer.h	2015-04-24 19:31:05.000000000 +0000
@@ -14,7 +14,6 @@
 
 namespace mozilla {
 
-class WebGLFramebufferAttachable;
 class WebGLRenderbuffer;
 class WebGLTexture;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLObjectModel.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLObjectModel.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLObjectModel.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLObjectModel.h	2015-04-24 19:31:05.000000000 +0000
@@ -12,7 +12,6 @@
 
 namespace mozilla {
 
-class WebGLBuffer;
 class WebGLContext;
 
 /* Each WebGL object class WebGLFoo wants to:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLQuery.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLQuery.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLQuery.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLQuery.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -40,10 +40,9 @@
 bool
 WebGLQuery::IsActive() const
 {
-    WebGLRefPtr<WebGLQuery>* targetSlot = mContext->GetQueryTargetSlot(mType);
+    WebGLRefPtr<WebGLQuery>& targetSlot = mContext->GetQuerySlotByTarget(mType);
 
-    MOZ_ASSERT(targetSlot, "unknown query object's type");
-    return targetSlot && *targetSlot == this;
+    return targetSlot.get() == this;
 }
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLQuery)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLShaderPrecisionFormat.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLShaderPrecisionFormat.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLShaderPrecisionFormat.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLShaderPrecisionFormat.h	2015-04-24 19:31:05.000000000 +0000
@@ -10,8 +10,6 @@
 
 namespace mozilla {
 
-class WebGLBuffer;
-
 class WebGLShaderPrecisionFormat final
     : public WebGLContextBoundObject
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLStrongTypes.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLStrongTypes.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLStrongTypes.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLStrongTypes.h	2015-04-24 19:31:05.000000000 +0000
@@ -445,9 +445,13 @@
 STRONG_GLENUM_END(VAOBinding)
 
 STRONG_GLENUM_BEGIN(BufferBinding)
-    STRONG_GLENUM_VALUE(NONE),
-    STRONG_GLENUM_VALUE(ARRAY_BUFFER),
-    STRONG_GLENUM_VALUE(ELEMENT_ARRAY_BUFFER),
+    STRONG_GLENUM_VALUE(NONE),                      // 0x0000
+    STRONG_GLENUM_VALUE(ARRAY_BUFFER),              // 0x8892
+    STRONG_GLENUM_VALUE(ELEMENT_ARRAY_BUFFER),      // 0x8893
+    STRONG_GLENUM_VALUE(PIXEL_PACK_BUFFER),         // 0x88EB
+    STRONG_GLENUM_VALUE(PIXEL_UNPACK_BUFFER),       // 0x88EC
+    STRONG_GLENUM_VALUE(UNIFORM_BUFFER),            // 0x8A11
+    STRONG_GLENUM_VALUE(TRANSFORM_FEEDBACK_BUFFER), // 0x8C8E
 STRONG_GLENUM_END(BufferBinding)
 
 #endif // WEBGL_STRONG_TYPES_H_
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLTexture.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLTexture.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/canvas/WebGLTexture.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/canvas/WebGLTexture.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -14,6 +14,7 @@
 #include "WebGLContext.h"
 #include "WebGLContextUtils.h"
 #include "WebGLTexelConversions.h"
+#include "mozilla/gfx/Logging.h"
 
 namespace mozilla {
 
@@ -689,6 +690,7 @@
     if (error) {
         // Should only be OUT_OF_MEMORY. Anyway, there's no good way to recover
         // from this here.
+        gfxCriticalError() << "GL context GetAndFlushUnderlyingGLErrors " << gfx::hexa(error);
         printf_stderr("Error: 0x%4x\n", error);
         MOZ_CRASH(); // Errors on texture upload have been related to video
                      // memory exposure in the past.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/datastore/DataStoreCursor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/datastore/DataStoreCursor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/datastore/DataStoreCursor.h	2015-04-22 13:05:53.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/datastore/DataStoreCursor.h	2015-04-24 19:31:06.000000000 +0000
@@ -9,8 +9,6 @@
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 
-class nsPIDOMWindow;
-
 namespace mozilla {
 
 class ErrorResult;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/datastore/DataStoreDB.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/datastore/DataStoreDB.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/datastore/DataStoreDB.h	2015-04-22 13:05:53.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/datastore/DataStoreDB.h	2015-04-24 19:31:06.000000000 +0000
@@ -21,7 +21,6 @@
 namespace indexedDB {
 class IDBDatabase;
 class IDBFactory;
-class IDBObjectStore;
 class IDBOpenDBRequest;
 class IDBTransaction;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/events/EventDispatcher.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/events/EventDispatcher.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/events/EventDispatcher.h	2015-04-22 13:05:53.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/events/EventDispatcher.h	2015-04-24 19:31:06.000000000 +0000
@@ -16,7 +16,6 @@
 
 class nsIContent;
 class nsIDOMEvent;
-class nsIScriptGlobalObject;
 class nsPresContext;
 
 template<class E> class nsCOMArray;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/events/Event.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/events/Event.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/events/Event.h	2015-04-22 13:05:53.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/events/Event.h	2015-04-24 19:31:06.000000000 +0000
@@ -33,11 +33,10 @@
 #define GENERATED_EVENT(EventClass_) class EventClass_;
 #include "mozilla/dom/GeneratedEventList.h"
 #undef GENERATED_EVENT
-// ExtendableEvent and InstallEvent are ServiceWorker events that are not
-// autogenerated since they have some extra methods.
+// ExtendableEvent is a ServiceWorker event that is not
+// autogenerated since it has some extra methods.
 namespace workers {
 class ExtendableEvent;
-class InstallEvent;
 } // namespace workers
 
 // Dummy class so we can cast through it to get from nsISupports to
@@ -102,17 +101,12 @@
 #include "mozilla/dom/GeneratedEventList.h"
 #undef GENERATED_EVENT
 
-  // ExtendableEvent and InstallEvent are ServiceWorker events that are not
-  // autogenerated since they have some extra methods.
+  // ExtendableEvent is a ServiceWorker event that is not
+  // autogenerated since it has some extra methods.
   virtual workers::ExtendableEvent* AsExtendableEvent()
   {
     return nullptr;
   }
-
-  virtual workers::InstallEvent* AsInstallEvent()
-  {
-    return nullptr;
-  }
 
   // nsIDOMEvent Interface
   NS_DECL_NSIDOMEVENT
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/events/EventListenerManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/events/EventListenerManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/events/EventListenerManager.h	2015-04-22 13:05:53.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/events/EventListenerManager.h	2015-04-24 19:31:06.000000000 +0000
@@ -19,7 +19,6 @@
 class nsIDocShell;
 class nsIDOMEvent;
 class nsIEventListenerInfo;
-class nsIScriptContext;
 class nsPIDOMWindow;
 class JSTracer;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/events/EventTarget.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/events/EventTarget.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/events/EventTarget.h	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/events/EventTarget.h	2015-04-24 19:31:06.000000000 +0000
@@ -11,7 +11,6 @@
 #include "nsIAtom.h"
 
 class nsIDOMWindow;
-class nsIDOMEventListener;
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/events/IMEStateManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/events/IMEStateManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/events/IMEStateManager.h	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/events/IMEStateManager.h	2015-04-24 19:31:06.000000000 +0000
@@ -13,7 +13,6 @@
 class nsIDOMMouseEvent;
 class nsIEditor;
 class nsINode;
-class nsPIDOMWindow;
 class nsPresContext;
 class nsISelection;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/FetchDriver.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/FetchDriver.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/FetchDriver.cpp	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/FetchDriver.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -20,6 +20,7 @@
 #include "nsDataHandler.h"
 #include "nsHostObjectProtocolHandler.h"
 #include "nsNetUtil.h"
+#include "nsPrintfCString.h"
 #include "nsStreamUtils.h"
 #include "nsStringStream.h"
 
@@ -501,7 +502,7 @@
     // directly.
     nsRefPtr<nsCORSListenerProxy> corsListener =
       new nsCORSListenerProxy(this, mPrincipal, useCredentials);
-    rv = corsListener->Init(chan, true /* allow data uri */);
+    rv = corsListener->Init(chan, DataURIHandling::Allow);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return FailWithNetworkError();
     }
@@ -629,7 +630,13 @@
   {
     ErrorResult result;
     mResponse->Headers()->Append(aHeader, aValue, result);
-    return result.ErrorCode();
+    if (result.Failed()) {
+      NS_WARNING(nsPrintfCString("Fetch ignoring illegal header - '%s': '%s'",
+                                 PromiseFlatCString(aHeader).get(),
+                                 PromiseFlatCString(aValue).get()).get());
+      result.ClearMessage();
+    }
+    return NS_OK;
   }
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/FetchDriver.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/FetchDriver.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/FetchDriver.h	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/FetchDriver.h	2015-04-24 19:31:06.000000000 +0000
@@ -24,7 +24,6 @@
 namespace mozilla {
 namespace dom {
 
-class BlobSet;
 class InternalRequest;
 class InternalResponse;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/Fetch.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/Fetch.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/Fetch.h	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/Fetch.h	2015-04-24 19:31:06.000000000 +0000
@@ -20,7 +20,6 @@
 #include "mozilla/dom/RequestBinding.h"
 #include "mozilla/dom/workers/bindings/WorkerFeature.h"
 
-class nsIOutputStream;
 class nsIGlobalObject;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/Headers.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/Headers.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/Headers.h	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/Headers.h	2015-04-24 19:31:06.000000000 +0000
@@ -14,8 +14,6 @@
 
 #include "InternalHeaders.h"
 
-class nsPIDOMWindow;
-
 namespace mozilla {
 
 class ErrorResult;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/InternalHeaders.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/InternalHeaders.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/InternalHeaders.h	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/InternalHeaders.h	2015-04-24 19:31:06.000000000 +0000
@@ -14,8 +14,6 @@
 #include "nsClassHashtable.h"
 #include "nsWrapperCache.h"
 
-class nsPIDOMWindow;
-
 namespace mozilla {
 
 class ErrorResult;
@@ -23,7 +21,6 @@
 namespace dom {
 
 template<typename T> class MozMap;
-class HeadersOrByteStringSequenceSequenceOrByteStringMozMap;
 
 class InternalHeaders final
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/InternalRequest.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/InternalRequest.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/InternalRequest.h	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/InternalRequest.h	2015-04-24 19:31:06.000000000 +0000
@@ -19,9 +19,6 @@
 #include "nsServiceManagerUtils.h"
 #endif
 
-class nsIDocument;
-class nsPIDOMWindow;
-
 namespace mozilla {
 namespace dom {
 
@@ -84,7 +81,6 @@
  * TODO: Split TYPE_OBJECT into TYPE_EMBED and TYPE_OBJECT
  */
 
-class FetchBodyStream;
 class Request;
 
 #define kFETCH_CLIENT_REFERRER_STR "about:client"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/Request.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/Request.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/Request.h	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/Request.h	2015-04-24 19:31:06.000000000 +0000
@@ -16,14 +16,11 @@
 // files.
 #include "mozilla/dom/RequestBinding.h"
 
-class nsPIDOMWindow;
-
 namespace mozilla {
 namespace dom {
 
 class Headers;
 class InternalHeaders;
-class Promise;
 class RequestOrUSVString;
 
 class Request final : public nsISupports
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/Response.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/Response.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fetch/Response.h	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fetch/Response.h	2015-04-24 19:31:06.000000000 +0000
@@ -14,15 +14,11 @@
 
 #include "InternalResponse.h"
 
-class nsPIDOMWindow;
-
 namespace mozilla {
 namespace dom {
 
-class ArrayBufferOrArrayBufferViewOrUSVStringOrURLSearchParams;
 class Headers;
 class InternalHeaders;
-class Promise;
 
 class Response final : public nsISupports
                      , public FetchBody<Response>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/filesystem/FileSystemTaskBase.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/filesystem/FileSystemTaskBase.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/filesystem/FileSystemTaskBase.h	2015-04-22 13:05:54.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/filesystem/FileSystemTaskBase.h	2015-04-24 19:31:06.000000000 +0000
@@ -19,7 +19,6 @@
 class BlobParent;
 class FileSystemBase;
 class FileSystemParams;
-class Promise;
 
 /*
  * The base class to implement a Task class.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fmradio/FMRadio.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fmradio/FMRadio.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/fmradio/FMRadio.h	2015-04-22 13:05:55.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/fmradio/FMRadio.h	2015-04-24 19:31:06.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsWeakReference.h"
 
 class nsPIDOMWindow;
-class nsIScriptContext;
 
 BEGIN_FMRADIO_NAMESPACE
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/android/AndroidGamepad.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/android/AndroidGamepad.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/android/AndroidGamepad.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/android/AndroidGamepad.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,22 @@
+/* -*- 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 "AndroidBridge.h"
+
+namespace mozilla {
+namespace dom {
+
+void StartGamepadMonitoring()
+{
+  widget::GeckoAppShell::StartMonitoringGamepad();
+}
+
+void StopGamepadMonitoring()
+{
+  widget::GeckoAppShell::StopMonitoringGamepad();
+}
+
+} // namespace dom
+} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/cocoa/CocoaGamepad.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/cocoa/CocoaGamepad.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/cocoa/CocoaGamepad.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/cocoa/CocoaGamepad.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,522 @@
+/* -*- Mode: C++; 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/. */
+
+// mostly derived from the Allegro source code at:
+// http://alleg.svn.sourceforge.net/viewvc/alleg/allegro/branches/4.9/src/macosx/hidjoy.m?revision=13760&view=markup
+
+#include "mozilla/dom/GamepadFunctions.h"
+#include "mozilla/ArrayUtils.h"
+#include <CoreFoundation/CoreFoundation.h>
+#include <IOKit/hid/IOHIDBase.h>
+#include <IOKit/hid/IOHIDKeys.h>
+#include <IOKit/hid/IOHIDManager.h>
+
+#include <stdio.h>
+#include <vector>
+
+namespace {
+
+using namespace mozilla;
+using namespace mozilla::dom::GamepadFunctions;
+using std::vector;
+
+struct Button {
+  int id;
+  bool analog;
+  IOHIDElementRef element;
+  CFIndex min;
+  CFIndex max;
+
+  Button(int aId, IOHIDElementRef aElement, CFIndex aMin, CFIndex aMax) :
+    id(aId),
+    analog((aMax - aMin) > 1),
+    element(aElement),
+    min(aMin),
+    max(aMax) {}
+};
+
+struct Axis {
+  int id;
+  IOHIDElementRef element;
+  uint32_t usagePage;
+  uint32_t usage;
+  CFIndex min;
+  CFIndex max;
+};
+
+typedef bool dpad_buttons[4];
+
+// These values can be found in the USB HID Usage Tables:
+// http://www.usb.org/developers/hidpage
+const unsigned kDesktopUsagePage = 0x01;
+const unsigned kSimUsagePage = 0x02;
+const unsigned kAcceleratorUsage = 0xC4;
+const unsigned kBrakeUsage = 0xC5;
+const unsigned kJoystickUsage = 0x04;
+const unsigned kGamepadUsage = 0x05;
+const unsigned kAxisUsageMin = 0x30;
+const unsigned kAxisUsageMax = 0x35;
+const unsigned kDpadUsage = 0x39;
+const unsigned kButtonUsagePage = 0x09;
+const unsigned kConsumerPage = 0x0C;
+const unsigned kHomeUsage = 0x223;
+const unsigned kBackUsage = 0x224;
+
+
+class Gamepad {
+ private:
+  IOHIDDeviceRef mDevice;
+  nsTArray<Button> buttons;
+  nsTArray<Axis> axes;
+  IOHIDElementRef mDpad;
+  dpad_buttons mDpadState;
+
+ public:
+  Gamepad() : mDevice(nullptr), mDpad(nullptr), mSuperIndex(-1) {}
+  bool operator==(IOHIDDeviceRef device) const { return mDevice == device; }
+  bool empty() const { return mDevice == nullptr; }
+  void clear()
+  {
+    mDevice = nullptr;
+    buttons.Clear();
+    axes.Clear();
+    mDpad = nullptr;
+    mSuperIndex = -1;
+  }
+  void init(IOHIDDeviceRef device);
+  size_t numButtons() { return buttons.Length() + (mDpad ? 4 : 0); }
+  size_t numAxes() { return axes.Length(); }
+
+  // Index given by our superclass.
+  uint32_t mSuperIndex;
+
+  const bool isDpad(IOHIDElementRef element) const
+  {
+    return element == mDpad;
+  }
+
+  const dpad_buttons& getDpadState() const
+  {
+    return mDpadState;
+  }
+
+  void setDpadState(const dpad_buttons& dpadState)
+  {
+    for (unsigned i = 0; i < ArrayLength(mDpadState); i++) {
+      mDpadState[i] = dpadState[i];
+    }
+  }
+
+  const Button* lookupButton(IOHIDElementRef element) const
+  {
+    for (unsigned i = 0; i < buttons.Length(); i++) {
+      if (buttons[i].element == element)
+        return &buttons[i];
+    }
+    return nullptr;
+  }
+
+  const Axis* lookupAxis(IOHIDElementRef element) const
+  {
+    for (unsigned i = 0; i < axes.Length(); i++) {
+      if (axes[i].element == element)
+        return &axes[i];
+    }
+    return nullptr;
+  }
+};
+
+class AxisComparator {
+public:
+  bool Equals(const Axis& a1, const Axis& a2) const
+  {
+    return a1.usagePage == a2.usagePage && a1.usage == a2.usage;
+  }
+  bool LessThan(const Axis& a1, const Axis& a2) const
+  {
+    if (a1.usagePage == a2.usagePage) {
+      return a1.usage < a2.usage;
+    }
+    return a1.usagePage < a2.usagePage;
+  }
+};
+
+void Gamepad::init(IOHIDDeviceRef device)
+{
+  clear();
+  mDevice = device;
+
+  CFArrayRef elements = IOHIDDeviceCopyMatchingElements(device,
+                                                        nullptr,
+                                                        kIOHIDOptionsTypeNone);
+  CFIndex n = CFArrayGetCount(elements);
+  for (CFIndex i = 0; i < n; i++) {
+    IOHIDElementRef element = (IOHIDElementRef)CFArrayGetValueAtIndex(elements,
+                                                                      i);
+    uint32_t usagePage = IOHIDElementGetUsagePage(element);
+    uint32_t usage = IOHIDElementGetUsage(element);
+
+    if (usagePage == kDesktopUsagePage &&
+        usage >= kAxisUsageMin &&
+        usage <= kAxisUsageMax)
+    {
+      Axis axis = { int(axes.Length()),
+                    element,
+                    usagePage,
+                    usage,
+                    IOHIDElementGetLogicalMin(element),
+                    IOHIDElementGetLogicalMax(element) };
+      axes.AppendElement(axis);
+    } else if (usagePage == kDesktopUsagePage && usage == kDpadUsage &&
+               // Don't know how to handle d-pads that return weird values.
+               IOHIDElementGetLogicalMax(element) - IOHIDElementGetLogicalMin(element) == 7) {
+      mDpad = element;
+    } else if ((usagePage == kSimUsagePage &&
+                 (usage == kAcceleratorUsage ||
+                  usage == kBrakeUsage)) ||
+               (usagePage == kButtonUsagePage) ||
+               (usagePage == kConsumerPage &&
+                 (usage == kHomeUsage ||
+                  usage == kBackUsage))) {
+      Button button(int(buttons.Length()), element, IOHIDElementGetLogicalMin(element), IOHIDElementGetLogicalMax(element));
+      buttons.AppendElement(button);
+    } else {
+      //TODO: handle other usage pages
+    }
+  }
+
+  AxisComparator comparator;
+  axes.Sort(comparator);
+  for (unsigned i = 0; i < axes.Length(); i++) {
+    axes[i].id = i;
+  }
+}
+
+class DarwinGamepadService {
+ private:
+  IOHIDManagerRef mManager;
+  vector<Gamepad> mGamepads;
+
+  static void DeviceAddedCallback(void* data, IOReturn result,
+                                  void* sender, IOHIDDeviceRef device);
+  static void DeviceRemovedCallback(void* data, IOReturn result,
+                                    void* sender, IOHIDDeviceRef device);
+  static void InputValueChangedCallback(void* data, IOReturn result,
+                                        void* sender, IOHIDValueRef newValue);
+
+  void DeviceAdded(IOHIDDeviceRef device);
+  void DeviceRemoved(IOHIDDeviceRef device);
+  void InputValueChanged(IOHIDValueRef value);
+
+ public:
+  DarwinGamepadService();
+  ~DarwinGamepadService();
+  void Startup();
+  void Shutdown();
+};
+
+void
+DarwinGamepadService::DeviceAdded(IOHIDDeviceRef device)
+{
+  size_t slot = size_t(-1);
+  for (size_t i = 0; i < mGamepads.size(); i++) {
+    if (mGamepads[i] == device)
+      return;
+    if (slot == size_t(-1) && mGamepads[i].empty())
+      slot = i;
+  }
+
+  if (slot == size_t(-1)) {
+    slot = mGamepads.size();
+    mGamepads.push_back(Gamepad());
+  }
+  mGamepads[slot].init(device);
+
+  // Gather some identifying information
+  CFNumberRef vendorIdRef =
+    (CFNumberRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDVendorIDKey));
+  CFNumberRef productIdRef =
+    (CFNumberRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductIDKey));
+  CFStringRef productRef =
+    (CFStringRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey));
+  int vendorId, productId;
+  CFNumberGetValue(vendorIdRef, kCFNumberIntType, &vendorId);
+  CFNumberGetValue(productIdRef, kCFNumberIntType, &productId);
+  char product_name[128];
+  CFStringGetCString(productRef, product_name,
+                     sizeof(product_name), kCFStringEncodingASCII);
+  char buffer[256];
+  sprintf(buffer, "%x-%x-%s", vendorId, productId, product_name);
+  mGamepads[slot].mSuperIndex = AddGamepad(buffer,
+                                           mozilla::dom::GamepadMappingType::_empty,
+                                           (int)mGamepads[slot].numButtons(),
+                                           (int)mGamepads[slot].numAxes());
+}
+
+void
+DarwinGamepadService::DeviceRemoved(IOHIDDeviceRef device)
+{
+  for (size_t i = 0; i < mGamepads.size(); i++) {
+    if (mGamepads[i] == device) {
+      RemoveGamepad(mGamepads[i].mSuperIndex);
+      mGamepads[i].clear();
+      return;
+    }
+  }
+}
+
+/*
+ * Given a value from a d-pad (POV hat in USB HID terminology),
+ * represent it as 4 buttons, one for each cardinal direction.
+ */
+static void
+UnpackDpad(int dpad_value, int min, int max, dpad_buttons& buttons)
+{
+  const unsigned kUp = 0;
+  const unsigned kDown = 1;
+  const unsigned kLeft = 2;
+  const unsigned kRight = 3;
+
+  // Different controllers have different ways of representing
+  // "nothing is pressed", but they're all outside the range of values.
+  if (dpad_value < min || dpad_value > max) {
+    // Nothing is pressed.
+    return;
+  }
+
+  // Normalize value to start at 0.
+  int value = dpad_value - min;
+
+  // Value will be in the range 0-7. The value represents the
+  // position of the d-pad around a circle, with 0 being straight up,
+  // 2 being right, 4 being straight down, and 6 being left.
+  if (value < 2 || value > 6) {
+    buttons[kUp] = true;
+  }
+  if (value > 2 && value < 6) {
+    buttons[kDown] = true;
+  }
+  if (value > 4) {
+    buttons[kLeft] = true;
+  }
+  if (value > 0 && value < 4) {
+    buttons[kRight] = true;
+  }
+}
+
+void
+DarwinGamepadService::InputValueChanged(IOHIDValueRef value)
+{
+  uint32_t value_length = IOHIDValueGetLength(value);
+  if (value_length > 4) {
+    // Workaround for bizarre issue with PS3 controllers that try to return
+    // massive (30+ byte) values and crash IOHIDValueGetIntegerValue
+    return;
+  }
+  IOHIDElementRef element = IOHIDValueGetElement(value);
+  IOHIDDeviceRef device = IOHIDElementGetDevice(element);
+  for (unsigned i = 0; i < mGamepads.size(); i++) {
+    Gamepad &gamepad = mGamepads[i];
+    if (gamepad == device) {
+      if (gamepad.isDpad(element)) {
+        const dpad_buttons& oldState = gamepad.getDpadState();
+        dpad_buttons newState = { false, false, false, false };
+        UnpackDpad(IOHIDValueGetIntegerValue(value),
+                   IOHIDElementGetLogicalMin(element),
+                   IOHIDElementGetLogicalMax(element),
+                   newState);
+        const int numButtons = gamepad.numButtons();
+        for (unsigned b = 0; b < ArrayLength(newState); b++) {
+          if (newState[b] != oldState[b]) {
+            NewButtonEvent(i, numButtons - 4 + b, newState[b]);
+          }
+        }
+        gamepad.setDpadState(newState);
+      } else if (const Axis* axis = gamepad.lookupAxis(element)) {
+        double d = IOHIDValueGetIntegerValue(value);
+        double v = 2.0f * (d - axis->min) /
+          (double)(axis->max - axis->min) - 1.0f;
+        NewAxisMoveEvent(i, axis->id, v);
+      } else if (const Button* button = gamepad.lookupButton(element)) {
+        int iv = IOHIDValueGetIntegerValue(value);
+        bool pressed = iv != 0;
+        double v = 0;
+        if (button->analog) {
+          double dv = iv;
+          v = (dv - button->min) / (double)(button->max - button->min);
+        } else {
+          v = pressed ? 1.0 : 0.0;
+        }
+        NewButtonEvent(i, button->id, pressed, v);
+      }
+      return;
+    }
+  }
+}
+
+void
+DarwinGamepadService::DeviceAddedCallback(void* data, IOReturn result,
+                                         void* sender, IOHIDDeviceRef device)
+{
+  DarwinGamepadService* service = (DarwinGamepadService*)data;
+  service->DeviceAdded(device);
+}
+
+void
+DarwinGamepadService::DeviceRemovedCallback(void* data, IOReturn result,
+                                           void* sender, IOHIDDeviceRef device)
+{
+  DarwinGamepadService* service = (DarwinGamepadService*)data;
+  service->DeviceRemoved(device);
+}
+
+void
+DarwinGamepadService::InputValueChangedCallback(void* data,
+                                               IOReturn result,
+                                               void* sender,
+                                               IOHIDValueRef newValue)
+{
+  DarwinGamepadService* service = (DarwinGamepadService*)data;
+  service->InputValueChanged(newValue);
+}
+
+static CFMutableDictionaryRef
+MatchingDictionary(UInt32 inUsagePage, UInt32 inUsage)
+{
+  CFMutableDictionaryRef dict =
+    CFDictionaryCreateMutable(kCFAllocatorDefault,
+                              0,
+                              &kCFTypeDictionaryKeyCallBacks,
+                              &kCFTypeDictionaryValueCallBacks);
+  if (!dict)
+    return nullptr;
+  CFNumberRef number = CFNumberCreate(kCFAllocatorDefault,
+                                      kCFNumberIntType,
+                                      &inUsagePage);
+  if (!number) {
+    CFRelease(dict);
+    return nullptr;
+  }
+  CFDictionarySetValue(dict, CFSTR(kIOHIDDeviceUsagePageKey), number);
+  CFRelease(number);
+
+  number = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &inUsage);
+  if (!number) {
+    CFRelease(dict);
+    return nullptr;
+  }
+  CFDictionarySetValue(dict, CFSTR(kIOHIDDeviceUsageKey), number);
+  CFRelease(number);
+
+  return dict;
+}
+
+DarwinGamepadService::DarwinGamepadService() : mManager(nullptr) {}
+
+DarwinGamepadService::~DarwinGamepadService()
+{
+  if (mManager != nullptr)
+    CFRelease(mManager);
+}
+
+void DarwinGamepadService::Startup()
+{
+  if (mManager != nullptr)
+    return;
+
+  IOHIDManagerRef manager = IOHIDManagerCreate(kCFAllocatorDefault,
+                                               kIOHIDOptionsTypeNone);
+
+  CFMutableDictionaryRef criteria_arr[2];
+  criteria_arr[0] = MatchingDictionary(kDesktopUsagePage,
+                                       kJoystickUsage);
+  if (!criteria_arr[0]) {
+    CFRelease(manager);
+    return;
+  }
+
+  criteria_arr[1] = MatchingDictionary(kDesktopUsagePage,
+                                       kGamepadUsage);
+  if (!criteria_arr[1]) {
+    CFRelease(criteria_arr[0]);
+    CFRelease(manager);
+    return;
+  }
+
+  CFArrayRef criteria =
+    CFArrayCreate(kCFAllocatorDefault, (const void**)criteria_arr, 2, nullptr);
+  if (!criteria) {
+    CFRelease(criteria_arr[1]);
+    CFRelease(criteria_arr[0]);
+    CFRelease(manager);
+    return;
+  }
+
+  IOHIDManagerSetDeviceMatchingMultiple(manager, criteria);
+  CFRelease(criteria);
+  CFRelease(criteria_arr[1]);
+  CFRelease(criteria_arr[0]);
+
+  IOHIDManagerRegisterDeviceMatchingCallback(manager,
+                                             DeviceAddedCallback,
+                                             this);
+  IOHIDManagerRegisterDeviceRemovalCallback(manager,
+                                            DeviceRemovedCallback,
+                                            this);
+  IOHIDManagerRegisterInputValueCallback(manager,
+                                         InputValueChangedCallback,
+                                         this);
+  IOHIDManagerScheduleWithRunLoop(manager,
+                                  CFRunLoopGetCurrent(),
+                                  kCFRunLoopDefaultMode);
+  IOReturn rv = IOHIDManagerOpen(manager, kIOHIDOptionsTypeNone);
+  if (rv != kIOReturnSuccess) {
+    CFRelease(manager);
+    return;
+  }
+
+  mManager = manager;
+}
+
+void DarwinGamepadService::Shutdown()
+{
+  IOHIDManagerRef manager = (IOHIDManagerRef)mManager;
+  if (manager) {
+    IOHIDManagerClose(manager, 0);
+    CFRelease(manager);
+    mManager = nullptr;
+  }
+}
+
+} // namespace
+
+namespace mozilla {
+namespace dom {
+
+DarwinGamepadService* gService = nullptr;
+
+void StartGamepadMonitoring()
+{
+  if (gService) {
+    return;
+  }
+
+  gService = new DarwinGamepadService();
+  gService->Startup();
+}
+
+void StopGamepadMonitoring()
+{
+  if (!gService) {
+    return;
+  }
+
+  gService->Shutdown();
+  delete gService;
+  gService = nullptr;
+}
+
+} // namespace dom
+} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/fallback/FallbackGamepad.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/fallback/FallbackGamepad.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/fallback/FallbackGamepad.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/fallback/FallbackGamepad.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 ts=8 et ft=cpp : */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+namespace mozilla {
+namespace dom {
+
+void StartGamepadMonitoring()
+{
+}
+
+void StopGamepadMonitoring()
+{
+}
+
+} // namespace dom
+} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadFunctions.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadFunctions.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadFunctions.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadFunctions.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,105 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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/dom/GamepadFunctions.h"
+#include "mozilla/dom/GamepadService.h"
+#include "nsHashKeys.h"
+#include "mozilla/dom/ContentParent.h"
+#include "mozilla/unused.h"
+
+namespace mozilla {
+namespace dom {
+namespace GamepadFunctions {
+
+namespace {
+// Increments as gamepads are added
+uint32_t gGamepadIndex = 0;
+}
+
+template<class T>
+void
+NotifyGamepadChange(const T& aInfo)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
+  GamepadChangeEvent e(aInfo);
+  nsTArray<ContentParent*> t;
+  ContentParent::GetAll(t);
+  for(uint32_t i = 0; i < t.Length(); ++i) {
+    unused << t[i]->SendGamepadUpdate(e);
+  }
+  // If we have a GamepadService in the main process, send directly to it.
+  if (GamepadService::IsServiceRunning()) {
+    nsRefPtr<GamepadService> svc = GamepadService::GetService();
+    svc->Update(e);
+  }
+}
+
+uint32_t
+AddGamepad(const char* aID,
+           GamepadMappingType aMapping,
+           uint32_t aNumButtons, uint32_t aNumAxes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
+
+  int index = gGamepadIndex;
+  gGamepadIndex++;
+  GamepadAdded a(NS_ConvertUTF8toUTF16(nsDependentCString(aID)), index,
+                 (uint32_t)aMapping, aNumButtons, aNumAxes);
+  gGamepadIndex++;
+  NotifyGamepadChange<GamepadAdded>(a);
+  return index;
+}
+
+void
+RemoveGamepad(uint32_t aIndex)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
+  GamepadRemoved a(aIndex);
+  NotifyGamepadChange<GamepadRemoved>(a);
+}
+
+void
+NewButtonEvent(uint32_t aIndex, uint32_t aButton,
+               bool aPressed, double aValue)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
+  GamepadButtonInformation a(aIndex, aButton, aPressed, aValue);
+  NotifyGamepadChange<GamepadButtonInformation>(a);
+}
+
+void
+NewButtonEvent(uint32_t aIndex, uint32_t aButton,
+               bool aPressed)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
+  // When only a digital button is available the value will be synthesized.
+  NewButtonEvent(aIndex, aButton, aPressed, aPressed ? 1.0L : 0.0L);
+}
+
+void
+NewAxisMoveEvent(uint32_t aIndex, uint32_t aAxis,
+                 double aValue)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
+  GamepadAxisInformation a(aIndex, aAxis, aValue);
+  NotifyGamepadChange<GamepadAxisInformation>(a);
+}
+
+void
+ResetGamepadIndexes()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
+  gGamepadIndex = 0;
+}
+
+} // namespace GamepadFunctions
+} // namespace dom
+} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadFunctions.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadFunctions.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadFunctions.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadFunctions.h	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozilla_dom_GamepadFunctions_h_
+#define mozilla_dom_GamepadFunctions_h_
+
+#include "mozilla/dom/GamepadBinding.h"
+
+namespace mozilla {
+namespace dom {
+namespace GamepadFunctions {
+
+// Functions for building and transmitting IPDL messages through the HAL
+// sandbox. Used by platform specific Gamepad implementations
+
+// Add a gamepad to the list of known gamepads, and return its index.
+uint32_t AddGamepad(const char* aID, GamepadMappingType aMapping,
+                    uint32_t aNumButtons, uint32_t aNumAxes);
+// Remove the gamepad at |aIndex| from the list of known gamepads.
+void RemoveGamepad(uint32_t aIndex);
+
+// Update the state of |aButton| for the gamepad at |aIndex| for all
+// windows that are listening and visible, and fire one of
+// a gamepadbutton{up,down} event at them as well.
+// aPressed is used for digital buttons, aValue is for analog buttons.
+void NewButtonEvent(uint32_t aIndex, uint32_t aButton, bool aPressed,
+                    double aValue);
+// When only a digital button is available the value will be synthesized.
+void NewButtonEvent(uint32_t aIndex, uint32_t aButton, bool aPressed);
+
+// Update the state of |aAxis| for the gamepad at |aIndex| for all
+// windows that are listening and visible, and fire a gamepadaxismove
+// event at them as well.
+void NewAxisMoveEvent(uint32_t aIndex, uint32_t aAxis, double aValue);
+
+// When shutting down the platform communications for gamepad, also reset the
+// indexes.
+void ResetGamepadIndexes();
+
+} // namespace GamepadFunctions
+} // namespace dom
+} // namespace mozilla
+
+#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadMonitoring.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadMonitoring.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadMonitoring.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadMonitoring.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,31 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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/dom/GamepadMonitoring.h"
+#include "mozilla/dom/GamepadFunctions.h"
+#include "mozilla/dom/PContentParent.h"
+
+namespace mozilla {
+namespace dom {
+
+using namespace GamepadFunctions;
+
+void
+MaybeStopGamepadMonitoring()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
+  nsTArray<ContentParent*> t;
+  ContentParent::GetAll(t);
+  for(uint32_t i = 0; i < t.Length(); ++i) {
+    if (t[i]->HasGamepadListener()) {
+      return;
+    }
+  }
+  StopGamepadMonitoring();
+  ResetGamepadIndexes();
+}
+
+} // namespace dom
+} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadMonitoring.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadMonitoring.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadMonitoring.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadMonitoring.h	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozilla_dom_GamepadMonitoring_h_
+#define mozilla_dom_GamepadMonitoring_h_
+
+namespace mozilla {
+namespace dom {
+// Functions for platform specific gamepad monitoring.
+
+void MaybeStopGamepadMonitoring();
+
+// These two functions are implemented in the platform specific service files
+// (linux/LinuxGamepad.cpp, cocoa/CocoaGamepad.cpp, etc)
+void StartGamepadMonitoring();
+void StopGamepadMonitoring();
+
+} // namespace dom
+} // namespace mozilla
+
+#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadService.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadService.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadService.cpp	2015-04-22 13:05:55.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadService.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -2,13 +2,18 @@
  * License, v. 2.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/Hal.h"
+#include "mozilla/dom/GamepadService.h"
+#include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/Gamepad.h"
+#include "mozilla/dom/GamepadAxisMoveEvent.h"
+#include "mozilla/dom/GamepadButtonEvent.h"
+#include "mozilla/dom/GamepadEvent.h"
+#include "mozilla/dom/GamepadMonitoring.h"
+
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPtr.h"
 
-#include "GamepadService.h"
-#include "Gamepad.h"
 #include "nsAutoPtr.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMDocument.h"
@@ -20,10 +25,6 @@
 #include "nsThreadUtils.h"
 #include "mozilla/Services.h"
 
-#include "mozilla/dom/GamepadAxisMoveEvent.h"
-#include "mozilla/dom/GamepadButtonEvent.h"
-#include "mozilla/dom/GamepadEvent.h"
-
 #include <cstddef>
 
 namespace mozilla {
@@ -82,7 +83,11 @@
     mTimer->Cancel();
   }
   if (mStarted) {
-    mozilla::hal::StopMonitoringGamepadStatus();
+    if (XRE_GetProcessType() == GeckoProcessType_Default) {
+      MaybeStopGamepadMonitoring();
+    } else {
+      ContentChild::GetSingleton()->SendGamepadListenerRemoved();
+    }
     mStarted = false;
   }
   // Don't let windows call back to unregister during shutdown
@@ -99,7 +104,6 @@
 {
   MOZ_ASSERT(aWindow);
   MOZ_ASSERT(aWindow->IsInnerWindow());
-
   if (mShuttingDown) {
     return;
   }
@@ -109,10 +113,13 @@
   }
 
   if (!mStarted && mEnabled) {
-    mozilla::hal::StartMonitoringGamepadStatus();
+    if (XRE_GetProcessType() == GeckoProcessType_Default) {
+      StartGamepadMonitoring();
+    } else {
+      ContentChild::GetSingleton()->SendGamepadListenerAdded();
+    }
     mStarted = true;
   }
-
   mListeners.AppendElement(aWindow);
 }
 
@@ -139,8 +146,20 @@
   }
 }
 
-uint32_t
-GamepadService::AddGamepad(const char* aId,
+already_AddRefed<Gamepad>
+GamepadService::GetGamepad(uint32_t aIndex)
+{
+  nsRefPtr<Gamepad> gamepad;
+  if (mGamepads.Get(aIndex, getter_AddRefs(gamepad))) {
+    return gamepad.forget();
+  }
+
+  return nullptr;
+}
+
+void
+GamepadService::AddGamepad(uint32_t aIndex,
+                           const nsAString& aId,
                            GamepadMappingType aMapping,
                            uint32_t aNumButtons,
                            uint32_t aNumAxes)
@@ -148,63 +167,40 @@
   //TODO: bug 852258: get initial button/axis state
   nsRefPtr<Gamepad> gamepad =
     new Gamepad(nullptr,
-                NS_ConvertUTF8toUTF16(nsDependentCString(aId)),
-                0,
+                aId,
+                0, // index is set by global window
                 aMapping,
                 aNumButtons,
                 aNumAxes);
-  int index = -1;
-  for (uint32_t i = 0; i < mGamepads.Length(); i++) {
-    if (!mGamepads[i]) {
-      mGamepads[i] = gamepad;
-      index = i;
-      break;
-    }
-  }
-  if (index == -1) {
-    mGamepads.AppendElement(gamepad);
-    index = mGamepads.Length() - 1;
-  }
-
-  gamepad->SetIndex(index);
-  NewConnectionEvent(index, true);
 
-  return index;
+  // We store the gamepad related to its index given by the parent process.
+  mGamepads.Put(aIndex, gamepad);
+  NewConnectionEvent(aIndex, true);
 }
 
 void
 GamepadService::RemoveGamepad(uint32_t aIndex)
 {
-  if (aIndex < mGamepads.Length()) {
-    mGamepads[aIndex]->SetConnected(false);
-    NewConnectionEvent(aIndex, false);
-    // If this is the last entry in the list, just remove it.
-    if (aIndex == mGamepads.Length() - 1) {
-      mGamepads.RemoveElementAt(aIndex);
-    } else {
-      // Otherwise just null it out and leave it, so the
-      // indices of the following entries remain valid.
-      mGamepads[aIndex] = nullptr;
-    }
+  nsRefPtr<Gamepad> gamepad = GetGamepad(aIndex);
+  if (!gamepad) {
+    NS_WARNING("Trying to delete gamepad with invalid index");
+    return;
   }
-}
-
-void
-GamepadService::NewButtonEvent(uint32_t aIndex, uint32_t aButton, bool aPressed)
-{
-  // Synthesize a value: 1.0 for pressed, 0.0 for unpressed.
-  NewButtonEvent(aIndex, aButton, aPressed, aPressed ? 1.0L : 0.0L);
+  gamepad->SetConnected(false);
+    NewConnectionEvent(aIndex, false);
+  mGamepads.Remove(aIndex);
 }
 
 void
 GamepadService::NewButtonEvent(uint32_t aIndex, uint32_t aButton, bool aPressed,
                                double aValue)
 {
-  if (mShuttingDown || aIndex >= mGamepads.Length()) {
+  nsRefPtr<Gamepad> gamepad = GetGamepad(aIndex);
+  if (mShuttingDown || !gamepad) {
     return;
   }
 
-  mGamepads[aIndex]->SetButton(aButton, aPressed, aValue);
+  gamepad->SetButton(aButton, aPressed, aValue);
 
   // Hold on to listeners in a separate array because firing events
   // can mutate the mListeners array.
@@ -227,15 +223,15 @@
       first_time = true;
     }
 
-    nsRefPtr<Gamepad> gamepad = listeners[i]->GetGamepad(aIndex);
-    if (gamepad) {
-      gamepad->SetButton(aButton, aPressed, aValue);
+    nsRefPtr<Gamepad> listenerGamepad = listeners[i]->GetGamepad(aIndex);
+    if (listenerGamepad) {
+      listenerGamepad->SetButton(aButton, aPressed, aValue);
       if (first_time) {
-        FireConnectionEvent(listeners[i], gamepad, true);
+        FireConnectionEvent(listeners[i], listenerGamepad, true);
       }
       if (mNonstandardEventsEnabled) {
         // Fire event
-        FireButtonEvent(listeners[i], gamepad, aButton, aValue);
+        FireButtonEvent(listeners[i], listenerGamepad, aButton, aValue);
       }
     }
   }
@@ -266,10 +262,11 @@
 void
 GamepadService::NewAxisMoveEvent(uint32_t aIndex, uint32_t aAxis, double aValue)
 {
-  if (mShuttingDown || aIndex >= mGamepads.Length()) {
+  nsRefPtr<Gamepad> gamepad = GetGamepad(aIndex);
+  if (mShuttingDown || !gamepad) {
     return;
   }
-  mGamepads[aIndex]->SetAxis(aAxis, aValue);
+  gamepad->SetAxis(aAxis, aValue);
 
   // Hold on to listeners in a separate array because firing events
   // can mutate the mListeners array.
@@ -292,15 +289,15 @@
       first_time = true;
     }
 
-    nsRefPtr<Gamepad> gamepad = listeners[i]->GetGamepad(aIndex);
-    if (gamepad) {
-      gamepad->SetAxis(aAxis, aValue);
+    nsRefPtr<Gamepad> listenerGamepad = listeners[i]->GetGamepad(aIndex);
+    if (listenerGamepad) {
+      listenerGamepad->SetAxis(aAxis, aValue);
       if (first_time) {
-        FireConnectionEvent(listeners[i], gamepad, true);
+        FireConnectionEvent(listeners[i], listenerGamepad, true);
       }
       if (mNonstandardEventsEnabled) {
         // Fire event
-        FireAxisMoveEvent(listeners[i], gamepad, aAxis, aValue);
+        FireAxisMoveEvent(listeners[i], listenerGamepad, aAxis, aValue);
       }
     }
   }
@@ -332,7 +329,9 @@
 void
 GamepadService::NewConnectionEvent(uint32_t aIndex, bool aConnected)
 {
-  if (mShuttingDown || aIndex >= mGamepads.Length()) {
+  nsRefPtr<Gamepad> gamepad = GetGamepad(aIndex);
+
+  if (mShuttingDown || !gamepad) {
     return;
   }
 
@@ -358,10 +357,10 @@
 
       SetWindowHasSeenGamepad(listeners[i], aIndex);
 
-      nsRefPtr<Gamepad> gamepad = listeners[i]->GetGamepad(aIndex);
-      if (gamepad) {
+      nsRefPtr<Gamepad> listenerGamepad = listeners[i]->GetGamepad(aIndex);
+      if (listenerGamepad) {
         // Fire event
-        FireConnectionEvent(listeners[i], gamepad, aConnected);
+        FireConnectionEvent(listeners[i], listenerGamepad, aConnected);
       }
     }
   } else {
@@ -374,11 +373,11 @@
       // deal with the hassle of syncing the state of removed gamepads.
 
       if (WindowHasSeenGamepad(listeners[i], aIndex)) {
-        nsRefPtr<Gamepad> gamepad = listeners[i]->GetGamepad(aIndex);
-        if (gamepad) {
-          gamepad->SetConnected(false);
+        nsRefPtr<Gamepad> listenerGamepad = listeners[i]->GetGamepad(aIndex);
+        if (listenerGamepad) {
+          listenerGamepad->SetConnected(false);
           // Fire event
-          FireConnectionEvent(listeners[i], gamepad, false);
+          FireConnectionEvent(listeners[i], listenerGamepad, false);
           listeners[i]->RemoveGamepad(aIndex);
         }
       }
@@ -409,11 +408,19 @@
 void
 GamepadService::SyncGamepadState(uint32_t aIndex, Gamepad* aGamepad)
 {
-  if (mShuttingDown || !mEnabled || aIndex > mGamepads.Length()) {
+  nsRefPtr<Gamepad> gamepad = GetGamepad(aIndex);
+  if (mShuttingDown || !mEnabled || !gamepad) {
     return;
   }
 
-  aGamepad->SyncState(mGamepads[aIndex]);
+  aGamepad->SyncState(gamepad);
+}
+
+// static
+bool
+GamepadService::IsServiceRunning()
+{
+  return !!gGamepadServiceSingleton;
 }
 
 // static
@@ -461,8 +468,13 @@
   if (aHasSeen) {
     aWindow->SetHasSeenGamepadInput(true);
     nsCOMPtr<nsISupports> window = ToSupports(aWindow);
-    nsRefPtr<Gamepad> gamepad = mGamepads[aIndex]->Clone(window);
-    aWindow->AddGamepad(aIndex, gamepad);
+    nsRefPtr<Gamepad> gamepad = GetGamepad(aIndex);
+    MOZ_ASSERT(gamepad);
+    if (!gamepad) {
+      return;
+    }
+    nsRefPtr<Gamepad> clonedGamepad = gamepad->Clone(window);
+    aWindow->AddGamepad(aIndex, clonedGamepad);
   } else {
     aWindow->RemoveGamepad(aIndex);
   }
@@ -486,13 +498,16 @@
   }
 
   if (self->mListeners.Length() == 0) {
-    mozilla::hal::StopMonitoringGamepadStatus();
+    if (XRE_GetProcessType() == GeckoProcessType_Default) {
+      MaybeStopGamepadMonitoring();
+    } else {
+      ContentChild::GetSingleton()->SendGamepadListenerRemoved();
+    }
+
     self->mStarted = false;
-    if (!self->mGamepads.IsEmpty()) {
       self->mGamepads.Clear();
     }
   }
-}
 
 void
 GamepadService::StartCleanupTimer()
@@ -510,71 +525,26 @@
   }
 }
 
-/*
- * Implementation of the test service. This is just to provide a simple binding
- * of the GamepadService to JavaScript via XPCOM so that we can write Mochitests
- * that add and remove fake gamepads, avoiding the platform-specific backends.
- */
-NS_IMPL_ISUPPORTS(GamepadServiceTest, nsIGamepadServiceTest)
-
-GamepadServiceTest* GamepadServiceTest::sSingleton = nullptr;
-
-// static
-already_AddRefed<GamepadServiceTest>
-GamepadServiceTest::CreateService()
+void
+GamepadService::Update(const GamepadChangeEvent& aEvent)
 {
-  if (sSingleton == nullptr) {
-    sSingleton = new GamepadServiceTest();
+  if (aEvent.type() == GamepadChangeEvent::TGamepadAdded) {
+    const GamepadAdded& a = aEvent.get_GamepadAdded();
+    AddGamepad(a.index(), a.id(),
+               static_cast<GamepadMappingType>(a.mapping()),
+               a.num_buttons(), a.num_axes());
+  } else if (aEvent.type() == GamepadChangeEvent::TGamepadRemoved) {
+    const GamepadRemoved& a = aEvent.get_GamepadRemoved();
+    RemoveGamepad(a.index());
+  } else if (aEvent.type() == GamepadChangeEvent::TGamepadButtonInformation) {
+    const GamepadButtonInformation& a = aEvent.get_GamepadButtonInformation();
+    NewButtonEvent(a.index(), a.button(), a.pressed(), a.value());
+  } else if (aEvent.type() == GamepadChangeEvent::TGamepadAxisInformation) {
+    const GamepadAxisInformation& a = aEvent.get_GamepadAxisInformation();
+    NewAxisMoveEvent(a.index(), a.axis(), a.value());
+  } else {
+    MOZ_CRASH("We shouldn't be here!");
   }
-  nsRefPtr<GamepadServiceTest> service = sSingleton;
-  return service.forget();
-}
-
-GamepadServiceTest::GamepadServiceTest()
-{
-  /* member initializers and constructor code */
-  nsRefPtr<GamepadService> service = GamepadService::GetService();
-}
-
-/* uint32_t addGamepad (in string id, in unsigned long mapping, in unsigned long numButtons, in unsigned long numAxes); */
-NS_IMETHODIMP GamepadServiceTest::AddGamepad(const char* aID,
-                                             uint32_t aMapping,
-                                             uint32_t aNumButtons,
-                                             uint32_t aNumAxes,
-                                             uint32_t* aRetval)
-{
-  *aRetval = gGamepadServiceSingleton->AddGamepad(aID,
-                                                  static_cast<GamepadMappingType>(aMapping),
-                                                  aNumButtons,
-                                                  aNumAxes);
-  return NS_OK;
-}
-
-/* void removeGamepad (in uint32_t index); */
-NS_IMETHODIMP GamepadServiceTest::RemoveGamepad(uint32_t aIndex)
-{
-  gGamepadServiceSingleton->RemoveGamepad(aIndex);
-  return NS_OK;
-}
-
-/* void newButtonEvent (in uint32_t index, in uint32_t button,
-   in boolean pressed); */
-NS_IMETHODIMP GamepadServiceTest::NewButtonEvent(uint32_t aIndex,
-                                                 uint32_t aButton,
-                                                 bool aPressed)
-{
-  gGamepadServiceSingleton->NewButtonEvent(aIndex, aButton, aPressed);
-  return NS_OK;
-}
-
-/* void newAxisMoveEvent (in uint32_t index, in uint32_t axis,
-   in double value); */
-NS_IMETHODIMP GamepadServiceTest::NewAxisMoveEvent(uint32_t aIndex,
-                                                   uint32_t aAxis,
-                                                   double aValue)
-{
-  gGamepadServiceSingleton->NewAxisMoveEvent(aIndex, aAxis, aValue);
-  return NS_OK;
 }
 
 } // namespace dom
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadService.h	2015-04-22 13:05:55.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadService.h	2015-04-24 19:31:06.000000000 +0000
@@ -6,7 +6,6 @@
 #define mozilla_dom_GamepadService_h_
 
 #include <stdint.h>
-#include "Gamepad.h"
 #include "nsAutoPtr.h"
 #include "nsCOMArray.h"
 #include "nsIGamepadServiceTest.h"
@@ -15,13 +14,14 @@
 #include "nsIObserver.h"
 #include "nsITimer.h"
 #include "nsTArray.h"
-
-class nsIDOMDocument;
-
+// Needed for GamepadMappingType
+#include "mozilla/dom/GamepadBinding.h"
 namespace mozilla {
 namespace dom {
 
 class EventTarget;
+class GamepadChangeEvent;
+class Gamepad;
 
 class GamepadService : public nsIObserver
 {
@@ -29,6 +29,8 @@
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
+  // Returns true if we actually have a service up and running
+  static bool IsServiceRunning();
   // Get the singleton service
   static already_AddRefed<GamepadService> GetService();
   // Return true if the API is preffed on.
@@ -41,9 +43,10 @@
   // Indicate that |aWindow| should no longer receive gamepad events.
   void RemoveListener(nsGlobalWindow* aWindow);
 
-  // Add a gamepad to the list of known gamepads, and return its index.
-  uint32_t AddGamepad(const char* aID, GamepadMappingType aMapping,
+  // Add a gamepad to the list of known gamepads.
+  void AddGamepad(uint32_t aIndex, const nsAString& aID, GamepadMappingType aMapping,
                       uint32_t aNumButtons, uint32_t aNumAxes);
+
   // Remove the gamepad at |aIndex| from the list of known gamepads.
   void RemoveGamepad(uint32_t aIndex);
 
@@ -53,8 +56,6 @@
   // aPressed is used for digital buttons, aValue is for analog buttons.
   void NewButtonEvent(uint32_t aIndex, uint32_t aButton, bool aPressed,
                       double aValue);
-  // When only a digital button is available the value will be synthesized.
-  void NewButtonEvent(uint32_t aIndex, uint32_t aButton, bool aPressed);
 
   // Update the state of |aAxis| for the gamepad at |aIndex| for all
   // windows that are listening and visible, and fire a gamepadaxismove
@@ -64,6 +65,11 @@
   // Synchronize the state of |aGamepad| to match the gamepad stored at |aIndex|
   void SyncGamepadState(uint32_t aIndex, Gamepad* aGamepad);
 
+  // Returns gamepad object if index exists, null otherwise
+  already_AddRefed<Gamepad> GetGamepad(uint32_t aIndex);
+
+  // Receive GamepadChangeEvent messages from parent process to fire DOM events
+  void Update(const GamepadChangeEvent& aGamepadEvent);
  protected:
   GamepadService();
   virtual ~GamepadService() {};
@@ -117,37 +123,13 @@
 
   // Gamepads connected to the system. Copies of these are handed out
   // to each window.
-  nsTArray<nsRefPtr<Gamepad> > mGamepads;
+  nsRefPtrHashtable<nsUint32HashKey, Gamepad> mGamepads;
   // Inner windows that are listening for gamepad events.
   // has been sent to that window.
   nsTArray<nsRefPtr<nsGlobalWindow> > mListeners;
   nsCOMPtr<nsITimer> mTimer;
-  nsCOMPtr<nsIFocusManager> mFocusManager;
-  nsCOMPtr<nsIObserver> mObserver;
-};
-
-// Service for testing purposes
-class GamepadServiceTest : public nsIGamepadServiceTest
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIGAMEPADSERVICETEST
-
-  GamepadServiceTest();
-
-  static already_AddRefed<GamepadServiceTest> CreateService();
-
-private:
-  static GamepadServiceTest* sSingleton;
-  virtual ~GamepadServiceTest() {};
 };
 
 }  // namespace dom
 }  // namespace mozilla
-
-#define NS_GAMEPAD_TEST_CID \
-{ 0xfb1fcb57, 0xebab, 0x4cf4, \
-{ 0x96, 0x3b, 0x1e, 0x4d, 0xb8, 0x52, 0x16, 0x96 } }
-#define NS_GAMEPAD_TEST_CONTRACTID "@mozilla.org/gamepad-test;1"
-
 #endif // mozilla_dom_GamepadService_h_
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadServiceTest.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadServiceTest.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadServiceTest.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadServiceTest.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -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/. */
+
+#include "GamepadServiceTest.h"
+#include "mozilla/dom/GamepadService.h"
+#include "mozilla/dom/GamepadFunctions.h"
+
+using namespace mozilla::dom;
+
+/*
+ * Implementation of the test service. This is just to provide a simple binding
+ * of the GamepadService to JavaScript via XPCOM so that we can write Mochitests
+ * that add and remove fake gamepads, avoiding the platform-specific backends.
+ */
+NS_IMPL_ISUPPORTS(GamepadServiceTest, nsIGamepadServiceTest)
+
+GamepadServiceTest* GamepadServiceTest::sSingleton = nullptr;
+
+// static
+already_AddRefed<GamepadServiceTest>
+GamepadServiceTest::CreateService()
+{
+  if (sSingleton == nullptr) {
+    sSingleton = new GamepadServiceTest();
+  }
+  nsRefPtr<GamepadServiceTest> service = sSingleton;
+  return service.forget();
+}
+
+GamepadServiceTest::GamepadServiceTest() :
+  mService(GamepadService::GetService())
+{
+}
+
+GamepadServiceTest::~GamepadServiceTest()
+{
+}
+
+/* uint32_t addGamepad(in unsigned long index, in string id, in unsigned long mapping, in unsigned long numButtons, in unsigned long numAxes); */
+NS_IMETHODIMP
+GamepadServiceTest::AddGamepad(const char* aID,
+                               uint32_t aMapping,
+                               uint32_t aNumButtons,
+                               uint32_t aNumAxes,
+                               uint32_t* aGamepadIndex)
+{
+  *aGamepadIndex = GamepadFunctions::AddGamepad(aID,
+                                                static_cast<GamepadMappingType>(aMapping),
+                                                aNumButtons,
+                                                aNumAxes);
+  return NS_OK;
+}
+
+/* void removeGamepad (in uint32_t index); */
+NS_IMETHODIMP GamepadServiceTest::RemoveGamepad(uint32_t aIndex)
+{
+  GamepadFunctions::RemoveGamepad(aIndex);
+  return NS_OK;
+}
+
+/* void newButtonEvent (in uint32_t index, in uint32_t button,
+   in boolean pressed); */
+NS_IMETHODIMP GamepadServiceTest::NewButtonEvent(uint32_t aIndex,
+                                                 uint32_t aButton,
+                                                 bool aPressed)
+{
+  GamepadFunctions::NewButtonEvent(aIndex, aButton, aPressed);
+  return NS_OK;
+}
+
+/* void newButtonEvent (in uint32_t index, in uint32_t button,
+   in boolean pressed, double value); */
+NS_IMETHODIMP GamepadServiceTest::NewButtonValueEvent(uint32_t aIndex,
+                                                      uint32_t aButton,
+                                                      bool aPressed,
+                                                      double aValue)
+{
+  GamepadFunctions::NewButtonEvent(aIndex, aButton, aPressed, aValue);
+  return NS_OK;
+}
+
+/* void newAxisMoveEvent (in uint32_t index, in uint32_t axis,
+   in double value); */
+NS_IMETHODIMP GamepadServiceTest::NewAxisMoveEvent(uint32_t aIndex,
+                                                   uint32_t aAxis,
+                                                   double aValue)
+{
+  GamepadFunctions::NewAxisMoveEvent(aIndex, aAxis, aValue);
+  return NS_OK;
+}
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadServiceTest.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadServiceTest.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/GamepadServiceTest.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/GamepadServiceTest.h	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,42 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozilla_dom_GamepadServiceTest_h_
+#define mozilla_dom_GamepadServiceTest_h_
+
+#include "nsIGamepadServiceTest.h"
+
+namespace mozilla {
+namespace dom {
+
+class GamepadService;
+
+// Service for testing purposes
+class GamepadServiceTest : public nsIGamepadServiceTest
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIGAMEPADSERVICETEST
+
+  GamepadServiceTest();
+
+  static already_AddRefed<GamepadServiceTest> CreateService();
+
+private:
+  static GamepadServiceTest* sSingleton;
+  // Hold a reference to the gamepad service so we don't have to worry about
+  // execution order in tests.
+  nsRefPtr<GamepadService> mService;
+  virtual ~GamepadServiceTest();
+};
+
+}  // namespace dom
+}  // namespace mozilla
+
+#define NS_GAMEPAD_TEST_CID \
+{ 0xfb1fcb57, 0xebab, 0x4cf4, \
+{ 0x96, 0x3b, 0x1e, 0x4d, 0xb8, 0x52, 0x16, 0x96 } }
+#define NS_GAMEPAD_TEST_CONTRACTID "@mozilla.org/gamepad-test;1"
+
+#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/linux/LinuxGamepad.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/linux/LinuxGamepad.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/linux/LinuxGamepad.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/linux/LinuxGamepad.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,371 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * LinuxGamepadService: A Linux backend for the GamepadService.
+ * Derived from the kernel documentation at
+ * http://www.kernel.org/doc/Documentation/input/joystick-api.txt
+ */
+#include <algorithm>
+#include <cstddef>
+
+#include <glib.h>
+#include <linux/joystick.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include "nscore.h"
+#include "mozilla/dom/GamepadFunctions.h"
+#include "udev.h"
+
+namespace {
+
+using namespace mozilla::dom::GamepadFunctions;
+using mozilla::udev_lib;
+using mozilla::udev_device;
+using mozilla::udev_list_entry;
+using mozilla::udev_enumerate;
+using mozilla::udev_monitor;
+
+static const float kMaxAxisValue = 32767.0;
+static const char kJoystickPath[] = "/dev/input/js";
+
+//TODO: should find a USB identifier for each device so we can
+// provide something that persists across connect/disconnect cycles.
+typedef struct {
+  int index;
+  guint source_id;
+  int numAxes;
+  int numButtons;
+  char idstring[128];
+  char devpath[PATH_MAX];
+} Gamepad;
+
+class LinuxGamepadService {
+public:
+  LinuxGamepadService() : mMonitor(nullptr),
+                          mMonitorSourceID(0) {
+  }
+
+  void Startup();
+  void Shutdown();
+
+private:
+  void AddDevice(struct udev_device* dev);
+  void RemoveDevice(struct udev_device* dev);
+  void ScanForDevices();
+  void AddMonitor();
+  void RemoveMonitor();
+  bool is_gamepad(struct udev_device* dev);
+  void ReadUdevChange();
+
+  // handler for data from /dev/input/jsN
+  static gboolean OnGamepadData(GIOChannel *source,
+                                GIOCondition condition,
+                                gpointer data);
+
+  // handler for data from udev monitor
+  static gboolean OnUdevMonitor(GIOChannel *source,
+                                GIOCondition condition,
+                                gpointer data);
+
+  udev_lib mUdev;
+  struct udev_monitor* mMonitor;
+  guint mMonitorSourceID;
+  // Information about currently connected gamepads.
+  nsAutoTArray<Gamepad,4> mGamepads;
+};
+
+// singleton instance
+LinuxGamepadService* gService = nullptr;
+
+void
+LinuxGamepadService::AddDevice(struct udev_device* dev)
+{
+  const char* devpath = mUdev.udev_device_get_devnode(dev);
+  if (!devpath) {
+    return;
+  }
+
+  // Ensure that this device hasn't already been added.
+  for (unsigned int i = 0; i < mGamepads.Length(); i++) {
+    if (strcmp(mGamepads[i].devpath, devpath) == 0) {
+      return;
+    }
+  }
+
+  Gamepad gamepad;
+  snprintf(gamepad.devpath, sizeof(gamepad.devpath), "%s", devpath);
+  GIOChannel* channel = g_io_channel_new_file(devpath, "r", nullptr);
+  if (!channel) {
+    return;
+  }
+
+  g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, nullptr);
+  g_io_channel_set_encoding(channel, nullptr, nullptr);
+  g_io_channel_set_buffered(channel, FALSE);
+  int fd = g_io_channel_unix_get_fd(channel);
+  char name[128];
+  if (ioctl(fd, JSIOCGNAME(sizeof(name)), &name) == -1) {
+    strcpy(name, "unknown");
+  }
+  const char* vendor_id =
+    mUdev.udev_device_get_property_value(dev, "ID_VENDOR_ID");
+  const char* model_id =
+    mUdev.udev_device_get_property_value(dev, "ID_MODEL_ID");
+  if (!vendor_id || !model_id) {
+    struct udev_device* parent =
+      mUdev.udev_device_get_parent_with_subsystem_devtype(dev,
+                                                          "input",
+                                                          nullptr);
+    if (parent) {
+      vendor_id = mUdev.udev_device_get_sysattr_value(parent, "id/vendor");
+      model_id = mUdev.udev_device_get_sysattr_value(parent, "id/product");
+    }
+  }
+  snprintf(gamepad.idstring, sizeof(gamepad.idstring),
+           "%s-%s-%s",
+           vendor_id ? vendor_id : "unknown",
+           model_id ? model_id : "unknown",
+           name);
+
+  char numAxes = 0, numButtons = 0;
+  ioctl(fd, JSIOCGAXES, &numAxes);
+  gamepad.numAxes = numAxes;
+  ioctl(fd, JSIOCGBUTTONS, &numButtons);
+  gamepad.numButtons = numButtons;
+
+  gamepad.index = AddGamepad(gamepad.idstring,
+                             mozilla::dom::GamepadMappingType::_empty,
+                             gamepad.numButtons,
+                             gamepad.numAxes);
+
+  gamepad.source_id =
+    g_io_add_watch(channel,
+                   GIOCondition(G_IO_IN | G_IO_ERR | G_IO_HUP),
+                   OnGamepadData,
+                   GINT_TO_POINTER(gamepad.index));
+  g_io_channel_unref(channel);
+
+  mGamepads.AppendElement(gamepad);
+}
+
+void
+LinuxGamepadService::RemoveDevice(struct udev_device* dev)
+{
+  const char* devpath = mUdev.udev_device_get_devnode(dev);
+  if (!devpath) {
+    return;
+  }
+
+  for (unsigned int i = 0; i < mGamepads.Length(); i++) {
+    if (strcmp(mGamepads[i].devpath, devpath) == 0) {
+      g_source_remove(mGamepads[i].source_id);
+      RemoveGamepad(mGamepads[i].index);
+      mGamepads.RemoveElementAt(i);
+      break;
+    }
+  }
+}
+
+void
+LinuxGamepadService::ScanForDevices()
+{
+  struct udev_enumerate* en = mUdev.udev_enumerate_new(mUdev.udev);
+  mUdev.udev_enumerate_add_match_subsystem(en, "input");
+  mUdev.udev_enumerate_scan_devices(en);
+
+  struct udev_list_entry* dev_list_entry;
+  for (dev_list_entry = mUdev.udev_enumerate_get_list_entry(en);
+       dev_list_entry != nullptr;
+       dev_list_entry = mUdev.udev_list_entry_get_next(dev_list_entry)) {
+    const char* path = mUdev.udev_list_entry_get_name(dev_list_entry);
+    struct udev_device* dev = mUdev.udev_device_new_from_syspath(mUdev.udev,
+                                                                 path);
+    if (is_gamepad(dev)) {
+      AddDevice(dev);
+    }
+
+    mUdev.udev_device_unref(dev);
+  }
+
+  mUdev.udev_enumerate_unref(en);
+}
+
+void
+LinuxGamepadService::AddMonitor()
+{
+  // Add a monitor to watch for device changes
+  mMonitor =
+    mUdev.udev_monitor_new_from_netlink(mUdev.udev, "udev");
+  if (!mMonitor) {
+    // Not much we can do here.
+    return;
+  }
+  mUdev.udev_monitor_filter_add_match_subsystem_devtype(mMonitor,
+                                                        "input",
+							nullptr);
+
+  int monitor_fd = mUdev.udev_monitor_get_fd(mMonitor);
+  GIOChannel* monitor_channel = g_io_channel_unix_new(monitor_fd);
+  mMonitorSourceID =
+    g_io_add_watch(monitor_channel,
+                   GIOCondition(G_IO_IN | G_IO_ERR | G_IO_HUP),
+                   OnUdevMonitor,
+                   nullptr);
+  g_io_channel_unref(monitor_channel);
+
+  mUdev.udev_monitor_enable_receiving(mMonitor);
+}
+
+void
+LinuxGamepadService::RemoveMonitor()
+{
+  if (mMonitorSourceID) {
+    g_source_remove(mMonitorSourceID);
+    mMonitorSourceID = 0;
+  }
+  if (mMonitor) {
+    mUdev.udev_monitor_unref(mMonitor);
+    mMonitor = nullptr;
+  }
+}
+
+void
+LinuxGamepadService::Startup()
+{
+  // Don't bother starting up if libudev couldn't be loaded or initialized.
+  if (!mUdev)
+    return;
+
+  AddMonitor();
+  ScanForDevices();
+}
+
+void
+LinuxGamepadService::Shutdown()
+{
+  for (unsigned int i = 0; i < mGamepads.Length(); i++) {
+    g_source_remove(mGamepads[i].source_id);
+  }
+  mGamepads.Clear();
+  RemoveMonitor();
+}
+
+bool
+LinuxGamepadService::is_gamepad(struct udev_device* dev)
+{
+  if (!mUdev.udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK"))
+    return false;
+
+  const char* devpath = mUdev.udev_device_get_devnode(dev);
+  if (!devpath) {
+    return false;
+  }
+  if (strncmp(kJoystickPath, devpath, sizeof(kJoystickPath) - 1) != 0) {
+    return false;
+  }
+
+  return true;
+}
+
+void
+LinuxGamepadService::ReadUdevChange()
+{
+  struct udev_device* dev =
+    mUdev.udev_monitor_receive_device(mMonitor);
+  const char* action = mUdev.udev_device_get_action(dev);
+  if (is_gamepad(dev)) {
+    if (strcmp(action, "add") == 0) {
+      AddDevice(dev);
+    } else if (strcmp(action, "remove") == 0) {
+      RemoveDevice(dev);
+    }
+  }
+  mUdev.udev_device_unref(dev);
+}
+
+// static
+gboolean
+LinuxGamepadService::OnGamepadData(GIOChannel* source,
+                                   GIOCondition condition,
+                                   gpointer data)
+{
+  int index = GPOINTER_TO_INT(data);
+  //TODO: remove gamepad?
+  if (condition & G_IO_ERR || condition & G_IO_HUP)
+    return FALSE;
+
+  while (true) {
+    struct js_event event;
+    gsize count;
+    GError* err = nullptr;
+    if (g_io_channel_read_chars(source,
+				(gchar*)&event,
+				sizeof(event),
+				&count,
+				&err) != G_IO_STATUS_NORMAL ||
+	count == 0) {
+      break;
+    }
+
+    //TODO: store device state?
+    if (event.type & JS_EVENT_INIT) {
+      continue;
+    }
+
+    switch (event.type) {
+    case JS_EVENT_BUTTON:
+      NewButtonEvent(index, event.number, !!event.value);
+      break;
+    case JS_EVENT_AXIS:
+      NewAxisMoveEvent(index, event.number,
+                       ((float)event.value) / kMaxAxisValue);
+      break;
+    }
+  }
+
+  return TRUE;
+}
+
+// static
+gboolean
+LinuxGamepadService::OnUdevMonitor(GIOChannel* source,
+                                   GIOCondition condition,
+                                   gpointer data)
+{
+  if (condition & G_IO_ERR || condition & G_IO_HUP)
+    return FALSE;
+
+  gService->ReadUdevChange();
+  return TRUE;
+}
+
+} // namespace
+
+namespace mozilla {
+namespace dom {
+
+void StartGamepadMonitoring()
+{
+  if (gService) {
+    return;
+  }
+  gService = new LinuxGamepadService();
+  gService->Startup();
+}
+
+void StopGamepadMonitoring()
+{
+  if (!gService) {
+    return;
+  }
+  gService->Shutdown();
+  delete gService;
+  gService = nullptr;
+}
+
+} // namespace dom
+} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/linux/udev.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/linux/udev.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/linux/udev.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/linux/udev.h	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,148 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 defines a wrapper around libudev so we can avoid
+ * linking directly to it and use dlopen instead.
+ */
+
+#ifndef HAL_LINUX_UDEV_H_
+#define HAL_LINUX_UDEV_H_
+
+#include <dlfcn.h>
+
+#include "mozilla/ArrayUtils.h"
+
+namespace mozilla {
+
+struct udev;
+struct udev_device;
+struct udev_enumerate;
+struct udev_list_entry;
+struct udev_monitor;
+
+class udev_lib {
+ public:
+  udev_lib() : lib(nullptr),
+               udev(nullptr) {
+    // Be careful about ABI compat! 0 -> 1 didn't change any
+    // symbols this code relies on, per:
+    // https://lists.fedoraproject.org/pipermail/devel/2012-June/168227.html
+    const char* lib_names[] = {"libudev.so.0", "libudev.so.1"};
+    // Check whether a library is already loaded so we don't load two
+    // conflicting libs.
+    for (unsigned i = 0; i < ArrayLength(lib_names); i++) {
+      lib = dlopen(lib_names[i], RTLD_NOLOAD | RTLD_LAZY | RTLD_GLOBAL);
+      if (lib) {
+        break;
+      }
+    }
+    // If nothing loads the first time through, it means no version of libudev
+    // was already loaded.
+    if (!lib) {
+      for (unsigned i = 0; i < ArrayLength(lib_names); i++) {
+        lib = dlopen(lib_names[i], RTLD_LAZY | RTLD_GLOBAL);
+        if (lib) {
+          break;
+        }
+      }
+    }
+    if (lib && LoadSymbols()) {
+      udev = udev_new();
+    }
+  }
+
+  ~udev_lib() {
+    if (udev) {
+      udev_unref(udev);
+    }
+
+    if (lib) {
+      dlclose(lib);
+    }
+  }
+
+  explicit operator bool() {
+    return udev;
+  }
+
+ private:
+  bool LoadSymbols() {
+#define DLSYM(s) \
+  do { \
+    s = (typeof(s))dlsym(lib, #s); \
+    if (!s) return false; \
+  } while (0)
+
+    DLSYM(udev_new);
+    DLSYM(udev_unref);
+    DLSYM(udev_device_unref);
+    DLSYM(udev_device_new_from_syspath);
+    DLSYM(udev_device_get_devnode);
+    DLSYM(udev_device_get_parent_with_subsystem_devtype);
+    DLSYM(udev_device_get_property_value);
+    DLSYM(udev_device_get_action);
+    DLSYM(udev_device_get_sysattr_value);
+    DLSYM(udev_enumerate_new);
+    DLSYM(udev_enumerate_unref);
+    DLSYM(udev_enumerate_add_match_subsystem);
+    DLSYM(udev_enumerate_scan_devices);
+    DLSYM(udev_enumerate_get_list_entry);
+    DLSYM(udev_list_entry_get_next);
+    DLSYM(udev_list_entry_get_name);
+    DLSYM(udev_monitor_new_from_netlink);
+    DLSYM(udev_monitor_filter_add_match_subsystem_devtype);
+    DLSYM(udev_monitor_enable_receiving);
+    DLSYM(udev_monitor_get_fd);
+    DLSYM(udev_monitor_receive_device);
+    DLSYM(udev_monitor_unref);
+#undef DLSYM
+    return true;
+  }
+
+  void* lib;
+
+ public:
+  struct udev* udev;
+
+  // Function pointers returned from dlsym.
+  struct udev* (*udev_new)(void);
+  void (*udev_unref)(struct udev*);
+
+  void (*udev_device_unref)(struct udev_device*);
+  struct udev_device* (*udev_device_new_from_syspath)(struct udev*,
+                                                      const char*);
+  const char* (*udev_device_get_devnode)(struct udev_device*);
+  struct udev_device* (*udev_device_get_parent_with_subsystem_devtype)
+    (struct udev_device*, const char*, const char*);
+  const char* (*udev_device_get_property_value)(struct udev_device*,
+                                                const char*);
+  const char* (*udev_device_get_action)(struct udev_device*);
+  const char* (*udev_device_get_sysattr_value)(struct udev_device*,
+                                               const char*);
+
+  struct udev_enumerate* (*udev_enumerate_new)(struct udev*);
+  void (*udev_enumerate_unref)(struct udev_enumerate*);
+  int (*udev_enumerate_add_match_subsystem)(struct udev_enumerate*,
+                                            const char*);
+  int (*udev_enumerate_scan_devices)(struct udev_enumerate*);
+  struct udev_list_entry* (*udev_enumerate_get_list_entry)
+    (struct udev_enumerate*);
+
+  struct udev_list_entry* (*udev_list_entry_get_next)(struct udev_list_entry *);
+  const char* (*udev_list_entry_get_name)(struct udev_list_entry*);
+
+  struct udev_monitor* (*udev_monitor_new_from_netlink)(struct udev*,
+                                                        const char*);
+  int (*udev_monitor_filter_add_match_subsystem_devtype)
+    (struct udev_monitor*, const char*, const char*);
+  int (*udev_monitor_enable_receiving)(struct udev_monitor*);
+  int (*udev_monitor_get_fd)(struct udev_monitor*);
+  struct udev_device* (*udev_monitor_receive_device)(struct udev_monitor*);
+  void (*udev_monitor_unref)(struct udev_monitor*);
+};
+
+} // namespace mozilla
+
+#endif // HAL_LINUX_UDEV_H_
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/moz.build	2015-04-22 13:05:55.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/moz.build	2015-04-24 19:31:06.000000000 +0000
@@ -7,13 +7,40 @@
 EXPORTS.mozilla.dom += [
     'Gamepad.h',
     'GamepadButton.h',
+    'GamepadFunctions.h',
+    'GamepadMonitoring.h',
     'GamepadService.h',
+    'GamepadServiceTest.h'
     ]
 
 UNIFIED_SOURCES = [
     'Gamepad.cpp',
     'GamepadButton.cpp',
+    'GamepadFunctions.cpp',
+    'GamepadMonitoring.cpp',
     'GamepadService.cpp',
+    'GamepadServiceTest.cpp'
+    ]
+
+if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
+    UNIFIED_SOURCES += [
+        'fallback/FallbackGamepad.cpp'
+    ]
+elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
+    UNIFIED_SOURCES += [
+        'cocoa/CocoaGamepad.cpp'
+    ]
+elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
+    UNIFIED_SOURCES += [
+        'windows/WindowsGamepad.cpp'
+    ]
+elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
+    UNIFIED_SOURCES += [
+        'linux/LinuxGamepad.cpp'
+    ]
+elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'android':
+    UNIFIED_SOURCES += [
+        'android/AndroidGamepad.cpp'
     ]
 
 FAIL_ON_WARNINGS = True
@@ -25,3 +52,7 @@
     '/dom/base',
 ]
 
+CFLAGS += CONFIG['GLIB_CFLAGS']
+CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+CXXFLAGS += CONFIG['GLIB_CFLAGS']
+CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/windows/WindowsGamepad.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/windows/WindowsGamepad.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/gamepad/windows/WindowsGamepad.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/gamepad/windows/WindowsGamepad.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,1011 @@
+/* -*- 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 <algorithm>
+#include <cstddef>
+
+#ifndef UNICODE
+#define UNICODE
+#endif
+#include <windows.h>
+#include <hidsdi.h>
+#include <stdio.h>
+#include <xinput.h>
+
+#include "nsIComponentManager.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
+#include "nsITimer.h"
+#include "nsTArray.h"
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/dom/GamepadFunctions.h"
+#include "mozilla/Services.h"
+
+namespace {
+
+using namespace mozilla::dom;
+using namespace mozilla::dom::GamepadFunctions;
+using mozilla::ArrayLength;
+
+// USB HID usage tables, page 1 (Hat switch)
+const unsigned kUsageDpad = 0x39;
+// USB HID usage tables, page 1, 0x30 = X
+const unsigned kFirstAxis = 0x30;
+
+// USB HID usage tables
+const unsigned kDesktopUsagePage = 0x1;
+const unsigned kButtonUsagePage = 0x9;
+
+// Arbitrary. In practice 10 buttons/6 axes is the near maximum.
+const unsigned kMaxButtons = 32;
+const unsigned kMaxAxes = 32;
+
+// Multiple devices-changed notifications can be sent when a device
+// is connected, because USB devices consist of multiple logical devices.
+// Therefore, we wait a bit after receiving one before looking for
+// device changes.
+const uint32_t kDevicesChangedStableDelay = 200;
+// XInput is a purely polling-driven API, so we need to
+// poll it periodically. 50ms is arbitrarily chosen.
+const uint32_t kXInputPollInterval = 50;
+
+const UINT kRawInputError = (UINT)-1;
+
+#ifndef XUSER_MAX_COUNT
+#define XUSER_MAX_COUNT 4
+#endif
+
+const struct {
+  int usagePage;
+  int usage;
+} kUsagePages[] = {
+  // USB HID usage tables, page 1
+  { kDesktopUsagePage, 4 },  // Joystick
+  { kDesktopUsagePage, 5 }   // Gamepad
+};
+
+const struct {
+  WORD button;
+  int mapped;
+} kXIButtonMap[] = {
+  { XINPUT_GAMEPAD_DPAD_UP, 12 },
+  { XINPUT_GAMEPAD_DPAD_DOWN, 13 },
+  { XINPUT_GAMEPAD_DPAD_LEFT, 14 },
+  { XINPUT_GAMEPAD_DPAD_RIGHT, 15 },
+  { XINPUT_GAMEPAD_START, 9 },
+  { XINPUT_GAMEPAD_BACK, 8 },
+  { XINPUT_GAMEPAD_LEFT_THUMB, 10 },
+  { XINPUT_GAMEPAD_RIGHT_THUMB, 11 },
+  { XINPUT_GAMEPAD_LEFT_SHOULDER, 4 },
+  { XINPUT_GAMEPAD_RIGHT_SHOULDER, 5 },
+  { XINPUT_GAMEPAD_A, 0 },
+  { XINPUT_GAMEPAD_B, 1 },
+  { XINPUT_GAMEPAD_X, 2 },
+  { XINPUT_GAMEPAD_Y, 3 }
+};
+const size_t kNumMappings = ArrayLength(kXIButtonMap);
+
+enum GamepadType {
+  kNoGamepad = 0,
+  kRawInputGamepad,
+  kXInputGamepad
+};
+
+class WindowsGamepadService;
+WindowsGamepadService* gService = nullptr;
+
+struct Gamepad {
+  GamepadType type;
+
+  // Handle to raw input device
+  HANDLE handle;
+
+  // XInput Index of the user's controller. Passed to XInputGetState.
+  DWORD userIndex;
+
+  // Last-known state of the controller.
+  XINPUT_STATE state;
+
+  // ID from the GamepadService, also used as the index into
+  // WindowsGamepadService::mGamepads.
+  int id;
+
+  // Information about the physical device.
+  unsigned numAxes;
+  unsigned numButtons;
+  bool hasDpad;
+  HIDP_VALUE_CAPS dpadCaps;
+
+  bool buttons[kMaxButtons];
+  struct {
+    HIDP_VALUE_CAPS caps;
+    double value;
+  } axes[kMaxAxes];
+
+  // Used during rescan to find devices that were disconnected.
+  bool present;
+};
+
+// Drop this in favor of decltype when we require a new enough SDK.
+typedef void (WINAPI *XInputEnable_func)(BOOL);
+
+// RAII class to wrap loading the XInput DLL
+class XInputLoader {
+public:
+  XInputLoader() : module(nullptr),
+                   mXInputEnable(nullptr),
+                   mXInputGetState(nullptr) {
+    // xinput1_4.dll exists on Windows 8
+    // xinput9_1_0.dll exists on Windows 7 and Vista
+    // xinput1_3.dll shipped with the DirectX SDK
+    const wchar_t* dlls[] = {L"xinput1_4.dll",
+                             L"xinput9_1_0.dll",
+                             L"xinput1_3.dll"};
+    const size_t kNumDLLs = ArrayLength(dlls);
+    for (size_t i = 0; i < kNumDLLs; ++i) {
+      module = LoadLibraryW(dlls[i]);
+      if (module) {
+        mXInputEnable = reinterpret_cast<XInputEnable_func>(
+         GetProcAddress(module, "XInputEnable"));
+        mXInputGetState = reinterpret_cast<decltype(XInputGetState)*>(
+         GetProcAddress(module, "XInputGetState"));
+        if (mXInputEnable) {
+          mXInputEnable(TRUE);
+        }
+        break;
+      }
+    }
+  }
+
+  ~XInputLoader() {
+    //mXInputEnable = nullptr;
+    mXInputGetState = nullptr;
+
+    if (module) {
+      FreeLibrary(module);
+    }
+  }
+
+  operator bool() {
+    return module && mXInputGetState;
+  }
+
+  HMODULE module;
+  decltype(XInputGetState) *mXInputGetState;
+  XInputEnable_func mXInputEnable;
+};
+
+bool
+GetPreparsedData(HANDLE handle, nsTArray<uint8_t>& data)
+{
+  UINT size;
+  if (GetRawInputDeviceInfo(handle, RIDI_PREPARSEDDATA, nullptr, &size) == kRawInputError) {
+    return false;
+  }
+  data.SetLength(size);
+  return GetRawInputDeviceInfo(handle, RIDI_PREPARSEDDATA,
+                               data.Elements(), &size) > 0;
+}
+
+/*
+ * Given an axis value and a minimum and maximum range,
+ * scale it to be in the range -1.0 .. 1.0.
+ */
+double
+ScaleAxis(ULONG value, LONG min, LONG max)
+{
+  return  2.0 * (value - min) / (max - min) - 1.0;
+}
+
+/*
+ * Given a value from a d-pad (POV hat in USB HID terminology),
+ * represent it as 4 buttons, one for each cardinal direction.
+ */
+void
+UnpackDpad(LONG dpad_value, const Gamepad* gamepad, bool buttons[kMaxButtons])
+{
+  const unsigned kUp = gamepad->numButtons - 4;
+  const unsigned kDown = gamepad->numButtons - 3;
+  const unsigned kLeft = gamepad->numButtons - 2;
+  const unsigned kRight = gamepad->numButtons - 1;
+
+  // Different controllers have different ways of representing
+  // "nothing is pressed", but they're all outside the range of values.
+  if (dpad_value < gamepad->dpadCaps.LogicalMin
+      || dpad_value > gamepad->dpadCaps.LogicalMax) {
+    // Nothing is pressed.
+    return;
+  }
+
+  // Normalize value to start at 0.
+  int value = dpad_value - gamepad->dpadCaps.LogicalMin;
+
+  // Value will be in the range 0-7. The value represents the
+  // position of the d-pad around a circle, with 0 being straight up,
+  // 2 being right, 4 being straight down, and 6 being left.
+  if (value < 2 || value > 6) {
+    buttons[kUp] = true;
+  }
+  if (value > 2 && value < 6) {
+    buttons[kDown] = true;
+  }
+  if (value > 4) {
+    buttons[kLeft] = true;
+  }
+  if (value > 0 && value < 4) {
+    buttons[kRight] = true;
+  }
+}
+
+/*
+ * Return true if this USB HID usage page and usage are of a type we
+ * know how to handle.
+ */
+bool
+SupportedUsage(USHORT page, USHORT usage)
+{
+  for (unsigned i = 0; i < ArrayLength(kUsagePages); i++) {
+    if (page == kUsagePages[i].usagePage && usage == kUsagePages[i].usage) {
+      return true;
+    }
+  }
+  return false;
+}
+
+class Observer : public nsIObserver {
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
+  Observer(WindowsGamepadService& svc) : mSvc(svc),
+                                         mObserving(true)
+  {
+    nsresult rv;
+    mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv);
+    nsCOMPtr<nsIObserverService> observerService =
+      mozilla::services::GetObserverService();
+    observerService->AddObserver(this,
+                                 NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID,
+                                 false);
+  }
+
+  void Stop()
+  {
+    if (mTimer) {
+      mTimer->Cancel();
+    }
+    if (mObserving) {
+      nsCOMPtr<nsIObserverService> observerService =
+        mozilla::services::GetObserverService();
+      observerService->RemoveObserver(this, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID);
+      mObserving = false;
+    }
+  }
+
+  void SetDeviceChangeTimer()
+  {
+    // Set stable timer, since we will get multiple devices-changed
+    // notifications at once
+    if (mTimer) {
+      mTimer->Cancel();
+      mTimer->Init(this, kDevicesChangedStableDelay, nsITimer::TYPE_ONE_SHOT);
+    }
+  }
+
+private:
+  virtual ~Observer()
+  {
+    Stop();
+  }
+
+  // Gamepad service owns us, we just hold a reference back to it.
+  WindowsGamepadService& mSvc;
+  nsCOMPtr<nsITimer> mTimer;
+  bool mObserving;
+};
+
+NS_IMPL_ISUPPORTS(Observer, nsIObserver);
+
+class HIDLoader {
+public:
+  HIDLoader() : mModule(LoadLibraryW(L"hid.dll")),
+                mHidD_GetProductString(nullptr),
+                mHidP_GetCaps(nullptr),
+                mHidP_GetButtonCaps(nullptr),
+                mHidP_GetValueCaps(nullptr),
+                mHidP_GetUsages(nullptr),
+                mHidP_GetUsageValue(nullptr),
+                mHidP_GetScaledUsageValue(nullptr)
+  {
+    if (mModule) {
+      mHidD_GetProductString = reinterpret_cast<decltype(HidD_GetProductString)*>(GetProcAddress(mModule, "HidD_GetProductString"));
+      mHidP_GetCaps = reinterpret_cast<decltype(HidP_GetCaps)*>(GetProcAddress(mModule, "HidP_GetCaps"));
+      mHidP_GetButtonCaps = reinterpret_cast<decltype(HidP_GetButtonCaps)*>(GetProcAddress(mModule, "HidP_GetButtonCaps"));
+      mHidP_GetValueCaps = reinterpret_cast<decltype(HidP_GetValueCaps)*>(GetProcAddress(mModule, "HidP_GetValueCaps"));
+      mHidP_GetUsages = reinterpret_cast<decltype(HidP_GetUsages)*>(GetProcAddress(mModule, "HidP_GetUsages"));
+      mHidP_GetUsageValue = reinterpret_cast<decltype(HidP_GetUsageValue)*>(GetProcAddress(mModule, "HidP_GetUsageValue"));
+      mHidP_GetScaledUsageValue = reinterpret_cast<decltype(HidP_GetScaledUsageValue)*>(GetProcAddress(mModule, "HidP_GetScaledUsageValue"));
+    }
+  }
+
+  ~HIDLoader() {
+    if (mModule) {
+      FreeLibrary(mModule);
+    }
+  }
+
+  operator bool() {
+    return mModule &&
+      mHidD_GetProductString &&
+      mHidP_GetCaps &&
+      mHidP_GetButtonCaps &&
+      mHidP_GetValueCaps &&
+      mHidP_GetUsages &&
+      mHidP_GetUsageValue &&
+      mHidP_GetScaledUsageValue;
+  }
+
+  decltype(HidD_GetProductString) *mHidD_GetProductString;
+  decltype(HidP_GetCaps) *mHidP_GetCaps;
+  decltype(HidP_GetButtonCaps) *mHidP_GetButtonCaps;
+  decltype(HidP_GetValueCaps) *mHidP_GetValueCaps;
+  decltype(HidP_GetUsages) *mHidP_GetUsages;
+  decltype(HidP_GetUsageValue) *mHidP_GetUsageValue;
+  decltype(HidP_GetScaledUsageValue) *mHidP_GetScaledUsageValue;
+
+private:
+  HMODULE mModule;
+};
+
+class WindowsGamepadService {
+public:
+  WindowsGamepadService();
+  virtual ~WindowsGamepadService()
+  {
+    Cleanup();
+  }
+
+  enum DeviceChangeType {
+    DeviceChangeNotification,
+    DeviceChangeStable
+  };
+  void DevicesChanged(DeviceChangeType type);
+  void Startup();
+  void Shutdown();
+  // Parse gamepad input from a WM_INPUT message.
+  bool HandleRawInput(HRAWINPUT handle);
+
+private:
+  void ScanForDevices();
+  // Look for connected raw input devices.
+  void ScanForRawInputDevices();
+  // Look for connected XInput devices.
+  bool ScanForXInputDevices();
+  bool HaveXInputGamepad(int userIndex);
+
+  // Timer callback for XInput polling
+  static void XInputPollTimerCallback(nsITimer* aTimer, void* aClosure);
+  void PollXInput();
+  void CheckXInputChanges(Gamepad& gamepad, XINPUT_STATE& state);
+
+  // Get information about a raw input gamepad.
+  bool GetRawGamepad(HANDLE handle);
+  void Cleanup();
+
+  // List of connected devices.
+  nsTArray<Gamepad> mGamepads;
+
+  nsRefPtr<Observer> mObserver;
+  nsCOMPtr<nsITimer> mXInputPollTimer;
+
+  HIDLoader mHID;
+  XInputLoader mXInput;
+};
+
+
+WindowsGamepadService::WindowsGamepadService()
+{
+  nsresult rv;
+  mXInputPollTimer = do_CreateInstance("@mozilla.org/timer;1", &rv);
+  mObserver = new Observer(*this);
+}
+
+void
+WindowsGamepadService::ScanForRawInputDevices()
+{
+  if (!mHID) {
+    return;
+  }
+
+  UINT numDevices;
+  if (GetRawInputDeviceList(nullptr, &numDevices, sizeof(RAWINPUTDEVICELIST))
+      == kRawInputError) {
+    return;
+  }
+  nsTArray<RAWINPUTDEVICELIST> devices(numDevices);
+  devices.SetLength(numDevices);
+  if (GetRawInputDeviceList(devices.Elements(), &numDevices,
+                            sizeof(RAWINPUTDEVICELIST)) == kRawInputError) {
+    return;
+  }
+
+  for (unsigned i = 0; i < devices.Length(); i++) {
+    if (devices[i].dwType == RIM_TYPEHID) {
+      GetRawGamepad(devices[i].hDevice);
+    }
+  }
+}
+
+bool
+WindowsGamepadService::HaveXInputGamepad(int userIndex)
+{
+  for (unsigned int i = 0; i < mGamepads.Length(); i++) {
+    if (mGamepads[i].type == kXInputGamepad
+        && mGamepads[i].userIndex == userIndex) {
+      mGamepads[i].present = true;
+      return true;
+    }
+  }
+  return false;
+}
+
+bool
+WindowsGamepadService::ScanForXInputDevices()
+{
+  MOZ_ASSERT(mXInput, "XInput should be present!");
+
+  bool found = false;
+  for (int i = 0; i < XUSER_MAX_COUNT; i++) {
+    XINPUT_STATE state = {};
+    if (mXInput.mXInputGetState(i, &state) != ERROR_SUCCESS) {
+      continue;
+    }
+    found = true;
+    // See if this device is already present in our list.
+    if (HaveXInputGamepad(i)) {
+      continue;
+    }
+
+    // Not already present, add it.
+    Gamepad gamepad = {};
+    gamepad.type = kXInputGamepad;
+    gamepad.present = true;
+    gamepad.state = state;
+    gamepad.userIndex = i;
+    gamepad.numButtons = kStandardGamepadButtons;
+    gamepad.numAxes = kStandardGamepadAxes;
+    gamepad.id = AddGamepad("xinput",
+                            GamepadMappingType::Standard,
+                            kStandardGamepadButtons,
+                            kStandardGamepadAxes);
+    mGamepads.AppendElement(gamepad);
+  }
+
+  return found;
+}
+
+void
+WindowsGamepadService::ScanForDevices()
+{
+  for (int i = mGamepads.Length() - 1; i >= 0; i--) {
+    mGamepads[i].present = false;
+  }
+
+  if (mHID) {
+    ScanForRawInputDevices();
+  }
+  if (mXInput) {
+    mXInputPollTimer->Cancel();
+    if (ScanForXInputDevices()) {
+      mXInputPollTimer->InitWithFuncCallback(XInputPollTimerCallback,
+                                             this,
+                                             kXInputPollInterval,
+                                             nsITimer::TYPE_REPEATING_SLACK);
+    }
+  }
+
+  // Look for devices that are no longer present and remove them.
+  for (int i = mGamepads.Length() - 1; i >= 0; i--) {
+    if (!mGamepads[i].present) {
+      RemoveGamepad(mGamepads[i].id);
+      mGamepads.RemoveElementAt(i);
+    }
+  }
+}
+
+// static
+void
+WindowsGamepadService::XInputPollTimerCallback(nsITimer* aTimer,
+                                               void* aClosure)
+{
+  WindowsGamepadService* self =
+    reinterpret_cast<WindowsGamepadService*>(aClosure);
+  self->PollXInput();
+}
+
+void
+WindowsGamepadService::PollXInput()
+{
+  for (unsigned int i = 0; i < mGamepads.Length(); i++) {
+    if (mGamepads[i].type != kXInputGamepad) {
+      continue;
+    }
+
+    XINPUT_STATE state = {};
+    DWORD res = mXInput.mXInputGetState(mGamepads[i].userIndex, &state);
+    if (res == ERROR_SUCCESS
+        && state.dwPacketNumber != mGamepads[i].state.dwPacketNumber) {
+        CheckXInputChanges(mGamepads[i], state);
+    }
+  }
+}
+
+void WindowsGamepadService::CheckXInputChanges(Gamepad& gamepad,
+                                               XINPUT_STATE& state) {
+  // Handle digital buttons first
+  for (size_t b = 0; b < kNumMappings; b++) {
+    if (state.Gamepad.wButtons & kXIButtonMap[b].button &&
+        !(gamepad.state.Gamepad.wButtons & kXIButtonMap[b].button)) {
+      // Button pressed
+      NewButtonEvent(gamepad.id, kXIButtonMap[b].mapped, true);
+    } else if (!(state.Gamepad.wButtons & kXIButtonMap[b].button) &&
+               gamepad.state.Gamepad.wButtons & kXIButtonMap[b].button) {
+      // Button released
+      NewButtonEvent(gamepad.id, kXIButtonMap[b].mapped, false);
+    }
+  }
+
+  // Then triggers
+  if (state.Gamepad.bLeftTrigger != gamepad.state.Gamepad.bLeftTrigger) {
+    bool pressed =
+      state.Gamepad.bLeftTrigger >= XINPUT_GAMEPAD_TRIGGER_THRESHOLD;
+    NewButtonEvent(gamepad.id, kButtonLeftTrigger,
+                   pressed, state.Gamepad.bLeftTrigger / 255.0);
+  }
+  if (state.Gamepad.bRightTrigger != gamepad.state.Gamepad.bRightTrigger) {
+    bool pressed =
+      state.Gamepad.bRightTrigger >= XINPUT_GAMEPAD_TRIGGER_THRESHOLD;
+    NewButtonEvent(gamepad.id, kButtonRightTrigger,
+                   pressed, state.Gamepad.bRightTrigger / 255.0);
+  }
+
+  // Finally deal with analog sticks
+  // TODO: bug 1001955 - Support deadzones.
+  if (state.Gamepad.sThumbLX != gamepad.state.Gamepad.sThumbLX) {
+    NewAxisMoveEvent(gamepad.id, kLeftStickXAxis,
+                     state.Gamepad.sThumbLX / 32767.0);
+  }
+  if (state.Gamepad.sThumbLY != gamepad.state.Gamepad.sThumbLY) {
+    NewAxisMoveEvent(gamepad.id, kLeftStickYAxis,
+                     -1.0 * state.Gamepad.sThumbLY / 32767.0);
+  }
+  if (state.Gamepad.sThumbRX != gamepad.state.Gamepad.sThumbRX) {
+    NewAxisMoveEvent(gamepad.id, kRightStickXAxis,
+                     state.Gamepad.sThumbRX / 32767.0);
+  }
+  if (state.Gamepad.sThumbRY != gamepad.state.Gamepad.sThumbRY) {
+    NewAxisMoveEvent(gamepad.id, kRightStickYAxis,
+                     -1.0 * state.Gamepad.sThumbRY / 32767.0);
+  }
+  gamepad.state = state;
+}
+
+// Used to sort a list of axes by HID usage.
+class HidValueComparator {
+public:
+  bool Equals(const HIDP_VALUE_CAPS& c1, const HIDP_VALUE_CAPS& c2) const
+  {
+    return c1.UsagePage == c2.UsagePage && c1.Range.UsageMin == c2.Range.UsageMin;
+  }
+  bool LessThan(const HIDP_VALUE_CAPS& c1, const HIDP_VALUE_CAPS& c2) const
+  {
+    if (c1.UsagePage == c2.UsagePage) {
+      return c1.Range.UsageMin < c2.Range.UsageMin;
+    }
+    return c1.UsagePage < c2.UsagePage;
+  }
+};
+
+bool
+WindowsGamepadService::GetRawGamepad(HANDLE handle)
+{
+  if (!mHID) {
+    return false;
+  }
+
+  for (unsigned i = 0; i < mGamepads.Length(); i++) {
+    if (mGamepads[i].type == kRawInputGamepad && mGamepads[i].handle == handle) {
+      mGamepads[i].present = true;
+      return true;
+    }
+  }
+
+  RID_DEVICE_INFO rdi = {};
+  UINT size = rdi.cbSize = sizeof(RID_DEVICE_INFO);
+  if (GetRawInputDeviceInfo(handle, RIDI_DEVICEINFO, &rdi, &size) == kRawInputError) {
+    return false;
+  }
+  // Ensure that this is a device we care about
+  if (!SupportedUsage(rdi.hid.usUsagePage, rdi.hid.usUsage)) {
+    return false;
+  }
+
+  Gamepad gamepad = {};
+
+  // Device name is a mostly-opaque string.
+  if (GetRawInputDeviceInfo(handle, RIDI_DEVICENAME, nullptr, &size) == kRawInputError) {
+    return false;
+  }
+
+  nsTArray<wchar_t> devname(size);
+  devname.SetLength(size);
+  if (GetRawInputDeviceInfo(handle, RIDI_DEVICENAME, devname.Elements(), &size) == kRawInputError) {
+    return false;
+  }
+
+  // Per http://msdn.microsoft.com/en-us/library/windows/desktop/ee417014.aspx
+  // device names containing "IG_" are XInput controllers. Ignore those
+  // devices since we'll handle them with XInput.
+  if (wcsstr(devname.Elements(), L"IG_")) {
+    return false;
+  }
+
+  // Product string is a human-readable name.
+  // Per http://msdn.microsoft.com/en-us/library/windows/hardware/ff539681%28v=vs.85%29.aspx
+  // "For USB devices, the maximum string length is 126 wide characters (not including the terminating NULL character)."
+  wchar_t name[128] = { 0 };
+  size = sizeof(name);
+  nsTArray<char> gamepad_name;
+  HANDLE hid_handle = CreateFile(devname.Elements(), GENERIC_READ | GENERIC_WRITE,
+    FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+  if (hid_handle) {
+    if (mHID.mHidD_GetProductString(hid_handle, &name, size)) {
+      int bytes = WideCharToMultiByte(CP_UTF8, 0, name, -1, nullptr, 0, nullptr,
+                                      nullptr);
+      gamepad_name.SetLength(bytes);
+      WideCharToMultiByte(CP_UTF8, 0, name, -1, gamepad_name.Elements(),
+                          bytes, nullptr, nullptr);
+    }
+    CloseHandle(hid_handle);
+  }
+  if (gamepad_name.Length() == 0 || !gamepad_name[0]) {
+    const char kUnknown[] = "Unknown Gamepad";
+    gamepad_name.SetLength(ArrayLength(kUnknown));
+    strcpy_s(gamepad_name.Elements(), gamepad_name.Length(), kUnknown);
+  }
+
+  char gamepad_id[256] = { 0 };
+  _snprintf_s(gamepad_id, _TRUNCATE, "%04x-%04x-%s", rdi.hid.dwVendorId,
+              rdi.hid.dwProductId, gamepad_name.Elements());
+
+  nsTArray<uint8_t> preparsedbytes;
+  if (!GetPreparsedData(handle, preparsedbytes)) {
+    return false;
+  }
+
+  PHIDP_PREPARSED_DATA parsed =
+    reinterpret_cast<PHIDP_PREPARSED_DATA>(preparsedbytes.Elements());
+  HIDP_CAPS caps;
+  if (mHID.mHidP_GetCaps(parsed, &caps) != HIDP_STATUS_SUCCESS) {
+    return false;
+  }
+
+  // Enumerate buttons.
+  USHORT count = caps.NumberInputButtonCaps;
+  nsTArray<HIDP_BUTTON_CAPS> buttonCaps(count);
+  buttonCaps.SetLength(count);
+  if (mHID.mHidP_GetButtonCaps(HidP_Input, buttonCaps.Elements(), &count, parsed)
+      != HIDP_STATUS_SUCCESS) {
+    return false;
+  }
+  for (unsigned i = 0; i < count; i++) {
+    // Each buttonCaps is typically a range of buttons.
+    gamepad.numButtons +=
+      buttonCaps[i].Range.UsageMax - buttonCaps[i].Range.UsageMin + 1;
+  }
+  gamepad.numButtons = std::min(gamepad.numButtons, kMaxButtons);
+
+  // Enumerate value caps, which represent axes and d-pads.
+  count = caps.NumberInputValueCaps;
+  nsTArray<HIDP_VALUE_CAPS> valueCaps(count);
+  valueCaps.SetLength(count);
+  if (mHID.mHidP_GetValueCaps(HidP_Input, valueCaps.Elements(), &count, parsed)
+      != HIDP_STATUS_SUCCESS) {
+    return false;
+  }
+  nsTArray<HIDP_VALUE_CAPS> axes;
+  // Sort the axes by usagePage and usage to expose a consistent ordering.
+  HidValueComparator comparator;
+  for (unsigned i = 0; i < count; i++) {
+    if (valueCaps[i].UsagePage == kDesktopUsagePage
+        && valueCaps[i].Range.UsageMin == kUsageDpad
+        // Don't know how to handle d-pads that return weird values.
+        && valueCaps[i].LogicalMax - valueCaps[i].LogicalMin == 7
+        // Can't overflow buttons
+        && gamepad.numButtons + 4 < kMaxButtons) {
+      // d-pad gets special handling.
+      // Ostensibly HID devices can expose multiple d-pads, but this
+      // doesn't happen in practice.
+      gamepad.hasDpad = true;
+      gamepad.dpadCaps = valueCaps[i];
+      // Expose d-pad as 4 additional buttons.
+      gamepad.numButtons += 4;
+    } else {
+      axes.InsertElementSorted(valueCaps[i], comparator);
+    }
+  }
+
+  gamepad.numAxes = std::min<size_t>(axes.Length(), kMaxAxes);
+  for (unsigned i = 0; i < gamepad.numAxes; i++) {
+    if (i >= kMaxAxes) {
+      break;
+    }
+    gamepad.axes[i].caps = axes[i];
+  }
+  gamepad.type = kRawInputGamepad;
+  gamepad.handle = handle;
+  gamepad.present = true;
+
+  gamepad.id = GamepadFunctions::AddGamepad(gamepad_id,
+                                            GamepadMappingType::_empty,
+                                            gamepad.numButtons,
+                                            gamepad.numAxes);
+  mGamepads.AppendElement(gamepad);
+  return true;
+}
+
+bool
+WindowsGamepadService::HandleRawInput(HRAWINPUT handle)
+{
+  if (!mHID) {
+    return false;
+  }
+
+  // First, get data from the handle
+  UINT size;
+  GetRawInputData(handle, RID_INPUT, nullptr, &size, sizeof(RAWINPUTHEADER));
+  nsTArray<uint8_t> data(size);
+  data.SetLength(size);
+  if (GetRawInputData(handle, RID_INPUT, data.Elements(), &size,
+                      sizeof(RAWINPUTHEADER)) == kRawInputError) {
+    return false;
+  }
+  PRAWINPUT raw = reinterpret_cast<PRAWINPUT>(data.Elements());
+
+  Gamepad* gamepad = nullptr;
+  for (unsigned i = 0; i < mGamepads.Length(); i++) {
+    if (mGamepads[i].type == kRawInputGamepad
+        && mGamepads[i].handle == raw->header.hDevice) {
+      gamepad = &mGamepads[i];
+      break;
+    }
+  }
+  if (gamepad == nullptr) {
+    return false;
+  }
+
+  // Second, get the preparsed data
+  nsTArray<uint8_t> parsedbytes;
+  if (!GetPreparsedData(raw->header.hDevice, parsedbytes)) {
+    return false;
+  }
+  PHIDP_PREPARSED_DATA parsed =
+    reinterpret_cast<PHIDP_PREPARSED_DATA>(parsedbytes.Elements());
+
+  // Get all the pressed buttons.
+  nsTArray<USAGE> usages(gamepad->numButtons);
+  usages.SetLength(gamepad->numButtons);
+  ULONG usageLength = gamepad->numButtons;
+  if (mHID.mHidP_GetUsages(HidP_Input, kButtonUsagePage, 0, usages.Elements(),
+                     &usageLength, parsed, (PCHAR)raw->data.hid.bRawData,
+                     raw->data.hid.dwSizeHid) != HIDP_STATUS_SUCCESS) {
+    return false;
+  }
+
+  bool buttons[kMaxButtons] = { false };
+  usageLength = std::min<ULONG>(usageLength, kMaxButtons);
+  for (unsigned i = 0; i < usageLength; i++) {
+    buttons[usages[i] - 1] = true;
+  }
+
+  if (gamepad->hasDpad) {
+    // Get d-pad position as 4 buttons.
+    ULONG value;
+    if (mHID.mHidP_GetUsageValue(HidP_Input, gamepad->dpadCaps.UsagePage, 0, gamepad->dpadCaps.Range.UsageMin, &value, parsed, (PCHAR)raw->data.hid.bRawData, raw->data.hid.dwSizeHid) == HIDP_STATUS_SUCCESS) {
+      UnpackDpad(static_cast<LONG>(value), gamepad, buttons);
+    }
+  }
+
+  for (unsigned i = 0; i < gamepad->numButtons; i++) {
+    if (gamepad->buttons[i] != buttons[i]) {
+      NewButtonEvent(gamepad->id, i, buttons[i]);
+      gamepad->buttons[i] = buttons[i];
+    }
+  }
+
+  // Get all axis values.
+  for (unsigned i = 0; i < gamepad->numAxes; i++) {
+    double new_value;
+    if (gamepad->axes[i].caps.LogicalMin < 0) {
+LONG value;
+      if (mHID.mHidP_GetScaledUsageValue(HidP_Input, gamepad->axes[i].caps.UsagePage,
+                                   0, gamepad->axes[i].caps.Range.UsageMin,
+                                   &value, parsed,
+                                   (PCHAR)raw->data.hid.bRawData,
+                                   raw->data.hid.dwSizeHid)
+          != HIDP_STATUS_SUCCESS) {
+        continue;
+      }
+      new_value = ScaleAxis(value, gamepad->axes[i].caps.LogicalMin,
+                            gamepad->axes[i].caps.LogicalMax);
+    }
+    else {
+      ULONG value;
+      if (mHID.mHidP_GetUsageValue(HidP_Input, gamepad->axes[i].caps.UsagePage, 0,
+                             gamepad->axes[i].caps.Range.UsageMin, &value,
+                             parsed, (PCHAR)raw->data.hid.bRawData,
+                             raw->data.hid.dwSizeHid) != HIDP_STATUS_SUCCESS) {
+        continue;
+      }
+
+      new_value = ScaleAxis(value, gamepad->axes[i].caps.LogicalMin,
+                            gamepad->axes[i].caps.LogicalMax);
+    }
+    if (gamepad->axes[i].value != new_value) {
+      NewAxisMoveEvent(gamepad->id, i, new_value);
+      gamepad->axes[i].value = new_value;
+    }
+  }
+
+  return true;
+}
+
+void
+WindowsGamepadService::Startup()
+{
+  ScanForDevices();
+}
+
+void
+WindowsGamepadService::Shutdown()
+{
+  Cleanup();
+}
+
+void
+WindowsGamepadService::Cleanup()
+{
+  if (mXInputPollTimer) {
+    mXInputPollTimer->Cancel();
+  }
+  mGamepads.Clear();
+}
+
+void
+WindowsGamepadService::DevicesChanged(DeviceChangeType type)
+{
+  if (type == DeviceChangeNotification) {
+    mObserver->SetDeviceChangeTimer();
+  } else if (type == DeviceChangeStable) {
+    ScanForDevices();
+  }
+}
+
+NS_IMETHODIMP
+Observer::Observe(nsISupports* aSubject,
+                  const char* aTopic,
+                  const char16_t* aData)
+{
+  if (strcmp(aTopic, "timer-callback") == 0) {
+    mSvc.DevicesChanged(WindowsGamepadService::DeviceChangeStable);
+  } else if (strcmp(aTopic, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID) == 0) {
+    Stop();
+  }
+  return NS_OK;
+}
+
+HWND sHWnd = nullptr;
+
+bool
+RegisterRawInput(HWND hwnd, bool enable)
+{
+  nsTArray<RAWINPUTDEVICE> rid(ArrayLength(kUsagePages));
+  rid.SetLength(ArrayLength(kUsagePages));
+
+  for (unsigned i = 0; i < rid.Length(); i++) {
+    rid[i].usUsagePage = kUsagePages[i].usagePage;
+    rid[i].usUsage = kUsagePages[i].usage;
+    rid[i].dwFlags =
+      enable ? RIDEV_EXINPUTSINK | RIDEV_DEVNOTIFY : RIDEV_REMOVE;
+    rid[i].hwndTarget = hwnd;
+  }
+
+  if (!RegisterRawInputDevices(rid.Elements(), rid.Length(),
+                               sizeof(RAWINPUTDEVICE))) {
+    return false;
+  }
+  return true;
+}
+
+static
+LRESULT CALLBACK
+GamepadWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+  const unsigned int DBT_DEVICEARRIVAL        = 0x8000;
+  const unsigned int DBT_DEVICEREMOVECOMPLETE = 0x8004;
+  const unsigned int DBT_DEVNODES_CHANGED     = 0x7;
+
+  switch (msg) {
+  case WM_DEVICECHANGE:
+    if (wParam == DBT_DEVICEARRIVAL ||
+        wParam == DBT_DEVICEREMOVECOMPLETE ||
+        wParam == DBT_DEVNODES_CHANGED) {
+      if (gService) {
+        gService->DevicesChanged(WindowsGamepadService::DeviceChangeNotification);
+      }
+    }
+    break;
+  case WM_INPUT:
+    if (gService) {
+      gService->HandleRawInput(reinterpret_cast<HRAWINPUT>(lParam));
+    }
+    break;
+  }
+  return DefWindowProc(hwnd, msg, wParam, lParam);
+}
+
+} // namespace
+
+namespace mozilla {
+namespace dom {
+
+void StartGamepadMonitoring()
+{
+  if (gService) {
+    return;
+  }
+
+  gService = new WindowsGamepadService();
+  gService->Startup();
+
+  if (sHWnd == nullptr) {
+    WNDCLASSW wc;
+    HMODULE hSelf = GetModuleHandle(nullptr);
+
+    if (!GetClassInfoW(hSelf, L"MozillaGamepadClass", &wc)) {
+      ZeroMemory(&wc, sizeof(WNDCLASSW));
+      wc.hInstance = hSelf;
+      wc.lpfnWndProc = GamepadWindowProc;
+      wc.lpszClassName = L"MozillaGamepadClass";
+      RegisterClassW(&wc);
+    }
+
+    sHWnd = CreateWindowW(L"MozillaGamepadClass", L"Gamepad Watcher",
+                          0, 0, 0, 0, 0,
+                          nullptr, nullptr, hSelf, nullptr);
+    RegisterRawInput(sHWnd, true);
+  }
+}
+
+void StopGamepadMonitoring()
+{
+  if (!gService) {
+    return;
+  }
+
+  if (sHWnd) {
+    RegisterRawInput(sHWnd, false);
+    DestroyWindow(sHWnd);
+    sHWnd = nullptr;
+  }
+
+  gService->Shutdown();
+  delete gService;
+  gService = nullptr;
+}
+
+} // namespace dom
+} // namespace mozilla
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLAllCollection.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLAllCollection.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLAllCollection.h	2015-04-22 13:05:55.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLAllCollection.h	2015-04-24 19:31:06.000000000 +0000
@@ -21,9 +21,6 @@
 class nsINode;
 
 namespace mozilla {
-
-class ErrorResult;
-
 namespace dom {
 
 class OwningNodeOrHTMLCollection;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLFrameElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLFrameElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLFrameElement.h	2015-04-22 13:05:55.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLFrameElement.h	2015-04-24 19:31:07.000000000 +0000
@@ -11,8 +11,6 @@
 #include "nsGenericHTMLFrameElement.h"
 #include "nsGkAtoms.h"
 
-class nsIDOMDocument;
-
 namespace mozilla {
 namespace dom {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLInputElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLInputElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLInputElement.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLInputElement.h	2015-04-24 19:31:07.000000000 +0000
@@ -25,7 +25,6 @@
 #include "nsTextEditorState.h"
 
 class nsIRadioGroupContainer;
-class nsIRadioGroupVisitor;
 class nsIRadioVisitor;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLMediaElement.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLMediaElement.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLMediaElement.cpp	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLMediaElement.cpp	2015-04-24 19:31:07.000000000 +0000
@@ -636,7 +636,7 @@
   RemoveMediaElementFromURITable();
   NS_ASSERTION(mDecoder, "Must have decoder to shut down");
   mDecoder->Shutdown();
-  mDecoder = nullptr;
+  SetDecoder(nullptr);
 }
 
 void HTMLMediaElement::AbortExistingLoads()
@@ -700,7 +700,6 @@
   mPendingEncryptedInitData.mInitDatas.Clear();
 #endif // MOZ_EME
   mSourcePointer = nullptr;
-  mLastNextFrameStatus = NEXT_FRAME_UNINITIALIZED;
 
   mTags = nullptr;
 
@@ -941,13 +940,13 @@
 
   bool videoHasChanged = IsVideo() && HasVideo() != !VideoTracks()->IsEmpty();
 
-  UpdateReadyStateForData(mLastNextFrameStatus);
-
   if (videoHasChanged) {
     // We are a video element and HasVideo() changed so update the screen
     // wakelock
     NotifyOwnerDocumentActivityChanged();
   }
+
+  mReadyStateUpdater->Notify();
 }
 
 void HTMLMediaElement::LoadFromSourceChildren()
@@ -1275,7 +1274,7 @@
       new nsCORSListenerProxy(loadListener,
                               NodePrincipal(),
                               GetCORSMode() == CORS_USE_CREDENTIALS);
-    rv = corsListener->Init(channel);
+    rv = corsListener->Init(channel, DataURIHandling::Allow);
     NS_ENSURE_SUCCESS(rv, rv);
     listener = corsListener;
   } else {
@@ -2045,8 +2044,8 @@
   : nsGenericHTMLElement(aNodeInfo),
     mCurrentLoadID(0),
     mNetworkState(nsIDOMHTMLMediaElement::NETWORK_EMPTY),
-    mReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING),
-    mLastNextFrameStatus(NEXT_FRAME_UNINITIALIZED),
+    mReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING, "HTMLMediaElement::mReadyState"),
+    mReadyStateUpdater("HTMLMediaElement::mReadyStateUpdater"),
     mLoadWaitStatus(NOT_WAITING),
     mVolume(1.0),
     mPreloadAction(PRELOAD_UNDEFINED),
@@ -2087,7 +2086,7 @@
     mMediaSecurityVerified(false),
     mCORSMode(CORS_NONE),
     mIsEncrypted(false),
-    mDownloadSuspendedByCache(false),
+    mDownloadSuspendedByCache(false, "HTMLMediaElement::mDownloadSuspendedByCache"),
     mAudioChannelFaded(false),
     mPlayingThroughTheAudioChannel(false),
     mDisableVideo(false),
@@ -2100,6 +2099,7 @@
   if (!gMediaElementEventsLog) {
     gMediaElementEventsLog = PR_NewLogModule("nsMediaElementEvents");
   }
+  EnsureStateWatchingLog();
 #endif
 
   mAudioChannel = AudioChannelService::GetDefaultAudioChannel();
@@ -2108,6 +2108,13 @@
 
   RegisterActivityObserver();
   NotifyOwnerDocumentActivityChanged();
+
+  MOZ_ASSERT(NS_IsMainThread());
+  mReadyStateUpdater->AddWeakCallback(this, &HTMLMediaElement::UpdateReadyStateInternal);
+  mReadyStateUpdater->Watch(mDownloadSuspendedByCache);
+  // Paradoxically, there is a self-edge whereby UpdateReadyStateInternal refuses
+  // to run until mReadyState reaches at least HAVE_METADATA by some other means.
+  mReadyStateUpdater->Watch(mReadyState);
 }
 
 HTMLMediaElement::~HTMLMediaElement()
@@ -2604,8 +2611,8 @@
     ErrorResult ignore;
     stalled = index != TimeRanges::NoIndex &&
               (ranges->End(index, ignore) - t) < errorMargin;
-    stalled |= mLastNextFrameStatus == MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_BUFFERING &&
-                                       mReadyState == HTMLMediaElement::HAVE_CURRENT_DATA;
+    stalled |= mDecoder && NextFrameStatus() == MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_BUFFERING &&
+               mReadyState == HTMLMediaElement::HAVE_CURRENT_DATA;
     if (stalled) {
       state = STALLED;
     }
@@ -2751,7 +2758,7 @@
   // RtspMediaResource.
   if (DecoderTraits::DecoderWaitsForOnConnected(mimeType)) {
     decoder->SetResource(resource);
-    mDecoder = decoder;
+    SetDecoder(decoder);
     if (aListener) {
       *aListener = nullptr;
     }
@@ -2777,7 +2784,7 @@
   mPendingEvents.Clear();
   // Set mDecoder now so if methods like GetCurrentSrc get called between
   // here and Load(), they work.
-  mDecoder = aDecoder;
+  SetDecoder(aDecoder);
 
   // Tell the decoder about its MediaResource now so things like principals are
   // available immediately.
@@ -2802,7 +2809,7 @@
 
   nsresult rv = aDecoder->Load(aListener, aCloneDonor);
   if (NS_FAILED(rv)) {
-    mDecoder = nullptr;
+    SetDecoder(nullptr);
     LOG(PR_LOG_DEBUG, ("%p Failed to load for decoder %p", this, aDecoder));
     return rv;
   }
@@ -2840,13 +2847,16 @@
   return rv;
 }
 
-class HTMLMediaElement::StreamListener : public MediaStreamListener {
+class HTMLMediaElement::StreamListener : public MediaStreamListener,
+                                         public WatchTarget
+{
 public:
-  explicit StreamListener(HTMLMediaElement* aElement) :
+  explicit StreamListener(HTMLMediaElement* aElement, const char* aName) :
+    WatchTarget(aName),
     mElement(aElement),
     mHaveCurrentData(false),
     mBlocked(false),
-    mMutex("HTMLMediaElement::StreamListener"),
+    mMutex(aName),
     mPendingNotifyOutput(false)
   {}
   void Forget() { mElement = nullptr; }
@@ -2859,24 +2869,25 @@
       mElement->PlaybackEnded();
     }
   }
-  void UpdateReadyStateForData()
+
+  MediaDecoderOwner::NextFrameStatus NextFrameStatus()
   {
-    if (mElement && mHaveCurrentData) {
-      nsRefPtr<HTMLMediaElement> deathGrip = mElement;
-      mElement->UpdateReadyStateForData(
-        mBlocked ? MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_BUFFERING :
-                   MediaDecoderOwner::NEXT_FRAME_AVAILABLE);
+    if (!mElement || !mHaveCurrentData) {
+      return MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE;
     }
+    return mBlocked ? MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_BUFFERING
+                    : MediaDecoderOwner::NEXT_FRAME_AVAILABLE;
   }
+
   void DoNotifyBlocked()
   {
     mBlocked = true;
-    UpdateReadyStateForData();
+    NotifyWatchers();
   }
   void DoNotifyUnblocked()
   {
     mBlocked = false;
-    UpdateReadyStateForData();
+    NotifyWatchers();
   }
   void DoNotifyOutput()
   {
@@ -2896,7 +2907,7 @@
       nsRefPtr<HTMLMediaElement> deathGrip = mElement;
       mElement->FirstFrameLoaded();
     }
-    UpdateReadyStateForData();
+    NotifyWatchers();
     DoNotifyOutput();
   }
 
@@ -3060,8 +3071,9 @@
 
   // XXX if we ever support capturing the output of a media element which is
   // playing a stream, we'll need to add a CombineWithPrincipal call here.
-  mMediaStreamListener = new StreamListener(this);
+  mMediaStreamListener = new StreamListener(this, "HTMLMediaElement::mMediaStreamListener");
   mMediaStreamSizeListener = new StreamSizeListener(this);
+  mReadyStateUpdater->Watch(*mMediaStreamListener);
 
   GetSrcMediaStream()->AddListener(mMediaStreamListener);
   // Listen for an initial image size on mSrcStream so we can get results even
@@ -3111,6 +3123,7 @@
   }
 
   // Kill its reference to this element
+  mReadyStateUpdater->Unwatch(*mMediaStreamListener);
   mMediaStreamListener->Forget();
   mMediaStreamListener = nullptr;
   mMediaStreamSizeListener->Forget();
@@ -3213,7 +3226,7 @@
   if (!aInfo->HasVideo()) {
     ResetState();
   } else {
-    UpdateReadyStateForData(mLastNextFrameStatus);
+    mReadyStateUpdater->Notify();
   }
 
   if (IsVideo() && aInfo->HasVideo()) {
@@ -3494,9 +3507,13 @@
     ShouldCheckAllowOrigin();
 }
 
-void HTMLMediaElement::UpdateReadyStateForData(MediaDecoderOwner::NextFrameStatus aNextFrame)
+void
+HTMLMediaElement::UpdateReadyStateInternal()
 {
-  mLastNextFrameStatus = aNextFrame;
+  if (!mDecoder && !mSrcStream) {
+    // Not initialized - bail out.
+    return;
+  }
 
   if (mDecoder && mReadyState < nsIDOMHTMLMediaElement::HAVE_METADATA) {
     // aNextFrame might have a next frame because the decoder can advance
@@ -3520,7 +3537,7 @@
     MetadataLoaded(&mediaInfo, nsAutoPtr<const MetadataTags>(nullptr));
   }
 
-  if (aNextFrame == MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_SEEKING) {
+  if (NextFrameStatus() == MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_SEEKING) {
     ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_METADATA);
     return;
   }
@@ -3549,9 +3566,9 @@
     return;
   }
 
-  if (aNextFrame != MediaDecoderOwner::NEXT_FRAME_AVAILABLE) {
+  if (NextFrameStatus() != MediaDecoderOwner::NEXT_FRAME_AVAILABLE) {
     ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA);
-    if (!mWaitingFired && aNextFrame == MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_BUFFERING) {
+    if (!mWaitingFired && NextFrameStatus() == MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_BUFFERING) {
       FireTimeUpdate(false);
       DispatchAsyncEvent(NS_LITERAL_STRING("waiting"));
       mWaitingFired = true;
@@ -3870,7 +3887,7 @@
   }
 
   mMediaInfo.mVideo.mDisplay = aSize;
-  UpdateReadyStateForData(mLastNextFrameStatus);
+  mReadyStateUpdater->Notify();
 }
 
 void HTMLMediaElement::UpdateInitialMediaSize(const nsIntSize& aSize)
@@ -4681,5 +4698,16 @@
   SetHTMLAttr(nsGkAtoms::mozaudiochannel, channel, aRv);
 }
 
+MediaDecoderOwner::NextFrameStatus
+HTMLMediaElement::NextFrameStatus()
+{
+  if (mDecoder) {
+    return mDecoder->NextFrameStatus();
+  } else if (mMediaStreamListener) {
+    return mMediaStreamListener->NextFrameStatus();
+  }
+  return NEXT_FRAME_UNINITIALIZED;
+}
+
 } // namespace dom
 } // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLMediaElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLMediaElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLMediaElement.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLMediaElement.h	2015-04-24 19:31:07.000000000 +0000
@@ -23,6 +23,7 @@
 #ifdef MOZ_EME
 #include "mozilla/dom/MediaKeys.h"
 #endif
+#include "StateWatching.h"
 #include "nsGkAtoms.h"
 
 // X.h on Linux #defines CurrentTime as 0L, so we have to #undef it here.
@@ -219,13 +220,6 @@
   // Dispatch events that were raised while in the bfcache
   nsresult DispatchPendingMediaEvents();
 
-  // Called by the decoder when some data has been downloaded or
-  // buffering/seeking has ended. aNextFrameAvailable is true when
-  // the data for the next frame is available. This method will
-  // decide whether to set the ready state to HAVE_CURRENT_DATA,
-  // HAVE_FUTURE_DATA or HAVE_ENOUGH_DATA.
-  virtual void UpdateReadyStateForData(MediaDecoderOwner::NextFrameStatus aNextFrame) final override;
-
   // Return true if we can activate autoplay assuming enough data has arrived.
   bool CanActivateAutoplay();
 
@@ -647,6 +641,19 @@
   class StreamListener;
   class StreamSizeListener;
 
+  MediaDecoderOwner::NextFrameStatus NextFrameStatus();
+
+  void SetDecoder(MediaDecoder* aDecoder)
+  {
+    if (mDecoder) {
+      mReadyStateUpdater->Unwatch(mDecoder->ReadyStateWatchTarget());
+    }
+    mDecoder = aDecoder;
+    if (mDecoder) {
+      mReadyStateUpdater->Watch(mDecoder->ReadyStateWatchTarget());
+    }
+  }
+
   virtual void GetItemValueText(DOMString& text) override;
   virtual void SetItemValueText(const nsAString& text) override;
 
@@ -660,7 +667,7 @@
     void SetOuter(HTMLMediaElement* outer) { mOuter = outer; }
     void SetCanPlay(bool aCanPlay);
 
-    operator bool() const { return mValue; }
+    MOZ_IMPLICIT operator bool() const { return mValue; }
 
     WakeLockBoolWrapper& operator=(bool val);
 
@@ -1013,6 +1020,9 @@
   // MediaElement doesn't yet have one then it will create it.
   TextTrackManager* GetOrCreateTextTrackManager();
 
+  // Recomputes ready state and fires events as necessary based on current state.
+  void UpdateReadyStateInternal();
+
   class nsAsyncEventRunner;
   using nsGenericHTMLElement::DispatchEvent;
   // For nsAsyncEventRunner.
@@ -1090,10 +1100,9 @@
   // Media loading flags. See:
   //   http://www.whatwg.org/specs/web-apps/current-work/#video)
   nsMediaNetworkState mNetworkState;
-  nsMediaReadyState mReadyState;
+  Watchable<nsMediaReadyState> mReadyState;
 
-  // Last value passed from codec or stream source to UpdateReadyStateForData.
-  NextFrameStatus mLastNextFrameStatus;
+  WatcherHolder mReadyStateUpdater;
 
   enum LoadAlgorithmState {
     // No load algorithm instance is waiting for a source to be added to the
@@ -1328,7 +1337,7 @@
 #endif // MOZ_EME
 
   // True if the media's channel's download has been suspended.
-  bool mDownloadSuspendedByCache;
+  Watchable<bool> mDownloadSuspendedByCache;
 
   // Audio Channel.
   AudioChannel mAudioChannel;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLSourceElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLSourceElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLSourceElement.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLSourceElement.h	2015-04-24 19:31:07.000000000 +0000
@@ -17,7 +17,6 @@
 namespace mozilla {
 namespace dom {
 
-class ResponsiveImageSelector;
 class HTMLSourceElement final : public nsGenericHTMLElement,
                                 public nsIDOMHTMLSourceElement
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLTableCellElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLTableCellElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLTableCellElement.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLTableCellElement.h	2015-04-24 19:31:07.000000000 +0000
@@ -9,8 +9,6 @@
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLTableCellElement.h"
 
-class nsIDOMHTMLTableRowElement;
-
 namespace mozilla {
 namespace dom {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLTableRowElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLTableRowElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/HTMLTableRowElement.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/HTMLTableRowElement.h	2015-04-24 19:31:07.000000000 +0000
@@ -8,7 +8,6 @@
 #include "mozilla/Attributes.h"
 #include "nsGenericHTMLElement.h"
 
-class nsIDOMHTMLTableElement;
 class nsContentList;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsFormSubmission.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsFormSubmission.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsFormSubmission.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsFormSubmission.h	2015-04-24 19:31:07.000000000 +0000
@@ -12,12 +12,7 @@
 class nsIURI;
 class nsIInputStream;
 class nsGenericHTMLElement;
-class nsILinkHandler;
 class nsIContent;
-class nsIFormControl;
-class nsIDOMHTMLElement;
-class nsIDocShell;
-class nsIRequest;
 class nsISaveAsCharset;
 class nsIMultiplexInputStream;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsHTMLDocument.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsHTMLDocument.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsHTMLDocument.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsHTMLDocument.h	2015-04-24 19:31:07.000000000 +0000
@@ -22,7 +22,6 @@
 #include "mozilla/dom/HTMLSharedElement.h"
 
 class nsIEditor;
-class nsIParser;
 class nsIURI;
 class nsIDocShell;
 class nsICachingChannel;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsIFormControl.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsIFormControl.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsIFormControl.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsIFormControl.h	2015-04-24 19:31:07.000000000 +0000
@@ -8,8 +8,6 @@
 #include "nsISupports.h"
 class nsIDOMHTMLFormElement;
 class nsPresState;
-class nsString;
-class nsIFormProcessor;
 class nsFormSubmission;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsIForm.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsIForm.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsIForm.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsIForm.h	2015-04-24 19:31:07.000000000 +0000
@@ -9,8 +9,6 @@
 #include "nsAString.h"
 
 class nsIFormControl;
-class nsISimpleEnumerator;
-class nsIURI;
 
 #define NS_FORM_METHOD_GET  0
 #define NS_FORM_METHOD_POST 1
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsIHTMLCollection.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsIHTMLCollection.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsIHTMLCollection.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsIHTMLCollection.h	2015-04-24 19:31:07.000000000 +0000
@@ -15,8 +15,6 @@
 class nsString;
 
 namespace mozilla {
-class ErrorResult;
-
 namespace dom {
 class Element;
 } // namespace dom
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsIHTMLDocument.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsIHTMLDocument.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsIHTMLDocument.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsIHTMLDocument.h	2015-04-24 19:31:07.000000000 +0000
@@ -9,12 +9,9 @@
 #include "nsISupports.h"
 #include "nsCompatibility.h"
 
-class nsIDOMHTMLFormElement;
 class nsIContent;
-class nsIScriptElement;
 class nsIEditor;
 class nsContentList;
-class nsWrapperCache;
 
 #define NS_IHTMLDOCUMENT_IID \
 { 0xcf814492, 0x303c, 0x4718, \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsIRadioGroupContainer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsIRadioGroupContainer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/nsIRadioGroupContainer.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/nsIRadioGroupContainer.h	2015-04-24 19:31:07.000000000 +0000
@@ -7,7 +7,6 @@
 
 #include "nsISupports.h"
 
-class nsString;
 class nsIRadioVisitor;
 class nsIFormControl;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/UndoManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/UndoManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/html/UndoManager.h	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/html/UndoManager.h	2015-04-24 19:31:07.000000000 +0000
@@ -16,7 +16,6 @@
 #include "mozilla/dom/Nullable.h"
 
 class nsITransactionManager;
-class nsIMutationObserver;
 
 namespace mozilla {
 class ErrorResult;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/icc/Icc.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/icc/Icc.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/icc/Icc.cpp	2015-04-22 13:05:57.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/icc/Icc.cpp	2015-04-24 19:31:07.000000000 +0000
@@ -38,6 +38,8 @@
     case IccLockType::SpckPuk:
     case IccLockType::RcckPuk:
     case IccLockType::RspckPuk:
+    case IccLockType::NsckPuk:
+    case IccLockType::PckPuk:
       return true;
     default:
       return false;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/imptests/testharness.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/imptests/testharness.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/imptests/testharness.js	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/imptests/testharness.js	2015-04-24 19:31:08.000000000 +0000
@@ -464,6 +464,74 @@
                 }));
     }
 
+    /**
+     * This constructor helper allows DOM events to be handled using Promises,
+     * which can make it a lot easier to test a very specific series of events,
+     * including ensuring that unexpected events are not fired at any point.
+     */
+    function EventWatcher(test, watchedNode, eventTypes)
+    {
+        if (typeof eventTypes == 'string') {
+            eventTypes = [eventTypes];
+        }
+
+        var waitingFor = null;
+
+        var eventHandler = test.step_func(function(evt) {
+            assert_true(!!waitingFor,
+                        'Not expecting event, but got ' + evt.type + ' event');
+            assert_equals(evt.type, waitingFor.types[0],
+                          'Expected ' + waitingFor.types[0] + ' event, but got ' +
+                          evt.type + ' event instead');
+            if (waitingFor.types.length > 1) {
+                // Pop first event from array
+                waitingFor.types.shift();
+                return;
+            }
+            // We need to null out waitingFor before calling the resolve function
+            // since the Promise's resolve handlers may call wait_for() which will
+            // need to set waitingFor.
+            var resolveFunc = waitingFor.resolve;
+            waitingFor = null;
+            resolveFunc(evt);
+        });
+
+        for (var i = 0; i < eventTypes.length; i++) {
+            watchedNode.addEventListener(eventTypes[i], eventHandler);
+        }
+
+        /**
+         * Returns a Promise that will resolve after the specified event or
+         * series of events has occured.
+         */
+        this.wait_for = function(types) {
+            if (waitingFor) {
+                return Promise.reject('Already waiting for an event or events');
+            }
+            if (typeof types == 'string') {
+                types = [types];
+            }
+            return new Promise(function(resolve, reject) {
+                waitingFor = {
+                    types: types,
+                    resolve: resolve,
+                    reject: reject
+                };
+            });
+        };
+
+        function stop_watching() {
+            for (var i = 0; i < eventTypes.length; i++) {
+                watchedNode.removeEventListener(eventTypes[i], eventHandler);
+            }
+        };
+
+        test.add_cleanup(stop_watching);
+
+        return this;
+    }
+    expose(EventWatcher, 'EventWatcher');
+
     function setup(func_or_properties, maybe_properties)
     {
         var func = null;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/ActorsChild.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/ActorsChild.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/ActorsChild.h	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/ActorsChild.h	2015-04-24 19:31:08.000000000 +0000
@@ -42,7 +42,6 @@
 class IDBOpenDBRequest;
 class IDBRequest;
 class Key;
-class PBackgroundIDBFileChild;
 class PermissionRequestChild;
 class PermissionRequestParent;
 class SerializedStructuredCloneReadInfo;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/ActorsParent.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/ActorsParent.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/ActorsParent.cpp	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/ActorsParent.cpp	2015-04-24 19:31:08.000000000 +0000
@@ -4334,11 +4334,11 @@
   nsInterfaceHashtable<nsCStringHashKey, mozIStorageStatement>
     mCachedStatements;
   nsRefPtr<UpdateRefcountFunction> mUpdateRefcountFunction;
+  bool mInWriteTransaction;
 
 #ifdef DEBUG
   uint32_t mDEBUGSavepointCount;
   PRThread* mDEBUGThread;
-  bool mDEBUGInWriteTransaction;
 #endif
 
 public:
@@ -4390,6 +4390,9 @@
   BeginWriteTransaction();
 
   void
+  RollbackWriteTransaction();
+
+  void
   FinishWriteTransaction();
 
   nsresult
@@ -5102,13 +5105,10 @@
   AssertIsOnOwningThread() const
   {
     AssertIsOnBackgroundThread();
-
-#ifdef DEBUG
     MOZ_ASSERT(mOwningThread);
-    bool current;
+    DebugOnly<bool> current;
     MOZ_ASSERT(NS_SUCCEEDED(mOwningThread->IsOnCurrentThread(&current)));
     MOZ_ASSERT(current);
-#endif
   }
 
   void
@@ -5128,7 +5128,8 @@
     return mActorDestroyed;
   }
 
-  // May be called on any thread.
+  // May be called on any thread, but you should call IsActorDestroyed() if
+  // you know you're on the background thread because it is slightly faster.
   bool
   OperationMayProceed() const
   {
@@ -7737,7 +7738,7 @@
     MOZ_ASSERT(NS_IsMainThread());
 
     if (sInstance) {
-      return sInstance->mShutdownRequested;
+      return sInstance->IsShuttingDown();
     }
 
     return QuotaManager::IsShuttingDown();
@@ -7812,13 +7813,11 @@
   : public nsRunnable
 {
   nsRefPtr<QuotaClient> mQuotaClient;
-  bool mHasRequestedShutDown;
 
 public:
 
   explicit ShutdownWorkThreadsRunnable(QuotaClient* aQuotaClient)
     : mQuotaClient(aQuotaClient)
-    , mHasRequestedShutDown(false)
   {
     MOZ_ASSERT(NS_IsMainThread());
     MOZ_ASSERT(aQuotaClient);
@@ -8299,10 +8298,10 @@
                                       FileManager* aFileManager)
   : mStorageConnection(aStorageConnection)
   , mFileManager(aFileManager)
+  , mInWriteTransaction(false)
 #ifdef DEBUG
   , mDEBUGSavepointCount(0)
   , mDEBUGThread(PR_GetCurrentThread())
-  , mDEBUGInWriteTransaction(false)
 #endif
 {
   AssertIsOnConnectionThread();
@@ -8316,15 +8315,15 @@
   MOZ_ASSERT(!mFileManager);
   MOZ_ASSERT(!mCachedStatements.Count());
   MOZ_ASSERT(!mUpdateRefcountFunction);
+  MOZ_ASSERT(!mInWriteTransaction);
   MOZ_ASSERT(!mDEBUGSavepointCount);
-  MOZ_ASSERT(!mDEBUGInWriteTransaction);
 }
 
 nsresult
 DatabaseConnection::Init()
 {
   AssertIsOnConnectionThread();
-  MOZ_ASSERT(!mDEBUGInWriteTransaction);
+  MOZ_ASSERT(!mInWriteTransaction);
 
   CachedStatement stmt;
   nsresult rv = GetCachedStatement("BEGIN", &stmt);
@@ -8386,20 +8385,20 @@
 {
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
-  MOZ_ASSERT(!mDEBUGInWriteTransaction);
+  MOZ_ASSERT(!mInWriteTransaction);
 
   PROFILER_LABEL("IndexedDB",
                  "DatabaseConnection::BeginWriteTransaction",
                  js::ProfileEntry::Category::STORAGE);
 
   // Release our read locks.
-  CachedStatement commitStmt;
-  nsresult rv = GetCachedStatement("ROLLBACK", &commitStmt);
+  CachedStatement rollbackStmt;
+  nsresult rv = GetCachedStatement("ROLLBACK", &rollbackStmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
-  rv = commitStmt->Execute();
+  rv = rollbackStmt->Execute();
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -8451,27 +8450,55 @@
     return rv;
   }
 
-#ifdef DEBUG
-  mDEBUGInWriteTransaction = true;
-#endif
+  mInWriteTransaction = true;
 
   return NS_OK;
 }
 
 void
+DatabaseConnection::RollbackWriteTransaction()
+{
+  AssertIsOnConnectionThread();
+  MOZ_ASSERT(mStorageConnection);
+
+  PROFILER_LABEL("IndexedDB",
+                 "DatabaseConnection::RollbackWriteTransaction",
+                 js::ProfileEntry::Category::STORAGE);
+
+  if (!mInWriteTransaction) {
+    return;
+  }
+
+  DatabaseConnection::CachedStatement stmt;
+  nsresult rv = GetCachedStatement("ROLLBACK", &stmt);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  // This may fail if SQLite already rolled back the transaction so ignore any
+  // errors.
+  unused << stmt->Execute();
+}
+
+void
 DatabaseConnection::FinishWriteTransaction()
 {
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
-  MOZ_ASSERT(mDEBUGInWriteTransaction);
+
+  PROFILER_LABEL("IndexedDB",
+                 "DatabaseConnection::FinishWriteTransaction",
+                 js::ProfileEntry::Category::STORAGE);
 
   if (mUpdateRefcountFunction) {
     mUpdateRefcountFunction->Reset();
   }
 
-#ifdef DEBUG
-  mDEBUGInWriteTransaction = false;
-#endif
+  if (!mInWriteTransaction) {
+    return;
+  }
+
+  mInWriteTransaction = false;
 
   CachedStatement stmt;
   nsresult rv = GetCachedStatement("BEGIN", &stmt);
@@ -8491,7 +8518,7 @@
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
   MOZ_ASSERT(mUpdateRefcountFunction);
-  MOZ_ASSERT(mDEBUGInWriteTransaction);
+  MOZ_ASSERT(mInWriteTransaction);
 
   PROFILER_LABEL("IndexedDB",
                  "DatabaseConnection::StartSavepoint",
@@ -8524,7 +8551,7 @@
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
   MOZ_ASSERT(mUpdateRefcountFunction);
-  MOZ_ASSERT(mDEBUGInWriteTransaction);
+  MOZ_ASSERT(mInWriteTransaction);
 
   PROFILER_LABEL("IndexedDB",
                  "DatabaseConnection::ReleaseSavepoint",
@@ -8555,7 +8582,7 @@
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
   MOZ_ASSERT(mUpdateRefcountFunction);
-  MOZ_ASSERT(mDEBUGInWriteTransaction);
+  MOZ_ASSERT(mInWriteTransaction);
 
   PROFILER_LABEL("IndexedDB",
                  "DatabaseConnection::RollbackSavepoint",
@@ -8627,7 +8654,7 @@
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
   MOZ_ASSERT(!mDEBUGSavepointCount);
-  MOZ_ASSERT(!mDEBUGInWriteTransaction);
+  MOZ_ASSERT(!mInWriteTransaction);
 
   PROFILER_LABEL("IndexedDB",
                  "DatabaseConnection::Close",
@@ -11071,10 +11098,6 @@
 
   // If this is the first instance then we need to do some initialization.
   if (!sFactoryInstanceCount) {
-    if (!gConnectionPool) {
-      gConnectionPool = new ConnectionPool();
-    }
-
     MOZ_ASSERT(!gLiveDatabaseHashtable);
     gLiveDatabaseHashtable = new DatabaseActorHashtable();
 
@@ -11906,6 +11929,10 @@
     return true;
   }
 
+  if (!gConnectionPool) {
+    gConnectionPool = new ConnectionPool();
+  }
+
   auto* transaction = static_cast<NormalTransaction*>(aActor);
 
   nsRefPtr<StartTransactionOp> startOp = new StartTransactionOp(transaction);
@@ -15318,7 +15345,6 @@
 ShutdownWorkThreadsRunnable::Run()
 {
   if (NS_IsMainThread()) {
-    MOZ_ASSERT(mHasRequestedShutDown);
     MOZ_ASSERT(QuotaClient::GetInstance() == mQuotaClient);
     MOZ_ASSERT(mQuotaClient->mShutdownRunnable == this);
 
@@ -15330,16 +15356,11 @@
 
   AssertIsOnBackgroundThread();
 
-  if (!mHasRequestedShutDown) {
-    mHasRequestedShutDown = true;
-
-    nsRefPtr<ConnectionPool> connectionPool = gConnectionPool.get();
-    if (connectionPool) {
-      connectionPool->Shutdown();
-
-      gConnectionPool = nullptr;
-    }
+  nsRefPtr<ConnectionPool> connectionPool = gConnectionPool.get();
+  if (connectionPool) {
+    connectionPool->Shutdown();
 
+    gConnectionPool = nullptr;
   }
 
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(this)));
@@ -17124,15 +17145,11 @@
 {
   AssertIsOnOwningThread();
 
-  if (mDatabase && aWhy != Deletion) {
-    mDatabase->Invalidate();
-  }
+  FactoryOp::ActorDestroy(aWhy);
 
   if (mVersionChangeOp) {
     mVersionChangeOp->NoteActorDestroyed();
   }
-
-  FactoryOp::ActorDestroy(aWhy);
 }
 
 nsresult
@@ -17645,7 +17662,6 @@
   MOZ_ASSERT(!mVersionChangeTransaction);
 
   if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonMainThread()) ||
-      !OperationMayProceed() ||
       IsActorDestroyed()) {
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
@@ -17763,7 +17779,8 @@
                IDBTransaction::VERSION_CHANGE);
   MOZ_ASSERT(mMaybeBlockedDatabases.IsEmpty());
 
-  if (IsActorDestroyed()) {
+  if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonMainThread()) ||
+      IsActorDestroyed()) {
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
   }
@@ -17782,6 +17799,10 @@
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
+  if (!gConnectionPool) {
+    gConnectionPool = new ConnectionPool();
+  }
+
   nsRefPtr<VersionChangeOp> versionChangeOp = new VersionChangeOp(this);
 
   uint64_t transactionId =
@@ -17811,7 +17832,6 @@
   MOZ_ASSERT_IF(!IsActorDestroyed(), mDatabase);
 
   if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonMainThread()) ||
-      !OperationMayProceed() ||
       IsActorDestroyed()) {
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
@@ -17872,7 +17892,11 @@
     mVersionChangeTransaction = nullptr;
   }
 
-  if (!IsActorDestroyed()) {
+  if (IsActorDestroyed()) {
+    if (NS_SUCCEEDED(mResultCode)) {
+      mResultCode = NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
+    }
+  } else {
     FactoryRequestResponse response;
 
     if (NS_SUCCEEDED(mResultCode)) {
@@ -17907,7 +17931,16 @@
       PBackgroundIDBFactoryRequestParent::Send__delete__(this, response);
   }
 
-  if (NS_FAILED(mResultCode) && mOfflineStorage) {
+  if (mDatabase) {
+    MOZ_ASSERT(!mOfflineStorage);
+
+    if (NS_FAILED(mResultCode)) {
+      mDatabase->Invalidate();
+    }
+
+    // Make sure to release the database on this thread.
+    mDatabase = nullptr;
+  } else if (mOfflineStorage) {
     mOfflineStorage->CloseOnOwningThread();
 
     nsCOMPtr<nsIRunnable> callback =
@@ -17918,10 +17951,6 @@
     helper->WaitForTransactions();
   }
 
-  // Make sure to release the database on this thread.
-  nsRefPtr<Database> database;
-  mDatabase.swap(database);
-
   FinishSendResults();
 }
 
@@ -18520,7 +18549,6 @@
   MOZ_ASSERT(mMaybeBlockedDatabases.IsEmpty());
 
   if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonMainThread()) ||
-      !OperationMayProceed() ||
       IsActorDestroyed()) {
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
@@ -18560,7 +18588,6 @@
   MOZ_ASSERT(mMaybeBlockedDatabases.IsEmpty());
 
   if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonMainThread()) ||
-      !OperationMayProceed() ||
       IsActorDestroyed()) {
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
@@ -19410,14 +19437,7 @@
           fileRefcountFunction->DidAbort();
         }
 
-        DatabaseConnection::CachedStatement stmt;
-        if (NS_SUCCEEDED(connection->GetCachedStatement("ROLLBACK", &stmt))) {
-          // This may fail if SQLite already rolled back the transaction so
-          // ignore any errors.
-          unused << stmt->Execute();
-        } else {
-          NS_WARNING("Failed to prepare ROLLBACK statement!");
-        }
+        connection->RollbackWriteTransaction();
       }
 
       CommitOrRollbackAutoIncrementCounts();
@@ -20113,6 +20133,7 @@
   /* setProperty */ nullptr,
   /* enumerate */ nullptr,
   /* resolve */ nullptr,
+  /* mayResolve */ nullptr,
   /* convert */ nullptr,
   /* finalize */ nullptr,
   /* call */ nullptr,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/ActorsParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/ActorsParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/ActorsParent.h	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/ActorsParent.h	2015-04-24 19:31:08.000000000 +0000
@@ -6,16 +6,12 @@
 #define mozilla_dom_indexeddb_actorsparent_h__
 
 template <class> struct already_AddRefed;
-class nsCString;
-struct nsID;
 class nsIPrincipal;
-class nsPIDOMWindow;
 
 namespace mozilla {
 namespace dom {
 
 class Element;
-class TabParent;
 
 namespace quota {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IDBDatabase.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IDBDatabase.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IDBDatabase.h	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IDBDatabase.h	2015-04-24 19:31:08.000000000 +0000
@@ -19,7 +19,6 @@
 #include "nsTHashtable.h"
 
 class nsIDocument;
-class nsIWeakReference;
 class nsPIDOMWindow;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IDBObjectStore.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IDBObjectStore.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IDBObjectStore.h	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IDBObjectStore.h	2015-04-24 19:31:08.000000000 +0000
@@ -27,21 +27,17 @@
 namespace dom {
 
 class DOMStringList;
-class nsIContentParent;
 template <typename> class Sequence;
 
 namespace indexedDB {
 
-class FileManager;
 class IDBCursor;
-class IDBKeyRange;
 class IDBRequest;
 class IDBTransaction;
 class IndexUpdateInfo;
 class Key;
 class KeyPath;
 class ObjectStoreSpec;
-struct StructuredCloneFile;
 struct StructuredCloneReadInfo;
 
 class IDBObjectStore final
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IDBRequest.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IDBRequest.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IDBRequest.h	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IDBRequest.h	2015-04-24 19:31:08.000000000 +0000
@@ -28,7 +28,6 @@
 namespace dom {
 
 class DOMError;
-struct ErrorEventInit;
 template <typename> struct Nullable;
 class OwningIDBObjectStoreOrIDBIndexOrIDBCursor;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IDBTransaction.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IDBTransaction.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IDBTransaction.h	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IDBTransaction.h	2015-04-24 19:31:08.000000000 +0000
@@ -27,7 +27,6 @@
 
 class DOMError;
 class DOMStringList;
-class PBlobChild;
 
 namespace indexedDB {
 
@@ -42,7 +41,6 @@
 class IndexMetadata;
 class ObjectStoreSpec;
 class OpenCursorParams;
-class PBackgroundIDBDatabaseFileChild;
 class RequestParams;
 
 class IDBTransaction final
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IndexedDatabase.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IndexedDatabase.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IndexedDatabase.h	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IndexedDatabase.h	2015-04-24 19:31:08.000000000 +0000
@@ -12,8 +12,6 @@
 #include "nsCOMPtr.h"
 #include "nsTArray.h"
 
-class nsIInputStream;
-
 namespace mozilla {
 namespace dom {
 
@@ -23,9 +21,7 @@
 
 class FileInfo;
 class IDBDatabase;
-class IDBTransaction;
 class SerializedStructuredCloneReadInfo;
-class SerializedStructuredCloneWriteInfo;
 
 struct StructuredCloneFile
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IndexedDatabaseManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IndexedDatabaseManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/IndexedDatabaseManager.h	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/IndexedDatabaseManager.h	2015-04-24 19:31:08.000000000 +0000
@@ -16,12 +16,10 @@
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
 
-class nsPIDOMWindow;
 struct PRLogModuleInfo;
 
 namespace mozilla {
 
-class DOMEventTargetHelper;
 class EventChainPostVisitor;
 
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/PermissionRequestBase.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/PermissionRequestBase.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/indexedDB/PermissionRequestBase.h	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/indexedDB/PermissionRequestBase.h	2015-04-24 19:31:08.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsString.h"
 
 class nsIPrincipal;
-class nsPIDOMWindow;
 
 namespace mozilla {
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/interfaces/base/nsIServiceWorkerManager.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/interfaces/base/nsIServiceWorkerManager.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/interfaces/base/nsIServiceWorkerManager.idl	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/interfaces/base/nsIServiceWorkerManager.idl	2015-04-24 19:31:08.000000000 +0000
@@ -33,7 +33,7 @@
   readonly attribute DOMString waitingCacheName;
 };
 
-[scriptable, builtinclass, uuid(c05b3b45-7f39-458c-8097-afafc7d69b01)]
+[scriptable, builtinclass, uuid(ff6e13ae-ae34-4941-a81e-a82f3e0e7b6b)]
 interface nsIServiceWorkerManager : nsISupports
 {
   /**
@@ -76,10 +76,6 @@
   void dispatchFetchEvent(in nsIDocument aDoc, in nsIInterceptedChannel aChannel,
                           in boolean aIsReload);
 
-  // aTarget MUST be a ServiceWorkerRegistration.
-  [noscript] void AddRegistrationEventListener(in DOMString aScope, in nsIDOMEventTarget aTarget);
-  [noscript] void RemoveRegistrationEventListener(in DOMString aScope, in nsIDOMEventTarget aTarget);
-
   /**
    * Call this to request that document `aDoc` be controlled by a ServiceWorker
    * if a registration exists for it's scope.
@@ -111,9 +107,9 @@
   [noscript] nsISupports GetDocumentController(in nsIDOMWindow aWindow);
 
   /*
-   * This implements the update algorithm.
+   * This implements the soft update algorithm.
    */
-  void update(in DOMString aScope);
+  void softUpdate(in DOMString aScope);
 
   // Testing
   DOMString getScopeForUrl(in DOMString path);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/interfaces/gamepad/nsIGamepadServiceTest.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/interfaces/gamepad/nsIGamepadServiceTest.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/interfaces/gamepad/nsIGamepadServiceTest.idl	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/interfaces/gamepad/nsIGamepadServiceTest.idl	2015-04-24 19:31:08.000000000 +0000
@@ -9,18 +9,21 @@
 /*
  * This interface is intended only for use in tests.
  */
-[scriptable, uuid(b6ed093c-6ea0-4141-a8eb-f99645162651)]
+[scriptable, uuid(c03ec4ed-8a7e-40e7-99da-c609f1760d0c)]
 interface nsIGamepadServiceTest : nsISupports
 {
   const unsigned long NO_MAPPING = 0;
   const unsigned long STANDARD_MAPPING = 1;
 
-  unsigned long addGamepad(in string id, in unsigned long mapping,
+  unsigned long addGamepad(in string id,
+                           in unsigned long mapping,
                            in unsigned long numButtons,
 			   in unsigned long numAxes);
   void removeGamepad(in unsigned long index);
   void newButtonEvent(in unsigned long index, in unsigned long button,
 		      in boolean pressed);
+  void newButtonValueEvent(in unsigned long index, in unsigned long button,
+                           in boolean pressed, in double value);
   void newAxisMoveEvent(in unsigned long index, in unsigned long axis,
 			in double value);
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/interfaces/push/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/interfaces/push/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/interfaces/push/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/interfaces/push/moz.build	2015-04-24 19:31:08.000000000 +0000
@@ -0,0 +1,12 @@
+# -*- Mode: python; c-basic-offset: 4; 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/.
+
+XPIDL_SOURCES += [
+    'nsIPushNotificationService.idl',
+    'nsIPushObserverNotification.idl',
+]
+
+XPIDL_MODULE = 'dom_push'
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/interfaces/push/nsIPushNotificationService.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/interfaces/push/nsIPushNotificationService.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/interfaces/push/nsIPushNotificationService.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/interfaces/push/nsIPushNotificationService.idl	2015-04-24 19:31:08.000000000 +0000
@@ -0,0 +1,54 @@
+/* -*- 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/. */
+
+#include "nsISupports.idl"
+
+/**
+ * A service for components to subscribe and receive push messages from web
+ * services. This functionality is exposed to content via the Push API, which
+ * uses service workers to notify applications. This interface exists to allow
+ * privileged code to receive messages without migrating to service workers.
+ */
+[scriptable, uuid(3da6a16c-69f8-4843-9149-1e89d58a53e2)]
+interface nsIPushNotificationService : nsISupports
+{
+  /**
+   * Creates a push subscription for the given |scope| URL and |pageURL|.
+   * Returns a promise for the new subscription record, or the existing
+   * record if this |scope| already has a subscription.
+   *
+   * The |pushEndpoint| property of the subscription record is a URL string
+   * that can be used to send push messages to subscribers. For details,
+   * please see the Simple Push protocol docs.
+   *
+   * Each incoming message fires a `push-notification` observer
+   * notification, with an `nsIPushObserverNotification` as the subject and
+   * the |scope| as the data.
+   *
+   * If the server drops a subscription, a `push-subscription-change` observer
+   * will be fired, with the subject set to `null` and the data set to |scope|.
+   * Servers may drop subscriptions at any time, so callers should recreate
+   * subscriptions if desired.
+   */
+  jsval register(in string scope, [optional] in string pageURL);
+
+  /**
+   * Revokes a push subscription for the given |scope|. Returns a promise
+   * for the revoked subscription record, or `null` if the |scope| is not
+   * subscribed to receive notifications.
+   */
+  jsval unregister(in string scope);
+
+  /**
+   * Returns a promise for the subscription record associated with the
+   * given |scope|, or `null` if the |scope| does not have a subscription.
+   */
+  jsval registration(in string scope);
+
+  /**
+   * Clear all subscriptions
+   */
+   jsval clearAll();
+};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/interfaces/push/nsIPushObserverNotification.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/interfaces/push/nsIPushObserverNotification.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/interfaces/push/nsIPushObserverNotification.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/interfaces/push/nsIPushObserverNotification.idl	2015-04-24 19:31:08.000000000 +0000
@@ -0,0 +1,30 @@
+/* -*- 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/. */
+
+#include "nsISupports.idl"
+
+/**
+ * A push message received by an `nsIPushNotificationService`, used as the
+ * subject of a `push-notification` observer notification.
+ */
+[scriptable, uuid(66a87970-6dc9-46e0-ac61-adb4a13791de)]
+interface nsIPushObserverNotification : nsISupports
+{
+  /* The URL that receives push messages from an application server. */
+  attribute string pushEndpoint;
+
+  /**
+   * The notification version sent by the application server. This is a
+   * monotonically increasing number.
+   */
+  attribute long long version;
+
+  /**
+   * The notification payload. Delivery is not guaranteed; if the browser is
+   * offline when the application server sends the push message, the payload
+   * may be discarded.
+   */
+  attribute string data;
+};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/BlobChild.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/BlobChild.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/BlobChild.h	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/BlobChild.h	2015-04-24 19:31:08.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsCOMPtr.h"
 #include "nsID.h"
 
-class nsIDOMBlob;
 class nsIEventTarget;
 class nsIRemoteBlob;
 class nsString;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/BlobParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/BlobParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/BlobParent.h	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/BlobParent.h	2015-04-24 19:31:08.000000000 +0000
@@ -14,7 +14,6 @@
 
 template <class, class> class nsDataHashtable;
 class nsIDHashKey;
-class nsIDOMBlob;
 class nsIEventTarget;
 class nsIRemoteBlob;
 template <class> class nsRevocableEventPtr;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/ContentChild.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/ContentChild.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/ContentChild.cpp	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/ContentChild.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -23,6 +23,7 @@
 #ifdef ACCESSIBILITY
 #include "mozilla/a11y/DocAccessibleChild.h"
 #endif
+#include "mozilla/LookAndFeel.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ProcessHangMonitorIPC.h"
 #include "mozilla/docshell/OfflineCacheUpdateChild.h"
@@ -38,6 +39,7 @@
 #include "mozilla/dom/asmjscache/AsmJSCache.h"
 #include "mozilla/dom/asmjscache/PAsmJSCacheEntryChild.h"
 #include "mozilla/dom/nsIContentChild.h"
+#include "mozilla/psm/PSMContentListener.h"
 #include "mozilla/hal_sandbox/PHalChild.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/FileDescriptorSetChild.h"
@@ -52,6 +54,7 @@
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/plugins/PluginInstanceParent.h"
 #include "mozilla/plugins/PluginModuleParent.h"
+#include "mozilla/widget/WidgetMessageUtils.h"
 
 #if defined(MOZ_CONTENT_SANDBOX)
 #if defined(XP_WIN)
@@ -152,6 +155,10 @@
 #include "ipc/Nuwa.h"
 #endif
 
+#ifdef MOZ_GAMEPAD
+#include "mozilla/dom/GamepadService.h"
+#endif
+
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/cellbroadcast/CellBroadcastIPCService.h"
 #include "mozilla/dom/icc/IccChild.h"
@@ -203,6 +210,7 @@
 using namespace mozilla::layers;
 using namespace mozilla::net;
 using namespace mozilla::jsipc;
+using namespace mozilla::psm;
 using namespace mozilla::widget;
 #if defined(MOZ_WIDGET_GONK)
 using namespace mozilla::system;
@@ -1623,6 +1631,22 @@
     return true;
 }
 
+PPSMContentDownloaderChild*
+ContentChild::AllocPPSMContentDownloaderChild(const uint32_t& aCertType)
+{
+    // NB: We don't need aCertType in the child actor.
+    nsRefPtr<PSMContentDownloaderChild> child = new PSMContentDownloaderChild();
+    return child.forget().take();
+}
+
+bool
+ContentChild::DeallocPPSMContentDownloaderChild(PPSMContentDownloaderChild* aListener)
+{
+    auto* listener = static_cast<PSMContentDownloaderChild*>(aListener);
+    nsRefPtr<PSMContentDownloaderChild> child = dont_AddRef(listener);
+    return true;
+}
+
 PExternalHelperAppChild*
 ContentChild::AllocPExternalHelperAppChild(const OptionalURIParams& uri,
                                            const nsCString& aMimeContentType,
@@ -2755,6 +2779,18 @@
     return true;
 }
 
+bool
+ContentChild::RecvGamepadUpdate(const GamepadChangeEvent& aGamepadEvent)
+{
+#ifdef MOZ_GAMEPAD
+    nsRefPtr<GamepadService> svc(GamepadService::GetService());
+    if (svc) {
+        svc->Update(aGamepadEvent);
+    }
+#endif
+    return true;
+}
+
 // This code goes here rather than nsGlobalWindow.cpp because nsGlobalWindow.cpp
 // can't include ContentChild.h since it includes windows.h.
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/ContentChild.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/ContentChild.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/ContentChild.h	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/ContentChild.h	2015-04-24 19:31:09.000000000 +0000
@@ -20,7 +20,6 @@
 
 
 struct ChromePackage;
-class nsIDOMBlob;
 class nsIObserver;
 struct ResourceMapping;
 struct OverrideMapping;
@@ -35,10 +34,6 @@
 class URIParams;
 }// namespace ipc
 
-namespace jsipc {
-class JavaScriptShared;
-}
-
 namespace layers {
 class PCompositorChild;
 } // namespace layers
@@ -46,7 +41,6 @@
 namespace dom {
 
 class AlertObserver;
-class PrefObserver;
 class ConsoleListener;
 class PStorageChild;
 class ClonedMessageData;
@@ -238,6 +232,10 @@
                              bool* aSuccess) override;
     virtual bool DeallocPScreenManagerChild(PScreenManagerChild*) override;
 
+    virtual PPSMContentDownloaderChild* AllocPPSMContentDownloaderChild(
+            const uint32_t& aCertType) override;
+    virtual bool DeallocPPSMContentDownloaderChild(PPSMContentDownloaderChild* aDownloader) override;
+
     virtual PExternalHelperAppChild *AllocPExternalHelperAppChild(
             const OptionalURIParams& uri,
             const nsCString& aMimeContentType,
@@ -466,6 +464,8 @@
     virtual bool
     DeallocPContentPermissionRequestChild(PContentPermissionRequestChild* actor) override;
 
+    virtual bool RecvGamepadUpdate(const GamepadChangeEvent& aGamepadEvent) override;
+
 private:
     virtual void ActorDestroy(ActorDestroyReason why) override;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/ContentParent.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/ContentParent.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/ContentParent.cpp	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/ContentParent.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -76,6 +76,7 @@
 #include "mozilla/layers/CompositorParent.h"
 #include "mozilla/layers/ImageBridgeParent.h"
 #include "mozilla/layers/SharedBufferManagerParent.h"
+#include "mozilla/LookAndFeel.h"
 #include "mozilla/net/NeckoParent.h"
 #include "mozilla/plugins/PluginBridge.h"
 #include "mozilla/Preferences.h"
@@ -156,6 +157,7 @@
 #include "prio.h"
 #include "private/pprio.h"
 #include "ContentProcessManager.h"
+#include "mozilla/psm/PSMContentListener.h"
 
 #include "nsIBidiKeyboard.h"
 
@@ -224,6 +226,10 @@
 #include "nsIProfileSaveEvent.h"
 #endif
 
+#ifdef MOZ_GAMEPAD
+#include "mozilla/dom/GamepadMonitoring.h"
+#endif
+
 static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID);
 
 using base::ChildPrivileges;
@@ -249,6 +255,7 @@
 using namespace mozilla::layers;
 using namespace mozilla::net;
 using namespace mozilla::jsipc;
+using namespace mozilla::psm;
 using namespace mozilla::widget;
 
 #ifdef ENABLE_TESTS
@@ -2154,6 +2161,7 @@
     , mOpener(aOpener)
     , mIsForBrowser(aIsForBrowser)
     , mIsNuwaProcess(aIsNuwaProcess)
+    , mHasGamepadListener(false)
 {
     InitializeMembers();  // Perform common initialization.
 
@@ -2885,6 +2893,7 @@
     InfallibleTArray<nsString> unusedDictionaries;
     ClipboardCapabilities clipboardCaps;
     DomainPolicyClone domainPolicy;
+
     RecvGetXPCOMProcessAttributes(&isOffline, &isLangRTL, &unusedDictionaries,
                                   &clipboardCaps, &domainPolicy);
     mozilla::unused << content->SendSetOffline(isOffline);
@@ -3665,6 +3674,22 @@
     return true;
 }
 
+PPSMContentDownloaderParent*
+ContentParent::AllocPPSMContentDownloaderParent(const uint32_t& aCertType)
+{
+    nsRefPtr<PSMContentDownloaderParent> downloader =
+        new PSMContentDownloaderParent(aCertType);
+    return downloader.forget().take();
+}
+
+bool
+ContentParent::DeallocPPSMContentDownloaderParent(PPSMContentDownloaderParent* aListener)
+{
+    auto* listener = static_cast<PSMContentDownloaderParent*>(aListener);
+    nsRefPtr<PSMContentDownloaderParent> downloader = dont_AddRef(listener);
+    return true;
+}
+
 PExternalHelperAppParent*
 ContentParent::AllocPExternalHelperAppParent(const OptionalURIParams& uri,
                                              const nsCString& aMimeContentType,
@@ -4020,6 +4045,13 @@
 }
 
 bool
+ContentParent::RecvGetLookAndFeelCache(nsTArray<LookAndFeelInt>&& aLookAndFeelIntCache)
+{
+    aLookAndFeelIntCache = LookAndFeel::GetIntCache();
+    return true;
+}
+
+bool
 ContentParent::RecvIsSecureURI(const uint32_t& type,
                                const URIParams& uri,
                                const uint32_t& flags,
@@ -4963,6 +4995,34 @@
     return true;
 }
 
+bool
+ContentParent::RecvGamepadListenerAdded()
+{
+#ifdef MOZ_GAMEPAD
+    if (mHasGamepadListener) {
+        NS_WARNING("Gamepad listener already started, cannot start again!");
+        return false;
+    }
+    mHasGamepadListener = true;
+    StartGamepadMonitoring();
+#endif
+    return true;
+}
+
+bool
+ContentParent::RecvGamepadListenerRemoved()
+{
+#ifdef MOZ_GAMEPAD
+    if (!mHasGamepadListener) {
+        NS_WARNING("Gamepad listener already stopped, cannot stop again!");
+        return false;
+    }
+    mHasGamepadListener = false;
+    MaybeStopGamepadMonitoring();
+#endif
+    return true;
+}
+
 } // namespace dom
 } // namespace mozilla
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/ContentParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/ContentParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/ContentParent.h	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/ContentParent.h	2015-04-24 19:31:09.000000000 +0000
@@ -30,9 +30,7 @@
 class mozIApplication;
 class nsConsoleService;
 class nsICycleCollectorLogSink;
-class nsIDOMBlob;
 class nsIDumpGCAndCCLogsCallback;
-class nsIMemoryReporter;
 class nsITimer;
 class ParentIdleListener;
 class nsIWidget;
@@ -48,7 +46,6 @@
 } // namespace ipc
 
 namespace jsipc {
-class JavaScriptShared;
 class PJavaScriptParent;
 }
 
@@ -380,6 +377,8 @@
     virtual bool
     DeallocPContentPermissionRequestParent(PContentPermissionRequestParent* actor) override;
 
+    bool HasGamepadListener() const { return mHasGamepadListener; }
+
 protected:
     void OnChannelConnected(int32_t pid) override;
     virtual void ActorDestroy(ActorDestroyReason why) override;
@@ -546,8 +545,7 @@
                                                bool* aIsLangRTL,
                                                InfallibleTArray<nsString>* dictionaries,
                                                ClipboardCapabilities* clipboardCaps,
-                                               DomainPolicyClone* domainPolicy)
-        override;
+                                               DomainPolicyClone* domainPolicy) override;
 
     virtual bool DeallocPJavaScriptParent(mozilla::jsipc::PJavaScriptParent*) override;
 
@@ -609,6 +607,10 @@
 
     virtual bool DeallocPNeckoParent(PNeckoParent* necko) override;
 
+    virtual PPSMContentDownloaderParent* AllocPPSMContentDownloaderParent(
+            const uint32_t& aCertType) override;
+    virtual bool DeallocPPSMContentDownloaderParent(PPSMContentDownloaderParent* aDownloader) override;
+
     virtual PExternalHelperAppParent* AllocPExternalHelperAppParent(
             const OptionalURIParams& aUri,
             const nsCString& aMimeContentType,
@@ -755,6 +757,8 @@
                                                      const bool& aHidden) override;
     virtual bool RecvGetSystemMemory(const uint64_t& getterId) override;
 
+    virtual bool RecvGetLookAndFeelCache(nsTArray<LookAndFeelInt>&& aLookAndFeelIntCache) override;
+
     virtual bool RecvDataStoreGetStores(
                        const nsString& aName,
                        const nsString& aOwner,
@@ -838,6 +842,10 @@
 
     virtual bool RecvUpdateDropEffect(const uint32_t& aDragAction,
                                       const uint32_t& aDropEffect) override;
+
+    virtual bool RecvGamepadListenerAdded() override;
+    virtual bool RecvGamepadListenerRemoved() override;
+
     // If you add strong pointers to cycle collected objects here, be sure to
     // release these objects in ShutDownProcess.  See the comment there for more
     // details.
@@ -882,6 +890,7 @@
     bool mSendDataStoreInfos;
     bool mIsForBrowser;
     bool mIsNuwaProcess;
+    bool mHasGamepadListener;
 
     // These variables track whether we've called Close(), CloseWithError()
     // and KillHard() on our channel.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/CrashReporterParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/CrashReporterParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/CrashReporterParent.h	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/CrashReporterParent.h	2015-04-24 19:31:09.000000000 +0000
@@ -17,7 +17,6 @@
 
 namespace mozilla {
 namespace dom {
-class ProcessReporter;
 
 class CrashReporterParent :
     public PCrashReporterParent
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/jar.mn thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/jar.mn
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/jar.mn	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/jar.mn	2015-04-24 19:31:09.000000000 +0000
@@ -9,6 +9,7 @@
         content/global/BrowserElementChildPreload.js (../browser-element/BrowserElementChildPreload.js)
         content/global/BrowserElementPanning.js (../browser-element/BrowserElementPanning.js)
 *       content/global/BrowserElementPanningAPZDisabled.js (../browser-element/BrowserElementPanningAPZDisabled.js)
+        content/global/manifestMessages.js (manifestMessages.js)
         content/global/PushServiceChildPreload.js (../push/PushServiceChildPreload.js)
         content/global/preload.js (preload.js)
         content/global/post-fork-preload.js (post-fork-preload.js)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/manifestMessages.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/manifestMessages.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/manifestMessages.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/manifestMessages.js	2015-04-24 19:31:09.000000000 +0000
@@ -0,0 +1,119 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.*/
+/*
+ * Manifest obtainer frame script implementation of:
+ * http://w3c.github.io/manifest/#obtaining
+ *
+ * It searches a top-level browsing context for
+ * a <link rel=manifest> element. Then fetches
+ * and processes the linked manifest.
+ *
+ * BUG: https://bugzilla.mozilla.org/show_bug.cgi?id=1083410
+ * exported ManifestObtainer
+ */
+/*globals content, ManifestProcessor, XPCOMUtils, sendAsyncMessage, addMessageListener, Components*/
+'use strict';
+const {
+  utils: Cu
+} = Components;
+
+Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+
+XPCOMUtils.defineLazyModuleGetter(this, 'ManifestProcessor',
+  'resource://gre/modules/ManifestProcessor.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'ManifestObtainer',
+  'resource://gre/modules/ManifestObtainer.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'BrowserUtils',
+  'resource://gre/modules/BrowserUtils.jsm');
+
+addMessageListener('DOM:ManifestObtainer:Obtain', (aMsg) => {
+  fetchManifest()
+    .then(
+      manifest => sendAsyncMessage('DOM:ManifestObtainer:Obtain', {
+        success: true,
+        result: manifest,
+        msgId: aMsg.data.msgId
+      }),
+      error => sendAsyncMessage('DOM:ManifestObtainer:Obtain', {
+        success: false,
+        result: cloneError(error),
+        msgId: aMsg.data.msgId
+      })
+    );
+});
+
+function cloneError(aError) {
+  const clone = {
+    'fileName': String(aError.fileName),
+    'lineNumber': String(aError.lineNumber),
+    'columnNumber': String(aError.columnNumber),
+    'stack': String(aError.stack),
+    'message': String(aError.message),
+    'name': String(aError.name)
+  };
+  return clone;
+}
+
+function fetchManifest() {
+  const manifestQuery = 'link[rel~="manifest"]';
+  return new Promise((resolve, reject) => {
+    if (!content || content.top !== content) {
+      let msg = 'Content window must be a top-level browsing context.';
+      return reject(new Error(msg));
+    }
+    const elem = content.document.querySelector(manifestQuery);
+    if (!elem || !elem.getAttribute('href')) {
+      let msg = 'No manifest to fetch.';
+      return reject(new Error(msg));
+    }
+    // Will throw on "about:blank" and possibly other invalid URIs.
+    const manifestURL = new content.URL(elem.href, elem.baseURI);
+    const reqInit = {};
+    switch (elem.crossOrigin) {
+      case 'use-credentials':
+        reqInit.credentials = 'include';
+        reqInit.mode = 'cors';
+        break;
+      case 'anonymous':
+        reqInit.credentials = 'omit';
+        reqInit.mode = 'cors';
+        break;
+      default:
+        reqInit.credentials = 'same-origin';
+        reqInit.mode = 'no-cors';
+        break;
+    }
+    const req = new content.Request(manifestURL, reqInit);
+    req.setContext('manifest');
+    content
+      .fetch(req)
+      .then(resp => processResponse(resp, content))
+      .then(resolve)
+      .catch(reject);
+  });
+}
+
+function processResponse(aResp, aContentWindow) {
+  const manifestURL = aResp.url;
+  return new Promise((resolve, reject) => {
+    const badStatus = aResp.status < 200 || aResp.status >= 300;
+    if (aResp.type === 'error' || badStatus) {
+      let msg =
+        `Fetch error: ${aResp.status} - ${aResp.statusText} at ${aResp.url}`;
+      return reject(new Error(msg));
+    }
+    aResp
+      .text()
+      .then((text) => {
+        const args = {
+          jsonText: text,
+          manifestURL: manifestURL,
+          docURL: aContentWindow.location.href
+        };
+        const processor = new ManifestProcessor();
+        const manifest = processor.process(args);
+        resolve(Cu.cloneInto(manifest, content));
+      }, reject);
+  });
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/PBrowser.ipdl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/PBrowser.ipdl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/PBrowser.ipdl	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/PBrowser.ipdl	2015-04-24 19:31:09.000000000 +0000
@@ -58,6 +58,7 @@
 using mozilla::WritingMode from "mozilla/WritingModes.h";
 using mozilla::layers::TouchBehaviorFlags from "mozilla/layers/APZUtils.h";
 using nsIWidget::TouchPointerState from "nsIWidget.h";
+using struct LookAndFeelInt from "mozilla/widget/WidgetMessageUtils.h";
 
 namespace mozilla {
 namespace dom {
@@ -674,6 +675,12 @@
     UIResolutionChanged();
 
     /**
+     * Tell the child that the system theme has changed, and that a repaint
+     * is necessary.
+     */
+    ThemeChanged(LookAndFeelInt[] lookAndFeelIntCache);
+
+    /**
      * Tell the child of an app's offline status
      */
     AppOfflineStatus(uint32_t id, bool offline);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/PContent.ipdl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/PContent.ipdl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/PContent.ipdl	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/PContent.ipdl	2015-04-24 19:31:09.000000000 +0000
@@ -16,6 +16,7 @@
 include protocol PCycleCollectWithLogs;
 include protocol PCrashReporter;
 include protocol PDocAccessible;
+include protocol PPSMContentDownloader;
 include protocol PExternalHelperApp;
 include protocol PDeviceStorageRequest;
 include protocol PFileDescriptorSet;
@@ -86,6 +87,7 @@
 using gfxIntSize from "nsSize.h";
 using mozilla::dom::TabId from "mozilla/dom/ipc/IdType.h";
 using mozilla::dom::ContentParentId from "mozilla/dom/ipc/IdType.h";
+using struct LookAndFeelInt from "mozilla/widget/WidgetMessageUtils.h";
 
 union ChromeRegistryItem
 {
@@ -366,6 +368,38 @@
     URIParams[] superWhitelist;
 };
 
+struct GamepadAdded {
+    nsString id;
+    uint32_t index;
+    uint32_t mapping;
+    uint32_t num_buttons;
+    uint32_t num_axes;
+};
+
+struct GamepadRemoved {
+    uint32_t index;
+};
+
+struct GamepadAxisInformation {
+    uint32_t index;
+    uint32_t axis;
+    double value;
+};
+
+struct GamepadButtonInformation {
+    uint32_t index;
+    uint32_t button;
+    bool pressed;
+    double value;
+};
+
+union GamepadChangeEvent {
+    GamepadAdded;
+    GamepadRemoved;
+    GamepadAxisInformation;
+    GamepadButtonInformation;
+};
+
 prio(normal upto urgent) sync protocol PContent
 {
     parent spawns PPluginModule;
@@ -388,6 +422,7 @@
     manages PDocAccessible;
     manages PDeviceStorageRequest;
     manages PFileSystemRequest;
+    manages PPSMContentDownloader;
     manages PExternalHelperApp;
     manages PFileDescriptorSet;
     manages PFMRadio;
@@ -602,6 +637,10 @@
      */
     async UpdateWindow(uintptr_t aChildId);
 
+    /**
+     * Send gamepad status update to child.
+     */
+    GamepadUpdate(GamepadChangeEvent aGamepadEvent);
 parent:
     /**
      * Tell the parent process a new accessible document has been created.
@@ -673,7 +712,7 @@
 
     async PJavaScript();
 
-    sync PRemoteSpellcheckEngine();
+    PRemoteSpellcheckEngine();
     PDeviceStorageRequest(DeviceStorageParams params);
 
     PFileSystemRequest(FileSystemParams params);
@@ -688,6 +727,8 @@
     sync IsSecureURI(uint32_t type, URIParams uri, uint32_t flags)
         returns (bool isSecureURI);
 
+    sync GetLookAndFeelCache(LookAndFeelInt[] lookAndFeelIntCache);
+
     PHal();
 
     PIcc(uint32_t serviceId);
@@ -756,6 +797,8 @@
 
     CloseAlert(nsString name, Principal principal);
 
+    PPSMContentDownloader(uint32_t aCertType);
+
     PExternalHelperApp(OptionalURIParams uri,
                        nsCString aMimeContentType,
                        nsCString aContentDisposition,
@@ -985,6 +1028,16 @@
     PContentPermissionRequest(PermissionRequest[] aRequests, Principal aPrincipal,
                               TabId tabId);
 
+    /*
+     * Tells the parent to start the gamepad listening service if it hasn't already.
+     */
+    GamepadListenerAdded();
+
+    /**
+     * Tells the parent to stop the gamepad listening service if it hasn't already.
+     */
+    GamepadListenerRemoved();
+
 both:
      AsyncMessage(nsString aMessage, ClonedMessageData aData,
                   CpowEntry[] aCpows, Principal aPrincipal);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/PreallocatedProcessManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/PreallocatedProcessManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/PreallocatedProcessManager.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/PreallocatedProcessManager.h	2015-04-24 19:31:09.000000000 +0000
@@ -11,8 +11,6 @@
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
 
-class nsIRunnable;
-
 namespace mozilla {
 namespace dom {
 class ContentParent;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/ProcessHangMonitor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/ProcessHangMonitor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/ProcessHangMonitor.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/ProcessHangMonitor.h	2015-04-24 19:31:09.000000000 +0000
@@ -10,7 +10,6 @@
 #include "mozilla/Atomics.h"
 #include "nsIObserver.h"
 
-class nsGlobalWindow;
 class nsITabChild;
 
 class MessageLoop;
@@ -26,7 +25,6 @@
 }
 
 class PProcessHangMonitorParent;
-class PProcessHangMonitorChild;
 
 class ProcessHangMonitor final
   : public nsIObserver
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/StructuredCloneUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/StructuredCloneUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/StructuredCloneUtils.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/StructuredCloneUtils.h	2015-04-24 19:31:09.000000000 +0000
@@ -14,9 +14,6 @@
 #include "js/StructuredClone.h"
 
 namespace mozilla {
-
-struct SerializedStructuredCloneBuffer;
-
 namespace dom {
 
 struct
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/TabChild.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/TabChild.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/TabChild.cpp	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/TabChild.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -1705,6 +1705,10 @@
 
     SetProcessNameToAppName();
 
+    nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+    MOZ_ASSERT(swm);
+    swm->LoadRegistrations(aConfiguration.serviceWorkerRegistrations());
+
     nsresult rv = WebNavigation()->LoadURI(NS_ConvertUTF8toUTF16(aURI).get(),
                                            nsIWebNavigation::LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP |
                                            nsIWebNavigation::LOAD_FLAGS_DISALLOW_INHERIT_OWNER,
@@ -1717,10 +1721,6 @@
     CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("URL"), aURI);
 #endif
 
-    nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
-    MOZ_ASSERT(swm);
-    swm->LoadRegistrations(aConfiguration.serviceWorkerRegistrations());
-
     return true;
 }
 
@@ -3140,8 +3140,27 @@
   static_cast<PuppetWidget*>(mWidget.get())->ClearBackingScaleCache();
   nsCOMPtr<nsIDocument> document(GetDocument());
   nsCOMPtr<nsIPresShell> presShell = document->GetShell();
-  nsRefPtr<nsPresContext> presContext = presShell->GetPresContext();
-  presContext->UIResolutionChanged();
+  if (presShell) {
+    nsRefPtr<nsPresContext> presContext = presShell->GetPresContext();
+    if (presContext) {
+      presContext->UIResolutionChanged();
+    }
+  }
+  return true;
+}
+
+bool
+TabChild::RecvThemeChanged(nsTArray<LookAndFeelInt>&& aLookAndFeelIntCache)
+{
+  LookAndFeel::SetIntCache(aLookAndFeelIntCache);
+  nsCOMPtr<nsIDocument> document(GetDocument());
+  nsCOMPtr<nsIPresShell> presShell = document->GetShell();
+  if (presShell) {
+    nsRefPtr<nsPresContext> presContext = presShell->GetPresContext();
+    if (presContext) {
+      presContext->ThemeChanged();
+    }
+  }
   return true;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/TabChild.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/TabChild.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/TabChild.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/TabChild.h	2015-04-24 19:31:09.000000000 +0000
@@ -480,6 +480,8 @@
 
     virtual bool RecvUIResolutionChanged() override;
 
+    virtual bool RecvThemeChanged(nsTArray<LookAndFeelInt>&& aLookAndFeelIntCache) override;
+
     /**
      * Native widget remoting protocol for use with windowed plugins with e10s.
      */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/TabParent.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/TabParent.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/TabParent.cpp	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/TabParent.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -24,6 +24,7 @@
 #include "mozilla/layers/CompositorParent.h"
 #include "mozilla/layers/InputAPZContext.h"
 #include "mozilla/layout/RenderFrameParent.h"
+#include "mozilla/LookAndFeel.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/Preferences.h"
@@ -992,6 +993,19 @@
   }
 }
 
+void
+TabParent::ThemeChanged()
+{
+  if (!mIsDestroyed) {
+    // The theme has changed, and any cached values we had sent down
+    // to the child have been invalidated. When this method is called,
+    // LookAndFeel should have the up-to-date values, which we now
+    // send down to the child. We do this for every remote tab for now,
+    // but bug 1156934 has been filed to do it once per content process.
+    unused << SendThemeChanged(LookAndFeel::GetIntCache());
+  }
+}
+
 void
 TabParent::RequestFlingSnap(const FrameMetrics::ViewID& aScrollId,
                             const mozilla::CSSPoint& aDestination)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/TabParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/TabParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/ipc/TabParent.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/ipc/TabParent.h	2015-04-24 19:31:09.000000000 +0000
@@ -246,6 +246,7 @@
     void UpdateDimensions(const nsIntRect& rect, const ScreenIntSize& size);
     void UpdateFrame(const layers::FrameMetrics& aFrameMetrics);
     void UIResolutionChanged();
+    void ThemeChanged();
     void RequestFlingSnap(const FrameMetrics::ViewID& aScrollId,
                           const mozilla::CSSPoint& aDestination);
     void AcknowledgeScrollUpdate(const ViewID& aScrollId, const uint32_t& aScrollGeneration);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/locales/en-US/chrome/appstrings.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/locales/en-US/chrome/appstrings.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/locales/en-US/chrome/appstrings.properties	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/locales/en-US/chrome/appstrings.properties	2015-04-24 19:31:09.000000000 +0000
@@ -29,6 +29,7 @@
 externalProtocolChkMsg=Remember my choice for all links of this type.
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
+unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
 cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/locales/en-US/chrome/netError.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/locales/en-US/chrome/netError.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/locales/en-US/chrome/netError.dtd	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/locales/en-US/chrome/netError.dtd	2015-04-24 19:31:09.000000000 +0000
@@ -81,6 +81,11 @@
 <p>Website owners who believe their site has been reported as an attack site in error may <a href='http://www.stopbadware.org/home/reviewinfo' >request a review</a>.</p>
 ">
 
+<!ENTITY unwantedBlocked.title "Suspected Unwanted Software Site!">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Unwanted software pages try to install software that can be deceptive and affect your system in unexpected ways.</p>
+">
+
 <!ENTITY phishingBlocked.title "Suspected Web Forgery!">
 <!ENTITY phishingBlocked.longDesc "
 <p>Entering any personal information on this page may result in identity theft or other fraud.</p>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/ManifestObtainer.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/ManifestObtainer.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/ManifestObtainer.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/ManifestObtainer.jsm	2015-04-24 19:31:09.000000000 +0000
@@ -0,0 +1,85 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * ManifestObtainer is an implementation of:
+ * http://w3c.github.io/manifest/#obtaining
+ *
+ * Exposes public method `.obtainManifest(browserWindow)`, which returns
+ * a promise. If successful, you get back a manifest (string).
+ *
+ * For e10s compat, this JSM relies on the following to do
+ * the nessesary IPC:
+ *   dom/ipc/manifestMessages.js
+ *
+ * whose internal URL is:
+ *   'chrome://global/content/manifestMessages.js'
+ *
+ * Which is injected into every browser instance via browser.js.
+ *
+ * BUG: https://bugzilla.mozilla.org/show_bug.cgi?id=1083410
+ * exported ManifestObtainer
+ */
+'use strict';
+this.EXPORTED_SYMBOLS = ['ManifestObtainer'];
+
+const MSG_KEY = 'DOM:ManifestObtainer:Obtain';
+let messageCounter = 0;
+// FIXME: Ideally, we would store a reference to the
+//        message manager in a weakmap instead of needing a
+//        browserMap. However, trying to store a messageManager
+//        results in a TypeError because of:
+//        https://bugzilla.mozilla.org/show_bug.cgi?id=888600
+const browsersMap = new WeakMap();
+
+function ManifestObtainer() {}
+
+ManifestObtainer.prototype = {
+  obtainManifest(aBrowserWindow) {
+    if (!aBrowserWindow) {
+      const err = new TypeError('Invalid input. Expected xul browser.');
+      return Promise.reject(err);
+    }
+    const mm = aBrowserWindow.messageManager;
+    const onMessage = function(aMsg) {
+      const msgId = aMsg.data.msgId;
+      const {
+        resolve, reject
+      } = browsersMap.get(aBrowserWindow).get(msgId);
+      browsersMap.get(aBrowserWindow).delete(msgId);
+      // If we we've processed all messages,
+      // stop listening.
+      if (!browsersMap.get(aBrowserWindow).size) {
+        browsersMap.delete(aBrowserWindow);
+        mm.removeMessageListener(MSG_KEY, onMessage);
+      }
+      if (aMsg.data.success) {
+        return resolve(aMsg.data.result);
+      }
+      reject(toError(aMsg.data.result));
+    };
+    // If we are not already listening for messages
+    // start listening.
+    if (!browsersMap.has(aBrowserWindow)) {
+      browsersMap.set(aBrowserWindow, new Map());
+      mm.addMessageListener(MSG_KEY, onMessage);
+    }
+    return new Promise((resolve, reject) => {
+      const msgId = messageCounter++;
+      browsersMap.get(aBrowserWindow).set(msgId, {
+        resolve: resolve,
+        reject: reject
+      });
+      mm.sendAsyncMessage(MSG_KEY, {
+        msgId: msgId
+      });
+    });
+
+    function toError(aErrorClone) {
+      const error = new Error();
+      Object.getOwnPropertyNames(aErrorClone)
+        .forEach(name => error[name] = aErrorClone[name]);
+      return error;
+    }
+  }
+};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/moz.build	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/moz.build	2015-04-24 19:31:09.000000000 +0000
@@ -5,8 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES += [
+    'ManifestObtainer.jsm',
     'ManifestProcessor.jsm',
 ]
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
-# BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/browser.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/browser.ini	2015-04-24 19:31:09.000000000 +0000
@@ -0,0 +1,2 @@
+[DEFAULT]
+[browser_ManifestObtainer_obtain.js]
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/browser_ManifestObtainer_obtain.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/browser_ManifestObtainer_obtain.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/browser_ManifestObtainer_obtain.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/browser_ManifestObtainer_obtain.js	2015-04-24 19:31:09.000000000 +0000
@@ -0,0 +1,210 @@
+//Used by JSHint:
+/*global Cu, ManifestObtainer, BrowserTestUtils, add_task, SpecialPowers, todo_is, gBrowser, Assert*/
+'use strict';
+Cu.import('resource://gre/modules/ManifestObtainer.jsm', this);
+requestLongerTimeout(4); // e10s tests take time.
+const defaultURL =
+  'http://example.org/tests/dom/manifest/test/resource.sjs';
+const remoteURL =
+  'http://mochi.test:8888/tests/dom/manifest/test/resource.sjs';
+const tests = [
+  // Fetch tests.
+  {
+    expected: 'Manifest is first `link` where @rel contains token manifest.',
+    get tabURL() {
+      let query = [
+        `body=<h1>${this.expected}</h1>`,
+        'Content-Type=text/html; charset=utf-8',
+      ];
+      const URL = `${defaultURL}?${query.join('&')}`;
+      return URL;
+    },
+    run(manifest) {
+      Assert.strictEqual(manifest.name, 'pass-1', this.expected);
+    },
+    testData: `
+      <link rel="manifesto" href='${defaultURL}?body={"name":"fail"}'>
+      <link rel="foo bar manifest bar test" href='${defaultURL}?body={"name":"pass-1"}'>
+      <link rel="manifest" href='${defaultURL}?body={"name":"fail"}'>`
+  }, {
+    expected: 'Manifest is first `link` where @rel contains token manifest.',
+    get tabURL() {
+      let query = [
+        `body=<h1>${this.expected}</h1>`,
+        'Content-Type=text/html; charset=utf-8',
+      ];
+      const URL = `${defaultURL}?${query.join('&')}`;
+      return URL;
+    },
+    run(manifest) {
+      Assert.strictEqual(manifest.name, 'pass-2', this.expected);
+    },
+    testData: `
+      <link rel="foo bar manifest bar test" href='resource.sjs?body={"name":"pass-2"}'>
+      <link rel="manifest" href='resource.sjs?body={"name":"fail"}'>
+      <link rel="manifest foo bar test" href='resource.sjs?body={"name":"fail"}'>`
+  }, {
+    expected: 'By default, manifest load cross-origin.',
+    get tabURL() {
+      let query = [
+        `body=<h1>${this.expected}</h1>`,
+        'Content-Type=text/html; charset=utf-8',
+      ];
+      const URL = `${defaultURL}?${query.join('&')}`;
+      return URL;
+    },
+    run(manifest) {
+      // Waiting on https://bugzilla.mozilla.org/show_bug.cgi?id=1130924
+      todo_is(manifest.name, 'pass-3', this.expected);
+    },
+    testData: `<link rel="manifest" href='${remoteURL}?body={"name":"pass-3"}'>`
+  },
+  // CORS Tests.
+  {
+    expected: 'CORS enabled, manifest must be fetched.',
+    get tabURL() {
+      let query = [
+        `body=<h1>${this.expected}</h1>`,
+        'Content-Type=text/html; charset=utf-8',
+      ];
+      const URL = `${defaultURL}?${query.join('&')}`;
+      return URL;
+    },
+    run(manifest) {
+      Assert.strictEqual(manifest.name, 'pass-4', this.expected);
+    },
+    get testData() {
+      const body = 'body={"name": "pass-4"}';
+      const CORS =
+        `Access-Control-Allow-Origin=${new URL(this.tabURL).origin}`;
+      const link =
+        `<link
+        crossorigin=anonymous
+        rel="manifest"
+        href='${remoteURL}?${body}&${CORS}'>`;
+      return link;
+    }
+  }, {
+    expected: 'Fetch blocked by CORS - origin does not match.',
+    get tabURL() {
+      let query = [
+        `body=<h1>${this.expected}</h1>`,
+        'Content-Type=text/html; charset=utf-8',
+      ];
+      const URL = `${defaultURL}?${query.join('&')}`;
+      return URL;
+    },
+    run(err) {
+      Assert.strictEqual(err.name, 'TypeError', this.expected);
+    },
+    get testData() {
+      const body = 'body={"name": "fail"}';
+      const CORS = 'Access-Control-Allow-Origin=http://not-here';
+      const link =
+        `<link
+        crossorigin
+        rel="manifest"
+        href='${remoteURL}?${body}&${CORS}'>`;
+      return link;
+    }
+  },
+];
+
+add_task(function*() {
+  yield new Promise(resolve => {
+    SpecialPowers.pushPrefEnv({
+      'set': [
+        ['dom.fetch.enabled', true]
+      ]
+    }, resolve);
+  });
+  for (let test of tests) {
+    let tabOptions = {
+      gBrowser: gBrowser,
+      url: test.tabURL,
+    };
+    yield BrowserTestUtils.withNewTab(
+      tabOptions,
+      browser => testObtainingManifest(browser, test)
+    );
+  }
+
+  function* testObtainingManifest(aBrowser, aTest) {
+    const obtainer = new ManifestObtainer();
+    aBrowser.contentWindowAsCPOW.document.head.innerHTML = aTest.testData;
+    try {
+      const manifest = yield obtainer.obtainManifest(aBrowser);
+      aTest.run(manifest);
+    } catch (e) {
+      aTest.run(e);
+    }
+  }
+});
+
+/*
+ * e10s race condition tests
+ * Open a bunch of tabs and load manifests
+ * in each tab. They should all return pass.
+ */
+add_task(function*() {
+  const obtainer = new ManifestObtainer();
+  const defaultPath = '/tests/dom/manifest/test/manifestLoader.html';
+  const tabURLs = [
+    `http://test:80${defaultPath}`,
+    `http://mochi.test:8888${defaultPath}`,
+    `http://test1.mochi.test:8888${defaultPath}`,
+    `http://sub1.test1.mochi.test:8888${defaultPath}`,
+    `http://sub2.xn--lt-uia.mochi.test:8888${defaultPath}`,
+    `http://test2.mochi.test:8888${defaultPath}`,
+    `http://example.org:80${defaultPath}`,
+    `http://test1.example.org:80${defaultPath}`,
+    `http://test2.example.org:80${defaultPath}`,
+    `http://sub1.test1.example.org:80${defaultPath}`,
+    `http://sub1.test2.example.org:80${defaultPath}`,
+    `http://sub2.test1.example.org:80${defaultPath}`,
+    `http://sub2.test2.example.org:80${defaultPath}`,
+    `http://example.org:8000${defaultPath}`,
+    `http://test1.example.org:8000${defaultPath}`,
+    `http://test2.example.org:8000${defaultPath}`,
+    `http://sub1.test1.example.org:8000${defaultPath}`,
+    `http://sub1.test2.example.org:8000${defaultPath}`,
+    `http://sub2.test1.example.org:8000${defaultPath}`,
+    `http://sub2.test2.example.org:8000${defaultPath}`,
+    `http://example.com:80${defaultPath}`,
+    `http://www.example.com:80${defaultPath}`,
+    `http://test1.example.com:80${defaultPath}`,
+    `http://test2.example.com:80${defaultPath}`,
+    `http://sub1.test1.example.com:80${defaultPath}`,
+    `http://sub1.test2.example.com:80${defaultPath}`,
+    `http://sub2.test1.example.com:80${defaultPath}`,
+    `http://sub2.test2.example.com:80${defaultPath}`,
+  ];
+  // Open tabs an collect corresponding browsers
+  let browsers = [
+    for (url of tabURLs) gBrowser.addTab(url).linkedBrowser
+  ];
+  // Once all the pages have loaded, run a bunch of tests in "parallel".
+  yield Promise.all((
+    for (browser of browsers) BrowserTestUtils.browserLoaded(browser)
+  ));
+  // Flood random browsers with requests. Once promises settle, check that
+  // responses all pass.
+  const results = yield Promise.all((
+    for (browser of randBrowsers(browsers, 1000)) obtainer.obtainManifest(browser)
+  ));
+  const expected = 'Expect every manifest to have name equal to `pass`.';
+  const pass = results.every(manifest => manifest.name === 'pass');
+  Assert.ok(pass, expected);
+  //cleanup
+  browsers
+    .map(browser => gBrowser.getTabForBrowser(browser))
+    .forEach(tab => gBrowser.removeTab(tab));
+
+  //Helper generator, spits out random browsers
+  function* randBrowsers(aBrowsers, aMax) {
+    for (let i = 0; i < aMax; i++) {
+      const randNum = Math.round(Math.random() * (aBrowsers.length - 1));
+      yield aBrowsers[randNum];
+    }
+  }
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/common.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/common.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/common.js	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/common.js	2015-04-24 19:31:09.000000000 +0000
@@ -6,7 +6,7 @@
 const bsp = SpecialPowers.Cu.import('resource://gre/modules/ManifestProcessor.jsm'),
   processor = new bsp.ManifestProcessor(),
   manifestURL = new URL(document.location.origin + '/manifest.json'),
-  docURL = new URL('', document.location.origin),
+  docURL = document.location,
   seperators = '\u2028\u2029\u0020\u00A0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000',
   lineTerminators = '\u000D\u000A\u2028\u2029',
   whiteSpace = `${seperators}${lineTerminators}`,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/manifestLoader.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/manifestLoader.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/manifestLoader.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/manifestLoader.html	2015-04-24 19:31:09.000000000 +0000
@@ -0,0 +1,13 @@
+<!doctype html>
+<meta charset=utf-8>
+<!--
+Uses resource.sjs to load a Web Manifest that can be loaded cross-origin.
+-->
+<link rel="manifest" href='resource.sjs?body={"name":"pass"}&amp;Access-Control-Allow-Origin=*'>
+<h1>Manifest loader</h1>
+<p>Uses resource.sjs to load a Web Manifest that can be loaded cross-origin. The manifest looks like this:</p>
+<pre>
+{
+	"name":"pass"
+}
+</pre>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/mochitest.ini	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/mochitest.ini	2015-04-24 19:31:09.000000000 +0000
@@ -1,7 +1,8 @@
 [DEFAULT]
-
 support-files =
 	common.js
+	resource.sjs
+	manifestLoader.html
 
 [test_IconsProcessor_density.html]
 [test_IconsProcessor_sizes.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/resource.sjs thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/resource.sjs
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/manifest/test/resource.sjs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/manifest/test/resource.sjs	2015-04-24 19:31:09.000000000 +0000
@@ -0,0 +1,93 @@
+/* Generic responder that composes a response from
+ * the query string of a request.
+ *
+ * It reserves some special prop names:
+ *  - body: get's used as the response body
+ *  - statusCode: override the 200 OK response code
+ *    (response text is set automatically)
+ *
+ * Any property names it doesn't know about get converted into
+ * HTTP headers.
+ *
+ * For example:
+ *  http://test/resource.sjs?Content-Type=text/html&body=<h1>hello</h1>&Hello=hi
+ *
+ * Outputs:
+ * HTTP/1.1 200 OK
+ * Content-Type: text/html
+ * Hello: hi
+ * <h1>hello</h1>
+ */
+//global handleRequest
+'use strict';
+const HTTPStatus = new Map([
+  [100, 'Continue'],
+  [101, 'Switching Protocol'],
+  [200, 'OK'],
+  [201, 'Created'],
+  [202, 'Accepted'],
+  [203, 'Non-Authoritative Information'],
+  [204, 'No Content'],
+  [205, 'Reset Content'],
+  [206, 'Partial Content'],
+  [300, 'Multiple Choice'],
+  [301, 'Moved Permanently'],
+  [302, 'Found'],
+  [303, 'See Other'],
+  [304, 'Not Modified'],
+  [305, 'Use Proxy'],
+  [306, 'unused'],
+  [307, 'Temporary Redirect'],
+  [308, 'Permanent Redirect'],
+  [400, 'Bad Request'],
+  [401, 'Unauthorized'],
+  [402, 'Payment Required'],
+  [403, 'Forbidden'],
+  [404, 'Not Found'],
+  [405, 'Method Not Allowed'],
+  [406, 'Not Acceptable'],
+  [407, 'Proxy Authentication Required'],
+  [408, 'Request Timeout'],
+  [409, 'Conflict'],
+  [410, 'Gone'],
+  [411, 'Length Required'],
+  [412, 'Precondition Failed'],
+  [413, 'Request Entity Too Large'],
+  [414, 'Request-URI Too Long'],
+  [415, 'Unsupported Media Type'],
+  [416, 'Requested Range Not Satisfiable'],
+  [417, 'Expectation Failed'],
+  [500, 'Internal Server Error'],
+  [501, 'Not Implemented'],
+  [502, 'Bad Gateway'],
+  [503, 'Service Unavailable'],
+  [504, 'Gateway Timeout'],
+  [505, 'HTTP Version Not Supported']
+]);
+
+function handleRequest(request, response) {
+  const queryMap = createQueryMap(request);
+  if (queryMap.has('statusCode')) {
+    let statusCode = parseInt(queryMap.get('statusCode'));
+    let statusText = HTTPStatus.get(statusCode);
+    queryMap.delete('statusCode');
+    response.setStatusLine('1.1', statusCode, statusText);
+  }
+  if (queryMap.has('body')) {
+    let body = queryMap.get('body') || '';
+    queryMap.delete('body');
+    response.write(body);
+  }
+  for (let [key, value] of queryMap) {
+    response.setHeader(key, value);
+  }
+
+  function createQueryMap(request) {
+    const queryMap = new Map();
+    request.queryString.split('&')
+      //split on first "="
+      .map((component) => component.split(/=(.+)?/))
+      .forEach(pair => queryMap.set(pair[0], decodeURIComponent(pair[1])));
+    return queryMap;
+  }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AbstractMediaDecoder.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AbstractMediaDecoder.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AbstractMediaDecoder.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AbstractMediaDecoder.h	2015-04-24 19:31:09.000000000 +0000
@@ -23,7 +23,6 @@
 class MediaResource;
 class ReentrantMonitor;
 class VideoFrameContainer;
-class TimedMetadata;
 class MediaDecoderOwner;
 #ifdef MOZ_EME
 class CDMProxy;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AbstractThread.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AbstractThread.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AbstractThread.cpp	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AbstractThread.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -63,12 +63,21 @@
 
   virtual bool IsCurrentThreadIn() override
   {
-    bool in = NS_GetCurrentThread() == mTarget;
+    // Compare NSPR threads so that this works after shutdown when
+    // NS_GetCurrentThread starts returning null.
+    PRThread* thread = nullptr;
+    mTarget->GetPRThread(&thread);
+    bool in = PR_GetCurrentThread() == thread;
     MOZ_ASSERT(in == (GetCurrent() == this));
     return in;
   }
 
-  void FireTailDispatcher() { MOZ_ASSERT(mTailDispatcher.isSome()); mTailDispatcher.reset(); }
+  void FireTailDispatcher()
+  {
+    MOZ_DIAGNOSTIC_ASSERT(mTailDispatcher.isSome());
+    mTailDispatcher.ref().DrainDirectTasks();
+    mTailDispatcher.reset();
+  }
 
   virtual TaskDispatcher& TailDispatcher() override
   {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/android/AndroidMediaPluginHost.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/android/AndroidMediaPluginHost.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/android/AndroidMediaPluginHost.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/android/AndroidMediaPluginHost.h	2015-04-24 19:31:09.000000000 +0000
@@ -13,8 +13,6 @@
 
 namespace mozilla {
 
-class AndroidMediaReader;
-
 class AndroidMediaPluginHost {
   nsRefPtr<AndroidMediaResourceServer> mResourceServer;
   nsTArray<MPAPI::Manifest *> mPlugins;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/android/AndroidMediaReader.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/android/AndroidMediaReader.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/android/AndroidMediaReader.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/android/AndroidMediaReader.h	2015-04-24 19:31:09.000000000 +0000
@@ -25,10 +25,6 @@
 class ImageContainer;
 }
 
-namespace dom {
-class TimeRanges;
-}
- 
 class AndroidMediaReader : public MediaDecoderReader
 {
   nsCString mType;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/android/AndroidMediaResourceServer.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/android/AndroidMediaResourceServer.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/android/AndroidMediaResourceServer.cpp	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/android/AndroidMediaResourceServer.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -421,7 +421,12 @@
 AndroidMediaResourceServer::Start()
 {
   nsRefPtr<AndroidMediaResourceServer> server = new AndroidMediaResourceServer();
-  NS_DispatchToMainThread(server, NS_DISPATCH_SYNC);
+  // We should fix this up - see bug 1157476.
+  if (NS_IsMainThread()) {
+    server->Run();
+  } else {
+    NS_DispatchToMainThread(server, NS_DISPATCH_SYNC);
+  }
   return server.forget();
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AudioSegment.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AudioSegment.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AudioSegment.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AudioSegment.h	2015-04-24 19:31:09.000000000 +0000
@@ -13,6 +13,7 @@
 #ifdef MOZILLA_INTERNAL_API
 #include "mozilla/TimeStamp.h"
 #endif
+#include <float.h>
 
 namespace mozilla {
 
@@ -43,7 +44,6 @@
   nsTArray<nsTArray<T> > mBuffers;
 };
 
-class AudioStream;
 class AudioMixer;
 
 /**
@@ -129,6 +129,25 @@
     mVolume = 1.0f;
     mBufferFormat = AUDIO_FORMAT_SILENCE;
   }
+
+  bool IsSilentOrSubnormal() const
+  {
+    if (!mBuffer) {
+      return true;
+    }
+
+    for (uint32_t i = 0, length = mChannelData.Length(); i < length; ++i) {
+      const float* channel = static_cast<const float*>(mChannelData[i]);
+      for (StreamTime frame = 0; frame < mDuration; ++frame) {
+        if (fabs(channel[frame]) >= FLT_MIN) {
+          return false;
+        }
+      }
+    }
+
+    return true;
+  }
+
   int ChannelCount() const { return mChannelData.Length(); }
 
   bool IsMuted() const { return mVolume == 0.0f; }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AudioSink.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AudioSink.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AudioSink.cpp	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AudioSink.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -25,6 +25,38 @@
 #define SINK_LOG_V(msg, ...)
 #endif
 
+AudioSink::OnAudioEndTimeUpdateTask::OnAudioEndTimeUpdateTask(
+                                     MediaDecoderStateMachine* aStateMachine)
+  : mMutex("OnAudioEndTimeUpdateTask")
+  , mEndTime(0)
+  , mStateMachine(aStateMachine)
+{
+}
+
+NS_IMETHODIMP
+AudioSink::OnAudioEndTimeUpdateTask::Run() {
+  MutexAutoLock lock(mMutex);
+  if (mStateMachine) {
+    mStateMachine->OnAudioEndTimeUpdate(mEndTime);
+  }
+  return NS_OK;
+}
+
+void
+AudioSink::OnAudioEndTimeUpdateTask::Dispatch(int64_t aEndTime) {
+  MutexAutoLock lock(mMutex);
+  if (mStateMachine) {
+    mEndTime = aEndTime;
+    mStateMachine->TaskQueue()->Dispatch(this);
+  }
+}
+
+void
+AudioSink::OnAudioEndTimeUpdateTask::Cancel() {
+  MutexAutoLock lock(mMutex);
+  mStateMachine = nullptr;
+}
+
 // The amount of audio frames that is used to fuzz rounding errors.
 static const int64_t AUDIO_FUZZ_FRAMES = 1;
 
@@ -46,6 +78,7 @@
   , mPlaying(true)
 {
   NS_ASSERTION(mStartTime != -1, "Should have audio start time by now");
+  mOnAudioEndTimeUpdateTask = new OnAudioEndTimeUpdateTask(aStateMachine);
 }
 
 nsresult
@@ -108,6 +141,7 @@
 void
 AudioSink::Shutdown()
 {
+  mOnAudioEndTimeUpdateTask->Cancel();
   mThread->Shutdown();
   mThread = nullptr;
   MOZ_ASSERT(!mAudioStream);
@@ -202,7 +236,7 @@
     }
     int64_t endTime = GetEndTime();
     if (endTime != -1) {
-      mStateMachine->DispatchOnAudioEndTimeUpdate(endTime);
+      mOnAudioEndTimeUpdateTask->Dispatch(endTime);
     }
   }
   ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AudioSink.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AudioSink.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AudioSink.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AudioSink.h	2015-04-24 19:31:09.000000000 +0000
@@ -12,7 +12,6 @@
 
 namespace mozilla {
 
-class AudioAvailableEventManager;
 class AudioStream;
 class MediaDecoderStateMachine;
 
@@ -140,6 +139,23 @@
   bool mSetPreservesPitch;
 
   bool mPlaying;
+
+  class OnAudioEndTimeUpdateTask : public nsRunnable {
+  public:
+    explicit OnAudioEndTimeUpdateTask(MediaDecoderStateMachine* aStateMachine);
+
+    NS_IMETHOD Run() override;
+
+    void Dispatch(int64_t aEndTime);
+    void Cancel();
+
+  private:
+    Mutex mMutex;
+    int64_t mEndTime;
+    nsRefPtr<MediaDecoderStateMachine> mStateMachine;
+  };
+
+  nsRefPtr<OnAudioEndTimeUpdateTask> mOnAudioEndTimeUpdateTask;
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AudioTrack.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AudioTrack.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/AudioTrack.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/AudioTrack.h	2015-04-24 19:31:09.000000000 +0000
@@ -12,8 +12,6 @@
 namespace mozilla {
 namespace dom {
 
-class AudioTrackList;
-
 class AudioTrack : public MediaTrack
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/directshow/DirectShowReader.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/directshow/DirectShowReader.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/directshow/DirectShowReader.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/directshow/DirectShowReader.h	2015-04-24 19:31:09.000000000 +0000
@@ -15,17 +15,12 @@
 struct IGraphBuilder;
 struct IMediaControl;
 struct IMediaSeeking;
-struct IMediaEventEx;
 
 namespace mozilla {
 
 class AudioSinkFilter;
 class SourceFilter;
 
-namespace dom {
-class TimeRanges;
-}
-
 // Decoder backend for decoding MP3 using DirectShow. DirectShow operates as
 // a filter graph. The basic design of the DirectShowReader is that we have
 // a SourceFilter that wraps the MediaResource that connects to the
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/directshow/SourceFilter.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/directshow/SourceFilter.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/directshow/SourceFilter.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/directshow/SourceFilter.h	2015-04-24 19:31:09.000000000 +0000
@@ -19,7 +19,6 @@
 namespace mozilla {
 
 class MediaResource;
-class ReadRequest;
 class OutputPin;
 
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/DOMMediaStream.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/DOMMediaStream.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/DOMMediaStream.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/DOMMediaStream.h	2015-04-24 19:31:09.000000000 +0000
@@ -15,8 +15,6 @@
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/CORSMode.h"
 
-class nsXPCClassInfo;
-
 // GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
 // GetTickCount() and conflicts with NS_DECL_NSIDOMMEDIASTREAM, containing
 // currentTime getter.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/eme/CDMProxy.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/eme/CDMProxy.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/eme/CDMProxy.cpp	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/eme/CDMProxy.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -64,19 +64,12 @@
       RejectPromise(aPromiseId, NS_ERROR_DOM_INVALID_STATE_ERR);
       return;
     }
-    bool hasPlugin;
-    nsTArray<nsCString> tags;
-    tags.AppendElement(NS_ConvertUTF16toUTF8(mKeySystem));
-    nsresult rv = mps->GetPluginVersionForAPI(NS_LITERAL_CSTRING(GMP_API_DECRYPTOR),
-                                              &tags, &hasPlugin, pluginVersion);
-    NS_ENSURE_SUCCESS_VOID(rv);
   }
 
   nsAutoPtr<InitData> data(new InitData());
   data->mPromiseId = aPromiseId;
   data->mOrigin = aOrigin;
   data->mTopLevelOrigin = aTopLevelOrigin;
-  data->mPluginVersion = pluginVersion;
   data->mInPrivateBrowsing = aInPrivateBrowsing;
   nsCOMPtr<nsIRunnable> task(
     NS_NewRunnableMethodWithArg<nsAutoPtr<InitData>>(this,
@@ -175,7 +168,6 @@
   nsresult rv = mps->GetNodeId(data.mOrigin,
                                data.mTopLevelOrigin,
                                data.mInPrivateBrowsing,
-                               data.mPluginVersion,
                                Move(callback));
   if (NS_FAILED(rv)) {
     RejectPromise(data.mPromiseId, NS_ERROR_DOM_INVALID_STATE_ERR);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/eme/CDMProxy.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/eme/CDMProxy.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/eme/CDMProxy.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/eme/CDMProxy.h	2015-04-24 19:31:09.000000000 +0000
@@ -181,7 +181,6 @@
     uint32_t mPromiseId;
     nsAutoString mOrigin;
     nsAutoString mTopLevelOrigin;
-    nsAutoCString mPluginVersion;
     bool mInPrivateBrowsing;
   };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/eme/MediaKeySession.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/eme/MediaKeySession.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/eme/MediaKeySession.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/eme/MediaKeySession.h	2015-04-24 19:31:09.000000000 +0000
@@ -23,9 +23,6 @@
 struct JSContext;
 
 namespace mozilla {
-
-class CDMProxy;
-
 namespace dom {
 
 class ArrayBufferViewOrArrayBuffer;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/EncodedBufferCache.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/EncodedBufferCache.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/EncodedBufferCache.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/EncodedBufferCache.h	2015-04-24 19:31:09.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/Mutex.h"
 
 struct PRFileDesc;
-class nsIDOMBlob;
 
 namespace mozilla {
 
@@ -20,7 +19,6 @@
 class File;
 }
 
-class ReentrantMonitor;
 /**
  * Data is moved into a temporary file when it grows beyond
  * the maximal size passed in the Init function.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/encoder/fmp4_muxer/ISOMediaBoxes.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/encoder/fmp4_muxer/ISOMediaBoxes.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/encoder/fmp4_muxer/ISOMediaBoxes.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/encoder/fmp4_muxer/ISOMediaBoxes.h	2015-04-24 19:31:09.000000000 +0000
@@ -28,7 +28,6 @@
 
 class AudioTrackMetadata;
 class VideoTrackMetadata;
-class ES_Descriptor;
 class ISOControl;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/encoder/fmp4_muxer/ISOMediaWriter.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/encoder/fmp4_muxer/ISOMediaWriter.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/encoder/fmp4_muxer/ISOMediaWriter.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/encoder/fmp4_muxer/ISOMediaWriter.h	2015-04-24 19:31:09.000000000 +0000
@@ -13,7 +13,6 @@
 
 class ISOControl;
 class FragmentBuffer;
-class ISOMediaWriterRunnable;
 
 class ISOMediaWriter : public ContainerWriter
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -158,6 +158,9 @@
       if (image) {
         image->Release();
       }
+      for (uint32_t i = 0; i < AV_NUM_DATA_POINTERS; i++) {
+        aFrame->data[i] = nullptr;
+      }
       break;
     }
     default:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/fmp4/PlatformDecoderModule.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/fmp4/PlatformDecoderModule.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/fmp4/PlatformDecoderModule.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/fmp4/PlatformDecoderModule.h	2015-04-24 19:31:09.000000000 +0000
@@ -13,14 +13,11 @@
 #include "mozilla/RefPtr.h"
 #include <queue>
 
-class nsIThreadPool;
-
 namespace mozilla {
 class TrackInfo;
 class AudioInfo;
 class VideoInfo;
 class MediaRawData;
-class MediaByteBuffer;
 
 namespace layers {
 class ImageContainer;
@@ -28,7 +25,6 @@
 
 class MediaDataDecoder;
 class MediaDataDecoderCallback;
-class MediaInputQueue;
 class FlushableMediaTaskQueue;
 class CDMProxy;
 typedef int64_t Microseconds;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPContentParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPContentParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPContentParent.h	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPContentParent.h	2015-04-24 19:31:09.000000000 +0000
@@ -9,14 +9,10 @@
 #include "mozilla/gmp/PGMPContentParent.h"
 #include "nsISupportsImpl.h"
 
-class nsITimer;
-
 namespace mozilla {
 namespace gmp {
 
-class GeckoMediaPluginService;
 class GMPAudioDecoderParent;
-class GMPCapability;
 class GMPDecryptorParent;
 class GMPParent;
 class GMPVideoDecoderParent;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPParent.h	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPParent.h	2015-04-24 19:31:09.000000000 +0000
@@ -23,7 +23,6 @@
 #include "nsIFile.h"
 #include "ThreadSafeRefcountingWithMainThreadDestruction.h"
 
-class nsILineInputStream;
 class nsIThread;
 
 #ifdef MOZ_CRASHREPORTER
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPServiceChild.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPServiceChild.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPServiceChild.cpp	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPServiceChild.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -148,12 +148,10 @@
 {
 public:
   GetNodeIdDone(const nsAString& aOrigin, const nsAString& aTopLevelOrigin,
-                bool aInPrivateBrowsing, const nsACString& aVersion,
-                UniquePtr<GetNodeIdCallback>&& aCallback)
+                bool aInPrivateBrowsing, UniquePtr<GetNodeIdCallback>&& aCallback)
     : mOrigin(aOrigin),
       mTopLevelOrigin(aTopLevelOrigin),
       mInPrivateBrowsing(aInPrivateBrowsing),
-      mVersion(aVersion),
       mCallback(Move(aCallback))
   {
   }
@@ -167,8 +165,7 @@
 
     nsCString outId;
     if (!aGMPServiceChild->SendGetGMPNodeId(mOrigin, mTopLevelOrigin,
-                                            mInPrivateBrowsing, mVersion,
-                                            &outId)) {
+                                            mInPrivateBrowsing, &outId)) {
       mCallback->Done(NS_ERROR_FAILURE, EmptyCString());
       return;
     }
@@ -180,7 +177,6 @@
   nsString mOrigin;
   nsString mTopLevelOrigin;
   bool mInPrivateBrowsing;
-  nsCString mVersion;
   UniquePtr<GetNodeIdCallback> mCallback;
 };
 
@@ -188,12 +184,10 @@
 GeckoMediaPluginServiceChild::GetNodeId(const nsAString& aOrigin,
                                         const nsAString& aTopLevelOrigin,
                                         bool aInPrivateBrowsing,
-                                        const nsACString& aVersion,
                                         UniquePtr<GetNodeIdCallback>&& aCallback)
 {
   UniquePtr<GetServiceChildCallback> callback(
-    new GetNodeIdDone(aOrigin, aTopLevelOrigin, aInPrivateBrowsing, aVersion,
-                      Move(aCallback)));
+    new GetNodeIdDone(aOrigin, aTopLevelOrigin, aInPrivateBrowsing, Move(aCallback)));
   GetServiceChild(Move(callback));
   return NS_OK;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPServiceChild.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPServiceChild.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPServiceChild.h	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPServiceChild.h	2015-04-24 19:31:09.000000000 +0000
@@ -34,7 +34,6 @@
   NS_IMETHOD GetNodeId(const nsAString& aOrigin,
                        const nsAString& aTopLevelOrigin,
                        bool aInPrivateBrowsingMode,
-                       const nsACString& aVersion,
                        UniquePtr<GetNodeIdCallback>&& aCallback) override;
 
   NS_DECL_NSIOBSERVER
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPServiceParent.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPServiceParent.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPServiceParent.cpp	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPServiceParent.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -584,9 +584,17 @@
         return gmp;
       }
 
-      // This GMP has the correct type but has the wrong nodeId; hold on to it
-      // in case we need to clone it.
-      gmpToClone = gmp;
+      if (!gmpToClone ||
+          (gmpToClone->IsMarkedForDeletion() && !gmp->IsMarkedForDeletion())) {
+        // This GMP has the correct type but has the wrong nodeId; hold on to it
+        // in case we need to clone it.
+        // Prefer GMPs in-use for the case where an upgraded plugin version is
+        // waiting for the old one to die. If the old plugin is in use, we
+        // should continue using it so that any persistent state remains
+        // consistent. Otherwise, just check that the plugin isn't scheduled
+        // for deletion.
+        gmpToClone = gmp;
+      }
       // Loop around and try the next plugin; it may be usable from aNodeId.
       index++;
     }
@@ -912,7 +920,6 @@
 GeckoMediaPluginServiceParent::GetNodeId(const nsAString& aOrigin,
                                          const nsAString& aTopLevelOrigin,
                                          bool aInPrivateBrowsing,
-                                         const nsACString& aVersion,
                                          nsACString& aOutId)
 {
   MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread);
@@ -941,8 +948,7 @@
   }
 
   const uint32_t hash = AddToHash(HashString(aOrigin),
-                                  HashString(aTopLevelOrigin),
-                                  HashString(aVersion));
+                                  HashString(aTopLevelOrigin));
 
   if (aInPrivateBrowsing) {
     // For PB mode, we store the node id, indexed by the origin pair,
@@ -1062,11 +1068,10 @@
 GeckoMediaPluginServiceParent::GetNodeId(const nsAString& aOrigin,
                                          const nsAString& aTopLevelOrigin,
                                          bool aInPrivateBrowsing,
-                                         const nsACString& aVersion,
                                          UniquePtr<GetNodeIdCallback>&& aCallback)
 {
   nsCString nodeId;
-  nsresult rv = GetNodeId(aOrigin, aTopLevelOrigin, aInPrivateBrowsing, aVersion, nodeId);
+  nsresult rv = GetNodeId(aOrigin, aTopLevelOrigin, aInPrivateBrowsing, nodeId);
   aCallback->Done(rv, nodeId);
   return rv;
 }
@@ -1435,11 +1440,10 @@
 GMPServiceParent::RecvGetGMPNodeId(const nsString& aOrigin,
                                    const nsString& aTopLevelOrigin,
                                    const bool& aInPrivateBrowsing,
-                                   const nsCString& aVersion,
                                    nsCString* aID)
 {
   nsresult rv = mService->GetNodeId(aOrigin, aTopLevelOrigin,
-                                    aInPrivateBrowsing, aVersion, *aID);
+                                    aInPrivateBrowsing, *aID);
   return NS_SUCCEEDED(rv);
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPServiceParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPServiceParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/GMPServiceParent.h	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/GMPServiceParent.h	2015-04-24 19:31:09.000000000 +0000
@@ -42,7 +42,6 @@
   NS_IMETHOD GetNodeId(const nsAString& aOrigin,
                        const nsAString& aTopLevelOrigin,
                        bool aInPrivateBrowsingMode,
-                       const nsACString& aVersion,
                        UniquePtr<GetNodeIdCallback>&& aCallback) override;
 
   NS_DECL_MOZIGECKOMEDIAPLUGINCHROMESERVICE
@@ -70,8 +69,7 @@
                                   size_t* aOutPluginIndex);
 
   nsresult GetNodeId(const nsAString& aOrigin, const nsAString& aTopLevelOrigin,
-                     bool aInPrivateBrowsing, const nsACString& aVersion,
-                     nsACString& aOutId);
+                     bool aInPrivateBrowsing, nsACString& aOutId);
 
   void UnloadPlugins();
   void CrashPlugins();
@@ -199,7 +197,6 @@
   virtual bool RecvGetGMPNodeId(const nsString& aOrigin,
                                 const nsString& aTopLevelOrigin,
                                 const bool& aInPrivateBrowsing,
-                                const nsCString& aVersion,
                                 nsCString* aID) override;
   static bool RecvGetGMPPluginVersionForAPI(const nsCString& aAPI,
                                             nsTArray<nsCString>&& aTags,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/mozIGeckoMediaPluginService.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/mozIGeckoMediaPluginService.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/mozIGeckoMediaPluginService.idl	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/mozIGeckoMediaPluginService.idl	2015-04-24 19:31:09.000000000 +0000
@@ -52,7 +52,7 @@
 native GetGMPVideoEncoderCallback(mozilla::UniquePtr<GetGMPVideoEncoderCallback>&&);
 native GetNodeIdCallback(mozilla::UniquePtr<GetNodeIdCallback>&&);
 
-[scriptable, uuid(6e3023f4-d9a2-46b4-8f50-70d4c918471d)]
+[scriptable, uuid(787cf744-eea8-48c8-b692-376e0485ef97)]
 interface mozIGeckoMediaPluginService : nsISupports
 {
 
@@ -146,6 +146,5 @@
   void getNodeId(in AString origin,
                  in AString topLevelOrigin,
                  in bool inPrivateBrowsingMode,
-                 in ACString version,
                  in GetNodeIdCallback callback);
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/PGMPService.ipdl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/PGMPService.ipdl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gmp/PGMPService.ipdl	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gmp/PGMPService.ipdl	2015-04-24 19:31:09.000000000 +0000
@@ -19,7 +19,7 @@
                ProcessId[] alreadyBridgedTo)
     returns (ProcessId id, nsCString displayName, nsCString pluginId);
   sync GetGMPNodeId(nsString origin, nsString topLevelOrigin,
-                    bool inPrivateBrowsing, nsCString version)
+                    bool inPrivateBrowsing)
     returns (nsCString id);
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/GraphDriver.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/GraphDriver.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/GraphDriver.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/GraphDriver.h	2015-04-24 19:31:09.000000000 +0000
@@ -60,7 +60,6 @@
     SCHEDULE_SAFETY_MARGIN_MS;
 
 class MediaStreamGraphImpl;
-class MessageBlock;
 
 /**
  * Microseconds relative to the start of the graph timeline.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gtest/MockMediaDecoderOwner.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gtest/MockMediaDecoderOwner.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gtest/MockMediaDecoderOwner.h	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gtest/MockMediaDecoderOwner.h	2015-04-24 19:31:09.000000000 +0000
@@ -33,9 +33,6 @@
   virtual void DownloadResumed(bool aForceNetworkLoading) override {}
   virtual void NotifySuspendedByCache(bool aIsSuspended) override {}
   virtual void NotifyDecoderPrincipalChanged() override {}
-  virtual void UpdateReadyStateForData(NextFrameStatus aNextFrame) override
-  {
-  }
   virtual VideoFrameContainer* GetVideoFrameContainer() override
   {
     return nullptr;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gtest/TestGMPCrossOrigin.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gtest/TestGMPCrossOrigin.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/gtest/TestGMPCrossOrigin.cpp	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/gtest/TestGMPCrossOrigin.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -497,7 +497,6 @@
   nsresult rv = service->GetNodeId(aOrigin,
                                    aTopLevelOrigin,
                                    aInPBMode,
-                                   NS_LITERAL_CSTRING(""),
                                    Move(callback));
   EXPECT_TRUE(NS_SUCCEEDED(rv) && NS_SUCCEEDED(result));
   return nodeId;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/imagecapture/ImageCapture.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/imagecapture/ImageCapture.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/imagecapture/ImageCapture.h	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/imagecapture/ImageCapture.h	2015-04-24 19:31:09.000000000 +0000
@@ -11,8 +11,6 @@
 #include "mozilla/dom/ImageCaptureBinding.h"
 #include "prlog.h"
 
-class nsIDOMBlob;
-
 namespace mozilla {
 
 #ifdef PR_LOGGING
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/Latency.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/Latency.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/Latency.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/Latency.h	2015-04-24 19:31:09.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsIObserver.h"
 
 class AsyncLatencyLogger;
-class LogEvent;
 
 PRLogModuleInfo* GetLatencyLog();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoder.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoder.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoder.cpp	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoder.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -313,7 +313,8 @@
     mHaveSentFinishVideo(false),
     mStream(aStream),
     mHaveBlockedForPlayState(false),
-    mHaveBlockedForStateMachineNotPlaying(false)
+    mHaveBlockedForStateMachineNotPlaying(false),
+    mEOSVideoCompensation(false)
 {
   mListener = new DecodedStreamGraphListener(mStream, this);
   mStream->AddListener(mListener);
@@ -585,6 +586,7 @@
 }
 
 MediaDecoder::MediaDecoder() :
+  mReadyStateWatchTarget("MediaDecoder::mReadyStateWatchTarget"),
   mDecoderPosition(0),
   mPlaybackPosition(0),
   mCurrentTime(0.0),
@@ -595,7 +597,7 @@
   mMediaSeekable(true),
   mSameOriginMedia(false),
   mReentrantMonitor("media.decoder"),
-  mPlayState(PLAY_STATE_LOADING),
+  mPlayState(PLAY_STATE_LOADING, "MediaDecoder::mPlayState"),
   mNextState(PLAY_STATE_PAUSED),
   mIgnoreProgressData(false),
   mInfiniteStream(false),
@@ -622,8 +624,17 @@
   if (!gMediaDecoderLog) {
     gMediaDecoderLog = PR_NewLogModule("MediaDecoder");
   }
+  EnsureStateWatchingLog();
 #endif
+
+  mNextFrameStatus.Init(AbstractThread::MainThread(), MediaDecoderOwner::NEXT_FRAME_UNINITIALIZED,
+                        "MediaDecoder::mNextFrameStatus (Mirror)");
+
+
   mAudioChannel = AudioChannelService::GetDefaultAudioChannel();
+
+  mReadyStateWatchTarget->Watch(mPlayState);
+  mReadyStateWatchTarget->Watch(mNextFrameStatus);
 }
 
 bool MediaDecoder::Init(MediaDecoderOwner* aOwner)
@@ -707,8 +718,8 @@
   nsresult rv = OpenResource(aStreamListener);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mDecoderStateMachine = CreateStateMachine();
-  NS_ENSURE_TRUE(mDecoderStateMachine, NS_ERROR_FAILURE);
+  SetStateMachine(CreateStateMachine());
+  NS_ENSURE_TRUE(GetStateMachine(), NS_ERROR_FAILURE);
 
   return InitializeStateMachine(aCloneDonor);
 }
@@ -1047,7 +1058,7 @@
   ChangeState(PLAY_STATE_ENDED);
   InvalidateWithFlags(VideoFrameContainer::INVALIDATE_FORCE);
 
-  UpdateReadyStateForData();
+  mReadyStateWatchTarget->Notify(); // XXXbholley - Still necessary?
   if (mOwner)  {
     mOwner->PlaybackEnded();
   }
@@ -1140,7 +1151,6 @@
   if (mResource && mOwner) {
     bool suspended = mResource->IsSuspendedByCache();
     mOwner->NotifySuspendedByCache(suspended);
-    UpdateReadyStateForData();
   }
 }
 
@@ -1210,17 +1220,6 @@
   mDecoderPosition = aOffset + aBytes;
 }
 
-void MediaDecoder::UpdateReadyStateForData()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!mOwner || mShuttingDown || !mDecoderStateMachine) {
-    return;
-  }
-  MediaDecoderOwner::NextFrameStatus frameStatus =
-    mDecoderStateMachine->GetNextFrameStatus();
-  mOwner->UpdateReadyStateForData(frameStatus);
-}
-
 void MediaDecoder::OnSeekResolved(SeekResolveValue aVal)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -1253,7 +1252,7 @@
   PlaybackPositionChanged(aVal.mEventVisibility);
 
   if (mOwner) {
-    UpdateReadyStateForData();
+    mReadyStateWatchTarget->Notify(); // XXXbholley - Still necessary?
     if (!seekWasAborted && (aVal.mEventVisibility != MediaDecoderEventVisibility::Suppressed)) {
       mOwner->SeekCompleted();
       if (fireEnded) {
@@ -1270,7 +1269,7 @@
     return;
 
   if (mOwner) {
-    UpdateReadyStateForData();
+    mReadyStateWatchTarget->Notify(); // XXXbholley - Still necessary?
     if (aEventVisibility != MediaDecoderEventVisibility::Suppressed) {
       mOwner->SeekStarted();
     }
@@ -1592,6 +1591,19 @@
   return mDecoderStateMachine ? mDecoderStateMachine->OnDecodeTaskQueue() : false;
 }
 
+void
+MediaDecoder::SetStateMachine(MediaDecoderStateMachine* aStateMachine)
+{
+  MOZ_ASSERT_IF(aStateMachine, !mDecoderStateMachine);
+  mDecoderStateMachine = aStateMachine;
+
+  if (mDecoderStateMachine) {
+    mNextFrameStatus.Connect(mDecoderStateMachine->CanonicalNextFrameStatus());
+  } else {
+    mNextFrameStatus.DisconnectIfConnected();
+  }
+}
+
 ReentrantMonitor& MediaDecoder::GetReentrantMonitor() {
   return mReentrantMonitor;
 }
@@ -1640,7 +1652,7 @@
   if (mDecoderStateMachine) {
     mDecoderStateMachine->NotifyDataArrived(aBuffer, aLength, aOffset);
   }
-  UpdateReadyStateForData();
+  mReadyStateWatchTarget->Notify(); // XXXbholley - Still necessary?
 }
 
 // Provide access to the state machine object
@@ -1666,7 +1678,7 @@
 
 // Drop reference to state machine.  Only called during shutdown dance.
 void MediaDecoder::BreakCycles() {
-  mDecoderStateMachine = nullptr;
+  SetStateMachine(nullptr);
 }
 
 MediaDecoderOwner* MediaDecoder::GetMediaOwner() const
@@ -1704,8 +1716,8 @@
 bool MediaDecoder::CanPlayThrough()
 {
   Statistics stats = GetStatistics();
+  NS_ENSURE_TRUE(mDecoderStateMachine, false);
 
-  NS_ASSERTION(mDecoderStateMachine, "CanPlayThrough should have state machine!");
   if (mDecoderStateMachine->IsRealTime() ||
       (stats.mTotalBytes < 0 && stats.mDownloadRateReliable) ||
       (stats.mTotalBytes >= 0 && stats.mTotalBytes == stats.mDownloadPosition)) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoder.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoder.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoder.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoder.h	2015-04-24 19:31:09.000000000 +0000
@@ -194,8 +194,11 @@
 #include "mozilla/dom/AudioChannelBinding.h"
 #include "mozilla/gfx/Rect.h"
 #include "mozilla/ReentrantMonitor.h"
+#include "MediaDecoderOwner.h"
 #include "MediaStreamGraph.h"
 #include "AbstractMediaDecoder.h"
+#include "StateMirroring.h"
+#include "StateWatching.h"
 #include "necko-config.h"
 #ifdef MOZ_EME
 #include "mozilla/CDMProxy.h"
@@ -217,7 +220,6 @@
 
 class VideoFrameContainer;
 class MediaDecoderStateMachine;
-class MediaDecoderOwner;
 
 // GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
 // GetTickCount() and conflicts with MediaDecoder::GetCurrentTime implementation.
@@ -454,6 +456,9 @@
     // We also have an explicit blocker on the stream when
     // mDecoderStateMachine is non-null and MediaDecoderStateMachine is false.
     bool mHaveBlockedForStateMachineNotPlaying;
+    // True if we need to send a compensation video frame to ensure the
+    // StreamTime going forward.
+    bool mEOSVideoCompensation;
   };
 
   class DecodedStreamGraphListener : public MediaStreamListener {
@@ -676,6 +681,9 @@
 
   bool OnDecodeTaskQueue() const override;
 
+  MediaDecoderStateMachine* GetStateMachine() { return mDecoderStateMachine; }
+  void SetStateMachine(MediaDecoderStateMachine* aStateMachine);
+
   // Returns the monitor for other threads to synchronise access to
   // state.
   ReentrantMonitor& GetReentrantMonitor() override;
@@ -820,10 +828,6 @@
   // This must be called on the main thread only.
   virtual void PlaybackPositionChanged(MediaDecoderEventVisibility aEventVisibility = MediaDecoderEventVisibility::Observable);
 
-  // Calls mElement->UpdateReadyStateForData, telling it whether we have
-  // data for the next frame and if we're buffering. Main thread only.
-  virtual void UpdateReadyStateForData();
-
   // Find the end of the cached data starting at the current decoder
   // position.
   int64_t GetDownloadPosition();
@@ -1040,6 +1044,10 @@
     GetFrameStatistics().NotifyDecodedFrames(aParsed, aDecoded, aDropped);
   }
 
+  WatchTarget& ReadyStateWatchTarget() { return *mReadyStateWatchTarget; }
+
+  virtual MediaDecoderOwner::NextFrameStatus NextFrameStatus() { return mNextFrameStatus; }
+
 protected:
   virtual ~MediaDecoder();
   void SetStateMachineParameters();
@@ -1055,6 +1063,11 @@
   // Return true if the decoder has reached the end of playback
   bool IsEnded() const;
 
+  WatcherHolder mReadyStateWatchTarget;
+
+  // NextFrameStatus, mirrored from the state machine.
+  Mirror<MediaDecoderOwner::NextFrameStatus>::Holder mNextFrameStatus;
+
   /******
    * The following members should be accessed with the decoder lock held.
    ******/
@@ -1101,17 +1114,19 @@
    * The following member variables can be accessed from any thread.
    ******/
 
+  // Media data resource.
+  nsRefPtr<MediaResource> mResource;
+
+private:
   // The state machine object for handling the decoding. It is safe to
   // call methods of this object from other threads. Its internal data
   // is synchronised on a monitor. The lifetime of this object is
   // after mPlayState is LOADING and before mPlayState is SHUTDOWN. It
   // is safe to access it during this period.
+  //
+  // Explicitly prievate to force access via accessors.
   nsRefPtr<MediaDecoderStateMachine> mDecoderStateMachine;
 
-  // Media data resource.
-  nsRefPtr<MediaResource> mResource;
-
-private:
   // |ReentrantMonitor| for detecting when the video play state changes. A call
   // to |Wait| on this monitor will block the thread until the next state
   // change.  Explicitly private for force access via GetReentrantMonitor.
@@ -1137,7 +1152,7 @@
   // OR on the main thread.
   // Any change to the state on the main thread must call NotifyAll on the
   // monitor so the decode thread can wake up.
-  PlayState mPlayState;
+  Watchable<PlayState> mPlayState;
 
   // The state to change to after a seek or load operation.
   // This can only be changed on the main thread while holding the decoder
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoderOwner.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoderOwner.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoderOwner.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoderOwner.h	2015-04-24 19:31:09.000000000 +0000
@@ -113,13 +113,6 @@
     NEXT_FRAME_UNINITIALIZED
   };
 
-  // Called by the decoder when some data has been downloaded or
-  // buffering/seeking has ended. aNextFrameAvailable is true when
-  // the data for the next frame is available. This method will
-  // decide whether to set the ready state to HAVE_CURRENT_DATA,
-  // HAVE_FUTURE_DATA or HAVE_ENOUGH_DATA.
-  virtual void UpdateReadyStateForData(NextFrameStatus aNextFrame) = 0;
-
   // Check if the decoder owner is active.
   virtual bool IsActive() = 0;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoderReader.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoderReader.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoderReader.cpp	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoderReader.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -35,6 +35,7 @@
 
 
 PRLogModuleInfo* gMediaPromiseLog;
+PRLogModuleInfo* gStateWatchingLog;
 
 void
 EnsureMediaPromiseLog()
@@ -44,6 +45,14 @@
   }
 }
 
+void
+EnsureStateWatchingLog()
+{
+  if (!gStateWatchingLog) {
+    gStateWatchingLog = PR_NewLogModule("StateWatching");
+  }
+}
+
 class VideoQueueMemoryFunctor : public nsDequeFunctor {
 public:
   VideoQueueMemoryFunctor() : mSize(0) {}
@@ -88,6 +97,7 @@
 {
   MOZ_COUNT_CTOR(MediaDecoderReader);
   EnsureMediaPromiseLog();
+  EnsureStateWatchingLog();
 }
 
 MediaDecoderReader::~MediaDecoderReader()
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoderStateMachine.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoderStateMachine.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoderStateMachine.cpp	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoderStateMachine.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -239,7 +239,6 @@
   mDropVideoUntilNextDiscontinuity(false),
   mDecodeToSeekTarget(false),
   mCurrentTimeBeforeSeek(0),
-  mLastFrameStatus(MediaDecoderOwner::NEXT_FRAME_UNINITIALIZED),
   mCorruptFrames(30),
   mDisabledHardwareAcceleration(false),
   mDecodingFrozenAtStateDecoding(false),
@@ -255,6 +254,9 @@
   MOZ_DIAGNOSTIC_ASSERT(pool);
   mTaskQueue = new MediaTaskQueue(pool.forget(), /* aAssertTailDispatch = */ true);
 
+  mNextFrameStatus.Init(mTaskQueue, MediaDecoderOwner::NEXT_FRAME_UNINITIALIZED,
+                        "MediaDecoderStateMachine::mNextFrameStatus (Canonical)");
+
   static bool sPrefCacheInit = false;
   if (!sPrefCacheInit) {
     sPrefCacheInit = true;
@@ -390,6 +392,16 @@
   aOutput->AppendFrame(image.forget(), duration, aIntrinsicSize);
 }
 
+static bool ZeroDurationAtLastChunk(VideoSegment& aInput)
+{
+  // Get the last video frame's start time in VideoSegment aInput.
+  // If the start time is equal to the duration of aInput, means the last video
+  // frame's duration is zero.
+  StreamTime lastVideoStratTime;
+  aInput.GetLastFrame(&lastVideoStratTime);
+  return lastVideoStratTime == aInput.GetDuration();
+}
+
 void MediaDecoderStateMachine::SendStreamData()
 {
   MOZ_ASSERT(OnTaskQueue());
@@ -500,10 +512,25 @@
                       v->mTime, v->GetEndTime());
         }
       }
+      // Check the output is not empty.
+      if (output.GetLastFrame()) {
+        stream->mEOSVideoCompensation = ZeroDurationAtLastChunk(output);
+      }
       if (output.GetDuration() > 0) {
         mediaStream->AppendToTrack(videoTrackId, &output);
       }
       if (VideoQueue().IsFinished() && !stream->mHaveSentFinishVideo) {
+        if (stream->mEOSVideoCompensation) {
+          VideoSegment endSegment;
+          // Calculate the deviation clock time from DecodedStream.
+          int64_t deviation_usec = mediaStream->StreamTimeToMicroseconds(1);
+          WriteVideoToMediaStream(mediaStream, stream->mLastVideoImage,
+            stream->mNextVideoTime + deviation_usec, stream->mNextVideoTime,
+            stream->mLastVideoImageDisplaySize, &endSegment);
+          stream->mNextVideoTime += deviation_usec;
+          MOZ_ASSERT(endSegment.GetDuration() > 0);
+          mediaStream->AppendToTrack(videoTrackId, &endSegment);
+        }
         mediaStream->EndTrack(videoTrackId);
         stream->mHaveSentFinishVideo = true;
       }
@@ -531,7 +558,7 @@
     // the decoding speed.
     if (a && a->mTime <= clockTime) {
       OnAudioEndTimeUpdate(std::max(mAudioEndTime, a->GetEndTime()));
-      nsRefPtr<AudioData> releaseMe = AudioQueue().PopFront();
+      nsRefPtr<AudioData> releaseMe = PopAudio();
       continue;
     }
     break;
@@ -541,7 +568,7 @@
   // until all samples are drained.
   if (finished && AudioQueue().GetSize() == 0) {
     mAudioCompleted = true;
-    UpdateReadyState();
+    UpdateNextFrameStatus();
   }
 }
 
@@ -776,7 +803,7 @@
         }
         if (mCurrentSeek.mTarget.mType == SeekTarget::PrevSyncPoint) {
           // Non-precise seek; we can stop the seek at the first sample.
-          AudioQueue().Push(audio);
+          Push(audio);
         } else {
           // We're doing an accurate seek. We must discard
           // MediaData up to the one containing exact seek target.
@@ -805,13 +832,21 @@
   // otherwise AdvanceFrame may pop the sample before we have a chance
   // to reach playing.
   AudioQueue().Push(aSample);
-  if (mState > DECODER_STATE_DECODING_FIRSTFRAME) {
-    // The ready state can change when we've decoded data, so update the
-    // ready state, so that DOM events can fire.
-    UpdateReadyState();
-    DispatchDecodeTasksIfNeeded();
-    mDecoder->GetReentrantMonitor().NotifyAll();
-  }
+  UpdateNextFrameStatus();
+  DispatchDecodeTasksIfNeeded();
+
+  // XXXbholley - Still necessary?
+  mDecoder->GetReentrantMonitor().NotifyAll();
+}
+
+void
+MediaDecoderStateMachine::PushFront(AudioData* aSample)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  MOZ_ASSERT(aSample);
+
+  AudioQueue().PushFront(aSample);
+  UpdateNextFrameStatus();
 }
 
 void
@@ -823,13 +858,39 @@
   // otherwise AdvanceFrame may pop the sample before we have a chance
   // to reach playing.
   VideoQueue().Push(aSample);
-  if (mState > DECODER_STATE_DECODING_FIRSTFRAME) {
-    // The ready state can change when we've decoded data, so update the
-    // ready state, so that DOM events can fire.
-    UpdateReadyState();
-    DispatchDecodeTasksIfNeeded();
-    mDecoder->GetReentrantMonitor().NotifyAll();
-  }
+  UpdateNextFrameStatus();
+  DispatchDecodeTasksIfNeeded();
+
+  // XXXbholley - Is this still necessary?
+  mDecoder->GetReentrantMonitor().NotifyAll();
+}
+
+void
+MediaDecoderStateMachine::PushFront(VideoData* aSample)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  MOZ_ASSERT(aSample);
+
+  VideoQueue().PushFront(aSample);
+  UpdateNextFrameStatus();
+}
+
+already_AddRefed<AudioData>
+MediaDecoderStateMachine::PopAudio()
+{
+  MOZ_ASSERT(OnTaskQueue());
+  nsRefPtr<AudioData> sample = AudioQueue().PopFront();
+  UpdateNextFrameStatus();
+  return sample.forget();
+}
+
+already_AddRefed<VideoData>
+MediaDecoderStateMachine::PopVideo()
+{
+  MOZ_ASSERT(OnTaskQueue());
+  nsRefPtr<VideoData> sample = VideoQueue().PopFront();
+  UpdateNextFrameStatus();
+  return sample.forget();
 }
 
 void
@@ -885,7 +946,7 @@
     // insert it into the queue so that we have something to display.
     // We make sure to do this before invoking VideoQueue().Finish()
     // below.
-    VideoQueue().Push(mFirstVideoFrameAfterSeek);
+    Push(mFirstVideoFrameAfterSeek);
     mFirstVideoFrameAfterSeek = nullptr;
   }
   if (isAudio) {
@@ -906,7 +967,7 @@
       CheckIfDecodeComplete();
       // The ready state can change when we've decoded data, so update the
       // ready state, so that DOM events can fire.
-      UpdateReadyState();
+      UpdateNextFrameStatus();
       mDecoder->GetReentrantMonitor().NotifyAll();
       // Schedule the state machine to notify track ended as soon as possible.
       if (mAudioCaptured) {
@@ -1036,7 +1097,7 @@
         }
         if (mCurrentSeek.mTarget.mType == SeekTarget::PrevSyncPoint) {
           // Non-precise seek; we can stop the seek at the first sample.
-          VideoQueue().Push(video);
+          Push(video);
         } else {
           // We're doing an accurate seek. We still need to discard
           // MediaData up to the one containing exact seek target.
@@ -1061,6 +1122,7 @@
 {
   MOZ_ASSERT(OnTaskQueue());
   AssertCurrentThreadInMonitor();
+  MOZ_ASSERT(mState == DECODER_STATE_SEEKING);
 
   const bool videoSeekComplete = IsVideoSeekComplete();
   if (HasVideo() && !videoSeekComplete) {
@@ -1085,9 +1147,7 @@
 
   if (audioSeekComplete && videoSeekComplete) {
     mDecodeToSeekTarget = false;
-    nsCOMPtr<nsIRunnable> task(
-      NS_NewRunnableMethod(this, &MediaDecoderStateMachine::SeekCompleted));
-    TaskQueue()->Dispatch(task.forget());
+    SeekCompleted();
   }
 }
 
@@ -1263,19 +1323,6 @@
   mPositionChangeQueued = false;
 }
 
-MediaDecoderOwner::NextFrameStatus MediaDecoderStateMachine::GetNextFrameStatus()
-{
-  ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-  if (IsBuffering()) {
-    return MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_BUFFERING;
-  } else if (IsSeeking()) {
-    return MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_SEEKING;
-  } else if (HaveNextFrameData()) {
-    return MediaDecoderOwner::NEXT_FRAME_AVAILABLE;
-  }
-  return MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE;
-}
-
 static const char* const gMachineStateStr[] = {
   "NONE",
   "DECODING_METADATA",
@@ -1845,9 +1892,11 @@
   StopPlayback();
   UpdatePlaybackPositionInternal(mCurrentSeek.mTarget.mTime);
 
-  // SeekingStarted will do a UpdateReadyStateForData which will
-  // inform the element and its users that we have no frames
-  // to display
+
+  // Make sure the main thread decoder gets notified of the seek only after
+  // we've updated the mirrored NextFrameStatus, which has special behavior
+  // when we're in DECODER_STATE_SEEKING.
+  UpdateNextFrameStatus();
   nsCOMPtr<nsIRunnable> startEvent =
       NS_NewRunnableMethodWithArg<MediaDecoderEventVisibility>(
         mDecoder,
@@ -2368,15 +2417,7 @@
 {
   MOZ_ASSERT(OnTaskQueue());
   ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-
-  if (mState != DECODER_STATE_SEEKING) {
-    MOZ_DIAGNOSTIC_ASSERT(mState == DECODER_STATE_DORMANT ||
-                          IsShutdown());
-    // It would be nice to assert mCurrent.Exists() here, but it's possible that
-    // we've transitioned to DECODER_STATE_SHUTDOWN but not yet gone through
-    // RunStateMachine in that state, which is where this promise gets rejected.
-    return;
-  }
+  MOZ_ASSERT(mState == DECODER_STATE_SEEKING);
 
   int64_t seekTime = mCurrentSeek.mTarget.mTime;
   int64_t newCurrentTime = seekTime;
@@ -2499,6 +2540,9 @@
   // mPendingWakeDecoder being needed again. Revoke it.
   mPendingWakeDecoder = nullptr;
 
+  // Disconnect mirrors before shutting down our task queue.
+  mNextFrameStatus.DisconnectAll();
+
   MOZ_ASSERT(mState == DECODER_STATE_SHUTDOWN,
              "How did we escape from the shutdown state?");
   // We must daisy-chain these events to destroy the decoder. We must
@@ -2658,7 +2702,7 @@
 
       // Notify to allow blocked decoder thread to continue
       mDecoder->GetReentrantMonitor().NotifyAll();
-      UpdateReadyState();
+      UpdateNextFrameStatus();
       MaybeStartPlayback();
       NS_ASSERTION(IsStateMachineScheduled(), "Must have timer scheduled");
       return NS_OK;
@@ -2916,7 +2960,7 @@
 #endif
       }
       currentFrame = frame;
-      nsRefPtr<VideoData> releaseMe = VideoQueue().PopFront();
+      nsRefPtr<VideoData> releaseMe = PopVideo();
       // Notify the decode thread that the video queue's buffers may have
       // free'd up space for more frames.
       mDecoder->GetReentrantMonitor().NotifyAll();
@@ -2950,7 +2994,7 @@
     }
     if (shouldBuffer) {
       if (currentFrame) {
-        VideoQueue().PushFront(currentFrame);
+        PushFront(currentFrame);
       }
       StartBuffering();
       // Don't go straight back to the state machine loop since that might
@@ -3016,7 +3060,7 @@
   // this function popping and playing a video frame, or by the audio
   // thread popping and playing an audio frame, we may need to update our
   // ready state. Post an update to do so.
-  UpdateReadyState();
+  UpdateNextFrameStatus();
 
   int64_t delay = remainingTime / mPlaybackRate;
   if (delay > 0) {
@@ -3071,7 +3115,7 @@
     DECODER_LOG("DropVideoUpToSeekTarget() found video frame [%lld, %lld] containing target=%lld",
                 video->mTime, video->GetEndTime(), target);
 
-    VideoQueue().PushFront(video);
+    PushFront(video);
   }
 
   return NS_OK;
@@ -3106,7 +3150,7 @@
     // silence to cover the gap. Typically this happens in poorly muxed
     // files.
     DECODER_WARN("Audio not synced after seek, maybe a poorly muxed file?");
-    AudioQueue().Push(audio);
+    Push(audio);
     return NS_OK;
   }
 
@@ -3142,7 +3186,7 @@
                                          audioData.forget(),
                                          channels,
                                          audio->mRate));
-  AudioQueue().PushFront(data);
+  PushFront(data);
 
   return NS_OK;
 }
@@ -3175,30 +3219,31 @@
   DECODER_LOG("Set media start time to %lld", mStartTime);
 }
 
-void MediaDecoderStateMachine::UpdateReadyState() {
+void MediaDecoderStateMachine::UpdateNextFrameStatus() {
+  MOZ_ASSERT(OnTaskQueue());
   AssertCurrentThreadInMonitor();
 
-  MediaDecoderOwner::NextFrameStatus nextFrameStatus = GetNextFrameStatus();
-  // FIXME: This optimization could result in inconsistent next frame status
-  // between the decoder and state machine when GetNextFrameStatus() is called
-  // by the decoder without updating mLastFrameStatus.
-  // Note not to regress bug 882027 when fixing this bug.
-  if (nextFrameStatus == mLastFrameStatus) {
-    return;
-  }
-  mLastFrameStatus = nextFrameStatus;
-
-  /* This is a bit tricky. MediaDecoder::UpdateReadyStateForData will run on
-   * the main thread and re-evaluate GetNextFrameStatus there, passing it to
-   * HTMLMediaElement::UpdateReadyStateForData. It doesn't use the value of
-   * GetNextFrameStatus we computed here, because what we're computing here
-   * could be stale by the time MediaDecoder::UpdateReadyStateForData runs.
-   * We only compute GetNextFrameStatus here to avoid posting runnables to the main
-   * thread unnecessarily.
-   */
-  nsCOMPtr<nsIRunnable> event;
-  event = NS_NewRunnableMethod(mDecoder, &MediaDecoder::UpdateReadyStateForData);
-  AbstractThread::MainThread()->Dispatch(event.forget());
+  MediaDecoderOwner::NextFrameStatus status;
+  const char* statusString;
+  if (IsBuffering()) {
+    status = MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_BUFFERING;
+    statusString = "NEXT_FRAME_UNAVAILABLE_BUFFERING";
+  } else if (IsSeeking()) {
+    status = MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_SEEKING;
+    statusString = "NEXT_FRAME_UNAVAILABLE_SEEKING";
+  } else if (HaveNextFrameData()) {
+    status = MediaDecoderOwner::NEXT_FRAME_AVAILABLE;
+    statusString = "NEXT_FRAME_AVAILABLE";
+  } else {
+    status = MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE;
+    statusString = "NEXT_FRAME_UNAVAILABLE";
+  }
+
+  if (status != mNextFrameStatus) {
+    DECODER_LOG("Changed mNextFrameStatus to %s", statusString);
+  }
+
+  mNextFrameStatus = status;
 }
 
 bool MediaDecoderStateMachine::JustExitedQuickBuffering()
@@ -3235,17 +3280,8 @@
     decodeDuration < UsecsToDuration(QUICK_BUFFER_THRESHOLD_USECS);
   mBufferingStart = TimeStamp::Now();
 
-  // We need to tell the element that buffering has started.
-  // We can't just directly send an asynchronous runnable that
-  // eventually fires the "waiting" event. The problem is that
-  // there might be pending main-thread events, such as "data
-  // received" notifications, that mean we're not actually still
-  // buffering by the time this runnable executes. So instead
-  // we just trigger UpdateReadyStateForData; when it runs, it
-  // will check the current state and decide whether to tell
-  // the element we're buffering or not.
   SetState(DECODER_STATE_BUFFERING);
-  UpdateReadyState();
+  UpdateNextFrameStatus();
   DECODER_LOG("Changed state from DECODING to BUFFERING, decoded for %.3lfs",
               decodeDuration.ToSeconds());
 #ifdef PR_LOGGING
@@ -3428,7 +3464,7 @@
   }
   ResyncAudioClock();
   mAudioCompleted = true;
-  UpdateReadyState();
+  UpdateNextFrameStatus();
   // Kick the decode thread; it may be sleeping waiting for this to finish.
   mDecoder->GetReentrantMonitor().NotifyAll();
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoderStateMachine.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoderStateMachine.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDecoderStateMachine.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDecoderStateMachine.h	2015-04-24 19:31:09.000000000 +0000
@@ -91,17 +91,13 @@
 #include "MediaMetadataManager.h"
 #include "mozilla/RollingMean.h"
 #include "MediaTimer.h"
-
-class nsITimer;
+#include "StateMirroring.h"
 
 namespace mozilla {
 
 class AudioSegment;
-class VideoSegment;
 class MediaTaskQueue;
-class SharedThreadPool;
 class AudioSink;
-class MediaDecoderStateMachineScheduler;
 
 // GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
 // GetTickCount() and conflicts with MediaDecoderStateMachine::GetCurrentTime
@@ -127,6 +123,7 @@
   friend class AudioSink;
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaDecoderStateMachine)
 public:
+  typedef MediaDecoderOwner::NextFrameStatus NextFrameStatus;
   typedef MediaDecoder::DecodedStreamData DecodedStreamData;
   MediaDecoderStateMachine(MediaDecoder* aDecoder,
                                MediaDecoderReader* aReader,
@@ -214,8 +211,6 @@
   bool OnDecodeTaskQueue() const;
   bool OnTaskQueue() const;
 
-  MediaDecoderOwner::NextFrameStatus GetNextFrameStatus();
-
   // Cause state transitions. These methods obtain the decoder monitor
   // to synchronise the change of state, and to notify other threads
   // that the state has changed.
@@ -437,6 +432,16 @@
   // aSample must not be null.
   void Push(AudioData* aSample);
   void Push(VideoData* aSample);
+  void PushFront(AudioData* aSample);
+  void PushFront(VideoData* aSample);
+
+  // Pops MediaData* samples from their respective MediaQueues.
+  // Note that the audio queue is also drained on the audio thread,
+  // which we can't easily react to - This should be fixed when we
+  // remove the audio thread in bug 750596.
+  already_AddRefed<AudioData> PopAudio();
+  already_AddRefed<VideoData> PopVideo();
+
 
   class WakeDecoderRunnable : public nsRunnable {
   public:
@@ -522,8 +527,9 @@
   // Returns true if we recently exited "quick buffering" mode.
   bool JustExitedQuickBuffering();
 
-  // Dispatches an asynchronous event to update the media element's ready state.
-  void UpdateReadyState();
+  // Recomputes mNextFrameStatus, possibly dispatching notifications to interested
+  // parties.
+  void UpdateNextFrameStatus();
 
   // Called when AudioSink reaches the end. |mPlayStartTime| and
   // |mPlayDuration| are updated to provide a good base for calculating video
@@ -718,16 +724,9 @@
   // Can only be called on the state machine thread.
   void SetPlayStartTime(const TimeStamp& aTimeStamp);
 
-private:
+public:
   // Update mAudioEndTime.
   void OnAudioEndTimeUpdate(int64_t aAudioEndTime);
-public:
-  void DispatchOnAudioEndTimeUpdate(int64_t aAudioEndTime)
-  {
-    RefPtr<nsRunnable> r =
-      NS_NewRunnableMethodWithArg<int64_t>(this, &MediaDecoderStateMachine::OnAudioEndTimeUpdate, aAudioEndTime);
-    TaskQueue()->Dispatch(r.forget());
-  }
 
 private:
   // Update mDecoder's playback offset.
@@ -886,6 +885,13 @@
   // as mStartTime and mEndTime could have been set separately.
   bool mDurationSet;
 
+  // The status of our next frame. Mirrored on the main thread and used to
+  // compute ready state.
+  Canonical<NextFrameStatus>::Holder mNextFrameStatus;
+public:
+  AbstractCanonical<NextFrameStatus>* CanonicalNextFrameStatus() { return &mNextFrameStatus; }
+protected:
+
   struct SeekJob {
     void Steal(SeekJob& aOther)
     {
@@ -1218,8 +1224,6 @@
 
   mozilla::MediaMetadataManager mMetadataManager;
 
-  MediaDecoderOwner::NextFrameStatus mLastFrameStatus;
-
   mozilla::RollingMean<uint32_t, uint32_t> mCorruptFrames;
 
   bool mDisabledHardwareAcceleration;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDeviceInfo.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDeviceInfo.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaDeviceInfo.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaDeviceInfo.h	2015-04-24 19:31:09.000000000 +0000
@@ -14,9 +14,6 @@
 namespace mozilla {
 namespace dom {
 
-class Promise;
-struct MediaStreamConstraints;
-
 #define MOZILLA_DOM_MEDIADEVICEINFO_IMPLEMENTATION_IID \
 {0x25091870, 0x84d6, 0x4acf, {0xaf, 0x97, 0x6e, 0xd5, 0x5b, 0xe0, 0x47, 0xb2}}
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaManager.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaManager.h	2015-04-24 19:31:09.000000000 +0000
@@ -45,8 +45,6 @@
 namespace mozilla {
 namespace dom {
 struct MediaStreamConstraints;
-class NavigatorUserMediaSuccessCallback;
-class NavigatorUserMediaErrorCallback;
 struct MediaTrackConstraintSet;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaRecorder.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaRecorder.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaRecorder.cpp	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaRecorder.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -368,11 +368,12 @@
 
 public:
   Session(MediaRecorder* aRecorder, int32_t aTimeSlice)
-    : mRecorder(aRecorder),
-      mTimeSlice(aTimeSlice),
-      mStopIssued(false),
-      mCanRetrieveData(false),
-      mIsRegisterProfiler(false)
+    : mRecorder(aRecorder)
+    , mTimeSlice(aTimeSlice)
+    , mStopIssued(false)
+    , mCanRetrieveData(false)
+    , mIsRegisterProfiler(false)
+    , mNeedSessionEndTask(true)
   {
     MOZ_ASSERT(NS_IsMainThread());
 
@@ -396,6 +397,11 @@
     MOZ_ASSERT(NS_IsMainThread());
     mStopIssued = true;
     CleanupStreams();
+    if (mNeedSessionEndTask) {
+      LOG(PR_LOG_DEBUG, ("Session.Stop mNeedSessionEndTask %p", this));
+      // End the Session directly if there is no ExtractRunnable.
+      DoSessionEndTask(NS_OK);
+    }
     nsContentUtils::UnregisterShutdownObserver(this);
   }
 
@@ -578,6 +584,10 @@
     LOG(PR_LOG_DEBUG, ("Session.InitEncoder %p", this));
     MOZ_ASSERT(NS_IsMainThread());
 
+    if (!mRecorder) {
+      LOG(PR_LOG_DEBUG, ("Session.InitEncoder failure, mRecorder is null %p", this));
+      return;
+    }
     // Allocate encoder and bind with union stream.
     // At this stage, the API doesn't allow UA to choose the output mimeType format.
 
@@ -589,6 +599,7 @@
     }
 
     if (!mEncoder) {
+      LOG(PR_LOG_DEBUG, ("Session.InitEncoder !mEncoder %p", this));
       DoSessionEndTask(NS_ERROR_ABORT);
       return;
     }
@@ -597,6 +608,7 @@
     // The Session::stop would clean the mTrackUnionStream. If the AfterTracksAdded
     // comes after stop command, this function would crash.
     if (!mTrackUnionStream) {
+      LOG(PR_LOG_DEBUG, ("Session.InitEncoder !mTrackUnionStream %p", this));
       DoSessionEndTask(NS_OK);
       return;
     }
@@ -605,19 +617,26 @@
     if (!mReadThread) {
       nsresult rv = NS_NewNamedThread("Media_Encoder", getter_AddRefs(mReadThread));
       if (NS_FAILED(rv)) {
+        LOG(PR_LOG_DEBUG, ("Session.InitEncoder !mReadThread %p", this));
         DoSessionEndTask(rv);
         return;
       }
     }
 
-    // In case source media stream does not notify track end, recieve
+    // In case source media stream does not notify track end, receive
     // shutdown notification and stop Read Thread.
     nsContentUtils::RegisterShutdownObserver(this);
 
     nsCOMPtr<nsIRunnable> event = new ExtractRunnable(this);
     if (NS_FAILED(mReadThread->Dispatch(event, NS_DISPATCH_NORMAL))) {
       NS_WARNING("Failed to dispatch ExtractRunnable at beginning");
+      LOG(PR_LOG_DEBUG, ("Session.InitEncoder !ReadThread->Dispatch %p", this));
+      DoSessionEndTask(NS_ERROR_ABORT);
     }
+    // Set mNeedSessionEndTask to false because the
+    // ExtractRunnable/DestroyRunnable will take the response to
+    // end the session.
+    mNeedSessionEndTask = false;
   }
   // application should get blob and onstop event
   void DoSessionEndTask(nsresult rv)
@@ -637,6 +656,7 @@
     if (NS_FAILED(NS_DispatchToMainThread(new DestroyRunnable(this)))) {
       MOZ_ASSERT(false, "NS_DispatchToMainThread DestroyRunnable failed");
     }
+    mNeedSessionEndTask = false;
   }
   void CleanupStreams()
   {
@@ -710,6 +730,10 @@
   bool mCanRetrieveData;
   // The register flag for "Media_Encoder" thread to profiler
   bool mIsRegisterProfiler;
+  // False if the InitEncoder called successfully, ensure the
+  // ExtractRunnable/DestroyRunnable will end the session.
+  // Main thread only.
+  bool mNeedSessionEndTask;
 };
 
 NS_IMPL_ISUPPORTS(MediaRecorder::Session, nsIObserver)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaResource.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaResource.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaResource.cpp	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaResource.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -619,7 +619,7 @@
                                 element->NodePrincipal(),
                                 false);
       NS_ENSURE_TRUE(crossSiteListener, NS_ERROR_OUT_OF_MEMORY);
-      rv = crossSiteListener->Init(mChannel);
+      rv = crossSiteListener->Init(mChannel, DataURIHandling::Allow);
       NS_ENSURE_SUCCESS(rv, rv);
       listener = crossSiteListener;
     } else {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaShutdownManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaShutdownManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaShutdownManager.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaShutdownManager.h	2015-04-24 19:31:09.000000000 +0000
@@ -19,7 +19,6 @@
 namespace mozilla {
 
 class MediaDecoder;
-class StateMachineThread;
 
 // The MediaShutdownManager manages shutting down the MediaDecoder
 // infrastructure in response to an xpcom-shutdown notification. This happens
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/mediasource/MediaSourceDecoder.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/mediasource/MediaSourceDecoder.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/mediasource/MediaSourceDecoder.cpp	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/mediasource/MediaSourceDecoder.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -54,14 +54,14 @@
 nsresult
 MediaSourceDecoder::Load(nsIStreamListener**, MediaDecoder*)
 {
-  MOZ_ASSERT(!mDecoderStateMachine);
-  mDecoderStateMachine = CreateStateMachine();
-  if (!mDecoderStateMachine) {
+  MOZ_ASSERT(!GetStateMachine());
+  SetStateMachine(CreateStateMachine());
+  if (!GetStateMachine()) {
     NS_WARNING("Failed to create state machine!");
     return NS_ERROR_FAILURE;
   }
 
-  nsresult rv = mDecoderStateMachine->Init(nullptr);
+  nsresult rv = GetStateMachine()->Init(nullptr);
   NS_ENSURE_SUCCESS(rv, rv);
 
   SetStateMachineParameters();
@@ -116,7 +116,7 @@
 void
 MediaSourceDecoder::AttachMediaSource(dom::MediaSource* aMediaSource)
 {
-  MOZ_ASSERT(!mMediaSource && !mDecoderStateMachine && NS_IsMainThread());
+  MOZ_ASSERT(!mMediaSource && !GetStateMachine() && NS_IsMainThread());
   mMediaSource = aMediaSource;
 }
 
@@ -233,10 +233,10 @@
       // We want a very bigger number, but not infinity.
       checkedDuration = INT64_MAX - 1;
     }
-    mDecoderStateMachine->SetDuration(checkedDuration);
+    GetStateMachine()->SetDuration(checkedDuration);
     mMediaSourceDuration = aDuration;
   } else {
-    mDecoderStateMachine->SetDuration(INT64_MAX);
+    GetStateMachine()->SetDuration(INT64_MAX);
     mMediaSourceDuration = PositiveInfinity<double>();
   }
   if (mReader) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/mediasource/SourceBufferList.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/mediasource/SourceBufferList.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/mediasource/SourceBufferList.h	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/mediasource/SourceBufferList.h	2015-04-24 19:31:09.000000000 +0000
@@ -22,7 +22,6 @@
 
 namespace mozilla {
 
-class ErrorResult;
 template <typename T> class AsyncEventRunner;
 
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html	2015-04-24 19:31:09.000000000 +0000
@@ -36,7 +36,6 @@
     });
 
     v.addEventListener("seeked", function () {
-      ok(v.readyState >= v.HAVE_FUTURE_DATA, "readyState is >= FUTURE_DATA");
       SimpleTest.finish();
     });
   });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaStreamGraph.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaStreamGraph.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaStreamGraph.cpp	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaStreamGraph.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -1817,8 +1817,19 @@
     mLifecycleState >= LIFECYCLE_WAITING_FOR_THREAD_SHUTDOWN;
 #endif
 
+  TaskDispatcher& tailDispatcher = AbstractThread::MainThread()->TailDispatcher();
   for (uint32_t i = 0; i < runnables.Length(); ++i) {
     runnables[i]->Run();
+    // "Direct" tail dispatcher are supposed to run immediately following the
+    // execution of the current task. So the meta-tasking that we do here in
+    // RunInStableState() breaks that abstraction a bit unless we handle it here.
+    //
+    // This is particularly important because we can end up with a "stream
+    // ended" notification immediately following a "stream available" notification,
+    // and we need to make sure that the watcher responding to "stream available"
+    // has a chance to run before the second notification starts tearing things
+    // down.
+    tailDispatcher.DrainDirectTasks();
   }
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaStreamGraph.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaStreamGraph.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaStreamGraph.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaStreamGraph.h	2015-04-24 19:31:09.000000000 +0000
@@ -248,7 +248,6 @@
 class AudioNodeEngine;
 class AudioNodeExternalInputStream;
 class AudioNodeStream;
-struct AudioChunk;
 class CameraPreviewMediaStream;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaTaskQueue.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaTaskQueue.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/MediaTaskQueue.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/MediaTaskQueue.h	2015-04-24 19:31:09.000000000 +0000
@@ -133,6 +133,8 @@
 
     ~AutoTaskGuard()
     {
+      DrainDirectTasks();
+
       MOZ_ASSERT(mQueue->mRunningThread == NS_GetCurrentThread());
       mQueue->mRunningThread = nullptr;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/moz.build	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/moz.build	2015-04-24 19:31:09.000000000 +0000
@@ -137,6 +137,8 @@
     'SelfRef.h',
     'SharedBuffer.h',
     'SharedThreadPool.h',
+    'StateMirroring.h',
+    'StateWatching.h',
     'StreamBuffer.h',
     'TaskDispatcher.h',
     'ThreadPoolCOMListener.h',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/omx/MediaCodecReader.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/omx/MediaCodecReader.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/omx/MediaCodecReader.cpp	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/omx/MediaCodecReader.cpp	2015-04-24 19:31:10.000000000 +0000
@@ -426,8 +426,11 @@
     }
   }
 
-  if (bufferInfo.mBuffer != nullptr && bufferInfo.mSize > 0 &&
-      bufferInfo.mBuffer->data() != nullptr) {
+  if ((bufferInfo.mFlags & MediaCodec::BUFFER_FLAG_EOS) ||
+      (status == ERROR_END_OF_STREAM)) {
+    AudioQueue().Finish();
+  } else if (bufferInfo.mBuffer != nullptr && bufferInfo.mSize > 0 &&
+             bufferInfo.mBuffer->data() != nullptr) {
     // This is the approximate byte position in the stream.
     int64_t pos = mDecoder->GetResource()->Tell();
 
@@ -445,13 +448,7 @@
         bufferInfo.mSize,
         mInfo.mAudio.mChannels));
   }
-
-  if ((bufferInfo.mFlags & MediaCodec::BUFFER_FLAG_EOS) ||
-      (status == ERROR_END_OF_STREAM)) {
-    AudioQueue().Finish();
-  }
   mAudioTrack.mCodec->releaseOutputBuffer(bufferInfo.mIndex);
-
 }
 
 void
@@ -918,6 +915,13 @@
     }
   }
 
+  if ((bufferInfo.mFlags & MediaCodec::BUFFER_FLAG_EOS) ||
+      (status == ERROR_END_OF_STREAM)) {
+    VideoQueue().Finish();
+    mVideoTrack.mCodec->releaseOutputBuffer(bufferInfo.mIndex);
+    return;
+  }
+
   nsRefPtr<VideoData> v;
   RefPtr<TextureClient> textureClient;
   sp<GraphicBuffer> graphicBuffer;
@@ -1014,11 +1018,6 @@
     }
   }
 
-  if ((bufferInfo.mFlags & MediaCodec::BUFFER_FLAG_EOS) ||
-      (status == ERROR_END_OF_STREAM)) {
-    VideoQueue().Finish();
-  }
-
   if (v != nullptr && textureClient != nullptr && graphicBuffer != nullptr) {
     MutexAutoLock al(mTextureClientIndexesLock);
     mTextureClientIndexes.Put(textureClient.get(), bufferInfo.mIndex);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/omx/MediaOmxCommonDecoder.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/omx/MediaOmxCommonDecoder.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/omx/MediaOmxCommonDecoder.cpp	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/omx/MediaOmxCommonDecoder.cpp	2015-04-24 19:31:10.000000000 +0000
@@ -98,16 +98,16 @@
   MOZ_ASSERT(NS_IsMainThread());
   GetReentrantMonitor().AssertCurrentThreadIn();
   DECODER_LOG(PR_LOG_DEBUG, ("%s", __PRETTY_FUNCTION__));
-  if (!mDecoderStateMachine) {
+  if (!GetStateMachine()) {
     return;
   }
   // enter dormant state
   RefPtr<nsRunnable> event =
     NS_NewRunnableMethodWithArg<bool>(
-      mDecoderStateMachine,
+      GetStateMachine(),
       &MediaDecoderStateMachine::SetDormant,
       true);
-  mDecoderStateMachine->TaskQueue()->Dispatch(event);
+  GetStateMachine()->TaskQueue()->Dispatch(event);
 }
 
 void
@@ -118,7 +118,7 @@
   DECODER_LOG(PR_LOG_DEBUG, ("%s current time %f", __PRETTY_FUNCTION__,
       mCurrentTime));
 
-  if (!mDecoderStateMachine) {
+  if (!GetStateMachine()) {
     return;
   }
 
@@ -134,10 +134,10 @@
   // exit dormant state
   RefPtr<nsRunnable> event =
     NS_NewRunnableMethodWithArg<bool>(
-      mDecoderStateMachine,
+      GetStateMachine(),
       &MediaDecoderStateMachine::SetDormant,
       false);
-  mDecoderStateMachine->TaskQueue()->Dispatch(event);
+  GetStateMachine()->TaskQueue()->Dispatch(event);
 }
 
 void
@@ -264,18 +264,12 @@
   }
 }
 
-void
-MediaOmxCommonDecoder::UpdateReadyStateForData()
+MediaDecoderOwner::NextFrameStatus
+MediaOmxCommonDecoder::NextFrameStatus()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (!mAudioOffloadPlayer) {
-    MediaDecoder::UpdateReadyStateForData();
-    return;
-  }
-
-  if (!mOwner || mShuttingDown)
-    return;
-  mOwner->UpdateReadyStateForData(mAudioOffloadPlayer->GetNextFrameStatus());
+  return mAudioOffloadPlayer ? mAudioOffloadPlayer->GetNextFrameStatus()
+                             : MediaDecoder::NextFrameStatus();
 }
 
 void
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/omx/MediaOmxCommonDecoder.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/omx/MediaOmxCommonDecoder.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/omx/MediaOmxCommonDecoder.h	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/omx/MediaOmxCommonDecoder.h	2015-04-24 19:31:10.000000000 +0000
@@ -30,7 +30,7 @@
   virtual void SetVolume(double aVolume);
   virtual void PlaybackPositionChanged(MediaDecoderEventVisibility aEventVisibility =
                                          MediaDecoderEventVisibility::Observable);
-  virtual void UpdateReadyStateForData();
+  virtual MediaDecoderOwner::NextFrameStatus NextFrameStatus() override;
   virtual void SetElementVisibility(bool aIsVisible);
   virtual void SetPlatformCanOffloadAudio(bool aCanOffloadAudio);
   virtual bool CheckDecoderCanOffloadAudio();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/omx/MediaOmxReader.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/omx/MediaOmxReader.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/omx/MediaOmxReader.h	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/omx/MediaOmxReader.h	2015-04-24 19:31:10.000000000 +0000
@@ -22,10 +22,6 @@
 
 namespace mozilla {
 
-namespace dom {
-  class TimeRanges;
-}
-
 class AbstractMediaDecoder;
 
 class MediaOmxReader : public MediaOmxCommonReader
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/omx/OMXCodecProxy.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/omx/OMXCodecProxy.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/omx/OMXCodecProxy.h	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/omx/OMXCodecProxy.h	2015-04-24 19:31:10.000000000 +0000
@@ -17,7 +17,6 @@
 
 namespace android {
 
-struct MediaBufferGroup;
 struct MetaData;
 
 class OMXCodecProxy : public MediaSource,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/SelfRef.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/SelfRef.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/SelfRef.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/SelfRef.h	2015-04-24 19:31:09.000000000 +0000
@@ -35,7 +35,7 @@
     }
   }
 
-  operator bool() const { return mHeld; }
+  MOZ_IMPLICIT operator bool() const { return mHeld; }
 
   SelfReference(const SelfReference& aOther) = delete;
   void operator=(const SelfReference& aOther) = delete;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/StateMirroring.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/StateMirroring.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/StateMirroring.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/StateMirroring.h	2015-04-24 19:31:09.000000000 +0000
@@ -0,0 +1,366 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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(StateMirroring_h_)
+#define StateMirroring_h_
+
+#include "MediaPromise.h"
+
+#include "StateWatching.h"
+#include "TaskDispatcher.h"
+
+#include "mozilla/Maybe.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/unused.h"
+
+#include "prlog.h"
+#include "nsISupportsImpl.h"
+
+/*
+ * The state-mirroring machinery allows pieces of interesting state to be
+ * observed on multiple thread without locking. The basic strategy is to track
+ * changes in a canonical value and post updates to other threads that hold
+ * mirrors for that value.
+ *
+ * One problem with the naive implementation of such a system is that some pieces
+ * of state need to be updated atomically, and certain other operations need to
+ * wait for these atomic updates to complete before executing. The state-mirroring
+ * machinery solves this problem by requiring that its owner thread uses tail
+ * dispatch, and posting state update events (which should always be run first by
+ * TaskDispatcher implementations) to that tail dispatcher. This ensures that
+ * state changes are always atomic from the perspective of observing threads.
+ *
+ * Given that semantics may change and comments tend to go out of date, we
+ * deliberately don't provide usage examples here. Grep around to find them.
+ */
+
+namespace mozilla {
+
+// Mirror<T> and Canonical<T> inherit WatchTarget, so we piggy-back on the
+// logging that WatchTarget already does. Given that, it makes sense to share
+// the same log module.
+#define MIRROR_LOG(x, ...) \
+  MOZ_ASSERT(gStateWatchingLog); \
+  PR_LOG(gStateWatchingLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
+
+template<typename T> class AbstractMirror;
+
+/*
+ * AbstractCanonical is a superclass from which all Canonical values must
+ * inherit. It serves as the interface of operations which may be performed (via
+ * asynchronous dispatch) by other threads, in particular by the corresponding
+ * Mirror value.
+ */
+template<typename T>
+class AbstractCanonical
+{
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AbstractCanonical)
+  AbstractCanonical(AbstractThread* aThread) : mOwnerThread(aThread) {}
+  virtual void AddMirror(AbstractMirror<T>* aMirror) = 0;
+  virtual void RemoveMirror(AbstractMirror<T>* aMirror) = 0;
+
+  AbstractThread* OwnerThread() const { return mOwnerThread; }
+protected:
+  virtual ~AbstractCanonical() {}
+  nsRefPtr<AbstractThread> mOwnerThread;
+};
+
+/*
+ * AbstractMirror is a superclass from which all Mirror values must
+ * inherit. It serves as the interface of operations which may be performed (via
+ * asynchronous dispatch) by other threads, in particular by the corresponding
+ * Canonical value.
+ */
+template<typename T>
+class AbstractMirror
+{
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AbstractMirror)
+  AbstractMirror(AbstractThread* aThread) : mOwnerThread(aThread) {}
+  virtual void UpdateValue(const T& aNewValue) = 0;
+  virtual void NotifyDisconnected() = 0;
+
+  AbstractThread* OwnerThread() const { return mOwnerThread; }
+protected:
+  virtual ~AbstractMirror() {}
+  nsRefPtr<AbstractThread> mOwnerThread;
+};
+
+/*
+ * Canonical<T> is a wrapper class that allows a given value to be mirrored by other
+ * threads. It maintains a list of active mirrors, and queues updates for them
+ * when the internal value changes. When changing the value, the caller needs to
+ * pass a TaskDispatcher object, which fires the updates at the appropriate time.
+ * Canonical<T> is also a WatchTarget, and may be set up to trigger other routines
+ * (on the same thread) when the canonical value changes.
+ *
+ * Do not instantiate a Canonical<T> directly as a member. Instead, instantiate a
+ * Canonical<T>::Holder, which handles lifetime issues and may eventually be
+ * extended to do other things as well.
+ */
+template<typename T>
+class Canonical : public AbstractCanonical<T>, public WatchTarget
+{
+public:
+  using AbstractCanonical<T>::OwnerThread;
+
+  Canonical(AbstractThread* aThread, const T& aInitialValue, const char* aName)
+    : AbstractCanonical<T>(aThread), WatchTarget(aName), mValue(aInitialValue)
+  {
+    MIRROR_LOG("%s [%p] initialized", mName, this);
+    MOZ_ASSERT(aThread->RequiresTailDispatch(), "Can't get coherency without tail dispatch");
+  }
+
+  void AddMirror(AbstractMirror<T>* aMirror) override
+  {
+    MIRROR_LOG("%s [%p] adding mirror %p", mName, this, aMirror);
+    MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
+    MOZ_ASSERT(!mMirrors.Contains(aMirror));
+    mMirrors.AppendElement(aMirror);
+    aMirror->OwnerThread()->Dispatch(MakeNotifier(aMirror));
+  }
+
+  void RemoveMirror(AbstractMirror<T>* aMirror) override
+  {
+    MIRROR_LOG("%s [%p] removing mirror %p", mName, this, aMirror);
+    MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
+    MOZ_ASSERT(mMirrors.Contains(aMirror));
+    mMirrors.RemoveElement(aMirror);
+  }
+
+  void DisconnectAll()
+  {
+    MIRROR_LOG("%s [%p] Disconnecting all mirrors", mName, this);
+    for (size_t i = 0; i < mMirrors.Length(); ++i) {
+      nsCOMPtr<nsIRunnable> r =
+        NS_NewRunnableMethod(mMirrors[i], &AbstractMirror<T>::NotifyDisconnected);
+      mMirrors[i]->OwnerThread()->Dispatch(r.forget());
+    }
+    mMirrors.Clear();
+  }
+
+  operator const T&()
+  {
+    MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
+    return mValue;
+  }
+
+  Canonical& operator=(const T& aNewValue)
+  {
+    MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
+
+    if (aNewValue == mValue) {
+      return *this;
+    }
+
+    // Notify same-thread watchers. The state watching machinery will make sure
+    // that notifications run at the right time.
+    NotifyWatchers();
+
+    // Check if we've already got a pending update. If so we won't schedule another
+    // one.
+    bool alreadyNotifying = mInitialValue.isSome();
+
+    // Stash the initial value if needed, then update to the new value.
+    if (mInitialValue.isNothing()) {
+      mInitialValue.emplace(mValue);
+    }
+    mValue = aNewValue;
+
+    // We wait until things have stablized before sending state updates so that
+    // we can avoid sending multiple updates, and possibly avoid sending any
+    // updates at all if the value ends up where it started.
+    if (!alreadyNotifying) {
+      nsCOMPtr<nsIRunnable> r = NS_NewRunnableMethod(this, &Canonical::DoNotify);
+      AbstractThread::GetCurrent()->TailDispatcher().AddDirectTask(r.forget());
+    }
+
+    return *this;
+  }
+
+  class Holder
+  {
+  public:
+    Holder() {}
+    ~Holder() { MOZ_DIAGNOSTIC_ASSERT(mCanonical, "Should have initialized me"); }
+
+    // NB: Because mirror-initiated disconnection can race with canonical-
+    // initiated disconnection, a canonical should never be reinitialized.
+    void Init(AbstractThread* aThread, const T& aInitialValue, const char* aName)
+    {
+      mCanonical = new Canonical<T>(aThread, aInitialValue, aName);
+    }
+
+    // Forward control operations to the Canonical<T>.
+    void DisconnectAll() { return mCanonical->DisconnectAll(); }
+
+    // Access to the Canonical<T>.
+    operator Canonical<T>&() { return *mCanonical; }
+    Canonical<T>* operator&() { return mCanonical; }
+
+    // Access to the T.
+    const T& Ref() { return *mCanonical; }
+    operator const T&() { return Ref(); }
+    Holder& operator=(const T& aNewValue) { *mCanonical = aNewValue; return *this; }
+
+  private:
+    nsRefPtr<Canonical<T>> mCanonical;
+  };
+
+protected:
+  ~Canonical() { MOZ_DIAGNOSTIC_ASSERT(mMirrors.IsEmpty()); }
+
+private:
+  void DoNotify()
+  {
+    MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
+    MOZ_ASSERT(mInitialValue.isSome());
+    bool same = mInitialValue.ref() == mValue;
+    mInitialValue.reset();
+
+    if (same) {
+      MIRROR_LOG("%s [%p] unchanged - not sending update", mName, this);
+      return;
+    }
+
+    for (size_t i = 0; i < mMirrors.Length(); ++i) {
+      OwnerThread()->TailDispatcher().AddStateChangeTask(mMirrors[i]->OwnerThread(), MakeNotifier(mMirrors[i]));
+    }
+  }
+
+  already_AddRefed<nsIRunnable> MakeNotifier(AbstractMirror<T>* aMirror)
+  {
+    nsCOMPtr<nsIRunnable> r =
+      NS_NewRunnableMethodWithArg<T>(aMirror, &AbstractMirror<T>::UpdateValue, mValue);
+    return r.forget();
+  }
+
+  T mValue;
+  Maybe<T> mInitialValue;
+  nsTArray<nsRefPtr<AbstractMirror<T>>> mMirrors;
+};
+
+/*
+ * Mirror<T> is a wrapper class that allows a given value to mirror that of a
+ * Canonical<T> owned by another thread. It registers itself with a Canonical<T>,
+ * and is periodically updated with new values. Mirror<T> is also a WatchTarget,
+ * and may be set up to trigger other routines (on the same thread) when the
+ * mirrored value changes.
+ *
+ * Do not instantiate a Mirror<T> directly as a member. Instead, instantiate a
+ * Mirror<T>::Holder, which handles lifetime issues and whose destructor
+ * initiates an asynchronous teardown of the reference-counted Mirror<T>,
+ * breaking the inherent cycle between Mirror<T> and Canonical<T>.
+ */
+template<typename T>
+class Mirror : public AbstractMirror<T>, public WatchTarget
+{
+public:
+  using AbstractMirror<T>::OwnerThread;
+
+  Mirror(AbstractThread* aThread, const T& aInitialValue, const char* aName)
+    : AbstractMirror<T>(aThread), WatchTarget(aName), mValue(aInitialValue)
+  {
+    MIRROR_LOG("%s [%p] initialized", mName, this);
+  }
+
+  operator const T&()
+  {
+    MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
+    return mValue;
+  }
+
+  virtual void UpdateValue(const T& aNewValue) override
+  {
+    MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
+    if (mValue != aNewValue) {
+      mValue = aNewValue;
+      WatchTarget::NotifyWatchers();
+    }
+  }
+
+  virtual void NotifyDisconnected() override
+  {
+    MIRROR_LOG("%s [%p] Notifed of disconnection from %p", mName, this, mCanonical.get());
+    MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
+    mCanonical = nullptr;
+  }
+
+  bool IsConnected() const { return !!mCanonical; }
+
+  void Connect(AbstractCanonical<T>* aCanonical)
+  {
+    MIRROR_LOG("%s [%p] Connecting to %p", mName, this, aCanonical);
+    MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
+    MOZ_ASSERT(!IsConnected());
+
+    nsCOMPtr<nsIRunnable> r = NS_NewRunnableMethodWithArg<StorensRefPtrPassByPtr<AbstractMirror<T>>>
+                                (aCanonical, &AbstractCanonical<T>::AddMirror, this);
+    aCanonical->OwnerThread()->Dispatch(r.forget());
+    mCanonical = aCanonical;
+  }
+
+  void DisconnectIfConnected()
+  {
+    MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
+    if (!IsConnected()) {
+      return;
+    }
+
+    MIRROR_LOG("%s [%p] Disconnecting from %p", mName, this, mCanonical.get());
+    nsCOMPtr<nsIRunnable> r = NS_NewRunnableMethodWithArg<StorensRefPtrPassByPtr<AbstractMirror<T>>>
+                                (mCanonical, &AbstractCanonical<T>::RemoveMirror, this);
+    mCanonical->OwnerThread()->Dispatch(r.forget());
+    mCanonical = nullptr;
+  }
+
+  class Holder
+  {
+  public:
+    Holder() {}
+    ~Holder()
+    {
+      MOZ_DIAGNOSTIC_ASSERT(mMirror, "Should have initialized me");
+      mMirror->DisconnectIfConnected();
+    }
+
+    // NB: Because mirror-initiated disconnection can race with canonical-
+    // initiated disconnection, a mirror should never be reinitialized.
+    void Init(AbstractThread* aThread, const T& aInitialValue, const char* aName)
+    {
+      mMirror = new Mirror<T>(aThread, aInitialValue, aName);
+    }
+
+    // Forward control operations to the Mirror<T>.
+    void Connect(AbstractCanonical<T>* aCanonical) { mMirror->Connect(aCanonical); }
+    void DisconnectIfConnected() { mMirror->DisconnectIfConnected(); }
+
+    // Access to the Mirror<T>.
+    operator Mirror<T>&() { return *mMirror; }
+    Mirror<T>* operator&() { return mMirror; }
+
+    // Access to the T.
+    const T& Ref() { return *mMirror; }
+    operator const T&() { return Ref(); }
+
+  private:
+    nsRefPtr<Mirror<T>> mMirror;
+  };
+
+protected:
+  ~Mirror() { MOZ_DIAGNOSTIC_ASSERT(!IsConnected()); }
+
+private:
+  T mValue;
+  nsRefPtr<AbstractCanonical<T>> mCanonical;
+};
+
+#undef MIRROR_LOG
+
+} // namespace mozilla
+
+#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/StateWatching.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/StateWatching.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/StateWatching.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/StateWatching.h	2015-04-24 19:31:09.000000000 +0000
@@ -0,0 +1,264 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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(StateWatching_h_)
+#define StateWatching_h_
+
+#include "AbstractThread.h"
+
+#include "mozilla/UniquePtr.h"
+#include "mozilla/unused.h"
+
+#include "nsISupportsImpl.h"
+
+/*
+ * The state-watching machinery automates the process of responding to changes
+ * in various pieces of state.
+ *
+ * A standard programming pattern is as follows:
+ *
+ * mFoo = ...;
+ * NotifyStuffChanged();
+ * ...
+ * mBar = ...;
+ * NotifyStuffChanged();
+ *
+ * This pattern is error-prone and difficult to audit because it requires the
+ * programmer to manually trigger the update routine. This can be especially
+ * problematic when the update routine depends on numerous pieces of state, and
+ * when that state is modified across a variety of helper methods. In these
+ * cases the responsibility for invoking the routine is often unclear, causing
+ * developers to scatter calls to it like pixie dust. This can result in
+ * duplicate invocations (which is wasteful) and missing invocations in corner-
+ * cases (which is a source of bugs).
+ *
+ * This file provides a set of primitives that automatically handle updates and
+ * allow the programmers to explicitly construct a graph of state dependencies.
+ * When used correctly, it eliminates the guess-work and wasted cycles described
+ * above.
+ *
+ * There are two basic pieces:
+ *   (1) Objects that can be watched for updates. These inherit WatchTarget.
+ *   (2) Objects that receive objects and trigger processing. These inherit
+ *       AbstractWatcher. Note that some watchers may themselves be watched,
+ *       allowing watchers to be composed together.
+ *
+ * Note that none of this machinery is thread-safe - it must all happen on the
+ * same owning thread. To solve multi-threaded use-cases, use state mirroring
+ * and watch the mirrored value.
+ *
+ * Given that semantics may change and comments tend to go out of date, we
+ * deliberately don't provide usage examples here. Grep around to find them.
+ */
+
+namespace mozilla {
+
+extern PRLogModuleInfo* gStateWatchingLog;
+
+void EnsureStateWatchingLog();
+
+#define WATCH_LOG(x, ...) \
+  MOZ_ASSERT(gStateWatchingLog); \
+  PR_LOG(gStateWatchingLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
+
+/*
+ * AbstractWatcher is a superclass from which all watchers must inherit.
+ */
+class AbstractWatcher
+{
+public:
+  NS_INLINE_DECL_REFCOUNTING(AbstractWatcher)
+  AbstractWatcher() : mDestroyed(false) {}
+  bool IsDestroyed() { return mDestroyed; }
+  virtual void Notify() = 0;
+
+protected:
+  virtual ~AbstractWatcher() {}
+  virtual void CustomDestroy() {}
+
+private:
+  // Only the holder is allowed to invoke Destroy().
+  friend class WatcherHolder;
+  void Destroy()
+  {
+    mDestroyed = true;
+    CustomDestroy();
+  }
+
+  bool mDestroyed;
+};
+
+/*
+ * WatchTarget is a superclass from which all watchable things must inherit.
+ * Unlike AbstractWatcher, it is a fully-implemented Mix-in, and the subclass
+ * needs only to invoke NotifyWatchers when something changes.
+ *
+ * The functionality that this class provides is not threadsafe, and should only
+ * be used on the thread that owns that WatchTarget.
+ */
+class WatchTarget
+{
+public:
+  explicit WatchTarget(const char* aName) : mName(aName) {}
+
+  void AddWatcher(AbstractWatcher* aWatcher)
+  {
+    MOZ_ASSERT(!mWatchers.Contains(aWatcher));
+    mWatchers.AppendElement(aWatcher);
+    aWatcher->Notify();
+  }
+
+  void RemoveWatcher(AbstractWatcher* aWatcher)
+  {
+    MOZ_ASSERT(mWatchers.Contains(aWatcher));
+    mWatchers.RemoveElement(aWatcher);
+  }
+
+protected:
+  void NotifyWatchers()
+  {
+    WATCH_LOG("%s[%p] notifying watchers\n", mName, this);
+    PruneWatchers();
+    for (size_t i = 0; i < mWatchers.Length(); ++i) {
+      mWatchers[i]->Notify();
+    }
+  }
+
+private:
+  // We don't have Watchers explicitly unregister themselves when they die,
+  // because then they'd need back-references to all the WatchTargets they're
+  // subscribed to, and WatchTargets aren't reference-counted. So instead we
+  // just prune dead ones at appropriate times, which works just fine.
+  void PruneWatchers()
+  {
+    for (int i = mWatchers.Length() - 1; i >= 0; --i) {
+      if (mWatchers[i]->IsDestroyed()) {
+        mWatchers.RemoveElementAt(i);
+      }
+    }
+  }
+
+  nsTArray<nsRefPtr<AbstractWatcher>> mWatchers;
+
+protected:
+  const char* mName;
+};
+
+/*
+ * Watchable is a wrapper class that turns any primitive into a WatchTarget.
+ */
+template<typename T>
+class Watchable : public WatchTarget
+{
+public:
+  Watchable(const T& aInitialValue, const char* aName)
+    : WatchTarget(aName), mValue(aInitialValue) {}
+
+  operator const T&() const { return mValue; }
+  Watchable& operator=(const T& aNewValue)
+  {
+    if (aNewValue != mValue) {
+      mValue = aNewValue;
+      NotifyWatchers();
+    }
+
+    return *this;
+  }
+
+private:
+  Watchable(const Watchable& aOther); // Not implemented
+  Watchable& operator=(const Watchable& aOther); // Not implemented
+
+  T mValue;
+};
+
+/*
+ * Watcher is the concrete AbstractWatcher implementation. It registers itself with
+ * various WatchTargets, and accepts any number of callbacks that will be
+ * invoked whenever any WatchTarget notifies of a change. It may also be watched
+ * by other watchers.
+ *
+ * When a notification is received, a runnable is passed as "direct" to the
+ * thread's tail dispatcher, which run directly (rather than via dispatch) when
+ * the tail dispatcher fires. All subsequent notifications are ignored until the
+ * runnable executes, triggering the updates and resetting the flags.
+ */
+class Watcher : public AbstractWatcher, public WatchTarget
+{
+public:
+  explicit Watcher(const char* aName)
+    : WatchTarget(aName), mNotifying(false) {}
+
+  void Notify() override
+  {
+    if (mNotifying) {
+      return;
+    }
+    mNotifying = true;
+
+    // Queue up our notification jobs to run in a stable state.
+    nsCOMPtr<nsIRunnable> r = NS_NewRunnableMethod(this, &Watcher::DoNotify);
+    AbstractThread::GetCurrent()->TailDispatcher().AddDirectTask(r.forget());
+  }
+
+  void Watch(WatchTarget& aTarget) { aTarget.AddWatcher(this); }
+  void Unwatch(WatchTarget& aTarget) { aTarget.RemoveWatcher(this); }
+
+  template<typename ThisType>
+  void AddWeakCallback(ThisType* aThisVal, void(ThisType::*aMethod)())
+  {
+    mCallbacks.AppendElement(NS_NewNonOwningRunnableMethod(aThisVal, aMethod));
+  }
+
+protected:
+  void CustomDestroy() override { mCallbacks.Clear(); }
+
+  void DoNotify()
+  {
+    MOZ_ASSERT(mNotifying);
+    mNotifying = false;
+
+    // Notify dependent watchers.
+    NotifyWatchers();
+
+    for (size_t i = 0; i < mCallbacks.Length(); ++i) {
+      mCallbacks[i]->Run();
+    }
+  }
+
+private:
+  nsTArray<nsCOMPtr<nsIRunnable>> mCallbacks;
+
+  bool mNotifying;
+};
+
+/*
+ * WatcherHolder encapsulates a Watcher and handles lifetime issues. Use it to
+ * holder watcher members.
+ */
+class WatcherHolder
+{
+public:
+  explicit WatcherHolder(const char* aName) { mWatcher = new Watcher(aName); }
+  operator Watcher*() { return mWatcher; }
+  Watcher* operator->() { return mWatcher; }
+
+  ~WatcherHolder()
+  {
+    mWatcher->Destroy();
+    mWatcher = nullptr;
+  }
+
+private:
+  nsRefPtr<Watcher> mWatcher;
+};
+
+
+#undef WATCH_LOG
+
+} // namespace mozilla
+
+#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/systemservices/LoadMonitor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/systemservices/LoadMonitor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/systemservices/LoadMonitor.h	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/systemservices/LoadMonitor.h	2015-04-24 19:31:10.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsIObserver.h"
 
 namespace mozilla {
-class LoadInfoUpdateRunner;
 class LoadInfoCollectRunner;
 
 class LoadNotificationCallback
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/TaskDispatcher.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/TaskDispatcher.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/TaskDispatcher.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/TaskDispatcher.h	2015-04-24 19:31:09.000000000 +0000
@@ -28,7 +28,7 @@
  *
  * TaskDispatcher is a general abstract class that accepts tasks and dispatches
  * them at some later point. These groups of tasks are per-target-thread, and
- * contain separate queues for two kinds of tasks - "state change tasks" (which
+ * contain separate queues for several kinds of tasks (see comments  below). - "state change tasks" (which
  * run first, and are intended to be used to update the value held by mirrors),
  * and regular tasks, which are other arbitrary operations that the are gated
  * to run after all the state changes have completed.
@@ -39,13 +39,25 @@
   TaskDispatcher() {}
   virtual ~TaskDispatcher() {}
 
+  // Direct tasks are run directly (rather than dispatched asynchronously) when
+  // the tail dispatcher fires. A direct task may cause other tasks to be added
+  // to the tail dispatcher.
+  virtual void AddDirectTask(already_AddRefed<nsIRunnable> aRunnable) = 0;
+
+  // State change tasks are dispatched asynchronously always run before regular
+  // tasks. They are intended to be used to update the value held by mirrors
+  // before any other dispatched tasks are run on the target thread.
   virtual void AddStateChangeTask(AbstractThread* aThread,
                                   already_AddRefed<nsIRunnable> aRunnable) = 0;
+
+  // Regular tasks are dispatched asynchronously, and run after state change
+  // tasks.
   virtual void AddTask(AbstractThread* aThread,
                        already_AddRefed<nsIRunnable> aRunnable,
                        AbstractThread::DispatchFailureHandling aFailureHandling = AbstractThread::AssertDispatchSuccess) = 0;
 
   virtual bool HasTasksFor(AbstractThread* aThread) = 0;
+  virtual void DrainDirectTasks() = 0;
 };
 
 /*
@@ -58,6 +70,17 @@
   explicit AutoTaskDispatcher(bool aIsTailDispatcher = false) : mIsTailDispatcher(aIsTailDispatcher) {}
   ~AutoTaskDispatcher()
   {
+    // Given that direct tasks may trigger other code that uses the tail
+    // dispatcher, it's better to avoid processing them in the tail dispatcher's
+    // destructor. So we require TailDispatchers to manually invoke
+    // DrainDirectTasks before the AutoTaskDispatcher gets destroyed. In truth,
+    // this is only necessary in the case where this AutoTaskDispatcher can be
+    // accessed by the direct tasks it dispatches (true for TailDispatchers, but
+    // potentially not true for other hypothetical AutoTaskDispatchers). Feel
+    // free to loosen this restriction to apply only to mIsTailDispatcher if a
+    // use-case requires it.
+    MOZ_ASSERT(mDirectTasks.empty());
+
     for (size_t i = 0; i < mTaskGroups.Length(); ++i) {
       UniquePtr<PerThreadTaskGroup> group(Move(mTaskGroups[i]));
       nsRefPtr<AbstractThread> thread = group->mThread;
@@ -70,6 +93,20 @@
     }
   }
 
+  void DrainDirectTasks() override
+  {
+    while (!mDirectTasks.empty()) {
+      nsCOMPtr<nsIRunnable> r = mDirectTasks.front();
+      mDirectTasks.pop();
+      r->Run();
+    }
+  }
+
+  void AddDirectTask(already_AddRefed<nsIRunnable> aRunnable) override
+  {
+    mDirectTasks.push(Move(aRunnable));
+  }
+
   void AddStateChangeTask(AbstractThread* aThread,
                           already_AddRefed<nsIRunnable> aRunnable) override
   {
@@ -90,7 +127,10 @@
     }
   }
 
-  bool HasTasksFor(AbstractThread* aThread) override { return !!GetTaskGroup(aThread); }
+  bool HasTasksFor(AbstractThread* aThread) override
+  {
+    return !!GetTaskGroup(aThread) || (aThread == AbstractThread::GetCurrent() && !mDirectTasks.empty());
+  }
 
 private:
 
@@ -118,18 +158,37 @@
 
       NS_IMETHODIMP Run()
       {
+        // State change tasks get run all together before any code is run, so
+        // that all state changes are made in an atomic unit.
         for (size_t i = 0; i < mTasks->mStateChangeTasks.Length(); ++i) {
           mTasks->mStateChangeTasks[i]->Run();
         }
 
+        // Once the state changes have completed, drain any direct tasks
+        // generated by those state changes (i.e. watcher notification tasks).
+        // This needs to be outside the loop because we don't want to run code
+        // that might observe intermediate states.
+        MaybeDrainDirectTasks();
+
         for (size_t i = 0; i < mTasks->mRegularTasks.Length(); ++i) {
           mTasks->mRegularTasks[i]->Run();
+
+          // Scope direct tasks tightly to the task that generated them.
+          MaybeDrainDirectTasks();
         }
 
         return NS_OK;
       }
 
     private:
+      void MaybeDrainDirectTasks()
+      {
+        AbstractThread* currentThread = AbstractThread::GetCurrent();
+        if (currentThread) {
+          currentThread->TailDispatcher().DrainDirectTasks();
+        }
+      }
+
       UniquePtr<PerThreadTaskGroup> mTasks;
   };
 
@@ -156,6 +215,9 @@
     return nullptr;
   }
 
+  // Direct tasks.
+  std::queue<nsCOMPtr<nsIRunnable>> mDirectTasks;
+
   // Task groups, organized by thread.
   nsTArray<UniquePtr<PerThreadTaskGroup>> mTaskGroups;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/test/test_eme_playback.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/test/test_eme_playback.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/test/test_eme_playback.html	2015-04-22 13:06:08.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/test/test_eme_playback.html	2015-04-24 19:31:10.000000000 +0000
@@ -49,14 +49,11 @@
   );
 
   var gotEncrypted = 0;
-  var gotPlaying = false;
 
   v.addEventListener("encrypted", function(ev) {
     gotEncrypted += 1;
   });
 
-  v.addEventListener("playing", function () { gotPlaying = true; });
-
   v.addEventListener("loadedmetadata", function() {
     ok(SpecialPowers.do_lookupGetter(v, "isEncrypted").apply(v),
        TimeStamp(token) + " isEncrypted should be true");
@@ -69,7 +66,6 @@
     is(gotEncrypted, test.sessionCount,
        TimeStamp(token) + " encrypted events expected: " + test.sessionCount
        + ", actual: " + gotEncrypted);
-    ok(gotPlaying, TimeStamp(token) + " playing event should have fired");
 
     ok(Math.abs(test.duration - v.duration) < 0.1,
        TimeStamp(token) + " Duration of video should be corrrect");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/tests/mochitest/pc.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/tests/mochitest/pc.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/tests/mochitest/pc.js	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/tests/mochitest/pc.js	2015-04-24 19:31:11.000000000 +0000
@@ -716,6 +716,39 @@
 
 
 /**
+ * This class provides helpers around analysing the audio content in a stream
+ * using WebAudio AnalyserNodes.
+ *
+ * @constructor
+ * @param {object} stream
+ *                 A MediaStream object whose audio track we shall analyse.
+ */
+function AudioStreamAnalyser(stream) {
+  if (stream.getAudioTracks().length === 0) {
+    throw new Error("No audio track in stream");
+  }
+  this.stream = stream;
+  this.audioContext = new AudioContext();
+  this.sourceNode = this.audioContext.createMediaStreamSource(this.stream);
+  this.analyser = this.audioContext.createAnalyser();
+  this.sourceNode.connect(this.analyser);
+  this.data = new Uint8Array(this.analyser.frequencyBinCount);
+}
+
+AudioStreamAnalyser.prototype = {
+  /**
+   * Get an array of frequency domain data for our stream's audio track.
+   *
+   * @returns {array} A Uint8Array containing the frequency domain data.
+   */
+  getByteFrequencyData: function() {
+    this.analyser.getByteFrequencyData(this.data);
+    return this.data;
+  }
+};
+
+
+/**
  * This class acts as a wrapper around a PeerConnection instance.
  *
  * @constructor
@@ -1497,6 +1530,58 @@
   },
 
   /**
+   * Check that correct audio (typically a flat tone) is flowing to this
+   * PeerConnection. Uses WebAudio AnalyserNodes to compare input and output
+   * audio data in the frequency domain.
+   *
+   * @param {object} from
+   *        A PeerConnectionWrapper whose audio RTPSender we use as source for
+   *        the audio flow check.
+   * @returns {Promise}
+   *        A promise that resolves when we're receiving the tone from |from|.
+   */
+  checkReceivingToneFrom : function(from) {
+    var inputElem = from.localMediaElements[0];
+
+    // As input we use the stream of |from|'s first available audio sender.
+    var inputSenderTracks = from._pc.getSenders().map(sn => sn.track);
+    var inputAudioStream = from._pc.getLocalStreams()
+      .find(s => s.getAudioTracks().some(t => inputSenderTracks.includes(t)));
+    var inputAnalyser = new AudioStreamAnalyser(inputAudioStream);
+
+    // It would have been nice to have a working getReceivers() here, but until
+    // we do, let's use what remote streams we have.
+    var outputAudioStream = this._pc.getRemoteStreams()
+      .find(s => s.getAudioTracks().length > 0);
+    var outputAnalyser = new AudioStreamAnalyser(outputAudioStream);
+
+    var maxWithIndex = (a, b, i) => (b >= a.value) ? { value: b, index: i } : a;
+    var initial = { value: -1, index: -1 };
+
+    return new Promise((resolve, reject) => inputElem.ontimeupdate = () => {
+      var inputData = inputAnalyser.getByteFrequencyData();
+      var outputData = outputAnalyser.getByteFrequencyData();
+
+      var inputMax = inputData.reduce(maxWithIndex, initial);
+      var outputMax = outputData.reduce(maxWithIndex, initial);
+      info("Comparing maxima; input[" + inputMax.index + "] = " + inputMax.value +
+           ", output[" + outputMax.index + "] = " + outputMax.value);
+      if (!inputMax.value || !outputMax.value) {
+        return;
+      }
+
+      // When the input and output maxima are within reasonable distance
+      // from each other, we can be sure that the input tone has made it
+      // through the peer connection.
+      if (Math.abs(inputMax.index - outputMax.index) < 10) {
+        ok(true, "input and output audio data matches");
+        inputElem.ontimeupdate = null;
+        resolve();
+      }
+    });
+  },
+
+  /**
    * Check that stats are present by checking for known stats.
    */
   getStats : function(selector) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/tests/mochitest/test_peerConnection_replaceTrack.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/tests/mochitest/test_peerConnection_replaceTrack.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/tests/mochitest/test_peerConnection_replaceTrack.html	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/tests/mochitest/test_peerConnection_replaceTrack.html	2015-04-24 19:31:11.000000000 +0000
@@ -8,62 +8,133 @@
 <script type="application/javascript;version=1.8">
   createHTML({
     bug: "1032839",
-    title: "Replace video track",
+    title: "Replace video and audio (with WebAudio) tracks",
     visible: true
   });
 
-  function isSenderOfTrack(sender) {
-    return sender.track == this;
+  function allLocalStreamsHaveSender(pc) {
+    return pc.getLocalStreams()
+      .every(s => s.getTracks()        // Every local stream,
+        .some(t => pc.getSenders()     // should have some track,
+          .some(sn => sn.track == t))) // that's being sent over |pc|.
+  }
+
+  function replacetest(wrapper) {
+    var pc = wrapper._pc;
+    var oldSenderCount = pc.getSenders().length;
+    var sender = pc.getSenders().find(sn => sn.track.kind == "video");
+    var oldTrack = sender.track;
+    ok(sender, "We have a sender for video");
+    ok(allLocalStreamsHaveSender(pc),
+       "Shouldn't have any streams without a corresponding sender");
+
+    var newTrack;
+    var audiotrack;
+    return navigator.mediaDevices.getUserMedia({video:true, audio:true, fake:true})
+      .then(newStream => {
+        newTrack = newStream.getVideoTracks()[0];
+        audiotrack = newStream.getAudioTracks()[0];
+        isnot(newTrack, sender.track, "replacing with a different track");
+        ok(!pc.getLocalStreams().includes(newStream), "from a different stream");
+        return sender.replaceTrack(newTrack);
+      })
+      .then(() => {
+        is(pc.getSenders().length, oldSenderCount, "same sender count");
+        is(sender.track, newTrack, "sender.track has been replaced");
+        ok(!pc.getSenders().map(sn => sn.track).includes(oldTrack),
+           "old track not among senders");
+        ok(pc.getLocalStreams().some(s => s.getTracks().includes(sender.track)),
+           "track exists among pc's local streams");
+        return sender.replaceTrack(audiotrack)
+          .then(() => ok(false, "replacing with different kind should fail"),
+                e => is(e.name, "IncompatibleMediaStreamTrackError",
+                        "replacing with different kind should fail"));
+      });
   }
 
   runNetworkTest(function () {
     test = new PeerConnectionTest();
-    test.setMediaConstraints([{video: true}], [{video: true}]);
+    test.audioCtx = new AudioContext();
+    test.setMediaConstraints([{video: true, audio: true}], [{video: true}]);
     test.chain.removeAfter("PC_REMOTE_CHECK_MEDIA_FLOW_PRESENT");
-    var flowtest = test.chain.remove("PC_REMOTE_CHECK_MEDIA_FLOW_PRESENT");
-    test.chain.append(flowtest);
 
-    var replacetest = [ function PC_LOCAL_REPLACE_VIDEOTRACK(test) {
-      var oldstream = test.pcLocal._pc.getLocalStreams()[0];
-      var oldtrack = oldstream.getVideoTracks()[0];
-      var sender = test.pcLocal._pc.getSenders().find(isSenderOfTrack, oldtrack);
-      ok(sender, "track has a sender");
-      var newtrack;
-      var audiotrack;
-      return navigator.mediaDevices.getUserMedia({video:true, audio:true, fake:true})
-        .then(newstream => {
-          newtrack = newstream.getVideoTracks()[0];
-          audiotrack = newstream.getAudioTracks()[0];
-          isnot(newtrack, oldtrack, "replacing with a different track");
-          isnot(newstream, oldstream, "from a different stream");
-          return sender.replaceTrack(newtrack);
-        })
-        .then(() => {
-          is(sender.track, newtrack, "sender.track has been replaced");
-          var stream = test.pcLocal._pc.getLocalStreams()[0];
-          var track = stream.getVideoTracks()[0];
-          is(track, newtrack, "track has been replaced in stream");
-          return sender.replaceTrack(audiotrack)
-            .then(() => ok(false, "replacing with different kind should fail"),
-                  e => is(e.name, "IncompatibleMediaStreamTrackError",
-                          "replacing with different kind should fail"));
-        });
-    } ];
-    // Do it twice to make sure it still works (does audio twice too, but hey)
-    test.chain.append(replacetest);
-    test.chain.append(flowtest);
-    test.chain.append(replacetest);
-    test.chain.append(flowtest);
-    test.chain.append([
-      function PC_LOCAL_REPLACE_VIDEOTRACK_WITHSAME(test) {
-        var oldstream = test.pcLocal._pc.getLocalStreams()[0];
-        var oldtrack = oldstream.getVideoTracks()[0];
-        var sender = test.pcLocal._pc.getSenders().find(isSenderOfTrack, oldtrack);
-        return sender.replaceTrack(oldtrack) // same track
+    // Test replaceTrack on pcRemote separately since it's video only.
+    test.chain.append([
+      function PC_REMOTE_VIDEOONLY_REPLACE_VIDEOTRACK(test) {
+        return replacetest(test.pcRemote);
+      },
+      function PC_LOCAL_NEW_VIDEOTRACK_CHECK_MEDIA_FLOW_PRESENT(test) {
+        return test.pcLocal.checkMediaFlowPresent();
+      }
+    ]);
+
+    // Replace video twice on pcLocal to make sure it still works
+    // (does audio twice too, but hey)
+    test.chain.append([
+      function PC_LOCAL_AUDIOVIDEO_REPLACE_VIDEOTRACK_1(test) {
+        return replacetest(test.pcLocal);
+      },
+      function PC_REMOTE_NEW_VIDEOTRACK_CHECK_MEDIA_FLOW_PRESENT_1(test) {
+        return test.pcRemote.checkMediaFlowPresent();
+      },
+      function PC_LOCAL_AUDIOVIDEO_REPLACE_VIDEOTRACK_2(test) {
+        return replacetest(test.pcLocal);
+      },
+      function PC_REMOTE_NEW_VIDEOTRACK_CHECK_MEDIA_FLOW_PRESENT_2(test) {
+        return test.pcRemote.checkMediaFlowPresent();
+      }
+    ]);
+
+    test.chain.append([
+      function PC_LOCAL_AUDIOVIDEO_REPLACE_VIDEOTRACK_WITHSAME(test) {
+        var pc = test.pcLocal._pc;
+        var sender = pc.getSenders().find(sn => sn.track.kind == "video");
+        ok(sender, "should still have a sender of video");
+        return sender.replaceTrack(sender.track)
           .then(() => ok(true, "replacing with itself should succeed"));
+      },
+      function PC_REMOTE_NEW_SAME_VIDEOTRACK_CHECK_MEDIA_FLOW_PRESENT(test) {
+        return test.pcRemote.checkMediaFlowPresent();
+      }
+    ]);
+
+    // Replace the gUM audio track on pcLocal with a WebAudio track.
+    test.chain.append([
+      function PC_LOCAL_AUDIOVIDEO_REPLACE_AUDIOTRACK_WEBAUDIO(test) {
+        var pc = test.pcLocal._pc;
+        var sender = pc.getSenders().find(sn => sn.track.kind == "audio");
+        ok(sender, "track has a sender");
+        var oldSenderCount = pc.getSenders().length;
+        var oldTrack = sender.track;
+
+        var sourceNode = test.audioCtx.createOscillator();
+        sourceNode.type = 'sine';
+        // We need a frequency not too close to the fake audio track (1kHz).
+        sourceNode.frequency.value = 2000;
+        sourceNode.start();
+
+        var destNode = test.audioCtx.createMediaStreamDestination();
+        sourceNode.connect(destNode);
+        var newTrack = destNode.stream.getAudioTracks()[0];
+
+        return sender.replaceTrack(newTrack)
+          .then(() => {
+            is(pc.getSenders().length, oldSenderCount, "same sender count");
+            ok(!pc.getSenders().some(sn => sn.track == oldTrack),
+               "Replaced track should be removed from senders");
+            ok(allLocalStreamsHaveSender(pc),
+               "Shouldn't have any streams without a corresponding sender");
+            is(sender.track, newTrack, "sender.track has been replaced");
+            ok(pc.getLocalStreams().some(s => s.getTracks().includes(sender.track)),
+               "track exists among pc's local streams");
+          });
+      }
+    ]);
+    test.chain.append([
+      function PC_LOCAL_CHECK_WEBAUDIO_FLOW_PRESENT(test) {
+        return test.pcRemote.checkReceivingToneFrom(test.pcLocal);
       }
     ]);
-    test.chain.append(flowtest);
     test.chain.append([
       function PC_LOCAL_INVALID_ADD_VIDEOTRACKS(test) {
         var stream = test.pcLocal._pc.getLocalStreams()[0];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/tests/mochitest/test_peerConnection_webAudio.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/tests/mochitest/test_peerConnection_webAudio.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/tests/mochitest/test_peerConnection_webAudio.html	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/tests/mochitest/test_peerConnection_webAudio.html	2015-04-24 19:31:11.000000000 +0000
@@ -11,109 +11,30 @@
   title: "WebAudio on both input and output side of peerconnection"
 });
 
-// This tests WebAudio as input to a PeerConnection and a PeerConnection as
-// input to WebAudio. This is done by piping a 700Hz oscillator through an
-// analyser on the input side, the PeerConnection, and an analyser on the
-// output side. We then sanity check the audio by comparing the frequency domain
-// data from both analysers.
-
-/*
- * Use as callback to Array.reduce to get an object { value, index }
- * that contains the largest element in the array.
- */
-var maxWithIndex = function(a, b, i) {
-  if (b >= a.value) {
-    return { value: b, index: i };
-  } else {
-    return a;
-  }
-};
+// This tests WebAudio (a 700Hz OscillatorNode) as input to a PeerConnection.
+// It also tests that a PeerConnection works as input to WebAudio as the remote
+// stream is connected to an AnalyserNode and compared to the source node.
 
 runNetworkTest(function() {
   var test = new PeerConnectionTest();
-
-  var audioContext = new AudioContext();
-  var inputAnalyser, outputAnalyser;
-  var inputData, outputData;
-
+  test.audioContext = new AudioContext();
   test.setMediaConstraints([{audio: true}], []);
   test.chain.replace("PC_LOCAL_GUM", [
     function PC_LOCAL_WEBAUDIO_SOURCE(test) {
-      var oscillator = audioContext.createOscillator();
+      var oscillator = test.audioContext.createOscillator();
       oscillator.type = 'sine';
       oscillator.frequency.value = 700;
       oscillator.start();
-      inputAnalyser = audioContext.createAnalyser();
-      var dest = audioContext.createMediaStreamDestination();
-
-      oscillator.connect(inputAnalyser);
-      inputAnalyser.connect(dest);
+      var dest = test.audioContext.createMediaStreamDestination();
+      oscillator.connect(dest);
       test.pcLocal.attachMedia(dest.stream, 'audio', 'local');
-
-      return Promise.resolve();
     }
   ]);
-  test.chain.insertBefore("PC_REMOTE_SETUP_ADDSTREAM_HANDLER", [
-    function PC_REMOTE_REPLACE_ATTACHMEDIA(test) {
-      var realAttachMedia = test.pcRemote.attachMedia.bind(test.pcRemote);
-      test.pcRemote.attachMedia = function(stream, type, side) {
-        var source = audioContext.createMediaStreamSource(stream);
-        outputAnalyser = audioContext.createAnalyser();
-        var dest = audioContext.createMediaStreamDestination();
-
-        source.connect(outputAnalyser);
-        outputAnalyser.connect(dest);
-        realAttachMedia(dest.stream, type, side);
-      };
-      return Promise.resolve();
-  }]);
   test.chain.append([
-    function GET_INPUT_DATA(test) {
-      inputData = new Uint8Array(inputAnalyser.frequencyBinCount);
-      inputAnalyser.getByteFrequencyData(inputData);
-      return Promise.resolve();
-    },
-    function GET_OUTPUT_DATA(test) {
-      // We've seen completely silent output with e10s, suggesting that the
-      // machine is overloaded. Here we wait for actual audio data on the
-      // output side before we proceed.
-      return new Promise(resolve => {
-        is(test.pcRemote.mediaCheckers.length, 1, "One media element on remote side");
-        var elem = test.pcRemote.mediaCheckers[0].element;
-        var data = new Uint8Array(outputAnalyser.frequencyBinCount);
-        elem.ontimeupdate = ev => {
-          outputAnalyser.getByteFrequencyData(data);
-          if (data.reduce(maxWithIndex, { value: -1, index: -1 }).value === 0) {
-            info("Waiting for output data... time: " + elem.currentTime);
-            return;
-          }
-          elem.ontimeupdate = null;
-          outputData = data;
-          resolve();
-        };
-      });
-    },
     function CHECK_AUDIO_FLOW(test) {
-      // This is for sanity check only. We'll deem that the streams are working
-      // if the global maxima in the frequency domain for both the input and
-      // the output are within 10 (out of 1024) steps of each other.
-
-      is(inputData.length, outputData.length, "Equally sized datasets");
-
-      var initialValue = { value: -1, index: -1 };
-      var inputMax = inputData.reduce(maxWithIndex, initialValue);
-      var outputMax = outputData.reduce(maxWithIndex, initialValue);
-
-      // Mild paranoia
-      isnot(inputMax, 0, "Input should have data");
-      isnot(outputMax, 0, "Output should have data");
-
-      ok(Math.abs(inputMax.index - outputMax.index) < 10,
-         "Input maxima " + inputMax.value + " at index " + inputMax.index +
-         " should be within 10 steps of Output maxima " + outputMax.value +
-         " at index " + outputMax.index);
-      return Promise.resolve();
-    }]);
+      return test.pcRemote.checkReceivingToneFrom(test.pcLocal);
+    }
+  ]);
   test.run();
 });
 </script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/TextTrack.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/TextTrack.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/TextTrack.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/TextTrack.h	2015-04-24 19:31:09.000000000 +0000
@@ -19,7 +19,6 @@
 class TextTrackList;
 class TextTrackCue;
 class TextTrackCueList;
-class TextTrackRegion;
 class HTMLTrackElement;
 
 enum TextTrackSource {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/AudioContext.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/AudioContext.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/AudioContext.h	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/AudioContext.h	2015-04-24 19:31:11.000000000 +0000
@@ -35,7 +35,6 @@
 class ErrorResult;
 class MediaStream;
 class MediaStreamGraph;
-class AudioNodeEngine;
 class AudioNodeStream;
 
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/AudioEventTimeline.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/AudioEventTimeline.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/AudioEventTimeline.h	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/AudioEventTimeline.h	2015-04-24 19:31:11.000000000 +0000
@@ -261,143 +261,100 @@
   template<class TimeType>
   float GetValueAtTime(TimeType aTime)
   {
-    mComputedValue = GetValueAtTimeHelper(aTime);
+    GetValuesAtTimeHelper(aTime, &mComputedValue, 1);
     return mComputedValue;
   }
 
+  template<class TimeType>
+  void GetValuesAtTime(TimeType aTime, float* aBuffer, const size_t aSize)
+  {
+    MOZ_ASSERT(aBuffer);
+    GetValuesAtTimeHelper(aTime, aBuffer, aSize);
+    mComputedValue = aBuffer[aSize - 1];
+  }
+
   // This method computes the AudioParam value at a given time based on the event timeline
   template<class TimeType>
-  float GetValueAtTimeHelper(TimeType aTime)
+  void GetValuesAtTimeHelper(TimeType aTime, float* aBuffer, const size_t aSize)
   {
+    MOZ_ASSERT(aBuffer);
+    MOZ_ASSERT(aSize);
+
+    size_t lastEventId = 0;
     const AudioTimelineEvent* previous = nullptr;
     const AudioTimelineEvent* next = nullptr;
-
     bool bailOut = false;
-    for (unsigned i = 0; !bailOut && i < mEvents.Length(); ++i) {
-      switch (mEvents[i].mType) {
-      case AudioTimelineEvent::SetValue:
-      case AudioTimelineEvent::SetTarget:
-      case AudioTimelineEvent::LinearRamp:
-      case AudioTimelineEvent::ExponentialRamp:
-      case AudioTimelineEvent::SetValueCurve:
-        if (TimesEqual(aTime, mEvents[i].template Time<TimeType>())) {
-          mLastComputedValue = mComputedValue;
-          // Find the last event with the same time
-          do {
-            ++i;
-          } while (i < mEvents.Length() &&
-                   aTime == mEvents[i].template Time<TimeType>());
 
-          // SetTarget nodes can be handled no matter what their next node is (if they have one)
-          if (mEvents[i - 1].mType == AudioTimelineEvent::SetTarget) {
-            // Follow the curve, without regard to the next event, starting at
-            // the last value of the last event.
-            return ExponentialApproach(mEvents[i - 1].template Time<TimeType>(),
-                                       mLastComputedValue, mEvents[i - 1].mValue,
-                                       mEvents[i - 1].mTimeConstant, aTime);
-          }
+    // Let's remove old events except the last one: we need it to calculate some curves.
+    while (mEvents.Length() > 1 &&
+           aTime > mEvents[1].template Time<TimeType>()) {
+      mEvents.RemoveElementAt(0);
+    }
+
+    for (size_t bufferIndex = 0; bufferIndex < aSize; ++bufferIndex, ++aTime) {
+      for (; !bailOut && lastEventId < mEvents.Length(); ++lastEventId) {
+
+#ifdef DEBUG
+        const AudioTimelineEvent* current = &mEvents[lastEventId];
+        MOZ_ASSERT(current->mType == AudioTimelineEvent::SetValue ||
+                   current->mType == AudioTimelineEvent::SetTarget ||
+                   current->mType == AudioTimelineEvent::LinearRamp ||
+                   current->mType == AudioTimelineEvent::ExponentialRamp ||
+                   current->mType == AudioTimelineEvent::SetValueCurve);
+#endif
 
-          // SetValueCurve events can be handled no matter what their event node is (if they have one)
-          if (mEvents[i - 1].mType == AudioTimelineEvent::SetValueCurve) {
-            return ExtractValueFromCurve(mEvents[i - 1].template Time<TimeType>(),
-                                         mEvents[i - 1].mCurve,
-                                         mEvents[i - 1].mCurveLength,
-                                         mEvents[i - 1].mDuration, aTime);
+        if (TimesEqual(aTime, mEvents[lastEventId].template Time<TimeType>())) {
+          mLastComputedValue = mComputedValue;
+          // Find the last event with the same time
+          while (lastEventId < mEvents.Length() - 1 &&
+                 TimesEqual(aTime, mEvents[lastEventId + 1].template Time<TimeType>())) {
+            ++lastEventId;
           }
-
-          // For other event types
-          return mEvents[i - 1].mValue;
+          break;
         }
+
         previous = next;
-        next = &mEvents[i];
-        if (aTime < mEvents[i].template Time<TimeType>()) {
+        next = &mEvents[lastEventId];
+        if (aTime < mEvents[lastEventId].template Time<TimeType>()) {
           bailOut = true;
         }
-        break;
-      default:
-        MOZ_ASSERT(false, "unreached");
       }
-    }
-    // Handle the case where the time is past all of the events
-    if (!bailOut) {
-      previous = next;
-      next = nullptr;
-    }
-
-    // Just return the default value if we did not find anything
-    if (!previous && !next) {
-      return mValue;
-    }
 
-    // If the requested time is before all of the existing events
-    if (!previous) {
-      return mValue;
-    }
+      // The time was found in the list of events.
+      if (!bailOut && lastEventId < mEvents.Length()) {
+        MOZ_ASSERT(TimesEqual(aTime, mEvents[lastEventId].template Time<TimeType>()));
+
+        // SetTarget nodes can be handled no matter what their next node is (if they have one)
+        if (mEvents[lastEventId].mType == AudioTimelineEvent::SetTarget) {
+          // Follow the curve, without regard to the next event, starting at
+          // the last value of the last event.
+          aBuffer[bufferIndex] = ExponentialApproach(mEvents[lastEventId].template Time<TimeType>(),
+                                                  mLastComputedValue, mEvents[lastEventId].mValue,
+                                                  mEvents[lastEventId].mTimeConstant, aTime);
+          continue;
+        }
 
-    // SetTarget nodes can be handled no matter what their next node is (if they have one)
-    if (previous->mType == AudioTimelineEvent::SetTarget) {
-      return ExponentialApproach(previous->template Time<TimeType>(),
-                                 mLastComputedValue, previous->mValue,
-                                 previous->mTimeConstant, aTime);
-    }
-
-    // SetValueCurve events can be handled no mattar what their next node is (if they have one)
-    if (previous->mType == AudioTimelineEvent::SetValueCurve) {
-      return ExtractValueFromCurve(previous->template Time<TimeType>(),
-                                   previous->mCurve, previous->mCurveLength,
-                                   previous->mDuration, aTime);
-    }
+        // SetValueCurve events can be handled no matter what their event node is (if they have one)
+        if (mEvents[lastEventId].mType == AudioTimelineEvent::SetValueCurve) {
+          aBuffer[bufferIndex] = ExtractValueFromCurve(mEvents[lastEventId].template Time<TimeType>(),
+                                                    mEvents[lastEventId].mCurve,
+                                                    mEvents[lastEventId].mCurveLength,
+                                                    mEvents[lastEventId].mDuration, aTime);
+          continue;
+        }
 
-    // If the requested time is after all of the existing events
-    if (!next) {
-      switch (previous->mType) {
-      case AudioTimelineEvent::SetValue:
-      case AudioTimelineEvent::LinearRamp:
-      case AudioTimelineEvent::ExponentialRamp:
-        // The value will be constant after the last event
-        return previous->mValue;
-      case AudioTimelineEvent::SetValueCurve:
-        return ExtractValueFromCurve(previous->template Time<TimeType>(),
-                                     previous->mCurve, previous->mCurveLength,
-                                     previous->mDuration, aTime);
-      case AudioTimelineEvent::SetTarget:
-        MOZ_ASSERT(false, "unreached");
+        // For other event types
+        aBuffer[bufferIndex] = mEvents[lastEventId].mValue;
+        continue;
       }
-      MOZ_ASSERT(false, "unreached");
-    }
-
-    // Finally, handle the case where we have both a previous and a next event
 
-    // First, handle the case where our range ends up in a ramp event
-    switch (next->mType) {
-    case AudioTimelineEvent::LinearRamp:
-      return LinearInterpolate(previous->template Time<TimeType>(), previous->mValue, next->template Time<TimeType>(), next->mValue, aTime);
-    case AudioTimelineEvent::ExponentialRamp:
-      return ExponentialInterpolate(previous->template Time<TimeType>(), previous->mValue, next->template Time<TimeType>(), next->mValue, aTime);
-    case AudioTimelineEvent::SetValue:
-    case AudioTimelineEvent::SetTarget:
-    case AudioTimelineEvent::SetValueCurve:
-      break;
-    }
-
-    // Now handle all other cases
-    switch (previous->mType) {
-    case AudioTimelineEvent::SetValue:
-    case AudioTimelineEvent::LinearRamp:
-    case AudioTimelineEvent::ExponentialRamp:
-      // If the next event type is neither linear or exponential ramp, the
-      // value is constant.
-      return previous->mValue;
-    case AudioTimelineEvent::SetValueCurve:
-      return ExtractValueFromCurve(previous->template Time<TimeType>(),
-                                   previous->mCurve, previous->mCurveLength,
-                                   previous->mDuration, aTime);
-    case AudioTimelineEvent::SetTarget:
-      MOZ_ASSERT(false, "unreached");
+      // Handle the case where the time is past all of the events
+      if (!bailOut) {
+        aBuffer[bufferIndex] = GetValuesAtTimeHelperInternal(aTime, next, nullptr);
+      } else {
+        aBuffer[bufferIndex] = GetValuesAtTimeHelperInternal(aTime, previous, next);
+      }
     }
-
-    MOZ_ASSERT(false, "unreached");
-    return 0.0f;
   }
 
   // Return the number of events scheduled
@@ -445,6 +402,92 @@
   }
 
 private:
+  template<class TimeType>
+  float GetValuesAtTimeHelperInternal(TimeType aTime,
+                                      const AudioTimelineEvent* aPrevious,
+                                      const AudioTimelineEvent* aNext)
+  {
+    // If the requested time is before all of the existing events
+    if (!aPrevious) {
+       return mValue;
+    }
+
+    // SetTarget nodes can be handled no matter what their next node is (if
+    // they have one)
+    if (aPrevious->mType == AudioTimelineEvent::SetTarget) {
+      return ExponentialApproach(aPrevious->template Time<TimeType>(),
+                                 mLastComputedValue, aPrevious->mValue,
+                                 aPrevious->mTimeConstant, aTime);
+    }
+
+    // SetValueCurve events can be handled no mattar what their next node is
+    // (if they have one)
+    if (aPrevious->mType == AudioTimelineEvent::SetValueCurve) {
+      return ExtractValueFromCurve(aPrevious->template Time<TimeType>(),
+                                   aPrevious->mCurve, aPrevious->mCurveLength,
+                                   aPrevious->mDuration, aTime);
+    }
+
+    // If the requested time is after all of the existing events
+    if (!aNext) {
+      switch (aPrevious->mType) {
+      case AudioTimelineEvent::SetValue:
+      case AudioTimelineEvent::LinearRamp:
+      case AudioTimelineEvent::ExponentialRamp:
+        // The value will be constant after the last event
+        return aPrevious->mValue;
+      case AudioTimelineEvent::SetValueCurve:
+        return ExtractValueFromCurve(aPrevious->template Time<TimeType>(),
+                                     aPrevious->mCurve, aPrevious->mCurveLength,
+                                     aPrevious->mDuration, aTime);
+      case AudioTimelineEvent::SetTarget:
+        MOZ_ASSERT(false, "unreached");
+      }
+      MOZ_ASSERT(false, "unreached");
+    }
+
+    // Finally, handle the case where we have both a previous and a next event
+
+    // First, handle the case where our range ends up in a ramp event
+    switch (aNext->mType) {
+    case AudioTimelineEvent::LinearRamp:
+      return LinearInterpolate(aPrevious->template Time<TimeType>(),
+                               aPrevious->mValue,
+                               aNext->template Time<TimeType>(),
+                               aNext->mValue, aTime);
+
+    case AudioTimelineEvent::ExponentialRamp:
+      return ExponentialInterpolate(aPrevious->template Time<TimeType>(),
+                                    aPrevious->mValue,
+                                    aNext->template Time<TimeType>(),
+                                    aNext->mValue, aTime);
+
+    case AudioTimelineEvent::SetValue:
+    case AudioTimelineEvent::SetTarget:
+    case AudioTimelineEvent::SetValueCurve:
+      break;
+    }
+
+    // Now handle all other cases
+    switch (aPrevious->mType) {
+    case AudioTimelineEvent::SetValue:
+    case AudioTimelineEvent::LinearRamp:
+    case AudioTimelineEvent::ExponentialRamp:
+      // If the next event type is neither linear or exponential ramp, the
+      // value is constant.
+      return aPrevious->mValue;
+    case AudioTimelineEvent::SetValueCurve:
+      return ExtractValueFromCurve(aPrevious->template Time<TimeType>(),
+                                   aPrevious->mCurve, aPrevious->mCurveLength,
+                                   aPrevious->mDuration, aTime);
+    case AudioTimelineEvent::SetTarget:
+      MOZ_ASSERT(false, "unreached");
+    }
+
+    MOZ_ASSERT(false, "unreached");
+    return 0.0f;
+  }
+
   const AudioTimelineEvent* GetPreviousEvent(double aTime) const
   {
     const AudioTimelineEvent* previous = nullptr;
@@ -579,4 +622,3 @@
 }
 
 #endif
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/AudioParamTimeline.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/AudioParamTimeline.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/AudioParamTimeline.h	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/AudioParamTimeline.h	2015-04-24 19:31:11.000000000 +0000
@@ -44,13 +44,26 @@
     return BaseClass::HasSimpleValue() && !mStream;
   }
 
+  template<class TimeType>
+  float GetValueAtTime(TimeType aTime)
+  {
+    return GetValueAtTime(aTime, 0);
+  }
+
   // Get the value of the AudioParam at time aTime + aCounter.
   // aCounter here is an offset to aTime if we try to get the value in ticks,
   // otherwise it should always be zero.  aCounter is meant to be used when
+  template<class TimeType>
+  float GetValueAtTime(TimeType aTime, size_t aCounter);
+
+  // Get the values of the AudioParam at time aTime + (0 to aSize).
+  // aBuffer must have the correct aSize.
+  // aSize here is an offset to aTime if we try to get the value in ticks,
+  // otherwise it should always be zero.  aSize is meant to be used when
   // getting the value of an a-rate AudioParam for each tick inside an
   // AudioNodeEngine implementation.
   template<class TimeType>
-  float GetValueAtTime(TimeType aTime, size_t aCounter = 0);
+  void GetValuesAtTime(TimeType aTime, float* aBuffer, const size_t aSize);
 
   virtual size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
   {
@@ -81,7 +94,6 @@
   return BaseClass::GetValueAtTime(aTime);
 }
 
-
 template<> inline float
 AudioParamTimeline::GetValueAtTime(int64_t aTime, size_t aCounter)
 {
@@ -93,8 +105,36 @@
     (mStream ? AudioNodeInputValue(aCounter) : 0.0f);
 }
 
+template<> inline void
+AudioParamTimeline::GetValuesAtTime(double aTime, float* aBuffer,
+                                    const size_t aSize)
+{
+  MOZ_ASSERT(aBuffer);
+  MOZ_ASSERT(aSize == 1);
+
+  // Getting an AudioParam value on an AudioNode does not consider input from
+  // other AudioNodes, which is managed only on the graph thread.
+  *aBuffer = BaseClass::GetValueAtTime(aTime);
+}
+
+template<> inline void
+AudioParamTimeline::GetValuesAtTime(int64_t aTime, float* aBuffer,
+                                    const size_t aSize)
+{
+  MOZ_ASSERT(aBuffer);
+  MOZ_ASSERT(aSize <= WEBAUDIO_BLOCK_SIZE);
+  MOZ_ASSERT(aSize == 1 || !HasSimpleValue());
+
+  // Mix the value of the AudioParam itself with that of the AudioNode inputs.
+  BaseClass::GetValuesAtTime(aTime, aBuffer, aSize);
+  if (mStream) {
+    for (size_t i = 0; i < aSize; ++i) {
+      aBuffer[i] += AudioNodeInputValue(i);
+    }
+  }
+}
+
 }
 }
 
 #endif
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/blink/Reverb.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/blink/Reverb.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/blink/Reverb.h	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/blink/Reverb.h	2015-04-24 19:31:11.000000000 +0000
@@ -41,9 +41,6 @@
 
 namespace WebCore {
 
-class DirectConvolver;
-class FFTConvolver;
-
 // Multi-channel convolution reverb with channel matrixing - one or more ReverbConvolver objects are used internally.
 
 class Reverb {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/DelayNode.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/DelayNode.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/DelayNode.cpp	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/DelayNode.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -83,7 +83,7 @@
     MOZ_ASSERT(mSource == aStream, "Invalid source stream");
     MOZ_ASSERT(aStream->SampleRate() == mDestination->SampleRate());
 
-    if (!aInput.IsNull()) {
+    if (!aInput.IsSilentOrSubnormal()) {
       if (mLeftOverData <= 0) {
         nsRefPtr<PlayingRefChanged> refchanged =
           new PlayingRefChanged(aStream, PlayingRefChanged::ADDREF);
@@ -137,9 +137,12 @@
       // If this DelayNode is in a cycle, make sure the delay value is at least
       // one block.
       StreamTime tick = mSource->GetCurrentPosition();
+      float values[WEBAUDIO_BLOCK_SIZE];
+      mDelay.GetValuesAtTime(tick, values,WEBAUDIO_BLOCK_SIZE);
+
       double computedDelay[WEBAUDIO_BLOCK_SIZE];
       for (size_t counter = 0; counter < WEBAUDIO_BLOCK_SIZE; ++counter) {
-        double delayAtTick = mDelay.GetValueAtTime(tick, counter) * sampleRate;
+        double delayAtTick = values[counter] * sampleRate;
         double delayAtTickClamped =
           std::max(minDelay, std::min(delayAtTick, maxDelay));
         computedDelay[counter] = delayAtTickClamped;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/GainNode.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/GainNode.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/GainNode.cpp	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/GainNode.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -84,11 +84,12 @@
       AllocateAudioBlock(aInput.mChannelData.Length(), aOutput);
 
       // Compute the gain values for the duration of the input AudioChunk
-      // XXX we need to add a method to AudioEventTimeline to compute this buffer directly.
+      StreamTime tick = aStream->GetCurrentPosition();
       float computedGain[WEBAUDIO_BLOCK_SIZE];
+      mGain.GetValuesAtTime(tick, computedGain, WEBAUDIO_BLOCK_SIZE);
+
       for (size_t counter = 0; counter < WEBAUDIO_BLOCK_SIZE; ++counter) {
-        StreamTime tick = aStream->GetCurrentPosition();
-        computedGain[counter] = mGain.GetValueAtTime(tick, counter) * aInput.mVolume;
+        computedGain[counter] *= aInput.mVolume;
       }
 
       // Apply the gain to the output buffer
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/StereoPannerNode.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/StereoPannerNode.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/StereoPannerNode.cpp	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/StereoPannerNode.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -145,15 +145,17 @@
       float computedGain[2][WEBAUDIO_BLOCK_SIZE];
       bool onLeft[WEBAUDIO_BLOCK_SIZE];
 
+      float values[WEBAUDIO_BLOCK_SIZE];
+      StreamTime tick = aStream->GetCurrentPosition();
+      mPan.GetValuesAtTime(tick, values, WEBAUDIO_BLOCK_SIZE);
+
       for (size_t counter = 0; counter < WEBAUDIO_BLOCK_SIZE; ++counter) {
-        StreamTime tick = aStream->GetCurrentPosition();
         float left, right;
-        float panning = mPan.GetValueAtTime(tick, counter);
-        GetGainValuesForPanning(panning, monoToStereo, left, right);
+        GetGainValuesForPanning(values[counter], monoToStereo, left, right);
 
         computedGain[0][counter] = left * aInput.mVolume;
         computedGain[1][counter] = right * aInput.mVolume;
-        onLeft[counter] = panning <= 0;
+        onLeft[counter] = values[counter] <= 0;
       }
 
       // Apply the gain to the output buffer
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/test/chrome.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/test/chrome.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/test/chrome.ini	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/test/chrome.ini	2015-04-24 19:31:11.000000000 +0000
@@ -2,4 +2,5 @@
 skip-if = buildapp == 'b2g'
 
 [test_AudioNodeDevtoolsAPI.html]
+[test_bug1027864.html]
 [test_AudioParamDevtoolsAPI.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/test/test_bug1027864.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/test/test_bug1027864.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webaudio/test/test_bug1027864.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webaudio/test/test_bug1027864.html	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test bug 1027864</title>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+Components.utils.import('resource://gre/modules/Services.jsm');
+SimpleTest.waitForExplicitFinish();
+
+function observer(subject, topic, data) {
+  var id = parseInt(data);
+  var index = ids.indexOf(id);
+  if (index != -1) {
+    ok(true, "Dropping id " + id + " at index " + index);
+    ids.splice(index, 1);
+    if (ids.length == 0) {
+      SimpleTest.executeSoon(function() {
+        SimpleTest.finish();
+      });
+    }
+  }
+}
+
+Services.obs.addObserver(observer, "webaudio-node-demise", false);
+
+SimpleTest.registerCleanupFunction(function() {
+  Services.obs.removeObserver(observer, "webaudio-node-demise");
+});
+
+var ac = new AudioContext();
+var ids;
+
+(function() {
+  var delay = ac.createDelay();
+  delay.delayTime.value = 0.03;
+
+  var gain = ac.createGain();
+  gain.gain.value = 0.6;
+
+  delay.connect(gain);
+  gain.connect(delay);
+
+  gain.connect(ac.destination);
+
+  var source = ac.createOscillator();
+
+  source.connect(gain);
+  source.start(ac.currentTime);
+  source.stop(ac.currentTime + 0.1);
+
+  ids = [ delay.id, gain.id, source.id ];
+})();
+
+setInterval(function() {
+  forceCC();
+}, 200);
+
+function forceCC() {
+  SpecialPowers.DOMWindowUtils.cycleCollect();
+  SpecialPowers.DOMWindowUtils.garbageCollect();
+}
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webm/IntelWebMVideoDecoder.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webm/IntelWebMVideoDecoder.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webm/IntelWebMVideoDecoder.cpp	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webm/IntelWebMVideoDecoder.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -156,7 +156,7 @@
 bool
 IntelWebMVideoDecoder::Demux(nsRefPtr<VP8Sample>& aSample, bool* aEOS)
 {
-  nsAutoRef<NesteggPacketHolder> holder(mReader->NextPacket(WebMReader::VIDEO));
+  nsRefPtr<NesteggPacketHolder> holder(mReader->NextPacket(WebMReader::VIDEO));
   if (!holder) {
     return false;
   }
@@ -185,13 +185,13 @@
   // end of the resource, use the file's duration as the end time of this
   // video frame.
   uint64_t next_tstamp = 0;
-  nsAutoRef<NesteggPacketHolder> next_holder(mReader->NextPacket(WebMReader::VIDEO));
+  nsRefPtr<NesteggPacketHolder> next_holder(mReader->NextPacket(WebMReader::VIDEO));
   if (next_holder) {
     r = nestegg_packet_tstamp(next_holder->mPacket, &next_tstamp);
     if (r == -1) {
       return false;
     }
-    mReader->PushVideoPacket(next_holder.disown());
+    mReader->PushVideoPacket(next_holder.forget());
   } else {
     next_tstamp = tstamp;
     next_tstamp += tstamp - mReader->GetLastVideoFrameTime();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.cpp	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -80,7 +80,7 @@
   // stats counters using the AutoNotifyDecoded stack-based class.
   AbstractMediaDecoder::AutoNotifyDecoded a(mReader->GetDecoder());
 
-  nsAutoRef<NesteggPacketHolder> holder(mReader->NextPacket(WebMReader::VIDEO));
+  nsRefPtr<NesteggPacketHolder> holder(mReader->NextPacket(WebMReader::VIDEO));
   if (!holder) {
     return false;
   }
@@ -109,13 +109,13 @@
   // end of the resource, use the file's duration as the end time of this
   // video frame.
   uint64_t next_tstamp = 0;
-  nsAutoRef<NesteggPacketHolder> next_holder(mReader->NextPacket(WebMReader::VIDEO));
+  nsRefPtr<NesteggPacketHolder> next_holder(mReader->NextPacket(WebMReader::VIDEO));
   if (next_holder) {
     r = nestegg_packet_tstamp(next_holder->mPacket, &next_tstamp);
     if (r == -1) {
       return false;
     }
-    mReader->PushVideoPacket(next_holder.disown());
+    mReader->PushVideoPacket(next_holder.forget());
   } else {
     next_tstamp = tstamp;
     next_tstamp += tstamp - mReader->GetLastVideoFrameTime();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webm/WebMBufferedParser.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webm/WebMBufferedParser.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webm/WebMBufferedParser.h	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webm/WebMBufferedParser.h	2015-04-24 19:31:11.000000000 +0000
@@ -12,10 +12,6 @@
 
 namespace mozilla {
 
-namespace dom {
-class TimeRanges;
-}
-
 // Stores a stream byte offset and the scaled timecode of the block at
 // that offset.
 struct WebMTimeDataOffset
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webm/WebMReader.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webm/WebMReader.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webm/WebMReader.cpp	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webm/WebMReader.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -867,7 +867,7 @@
   return true;
 }
 
-nsReturnRef<NesteggPacketHolder> WebMReader::NextPacket(TrackType aTrackType)
+already_AddRefed<NesteggPacketHolder> WebMReader::NextPacket(TrackType aTrackType)
 {
   // The packet queue that packets will be pushed on if they
   // are not the type we are interested in.
@@ -892,10 +892,10 @@
   // Value of other track
   uint32_t otherTrack = aTrackType == VIDEO ? mAudioTrack : mVideoTrack;
 
-  nsAutoRef<NesteggPacketHolder> holder;
+  nsRefPtr<NesteggPacketHolder> holder;
 
   if (packets.GetSize() > 0) {
-    holder.own(packets.PopFront());
+    holder = packets.PopFront();
   } else {
     // Keep reading packets until we find a packet
     // for the track we want.
@@ -903,20 +903,20 @@
       nestegg_packet* packet;
       int r = nestegg_read_packet(mContext, &packet);
       if (r <= 0) {
-        return nsReturnRef<NesteggPacketHolder>();
+        return nullptr;
       }
       int64_t offset = mDecoder->GetResource()->Tell();
-      holder.own(new NesteggPacketHolder(packet, offset));
+      holder = new NesteggPacketHolder(packet, offset);
 
       unsigned int track = 0;
       r = nestegg_packet_track(packet, &track);
       if (r == -1) {
-        return nsReturnRef<NesteggPacketHolder>();
+        return nullptr;
       }
 
       if (hasOtherType && otherTrack == track) {
         // Save the packet for when we want these packets
-        otherPackets.Push(holder.disown());
+        otherPackets.Push(holder.forget());
         continue;
       }
 
@@ -927,14 +927,14 @@
     } while (true);
   }
 
-  return holder.out();
+  return holder.forget();
 }
 
 bool WebMReader::DecodeAudioData()
 {
   MOZ_ASSERT(OnTaskQueue());
 
-  nsAutoRef<NesteggPacketHolder> holder(NextPacket(AUDIO));
+  nsRefPtr<NesteggPacketHolder> holder(NextPacket(AUDIO));
   if (!holder) {
     return false;
   }
@@ -947,7 +947,7 @@
   // Push the video frames to the aOutput which's timestamp is less
   // than aEndTime.
   while (true) {
-    nsAutoRef<NesteggPacketHolder> holder(NextPacket(VIDEO));
+    nsRefPtr<NesteggPacketHolder> holder(NextPacket(VIDEO));
     if (!holder) {
       break;
     }
@@ -958,10 +958,10 @@
     }
     uint64_t tstamp_usecs = tstamp / NS_PER_USEC;
     if (tstamp_usecs >= (uint64_t)aEndTime) {
-      PushVideoPacket(holder.disown());
+      PushVideoPacket(holder.forget());
       return true;
     } else {
-      aOutput.PushFront(holder.disown());
+      aOutput.PushFront(holder.forget());
     }
   }
 
@@ -984,7 +984,7 @@
   bool foundKeyframe = false;
   int64_t keyframeTime = -1;
   while (!foundKeyframe) {
-    nsAutoRef<NesteggPacketHolder> holder(NextPacket(VIDEO));
+    nsRefPtr<NesteggPacketHolder> holder(NextPacket(VIDEO));
     if (!holder) {
       break;
     }
@@ -1022,7 +1022,7 @@
         break;
       }
     }
-    skipPacketQueue.PushFront(holder.disown());
+    skipPacketQueue.PushFront(holder.forget());
   }
 
   uint32_t size = skipPacketQueue.GetSize();
@@ -1047,9 +1047,9 @@
   return mVideoDecoder->DecodeVideoFrame(aKeyframeSkip, aTimeThreshold);
 }
 
-void WebMReader::PushVideoPacket(NesteggPacketHolder* aItem)
+void WebMReader::PushVideoPacket(already_AddRefed<NesteggPacketHolder> aItem)
 {
-    mVideoPackets.PushFront(aItem);
+    mVideoPackets.PushFront(Move(aItem));
 }
 
 nsRefPtr<MediaDecoderReader::SeekPromise>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webm/WebMReader.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webm/WebMReader.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webm/WebMReader.h	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webm/WebMReader.h	2015-04-24 19:31:11.000000000 +0000
@@ -8,7 +8,6 @@
 
 #include <stdint.h>
 
-#include "nsDeque.h"
 #include "MediaDecoderReader.h"
 #include "nsAutoRef.h"
 #include "nestegg/nestegg.h"
@@ -32,81 +31,58 @@
 // to stop to buffer, given the current download rate.
 class NesteggPacketHolder {
 public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(NesteggPacketHolder)
   NesteggPacketHolder(nestegg_packet* aPacket, int64_t aOffset)
-    : mPacket(aPacket), mOffset(aOffset)
-  {
-    MOZ_COUNT_CTOR(NesteggPacketHolder);
-  }
-  ~NesteggPacketHolder() {
-    MOZ_COUNT_DTOR(NesteggPacketHolder);
-    nestegg_free_packet(mPacket);
-  }
+    : mPacket(aPacket), mOffset(aOffset) {}
+
   nestegg_packet* mPacket;
   // Offset in bytes. This is the offset of the end of the Block
   // which contains the packet.
   int64_t mOffset;
 private:
+  ~NesteggPacketHolder() {
+    nestegg_free_packet(mPacket);
+  }
+
   // Copy constructor and assignment operator not implemented. Don't use them!
   NesteggPacketHolder(const NesteggPacketHolder &aOther);
   NesteggPacketHolder& operator= (NesteggPacketHolder const& aOther);
 };
 
-template <>
-class nsAutoRefTraits<NesteggPacketHolder> : public nsPointerRefTraits<NesteggPacketHolder>
-{
-public:
-  static void Release(NesteggPacketHolder* aHolder) { delete aHolder; }
-};
-
 namespace mozilla {
 class WebMBufferedState;
 static const unsigned NS_PER_USEC = 1000;
 static const double NS_PER_S = 1e9;
 
-// Thread and type safe wrapper around nsDeque.
-class PacketQueueDeallocator : public nsDequeFunctor {
-  virtual void* operator() (void* aObject) {
-    delete static_cast<NesteggPacketHolder*>(aObject);
-    return nullptr;
-  }
-};
-
-// Typesafe queue for holding nestegg packets. It has
-// ownership of the items in the queue and will free them
-// when destroyed.
-class WebMPacketQueue : private nsDeque {
+// Queue for holding nestegg packets.
+class WebMPacketQueue {
  public:
-   WebMPacketQueue()
-     : nsDeque(new PacketQueueDeallocator())
-   {}
-
-  ~WebMPacketQueue() {
-    Reset();
-  }
-
-  inline int32_t GetSize() {
-    return nsDeque::GetSize();
+  int32_t GetSize() {
+    return mQueue.size();
   }
 
-  inline void Push(NesteggPacketHolder* aItem) {
-    NS_ASSERTION(aItem, "NULL pushed to WebMPacketQueue");
-    nsDeque::Push(aItem);
+  void Push(already_AddRefed<NesteggPacketHolder> aItem) {
+    mQueue.push_back(Move(aItem));
   }
 
-  inline void PushFront(NesteggPacketHolder* aItem) {
-    NS_ASSERTION(aItem, "NULL pushed to WebMPacketQueue");
-    nsDeque::PushFront(aItem);
+  void PushFront(already_AddRefed<NesteggPacketHolder> aItem) {
+    mQueue.push_front(Move(aItem));
   }
 
-  inline NesteggPacketHolder* PopFront() {
-    return static_cast<NesteggPacketHolder*>(nsDeque::PopFront());
+  already_AddRefed<NesteggPacketHolder> PopFront() {
+    nsRefPtr<NesteggPacketHolder> result = mQueue.front().forget();
+    mQueue.pop_front();
+    return result.forget();
   }
 
   void Reset() {
-    while (GetSize() > 0) {
-      delete PopFront();
+    while (!mQueue.empty()) {
+      mQueue.pop_front();
     }
   }
+
+private:
+  std::deque<nsRefPtr<NesteggPacketHolder>> mQueue;
 };
 
 class WebMReader;
@@ -175,10 +151,10 @@
   // Read a packet from the nestegg file. Returns nullptr if all packets for
   // the particular track have been read. Pass VIDEO or AUDIO to indicate the
   // type of the packet we want to read.
-  nsReturnRef<NesteggPacketHolder> NextPacket(TrackType aTrackType);
+  already_AddRefed<NesteggPacketHolder> NextPacket(TrackType aTrackType);
 
   // Pushes a packet to the front of the video packet queue.
-  virtual void PushVideoPacket(NesteggPacketHolder* aItem);
+  virtual void PushVideoPacket(already_AddRefed<NesteggPacketHolder> aItem);
 
   int GetVideoCodec();
   nsIntRect GetPicture();
@@ -245,7 +221,7 @@
   uint64_t mSeekPreroll; // Nanoseconds to discard after seeking.
 
   // Queue of video and audio packets that have been read but not decoded. These
-  // must only be accessed from the state machine thread.
+  // must only be accessed from the decode thread.
   WebMPacketQueue mVideoPackets;
   WebMPacketQueue mAudioPackets;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webrtc/MediaEngineDefault.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webrtc/MediaEngineDefault.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webrtc/MediaEngineDefault.h	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webrtc/MediaEngineDefault.h	2015-04-24 19:31:11.000000000 +0000
@@ -23,7 +23,6 @@
 
 namespace layers {
 class ImageContainer;
-class PlanarYCbCrImage;
 }
 
 class MediaEngineDefault;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/recognition/SpeechRecognition.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/recognition/SpeechRecognition.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/recognition/SpeechRecognition.h	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/recognition/SpeechRecognition.h	2015-04-24 19:31:11.000000000 +0000
@@ -31,8 +31,6 @@
 
 #include "mozilla/dom/SpeechRecognitionError.h"
 
-class nsIDOMWindow;
-
 namespace mozilla {
 
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -64,7 +64,7 @@
   MOZ_ASSERT(aActor);
   SpeechSynthesisRequestParent* actor =
     static_cast<SpeechSynthesisRequestParent*>(aActor);
-  nsSynthVoiceRegistry::GetInstance()->Speak(aText, aLang, aUri, aRate,
+  nsSynthVoiceRegistry::GetInstance()->Speak(aText, aLang, aUri, aVolume, aRate,
                                              aPitch, actor->mTask);
   return true;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/nsISpeechService.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/nsISpeechService.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/nsISpeechService.idl	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/nsISpeechService.idl	2015-04-24 19:31:11.000000000 +0000
@@ -134,7 +134,7 @@
  *    audio information is provided at setup(), and audio data is sent with
  *    sendAudio(). The utterance is terminated with an empty sendAudio().
  */
-[scriptable, uuid(3952d388-050c-47ba-a70f-5fc1cadf1db0)]
+[scriptable, uuid(9b7d59db-88ff-43d0-b6ee-9f63d042d08f)]
 interface nsISpeechService : nsISupports
 {
   /**
@@ -142,15 +142,16 @@
    * W3C Speech API spec for information about pitch and rate.
    * https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html#utterance-attributes
    *
-   * @param aText  text to utter.
-   * @param aUri   unique voice identifier.
-   * @param aRate  rate to speak voice in.
-   * @param aPitch pitch to speak voice in.
+   * @param aText   text to utter.
+   * @param aUri    unique voice identifier.
+   * @param aVolume volume to speak voice in. Only relevant for indirect audio.
+   * @param aRate   rate to speak voice in.
+   * @param aPitch  pitch to speak voice in.
    * @param aTask  task instance for utterance, used for sending events or audio
    *                 data back to browser.
    */
   void speak(in DOMString aText, in DOMString aUri,
-             in float aRate, in float aPitch,
+             in float aVolume, in float aRate, in float aPitch,
              in nsISpeechTask aTask);
 
   const SpeechServiceType SERVICETYPE_DIRECT_AUDIO = 1;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -539,7 +539,7 @@
   } else {
     task = new nsSpeechTask(&aUtterance);
     Speak(aUtterance.mText, lang, uri,
-          aUtterance.Rate(), aUtterance.Pitch(), task);
+          aUtterance.Volume(), aUtterance.Rate(), aUtterance.Pitch(), task);
   }
 
   return task.forget();
@@ -549,6 +549,7 @@
 nsSynthVoiceRegistry::Speak(const nsAString& aText,
                             const nsAString& aLang,
                             const nsAString& aUri,
+                            const float& aVolume,
                             const float& aRate,
                             const float& aPitch,
                             nsSpeechTask* aTask)
@@ -583,7 +584,7 @@
     aTask->BindStream(mStream);
   }
 
-  voice->mService->Speak(aText, voice->mUri, aRate, aPitch, aTask);
+  voice->mService->Speak(aText, voice->mUri, aVolume, aRate, aPitch, aTask);
 }
 
 } // namespace dom
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/nsSynthVoiceRegistry.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/nsSynthVoiceRegistry.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/nsSynthVoiceRegistry.h	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/nsSynthVoiceRegistry.h	2015-04-24 19:31:11.000000000 +0000
@@ -36,8 +36,8 @@
                                                 const nsAString& aDocLang);
 
   void Speak(const nsAString& aText, const nsAString& aLang,
-             const nsAString& aUri, const float& aRate, const float& aPitch,
-             nsSpeechTask* aTask);
+             const nsAString& aUri, const float& aVolume,  const float& aRate,
+             const float& aPitch, nsSpeechTask* aTask);
 
   void SendVoices(InfallibleTArray<RemoteVoice>* aVoices,
                   InfallibleTArray<nsString>* aDefaults);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/pico/nsPicoService.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/pico/nsPicoService.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/pico/nsPicoService.cpp	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/pico/nsPicoService.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -462,7 +462,8 @@
 
 NS_IMETHODIMP
 nsPicoService::Speak(const nsAString& aText, const nsAString& aUri,
-                     float aRate, float aPitch, nsISpeechTask* aTask)
+                     float aVolume, float aRate, float aPitch,
+                     nsISpeechTask* aTask)
 {
   NS_ENSURE_TRUE(mInitialized, NS_ERROR_NOT_AVAILABLE);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/test/common.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/test/common.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/webspeech/synth/test/common.js	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/webspeech/synth/test/common.js	2015-04-24 19:31:11.000000000 +0000
@@ -40,7 +40,7 @@
 
   serviceType: SpecialPowers.Ci.nsISpeechService.SERVICETYPE_DIRECT_AUDIO,
 
-  speak: function speak(aText, aUri, aRate, aPitch, aTask) {
+  speak: function speak(aText, aUri, aVolume, aRate, aPitch, aTask) {
     var task = SpecialPowers.wrap(aTask);
 
     window.setTimeout(
@@ -64,7 +64,7 @@
 var TestSpeechServiceNoAudio = SpecialPowers.wrapCallbackObject({
   serviceType: SpecialPowers.Ci.nsISpeechService.SERVICETYPE_INDIRECT_AUDIO,
 
-  speak: function speak(aText, aUri, aRate, aPitch, aTask) {
+  speak: function speak(aText, aUri, aVolume, aRate, aPitch, aTask) {
     var pair = this.expectedSpeaks.shift();
     if (pair) {
       // XXX: These tests do not happen in OOP
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/wmf/WMFReader.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/wmf/WMFReader.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/media/wmf/WMFReader.h	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/media/wmf/WMFReader.h	2015-04-24 19:31:11.000000000 +0000
@@ -18,10 +18,6 @@
 class WMFSourceReaderCallback;
 class DXVA2Manager;
 
-namespace dom {
-class TimeRanges;
-}
-
 // Decoder backend for reading H.264/AAC in MP4/M4A, and MP3 files using
 // Windows Media Foundation.
 class WMFReader : public MediaDecoderReader
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/mobileconnection/MobileNetworkInfo.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/mobileconnection/MobileNetworkInfo.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/mobileconnection/MobileNetworkInfo.h	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/mobileconnection/MobileNetworkInfo.h	2015-04-24 19:31:11.000000000 +0000
@@ -15,8 +15,6 @@
 namespace mozilla {
 namespace dom {
 
-class GlobalObject;
-
 class MobileNetworkInfo final : public nsIMobileNetworkInfo
                               , public nsWrapperCache
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/mobilemessage/ipc/SmsIPCService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/mobilemessage/ipc/SmsIPCService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/mobilemessage/ipc/SmsIPCService.h	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/mobilemessage/ipc/SmsIPCService.h	2015-04-24 19:31:11.000000000 +0000
@@ -16,8 +16,6 @@
 namespace dom {
 namespace mobilemessage {
 
-class PSmsChild;
-
 class SmsIPCService final : public nsISmsService
                           , public nsIMmsService
                           , public nsIMobileMessageDatabaseService
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/mobilemessage/MobileMessageCallback.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/mobilemessage/MobileMessageCallback.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/mobilemessage/MobileMessageCallback.h	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/mobilemessage/MobileMessageCallback.h	2015-04-24 19:31:11.000000000 +0000
@@ -10,8 +10,6 @@
 #include "nsCOMPtr.h"
 #include "DOMRequest.h"
 
-class nsIDOMMozMmsMessage;
-
 namespace mozilla {
 namespace dom {
 namespace mobilemessage {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/moz.build	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/moz.build	2015-04-24 19:31:11.000000000 +0000
@@ -26,6 +26,7 @@
     'storage',
     'json',
     'offline',
+    'push',
     'geolocation',
     'notification',
     'permission',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/network/TCPServerSocketParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/network/TCPServerSocketParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/network/TCPServerSocketParent.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/network/TCPServerSocketParent.h	2015-04-24 19:31:11.000000000 +0000
@@ -13,8 +13,6 @@
 namespace mozilla {
 namespace dom {
 
-class PBrowserParent;
-
 class TCPServerSocketParent : public mozilla::net::PTCPServerSocketParent
                             , public nsITCPServerSocketParent
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/network/TCPSocketParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/network/TCPSocketParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/network/TCPSocketParent.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/network/TCPSocketParent.h	2015-04-24 19:31:11.000000000 +0000
@@ -19,8 +19,6 @@
 namespace mozilla {
 namespace dom {
 
-class PBrowserParent;
-
 class TCPSocketParentBase : public nsITCPSocketParent
                           , public mozilla::net::DisconnectableParent
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/nfc/gonk/NfcService.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/nfc/gonk/NfcService.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/nfc/gonk/NfcService.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/nfc/gonk/NfcService.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -222,7 +222,7 @@
 class NfcEventRunnable : public nsRunnable
 {
 public:
-  NfcEventRunnable(NfcMessageHandler* aHandler, UnixSocketRawData* aData)
+  NfcEventRunnable(NfcMessageHandler* aHandler, UnixSocketBuffer* aData)
     : mHandler(aHandler), mData(aData)
   {
     MOZ_ASSERT(NS_IsMainThread());
@@ -255,7 +255,7 @@
 
 private:
   NfcMessageHandler* mHandler;
-  nsAutoPtr<UnixSocketRawData> mData;
+  nsAutoPtr<UnixSocketBuffer> mData;
 };
 
 NfcService::NfcService()
@@ -383,10 +383,11 @@
 }
 
 void
-NfcService::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aData)
+NfcService::ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer)
 {
   MOZ_ASSERT(mHandler);
-  nsCOMPtr<nsIRunnable> runnable = new NfcEventRunnable(mHandler, aData.forget());
+  nsCOMPtr<nsIRunnable> runnable =
+    new NfcEventRunnable(mHandler, aBuffer.forget());
   mThread->Dispatch(runnable, nsIEventTarget::DISPATCH_NORMAL);
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/nfc/gonk/NfcService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/nfc/gonk/NfcService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/nfc/gonk/NfcService.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/nfc/gonk/NfcService.h	2015-04-24 19:31:11.000000000 +0000
@@ -30,7 +30,7 @@
   void DispatchNfcEvent(const mozilla::dom::NfcEventOptions& aOptions);
 
   virtual void ReceiveSocketData(
-    nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aData) override;
+    nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aBuffer) override;
 
   virtual void OnConnectSuccess(enum SocketType aSocketType) override;
   virtual void OnConnectError(enum SocketType aSocketType) override;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/nfc/MozNDEFRecord.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/nfc/MozNDEFRecord.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/nfc/MozNDEFRecord.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/nfc/MozNDEFRecord.h	2015-04-24 19:31:11.000000000 +0000
@@ -21,7 +21,6 @@
 #include "js/GCAPI.h"
 #include "nsISupports.h"
 
-class nsIGlobalObject;
 struct JSContext;
 struct JSStructuredCloneWriter;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/offline/nsDOMOfflineResourceList.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/offline/nsDOMOfflineResourceList.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/offline/nsDOMOfflineResourceList.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/offline/nsDOMOfflineResourceList.h	2015-04-24 19:31:11.000000000 +0000
@@ -26,8 +26,6 @@
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/ErrorResult.h"
 
-class nsIDOMWindow;
-
 namespace mozilla {
 namespace dom {
 class DOMStringList;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/android/android_npapi.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/android/android_npapi.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/android/android_npapi.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/android/android_npapi.h	2015-04-24 19:31:11.000000000 +0000
@@ -87,7 +87,6 @@
 struct ANPMatrix;
 struct ANPPaint;
 struct ANPPath;
-struct ANPRegion;
 struct ANPTypeface;
 
 enum ANPMatrixFlags {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/nsJSNPRuntime.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/nsJSNPRuntime.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/nsJSNPRuntime.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/nsJSNPRuntime.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -213,6 +213,7 @@
     NPObjWrapper_SetProperty,
     nullptr,
     NPObjWrapper_Resolve,
+    nullptr,                                                /* mayResolve */
     NPObjWrapper_Convert,
     NPObjWrapper_Finalize,
     NPObjWrapper_Call,
@@ -265,7 +266,7 @@
   {
     "NPObject Ambiguous Member class", JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS,
     nullptr, nullptr, nullptr, nullptr,
-    nullptr, nullptr, NPObjectMember_Convert,
+    nullptr, nullptr, nullptr, NPObjectMember_Convert,
     NPObjectMember_Finalize, NPObjectMember_Call,
     nullptr, nullptr, NPObjectMember_Trace
   };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -1167,7 +1167,7 @@
     if (plugin)
       mLibrary = plugin->GetLibrary();
   }
-  operator bool() { return !!mLibrary; }
+  explicit operator bool() { return !!mLibrary; }
   PluginLibrary* operator->() { return mLibrary; }
 
 private:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/nsPluginHost.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/nsPluginHost.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/nsPluginHost.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/nsPluginHost.h	2015-04-24 19:31:11.000000000 +0000
@@ -41,7 +41,6 @@
 } // namespace plugins
 
 class nsNPAPIPlugin;
-class nsIComponentManager;
 class nsIFile;
 class nsIChannel;
 class nsPluginNativeWindow;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/nsPluginInstanceOwner.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/nsPluginInstanceOwner.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/nsPluginInstanceOwner.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/nsPluginInstanceOwner.h	2015-04-24 19:31:11.000000000 +0000
@@ -40,7 +40,6 @@
 using mozilla::widget::PuppetWidget;
 
 #ifdef MOZ_X11
-class gfxXlibSurface;
 #ifdef MOZ_WIDGET_QT
 #include "gfxQtNativeRenderer.h"
 #else
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/nsPluginTags.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/nsPluginTags.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/base/nsPluginTags.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/base/nsPluginTags.h	2015-04-24 19:31:11.000000000 +0000
@@ -15,7 +15,6 @@
 #include "nsITimer.h"
 #include "nsString.h"
 
-class nsPluginHost;
 struct PRLibrary;
 struct nsPluginInfo;
 class nsNPAPIPlugin;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/BrowserStreamParent.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/BrowserStreamParent.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/BrowserStreamParent.cpp	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/BrowserStreamParent.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -35,6 +35,7 @@
 
 BrowserStreamParent::~BrowserStreamParent()
 {
+  mStream->pdata = nullptr;
 }
 
 void
@@ -51,7 +52,6 @@
   PluginAsyncSurrogate* surrogate = mNPP->GetAsyncSurrogate();
   MOZ_ASSERT(surrogate);
   surrogate->AsyncCallArriving();
-  nsRefPtr<nsNPAPIPluginStreamListener> streamListener = mStreamListener.forget();
   if (mState == DEFERRING_DESTROY) {
     // We've been asked to destroy ourselves before init was complete.
     mState = DYING;
@@ -61,10 +61,10 @@
 
   NPError error = rv;
   if (error == NPERR_NO_ERROR) {
-    if (!streamListener) {
+    if (!mStreamListener) {
       return false;
     }
-    if (streamListener->SetStreamType(stype)) {
+    if (mStreamListener->SetStreamType(stype)) {
       mState = ALIVE;
     } else {
       error = NPERR_GENERIC_ERROR;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginInstanceChild.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginInstanceChild.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginInstanceChild.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginInstanceChild.h	2015-04-24 19:31:11.000000000 +0000
@@ -40,11 +40,6 @@
 class gfxASurface;
 
 namespace mozilla {
-
-namespace layers {
-struct RemoteImageData;
-}
-
 namespace plugins {
 
 class PBrowserStreamChild;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginInstanceParent.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginInstanceParent.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginInstanceParent.cpp	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginInstanceParent.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -1419,6 +1419,12 @@
                       FULLFUNCTION, (void*) stream, (int) reason));
 
     AStream* s = static_cast<AStream*>(stream->pdata);
+    if (!s) {
+        // The stream has already been deleted by other means.
+        // With async plugin init this could happen if async NPP_NewStream
+        // returns an error code.
+        return NPERR_NO_ERROR;
+    }
     if (s->IsBrowserStream()) {
         BrowserStreamParent* sp =
             static_cast<BrowserStreamParent*>(s);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginInstanceParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginInstanceParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginInstanceParent.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginInstanceParent.h	2015-04-24 19:31:11.000000000 +0000
@@ -24,9 +24,6 @@
 #include "nsRect.h"
 #include "PluginDataResolver.h"
 
-#ifdef MOZ_X11
-class gfxXlibSurface;
-#endif
 #include "mozilla/unused.h"
 
 class gfxASurface;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginModuleChild.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginModuleChild.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginModuleChild.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginModuleChild.h	2015-04-24 19:31:11.000000000 +0000
@@ -57,7 +57,6 @@
 static const int kNestedLoopDetectorIntervalMs = 90;
 #endif
 
-class PluginScriptableObjectChild;
 class PluginInstanceChild;
 
 class PluginModuleChild : public PPluginModuleChild
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginModuleParent.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginModuleParent.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginModuleParent.cpp	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginModuleParent.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -1112,24 +1112,17 @@
     }
 }
 
-#ifdef MOZ_CRASHREPORTER_INJECTOR
+#ifdef MOZ_CRASHREPORTER
 static bool
-CreateFlashMinidump(DWORD processId, ThreadId childThread,
-                    nsIFile* parentMinidump, const nsACString& name)
+CreatePluginMinidump(base::ProcessId processId, ThreadId childThread,
+                     nsIFile* parentMinidump, const nsACString& name)
 {
-  if (processId == 0) {
-    return false;
-  }
-
-  base::ProcessHandle handle;
-  if (!base::OpenPrivilegedProcessHandle(processId, &handle)) {
+  mozilla::ipc::ScopedProcessHandle handle;
+  if (processId == 0 ||
+      !base::OpenPrivilegedProcessHandle(processId, &handle.rwget())) {
     return false;
   }
-
-  bool res = CreateAdditionalChildMinidump(handle, 0, parentMinidump, name);
-  base::CloseProcessHandle(handle);
-
-  return res;
+  return CreateAdditionalChildMinidump(handle, 0, parentMinidump, name);
 }
 #endif
 
@@ -1201,32 +1194,37 @@
         }
     }
 #endif // XP_WIN
+    // Generate base report, includes plugin and browser process minidumps.
     if (crashReporter->GeneratePairedMinidump(this)) {
         mPluginDumpID = crashReporter->ChildDumpID();
         PLUGIN_LOG_DEBUG(
                 ("generated paired browser/plugin minidumps: %s)",
                  NS_ConvertUTF16toUTF8(mPluginDumpID).get()));
-
         nsAutoCString additionalDumps("browser");
-
-#ifdef MOZ_CRASHREPORTER_INJECTOR
         nsCOMPtr<nsIFile> pluginDumpFile;
-
         if (GetMinidumpForID(mPluginDumpID, getter_AddRefs(pluginDumpFile)) &&
             pluginDumpFile) {
-          nsCOMPtr<nsIFile> childDumpFile;
-
-          if (CreateFlashMinidump(mFlashProcess1, 0, pluginDumpFile,
-                                  NS_LITERAL_CSTRING("flash1"))) {
-            additionalDumps.AppendLiteral(",flash1");
-          }
-          if (CreateFlashMinidump(mFlashProcess2, 0, pluginDumpFile,
-                                  NS_LITERAL_CSTRING("flash2"))) {
-            additionalDumps.AppendLiteral(",flash2");
-          }
-        }
+#ifdef MOZ_CRASHREPORTER_INJECTOR
+            // If we have handles to the flash sandbox processes on Windows,
+            // include those minidumps as well.
+            if (CreatePluginMinidump(mFlashProcess1, 0, pluginDumpFile,
+                                     NS_LITERAL_CSTRING("flash1"))) {
+                additionalDumps.AppendLiteral(",flash1");
+            }
+            if (CreatePluginMinidump(mFlashProcess2, 0, pluginDumpFile,
+                                     NS_LITERAL_CSTRING("flash2"))) {
+                additionalDumps.AppendLiteral(",flash2");
+            }
 #endif
-
+            if (mContentParent) {
+                // Include the content process minidump
+                if (CreatePluginMinidump(mContentParent->OtherPid(), 0,
+                                         pluginDumpFile,
+                                         NS_LITERAL_CSTRING("content"))) {
+                    additionalDumps.AppendLiteral(",content");
+                }
+            }
+        }
         crashReporter->AnnotateCrashReport(
             NS_LITERAL_CSTRING("additional_minidumps"),
             additionalDumps);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginScriptableObjectParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginScriptableObjectParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginScriptableObjectParent.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginScriptableObjectParent.h	2015-04-24 19:31:11.000000000 +0000
@@ -16,7 +16,6 @@
 namespace mozilla {
 namespace plugins {
 
-class PluginAsyncSurrogate;
 class PluginInstanceParent;
 class PluginScriptableObjectParent;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginScriptableObjectUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginScriptableObjectUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/ipc/PluginScriptableObjectUtils.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/ipc/PluginScriptableObjectUtils.h	2015-04-24 19:31:11.000000000 +0000
@@ -277,7 +277,7 @@
     return mActor;
   }
 
-  operator bool()
+  explicit operator bool()
   {
     return !!mActor;
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/test/testplugin/nptest.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/test/testplugin/nptest.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/plugins/test/testplugin/nptest.cpp	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/plugins/test/testplugin/nptest.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -36,6 +36,7 @@
 #include "nptest_utils.h"
 #include "nptest_platform.h"
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/IntentionalCrash.h"
 
 #include <stdlib.h>
@@ -61,9 +62,6 @@
 using namespace std;
 
 #define PLUGIN_VERSION     "1.0.0.0"
-#define ARRAY_LENGTH(a) (sizeof(a)/sizeof(a[0]))
-#define STATIC_ASSERT(condition)                                \
-    extern void np_static_assert(int arg[(condition) ? 1 : -1])
 
 extern const char *sPluginName;
 extern const char *sPluginDescription;
@@ -237,7 +235,7 @@
   "queryContentsScaleFactor",
   "echoString",
 };
-static NPIdentifier sPluginMethodIdentifiers[ARRAY_LENGTH(sPluginMethodIdentifierNames)];
+static NPIdentifier sPluginMethodIdentifiers[MOZ_ARRAY_LENGTH(sPluginMethodIdentifierNames)];
 static const ScriptableFunction sPluginMethodFunctions[] = {
   npnEvaluateTest,
   npnInvokeTest,
@@ -305,14 +303,15 @@
   echoString,
 };
 
-STATIC_ASSERT(ARRAY_LENGTH(sPluginMethodIdentifierNames) ==
-              ARRAY_LENGTH(sPluginMethodFunctions));
+static_assert(MOZ_ARRAY_LENGTH(sPluginMethodIdentifierNames) ==
+              MOZ_ARRAY_LENGTH(sPluginMethodFunctions),
+              "Arrays should have the same size");
 
 static const NPUTF8* sPluginPropertyIdentifierNames[] = {
   "propertyAndMethod"
 };
-static NPIdentifier sPluginPropertyIdentifiers[ARRAY_LENGTH(sPluginPropertyIdentifierNames)];
-static NPVariant sPluginPropertyValues[ARRAY_LENGTH(sPluginPropertyIdentifierNames)];
+static NPIdentifier sPluginPropertyIdentifiers[MOZ_ARRAY_LENGTH(sPluginPropertyIdentifierNames)];
+static NPVariant sPluginPropertyValues[MOZ_ARRAY_LENGTH(sPluginPropertyIdentifierNames)];
 
 struct URLNotifyData
 {
@@ -389,9 +388,9 @@
 {
   if (!sIdentifiersInitialized) {
     NPN_GetStringIdentifiers(sPluginMethodIdentifierNames,
-        ARRAY_LENGTH(sPluginMethodIdentifierNames), sPluginMethodIdentifiers);
+        MOZ_ARRAY_LENGTH(sPluginMethodIdentifierNames), sPluginMethodIdentifiers);
     NPN_GetStringIdentifiers(sPluginPropertyIdentifierNames,
-        ARRAY_LENGTH(sPluginPropertyIdentifierNames), sPluginPropertyIdentifiers);
+        MOZ_ARRAY_LENGTH(sPluginPropertyIdentifierNames), sPluginPropertyIdentifiers);
 
     sIdentifiersInitialized = true;
 
@@ -405,9 +404,9 @@
 static void clearIdentifiers()
 {
   memset(sPluginMethodIdentifiers, 0,
-      ARRAY_LENGTH(sPluginMethodIdentifiers) * sizeof(NPIdentifier));
+      MOZ_ARRAY_LENGTH(sPluginMethodIdentifiers) * sizeof(NPIdentifier));
   memset(sPluginPropertyIdentifiers, 0,
-      ARRAY_LENGTH(sPluginPropertyIdentifiers) * sizeof(NPIdentifier));
+      MOZ_ARRAY_LENGTH(sPluginPropertyIdentifiers) * sizeof(NPIdentifier));
 
   sIdentifiersInitialized = false;
 }
@@ -686,7 +685,7 @@
 
   initializeIdentifiers();
 
-  for (unsigned int i = 0; i < ARRAY_LENGTH(sPluginPropertyValues); i++) {
+  for (unsigned int i = 0; i < MOZ_ARRAY_LENGTH(sPluginPropertyValues); i++) {
     VOID_TO_NPVARIANT(sPluginPropertyValues[i]);
   }
 
@@ -737,7 +736,7 @@
 {
   clearIdentifiers();
 
-  for (unsigned int i = 0; i < ARRAY_LENGTH(sPluginPropertyValues); i++) {
+  for (unsigned int i = 0; i < MOZ_ARRAY_LENGTH(sPluginPropertyValues); i++) {
     NPN_ReleaseVariantValue(&sPluginPropertyValues[i]);
   }
 
@@ -1852,7 +1851,7 @@
 bool
 scriptableHasMethod(NPObject* npobj, NPIdentifier name)
 {
-  for (int i = 0; i < int(ARRAY_LENGTH(sPluginMethodIdentifiers)); i++) {
+  for (int i = 0; i < int(MOZ_ARRAY_LENGTH(sPluginMethodIdentifiers)); i++) {
     if (name == sPluginMethodIdentifiers[i])
       return true;
   }
@@ -1878,7 +1877,7 @@
     return false;
   }
 
-  for (int i = 0; i < int(ARRAY_LENGTH(sPluginMethodIdentifiers)); i++) {
+  for (int i = 0; i < int(MOZ_ARRAY_LENGTH(sPluginMethodIdentifiers)); i++) {
     if (name == sPluginMethodIdentifiers[i])
       return sPluginMethodFunctions[i](npobj, args, argCount, result);
   }
@@ -1947,7 +1946,7 @@
       Crash();
     }
   }
-  for (int i = 0; i < int(ARRAY_LENGTH(sPluginPropertyIdentifiers)); i++) {
+  for (int i = 0; i < int(MOZ_ARRAY_LENGTH(sPluginPropertyIdentifiers)); i++) {
     if (name == sPluginPropertyIdentifiers[i]) {
       return true;
     }
@@ -1958,7 +1957,7 @@
 bool
 scriptableGetProperty(NPObject* npobj, NPIdentifier name, NPVariant* result)
 {
-  for (int i = 0; i < int(ARRAY_LENGTH(sPluginPropertyIdentifiers)); i++) {
+  for (int i = 0; i < int(MOZ_ARRAY_LENGTH(sPluginPropertyIdentifiers)); i++) {
     if (name == sPluginPropertyIdentifiers[i]) {
       DuplicateNPVariant(*result, sPluginPropertyValues[i]);
       return true;
@@ -1970,7 +1969,7 @@
 bool
 scriptableSetProperty(NPObject* npobj, NPIdentifier name, const NPVariant* value)
 {
-  for (int i = 0; i < int(ARRAY_LENGTH(sPluginPropertyIdentifiers)); i++) {
+  for (int i = 0; i < int(MOZ_ARRAY_LENGTH(sPluginPropertyIdentifiers)); i++) {
     if (name == sPluginPropertyIdentifiers[i]) {
       NPN_ReleaseVariantValue(&sPluginPropertyValues[i]);
       DuplicateNPVariant(sPluginPropertyValues[i], *value);
@@ -1983,7 +1982,7 @@
 bool
 scriptableRemoveProperty(NPObject* npobj, NPIdentifier name)
 {
-  for (int i = 0; i < int(ARRAY_LENGTH(sPluginPropertyIdentifiers)); i++) {
+  for (int i = 0; i < int(MOZ_ARRAY_LENGTH(sPluginPropertyIdentifiers)); i++) {
     if (name == sPluginPropertyIdentifiers[i]) {
       NPN_ReleaseVariantValue(&sPluginPropertyValues[i]);
 
@@ -1999,14 +1998,14 @@
 bool
 scriptableEnumerate(NPObject* npobj, NPIdentifier** identifier, uint32_t* count)
 {
-  const int bufsize = sizeof(NPIdentifier) * ARRAY_LENGTH(sPluginMethodIdentifierNames);
+  const int bufsize = sizeof(NPIdentifier) * MOZ_ARRAY_LENGTH(sPluginMethodIdentifierNames);
   NPIdentifier* ids = (NPIdentifier*) NPN_MemAlloc(bufsize);
   if (!ids)
     return false;
 
   memcpy(ids, sPluginMethodIdentifiers, bufsize);
   *identifier = ids;
-  *count = ARRAY_LENGTH(sPluginMethodIdentifierNames);
+  *count = MOZ_ARRAY_LENGTH(sPluginMethodIdentifierNames);
   return true;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/moz.build	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/moz.build	2015-04-24 19:31:11.000000000 +0000
@@ -6,13 +6,17 @@
 EXTRA_COMPONENTS += [
     'Push.js',
     'Push.manifest',
-    'PushServiceLauncher.js',
+    'PushNotificationService.js',
 ]
 
-EXTRA_JS_MODULES += [
+EXTRA_PP_JS_MODULES += [
     'PushService.jsm',
 ]
 
 MOCHITEST_MANIFESTS += [
     'test/mochitest.ini',
 ]
+
+XPCSHELL_TESTS_MANIFESTS += [
+    'test/xpcshell/xpcshell.ini',
+]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/Push.manifest thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/Push.manifest
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/Push.manifest	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/Push.manifest	2015-04-24 19:31:11.000000000 +0000
@@ -5,7 +5,10 @@
 component {CA86B665-BEDA-4212-8D0F-5C9F65270B58} Push.js
 contract @mozilla.org/push/PushSubscription;1 {CA86B665-BEDA-4212-8D0F-5C9F65270B58}
 
-# Component to initialize PushService on startup.
-component {4b8caa3b-3c58-4f3c-a7f5-7bd9cb24c11d} PushServiceLauncher.js
-contract @mozilla.org/push/ServiceLauncher;1 {4b8caa3b-3c58-4f3c-a7f5-7bd9cb24c11d}
-category app-startup PushServiceLauncher @mozilla.org/push/ServiceLauncher;1
+# XPCOM component; initializes the PushService on startup.
+component {32028e38-903b-4a64-a180-5857eb4cb3dd} PushNotificationService.js
+contract @mozilla.org/push/NotificationService;1 {32028e38-903b-4a64-a180-5857eb4cb3dd}
+category app-startup PushNotificationService @mozilla.org/push/NotificationService;1
+
+component {66a87970-6dc9-46e0-ac61-adb4a13791de} PushNotificationService.js
+contract @mozilla.org/push/ObserverNotification;1 {66a87970-6dc9-46e0-ac61-adb4a13791de}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/PushNotificationService.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/PushNotificationService.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/PushNotificationService.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/PushNotificationService.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,85 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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";
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+const Cr = Components.results;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+let isParent = Cc["@mozilla.org/xre/runtime;1"]
+                 .getService(Ci.nsIXULRuntime)
+                 .processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
+
+XPCOMUtils.defineLazyGetter(this, "PushService", function() {
+  // Lazily initialize the PushService on
+  // `sessionstore-windows-restored` or first use.
+  const {PushService} = Cu.import("resource://gre/modules/PushService.jsm", {});
+  if (isParent) {
+    PushService.init();
+  }
+  return PushService;
+});
+
+this.PushNotificationService = function PushNotificationService() {};
+
+PushNotificationService.prototype = {
+  classID: Components.ID("{32028e38-903b-4a64-a180-5857eb4cb3dd}"),
+
+  contractID: "@mozilla.org/push/NotificationService;1",
+
+  _xpcom_factory: XPCOMUtils.generateSingletonFactory(PushNotificationService),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
+                                         Ci.nsISupportsWeakReference,
+                                         Ci.nsIPushNotificationService]),
+
+  register: function register(scope, pageURL) {
+    return PushService._register({scope, pageURL});
+  },
+
+  unregister: function unregister(scope) {
+    return PushService._unregister({scope});
+  },
+
+  registration: function registration(scope) {
+    return PushService._registration({scope});
+  },
+
+  clearAll: function clearAll() {
+    return PushService._clearAll();
+  },
+
+  observe: function observe(subject, topic, data) {
+    switch (topic) {
+      case "app-startup":
+        Services.obs.addObserver(this, "sessionstore-windows-restored", true);
+        break;
+      case "sessionstore-windows-restored":
+        Services.obs.removeObserver(this, "sessionstore-windows-restored");
+        if (isParent) {
+          PushService.init();
+        }
+        break;
+    }
+  }
+};
+
+this.PushObserverNotification = function PushObserverNotification() {};
+
+PushObserverNotification.prototype = {
+  classID: Components.ID("{66a87970-6dc9-46e0-ac61-adb4a13791de}"),
+
+  contractID: "@mozilla.org/push/ObserverNotification;1",
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIPushObserverNotification])
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
+  PushNotificationService,
+  PushObserverNotification
+]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/PushService.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/PushService.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/PushService.jsm	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/PushService.jsm	2015-04-24 19:31:11.000000000 +0000
@@ -33,9 +33,11 @@
 XPCOMUtils.defineLazyModuleGetter(this, "AlarmService",
                                   "resource://gre/modules/AlarmService.jsm");
 
+#ifdef MOZ_B2G
 XPCOMUtils.defineLazyServiceGetter(this, "gPowerManagerService",
                                    "@mozilla.org/power/powermanagerservice;1",
                                    "nsIPowerManagerService");
+#endif
 
 var threadManager = Cc["@mozilla.org/thread-manager;1"].getService(Ci.nsIThreadManager);
 
@@ -133,6 +135,19 @@
     );
   },
 
+  clearAll: function clear(aSuccessCb, aErrorCb) {
+    this.newTxn(
+      "readwrite",
+      kPUSHDB_STORE_NAME,
+      function (aTxn, aStore) {
+        debug("Going to clear all!");
+        aStore.clear();
+      },
+      aSuccessCb,
+      aErrorCb
+    );
+  },
+
   getByPushEndpoint: function(aPushEndpoint, aSuccessCb, aErrorCb) {
     debug("getByPushEndpoint()");
 
@@ -217,8 +232,8 @@
       function txnCb(aTxn, aStore) {
         aStore.clear();
       },
-      aSuccessCb(),
-      aErrorCb()
+      aSuccessCb,
+      aErrorCb
     );
   }
 };
@@ -294,6 +309,7 @@
        */
       case "xpcom-shutdown":
         this.uninit();
+        break;
       case "network-active-changed":         /* On B2G. */
       case "network:offline-status-changed": /* On desktop. */
         // In case of network-active-changed, always disconnect existing
@@ -348,9 +364,12 @@
                 .deferred.reject({status: 0, error: "TimeoutError"});
 
               delete this._pendingRequests[channelID];
-              for (let i = this._requestQueue.length - 1; i >= 0; --i)
-                if (this._requestQueue[i].channelID == channelID)
+              for (let i = this._requestQueue.length - 1; i >= 0; --i) {
+                let [, data] = this._requestQueue[i];
+                if (data && data.channelID == channelID) {
                   this._requestQueue.splice(i, 1);
+                }
+              }
             }
           }
 
@@ -491,16 +510,42 @@
     this._ws.sendMsg(msg);
   },
 
-  init: function() {
+  init: function(options = {}) {
     debug("init()");
+    if (this._started) {
+      return;
+    }
+
+    // Override the backing store for testing.
+    this._db = options.db;
+    if (!this._db) {
+      this._db = new PushDB();
+    }
+
+    // Override the default WebSocket factory function. The returned object
+    // must be null or satisfy the nsIWebSocketChannel interface. Used by
+    // the tests to provide a mock WebSocket implementation.
+    if (options.makeWebSocket) {
+      this._makeWebSocket = options.makeWebSocket;
+    }
+
+    // Override the default UDP socket factory function. The returned object
+    // must be null or satisfy the nsIUDPSocket interface. Used by the
+    // UDP tests.
+    if (options.makeUDPSocket) {
+      this._makeUDPSocket = options.makeUDPSocket;
+    }
+
+    this._networkInfo = options.networkInfo;
+    if (!this._networkInfo) {
+      this._networkInfo = PushNetworkInfo;
+    }
 
     var globalMM = Cc["@mozilla.org/globalmessagemanager;1"]
                .getService(Ci.nsIFrameScriptLoader);
 
     globalMM.loadFrameScript("chrome://global/content/PushServiceChildPreload.js", true);
 
-    this._db = new PushDB();
-
     let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"]
                  .getService(Ci.nsIMessageBroadcaster);
 
@@ -537,7 +582,8 @@
     // On B2G both events fire, one after the other, when the network goes
     // online, so we explicitly check for the presence of NetworkManager and
     // don't add an observer for offline-status-changed on B2G.
-    Services.obs.addObserver(this, this._getNetworkStateChangeEventName(), false);
+    this._networkStateChangeEventName = this._networkInfo.getNetworkStateChangeEventName();
+    Services.obs.addObserver(this, this._networkStateChangeEventName, false);
 
     // This is only used for testing. Different tests require connecting to
     // slightly different URLs.
@@ -564,6 +610,7 @@
 
     this._waitingForPong = false;
     this._stopAlarm();
+    this._cancelPendingRequests();
   },
 
   uninit: function() {
@@ -575,7 +622,7 @@
     prefs.ignore("debug", this);
     prefs.ignore("connection.enabled", this);
     prefs.ignore("serverURL", this);
-    Services.obs.removeObserver(this, this._getNetworkStateChangeEventName());
+    Services.obs.removeObserver(this, this._networkStateChangeEventName);
     Services.obs.removeObserver(this, "webapps-clear-data", false);
     Services.obs.removeObserver(this, "xpcom-shutdown", false);
 
@@ -603,6 +650,7 @@
       this._requestTimeoutTimer.cancel();
     }
 
+    this._started = false;
     debug("shutdown complete!");
   },
 
@@ -688,7 +736,7 @@
     }
 
     // Save actual state of the network
-    let ns = this._getNetworkInformation();
+    let ns = this._networkInfo.getNetworkInformation();
 
     if (ns.ip) {
       // mobile
@@ -806,27 +854,7 @@
     }
   },
 
-  _beginWSSetup: function() {
-    debug("beginWSSetup()");
-    if (this._currentState != STATE_SHUT_DOWN) {
-      debug("_beginWSSetup: Not in shutdown state! Current state " +
-            this._currentState);
-      return;
-    }
-
-    if (!prefs.get("connection.enabled")) {
-      debug("_beginWSSetup: connection.enabled is not set to true. Aborting.");
-      return;
-    }
-
-    // Stop any pending reconnects scheduled for the near future.
-    this._stopAlarm();
-
-    if (Services.io.offline) {
-      debug("Network is offline.");
-      return;
-    }
-
+  _getServerURI: function() {
     let serverURL = prefs.get("serverURL");
     if (!serverURL) {
       debug("No dom.push.serverURL found!");
@@ -841,25 +869,67 @@
             serverURL + ")");
       return;
     }
+    return uri;
+  },
 
-    if (uri.scheme === "wss") {
-      this._ws = Cc["@mozilla.org/network/protocol;1?name=wss"]
-                   .createInstance(Ci.nsIWebSocketChannel);
+  _makeWebSocket: function(uri) {
+    if (!prefs.get("connection.enabled")) {
+      debug("_makeWebSocket: connection.enabled is not set to true. Aborting.");
+      return null;
+    }
 
-      this._ws.initLoadInfo(null, // aLoadingNode
-                            Services.scriptSecurityManager.getSystemPrincipal(),
-                            null, // aTriggeringPrincipal
-                            Ci.nsILoadInfo.SEC_NORMAL,
-                            Ci.nsIContentPolicy.TYPE_WEBSOCKET);
+    if (Services.io.offline) {
+      debug("Network is offline.");
+      return null;
+    }
+
+    let socket;
+    if (uri.scheme === "wss") {
+      socket = Cc["@mozilla.org/network/protocol;1?name=wss"]
+                 .createInstance(Ci.nsIWebSocketChannel);
     }
     else if (uri.scheme === "ws") {
-      debug("Push over an insecure connection (ws://) is not allowed!");
-      return;
+      if (uri.host != "localhost") {
+        debug("Push over an insecure connection (ws://) is not allowed!");
+        return null;
+      }
+      socket = Cc["@mozilla.org/network/protocol;1?name=ws"]
+                 .createInstance(Ci.nsIWebSocketChannel);
     }
     else {
       debug("Unsupported websocket scheme " + uri.scheme);
+      return null;
+    }
+
+    socket.initLoadInfo(null, // aLoadingNode
+                        Services.scriptSecurityManager.getSystemPrincipal(),
+                        null, // aTriggeringPrincipal
+                        Ci.nsILoadInfo.SEC_NORMAL,
+                        Ci.nsIContentPolicy.TYPE_WEBSOCKET);
+
+    return socket;
+  },
+
+  _beginWSSetup: function() {
+    debug("beginWSSetup()");
+    if (this._currentState != STATE_SHUT_DOWN) {
+      debug("_beginWSSetup: Not in shutdown state! Current state " +
+            this._currentState);
+      return;
+    }
+
+    // Stop any pending reconnects scheduled for the near future.
+    this._stopAlarm();
+
+    let uri = this._getServerURI();
+    if (!uri) {
+      return;
+    }
+    let socket = this._makeWebSocket(uri);
+    if (!socket) {
       return;
     }
+    this._ws = socket.QueryInterface(Ci.nsIWebSocketChannel);
 
     debug("serverURL: " + uri.spec);
     this._wsListener = new PushWebSocketListener(this);
@@ -868,7 +938,7 @@
     try {
       // Grab a wakelock before we open the socket to ensure we don't go to sleep
       // before connection the is opened.
-      this._ws.asyncOpen(uri, serverURL, this._wsListener, null);
+      this._ws.asyncOpen(uri, uri.spec, this._wsListener, null);
       this._acquireWakeLock();
       this._currentState = STATE_WAITING_FOR_WS_START;
     } catch(e) {
@@ -880,6 +950,10 @@
 
   _startListeningIfChannelsPresent: function() {
     // Check to see if we need to do anything.
+    if (this._requestQueue.length > 0) {
+      this._beginWSSetup();
+      return;
+    }
     this._db.getAllChannelIDs(function(channelIDs) {
       if (channelIDs.length > 0) {
         this._beginWSSetup();
@@ -999,6 +1073,8 @@
   },
 
   _acquireWakeLock: function() {
+#ifdef MOZ_B2G
+    // Disable the wake lock on non-B2G platforms to work around bug 1154492.
     if (!this._socketWakeLock) {
       debug("Acquiring Socket Wakelock");
       this._socketWakeLock = gPowerManagerService.newWakeLock("cpu");
@@ -1016,10 +1092,12 @@
                         // timers can be a little off and we don't want to go
                         // to sleep just as the socket connected.
                         this._requestTimeout + 1000,
-                        Ci.nsITimer.ONE_SHOT);
+                        Ci.nsITimer.TYPE_ONE_SHOT);
+#endif
   },
 
   _releaseWakeLock: function() {
+#ifdef MOZ_B2G
     debug("Releasing Socket WakeLock");
     if (this._socketWakeLockTimer) {
       this._socketWakeLockTimer.cancel();
@@ -1028,6 +1106,7 @@
       this._socketWakeLock.unlock();
       this._socketWakeLock = null;
     }
+#endif
   },
 
   /**
@@ -1163,11 +1242,9 @@
     debug("sendRequest() " + action);
     if (typeof data.channelID !== "string") {
       debug("Received non-string channelID");
-      return Promise.reject("Received non-string channelID");
+      return Promise.reject({error: "Received non-string channelID"});
     }
 
-    let deferred = Promise.defer();
-
     if (Object.keys(this._pendingRequests).length == 0) {
       // start the timer since we now have at least one request
       if (!this._requestTimeoutTimer)
@@ -1178,8 +1255,18 @@
                                      Ci.nsITimer.TYPE_REPEATING_SLACK);
     }
 
-    this._pendingRequests[data.channelID] = { deferred: deferred,
-                                              ctime: Date.now() };
+    let deferred;
+    let request = this._pendingRequests[data.channelID];
+    if (request) {
+      // If a request is already pending for this channel ID, assume it's a
+      // retry. Use the existing deferred, but update the send time and re-send
+      // the request.
+      deferred = request.deferred;
+    } else {
+      deferred = Promise.defer();
+      request = this._pendingRequests[data.channelID] = {deferred};
+    }
+    request.ctime = Date.now();
 
     this._send(action, data);
     return deferred.promise;
@@ -1201,6 +1288,11 @@
     }
 
     if (this._currentState != STATE_READY) {
+      if (!this._started) {
+        // The component hasn't been initialized yet. Return early; init()
+        // will dequeue all pending requests.
+        return;
+      }
       if (!this._ws) {
         // This will end up calling processNextRequestInQueue().
         this._beginWSSetup();
@@ -1269,52 +1361,49 @@
   // registration.
   _notifyAllAppsRegister: function() {
     debug("notifyAllAppsRegister()");
-    let deferred = Promise.defer();
-
-    // records are objects describing the registration as stored in IndexedDB.
-    function wakeupRegisteredApps(records) {
-      // Pages to be notified.
-      // wakeupTable[scope] -> [ pageURL ]
-      let wakeupTable = {};
-      for (let i = 0; i < records.length; i++) {
-        let record = records[i];
-        if (!(record.scope in wakeupTable))
-          wakeupTable[record.scope] = [];
-
-        wakeupTable[record.scope].push(record.pageURL);
-      }
-
-      // TODO -- test needed.  E10s support needed.
-
-      let globalMM = Cc['@mozilla.org/globalmessagemanager;1'].getService(Ci.nsIMessageListenerManager);
-      for (let scope in wakeupTable) {
-        wakeupTable[scope].forEach(function(pageURL) {
-          globalMM.broadcastAsyncMessage('pushsubscriptionchanged', aPushRecord.scope);
-        });
-      }
-      deferred.resolve();
-    }
-
-    this._db.getAllChannelIDs(wakeupRegisteredApps, deferred.reject);
-
-    return deferred.promise;
+    return new Promise((resolve, reject) => {
+      // records are objects describing the registration as stored in IndexedDB.
+      this._db.getAllChannelIDs(records => {
+        let scopes = new Set();
+        for (let record of records) {
+          scopes.add(record.scope);
+        }
+        let globalMM = Cc['@mozilla.org/globalmessagemanager;1'].getService(Ci.nsIMessageListenerManager);
+        for (let scope of scopes) {
+          // Notify XPCOM observers.
+          Services.obs.notifyObservers(
+            null,
+            "push-subscription-change",
+            scope
+          );
+          // TODO -- test needed.  E10s support needed.
+          globalMM.broadcastAsyncMessage('pushsubscriptionchanged', scope);
+        }
+        resolve();
+      }, reject);
+    });
   },
 
   _notifyApp: function(aPushRecord) {
-    if (!aPushRecord || !aPushRecord.pageURL || !aPushRecord.scope) {
+    if (!aPushRecord || !aPushRecord.scope) {
       debug("notifyApp() something is undefined.  Dropping notification: "
         + JSON.stringify(aPushRecord) );
       return;
     }
 
-    debug("notifyApp() " + aPushRecord.pageURL +
-          "  " + aPushRecord.scope);
-    let pageURI = Services.io.newURI(aPushRecord.pageURL, null, null);
+    debug("notifyApp() " + aPushRecord.scope);
     let scopeURI = Services.io.newURI(aPushRecord.scope, null, null);
-    let message = {
-      pushEndpoint: aPushRecord.pushEndpoint,
-      version: aPushRecord.version
-    };
+    // Notify XPCOM observers.
+    let notification = Cc["@mozilla.org/push/ObserverNotification;1"]
+                         .createInstance(Ci.nsIPushObserverNotification);
+    notification.pushEndpoint = aPushRecord.pushEndpoint;
+    notification.version = aPushRecord.version;
+    notification.data = "";
+    Services.obs.notifyObservers(
+      notification,
+      "push-notification",
+      aPushRecord.scope
+    );
 
     // If permission has been revoked, trash the message.
     if(Services.perms.testExactPermission(scopeURI, "push") != Ci.nsIPermissionManager.ALLOW_ACTION) {
@@ -1363,24 +1452,38 @@
    * Called on message from the child process. aPageRecord is an object sent by
    * navigator.push, identifying the sending page and other fields.
    */
+  _registerWithServer: function(channelID, aPageRecord) {
+    debug("registerWithServer()");
 
-  _registerWithServer: function(aPageRecord, aMessageManager) {
+    return this._sendRequest("register", {channelID: channelID})
+      .then(
+        this._onRegisterSuccess.bind(this, aPageRecord, channelID),
+        this._onRegisterError.bind(this)
+      );
+  },
+
+  _generateID: function() {
     let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"]
                           .getService(Ci.nsIUUIDGenerator);
     // generateUUID() gives a UUID surrounded by {...}, slice them off.
-    let channelID = uuidGenerator.generateUUID().toString().slice(1, -1);
+    return uuidGenerator.generateUUID().toString().slice(1, -1);
+  },
 
-    this._sendRequest("register", {channelID: channelID})
-      .then(
-        this._onRegisterSuccess.bind(this, aPageRecord, channelID),
-        this._onRegisterError.bind(this, aPageRecord, aMessageManager)
-      )
-      .then(
-        function(message) {
-          aMessageManager.sendAsyncMessage("PushService:Register:OK", message);
-        },
-        function(message) {
-          aMessageManager.sendAsyncMessage("PushService:Register:KO", message);
+  _register: function(aPageRecord) {
+    let recordPromise = new Promise((resolve, reject) =>
+      this._db.getByScope(aPageRecord.scope, resolve, reject));
+
+    return recordPromise.then(
+      pushRecord => {
+        if (pushRecord == null) {
+          let channelID = this._generateID();
+          return this._registerWithServer(channelID, aPageRecord);
+        }
+        return pushRecord;
+      },
+      error => {
+        debug("getByScope failed");
+        throw "Database error";
       }
     );
   },
@@ -1388,17 +1491,20 @@
   register: function(aPageRecord, aMessageManager) {
     debug("register(): " + JSON.stringify(aPageRecord));
 
-    this._db.getByScope(aPageRecord.scope,
+    this._register(aPageRecord).then(
       function(aPageRecord, aMessageManager, pushRecord) {
-        if (pushRecord == null) {
-          this._registerWithServer(aPageRecord, aMessageManager);
-        }
-        else {
-          this._onRegistrationSuccess(aPageRecord, aMessageManager, pushRecord);
-        }
+        let message = {
+          requestID: aPageRecord.requestID,
+          pushEndpoint: pushRecord.pushEndpoint
+        };
+        aMessageManager.sendAsyncMessage("PushService:Register:OK", message);
       }.bind(this, aPageRecord, aMessageManager),
-      function () {
-        debug("getByScope failed");
+      function(error) {
+        let message = {
+          requestID: aPageRecord.requestID,
+          error
+        };
+        aMessageManager.sendAsyncMessage("PushService:Register:KO", message);
       }
     );
   },
@@ -1409,19 +1515,15 @@
    */
   _onRegisterSuccess: function(aPageRecord, generatedChannelID, data) {
     debug("_onRegisterSuccess()");
-    let deferred = Promise.defer();
-    let message = { requestID: aPageRecord.requestID };
 
     if (typeof data.channelID !== "string") {
-      debug("Invalid channelID " + message);
-      message["error"] = "Invalid channelID received";
-      throw message;
+      debug("Invalid channelID " + data.channelID);
+      throw "Invalid channelID received";
     }
     else if (data.channelID != generatedChannelID) {
       debug("Server replied with different channelID " + data.channelID +
             " than what UA generated " + generatedChannelID);
-      message["error"] = "Server sent 200 status code but different channelID";
-      throw message;
+      throw "Server sent 200 status code but different channelID";
     }
 
     try {
@@ -1429,8 +1531,7 @@
     }
     catch (e) {
       debug("Invalid pushEndpoint " + data.pushEndpoint);
-      message["error"] = "Invalid pushEndpoint " + data.pushEndpoint;
-      throw message;
+      throw "Invalid pushEndpoint " + data.pushEndpoint;
     }
 
     let record = {
@@ -1443,33 +1544,30 @@
 
     debug("scope in _onRegisterSuccess: " + aPageRecord.scope)
 
-    this._updatePushRecord(record)
+    return this._updatePushRecord(record)
       .then(
         function() {
-          message["pushEndpoint"] = data.pushEndpoint;
-          deferred.resolve(message);
+          return record;
         },
         function(error) {
           // Unable to save.
           this._send("unregister", {channelID: record.channelID});
-          message["error"] = error;
-          deferred.reject(message);
+          throw error;
         }.bind(this)
       );
-
-    return deferred.promise;
   },
 
   /**
    * Exceptions thrown in _onRegisterError are caught by the promise obtained
    * from _sendRequest, causing the promise to be rejected instead.
    */
-  _onRegisterError: function(aPageRecord, aMessageManager, reply) {
+  _onRegisterError: function(reply) {
     debug("_onRegisterError()");
     if (!reply.error) {
       debug("Called without valid error message!");
+      throw "Registration error";
     }
-    throw { requestID: aPageRecord.requestID, error: reply.error };
+    throw reply.error;
   },
 
   /**
@@ -1496,78 +1594,106 @@
    * messages from the server, and have the client acknowledge. On a server,
    * data is cheap, reliable notification is not.
    */
-  unregister: function(aPageRecord, aMessageManager) {
-    debug("unregister() " + JSON.stringify(aPageRecord));
+  _unregister: function(aPageRecord) {
+    debug("unregisterWithServer()");
 
+    let deferred = Promise.defer();
     let fail = function(error) {
       debug("unregister() fail() error " + error);
-      let message = {requestID: aPageRecord.requestID, error: error};
-      aMessageManager.sendAsyncMessage("PushService:Unregister:KO", message);
+      deferred.reject(error);
+    };
+
+    if (!aPageRecord.scope) {
+      fail("NotFoundError");
+      return deferred.promise;
     }
 
-    this._db.getByPushEndpoint(aPageRecord.pushEndpoint, function(record) {
+    this._db.getByScope(aPageRecord.scope, function(record) {
       // If the endpoint didn't exist, let's just fail.
       if (record === undefined) {
         fail("NotFoundError");
         return;
       }
 
-      // Non-owner tried to unregister, say success, but don't do anything.
-      if (record.scope !== aPageRecord.scope) {
-        aMessageManager.sendAsyncMessage("PushService:Unregister:OK", {
-          requestID: aPageRecord.requestID,
-          pushEndpoint: aPageRecord.pushEndpoint
-        });
-        return;
-      }
-
       this._db.delete(record.channelID, function() {
         // Let's be nice to the server and try to inform it, but we don't care
         // about the reply.
         this._send("unregister", {channelID: record.channelID});
+        deferred.resolve();
+      }.bind(this), fail);
+    }.bind(this), fail);
+
+    return deferred.promise;
+  },
+
+  unregister: function(aPageRecord, aMessageManager) {
+    debug("unregister() " + JSON.stringify(aPageRecord));
+
+    this._unregister(aPageRecord).then(
+      () => {
         aMessageManager.sendAsyncMessage("PushService:Unregister:OK", {
           requestID: aPageRecord.requestID,
           pushEndpoint: aPageRecord.pushEndpoint
         });
-      }.bind(this), fail);
-    }.bind(this), fail);
+      },
+      error => {
+        aMessageManager.sendAsyncMessage("PushService:Unregister:KO", {
+          requestID: aPageRecord.requestID,
+          error
+        });
+      }
+    );
   },
 
+  _clearAll: function _clearAll() {
+    return new Promise((resolve, reject) => {
+      this._db.clearAll(() => resolve(),
+                        () => reject("Database error"));
+    });
+  },
+  
   /**
    * Called on message from the child process
    */
-  registration: function(aPageRecord, aMessageManager) {
-    debug("registration()");
-    this._db.getByScope(aPageRecord.scope,
-      this._onRegistrationSuccess.bind(this, aPageRecord, aMessageManager),
-      this._onRegistrationError.bind(this, aPageRecord, aMessageManager));
-  },
-
-  _onRegistrationSuccess: function(aPageRecord,
-                                   aMessageManager,
-                                   pushRecord) {
-
-
-    let registration = null;
-
-    if (pushRecord) {
-      registration = {
-        pushEndpoint: pushRecord.pushEndpoint,
-        version: pushRecord.version
-      };
-    }
-
-    aMessageManager.sendAsyncMessage("PushService:Registration:OK", {
-      requestID: aPageRecord.requestID,
-      registration: registration
+  _registration: function(aPageRecord) {
+    return new Promise((resolve, reject) => {
+      if (!aPageRecord.scope) {
+        reject("Database error");
+        return;
+      }
+      this._db.getByScope(aPageRecord.scope,
+        pushRecord => {
+          let registration = null;
+          if (pushRecord) {
+            registration = {
+              pushEndpoint: pushRecord.pushEndpoint,
+              version: pushRecord.version
+            };
+          }
+          resolve(registration);
+        },
+        () => reject("Database error")
+      );
     });
   },
 
-  _onRegistrationError: function(aPageRecord, aMessageManager) {
-    aMessageManager.sendAsyncMessage("PushService:Registration:KO", {
-      requestID: aPageRecord.requestID,
-      error: "Database error"
-    });
+  registration: function(aPageRecord, aMessageManager) {
+    debug("registration()");
+
+    return this._registration(aPageRecord).then(
+      registration => {
+        aMessageManager.sendAsyncMessage("PushService:Registration:OK", {
+          requestID: aPageRecord.requestID,
+          registration
+        });
+      },
+      error => {
+        aMessageManager.sendAsyncMessage("PushService:Registration:KO", {
+          requestID: aPageRecord.requestID,
+          error
+        });
+      }
+    );
   },
 
   // begin Push protocol handshake
@@ -1599,7 +1725,7 @@
       this._currentState = STATE_WAITING_FOR_HELLO;
     }
 
-    this._getNetworkState((networkState) => {
+    this._networkInfo.getNetworkState((networkState) => {
       if (networkState.ip) {
         // Opening an available UDP port.
         this._listenForUDPWakeup();
@@ -1731,6 +1857,22 @@
   },
 
   /**
+   * Rejects all pending requests with errors.
+   */
+  _cancelPendingRequests: function() {
+    for (let channelID in this._pendingRequests) {
+      let request = this._pendingRequests[channelID];
+      delete this._pendingRequests[channelID];
+      request.deferred.reject({status: 0, error: "AbortError"});
+    }
+  },
+
+  _makeUDPSocket: function() {
+    return Cc["@mozilla.org/network/udp-socket;1"]
+             .createInstance(Ci.nsIUDPSocket);
+  },
+
+  /**
    * This method should be called only if the device is on a mobile network!
    */
   _listenForUDPWakeup: function() {
@@ -1746,9 +1888,12 @@
       return;
     }
 
-    this._udpServer = Cc["@mozilla.org/network/udp-socket;1"]
-                        .createInstance(Ci.nsIUDPSocket);
-    this._udpServer.init(-1, false);
+    let socket = this._makeUDPSocket();
+    if (!socket) {
+      return;
+    }
+    this._udpServer = socket.QueryInterface(Ci.nsIUDPSocket);
+    this._udpServer.init(-1, false, Services.scriptSecurityManager.getSystemPrincipal());
     this._udpServer.asyncListen(this);
     debug("listenForUDPWakeup listening on " + this._udpServer.port);
 
@@ -1774,12 +1919,14 @@
     debug("UDP Server socket was shutdown. Status: " + aStatus);
     this._udpServer = undefined;
     this._beginWSSetup();
-  },
+  }
+};
 
+let PushNetworkInfo = {
   /**
    * Returns information about MCC-MNC and the IP of the current connection.
    */
-  _getNetworkInformation: function() {
+  getNetworkInformation: function() {
     debug("getNetworkInformation()");
 
     try {
@@ -1830,14 +1977,14 @@
    * woken up by UDP (which currently just means having an mcc and mnc along
    * with an IP, and optionally a netid).
    */
-  _getNetworkState: function(callback) {
+  getNetworkState: function(callback) {
     debug("getNetworkState()");
 
     if (typeof callback !== 'function') {
       throw new Error("No callback method. Aborting push agent !");
     }
 
-    var networkInfo = this._getNetworkInformation();
+    var networkInfo = this.getNetworkInformation();
 
     if (networkInfo.ip) {
       this._getMobileNetworkId(networkInfo, function(netid) {
@@ -1855,7 +2002,7 @@
   },
 
   // utility function used to add/remove observers in init() and shutdown()
-  _getNetworkStateChangeEventName: function() {
+  getNetworkStateChangeEventName: function() {
     try {
       Cc["@mozilla.org/network/manager;1"].getService(Ci.nsINetworkManager);
       return "network-active-changed";
@@ -1904,4 +2051,4 @@
       ".mcc" + ("00" + networkInfo.mcc).slice(-3) + ".3gppnetwork.org";
     queryDNSForDomain(netidAddress, callback);
   }
-}
+};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/PushServiceLauncher.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/PushServiceLauncher.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/PushServiceLauncher.js	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/PushServiceLauncher.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +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/. */
-
-"use strict";
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-const Cr = Components.results;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-function PushServiceLauncher() {
-};
-
-PushServiceLauncher.prototype = {
-  classID: Components.ID("{4b8caa3b-3c58-4f3c-a7f5-7bd9cb24c11d}"),
-
-  contractID: "@mozilla.org/push/ServiceLauncher;1",
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                         Ci.nsISupportsWeakReference]),
-
-  observe: function observe(subject, topic, data) {
-    switch (topic) {
-      case "app-startup":
-        Services.obs.addObserver(this, "final-ui-startup", true);
-        break;
-      case "final-ui-startup":
-        Services.obs.removeObserver(this, "final-ui-startup");
-        if (!Services.prefs.getBoolPref("dom.push.enabled")) {
-          return;
-        }
-
-        let isParent = Cc["@mozilla.org/xre/runtime;1"]
-                       .getService(Ci.nsIXULRuntime)
-                       .processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
-
-        if (isParent) {
-          Cu.import("resource://gre/modules/PushService.jsm");
-          PushService.init();
-        }
-        break;
-    }
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PushServiceLauncher]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/worker.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/worker.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/worker.js	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/worker.js	2015-04-24 19:31:11.000000000 +0000
@@ -1,7 +1,9 @@
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-addEventListener("push", function(event) {
+this.onpush = handlePush;
+
+function handlePush(event) {
 
   self.clients.matchAll().then(function(result) {
     if (event instanceof PushEvent &&
@@ -13,4 +15,4 @@
     }
     result[0].postMessage({type: "finished", okay: "no"});
   });
-});
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/head.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/head.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/head.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/head.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,450 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+Cu.import('resource://gre/modules/Services.jsm');
+Cu.import('resource://gre/modules/Timer.jsm');
+Cu.import('resource://gre/modules/Promise.jsm');
+Cu.import('resource://gre/modules/Preferences.jsm');
+
+const serviceExports = Cu.import('resource://gre/modules/PushService.jsm', {});
+const servicePrefs = new Preferences('dom.push.');
+
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "PushNotificationService",
+  "@mozilla.org/push/NotificationService;1",
+  "nsIPushNotificationService"
+);
+
+const DEFAULT_TIMEOUT = 5000;
+
+const WEBSOCKET_CLOSE_GOING_AWAY = 1001;
+
+// Stop and clean up after the PushService.
+Services.obs.addObserver(function observe(subject, topic, data) {
+  Services.obs.removeObserver(observe, topic, false);
+  serviceExports.PushService.uninit();
+  // Occasionally, `profile-change-teardown` and `xpcom-shutdown` will fire
+  // before the PushService and AlarmService finish writing to IndexedDB. This
+  // causes spurious errors and crashes, so we spin the event loop to let the
+  // writes finish.
+  let done = false;
+  setTimeout(() => done = true, 1000);
+  let thread = Services.tm.mainThread;
+  while (!done) {
+    try {
+      thread.processNextEvent(true);
+    } catch (e) {
+      Cu.reportError(e);
+    }
+  }
+}, 'profile-change-net-teardown', false);
+
+/**
+ * Gates a function so that it is called only after the wrapper is called a
+ * given number of times.
+ *
+ * @param {Number} times The number of wrapper calls before |func| is called.
+ * @param {Function} func The function to gate.
+ * @returns {Function} The gated function wrapper.
+ */
+function after(times, func) {
+  return function afterFunc() {
+    if (--times <= 0) {
+      return func.apply(this, arguments);
+    }
+  };
+}
+
+/**
+ * Wraps a Push database in a proxy that returns promises for all asynchronous
+ * methods. This makes it easier to test the database code with Task.jsm.
+ *
+ * @param {PushDB} db A Push database.
+ * @returns {Proxy} A proxy that traps function property gets and returns
+ *  promisified functions.
+ */
+function promisifyDatabase(db) {
+  return new Proxy(db, {
+    get(target, property) {
+      let method = target[property];
+      if (typeof method != 'function') {
+        return method;
+      }
+      return function(...params) {
+        return new Promise((resolve, reject) => {
+          method.call(target, ...params, resolve, reject);
+        });
+      };
+    }
+  });
+}
+
+/**
+ * Clears and closes an open Push database.
+ *
+ * @param {PushDB} db A Push database.
+ * @returns {Promise} A promise that fulfills when the database is closed.
+ */
+function cleanupDatabase(db) {
+  return new Promise(resolve => {
+    function close() {
+      db.close();
+      resolve();
+    }
+    db.drop(close, close);
+  });
+}
+
+/**
+ * Defers one or more callbacks until the next turn of the event loop. Multiple
+ * callbacks are executed in order.
+ *
+ * @param {Function[]} callbacks The callbacks to execute. One callback will be
+ *  executed per tick.
+ */
+function waterfall(...callbacks) {
+  callbacks.reduce((promise, callback) => promise.then(() => {
+    callback();
+  }), Promise.resolve()).catch(Cu.reportError);
+}
+
+/**
+ * Waits for an observer notification to fire.
+ *
+ * @param {String} topic The notification topic.
+ * @returns {Promise} A promise that fulfills when the notification is fired.
+ */
+function promiseObserverNotification(topic, matchFunc) {
+  return new Promise((resolve, reject) => {
+    Services.obs.addObserver(function observe(subject, topic, data) {
+      let matches = typeof matchFunc != 'function' || matchFunc(subject, data);
+      if (!matches) {
+        return;
+      }
+      Services.obs.removeObserver(observe, topic, false);
+      resolve({subject, data});
+    }, topic, false);
+  });
+}
+
+/**
+ * Waits for a promise to settle. Returns a rejected promise if the promise
+ * is not resolved or rejected within the given delay.
+ *
+ * @param {Promise} promise The pending promise.
+ * @param {Number} delay The time to wait before rejecting the promise.
+ * @param {String} [message] The rejection message if the promise times out.
+ * @returns {Promise} A promise that settles with the value of the pending
+ *  promise, or rejects if the pending promise times out.
+ */
+function waitForPromise(promise, delay, message = 'Timed out waiting on promise') {
+  let timeoutDefer = Promise.defer();
+  let id = setTimeout(() => timeoutDefer.reject(new Error(message)), delay);
+  return Promise.race([
+    promise.then(value => {
+      clearTimeout(id);
+      return value;
+    }, error => {
+      clearTimeout(id);
+      throw error;
+    }),
+    timeoutDefer.promise
+  ]);
+}
+
+/**
+ * Wraps an object in a proxy that traps property gets and returns stubs. If
+ * the stub is a function, the original value will be passed as the first
+ * argument. If the original value is a function, the proxy returns a wrapper
+ * that calls the stub; otherwise, the stub is called as a getter.
+ *
+ * @param {Object} target The object to wrap.
+ * @param {Object} stubs An object containing stubbed values and functions.
+ * @returns {Proxy} A proxy that returns stubs for property gets.
+ */
+function makeStub(target, stubs) {
+  return new Proxy(target, {
+    get(target, property) {
+      if (!stubs || typeof stubs != 'object' || !(property in stubs)) {
+        return target[property];
+      }
+      let stub = stubs[property];
+      if (typeof stub != 'function') {
+        return stub;
+      }
+      let original = target[property];
+      if (typeof original != 'function') {
+        return stub.call(this, original);
+      }
+      return function callStub(...params) {
+        return stub.call(this, original, ...params);
+      };
+    }
+  });
+}
+
+/**
+ * Disables `push` and `pushsubscriptionchange` service worker events for the
+ * given scopes. These events cause crashes in xpcshell, so we disable them
+ * for testing nsIPushNotificationService.
+ *
+ * @param {String[]} scopes A list of scope URLs.
+ */
+function disableServiceWorkerEvents(...scopes) {
+  for (let scope of scopes) {
+    Services.perms.add(
+      Services.io.newURI(scope, null, null),
+      'push',
+      Ci.nsIPermissionManager.DENY_ACTION
+    );
+  }
+}
+
+/**
+ * Sets default PushService preferences. All pref names are prefixed with
+ * `dom.push.`; any additional preferences will override the defaults.
+ *
+ * @param {Object} [prefs] Additional preferences to set.
+ */
+function setPrefs(prefs = {}) {
+  let defaultPrefs = Object.assign({
+    debug: true,
+    serverURL: 'wss://push.example.org',
+    'connection.enabled': true,
+    userAgentID: '',
+    enabled: true,
+    // Disable adaptive pings and UDP wake-up by default; these are
+    // tested separately.
+    'adaptive.enabled': false,
+    'udp.wakeupEnabled': false,
+    // Defaults taken from /b2g/app/b2g.js.
+    requestTimeout: 10000,
+    retryBaseInterval: 5000,
+    pingInterval: 30 * 60 * 1000,
+    'pingInterval.default': 3 * 60 * 1000,
+    'pingInterval.mobile': 3 * 60 * 1000,
+    'pingInterval.wifi': 3 * 60 * 1000,
+    'adaptive.lastGoodPingInterval': 3 * 60 * 1000,
+    'adaptive.lastGoodPingInterval.mobile': 3 * 60 * 1000,
+    'adaptive.lastGoodPingInterval.wifi': 3 * 60 * 1000,
+    'adaptive.gap': 60000,
+    'adaptive.upperLimit': 29 * 60 * 1000,
+    // Misc. defaults.
+    'adaptive.mobile': ''
+  }, prefs);
+  for (let pref in defaultPrefs) {
+    servicePrefs.set(pref, defaultPrefs[pref]);
+  }
+}
+
+function compareAscending(a, b) {
+  return a > b ? 1 : a < b ? -1 : 0;
+}
+
+/**
+ * Creates a mock WebSocket object that implements a subset of the
+ * nsIWebSocketChannel interface used by the PushService.
+ *
+ * The given protocol handlers are invoked for each Simple Push command sent
+ * by the PushService. The ping handler is optional; all others will throw if
+ * the PushService sends a command for which no handler is registered.
+ *
+ * All nsIWebSocketListener methods will be called asynchronously.
+ * serverSendMsg() and serverClose() can be used to respond to client messages
+ * and close the "server" end of the connection, respectively.
+ *
+ * @param {nsIURI} originalURI The original WebSocket URL.
+ * @param {Function} options.onHello The "hello" handshake command handler.
+ * @param {Function} options.onRegister The "register" command handler.
+ * @param {Function} options.onUnregister The "unregister" command handler.
+ * @param {Function} options.onACK The "ack" command handler.
+ * @param {Function} [options.onPing] An optional ping handler.
+ */
+function MockWebSocket(originalURI, handlers = {}) {
+  this._originalURI = originalURI;
+  this._onHello = handlers.onHello;
+  this._onRegister = handlers.onRegister;
+  this._onUnregister = handlers.onUnregister;
+  this._onACK = handlers.onACK;
+  this._onPing = handlers.onPing;
+}
+
+MockWebSocket.prototype = {
+  _originalURI: null,
+  _onHello: null,
+  _onRegister: null,
+  _onUnregister: null,
+  _onACK: null,
+  _onPing: null,
+
+  _listener: null,
+  _context: null,
+
+  QueryInterface: XPCOMUtils.generateQI([
+    Ci.nsISupports,
+    Ci.nsIWebSocketChannel
+  ]),
+
+  get originalURI() {
+    return this._originalURI;
+  },
+
+  asyncOpen(uri, origin, listener, context) {
+    this._listener = listener;
+    this._context = context;
+    waterfall(() => this._listener.onStart(this._context));
+  },
+
+  _handleMessage(msg) {
+    let messageType, request;
+    if (msg == '{}') {
+      request = {};
+      messageType = 'ping';
+    } else {
+      request = JSON.parse(msg);
+      messageType = request.messageType;
+    }
+    switch (messageType) {
+    case 'hello':
+      if (typeof this._onHello != 'function') {
+        throw new Error('Unexpected handshake request');
+      }
+      this._onHello(request);
+      break;
+
+    case 'register':
+      if (typeof this._onRegister != 'function') {
+        throw new Error('Unexpected register request');
+      }
+      this._onRegister(request);
+      break;
+
+    case 'unregister':
+      if (typeof this._onUnregister != 'function') {
+        throw new Error('Unexpected unregister request');
+      }
+      this._onUnregister(request);
+      break;
+
+    case 'ack':
+      if (typeof this._onACK != 'function') {
+        throw new Error('Unexpected acknowledgement');
+      }
+      this._onACK(request);
+      break;
+
+    case 'ping':
+      if (typeof this._onPing == 'function') {
+        this._onPing(request);
+      } else {
+        // Echo ping packets.
+        this.serverSendMsg('{}');
+      }
+      break;
+
+    default:
+      throw new Error('Unexpected message: ' + messageType);
+    }
+  },
+
+  sendMsg(msg) {
+    this._handleMessage(msg);
+  },
+
+  close(code, reason) {
+    waterfall(() => this._listener.onStop(this._context, Cr.NS_OK));
+  },
+
+  /**
+   * Responds with the given message, calling onMessageAvailable() and
+   * onAcknowledge() synchronously. Throws if the message is not a string.
+   * Used by the tests to respond to client commands.
+   *
+   * @param {String} msg The message to send to the client.
+   */
+  serverSendMsg(msg) {
+    if (typeof msg != 'string') {
+      throw new Error('Invalid response message');
+    }
+    waterfall(
+      () => this._listener.onMessageAvailable(this._context, msg),
+      () => this._listener.onAcknowledge(this._context, 0)
+    );
+  },
+
+  /**
+   * Closes the server end of the connection, calling onServerClose()
+   * followed by onStop(). Used to test abrupt connection termination
+   * and UDP wake-up.
+   *
+   * @param {Number} [statusCode] The WebSocket connection close code.
+   * @param {String} [reason] The connection close reason.
+   */
+  serverClose(statusCode, reason = '') {
+    if (!isFinite(statusCode)) {
+      statusCode = WEBSOCKET_CLOSE_GOING_AWAY;
+    }
+    waterfall(
+      () => this._listener.onServerClose(this._context, statusCode, reason),
+      () => this._listener.onStop(this._context, Cr.NS_BASE_STREAM_CLOSED)
+    );
+  }
+};
+
+/**
+ * Creates an object that exposes the same interface as NetworkInfo, used
+ * to simulate network status changes on Desktop. All methods returns empty
+ * carrier data.
+ */
+function MockDesktopNetworkInfo() {}
+
+MockDesktopNetworkInfo.prototype = {
+  getNetworkInformation() {
+    return {mcc: '', mnc: '', ip: ''};
+  },
+
+  getNetworkState(callback) {
+    callback({mcc: '', mnc: '', ip: '', netid: ''});
+  },
+
+  getNetworkStateChangeEventName() {
+    return 'network:offline-status-changed';
+  }
+};
+
+/**
+ * Creates an object that exposes the same interface as NetworkInfo, used
+ * to simulate network status changes on B2G.
+ *
+ * @param {String} [info.mcc] The mobile country code.
+ * @param {String} [info.mnc] The mobile network code.
+ * @param {String} [info.ip] The carrier IP address.
+ * @param {String} [info.netid] The resolved network ID for UDP wake-up.
+ */
+function MockMobileNetworkInfo(info = {}) {
+  this._info = info;
+}
+
+MockMobileNetworkInfo.prototype = {
+  _info: null,
+
+  getNetworkInformation() {
+    let {mcc, mnc, ip} = this._info;
+    return {mcc, mnc, ip};
+  },
+
+  getNetworkState(callback) {
+    let {mcc, mnc, ip, netid} = this._info;
+    callback({mcc, mnc, ip, netid});
+  },
+
+  getNetworkStateChangeEventName() {
+    return 'network-active-changed';
+  }
+};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_clearAll_successful.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_clearAll_successful.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_clearAll_successful.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_clearAll_successful.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,47 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const channelID = 'db0a7021-ec2d-4bd3-8802-7a6966f10ed8';
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  run_next_test();
+}
+
+add_task(function* test_unregister_success() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  yield promiseDB.put({
+    channelID,
+    pushEndpoint: 'https://example.org/update/unregister-success',
+    scope: 'https://example.com/page/unregister-success',
+    version: 1
+  });
+
+  let unregisterDefer = Promise.defer();
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: 'fbe865a6-aeb8-446f-873c-aeebdb8d493c'
+          }));
+        }
+      });
+    }
+  });
+
+  yield PushNotificationService.clearAll();
+  let record = yield promiseDB.getByChannelID(channelID);
+  ok(!record, 'Unregister did not remove record');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_notification_ack.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_notification_ack.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_notification_ack.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_notification_ack.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,127 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+let userAgentID = '5ab1d1df-7a3d-4024-a469-b9e1bb399fad';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({userAgentID});
+  disableServiceWorkerEvents(
+    'https://example.org/1',
+    'https://example.org/2',
+    'https://example.org/3'
+  );
+  run_next_test();
+}
+
+add_task(function* test_notification_ack() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  let records = [{
+    channelID: '21668e05-6da8-42c9-b8ab-9cc3f4d5630c',
+    pushEndpoint: 'https://example.com/update/1',
+    scope: 'https://example.org/1',
+    version: 1
+  }, {
+    channelID: '9a5ff87f-47c9-4215-b2b8-0bdd38b4b305',
+    pushEndpoint: 'https://example.com/update/2',
+    scope: 'https://example.org/2',
+    version: 2
+  }, {
+    channelID: '5477bfda-22db-45d4-9614-fee369630260',
+    pushEndpoint: 'https://example.com/update/3',
+    scope: 'https://example.org/3',
+    version: 3
+  }];
+  for (let record of records) {
+    yield promiseDB.put(record);
+  }
+
+  let notifyPromise = Promise.all([
+    promiseObserverNotification('push-notification'),
+    promiseObserverNotification('push-notification'),
+    promiseObserverNotification('push-notification')
+  ]);
+
+  let acks = 0;
+  let ackDefer = Promise.defer();
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          equal(request.uaid, userAgentID,
+            'Should send matching device IDs in handshake');
+          deepEqual(request.channelIDs.sort(), [
+            '21668e05-6da8-42c9-b8ab-9cc3f4d5630c',
+            '5477bfda-22db-45d4-9614-fee369630260',
+            '9a5ff87f-47c9-4215-b2b8-0bdd38b4b305'
+          ], 'Should send matching channel IDs in handshake');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            uaid: userAgentID,
+            status: 200
+          }));
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'notification',
+            updates: [{
+              channelID: '21668e05-6da8-42c9-b8ab-9cc3f4d5630c',
+              version: 2
+            }]
+          }));
+        },
+        onACK(request) {
+          equal(request.messageType, 'ack', 'Should send acknowledgements');
+          let updates = request.updates;
+          ok(Array.isArray(updates),
+            'Should send an array of acknowledged updates');
+          equal(updates.length, 1,
+            'Should send one acknowledged update per packet');
+          switch (++acks) {
+          case 1:
+            this.serverSendMsg(JSON.stringify({
+              messageType: 'notification',
+              updates: [{
+                channelID: '9a5ff87f-47c9-4215-b2b8-0bdd38b4b305',
+                version: 4
+              }, {
+                channelID: '5477bfda-22db-45d4-9614-fee369630260',
+                version: 6
+              }]
+            }));
+            break;
+
+          case 2:
+            deepEqual([{
+              channelID: '9a5ff87f-47c9-4215-b2b8-0bdd38b4b305',
+              version: 4
+            }], updates, 'Wrong updates for acknowledgement 2');
+            break;
+
+          case 3:
+            deepEqual([{
+              channelID: '5477bfda-22db-45d4-9614-fee369630260',
+              version: 6
+            }], updates, 'Wrong updates for acknowledgement 3');
+            ackDefer.resolve();
+            break;
+
+          default:
+            ok(false, 'Unexpected acknowledgement ' + acks);
+          }
+        }
+      });
+    }
+  });
+
+  yield waitForPromise(notifyPromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for notifications');
+  yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
+    'Timed out waiting for multiple acknowledgements');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_notification_duplicate.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_notification_duplicate.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_notification_duplicate.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_notification_duplicate.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,82 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  disableServiceWorkerEvents(
+    'https://example.com/1',
+    'https://example.com/2'
+  );
+  run_next_test();
+}
+
+// Should acknowledge duplicate notifications, but not notify apps.
+add_task(function* test_notification_duplicate() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  let records = [{
+    channelID: '8d2d9400-3597-4c5a-8a38-c546b0043bcc',
+    pushEndpoint: 'https://example.org/update/1',
+    scope: 'https://example.com/1',
+    version: 2
+  }, {
+    channelID: '27d1e393-03ef-4c72-a5e6-9e890dfccad0',
+    pushEndpoint: 'https://example.org/update/2',
+    scope: 'https://example.com/2',
+    version: 2
+  }];
+  for (let record of records) {
+    yield promiseDB.put(record);
+  }
+
+  let notifyPromise = promiseObserverNotification('push-notification');
+
+  let acks = 0;
+  let ackDefer = Promise.defer();
+  let ackDone = after(2, ackDefer.resolve);
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: '1500e7d9-8cbe-4ee6-98da-7fa5d6a39852'
+          }));
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'notification',
+            updates: [{
+              channelID: '8d2d9400-3597-4c5a-8a38-c546b0043bcc',
+              version: 2
+            }, {
+              channelID: '27d1e393-03ef-4c72-a5e6-9e890dfccad0',
+              version: 3
+            }]
+          }));
+        },
+        onACK: ackDone
+      });
+    }
+  });
+
+  yield waitForPromise(notifyPromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for notifications');
+  yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
+    'Timed out waiting for stale acknowledgement');
+
+  let staleRecord = yield promiseDB.getByChannelID(
+    '8d2d9400-3597-4c5a-8a38-c546b0043bcc');
+  strictEqual(staleRecord.version, 2, 'Wrong stale record version');
+
+  let updatedRecord = yield promiseDB.getByChannelID(
+    '27d1e393-03ef-4c72-a5e6-9e890dfccad0');
+  strictEqual(updatedRecord.version, 3, 'Wrong updated record version');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_notification_error.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_notification_error.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_notification_error.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_notification_error.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,127 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  disableServiceWorkerEvents(
+    'https://example.com/a',
+    'https://example.com/b',
+    'https://example.com/c'
+  );
+  run_next_test();
+}
+
+add_task(function* test_notification_error() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  let records = [{
+    channelID: 'f04f1e46-9139-4826-b2d1-9411b0821283',
+    pushEndpoint: 'https://example.org/update/success-1',
+    scope: 'https://example.com/a',
+    version: 1
+  }, {
+    channelID: '3c3930ba-44de-40dc-a7ca-8a133ec1a866',
+    pushEndpoint: 'https://example.org/update/error',
+    scope: 'https://example.com/b',
+    version: 2
+  }, {
+    channelID: 'b63f7bef-0a0d-4236-b41e-086a69dfd316',
+    pushEndpoint: 'https://example.org/update/success-2',
+    scope: 'https://example.com/c',
+    version: 3
+  }];
+  for (let record of records) {
+    yield promiseDB.put(record);
+  }
+
+  let notifyPromise = Promise.all([
+    promiseObserverNotification(
+      'push-notification',
+      (subject, data) => data == 'https://example.com/a'
+    ),
+    promiseObserverNotification(
+      'push-notification',
+      (subject, data) => data == 'https://example.com/c'
+    )
+  ]);
+
+  let ackDefer = Promise.defer();
+  let ackDone = after(records.length, ackDefer.resolve);
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db: makeStub(db, {
+      getByChannelID(prev, channelID, successCb, failureCb) {
+        if (channelID == '3c3930ba-44de-40dc-a7ca-8a133ec1a866') {
+          return failureCb('splines not reticulated');
+        }
+        return prev.call(this, channelID, successCb, failureCb);
+      }
+    }),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          deepEqual(request.channelIDs.sort(), [
+            '3c3930ba-44de-40dc-a7ca-8a133ec1a866',
+            'b63f7bef-0a0d-4236-b41e-086a69dfd316',
+            'f04f1e46-9139-4826-b2d1-9411b0821283'
+          ], 'Wrong channel list');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: '3c7462fc-270f-45be-a459-b9d631b0d093'
+          }));
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'notification',
+            updates: records.map(({channelID, version}) =>
+              ({channelID, version: ++version}))
+          }));
+        },
+        // Should acknowledge all received updates, even if updating
+        // IndexedDB fails.
+        onACK: ackDone
+      });
+    }
+  });
+
+  let [a, c] = yield waitForPromise(
+    notifyPromise,
+    DEFAULT_TIMEOUT,
+    'Timed out waiting for notifications'
+  );
+  let aPush = a.subject.QueryInterface(Ci.nsIPushObserverNotification);
+  equal(aPush.pushEndpoint, 'https://example.org/update/success-1',
+    'Wrong endpoint for notification A');
+  equal(aPush.version, 2, 'Wrong version for notification A');
+
+  let cPush = c.subject.QueryInterface(Ci.nsIPushObserverNotification);
+  equal(cPush.pushEndpoint, 'https://example.org/update/success-2',
+    'Wrong endpoint for notification C');
+  equal(cPush.version, 4, 'Wrong version for notification C');
+
+  yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
+    'Timed out waiting for acknowledgements');
+
+  let aRecord = yield promiseDB.getByScope('https://example.com/a');
+  equal(aRecord.channelID, 'f04f1e46-9139-4826-b2d1-9411b0821283',
+    'Wrong channel ID for record A');
+  strictEqual(aRecord.version, 2,
+    'Should return the new version for record A');
+
+  let bRecord = yield promiseDB.getByScope('https://example.com/b');
+  equal(bRecord.channelID, '3c3930ba-44de-40dc-a7ca-8a133ec1a866',
+    'Wrong channel ID for record B');
+  strictEqual(bRecord.version, 2,
+    'Should return the previous version for record B');
+
+  let cRecord = yield promiseDB.getByScope('https://example.com/c');
+  equal(cRecord.channelID, 'b63f7bef-0a0d-4236-b41e-086a69dfd316',
+    'Wrong channel ID for record C');
+  strictEqual(cRecord.version, 4,
+    'Should return the new version for record C');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_notification_incomplete.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_notification_incomplete.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_notification_incomplete.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_notification_incomplete.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,109 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  disableServiceWorkerEvents(
+    'https://example.com/page/1',
+    'https://example.com/page/2',
+    'https://example.com/page/3',
+    'https://example.com/page/4'
+  );
+  run_next_test();
+}
+
+add_task(function* test_notification_incomplete() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  let records = [{
+    channelID: '123',
+    pushEndpoint: 'https://example.org/update/1',
+    scope: 'https://example.com/page/1',
+    version: 1
+  }, {
+    channelID: '3ad1ed95-d37a-4d88-950f-22cbe2e240d7',
+    pushEndpoint: 'https://example.org/update/2',
+    scope: 'https://example.com/page/2',
+    version: 1
+  }, {
+    channelID: 'd239498b-1c85-4486-b99b-205866e82d1f',
+    pushEndpoint: 'https://example.org/update/3',
+    scope: 'https://example.com/page/3',
+    version: 3
+  }, {
+    channelID: 'a50de97d-b496-43ce-8b53-05522feb78db',
+    pushEndpoint: 'https://example.org/update/4',
+    scope: 'https://example.com/page/4',
+    version: 10
+  }];
+  for (let record of records) {
+    promiseDB.put(record);
+  }
+
+  Services.obs.addObserver(function observe(subject, topic, data) {
+    ok(false, 'Should not deliver malformed updates');
+  }, 'push-notification', false);
+
+  let notificationDefer = Promise.defer();
+  let notificationDone = after(2, notificationDefer.resolve);
+  let prevHandler = PushService._handleNotificationReply;
+  PushService._handleNotificationReply = function _handleNotificationReply() {
+    notificationDone();
+    return prevHandler.apply(this, arguments);
+  };
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: '1ca1cf66-eeb4-4df7-87c1-d5c92906ab90'
+          }));
+          this.serverSendMsg(JSON.stringify({
+            // Missing "updates" field; should ignore message.
+            messageType: 'notification'
+          }));
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'notification',
+            updates: [{
+              // Wrong channel ID field type.
+              channelID: 123,
+              version: 3
+            }, {
+              // Missing version field.
+              channelID: '3ad1ed95-d37a-4d88-950f-22cbe2e240d7'
+            }, {
+              // Wrong version field type.
+              channelID: 'd239498b-1c85-4486-b99b-205866e82d1f',
+              version: true
+            }, {
+              // Negative versions should be ignored.
+              channelID: 'a50de97d-b496-43ce-8b53-05522feb78db',
+              version: -5
+            }]
+          }));
+        },
+        onACK() {
+          ok(false, 'Should not acknowledge malformed updates');
+        }
+      });
+    }
+  });
+
+  yield waitForPromise(notificationDefer.promise, DEFAULT_TIMEOUT,
+    'Timed out waiting for incomplete notifications');
+
+  let storeRecords = yield promiseDB.getAllChannelIDs();
+  storeRecords.sort(({pushEndpoint: a}, {pushEndpoint: b}) =>
+    compareAscending(a, b));
+  deepEqual(records, storeRecords, 'Should not update malformed records');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_notification_version_string.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_notification_version_string.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_notification_version_string.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_notification_version_string.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,72 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  disableServiceWorkerEvents(
+    'https://example.net/case'
+  );
+  run_next_test();
+}
+
+add_task(function* test_notification_version_string() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  yield promiseDB.put({
+    channelID: '6ff97d56-d0c0-43bc-8f5b-61b855e1d93b',
+    pushEndpoint: 'https://example.org/updates/1',
+    scope: 'https://example.com/page/1',
+    version: 2
+  });
+
+  let notifyPromise = promiseObserverNotification('push-notification');
+
+  let ackDefer = Promise.defer();
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: 'ba31ac13-88d4-4984-8e6b-8731315a7cf8'
+          }));
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'notification',
+            updates: [{
+              channelID: '6ff97d56-d0c0-43bc-8f5b-61b855e1d93b',
+              version: '4'
+            }]
+          }));
+        },
+        onACK: ackDefer.resolve
+      });
+    }
+  });
+
+  let {subject: notification, data: scope} = yield waitForPromise(
+    notifyPromise,
+    DEFAULT_TIMEOUT,
+    'Timed out waiting for string notification'
+  );
+  let message = notification.QueryInterface(Ci.nsIPushObserverNotification);
+  equal(scope, 'https://example.com/page/1', 'Wrong scope');
+  equal(message.pushEndpoint, 'https://example.org/updates/1',
+    'Wrong push endpoint');
+  strictEqual(message.version, 4, 'Wrong version');
+
+  yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
+    'Timed out waiting for string acknowledgement');
+
+  let storeRecord = yield promiseDB.getByChannelID(
+    '6ff97d56-d0c0-43bc-8f5b-61b855e1d93b');
+  strictEqual(storeRecord.version, 4, 'Wrong record version');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_case.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_case.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_case.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_case.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,64 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = '1760b1f5-c3ba-40e3-9344-adef7c18ab12';
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  disableServiceWorkerEvents(
+    'https://example.net/case'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_case() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'HELLO',
+            uaid: userAgentID,
+            status: 200
+          }));
+        },
+        onRegister(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'ReGiStEr',
+            uaid: userAgentID,
+            channelID: request.channelID,
+            status: 200,
+            pushEndpoint: 'https://example.com/update/case'
+          }));
+        }
+      });
+    }
+  });
+
+  let newRecord = yield waitForPromise(
+    PushNotificationService.register('https://example.net/case'),
+    DEFAULT_TIMEOUT,
+    'Mixed-case register response timed out'
+  );
+  equal(newRecord.pushEndpoint, 'https://example.com/update/case',
+    'Wrong push endpoint in registration record');
+  equal(newRecord.scope, 'https://example.net/case',
+    'Wrong scope in registration record');
+
+  let record = yield promiseDB.getByChannelID(newRecord.channelID);
+  equal(record.pushEndpoint, 'https://example.com/update/case',
+    'Wrong push endpoint in database record');
+  equal(record.scope, 'https://example.net/case',
+    'Wrong scope in database record');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_flush.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_flush.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_flush.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_flush.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,103 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = '9ce1e6d3-7bdb-4fe9-90a5-def1d64716f1';
+const channelID = 'c26892c5-6e08-4c16-9f0c-0044697b4d85';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID,
+    requestTimeout: 1000,
+    retryBaseInterval: 150
+  });
+  disableServiceWorkerEvents(
+    'https://example.com/page/1',
+    'https://example.com/page/2'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_flush() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  let record = {
+    channelID: '9bcc7efb-86c7-4457-93ea-e24e6eb59b74',
+    pushEndpoint: 'https://example.org/update/1',
+    scope: 'https://example.com/page/1',
+    version: 2
+  };
+  yield promiseDB.put(record);
+
+  let notifyPromise = promiseObserverNotification('push-notification');
+
+  let ackDefer = Promise.defer();
+  let ackDone = after(2, ackDefer.resolve);
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID
+          }));
+        },
+        onRegister(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'notification',
+            updates: [{
+              channelID: request.channelID,
+              version: 2
+            }, {
+              channelID: '9bcc7efb-86c7-4457-93ea-e24e6eb59b74',
+              version: 3
+            }]
+          }));
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'register',
+            status: 200,
+            channelID: request.channelID,
+            uaid: userAgentID,
+            pushEndpoint: 'https://example.org/update/2'
+          }));
+        },
+        onACK: ackDone
+      });
+    }
+  });
+
+  let newRecord = yield PushNotificationService.register(
+    'https://example.com/page/2'
+  );
+  equal(newRecord.pushEndpoint, 'https://example.org/update/2',
+    'Wrong push endpoint in record');
+  equal(newRecord.scope, 'https://example.com/page/2',
+    'Wrong scope in record');
+
+  let {data: scope} = yield waitForPromise(notifyPromise, DEFAULT_TIMEOUT,
+    'Timed out waiting for notification');
+  equal(scope, 'https://example.com/page/1', 'Wrong notification scope');
+
+  yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
+     'Timed out waiting for acknowledgements');
+
+  let prevRecord = yield promiseDB.getByChannelID(
+    '9bcc7efb-86c7-4457-93ea-e24e6eb59b74');
+  equal(prevRecord.pushEndpoint, 'https://example.org/update/1',
+    'Wrong existing push endpoint');
+  strictEqual(prevRecord.version, 3,
+    'Should record version updates sent before register responses');
+
+  let registeredRecord = yield promiseDB.getByChannelID(newRecord.channelID);
+  equal(registeredRecord.pushEndpoint, 'https://example.org/update/2',
+    'Wrong new push endpoint');
+  ok(!registeredRecord.version, 'Should not record premature updates');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_invalid_channel.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_invalid_channel.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_invalid_channel.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_invalid_channel.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,60 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = '52b2b04c-b6cc-42c6-abdf-bef9cbdbea00';
+const channelID = 'cafed00d';
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  disableServiceWorkerEvents(
+    'https://example.com/invalid-channel'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_invalid_channel() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+
+  PushService._generateID = () => channelID;
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            uaid: userAgentID,
+            status: 200
+          }));
+        },
+        onRegister(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'register',
+            status: 403,
+            channelID,
+            error: 'Invalid channel ID'
+          }));
+        }
+      });
+    }
+  });
+
+  yield rejects(
+    PushNotificationService.register('https://example.com/invalid-channel'),
+    function(error) {
+      return error == 'Invalid channel ID';
+    },
+    'Wrong error for invalid channel ID'
+  );
+
+  let record = yield promiseDB.getByChannelID(channelID);
+  ok(!record, 'Should not store records for error responses');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_invalid_endpoint.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_invalid_endpoint.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_invalid_endpoint.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_invalid_endpoint.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,62 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = 'c9a12e81-ea5e-40f9-8bf4-acee34621671';
+const channelID = 'c0660af8-b532-4931-81f0-9fd27a12d6ab';
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  disableServiceWorkerEvents(
+    'https://example.net/page/invalid-endpoint'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_invalid_endpoint() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+
+  PushService._generateID = () => channelID;
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID,
+          }));
+        },
+        onRegister(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'register',
+            status: 200,
+            channelID,
+            uaid: userAgentID,
+            pushEndpoint: '!@#$%^&*'
+          }));
+        }
+      });
+    }
+  });
+
+  yield rejects(
+    PushNotificationService.register(
+      'https://example.net/page/invalid-endpoint'),
+    function(error) {
+      return error && error.contains('Invalid pushEndpoint');
+    },
+    'Wrong error for invalid endpoint'
+  );
+
+  let record = yield promiseDB.getByChannelID(channelID);
+  ok(!record, 'Should not store records with invalid endpoints');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_invalid_json.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_invalid_json.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_invalid_json.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_invalid_json.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,61 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = '8271186b-8073-43a3-adf6-225bd44a8b0a';
+const channelID = '2d08571e-feab-48a0-9f05-8254c3c7e61f';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    requestTimeout: 1000,
+    retryBaseInterval: 150
+  });
+  disableServiceWorkerEvents(
+    'https://example.net/page/invalid-json'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_invalid_json() {
+  let helloDefer = Promise.defer();
+  let helloDone = after(2, helloDefer.resolve);
+  let registers = 0;
+
+  PushService._generateID = () => channelID;
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID
+          }));
+          helloDone();
+        },
+        onRegister(request) {
+          equal(request.channelID, channelID, 'Register: wrong channel ID');
+          this.serverSendMsg(');alert(1);(');
+          registers++;
+        }
+      });
+    }
+  });
+
+  yield rejects(
+    PushNotificationService.register('https://example.net/page/invalid-json'),
+    function(error) {
+      return error == 'TimeoutError';
+    },
+    'Wrong error for invalid JSON response'
+  );
+
+  yield waitForPromise(helloDefer.promise, DEFAULT_TIMEOUT,
+    'Reconnect after invalid JSON response timed out');
+  equal(registers, 1, 'Wrong register count');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_no_id.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_no_id.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_no_id.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_no_id.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,65 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+let userAgentID = '9a2f9efe-2ebb-4bcb-a5d9-9e2b73d30afe';
+let channelID = '264c2ba0-f6db-4e84-acdb-bd225b62d9e3';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID,
+    requestTimeout: 1000,
+    retryBaseInterval: 150
+  });
+  disableServiceWorkerEvents(
+    'https://example.com/incomplete'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_no_id() {
+  let registers = 0;
+  let helloDefer = Promise.defer();
+  let helloDone = after(2, helloDefer.resolve);
+
+  PushService._generateID = () => channelID;
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID
+          }));
+          helloDone();
+        },
+        onRegister(request) {
+          registers++;
+          equal(request.channelID, channelID, 'Register: wrong channel ID');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'register',
+            status: 200
+          }));
+        }
+      });
+    }
+  });
+
+  yield rejects(
+    PushNotificationService.register('https://example.com/incomplete'),
+    function(error) {
+      return error == 'TimeoutError';
+    },
+    'Wrong error for incomplete register response'
+  );
+
+  yield waitForPromise(helloDefer.promise, DEFAULT_TIMEOUT,
+    'Reconnect after incomplete register response timed out');
+  equal(registers, 1, 'Wrong register count');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_request_queue.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_request_queue.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_request_queue.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_request_queue.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,65 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    requestTimeout: 1000,
+    retryBaseInterval: 150
+  });
+  disableServiceWorkerEvents(
+    'https://example.com/page/1'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_request_queue() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+
+  let helloDefer = Promise.defer();
+  let onHello = after(2, function onHello(request) {
+    this.serverSendMsg(JSON.stringify({
+      messageType: 'hello',
+      status: 200,
+      uaid: '54b08a9e-59c6-4ed7-bb54-f4fd60d6f606'
+    }));
+    helloDefer.resolve();
+  });
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello,
+        onRegister() {
+          ok(false, 'Should cancel timed-out requests');
+        }
+      });
+    }
+  });
+
+  let firstRegister = PushNotificationService.register(
+    'https://example.com/page/1'
+  );
+  let secondRegister = PushNotificationService.register(
+    'https://example.com/page/1'
+  );
+
+  yield waitForPromise(Promise.all([
+    rejects(firstRegister, function(error) {
+      return error == 'TimeoutError';
+    }, 'Should time out the first request'),
+    rejects(secondRegister, function(error) {
+      return error == 'TimeoutError';
+    }, 'Should time out the second request')
+  ]), DEFAULT_TIMEOUT, 'Queued requests did not time out');
+
+  yield waitForPromise(helloDefer.promise, DEFAULT_TIMEOUT,
+    'Timed out waiting for reconnect');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_rollback.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_rollback.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_rollback.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_rollback.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,88 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = 'b2546987-4f63-49b1-99f7-739cd3c40e44';
+const channelID = '35a820f7-d7dd-43b3-af21-d65352212ae3';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID,
+    requestTimeout: 1000,
+    retryBaseInterval: 150
+  });
+  disableServiceWorkerEvents(
+    'https://example.com/storage-error'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_rollback() {
+  let db = new PushDB();
+  do_register_cleanup(() => cleanupDatabase(db));
+
+  let handshakes = 0;
+  let registers = 0;
+  let unregisterDefer = Promise.defer();
+  PushService._generateID = () => channelID;
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db: makeStub(db, {
+      put(prev, record, successCb, failureCb) {
+        failureCb('universe has imploded');
+      }
+    }),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          handshakes++;
+          equal(request.uaid, userAgentID, 'Handshake: wrong device ID');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID
+          }));
+        },
+        onRegister(request) {
+          equal(request.channelID, channelID, 'Register: wrong channel ID');
+          registers++;
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'register',
+            status: 200,
+            uaid: userAgentID,
+            channelID,
+            pushEndpoint: 'https://example.com/update/rollback'
+          }));
+        },
+        onUnregister(request) {
+          equal(request.channelID, channelID, 'Unregister: wrong channel ID');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'unregister',
+            status: 200,
+            channelID
+          }));
+          unregisterDefer.resolve();
+        }
+      });
+    }
+  });
+
+  // Should return a rejected promise if storage fails.
+  yield rejects(
+    PushNotificationService.register('https://example.com/storage-error'),
+    function(error) {
+      return error == 'universe has imploded';
+    },
+    'Wrong error for unregister database failure'
+  );
+
+  // Should send an out-of-band unregister request.
+  yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
+    'Unregister request timed out');
+  equal(handshakes, 1, 'Wrong handshake count');
+  equal(registers, 1, 'Wrong register count');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_success.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_success.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_success.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_success.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,76 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = 'bd744428-f125-436a-b6d0-dd0c9845837f';
+const channelID = '0ef2ad4a-6c49-41ad-af6e-95d2425276bf';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID,
+    requestTimeout: 1000,
+    retryBaseInterval: 150
+  });
+  disableServiceWorkerEvents(
+    'https://example.org/1'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_success() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+
+  PushService._generateID = () => channelID;
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(data) {
+          equal(data.messageType, 'hello', 'Handshake: wrong message type');
+          equal(data.uaid, userAgentID, 'Handshake: wrong device ID');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID
+          }));
+        },
+        onRegister(data) {
+          equal(data.messageType, 'register', 'Register: wrong message type');
+          equal(data.channelID, channelID, 'Register: wrong channel ID');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'register',
+            status: 200,
+            channelID: channelID,
+            uaid: userAgentID,
+            pushEndpoint: 'https://example.com/update/1',
+          }));
+        }
+      });
+    }
+  });
+
+  let newRecord = yield PushNotificationService.register(
+    'https://example.org/1'
+  );
+  equal(newRecord.channelID, channelID,
+    'Wrong channel ID in registration record');
+  equal(newRecord.pushEndpoint, 'https://example.com/update/1',
+    'Wrong push endpoint in registration record');
+  equal(newRecord.scope, 'https://example.org/1',
+    'Wrong scope in registration record');
+
+  let record = yield promiseDB.getByChannelID(channelID);
+  equal(record.channelID, channelID,
+    'Wrong channel ID in database record');
+  equal(record.pushEndpoint, 'https://example.com/update/1',
+    'Wrong push endpoint in database record');
+  equal(record.scope, 'https://example.org/1',
+    'Wrong scope in database record');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_timeout.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_timeout.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_timeout.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_timeout.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,102 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = 'a4be0df9-b16d-4b5f-8f58-0f93b6f1e23d';
+const channelID = 'e1944e0b-48df-45e7-bdc0-d1fbaa7986d3';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    requestTimeout: 1000,
+    retryBaseInterval: 150
+  });
+  disableServiceWorkerEvents(
+    'https://example.net/page/timeout'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_timeout() {
+  let handshakes = 0;
+  let timeoutDefer = Promise.defer();
+  let registers = 0;
+
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+
+  PushService._generateID = () => channelID;
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          switch (handshakes) {
+          case 0:
+            equal(request.uaid, null, 'Should not include device ID');
+            deepEqual(request.channelIDs, [],
+              'Should include empty channel list');
+            break;
+
+          case 1:
+            // Should use the previously-issued device ID when reconnecting,
+            // but should not include the timed-out channel ID.
+            equal(request.uaid, userAgentID,
+              'Should include device ID on reconnect');
+            deepEqual(request.channelIDs, [],
+              'Should not include failed channel ID');
+            break;
+
+          default:
+            ok(false, 'Unexpected reconnect attempt ' + handshakes);
+          }
+          handshakes++;
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID,
+          }));
+        },
+        onRegister(request) {
+          equal(request.channelID, channelID,
+            'Wrong channel ID in register request');
+          setTimeout(() => {
+            // Should ignore replies for timed-out requests.
+            this.serverSendMsg(JSON.stringify({
+              messageType: 'register',
+              status: 200,
+              channelID: channelID,
+              uaid: userAgentID,
+              pushEndpoint: 'https://example.com/update/timeout',
+            }));
+            timeoutDefer.resolve();
+          }, 2000);
+          registers++;
+        }
+      });
+    }
+  });
+
+  yield rejects(
+    PushNotificationService.register('https://example.net/page/timeout'),
+    function(error) {
+      return error == 'TimeoutError';
+    },
+    'Wrong error for request timeout'
+  );
+
+  let record = yield promiseDB.getByChannelID(channelID);
+  ok(!record, 'Should not store records for timed-out responses');
+
+  yield waitForPromise(
+    timeoutDefer.promise,
+    DEFAULT_TIMEOUT,
+    'Reconnect timed out'
+  );
+  equal(registers, 1, 'Should not handle timed-out register requests');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_wrong_id.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_wrong_id.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_wrong_id.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_wrong_id.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,71 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = '84afc774-6995-40d1-9c90-8c34ddcd0cb4';
+const clientChannelID = '4b42a681c99e4dfbbb166a7e01a09b8b';
+const serverChannelID = '3f5aeb89c6e8405a9569619522783436';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID,
+    requestTimeout: 1000,
+    retryBaseInterval: 150
+  });
+  disableServiceWorkerEvents(
+    'https://example.com/mismatched'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_wrong_id() {
+  // Should reconnect after the register request times out.
+  let registers = 0;
+  let helloDefer = Promise.defer();
+  let helloDone = after(2, helloDefer.resolve);
+
+  PushService._generateID = () => clientChannelID;
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID
+          }));
+          helloDone();
+        },
+        onRegister(request) {
+          equal(request.channelID, clientChannelID,
+            'Register: wrong channel ID');
+          registers++;
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'register',
+            status: 200,
+            // Reply with a different channel ID. Since the ID is used as a
+            // nonce, the registration request will time out.
+            channelID: serverChannelID
+          }));
+        }
+      });
+    }
+  });
+
+  yield rejects(
+    PushNotificationService.register('https://example.com/mismatched'),
+    function(error) {
+      return error == 'TimeoutError';
+    },
+    'Wrong error for mismatched register reply'
+  );
+
+  yield waitForPromise(helloDefer.promise, DEFAULT_TIMEOUT,
+    'Reconnect after mismatched register reply timed out');
+  equal(registers, 1, 'Wrong register count');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_wrong_type.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_wrong_type.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_register_wrong_type.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_register_wrong_type.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,67 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = 'c293fdc5-a75e-4eb1-af88-a203991c0787';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    requestTimeout: 1000,
+    retryBaseInterval: 150
+  });
+  disableServiceWorkerEvents(
+    'https://example.com/mistyped'
+  );
+  run_next_test();
+}
+
+add_task(function* test_register_wrong_type() {
+  let registers = 0;
+  let helloDefer = Promise.defer();
+  let helloDone = after(2, helloDefer.resolve);
+
+  PushService._generateID = () => '1234';
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID
+          }));
+          helloDone();
+        },
+        onRegister(request) {
+          registers++;
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'register',
+            status: 200,
+            channelID: 1234,
+            uaid: userAgentID,
+            pushEndpoint: 'https://example.org/update/wrong-type'
+          }));
+        }
+      });
+    }
+  });
+
+  let promise =
+
+  yield rejects(
+    PushNotificationService.register('https://example.com/mistyped'),
+    function(error) {
+      return error == 'TimeoutError';
+    },
+    'Wrong error for non-string channel ID'
+  );
+
+  yield waitForPromise(helloDefer.promise, DEFAULT_TIMEOUT,
+    'Reconnect after sending non-string channel ID timed out');
+  equal(registers, 1, 'Wrong register count');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_registration_error.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_registration_error.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_registration_error.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_registration_error.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,39 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID: '6faed1f0-1439-4aac-a978-db21c81cd5eb'
+  });
+  run_next_test();
+}
+
+add_task(function* test_registrations_error() {
+  let db = new PushDB();
+  do_register_cleanup(() => cleanupDatabase(db));
+
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db: makeStub(db, {
+      getByScope(prev, scope, successCb, failureCb) {
+        failureCb('oops');
+      }
+    }),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri);
+    }
+  });
+
+  yield rejects(
+    PushNotificationService.registration('https://example.net/1'),
+    function(error) {
+      return error == 'Database error';
+    },
+    'Wrong message'
+  );
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_registration_missing_scope.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_registration_missing_scope.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_registration_missing_scope.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_registration_missing_scope.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,28 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  run_next_test();
+}
+
+add_task(function* test_registration_missing_scope() {
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri);
+    }
+  });
+  yield rejects(
+    PushNotificationService.registration(''),
+    function(error) {
+      return error == 'Database error';
+    },
+    'Record missing page and manifest URLs'
+  );
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_registration_none.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_registration_none.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_registration_none.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_registration_none.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,28 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = 'a722e448-c481-4c48-aea0-fc411cb7c9ed';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({userAgentID});
+  run_next_test();
+}
+
+// Should not open a connection if the client has no registrations.
+add_task(function* test_registration_none() {
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri);
+    }
+  });
+
+  let registration = yield PushNotificationService.registration(
+    'https://example.net/1');
+  ok(!registration, 'Should not open a connection without registration');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_registration_success.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_registration_success.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_registration_success.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_registration_success.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,67 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = '997ee7ba-36b1-4526-ae9e-2d3f38d6efe8';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({userAgentID});
+  run_next_test();
+}
+
+add_task(function* test_registration_success() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  let records = [{
+    channelID: 'bf001fe0-2684-42f2-bc4d-a3e14b11dd5b',
+    pushEndpoint: 'https://example.com/update/same-manifest/1',
+    scope: 'https://example.net/a',
+    version: 5
+  }, {
+    channelID: 'f6edfbcd-79d6-49b8-9766-48b9dcfeff0f',
+    pushEndpoint: 'https://example.com/update/same-manifest/2',
+    scope: 'https://example.net/b',
+    version: 10
+  }, {
+    channelID: 'b1cf38c9-6836-4d29-8a30-a3e98d59b728',
+    pushEndpoint: 'https://example.org/update/different-manifest',
+    scope: 'https://example.org/c',
+    version: 15
+  }];
+  for (let record of records) {
+    yield promiseDB.put(record);
+  }
+
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          equal(request.uaid, userAgentID, 'Wrong device ID in handshake');
+          deepEqual(request.channelIDs.sort(), [
+            'b1cf38c9-6836-4d29-8a30-a3e98d59b728',
+            'bf001fe0-2684-42f2-bc4d-a3e14b11dd5b',
+            'f6edfbcd-79d6-49b8-9766-48b9dcfeff0f',
+          ], 'Wrong channel list in handshake');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID
+          }));
+        }
+      });
+    }
+  });
+
+  let registration = yield PushNotificationService.registration(
+    'https://example.net/a');
+  deepEqual(registration, {
+    pushEndpoint: 'https://example.com/update/same-manifest/1',
+    version: 5
+  }, 'Should include registrations for all pages with this manifest');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_unregister_empty_scope.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_unregister_empty_scope.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_unregister_empty_scope.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_unregister_empty_scope.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,37 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  run_next_test();
+}
+
+add_task(function* test_unregister_empty_scope() {
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: '5619557c-86fe-4711-8078-d1fd6987aef7'
+          }));
+        }
+      });
+    }
+  });
+
+  yield rejects(
+    PushNotificationService.unregister(''),
+    function(error) {
+      return error == 'NotFoundError';
+    },
+    'Wrong error for empty endpoint'
+  );
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_unregister_error.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_unregister_error.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_unregister_error.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_unregister_error.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,65 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const channelID = '00c7fa13-7b71-447d-bd27-a91abc09d1b2';
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  run_next_test();
+}
+
+add_task(function* test_unregister_error() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  yield promiseDB.put({
+    channelID: channelID,
+    pushEndpoint: 'https://example.org/update/failure',
+    scope: 'https://example.net/page/failure',
+    version: 1
+  });
+
+  let unregisterDefer = Promise.defer();
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: '083e6c17-1063-4677-8638-ab705aebebc2'
+          }));
+        },
+        onUnregister(request) {
+          // The server is notified out-of-band. Since channels may be pruned,
+          // any failures are swallowed.
+          equal(request.channelID, channelID, 'Unregister: wrong channel ID');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'unregister',
+            status: 500,
+            error: 'omg, everything is exploding',
+            channelID
+          }));
+          unregisterDefer.resolve();
+        }
+      });
+    }
+  });
+
+  yield PushNotificationService.unregister(
+    'https://example.net/page/failure');
+
+  let result = yield promiseDB.getByChannelID(channelID);
+  ok(!result, 'Deleted push record exists');
+
+  // Make sure we send a request to the server.
+  yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
+    'Timed out waiting for unregister');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_unregister_invalid_json.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_unregister_invalid_json.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_unregister_invalid_json.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_unregister_invalid_json.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,78 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const userAgentID = '7f0af1bb-7e1f-4fb8-8e4a-e8de434abde3';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID,
+    requestTimeout: 150,
+    retryBaseInterval: 150
+  });
+  run_next_test();
+}
+
+add_task(function* test_unregister_invalid_json() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  let records = [{
+    channelID: '87902e90-c57e-4d18-8354-013f4a556559',
+    pushEndpoint: 'https://example.org/update/1',
+    scope: 'https://example.edu/page/1',
+    version: 1
+  }, {
+    channelID: '057caa8f-9b99-47ff-891c-adad18ce603e',
+    pushEndpoint: 'https://example.com/update/2',
+    scope: 'https://example.net/page/1',
+    version: 1
+  }];
+  for (let record of records) {
+    yield promiseDB.put(record);
+  }
+
+  let unregisterDefer = Promise.defer();
+  let unregisterDone = after(2, unregisterDefer.resolve);
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID
+          }));
+        },
+        onUnregister(request) {
+          this.serverSendMsg(');alert(1);(');
+          unregisterDone();
+        }
+      });
+    }
+  });
+
+  // "unregister" is fire-and-forget: it's sent via _send(), not
+  // _sendRequest().
+  yield PushNotificationService.unregister(
+    'https://example.edu/page/1');
+  let record = yield promiseDB.getByChannelID(
+    '87902e90-c57e-4d18-8354-013f4a556559');
+  ok(!record, 'Failed to delete unregistered record');
+
+  yield PushNotificationService.unregister(
+    'https://example.net/page/1');
+  record = yield promiseDB.getByChannelID(
+    '057caa8f-9b99-47ff-891c-adad18ce603e');
+  ok(!record,
+    'Failed to delete unregistered record after receiving invalid JSON');
+
+  yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
+    'Timed out waiting for unregister');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_unregister_not_found.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_unregister_not_found.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_unregister_not_found.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_unregister_not_found.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,35 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  run_next_test();
+}
+
+add_task(function* test_unregister_not_found() {
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: 'f074ed80-d479-44fa-ba65-792104a79ea9'
+          }));
+        }
+      });
+    }
+  });
+
+  let promise = PushNotificationService.unregister(
+    'https://example.net/nonexistent');
+  yield rejects(promise, function(error) {
+    return error == 'NotFoundError';
+  }, 'Wrong error for nonexistent scope');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_unregister_success.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_unregister_success.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/test_unregister_success.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/test_unregister_success.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,60 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService} = serviceExports;
+
+const channelID = 'db0a7021-ec2d-4bd3-8802-7a6966f10ed8';
+
+function run_test() {
+  do_get_profile();
+  setPrefs();
+  run_next_test();
+}
+
+add_task(function* test_unregister_success() {
+  let db = new PushDB();
+  let promiseDB = promisifyDatabase(db);
+  do_register_cleanup(() => cleanupDatabase(db));
+  yield promiseDB.put({
+    channelID,
+    pushEndpoint: 'https://example.org/update/unregister-success',
+    scope: 'https://example.com/page/unregister-success',
+    version: 1
+  });
+
+  let unregisterDefer = Promise.defer();
+  PushService.init({
+    networkInfo: new MockDesktopNetworkInfo(),
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: 'fbe865a6-aeb8-446f-873c-aeebdb8d493c'
+          }));
+        },
+        onUnregister(request) {
+          equal(request.channelID, channelID, 'Should include the channel ID');
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'unregister',
+            status: 200,
+            channelID
+          }));
+          unregisterDefer.resolve();
+        }
+      });
+    }
+  });
+
+  yield PushNotificationService.unregister(
+    'https://example.com/page/unregister-success');
+  let record = yield promiseDB.getByChannelID(channelID);
+  ok(!record, 'Unregister did not remove record');
+
+  yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
+    'Timed out waiting for unregister');
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/xpcshell.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/xpcshell.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/push/test/xpcshell/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/push/test/xpcshell/xpcshell.ini	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,34 @@
+[DEFAULT]
+head = head.js
+tail =
+# Push notifications and alarms are currently disabled on Android.
+skip-if = toolkit == 'android'
+
+[test_clearAll_successful.js]
+run-sequentially = This will delete all existing push subscritions.
+[test_notification_ack.js]
+[test_notification_duplicate.js]
+[test_notification_error.js]
+[test_notification_incomplete.js]
+[test_notification_version_string.js]
+[test_register_case.js]
+[test_register_flush.js]
+[test_register_invalid_channel.js]
+[test_register_invalid_endpoint.js]
+[test_register_invalid_json.js]
+[test_register_no_id.js]
+[test_register_request_queue.js]
+[test_register_rollback.js]
+[test_register_success.js]
+[test_register_timeout.js]
+[test_register_wrong_id.js]
+[test_register_wrong_type.js]
+[test_registration_error.js]
+[test_registration_missing_scope.js]
+[test_registration_none.js]
+[test_registration_success.js]
+[test_unregister_empty_scope.js]
+[test_unregister_error.js]
+[test_unregister_invalid_json.js]
+[test_unregister_not_found.js]
+[test_unregister_success.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/quota/Client.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/quota/Client.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/quota/Client.h	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/quota/Client.h	2015-04-24 19:31:11.000000000 +0000
@@ -20,7 +20,6 @@
 
 BEGIN_QUOTA_NAMESPACE
 
-class OriginOrPatternString;
 class UsageInfo;
 
 // An abstract interface for quota manager clients.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/quota/nsIOfflineStorage.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/quota/nsIOfflineStorage.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/quota/nsIOfflineStorage.h	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/quota/nsIOfflineStorage.h	2015-04-24 19:31:11.000000000 +0000
@@ -12,8 +12,6 @@
 #define NS_OFFLINESTORAGE_IID \
   {0x91c57bf2, 0x0eda, 0x4db6, {0x9f, 0xf6, 0xcb, 0x38, 0x26, 0x8d, 0xb3, 0x01}}
 
-class nsPIDOMWindow;
-
 namespace mozilla {
 namespace dom {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/quota/QuotaManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/quota/QuotaManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/quota/QuotaManager.h	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/quota/QuotaManager.h	2015-04-24 19:31:11.000000000 +0000
@@ -40,7 +40,6 @@
 
 BEGIN_QUOTA_NAMESPACE
 
-class AcquireListener;
 class AsyncUsageRunnable;
 class CollectOriginsHelper;
 class FinalizeOriginEvictionRunnable;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/security/nsCORSListenerProxy.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/security/nsCORSListenerProxy.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/security/nsCORSListenerProxy.cpp	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/security/nsCORSListenerProxy.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -471,7 +471,7 @@
 }
 
 nsresult
-nsCORSListenerProxy::Init(nsIChannel* aChannel, bool aAllowDataURI)
+nsCORSListenerProxy::Init(nsIChannel* aChannel, DataURIHandling aAllowDataURI)
 {
   aChannel->GetNotificationCallbacks(getter_AddRefs(mOuterNotificationCallbacks));
   aChannel->SetNotificationCallbacks(this);
@@ -798,7 +798,7 @@
   NS_ASSERTION(mNewRedirectChannel, "mNewRedirectChannel not set in callback");
 
   if (NS_SUCCEEDED(result)) {
-      nsresult rv = UpdateChannel(mNewRedirectChannel);
+    nsresult rv = UpdateChannel(mNewRedirectChannel, DataURIHandling::Disallow);
       if (NS_FAILED(rv)) {
           NS_WARNING("nsCORSListenerProxy::OnRedirectVerifyCallback: "
                      "UpdateChannel() returned failure");
@@ -818,7 +818,8 @@
 }
 
 nsresult
-nsCORSListenerProxy::UpdateChannel(nsIChannel* aChannel, bool aAllowDataURI)
+nsCORSListenerProxy::UpdateChannel(nsIChannel* aChannel,
+                                   DataURIHandling aAllowDataURI)
 {
   nsCOMPtr<nsIURI> uri, originalURI;
   nsresult rv = NS_GetFinalChannelURI(aChannel, getter_AddRefs(uri));
@@ -827,7 +828,7 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   // exempt data URIs from the same origin check.
-  if (aAllowDataURI && originalURI == uri) {
+  if (aAllowDataURI == DataURIHandling::Allow && originalURI == uri) {
     bool dataScheme = false;
     rv = uri->SchemeIs("data", &dataScheme);
     NS_ENSURE_SUCCESS(rv, rv);
@@ -1240,7 +1241,7 @@
     new nsCORSListenerProxy(preflightListener, aPrincipal,
                             aWithCredentials, method,
                             aUnsafeHeaders);
-  rv = corsListener->Init(preflightChannel);
+  rv = corsListener->Init(preflightChannel, DataURIHandling::Disallow);
   NS_ENSURE_SUCCESS(rv, rv);
   preflightListener = corsListener;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/security/nsCORSListenerProxy.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/security/nsCORSListenerProxy.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/security/nsCORSListenerProxy.h	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/security/nsCORSListenerProxy.h	2015-04-24 19:31:11.000000000 +0000
@@ -18,7 +18,6 @@
 #include "mozilla/Attributes.h"
 
 class nsIURI;
-class nsIParser;
 class nsIPrincipal;
 class nsINetworkInterceptController;
 
@@ -30,6 +29,12 @@
                       nsTArray<nsCString>& aACUnsafeHeaders,
                       nsIChannel** aPreflightChannel);
 
+enum class DataURIHandling
+{
+  Allow,
+  Disallow
+};
+
 class nsCORSListenerProxy final : public nsIStreamListener,
                                   public nsIInterfaceRequestor,
                                   public nsIChannelEventSink,
@@ -57,14 +62,14 @@
 
   static void Shutdown();
 
-  nsresult Init(nsIChannel* aChannel, bool aAllowDataURI = false);
+  nsresult Init(nsIChannel* aChannel, DataURIHandling aAllowDataURI);
 
   void SetInterceptController(nsINetworkInterceptController* aInterceptController);
 
 private:
   ~nsCORSListenerProxy();
 
-  nsresult UpdateChannel(nsIChannel* aChannel, bool aAllowDataURI = false);
+  nsresult UpdateChannel(nsIChannel* aChannel, DataURIHandling aAllowDataURI);
   nsresult CheckRequestApproved(nsIRequest* aRequest);
 
   nsCOMPtr<nsIStreamListener> mOuterListener;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/smil/nsISMILAttr.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/smil/nsISMILAttr.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/smil/nsISMILAttr.h	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/smil/nsISMILAttr.h	2015-04-24 19:31:12.000000000 +0000
@@ -9,7 +9,6 @@
 #include "nscore.h"
 
 class nsSMILValue;
-class nsISMILType;
 class nsIContent;
 class nsAString;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/nsISVGPoint.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/nsISVGPoint.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/nsISVGPoint.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/nsISVGPoint.h	2015-04-24 19:31:12.000000000 +0000
@@ -11,8 +11,6 @@
 #include "mozilla/dom/SVGPointBinding.h"
 #include "DOMSVGPointList.h"
 
-class nsSVGElement;
-
 // {d6b6c440-af8d-40ee-856b-02a317cab275}
 #define MOZILLA_NSISVGPOINT_IID \
   { 0xd6b6c440, 0xaf8d, 0x40ee, \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/nsSVGBoolean.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/nsSVGBoolean.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/nsSVGBoolean.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/nsSVGBoolean.h	2015-04-24 19:31:12.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/Attributes.h"
 
 class nsIAtom;
-class nsISupports;
 class nsSMILValue;
 class nsSVGElement;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/nsSVGElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/nsSVGElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/nsSVGElement.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/nsSVGElement.h	2015-04-24 19:31:12.000000000 +0000
@@ -33,13 +33,11 @@
 class nsSVGLength2;
 class nsSVGNumber2;
 class nsSVGNumberPair;
-class nsSVGPathGeometryElement;
 class nsSVGString;
 class nsSVGViewBox;
 
 namespace mozilla {
 namespace dom {
-class CSSValue;
 class SVGSVGElement;
 
 static const unsigned short SVG_UNIT_TYPE_UNKNOWN           = 0;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/nsSVGFilters.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/nsSVGFilters.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/nsSVGFilters.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/nsSVGFilters.h	2015-04-24 19:31:12.000000000 +0000
@@ -16,7 +16,6 @@
 #include "FilterSupport.h"
 
 class nsSVGFilterInstance;
-class nsSVGFilterResource;
 class nsSVGNumberPair;
 
 struct nsSVGStringInfo {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/nsSVGPathGeometryElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/nsSVGPathGeometryElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/nsSVGPathGeometryElement.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/nsSVGPathGeometryElement.h	2015-04-24 19:31:12.000000000 +0000
@@ -9,8 +9,6 @@
 #include "mozilla/gfx/2D.h"
 #include "SVGGraphicsElement.h"
 
-class gfxMatrix;
-
 struct nsSVGMark {
   enum Type {
     eStart,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGContentUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGContentUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGContentUtils.h	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGContentUtils.h	2015-04-24 19:31:12.000000000 +0000
@@ -21,7 +21,6 @@
 class nsIContent;
 class nsIDocument;
 class nsIFrame;
-class nsPresContext;
 class nsStyleContext;
 class nsStyleCoord;
 class nsSVGElement;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGDocument.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGDocument.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGDocument.cpp	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGDocument.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -105,7 +105,7 @@
 
   if (IsBeingUsedAsImage()) {
     // nsDocumentViewer::CreateStyleSet skipped loading all user-agent/user
-    // style sheets in this case, but we'll need B2G/Fennec/Metro's
+    // style sheets in this case, but we'll need B2G/Fennec's
     // content.css. We could load all the sheets registered with the
     // nsIStyleSheetService (and maybe we should) but most likely it isn't
     // desirable or necessary for foreignObject in SVG-as-an-image. Instead we
@@ -114,7 +114,7 @@
     // SVG-as-an-image down.
     //
     // We do this before adding UASheet() etc. below because
-    // EnsureOnDemandBuiltInUASheet prepends, and B2G/Fennec/Metro's
+    // EnsureOnDemandBuiltInUASheet prepends, and B2G/Fennec's
     // content.css must come after UASheet() etc.
     nsCOMPtr<nsICategoryManager> catMan =
     do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGFragmentIdentifier.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGFragmentIdentifier.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGFragmentIdentifier.h	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGFragmentIdentifier.h	2015-04-24 19:31:12.000000000 +0000
@@ -9,7 +9,6 @@
 #include "nsString.h"
 
 class nsIDocument;
-class nsSVGViewElement;
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGIRect.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGIRect.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGIRect.h	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGIRect.h	2015-04-24 19:31:12.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsWrapperCache.h"
 
 class nsIContent;
-class nsSVGElement;
 
 namespace mozilla {
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGSVGElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGSVGElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGSVGElement.h	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGSVGElement.h	2015-04-24 19:31:12.000000000 +0000
@@ -24,7 +24,6 @@
 class nsSMILTimeContainer;
 class nsSVGOuterSVGFrame;
 class nsSVGInnerSVGFrame;
-class nsSVGImageFrame;
 
 namespace mozilla {
 class AutoSVGRenderingState;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGTextPositioningElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGTextPositioningElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/svg/SVGTextPositioningElement.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/svg/SVGTextPositioningElement.h	2015-04-24 19:31:12.000000000 +0000
@@ -10,8 +10,6 @@
 #include "SVGAnimatedLengthList.h"
 #include "SVGAnimatedNumberList.h"
 
-class nsSVGElement;
-
 namespace mozilla {
 class SVGAnimatedLengthList;
 class DOMSVGAnimatedLengthList;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/system/gonk/AutoMounterSetting.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/system/gonk/AutoMounterSetting.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/system/gonk/AutoMounterSetting.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/system/gonk/AutoMounterSetting.h	2015-04-24 19:31:12.000000000 +0000
@@ -10,8 +10,6 @@
 namespace mozilla {
 namespace system {
 
-class ResultListener;
-
 class AutoMounterSetting : public nsIObserver
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/system/gonk/MozMtpServer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/system/gonk/MozMtpServer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/system/gonk/MozMtpServer.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/system/gonk/MozMtpServer.h	2015-04-24 19:31:12.000000000 +0000
@@ -16,12 +16,6 @@
 #include "nsCOMPtr.h"
 #include "nsIThread.h"
 
-namespace mozilla {
-namespace system {
-  class Volume;
-}
-}
-
 BEGIN_MTP_NAMESPACE
 using namespace android;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/system/gonk/nsVolume.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/system/gonk/nsVolume.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/system/gonk/nsVolume.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/system/gonk/nsVolume.h	2015-04-24 19:31:12.000000000 +0000
@@ -14,7 +14,6 @@
 namespace system {
 
 class Volume;
-class VolumeMountLock;
 
 class nsVolume : public nsIVolume
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/system/gonk/nsVolumeService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/system/gonk/nsVolumeService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/system/gonk/nsVolumeService.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/system/gonk/nsVolumeService.h	2015-04-24 19:31:12.000000000 +0000
@@ -22,7 +22,6 @@
 
 namespace system {
 
-class WakeLockCallback;
 class Volume;
 
 /***************************************************************************
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/telephony/TelephonyCall.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/telephony/TelephonyCall.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/telephony/TelephonyCall.cpp	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/telephony/TelephonyCall.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -87,7 +87,11 @@
 {
   nsRefPtr<TelephonyCall> kungFuDeathGrip(this);
 
-  nsString stateString;
+  // Update the internal state.
+  mCallState = aCallState;
+
+  // Indicate whether the external state have been changed.
+  bool externalStateChanged = true;
   switch (aCallState) {
     // These states are used internally to mark this call is currently being
     // controlled, and we should block consecutive requests of the same type
@@ -96,36 +100,32 @@
     case nsITelephonyService::CALL_STATE_DISCONNECTING:
     case nsITelephonyService::CALL_STATE_HOLDING:
     case nsITelephonyService::CALL_STATE_RESUMING:
+      externalStateChanged = false;
       break;
     // These states will be translated into literal strings which are used to
     // show the current status of this call.
     case nsITelephonyService::CALL_STATE_DIALING:
-      stateString.AssignLiteral("dialing");
+      mState.AssignLiteral("dialing");
       break;
     case nsITelephonyService::CALL_STATE_ALERTING:
-      stateString.AssignLiteral("alerting");
+      mState.AssignLiteral("alerting");
       break;
     case nsITelephonyService::CALL_STATE_CONNECTED:
-      stateString.AssignLiteral("connected");
+      mState.AssignLiteral("connected");
       break;
     case nsITelephonyService::CALL_STATE_HELD:
-      stateString.AssignLiteral("held");
+      mState.AssignLiteral("held");
       break;
     case nsITelephonyService::CALL_STATE_DISCONNECTED:
-      stateString.AssignLiteral("disconnected");
+      mState.AssignLiteral("disconnected");
       break;
     case nsITelephonyService::CALL_STATE_INCOMING:
-      stateString.AssignLiteral("incoming");
+      mState.AssignLiteral("incoming");
       break;
     default:
       NS_NOTREACHED("Unknown state!");
   }
 
-  mCallState = aCallState;
-  if (!stateString.IsEmpty()) {
-    mState = stateString;
-  }
-
   if (aCallState == nsITelephonyService::CALL_STATE_DISCONNECTED) {
     NS_ASSERTION(mLive, "Should be live!");
     mLive = false;
@@ -144,7 +144,7 @@
     }
   }
 
-  if (aFireEvents) {
+  if (aFireEvents && externalStateChanged) {
     nsresult rv = DispatchCallEvent(NS_LITERAL_STRING("statechange"), this);
     if (NS_FAILED(rv)) {
       NS_WARNING("Failed to dispatch specific event!");
@@ -153,7 +153,7 @@
     // This can change if the statechange handler called back here... Need to
     // figure out something smarter.
     if (mCallState == aCallState) {
-      rv = DispatchCallEvent(stateString, this);
+      rv = DispatchCallEvent(mState, this);
       if (NS_FAILED(rv)) {
         NS_WARNING("Failed to dispatch specific event!");
       }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/telephony/TelephonyCallGroup.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/telephony/TelephonyCallGroup.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/telephony/TelephonyCallGroup.cpp	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/telephony/TelephonyCallGroup.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -87,41 +87,47 @@
   if (mCallState == aCallState) {
     return;
   }
+  // Update the internal state.
+  mCallState = aCallState;
 
-  nsString stateString;
+  // Indicate whether the external state should be changed.
+  bool externalStateChanged = true;
   switch (aCallState) {
+    // These states are used internally to mark this CallGroup is currently
+    // being controlled, and we should block consecutive requests of the same
+    // type according to these states.
+    case nsITelephonyService::CALL_STATE_HOLDING:
+    case nsITelephonyService::CALL_STATE_RESUMING:
+      externalStateChanged = false;
+      break;
+    // These states will be translated into literal strings which are used to
+    // show the current status of this CallGroup.
     case nsITelephonyService::CALL_STATE_UNKNOWN:
+      mState.AssignLiteral("");
       break;
     case nsITelephonyService::CALL_STATE_CONNECTED:
-      stateString.AssignLiteral("connected");
-      break;
-    case nsITelephonyService::CALL_STATE_HOLDING:
-      stateString.AssignLiteral("holding");
+      mState.AssignLiteral("connected");
       break;
     case nsITelephonyService::CALL_STATE_HELD:
-      stateString.AssignLiteral("held");
-      break;
-    case nsITelephonyService::CALL_STATE_RESUMING:
-      stateString.AssignLiteral("resuming");
+      mState.AssignLiteral("held");
       break;
     default:
       NS_NOTREACHED("Unknown state!");
   }
 
-  mState = stateString;
-  mCallState = aCallState;
-
-  nsresult rv = DispatchCallEvent(NS_LITERAL_STRING("statechange"), nullptr);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Failed to dispatch specific event!");
-  }
-  if (!stateString.IsEmpty()) {
-    // This can change if the statechange handler called back here... Need to
-    // figure out something smarter.
-    if (mCallState == aCallState) {
-      rv = DispatchCallEvent(stateString, nullptr);
-      if (NS_FAILED(rv)) {
-        NS_WARNING("Failed to dispatch specific event!");
+  if (externalStateChanged) {
+    nsresult rv = DispatchCallEvent(NS_LITERAL_STRING("statechange"), nullptr);
+    if (NS_FAILED(rv)) {
+      NS_WARNING("Failed to dispatch specific event!");
+    }
+    if (!mState.IsEmpty()) {
+      // This can change if the statechange handler called back here... Need to
+      // figure out something smarter.
+      if (mCallState == aCallState) {
+        rv = DispatchCallEvent(mState, nullptr);
+        if (NS_FAILED(rv)) {
+          NS_WARNING("Failed to dispatch specific event!");
+        }
       }
     }
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/telephony/TelephonyCallGroup.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/telephony/TelephonyCallGroup.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/telephony/TelephonyCallGroup.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/telephony/TelephonyCallGroup.h	2015-04-24 19:31:13.000000000 +0000
@@ -70,9 +70,7 @@
 
   IMPL_EVENT_HANDLER(statechange)
   IMPL_EVENT_HANDLER(connected)
-  IMPL_EVENT_HANDLER(holding)
   IMPL_EVENT_HANDLER(held)
-  IMPL_EVENT_HANDLER(resuming)
   IMPL_EVENT_HANDLER(callschanged)
   IMPL_EVENT_HANDLER(error)
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/telephony/test/marionette/head.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/telephony/test/marionette/head.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/telephony/test/marionette/head.js	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/telephony/test/marionette/head.js	2015-04-24 19:31:13.000000000 +0000
@@ -777,8 +777,7 @@
       promises.push(waitForNamedStateEvent(call, "held"));
     }
 
-    let promise = waitForNamedStateEvent(conference, "holding")
-      .then(() => waitForNamedStateEvent(conference, "held"))
+    let promise = waitForNamedStateEvent(conference, "held")
       .then(() => {
         if (typeof heldCallback === "function") {
           heldCallback();
@@ -810,8 +809,7 @@
       promises.push(waitForNamedStateEvent(call, "connected"));
     }
 
-    let promise = waitForNamedStateEvent(conference, "resuming")
-      .then(() => waitForNamedStateEvent(conference, "connected"))
+    let promise = waitForNamedStateEvent(conference, "connected")
       .then(() => {
         if (typeof connectedCallback === "function") {
           connectedCallback();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/tests/mochitest/gamepad/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/tests/mochitest/gamepad/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/tests/mochitest/gamepad/mochitest.ini	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/tests/mochitest/gamepad/mochitest.ini	2015-04-24 19:31:15.000000000 +0000
@@ -1,18 +1,13 @@
 [DEFAULT]
+skip-if=e10s || (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 support-files =
   gamepad_frame.html
   gamepad_frame_state.html
   mock_gamepad.js
 
 [test_check_timestamp.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_gamepad.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_gamepad_connect_events.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_gamepad_frame_state_sync.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_gamepad_hidden_frame.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_navigator_gamepads.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/tests/mochitest/gamepad/test_check_timestamp.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/tests/mochitest/gamepad/test_check_timestamp.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/tests/mochitest/gamepad/test_check_timestamp.html	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/tests/mochitest/gamepad/test_check_timestamp.html	2015-04-24 19:31:15.000000000 +0000
@@ -11,6 +11,7 @@
 <script type="text/javascript" src="mock_gamepad.js"></script>
 <script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
+
 var index = GamepadService.addGamepad("test gamepad", // id
                                       SpecialPowers.Ci.nsIGamepadServiceTest.NO_MAPPING,
                                       4, // buttons
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/tests/mochitest/gamepad/test_gamepad.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/tests/mochitest/gamepad/test_gamepad.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/tests/mochitest/gamepad/test_gamepad.html	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/tests/mochitest/gamepad/test_gamepad.html	2015-04-24 19:31:15.000000000 +0000
@@ -17,19 +17,29 @@
                                       SpecialPowers.Ci.nsIGamepadServiceTest.STANDARD_MAPPING,
                                       4, // buttons
                                       2);// axes
-// Press a button
 GamepadService.newButtonEvent(index, 0, true);
 function connecthandler(e) {
   ok(e.gamepad.timestamp <= performance.now());
+  is(e.gamepad.index, 0, "correct gamepad index");
   is(e.gamepad.id, "test gamepad", "correct gamepad name");
   is(e.gamepad.mapping, "standard", "standard mapping");
   is(e.gamepad.buttons.length, 4, "correct number of buttons");
   is(e.gamepad.axes.length, 2, "correct number of axes");
+  // Press a button
+  GamepadService.newButtonEvent(index, 0, true);
+  gamepads = navigator.getGamepads();
+  is(gamepads[0].buttons[0].pressed, true, "gamepad button should register as pressed")
+  GamepadService.newButtonValueEvent(index, 1, true, 0.5);
+  gamepads = navigator.getGamepads();
+  is(gamepads[0].buttons[1].pressed, true, "gamepad button should register as pressed")
+  is(gamepads[0].buttons[1].value, 0.5, "gamepad button value should be 0.5")
+
   SimpleTest.executeSoon(function() {
     GamepadService.removeGamepad(index);
     SimpleTest.finish();
   });
 }
+
 </script>
 </body>
 </html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/tests/mochitest/gamepad/test_navigator_gamepads.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/tests/mochitest/gamepad/test_navigator_gamepads.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/tests/mochitest/gamepad/test_navigator_gamepads.html	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/tests/mochitest/gamepad/test_navigator_gamepads.html	2015-04-24 19:31:15.000000000 +0000
@@ -37,49 +37,61 @@
 window.addEventListener("gamepadconnected", connecthandler);
 window.addEventListener("gamepaddisconnected", disconnecthandler);
 // Add a gamepad
-var index1 = GamepadService.addGamepad("test gamepad 1", // id
+var internal_index1 = GamepadService.addGamepad("test gamepad 1", // id
                                        SpecialPowers.Ci.nsIGamepadServiceTest.NO_MAPPING,
                                        4, // buttons
                                        2);// axes
-var index2;
+var content_index1 = 0;
+var internal_index2;
+var content_index2 = 1;
 
 // Press a button to make the gamepad visible to the page.
-GamepadService.newButtonEvent(index1, 0, true);
+GamepadService.newButtonEvent(internal_index1, 0, true);
 
 function check_first_gamepad(e) {
+  ok(true, "Checking first gamepad");
   // First gamepad gets added.
   is(e.gamepad.id, "test gamepad 1", "correct gamepad name");
   var gamepads = navigator.getGamepads();
   is(gamepads.length, 1, "should have one gamepad exposed");
   is(gamepads[e.gamepad.index], e.gamepad, "right gamepad exposed at index");
+  is(gamepads[content_index1], e.gamepad, "gamepad counter working correctly");
   // Add a second gamepad, should automatically show up.
-  index2 = GamepadService.addGamepad("test gamepad 2", // id
+  internal_index2 = GamepadService.addGamepad("test gamepad 2", // id
                                      SpecialPowers.Ci.nsIGamepadServiceTest.NO_MAPPING,
                                      4, // buttons
                                      2);// axes
+  ok(true, "Done checking first gamepad");
 }
 
 function check_second_gamepad(e) {
+  ok(true, "Checking seceond gamepad");
   // Second gamepad gets added.
+  is(e.gamepad.index, 1, "gamepad index should be 1")
   is(e.gamepad.id, "test gamepad 2", "correct gamepad name");
   var gamepads = navigator.getGamepads();
   is(gamepads.length, 2, "should have two gamepads exposed");
   is(gamepads[e.gamepad.index], e.gamepad, "right gamepad exposed at index");
+  is(gamepads[content_index2], e.gamepad, "gamepad counter working correctly");
   // Now remove the first one.
-  GamepadService.removeGamepad(index1);
+  GamepadService.removeGamepad(internal_index1);
+  ok(true, "Done checking second gamepad");
 }
 
 function check_gamepad_hole(e) {
+  ok(true, "Checking gamepad hole");
   // First gamepad gets removed.
   var gamepads = navigator.getGamepads();
   is(gamepads.length, 2, "gamepads should have two entries");
-  is(gamepads[index1], null, "should be a hole in the gamepad list");
-  isnot(gamepads[index2], null, "second gamepad should exist");
+  is(gamepads[content_index1], null, "should be a hole in the gamepad list");
+  isnot(gamepads[content_index2], null, "second gamepad should exist");
   // Now remove the second one.
-  GamepadService.removeGamepad(index2);
+  GamepadService.removeGamepad(internal_index2);
+  ok(true, "Done checking gamepad hole");
 }
 
 function check_no_gamepads(e) {
+  ok(true, "Checking no gamepads");
   // Second gamepad gets removed.
   var gamepads = navigator.getGamepads();
   is(gamepads.length, 0, "gamepads should be empty");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/tv/TVChannel.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/tv/TVChannel.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/tv/TVChannel.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/tv/TVChannel.h	2015-04-24 19:31:15.000000000 +0000
@@ -18,7 +18,6 @@
 namespace dom {
 
 class Promise;
-class TVProgram;
 class TVSource;
 
 class TVChannel final : public DOMEventTargetHelper
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/vr/VRDevice.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/vr/VRDevice.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/vr/VRDevice.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/vr/VRDevice.h	2015-04-24 19:31:15.000000000 +0000
@@ -24,8 +24,6 @@
 namespace mozilla {
 namespace dom {
 
-class Element;
-
 class VRFieldOfViewReadOnly : public nsWrapperCache
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/Animation.webidl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/Animation.webidl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/Animation.webidl	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/Animation.webidl	2015-04-24 19:31:15.000000000 +0000
@@ -32,8 +32,9 @@
   readonly attribute Promise<Animation> finished;
   /*
   void cancel ();
-  void finish ();
   */
+  [Throws]
+  void finish ();
   [BinaryName="playFromJS"]
   void play ();
   [BinaryName="pauseFromJS"]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/InstallEvent.webidl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/InstallEvent.webidl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/InstallEvent.webidl	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/InstallEvent.webidl	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-/* -*- 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/.
- *
- * For more information on this interface, please see
- * http://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html
- */
-
-[Constructor(DOMString type, optional InstallEventInit eventInitDict),
- Exposed=ServiceWorker]
-interface InstallEvent : ExtendableEvent {
-  readonly attribute ServiceWorker? activeWorker;
-  void replace();
-};
-
-// Should be in the spec soon to satisfy conventions about events.
-// https://github.com/slightlyoff/ServiceWorker/issues/216.
-dictionary InstallEventInit : ExtendableEventInit {
-  ServiceWorker? activeWorker = null;
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/moz.build	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/moz.build	2015-04-24 19:31:16.000000000 +0000
@@ -256,7 +256,6 @@
     'InputPort.webidl',
     'InputPortManager.webidl',
     'InspectorUtils.webidl',
-    'InstallEvent.webidl',
     'InterAppConnection.webidl',
     'InterAppConnectionRequest.webidl',
     'InterAppMessagePort.webidl',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/MozSelfSupport.webidl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/MozSelfSupport.webidl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/MozSelfSupport.webidl	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/MozSelfSupport.webidl	2015-04-24 19:31:15.000000000 +0000
@@ -39,4 +39,15 @@
    *         Resolved when the FHR payload data has been collected.
    */
   Promise<object> getHealthReportPayload();
+
+  /**
+   * Resets a named pref:
+   * - if there is a default value, then change the value back to default,
+   * - if there's no default value, then delete the pref,
+   * - no-op otherwise.
+   *
+   * @param DOMString
+   *        The name of the pref to reset.
+   */
+  void resetPref(DOMString name);
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/PushSubscription.webidl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/PushSubscription.webidl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/PushSubscription.webidl	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/PushSubscription.webidl	2015-04-24 19:31:16.000000000 +0000
@@ -14,4 +14,5 @@
     readonly attribute USVString endpoint;
     readonly attribute DOMString subscriptionId;
     Promise<boolean> unsubscribe();
-};
\ No newline at end of file
+    jsonifier;
+};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/ServiceWorkerGlobalScope.webidl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/ServiceWorkerGlobalScope.webidl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/ServiceWorkerGlobalScope.webidl	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/ServiceWorkerGlobalScope.webidl	2015-04-24 19:31:16.000000000 +0000
@@ -14,11 +14,7 @@
  Exposed=ServiceWorker]
 interface ServiceWorkerGlobalScope : WorkerGlobalScope {
   readonly attribute Clients clients;
-
-  void update();
-
-  [Throws]
-  Promise<boolean> unregister();
+  readonly attribute ServiceWorkerRegistration registration;
 
   attribute EventHandler oninstall;
   attribute EventHandler onactivate;
@@ -30,4 +26,9 @@
   attribute EventHandler onmessage;
 };
 
+// These are from w3c.github.io/push-api/
+partial interface ServiceWorkerGlobalScope {
+  attribute EventHandler onpush;
+  attribute EventHandler onpushsubscriptionchange;
+};
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/ServiceWorkerRegistration.webidl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/ServiceWorkerRegistration.webidl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/ServiceWorkerRegistration.webidl	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/ServiceWorkerRegistration.webidl	2015-04-24 19:31:16.000000000 +0000
@@ -8,8 +8,8 @@
  *
  */
 
-[Pref="dom.serviceWorkers.enabled",
- Exposed=Window]
+[Func="mozilla::dom::ServiceWorkerRegistrationVisible",
+ Exposed=(Window,Worker)]
 interface ServiceWorkerRegistration : EventTarget {
   [Unforgeable] readonly attribute ServiceWorker? installing;
   [Unforgeable] readonly attribute ServiceWorker? waiting;
@@ -17,6 +17,8 @@
 
   readonly attribute USVString scope;
 
+  void update();
+
   [Throws]
   Promise<boolean> unregister();
 
@@ -26,7 +28,7 @@
 
 partial interface ServiceWorkerRegistration {
 #ifndef MOZ_SIMPLEPUSH
-  [Throws, Pref="dom.push.enabled"]
+  [Throws, Exposed=Window, Pref="dom.push.enabled"]
   readonly attribute PushManager pushManager;
 #endif
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/ServiceWorker.webidl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/ServiceWorker.webidl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/ServiceWorker.webidl	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/ServiceWorker.webidl	2015-04-24 19:31:16.000000000 +0000
@@ -12,7 +12,7 @@
 // https://github.com/slightlyoff/ServiceWorker/issues/189
 [Func="mozilla::dom::workers::ServiceWorkerVisible",
  // FIXME(nsm): Bug 1113522. This is exposed to satisfy webidl constraints, but it won't actually work.
- Exposed=(ServiceWorker,Window)]
+ Exposed=(Worker,Window)]
 interface ServiceWorker : EventTarget {
   readonly attribute USVString scriptURL;
   readonly attribute ServiceWorkerState state;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/TelephonyCallGroup.webidl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/TelephonyCallGroup.webidl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/TelephonyCallGroup.webidl	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/TelephonyCallGroup.webidl	2015-04-24 19:31:16.000000000 +0000
@@ -30,9 +30,7 @@
 
   attribute EventHandler onstatechange;
   attribute EventHandler onconnected;
-  attribute EventHandler onholding;
   attribute EventHandler onheld;
-  attribute EventHandler onresuming;
   attribute EventHandler oncallschanged;
   attribute EventHandler onerror;
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/WebGL2RenderingContext.webidl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/WebGL2RenderingContext.webidl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/webidl/WebGL2RenderingContext.webidl	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/webidl/WebGL2RenderingContext.webidl	2015-04-24 19:31:16.000000000 +0000
@@ -322,8 +322,7 @@
     /* Buffer objects */
     void copyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset,
                            GLintptr writeOffset, GLsizeiptr size);
-    void getBufferSubData(GLenum target, GLintptr offset, ArrayBuffer returnedData);
-    void getBufferSubData(GLenum target, GLintptr offset, ArrayBufferView returnedData);
+    void getBufferSubData(GLenum target, GLintptr offset, ArrayBuffer? returnedData);
 
     /* Framebuffer objects */
     void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/DataStoreCursor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/DataStoreCursor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/DataStoreCursor.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/DataStoreCursor.h	2015-04-24 19:31:16.000000000 +0000
@@ -16,7 +16,6 @@
 class Promise;
 class GlobalObject;
 class DataStoreCursor;
-class DataStoreCursorImpl;
 
 namespace workers {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/DataStore.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/DataStore.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/DataStore.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/DataStore.h	2015-04-24 19:31:16.000000000 +0000
@@ -18,7 +18,6 @@
 
 class Promise;
 class DataStore;
-class DataStoreImpl;
 class StringOrUnsignedLong;
 class OwningStringOrUnsignedLong;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/FileReaderSync.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/FileReaderSync.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/FileReaderSync.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/FileReaderSync.h	2015-04-24 19:31:16.000000000 +0000
@@ -10,7 +10,6 @@
 #include "Workers.h"
 
 class nsIInputStream;
-class nsIDOMBlob;
 
 namespace mozilla {
 class ErrorResult;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/RuntimeService.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/RuntimeService.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/RuntimeService.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/RuntimeService.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -160,6 +160,7 @@
 #define PREF_DOM_CACHES_ENABLED        "dom.caches.enabled"
 #define PREF_WORKERS_LATEST_JS_VERSION "dom.workers.latestJSVersion"
 #define PREF_INTL_ACCEPT_LANGUAGES     "intl.accept_languages"
+#define PREF_SERVICEWORKERS_ENABLED    "dom.serviceWorkers.enabled"
 
 namespace {
 
@@ -1933,6 +1934,10 @@
                                   WorkerPrefChanged,
                                   PREF_DOM_CACHES_ENABLED,
                                   reinterpret_cast<void *>(WORKERPREF_DOM_CACHES))) ||
+      NS_FAILED(Preferences::RegisterCallbackAndCall(
+                                  WorkerPrefChanged,
+                                  PREF_SERVICEWORKERS_ENABLED,
+                                  reinterpret_cast<void *>(WORKERPREF_SERVICEWORKERS))) ||
       NS_FAILED(Preferences::RegisterCallback(LoadRuntimeOptions,
                                               PREF_JS_OPTIONS_PREFIX,
                                               nullptr)) ||
@@ -2130,6 +2135,10 @@
                                                   nullptr)) ||
         NS_FAILED(Preferences::UnregisterCallback(
                                   WorkerPrefChanged,
+                                  PREF_SERVICEWORKERS_ENABLED,
+                                  reinterpret_cast<void *>(WORKERPREF_SERVICEWORKERS))) ||
+        NS_FAILED(Preferences::UnregisterCallback(
+                                  WorkerPrefChanged,
                                   PREF_DOM_CACHES_ENABLED,
                                   reinterpret_cast<void *>(WORKERPREF_DOM_CACHES))) ||
 #if DUMP_CONTROLLED_BY_PREF
@@ -2672,6 +2681,10 @@
     key = WORKERPREF_DOM_CACHES;
     sDefaultPreferences[WORKERPREF_DOM_CACHES] =
       Preferences::GetBool(PREF_DOM_CACHES_ENABLED, false);
+  } else if (key == WORKERPREF_SERVICEWORKERS) {
+    key = WORKERPREF_SERVICEWORKERS;
+    sDefaultPreferences[WORKERPREF_SERVICEWORKERS] =
+      Preferences::GetBool(PREF_SERVICEWORKERS_ENABLED, false);
   }
   // This function should never be registered as a callback for a preference it
   // does not handle.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/RuntimeService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/RuntimeService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/RuntimeService.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/RuntimeService.h	2015-04-24 19:31:16.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsHashKeys.h"
 #include "nsTArray.h"
 
-class nsIRunnable;
 class nsITimer;
 class nsPIDOMWindow;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ScriptLoader.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ScriptLoader.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ScriptLoader.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ScriptLoader.h	2015-04-24 19:31:16.000000000 +0000
@@ -19,12 +19,6 @@
 
 class ErrorResult;
 
-namespace dom {
-
-template <typename T>
-class Sequence;
-
-} // namespace dom
 } // namespace mozilla
 
 BEGIN_WORKERS_NAMESPACE
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerEvents.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerEvents.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerEvents.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerEvents.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -357,20 +357,6 @@
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(ExtendableEvent, Event, mPromise)
 
-InstallEvent::InstallEvent(EventTarget* aOwner)
-  : ExtendableEvent(aOwner)
-  , mActivateImmediately(false)
-{
-}
-
-NS_IMPL_ADDREF_INHERITED(InstallEvent, ExtendableEvent)
-NS_IMPL_RELEASE_INHERITED(InstallEvent, ExtendableEvent)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(InstallEvent)
-NS_INTERFACE_MAP_END_INHERITING(ExtendableEvent)
-
-NS_IMPL_CYCLE_COLLECTION_INHERITED(InstallEvent, ExtendableEvent, mActiveWorker)
-
 #ifndef MOZ_SIMPLEPUSH
 
 PushMessageData::PushMessageData(const nsAString& aData)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerEvents.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerEvents.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerEvents.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerEvents.h	2015-04-24 19:31:16.000000000 +0000
@@ -9,9 +9,9 @@
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/ExtendableEventBinding.h"
 #include "mozilla/dom/FetchEventBinding.h"
-#include "mozilla/dom/InstallEventBinding.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/Response.h"
+#include "mozilla/dom/workers/bindings/ServiceWorker.h"
 
 #ifndef MOZ_SIMPLEPUSH
 #include "mozilla/dom/PushEventBinding.h"
@@ -31,7 +31,6 @@
 
 BEGIN_WORKERS_NAMESPACE
 
-class ServiceWorker;
 class ServiceWorkerClient;
 
 class FetchEvent final : public Event
@@ -152,74 +151,6 @@
   {
     return this;
   }
-};
-
-class InstallEvent final : public ExtendableEvent
-{
-  // FIXME(nsm): Bug 982787 will allow actually populating this.
-  nsRefPtr<ServiceWorker> mActiveWorker;
-  bool mActivateImmediately;
-
-protected:
-  explicit InstallEvent(mozilla::dom::EventTarget* aOwner);
-  ~InstallEvent() {}
-
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(InstallEvent, ExtendableEvent)
-  NS_FORWARD_TO_EVENT
-
-  virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override
-  {
-    return mozilla::dom::InstallEventBinding::Wrap(aCx, this, aGivenProto);
-  }
-
-  static already_AddRefed<InstallEvent>
-  Constructor(mozilla::dom::EventTarget* aOwner,
-              const nsAString& aType,
-              const InstallEventInit& aOptions)
-  {
-    nsRefPtr<InstallEvent> e = new InstallEvent(aOwner);
-    bool trusted = e->Init(aOwner);
-    e->InitEvent(aType, aOptions.mBubbles, aOptions.mCancelable);
-    e->SetTrusted(trusted);
-    e->mActiveWorker = aOptions.mActiveWorker;
-    return e.forget();
-  }
-
-  static already_AddRefed<InstallEvent>
-  Constructor(const GlobalObject& aGlobal,
-              const nsAString& aType,
-              const InstallEventInit& aOptions,
-              ErrorResult& aRv)
-  {
-    nsCOMPtr<EventTarget> owner = do_QueryInterface(aGlobal.GetAsSupports());
-    return Constructor(owner, aType, aOptions);
-  }
-
-  already_AddRefed<ServiceWorker>
-  GetActiveWorker() const
-  {
-    nsRefPtr<ServiceWorker> sw = mActiveWorker;
-    return sw.forget();
-  }
-
-  void
-  Replace()
-  {
-    mActivateImmediately = true;
-  };
-
-  bool
-  ActivateImmediately() const
-  {
-    return mActivateImmediately;
-  }
-
-  InstallEvent* AsInstallEvent() override
-  {
-    return this;
-  }
 };
 
 #ifndef MOZ_SIMPLEPUSH
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorker.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorker.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorker.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorker.h	2015-04-24 19:31:16.000000000 +0000
@@ -15,8 +15,6 @@
 namespace mozilla {
 namespace dom {
 
-class Promise;
-
 namespace workers {
 
 class ServiceWorkerInfo;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerManager.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerManager.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -25,7 +25,6 @@
 #include "mozilla/dom/DOMError.h"
 #include "mozilla/dom/ErrorEvent.h"
 #include "mozilla/dom/Headers.h"
-#include "mozilla/dom/InstallEventBinding.h"
 #include "mozilla/dom/InternalHeaders.h"
 #include "mozilla/dom/Navigator.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
@@ -384,9 +383,9 @@
   void
   UpdateSucceeded(ServiceWorkerRegistrationInfo* aInfo) override
   {
-    nsRefPtr<ServiceWorkerRegistration> swr =
-      new ServiceWorkerRegistration(mWindow,
-          NS_ConvertUTF8toUTF16(aInfo->mScope));
+    nsRefPtr<ServiceWorkerRegistrationMainThread> swr =
+      new ServiceWorkerRegistrationMainThread(mWindow,
+                                              NS_ConvertUTF8toUTF16(aInfo->mScope));
     mPromise->MaybeResolve(swr);
   }
 
@@ -703,9 +702,11 @@
 
     // Step 4.6 "Queue a task..." for updatefound.
     nsCOMPtr<nsIRunnable> upr =
-      NS_NewRunnableMethodWithArg<ServiceWorkerRegistrationInfo*>(swm,
-                                                                  &ServiceWorkerManager::FireUpdateFound,
-                                                                  mRegistration);
+      NS_NewRunnableMethodWithArg<ServiceWorkerRegistrationInfo*>(
+        swm,
+        &ServiceWorkerManager::FireUpdateFoundOnServiceWorkerRegistrations,
+        mRegistration);
+
     NS_DispatchToMainThread(upr);
 
     nsRefPtr<ServiceWorker> serviceWorker;
@@ -1085,13 +1086,8 @@
   nsRefPtr<ExtendableEvent> event;
   nsRefPtr<EventTarget> target = aWorkerPrivate->GlobalScope();
 
-  if (mEventName.EqualsASCII("install")) {
+  if (mEventName.EqualsASCII("install") || mEventName.EqualsASCII("activate")) {
     // FIXME(nsm): Bug 982787 pass previous active worker.
-    InstallEventInit init;
-    init.mBubbles = false;
-    init.mCancelable = true;
-    event = InstallEvent::Constructor(target, mEventName, init);
-  } else if (mEventName.EqualsASCII("activate")) {
     ExtendableEventInit init;
     init.mBubbles = false;
     init.mCancelable = true;
@@ -1132,17 +1128,8 @@
     return false;
   }
 
-  // activateimmediately is only relevant to "install" event.
-  bool activateImmediately = false;
-  InstallEvent* installEvent = event->AsInstallEvent();
-  if (installEvent) {
-    activateImmediately = installEvent->ActivateImmediately();
-    // FIXME(nsm): Set activeWorker to the correct thing.
-    // FIXME(nsm): Install error handler for any listener errors.
-  }
-
   nsRefPtr<LifecycleEventPromiseHandler> handler =
-    new LifecycleEventPromiseHandler(mTask, activateImmediately);
+    new LifecycleEventPromiseHandler(mTask, false /* activateImmediately */);
   waitUntilPromise->AppendNativeHandler(handler);
   return true;
 }
@@ -1262,7 +1249,7 @@
       return NS_OK;
     }
 
-    nsTArray<nsRefPtr<ServiceWorkerRegistration>> array;
+    nsTArray<nsRefPtr<ServiceWorkerRegistrationMainThread>> array;
 
     bool isNullPrincipal = true;
     nsresult rv = principal->GetIsNullPrincipal(&isNullPrincipal);
@@ -1291,8 +1278,8 @@
         continue;
       }
 
-      nsRefPtr<ServiceWorkerRegistration> swr =
-        new ServiceWorkerRegistration(mWindow, scope);
+      nsRefPtr<ServiceWorkerRegistrationMainThread> swr =
+        new ServiceWorkerRegistrationMainThread(mWindow, scope);
 
       array.AppendElement(swr);
     }
@@ -1394,8 +1381,8 @@
     }
 
     NS_ConvertUTF8toUTF16 scope(registration->mScope);
-    nsRefPtr<ServiceWorkerRegistration> swr =
-      new ServiceWorkerRegistration(mWindow, scope);
+    nsRefPtr<ServiceWorkerRegistrationMainThread> swr =
+      new ServiceWorkerRegistrationMainThread(mWindow, scope);
     mPromise->MaybeResolve(swr);
 
     return NS_OK;
@@ -1694,8 +1681,8 @@
 
   if (registration && registration->mActiveWorker) {
     NS_ConvertUTF8toUTF16 scope(registration->mScope);
-    nsRefPtr<ServiceWorkerRegistration> swr =
-      new ServiceWorkerRegistration(aWindow, scope);
+    nsRefPtr<ServiceWorkerRegistrationMainThread> swr =
+      new ServiceWorkerRegistrationMainThread(aWindow, scope);
     aPromise->MaybeResolve(swr);
     return true;
   }
@@ -2199,63 +2186,59 @@
 }
 
 NS_IMETHODIMP
-ServiceWorkerManager::AddRegistrationEventListener(const nsAString& aScope, nsIDOMEventTarget* aListener)
+ServiceWorkerManager::AddRegistrationEventListener(const nsAString& aScope,
+                                                   ServiceWorkerRegistrationListener* aListener)
 {
   AssertIsOnMainThread();
-  nsAutoCString scope = NS_ConvertUTF16toUTF8(aScope);
-
-  // TODO: this is very very bad:
-  ServiceWorkerRegistration* registration = static_cast<ServiceWorkerRegistration*>(aListener);
-  MOZ_ASSERT(!mServiceWorkerRegistrations.Contains(registration));
+  MOZ_ASSERT(aListener);
 #ifdef DEBUG
   // Ensure a registration is only listening for it's own scope.
   nsAutoString regScope;
-  registration->GetScope(regScope);
+  aListener->GetScope(regScope);
   MOZ_ASSERT(!regScope.IsEmpty());
-  MOZ_ASSERT(scope.Equals(NS_ConvertUTF16toUTF8(regScope)));
+  MOZ_ASSERT(aScope.Equals(regScope));
 #endif
-  mServiceWorkerRegistrations.AppendElement(registration);
+
+  MOZ_ASSERT(!mServiceWorkerRegistrationListeners.Contains(aListener));
+  mServiceWorkerRegistrationListeners.AppendElement(aListener);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-ServiceWorkerManager::RemoveRegistrationEventListener(const nsAString& aScope, nsIDOMEventTarget* aListener)
+ServiceWorkerManager::RemoveRegistrationEventListener(const nsAString& aScope,
+                                                      ServiceWorkerRegistrationListener* aListener)
 {
   AssertIsOnMainThread();
-  nsCString scope = NS_ConvertUTF16toUTF8(aScope);
-  ServiceWorkerRegistration* registration = static_cast<ServiceWorkerRegistration*>(aListener);
-  MOZ_ASSERT(mServiceWorkerRegistrations.Contains(registration));
+  MOZ_ASSERT(aListener);
 #ifdef DEBUG
   // Ensure a registration is unregistering for it's own scope.
   nsAutoString regScope;
-  registration->GetScope(regScope);
+  aListener->GetScope(regScope);
   MOZ_ASSERT(!regScope.IsEmpty());
-  MOZ_ASSERT(scope.Equals(NS_ConvertUTF16toUTF8(regScope)));
+  MOZ_ASSERT(aScope.Equals(regScope));
 #endif
-  mServiceWorkerRegistrations.RemoveElement(registration);
+
+  MOZ_ASSERT(mServiceWorkerRegistrationListeners.Contains(aListener));
+  mServiceWorkerRegistrationListeners.RemoveElement(aListener);
   return NS_OK;
 }
 
 void
-ServiceWorkerManager::FireEventOnServiceWorkerRegistrations(
-  ServiceWorkerRegistrationInfo* aRegistration,
-  const nsAString& aName)
+ServiceWorkerManager::FireUpdateFoundOnServiceWorkerRegistrations(
+  ServiceWorkerRegistrationInfo* aRegistration)
 {
   AssertIsOnMainThread();
 
-  nsTObserverArray<ServiceWorkerRegistration*>::ForwardIterator it(mServiceWorkerRegistrations);
+  nsTObserverArray<ServiceWorkerRegistrationListener*>::ForwardIterator it(mServiceWorkerRegistrationListeners);
   while (it.HasMore()) {
-    nsRefPtr<ServiceWorkerRegistration> target = it.GetNext();
+    nsRefPtr<ServiceWorkerRegistrationListener> target = it.GetNext();
     nsAutoString regScope;
     target->GetScope(regScope);
     MOZ_ASSERT(!regScope.IsEmpty());
 
     NS_ConvertUTF16toUTF8 utf8Scope(regScope);
     if (utf8Scope.Equals(aRegistration->mScope)) {
-      nsresult rv = target->DispatchTrustedEvent(aName);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        // Warn only.
-      }
+      target->UpdateFound();
     }
   }
 }
@@ -2779,9 +2762,9 @@
                                                                 WhichServiceWorker aWhichOnes)
 {
   AssertIsOnMainThread();
-  nsTObserverArray<ServiceWorkerRegistration*>::ForwardIterator it(mServiceWorkerRegistrations);
+  nsTObserverArray<ServiceWorkerRegistrationListener*>::ForwardIterator it(mServiceWorkerRegistrationListeners);
   while (it.HasMore()) {
-    nsRefPtr<ServiceWorkerRegistration> target = it.GetNext();
+    nsRefPtr<ServiceWorkerRegistrationListener> target = it.GetNext();
     nsAutoString regScope;
     target->GetScope(regScope);
     MOZ_ASSERT(!regScope.IsEmpty());
@@ -2789,14 +2772,15 @@
     NS_ConvertUTF16toUTF8 utf8Scope(regScope);
 
     if (utf8Scope.Equals(aRegistration->mScope)) {
-      target->InvalidateWorkerReference(aWhichOnes);
+      target->InvalidateWorkers(aWhichOnes);
     }
   }
 }
 
 NS_IMETHODIMP
-ServiceWorkerManager::Update(const nsAString& aScope)
+ServiceWorkerManager::SoftUpdate(const nsAString& aScope)
 {
+  AssertIsOnMainThread();
   NS_ConvertUTF16toUTF8 scope(aScope);
 
   nsRefPtr<ServiceWorkerRegistrationInfo> registration;
@@ -2805,21 +2789,35 @@
     return NS_OK;
   }
 
-  // FIXME(nsm): Bug 1089889 Refactor this into SoftUpdate.
+  // "If registration's uninstalling flag is set, abort these steps."
   if (registration->mPendingUninstall) {
     return NS_OK;
   }
 
+  // "If registration's installing worker is not null, abort these steps."
   if (registration->mInstallingWorker) {
     return NS_OK;
   }
 
+  // "Let newestWorker be the result of running Get Newest Worker algorithm
+  // passing registration as its argument.
+  // If newestWorker is null, abort these steps."
+  nsRefPtr<ServiceWorkerInfo> newest = registration->Newest();
+  if (!newest) {
+    return NS_OK;
+  }
+
+  // "Set registration's registering script url to newestWorker's script url."
+  registration->mScriptSpec = newest->ScriptSpec();
+
   ServiceWorkerJobQueue* queue = GetOrCreateJobQueue(scope);
   MOZ_ASSERT(queue);
 
   nsRefPtr<ServiceWorkerUpdateFinishCallback> cb =
     new ServiceWorkerUpdateFinishCallback();
 
+  // "Invoke Update algorithm, or its equivalent, with client, registration as
+  // its argument."
   nsRefPtr<ServiceWorkerRegisterJob> job =
     new ServiceWorkerRegisterJob(queue, registration, cb);
   queue->Append(job);
@@ -3118,7 +3116,7 @@
                        void* aUserArg) {
   auto This = static_cast<ServiceWorkerManager*>(aUserArg);
   MOZ_ASSERT(!aInfo->mScope.IsEmpty());
-  nsresult res = This->Update(NS_ConvertUTF8toUTF16(aInfo->mScope));
+  nsresult res = This->SoftUpdate(NS_ConvertUTF8toUTF16(aInfo->mScope));
   unused << NS_WARN_IF(NS_FAILED(res));
 
   return PL_DHASH_NEXT;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerManager.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerManager.h	2015-04-24 19:31:16.000000000 +0000
@@ -28,8 +28,6 @@
 #include "nsTArrayForwardDeclare.h"
 #include "nsTObserverArray.h"
 
-class nsIScriptError;
-
 namespace mozilla {
 
 namespace ipc {
@@ -38,7 +36,7 @@
 
 namespace dom {
 
-class ServiceWorkerRegistration;
+class ServiceWorkerRegistrationListener;
 
 namespace workers {
 
@@ -340,7 +338,7 @@
   // The scope should be a fully qualified valid URL.
   nsRefPtrHashtable<nsCStringHashKey, ServiceWorkerRegistrationInfo> mServiceWorkerRegistrationInfos;
 
-  nsTObserverArray<ServiceWorkerRegistration*> mServiceWorkerRegistrations;
+  nsTObserverArray<ServiceWorkerRegistrationListener*> mServiceWorkerRegistrationListeners;
 
   nsRefPtrHashtable<nsISupportsHashKey, ServiceWorkerRegistrationInfo> mControlledDocuments;
 
@@ -398,6 +396,13 @@
  void LoadRegistrations(
                  const nsTArray<ServiceWorkerRegistrationData>& aRegistrations);
 
+  NS_IMETHOD
+  AddRegistrationEventListener(const nsAString& aScope,
+                               ServiceWorkerRegistrationListener* aListener);
+
+  NS_IMETHOD
+  RemoveRegistrationEventListener(const nsAString& aScope,
+                                  ServiceWorkerRegistrationListener* aListener);
 private:
   ServiceWorkerManager();
   ~ServiceWorkerManager();
@@ -457,15 +462,7 @@
                                              const nsAString& aName);
 
   void
-  FireEventOnServiceWorkerRegistrations(ServiceWorkerRegistrationInfo* aRegistration,
-                                        const nsAString& aName);
-
-  void
-  FireUpdateFound(ServiceWorkerRegistrationInfo* aRegistration)
-  {
-    FireEventOnServiceWorkerRegistrations(aRegistration,
-                                          NS_LITERAL_STRING("updatefound"));
-  }
+  FireUpdateFoundOnServiceWorkerRegistrations(ServiceWorkerRegistrationInfo* aRegistration);
 
   void
   FireControllerChange(ServiceWorkerRegistrationInfo* aRegistration);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerRegistrar.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerRegistrar.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerRegistrar.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerRegistrar.h	2015-04-24 19:31:16.000000000 +0000
@@ -23,7 +23,6 @@
 
 
 class nsIFile;
-class nsRunnable;
 
 namespace mozilla {
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerRegistration.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerRegistration.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerRegistration.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerRegistration.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -7,6 +7,7 @@
 #include "ServiceWorkerRegistration.h"
 
 #include "mozilla/dom/Promise.h"
+#include "mozilla/dom/PromiseWorkerProxy.h"
 #include "mozilla/dom/ServiceWorkerRegistrationBinding.h"
 #include "mozilla/Services.h"
 #include "nsCycleCollectionParticipant.h"
@@ -19,6 +20,8 @@
 #include "nsISupportsPrimitives.h"
 #include "nsPIDOMWindow.h"
 
+#include "Workers.h"
+
 #ifndef MOZ_SIMPLEPUSH
 #include "mozilla/dom/PushManagerBinding.h"
 #endif
@@ -28,63 +31,153 @@
 namespace mozilla {
 namespace dom {
 
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistration)
-NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
+bool
+ServiceWorkerRegistrationVisible(JSContext* aCx, JSObject* aObj)
+{
+  if (NS_IsMainThread()) {
+    return Preferences::GetBool("dom.serviceWorkers.enabled", false);
+  }
 
-NS_IMPL_ADDREF_INHERITED(ServiceWorkerRegistration, DOMEventTargetHelper)
-NS_IMPL_RELEASE_INHERITED(ServiceWorkerRegistration, DOMEventTargetHelper)
+  // Otherwise check the pref via the work private helper
+  WorkerPrivate* workerPrivate = GetWorkerPrivateFromContext(aCx);
+  if (!workerPrivate) {
+    return false;
+  }
 
-#ifdef MOZ_SIMPLEPUSH
+  return workerPrivate->ServiceWorkersEnabled();
+}
 
-NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistration,
-                                   DOMEventTargetHelper,
-                                   mInstallingWorker,
-                                   mWaitingWorker,
-                                   mActiveWorker)
+NS_IMPL_ADDREF_INHERITED(ServiceWorkerRegistrationBase, DOMEventTargetHelper)
+NS_IMPL_RELEASE_INHERITED(ServiceWorkerRegistrationBase, DOMEventTargetHelper)
 
-#else
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationBase)
+NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
 
-NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistration,
-                                   DOMEventTargetHelper,
-                                   mInstallingWorker,
-                                   mWaitingWorker,
-                                   mActiveWorker,
-                                   mPushManager)
-#endif
+NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationBase,
+                                   DOMEventTargetHelper, mCCDummy);
 
-ServiceWorkerRegistration::ServiceWorkerRegistration(nsPIDOMWindow* aWindow,
-                                                     const nsAString& aScope)
+ServiceWorkerRegistrationBase::ServiceWorkerRegistrationBase(nsPIDOMWindow* aWindow,
+                                                             const nsAString& aScope)
   : DOMEventTargetHelper(aWindow)
   , mScope(aScope)
+{}
+
+////////////////////////////////////////////////////
+// Main Thread implementation
+NS_IMPL_ADDREF_INHERITED(ServiceWorkerRegistrationMainThread, ServiceWorkerRegistrationBase)
+NS_IMPL_RELEASE_INHERITED(ServiceWorkerRegistrationMainThread, ServiceWorkerRegistrationBase)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationMainThread)
+NS_INTERFACE_MAP_END_INHERITING(ServiceWorkerRegistrationBase)
+
+#ifndef MOZ_SIMPLEPUSH
+NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationMainThread, ServiceWorkerRegistrationBase,
+                                   mPushManager,
+                                   mInstallingWorker, mWaitingWorker, mActiveWorker);
+#else
+NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationMainThread, ServiceWorkerRegistrationBase,
+                                   mInstallingWorker, mWaitingWorker, mActiveWorker);
+#endif
+
+ServiceWorkerRegistrationMainThread::ServiceWorkerRegistrationMainThread(nsPIDOMWindow* aWindow,
+                                                                         const nsAString& aScope)
+  : ServiceWorkerRegistrationBase(aWindow, aScope)
   , mListeningForEvents(false)
 {
+  AssertIsOnMainThread();
   MOZ_ASSERT(aWindow);
   MOZ_ASSERT(aWindow->IsInnerWindow());
-
   StartListeningForEvents();
 }
 
-ServiceWorkerRegistration::~ServiceWorkerRegistration()
+ServiceWorkerRegistrationMainThread::~ServiceWorkerRegistrationMainThread()
 {
   StopListeningForEvents();
+  MOZ_ASSERT(!mListeningForEvents);
+}
+
+
+already_AddRefed<workers::ServiceWorker>
+ServiceWorkerRegistrationMainThread::GetWorkerReference(WhichServiceWorker aWhichOne)
+{
+  nsCOMPtr<nsPIDOMWindow> window = GetOwner();
+  if (!window) {
+    return nullptr;
+  }
+
+  nsresult rv;
+  nsCOMPtr<nsIServiceWorkerManager> swm =
+    do_GetService(SERVICEWORKERMANAGER_CONTRACTID, &rv);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsISupports> serviceWorker;
+  switch(aWhichOne) {
+    case WhichServiceWorker::INSTALLING_WORKER:
+      rv = swm->GetInstalling(window, mScope, getter_AddRefs(serviceWorker));
+      break;
+    case WhichServiceWorker::WAITING_WORKER:
+      rv = swm->GetWaiting(window, mScope, getter_AddRefs(serviceWorker));
+      break;
+    case WhichServiceWorker::ACTIVE_WORKER:
+      rv = swm->GetActive(window, mScope, getter_AddRefs(serviceWorker));
+      break;
+    default:
+      MOZ_CRASH("Invalid enum value");
+  }
+
+  NS_WARN_IF_FALSE(NS_SUCCEEDED(rv) || rv == NS_ERROR_DOM_NOT_FOUND_ERR,
+                   "Unexpected error getting service worker instance from ServiceWorkerManager");
+  if (NS_FAILED(rv)) {
+    return nullptr;
+  }
+
+  nsRefPtr<ServiceWorker> ref =
+    static_cast<ServiceWorker*>(serviceWorker.get());
+  return ref.forget();
 }
 
+// XXXnsm, maybe this can be optimized to only add when a event handler is
+// registered.
 void
-ServiceWorkerRegistration::DisconnectFromOwner()
+ServiceWorkerRegistrationMainThread::StartListeningForEvents()
 {
-  StopListeningForEvents();
-  DOMEventTargetHelper::DisconnectFromOwner();
+  AssertIsOnMainThread();
+  MOZ_ASSERT(!mListeningForEvents);
+  nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+  if (swm) {
+    swm->AddRegistrationEventListener(mScope, this);
+    mListeningForEvents = true;
+  }
+}
+
+void
+ServiceWorkerRegistrationMainThread::StopListeningForEvents()
+{
+  AssertIsOnMainThread();
+  if (!mListeningForEvents) {
+    return;
+  }
+
+  nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+  if (swm) {
+    swm->RemoveRegistrationEventListener(mScope, this);
+  }
+  mListeningForEvents = false;
 }
 
 JSObject*
-ServiceWorkerRegistration::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+ServiceWorkerRegistrationMainThread::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
 {
+  AssertIsOnMainThread();
   return ServiceWorkerRegistrationBinding::Wrap(aCx, this, aGivenProto);
 }
 
 already_AddRefed<workers::ServiceWorker>
-ServiceWorkerRegistration::GetInstalling()
+ServiceWorkerRegistrationMainThread::GetInstalling()
 {
+  AssertIsOnMainThread();
   if (!mInstallingWorker) {
     mInstallingWorker = GetWorkerReference(WhichServiceWorker::INSTALLING_WORKER);
   }
@@ -94,8 +187,9 @@
 }
 
 already_AddRefed<workers::ServiceWorker>
-ServiceWorkerRegistration::GetWaiting()
+ServiceWorkerRegistrationMainThread::GetWaiting()
 {
+  AssertIsOnMainThread();
   if (!mWaitingWorker) {
     mWaitingWorker = GetWorkerReference(WhichServiceWorker::WAITING_WORKER);
   }
@@ -105,8 +199,9 @@
 }
 
 already_AddRefed<workers::ServiceWorker>
-ServiceWorkerRegistration::GetActive()
+ServiceWorkerRegistrationMainThread::GetActive()
 {
+  AssertIsOnMainThread();
   if (!mActiveWorker) {
     mActiveWorker = GetWorkerReference(WhichServiceWorker::ACTIVE_WORKER);
   }
@@ -115,8 +210,64 @@
   return ret.forget();
 }
 
+void
+ServiceWorkerRegistrationMainThread::UpdateFound()
+{
+  DispatchTrustedEvent(NS_LITERAL_STRING("updatefound"));
+}
+
+void
+ServiceWorkerRegistrationMainThread::InvalidateWorkers(WhichServiceWorker aWhichOnes)
+{
+  AssertIsOnMainThread();
+  if (aWhichOnes & WhichServiceWorker::INSTALLING_WORKER) {
+    mInstallingWorker = nullptr;
+  }
+
+  if (aWhichOnes & WhichServiceWorker::WAITING_WORKER) {
+    mWaitingWorker = nullptr;
+  }
+
+  if (aWhichOnes & WhichServiceWorker::ACTIVE_WORKER) {
+    mActiveWorker = nullptr;
+  }
+}
+
 namespace {
 
+void
+UpdateInternal(const nsAString& aScope)
+{
+  AssertIsOnMainThread();
+  nsCOMPtr<nsIServiceWorkerManager> swm =
+    mozilla::services::GetServiceWorkerManager();
+  MOZ_ASSERT(swm);
+  // The spec defines ServiceWorkerRegistration.update() exactly as Soft Update.
+  swm->SoftUpdate(aScope);
+}
+
+class UpdateRunnable final : public nsRunnable
+{
+public:
+  explicit UpdateRunnable(const nsAString& aScope)
+    : mScope(aScope)
+  {}
+
+  NS_IMETHOD
+  Run() override
+  {
+    AssertIsOnMainThread();
+    UpdateInternal(mScope);
+    return NS_OK;
+  }
+
+private:
+  ~UpdateRunnable()
+  {}
+
+  const nsString mScope;
+};
+
 class UnregisterCallback final : public nsIServiceWorkerUnregisterCallback
 {
   nsRefPtr<Promise> mPromise;
@@ -143,9 +294,7 @@
   {
     AssertIsOnMainThread();
 
-    AutoJSAPI api;
-    api.Init(mPromise->GetParentObject());
-    mPromise->MaybeReject(api.cx(), JS::UndefinedHandleValue);
+    mPromise->MaybeReject(NS_ERROR_DOM_SECURITY_ERR);
     return NS_OK;
   }
 
@@ -156,11 +305,165 @@
 
 NS_IMPL_ISUPPORTS(UnregisterCallback, nsIServiceWorkerUnregisterCallback)
 
+class FulfillUnregisterPromiseRunnable final : public WorkerRunnable
+{
+  nsRefPtr<PromiseWorkerProxy> mPromiseWorkerProxy;
+  Maybe<bool> mState;
+public:
+  FulfillUnregisterPromiseRunnable(WorkerPrivate* aWorkerPrivate,
+                                   PromiseWorkerProxy* aProxy,
+                                   Maybe<bool> aState)
+    : WorkerRunnable(aWorkerPrivate, WorkerThreadModifyBusyCount)
+    , mPromiseWorkerProxy(aProxy)
+    , mState(aState)
+  {
+    AssertIsOnMainThread();
+    MOZ_ASSERT(mPromiseWorkerProxy);
+  }
+
+  bool
+  WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override
+  {
+    Promise* promise = mPromiseWorkerProxy->GetWorkerPromise();
+    MOZ_ASSERT(promise);
+    if (mState.isSome()) {
+      promise->MaybeResolve(mState.value());
+    } else {
+      promise->MaybeReject(NS_ERROR_DOM_SECURITY_ERR);
+    }
+
+    mPromiseWorkerProxy->CleanUp(aCx);
+    return true;
+  }
+};
+
+class WorkerUnregisterCallback final : public nsIServiceWorkerUnregisterCallback
+{
+  nsRefPtr<PromiseWorkerProxy> mPromiseWorkerProxy;
+public:
+  NS_DECL_ISUPPORTS
+
+  explicit WorkerUnregisterCallback(PromiseWorkerProxy* aProxy)
+    : mPromiseWorkerProxy(aProxy)
+  {
+  }
+
+  NS_IMETHODIMP
+  UnregisterSucceeded(bool aState) override
+  {
+    AssertIsOnMainThread();
+    Finish(Some(aState));
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  UnregisterFailed() override
+  {
+    AssertIsOnMainThread();
+    Finish(Nothing());
+    return NS_OK;
+  }
+
+private:
+  ~WorkerUnregisterCallback()
+  { }
+
+  void
+  Finish(Maybe<bool> aState)
+  {
+    AssertIsOnMainThread();
+    if (!mPromiseWorkerProxy) {
+      return;
+    }
+
+    MutexAutoLock lock(mPromiseWorkerProxy->GetCleanUpLock());
+    if (mPromiseWorkerProxy->IsClean()) {
+      return;
+    }
+
+    nsRefPtr<WorkerRunnable> r =
+      new FulfillUnregisterPromiseRunnable(mPromiseWorkerProxy->GetWorkerPrivate(),
+                                           mPromiseWorkerProxy, aState);
+
+    AutoJSAPI jsapi;
+    jsapi.Init();
+    if (!r->Dispatch(jsapi.cx())) {
+      nsRefPtr<WorkerControlRunnable> cr =
+        new PromiseWorkerProxyControlRunnable(
+          mPromiseWorkerProxy->GetWorkerPrivate(),
+          mPromiseWorkerProxy);
+      cr->Dispatch(jsapi.cx());
+    }
+  }
+};
+
+NS_IMPL_ISUPPORTS(WorkerUnregisterCallback, nsIServiceWorkerUnregisterCallback);
+
+/*
+ * If the worker goes away, we still continue to unregister, but we don't try to
+ * resolve the worker Promise (which doesn't exist by that point).
+ */
+class StartUnregisterRunnable final : public nsRunnable
+{
+  nsRefPtr<PromiseWorkerProxy> mPromiseWorkerProxy;
+  const nsString mScope;
+
+public:
+  StartUnregisterRunnable(WorkerPrivate* aWorker, Promise* aPromise,
+                          const nsAString& aScope)
+    : mPromiseWorkerProxy(PromiseWorkerProxy::Create(aWorker, aPromise))
+    , mScope(aScope)
+  {
+    // mPromiseWorkerProxy may be null if AddFeature failed.
+  }
+
+  NS_IMETHOD
+  Run() override
+  {
+    AssertIsOnMainThread();
+
+    nsRefPtr<WorkerUnregisterCallback> cb = new WorkerUnregisterCallback(mPromiseWorkerProxy);
+
+    // XXXnsm: There is a rare chance of this failing if the worker gets
+    // destroyed. In that case, unregister() called from a SW is no longer
+    // guaranteed to run. We should fix this by having a main thread proxy
+    // maintain a strongref to ServiceWorkerRegistrationInfo and use its
+    // principal. Can that be trusted?
+    nsCOMPtr<nsIPrincipal> principal;
+    {
+      MutexAutoLock lock(mPromiseWorkerProxy->GetCleanUpLock());
+      if (mPromiseWorkerProxy->IsClean()) {
+        return NS_OK;
+      }
+
+      WorkerPrivate* worker = mPromiseWorkerProxy->GetWorkerPrivate();
+      MOZ_ASSERT(worker);
+      principal = worker->GetPrincipal();
+    }
+    MOZ_ASSERT(principal);
+
+    nsCOMPtr<nsIServiceWorkerManager> swm =
+      mozilla::services::GetServiceWorkerManager();
+    nsresult rv = swm->Unregister(principal, cb, mScope);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      cb->UnregisterFailed();
+    }
+
+    return NS_OK;
+  }
+};
 } // anonymous namespace
 
+void
+ServiceWorkerRegistrationMainThread::Update()
+{
+  UpdateInternal(mScope);
+}
+
 already_AddRefed<Promise>
-ServiceWorkerRegistration::Unregister(ErrorResult& aRv)
+ServiceWorkerRegistrationMainThread::Unregister(ErrorResult& aRv)
 {
+  AssertIsOnMainThread();
   nsCOMPtr<nsIGlobalObject> go = do_QueryInterface(GetOwner());
   if (!go) {
     aRv.Throw(NS_ERROR_FAILURE);
@@ -202,11 +505,7 @@
   }
 
   nsCOMPtr<nsIServiceWorkerManager> swm =
-    do_GetService(SERVICEWORKERMANAGER_CONTRACTID, &rv);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    aRv.Throw(rv);
-    return nullptr;
-  }
+    mozilla::services::GetServiceWorkerManager();
 
   nsRefPtr<Promise> promise = Promise::Create(go, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
@@ -224,91 +523,8 @@
   return promise.forget();
 }
 
-already_AddRefed<workers::ServiceWorker>
-ServiceWorkerRegistration::GetWorkerReference(WhichServiceWorker aWhichOne)
-{
-  nsCOMPtr<nsPIDOMWindow> window = GetOwner();
-  if (!window) {
-    return nullptr;
-  }
-
-  nsresult rv;
-  nsCOMPtr<nsIServiceWorkerManager> swm =
-    do_GetService(SERVICEWORKERMANAGER_CONTRACTID, &rv);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return nullptr;
-  }
-
-  nsCOMPtr<nsISupports> serviceWorker;
-  switch(aWhichOne) {
-    case WhichServiceWorker::INSTALLING_WORKER:
-      rv = swm->GetInstalling(window, mScope, getter_AddRefs(serviceWorker));
-      break;
-    case WhichServiceWorker::WAITING_WORKER:
-      rv = swm->GetWaiting(window, mScope, getter_AddRefs(serviceWorker));
-      break;
-    case WhichServiceWorker::ACTIVE_WORKER:
-      rv = swm->GetActive(window, mScope, getter_AddRefs(serviceWorker));
-      break;
-    default:
-      MOZ_CRASH("Invalid enum value");
-  }
-
-  NS_WARN_IF_FALSE(NS_SUCCEEDED(rv) || rv == NS_ERROR_DOM_NOT_FOUND_ERR,
-                   "Unexpected error getting service worker instance from ServiceWorkerManager");
-  if (NS_FAILED(rv)) {
-    return nullptr;
-  }
-
-  nsRefPtr<ServiceWorker> ref =
-    static_cast<ServiceWorker*>(serviceWorker.get());
-  return ref.forget();
-}
-
-void
-ServiceWorkerRegistration::InvalidateWorkerReference(WhichServiceWorker aWhichOnes)
-{
-  if (aWhichOnes & WhichServiceWorker::INSTALLING_WORKER) {
-    mInstallingWorker = nullptr;
-  }
-
-  if (aWhichOnes & WhichServiceWorker::WAITING_WORKER) {
-    mWaitingWorker = nullptr;
-  }
-
-  if (aWhichOnes & WhichServiceWorker::ACTIVE_WORKER) {
-    mActiveWorker = nullptr;
-  }
-}
-
-// XXXnsm, maybe this can be optimized to only add when a event handler is
-// registered.
-void
-ServiceWorkerRegistration::StartListeningForEvents()
-{
-  nsCOMPtr<nsIServiceWorkerManager> swm = do_GetService(SERVICEWORKERMANAGER_CONTRACTID);
-  if (swm) {
-    swm->AddRegistrationEventListener(mScope, this);
-    mListeningForEvents = true;
-  }
-}
-
-void
-ServiceWorkerRegistration::StopListeningForEvents()
-{
-  if (!mListeningForEvents) {
-    return;
-  }
-
-  nsCOMPtr<nsIServiceWorkerManager> swm = do_GetService(SERVICEWORKERMANAGER_CONTRACTID);
-  if (swm) {
-    swm->RemoveRegistrationEventListener(mScope, this);
-    mListeningForEvents = false;
-  }
-}
-
 already_AddRefed<PushManager>
-ServiceWorkerRegistration::GetPushManager(ErrorResult& aRv)
+ServiceWorkerRegistrationMainThread::GetPushManager(ErrorResult& aRv)
 {
   AssertIsOnMainThread();
 
@@ -357,5 +573,359 @@
   #endif /* ! MOZ_SIMPLEPUSH */
 }
 
+////////////////////////////////////////////////////
+// Worker Thread implementation
+class WorkerListener final : public ServiceWorkerRegistrationListener
+{
+  // Accessed on the main thread.
+  WorkerPrivate* mWorkerPrivate;
+  nsString mScope;
+  bool mListeningForEvents;
+
+  // Accessed on the worker thread.
+  ServiceWorkerRegistrationWorkerThread* mRegistration;
+
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(WorkerListener, override)
+
+  WorkerListener(WorkerPrivate* aWorkerPrivate,
+                 ServiceWorkerRegistrationWorkerThread* aReg)
+    : mWorkerPrivate(aWorkerPrivate)
+    , mListeningForEvents(false)
+    , mRegistration(aReg)
+  {
+    MOZ_ASSERT(mWorkerPrivate);
+    mWorkerPrivate->AssertIsOnWorkerThread();
+    MOZ_ASSERT(mRegistration);
+    // Copy scope so we can return it on the main thread.
+    mRegistration->GetScope(mScope);
+  }
+
+  void
+  StartListeningForEvents()
+  {
+    AssertIsOnMainThread();
+    MOZ_ASSERT(!mListeningForEvents);
+    MOZ_ASSERT(mWorkerPrivate);
+    nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+    if (swm) {
+      // FIXME(nsm): Maybe the function shouldn't take an explicit scope.
+      swm->AddRegistrationEventListener(mScope, this);
+      mListeningForEvents = true;
+    }
+  }
+
+  void
+  StopListeningForEvents()
+  {
+    AssertIsOnMainThread();
+
+    MOZ_ASSERT(mListeningForEvents);
+
+    nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+
+    // We aren't going to need this anymore and we shouldn't hold on since the
+    // worker will go away soon.
+    mWorkerPrivate = nullptr;
+
+    if (swm) {
+      // FIXME(nsm): Maybe the function shouldn't take an explicit scope.
+      swm->RemoveRegistrationEventListener(mScope, this);
+      mListeningForEvents = false;
+    }
+  }
+
+  // ServiceWorkerRegistrationListener
+  void
+  UpdateFound() override;
+
+  void
+  InvalidateWorkers(WhichServiceWorker aWhichOnes) override
+  {
+    AssertIsOnMainThread();
+    // FIXME(nsm);
+  }
+
+  void
+  GetScope(nsAString& aScope) const override
+  {
+    aScope = mScope;
+  }
+
+  ServiceWorkerRegistrationWorkerThread*
+  GetRegistration() const
+  {
+    if (mWorkerPrivate) {
+      mWorkerPrivate->AssertIsOnWorkerThread();
+    }
+    return mRegistration;
+  }
+
+  void
+  ClearRegistration()
+  {
+    if (mWorkerPrivate) {
+      mWorkerPrivate->AssertIsOnWorkerThread();
+    }
+    mRegistration = nullptr;
+  }
+
+private:
+  ~WorkerListener()
+  {
+    MOZ_ASSERT(!mListeningForEvents);
+  }
+};
+
+NS_IMPL_ADDREF_INHERITED(ServiceWorkerRegistrationWorkerThread, ServiceWorkerRegistrationBase)
+NS_IMPL_RELEASE_INHERITED(ServiceWorkerRegistrationWorkerThread, ServiceWorkerRegistrationBase)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationWorkerThread)
+NS_INTERFACE_MAP_END_INHERITING(ServiceWorkerRegistrationBase)
+
+// Expanded macros since we need special behaviour to release the proxy.
+NS_IMPL_CYCLE_COLLECTION_CLASS(ServiceWorkerRegistrationWorkerThread)
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(ServiceWorkerRegistrationWorkerThread,
+                                                  ServiceWorkerRegistrationBase)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(ServiceWorkerRegistrationWorkerThread,
+                                                ServiceWorkerRegistrationBase)
+  tmp->ReleaseListener(RegistrationIsGoingAway);
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+ServiceWorkerRegistrationWorkerThread::ServiceWorkerRegistrationWorkerThread(WorkerPrivate* aWorkerPrivate,
+                                                                             const nsAString& aScope)
+  : ServiceWorkerRegistrationBase(nullptr, aScope)
+  , mWorkerPrivate(aWorkerPrivate)
+{
+  InitListener();
+}
+
+ServiceWorkerRegistrationWorkerThread::~ServiceWorkerRegistrationWorkerThread()
+{
+  ReleaseListener(RegistrationIsGoingAway);
+  MOZ_ASSERT(!mListener);
+}
+
+JSObject*
+ServiceWorkerRegistrationWorkerThread::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+{
+  return ServiceWorkerRegistrationBinding_workers::Wrap(aCx, this, aGivenProto);
+}
+
+already_AddRefed<workers::ServiceWorker>
+ServiceWorkerRegistrationWorkerThread::GetInstalling()
+{
+  // FIXME(nsm): Will be implemented after Bug 1113522.
+  return nullptr;
+}
+
+already_AddRefed<workers::ServiceWorker>
+ServiceWorkerRegistrationWorkerThread::GetWaiting()
+{
+  // FIXME(nsm): Will be implemented after Bug 1113522.
+  return nullptr;
+}
+
+already_AddRefed<workers::ServiceWorker>
+ServiceWorkerRegistrationWorkerThread::GetActive()
+{
+  // FIXME(nsm): Will be implemented after Bug 1113522.
+  return nullptr;
+}
+
+void
+ServiceWorkerRegistrationWorkerThread::Update()
+{
+#ifdef DEBUG
+  WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
+  MOZ_ASSERT(worker);
+  worker->AssertIsOnWorkerThread();
+#endif
+  nsCOMPtr<nsIRunnable> r = new UpdateRunnable(mScope);
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(r)));
+}
+
+already_AddRefed<Promise>
+ServiceWorkerRegistrationWorkerThread::Unregister(ErrorResult& aRv)
+{
+  WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
+  MOZ_ASSERT(worker);
+  worker->AssertIsOnWorkerThread();
+
+  if (!worker->IsServiceWorker()) {
+    // For other workers, the registration probably originated from
+    // getRegistration(), so we may have to validate origin etc. Let's do this
+    // this later.
+    aRv.Throw(NS_ERROR_DOM_SECURITY_ERR);
+    return nullptr;
+  }
+
+  nsRefPtr<Promise> promise = Promise::Create(worker->GlobalScope(), aRv);
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+
+  nsRefPtr<StartUnregisterRunnable> r = new StartUnregisterRunnable(worker, promise, mScope);
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(r)));
+
+  return promise.forget();
+}
+
+class StartListeningRunnable final : public nsRunnable
+{
+  nsRefPtr<WorkerListener> mListener;
+public:
+  explicit StartListeningRunnable(WorkerListener* aListener)
+    : mListener(aListener)
+  {}
+
+  NS_IMETHOD
+  Run() override
+  {
+    mListener->StartListeningForEvents();
+    return NS_OK;
+  }
+};
+
+void
+ServiceWorkerRegistrationWorkerThread::InitListener()
+{
+  MOZ_ASSERT(!mListener);
+  WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
+  MOZ_ASSERT(worker);
+  worker->AssertIsOnWorkerThread();
+
+  mListener = new WorkerListener(worker, this);
+  if (!worker->AddFeature(worker->GetJSContext(), this)) {
+    mListener = nullptr;
+    NS_WARNING("Could not add feature");
+    return;
+  }
+
+  nsRefPtr<StartListeningRunnable> r =
+    new StartListeningRunnable(mListener);
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(r)));
+}
+
+class AsyncStopListeningRunnable final : public nsRunnable
+{
+  nsRefPtr<WorkerListener> mListener;
+public:
+  explicit AsyncStopListeningRunnable(WorkerListener* aListener)
+    : mListener(aListener)
+  {}
+
+  NS_IMETHOD
+  Run() override
+  {
+    mListener->StopListeningForEvents();
+    return NS_OK;
+  }
+};
+
+class SyncStopListeningRunnable final : public WorkerMainThreadRunnable
+{
+  nsRefPtr<WorkerListener> mListener;
+public:
+  SyncStopListeningRunnable(WorkerPrivate* aWorkerPrivate,
+                            WorkerListener* aListener)
+    : WorkerMainThreadRunnable(aWorkerPrivate)
+    , mListener(aListener)
+  {}
+
+  bool
+  MainThreadRun() override
+  {
+    mListener->StopListeningForEvents();
+    return true;
+  }
+};
+
+void
+ServiceWorkerRegistrationWorkerThread::ReleaseListener(Reason aReason)
+{
+  if (!mListener) {
+    return;
+  }
+
+  // We can assert worker here, because:
+  // 1) We always AddFeature, so if the worker has shutdown already, we'll have
+  //    received Notify and removed it. If AddFeature had failed, mListener will
+  //    be null and we won't reach here.
+  // 2) Otherwise, worker is still around even if we are going away.
+  mWorkerPrivate->AssertIsOnWorkerThread();
+  mWorkerPrivate->RemoveFeature(mWorkerPrivate->GetJSContext(), this);
+
+  mListener->ClearRegistration();
+
+  if (aReason == RegistrationIsGoingAway) {
+    nsRefPtr<AsyncStopListeningRunnable> r =
+      new AsyncStopListeningRunnable(mListener);
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(r)));
+  } else if (aReason == WorkerIsGoingAway) {
+    nsRefPtr<SyncStopListeningRunnable> r =
+      new SyncStopListeningRunnable(mWorkerPrivate, mListener);
+    if (!r->Dispatch(nullptr)) {
+      NS_ERROR("Failed to dispatch stop listening runnable!");
+    }
+  } else {
+    MOZ_CRASH("Bad reason");
+  }
+  mListener = nullptr;
+  mWorkerPrivate = nullptr;
+}
+
+bool
+ServiceWorkerRegistrationWorkerThread::Notify(JSContext* aCx, workers::Status aStatus)
+{
+  ReleaseListener(WorkerIsGoingAway);
+  return true;
+}
+
+class FireUpdateFoundRunnable final : public WorkerRunnable
+{
+  nsRefPtr<WorkerListener> mListener;
+public:
+  FireUpdateFoundRunnable(WorkerPrivate* aWorkerPrivate,
+                          WorkerListener* aListener)
+    : WorkerRunnable(aWorkerPrivate, WorkerThreadModifyBusyCount)
+    , mListener(aListener)
+  {
+    // Need this assertion for now since runnables which modify busy count can
+    // only be dispatched from parent thread to worker thread and we don't deal
+    // with nested workers. SW threads can't be nested.
+    MOZ_ASSERT(aWorkerPrivate->IsServiceWorker());
+  }
+
+  bool
+  WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override
+  {
+    MOZ_ASSERT(aWorkerPrivate);
+    aWorkerPrivate->AssertIsOnWorkerThread();
+
+    ServiceWorkerRegistrationWorkerThread* reg = mListener->GetRegistration();
+    if (reg) {
+      reg->DispatchTrustedEvent(NS_LITERAL_STRING("updatefound"));
+    }
+    return true;
+  }
+};
+
+void
+WorkerListener::UpdateFound()
+{
+  AssertIsOnMainThread();
+  if (mWorkerPrivate) {
+    nsRefPtr<FireUpdateFoundRunnable> r =
+      new FireUpdateFoundRunnable(mWorkerPrivate, this);
+    AutoJSAPI jsapi;
+    jsapi.Init();
+    if (NS_WARN_IF(!r->Dispatch(jsapi.cx()))) {
+    }
+  }
+}
 } // dom namespace
 } // mozilla namespace
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerRegistration.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerRegistration.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/ServiceWorkerRegistration.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/ServiceWorkerRegistration.h	2015-04-24 19:31:16.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/dom/ServiceWorkerBinding.h"
 #include "mozilla/dom/ServiceWorkerCommon.h"
+#include "mozilla/dom/workers/bindings/WorkerFeature.h"
 
 class nsPIDOMWindow;
 
@@ -18,63 +19,136 @@
 
 class Promise;
 class PushManager;
+class WorkerListener;
 
 namespace workers {
 class ServiceWorker;
+class WorkerPrivate;
 }
 
-class ServiceWorkerRegistration final : public DOMEventTargetHelper
+bool
+ServiceWorkerRegistrationVisible(JSContext* aCx, JSObject* aObj);
+
+// This class exists solely so that we can satisfy some WebIDL Func= attribute
+// constraints. Func= converts the function name to a header file to include, in
+// this case "ServiceWorkerRegistration.h".
+class ServiceWorkerRegistration final
+{
+public:
+  // Something that we can feed into the Func webidl property to ensure that
+  // SetScope is never exposed to the user.
+  static bool
+  WebPushMethodHider(JSContext* unusedContext, JSObject* unusedObject) {
+    return false;
+  }
+
+};
+
+// Used by ServiceWorkerManager to notify ServiceWorkerRegistrations of
+// updatefound event and invalidating ServiceWorker instances.
+class ServiceWorkerRegistrationListener
+{
+public:
+  NS_IMETHOD_(MozExternalRefCountType) AddRef() = 0;
+  NS_IMETHOD_(MozExternalRefCountType) Release() = 0;
+
+  virtual void
+  UpdateFound() = 0;
+
+  virtual void
+  InvalidateWorkers(WhichServiceWorker aWhichOnes) = 0;
+
+  virtual void
+  GetScope(nsAString& aScope) const = 0;
+};
+
+class ServiceWorkerRegistrationBase : public DOMEventTargetHelper
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ServiceWorkerRegistration,
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ServiceWorkerRegistrationBase,
                                            DOMEventTargetHelper)
 
   IMPL_EVENT_HANDLER(updatefound)
 
-  ServiceWorkerRegistration(nsPIDOMWindow* aWindow,
-                            const nsAString& aScope);
+  ServiceWorkerRegistrationBase(nsPIDOMWindow* aWindow,
+                                const nsAString& aScope);
 
   JSObject*
-  WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override = 0;
 
-  already_AddRefed<workers::ServiceWorker>
-  GetInstalling();
+  virtual already_AddRefed<workers::ServiceWorker>
+  GetInstalling() = 0;
 
-  already_AddRefed<workers::ServiceWorker>
-  GetWaiting();
+  virtual already_AddRefed<workers::ServiceWorker>
+  GetWaiting() = 0;
 
-  already_AddRefed<workers::ServiceWorker>
-  GetActive();
+  virtual already_AddRefed<workers::ServiceWorker>
+  GetActive() = 0;
+
+protected:
+  virtual ~ServiceWorkerRegistrationBase()
+  { }
+
+  const nsString mScope;
+private:
+  nsCOMPtr<nsISupports> mCCDummy;
+};
+
+class ServiceWorkerRegistrationMainThread final : public ServiceWorkerRegistrationBase,
+                                                  public ServiceWorkerRegistrationListener
+{
+public:
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ServiceWorkerRegistrationMainThread,
+                                           ServiceWorkerRegistrationBase)
+
+  ServiceWorkerRegistrationMainThread(nsPIDOMWindow* aWindow,
+                                      const nsAString& aScope);
 
   void
-  GetScope(nsAString& aScope) const
-  {
-    aScope = mScope;
-  }
+  Update();
 
   already_AddRefed<Promise>
   Unregister(ErrorResult& aRv);
 
-  // Useful methods for ServiceWorkerManager:
-  void
-  InvalidateWorkerReference(WhichServiceWorker aWhichOnes);
+  JSObject*
+  WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
-  // DOMEventTargethelper
-  virtual void DisconnectFromOwner() override;
+  already_AddRefed<workers::ServiceWorker>
+  GetInstalling() override;
 
+  already_AddRefed<workers::ServiceWorker>
+  GetWaiting() override;
+  
+  already_AddRefed<workers::ServiceWorker>
+  GetActive() override;
+  
   already_AddRefed<PushManager>
   GetPushManager(ErrorResult& aRv);
 
-  // Something that we can feed into the Func webidl property to ensure that
-  // SetScope is never exposed to the user.
-  static bool
-  WebPushMethodHider(JSContext* unusedContext, JSObject* unusedObject) {
-    return false;
+  // DOMEventTargethelper
+  void DisconnectFromOwner() override
+  {
+    StopListeningForEvents();
+    ServiceWorkerRegistrationBase::DisconnectFromOwner();
+  }
+
+  // ServiceWorkerRegistrationListener
+  void
+  UpdateFound() override;
+
+  void
+  InvalidateWorkers(WhichServiceWorker aWhichOnes) override;
+
+  void
+  GetScope(nsAString& aScope) const override
+  {
+    aScope = mScope;
   }
 
 private:
-  ~ServiceWorkerRegistration();
+  ~ServiceWorkerRegistrationMainThread();
 
   already_AddRefed<workers::ServiceWorker>
   GetWorkerReference(WhichServiceWorker aWhichOne);
@@ -85,6 +159,8 @@
   void
   StopListeningForEvents();
 
+  bool mListeningForEvents;
+
   // The following properties are cached here to ensure JS equality is satisfied
   // instead of acquiring a new worker instance from the ServiceWorkerManager
   // for every access. A null value is considered a cache miss.
@@ -96,12 +172,66 @@
 #ifndef MOZ_SIMPLEPUSH
   nsRefPtr<PushManager> mPushManager;
 #endif
+};
 
-  const nsString mScope;
-  bool mListeningForEvents;
+class ServiceWorkerRegistrationWorkerThread final : public ServiceWorkerRegistrationBase
+                                                  , public workers::WorkerFeature
+{
+public:
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ServiceWorkerRegistrationWorkerThread,
+                                           ServiceWorkerRegistrationBase)
+
+  ServiceWorkerRegistrationWorkerThread(workers::WorkerPrivate* aWorkerPrivate,
+                                        const nsAString& aScope);
+
+  void
+  Update();
+
+  already_AddRefed<Promise>
+  Unregister(ErrorResult& aRv);
+
+  JSObject*
+  WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+
+  already_AddRefed<workers::ServiceWorker>
+  GetInstalling() override;
+
+  already_AddRefed<workers::ServiceWorker>
+  GetWaiting() override;
+
+  already_AddRefed<workers::ServiceWorker>
+  GetActive() override;
+
+  void
+  GetScope(nsAString& aScope) const
+  {
+    aScope = mScope;
+  }
+
+  bool
+  Notify(JSContext* aCx, workers::Status aStatus) override;
+
+private:
+  enum Reason
+  {
+    RegistrationIsGoingAway = 0,
+    WorkerIsGoingAway,
+  };
+
+  ~ServiceWorkerRegistrationWorkerThread();
+
+  void
+  InitListener();
+
+  void
+  ReleaseListener(Reason aReason);
+
+  workers::WorkerPrivate* mWorkerPrivate;
+  nsRefPtr<WorkerListener> mListener;
 };
 
 } // namespace dom
 } // namespace mozilla
 
-#endif /* mozilla_dom_ServiceWorkerRegistration_h */
\ No newline at end of file
+#endif /* mozilla_dom_ServiceWorkerRegistration_h */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/importscript_worker.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/importscript_worker.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/importscript_worker.js	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/importscript_worker.js	2015-04-24 19:31:16.000000000 +0000
@@ -13,7 +13,7 @@
     }
 
     try {
-      importScript(['importscript.sjs']);
+      importScripts(['importscript.sjs']);
       res[0].postMessage("KO");
       return;
     } catch(e) {}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/mochitest.ini	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/mochitest.ini	2015-04-24 19:31:16.000000000 +0000
@@ -68,6 +68,9 @@
   client_focus_worker.js
   bug1151916_worker.js
   bug1151916_driver.html
+  worker_updatefoundevent.js
+  worker_updatefoundevent2.js
+  updatefoundevent.html
   empty.js
   periodic.sjs
   periodic/frame.html
@@ -86,8 +89,8 @@
 [test_navigator.html]
 [test_scopes.html]
 [test_controller.html]
-[test_workerUpdate.html]
 [test_workerUnregister.html]
+[test_workerUpdate.html]
 [test_post_message.html]
 [test_post_message_advanced.html]
 [test_post_message_source.html]
@@ -101,5 +104,6 @@
 [test_importscript.html]
 [test_client_focus.html]
 [test_bug1151916.html]
+[test_workerupdatefoundevent.html]
 [test_empty_serviceworker.html]
 [test_periodic_update.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js	2015-04-24 19:31:16.000000000 +0000
@@ -143,8 +143,6 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ImageData",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    "InstallEvent",
-// IMPORTANT: Do not change this list without review from a DOM peer!
     "MessageEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MessagePort",
@@ -161,6 +159,8 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ServiceWorkerGlobalScope",
 // IMPORTANT: Do not change this list without review from a DOM peer!
+    "ServiceWorkerRegistration",
+// IMPORTANT: Do not change this list without review from a DOM peer!
     "TextDecoder",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "TextEncoder",
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/test_workerupdatefoundevent.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/test_workerupdatefoundevent.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/test_workerupdatefoundevent.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/test_workerupdatefoundevent.html	2015-04-24 19:31:16.000000000 +0000
@@ -0,0 +1,84 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1131327 - Test ServiceWorkerRegistration.onupdatefound on ServiceWorker</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 id="display"></p>
+<div id="content"></div>
+<pre id="test"></pre>
+<script class="testbody" type="text/javascript">
+  var registration;
+  var promise;
+
+  function start() {
+    return navigator.serviceWorker.register("worker_updatefoundevent.js",
+                                            { scope: "./updatefoundevent.html" })
+      .then((swr) => registration = swr);
+  }
+
+  function startWaitForUpdateFound() {
+    registration.onupdatefound = function(e) {
+    }
+
+    promise = new Promise(function(resolve, reject) {
+      window.onmessage = function(e) {
+
+        if (e.data == "finish") {
+          ok(true, "Received updatefound");
+          resolve();
+        }
+      }
+    });
+
+    content = document.getElementById("content");
+    iframe = document.createElement("iframe");
+    content.appendChild(iframe);
+    iframe.setAttribute("src", "./updatefoundevent.html");
+
+    return Promise.resolve();
+  }
+
+  function registerNext() {
+    return navigator.serviceWorker.register("worker_updatefoundevent2.js",
+                                            { scope: "./updatefoundevent.html" });
+  }
+
+  function waitForUpdateFound() {
+    return promise;
+  }
+
+  function unregister() {
+    return registration.unregister().then(function(result) {
+      ok(result, "Unregister should return true.");
+    });
+  }
+
+  function runTest() {
+     start()
+      .then(startWaitForUpdateFound)
+      .then(registerNext)
+      .then(waitForUpdateFound)
+      .then(unregister)
+      .catch(function(e) {
+        ok(false, "Some test failed with error " + e);
+      }).then(SimpleTest.finish);
+  }
+
+  SimpleTest.waitForExplicitFinish();
+  SpecialPowers.pushPrefEnv({"set": [
+    ["dom.serviceWorkers.exemptFromPerDomainMax", true],
+    ["dom.serviceWorkers.enabled", true],
+    ["dom.serviceWorkers.testing.enabled", true],
+  ]}, runTest);
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/updatefoundevent.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/updatefoundevent.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/updatefoundevent.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/updatefoundevent.html	2015-04-24 19:31:16.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Bug 1131327 - Test ServiceWorkerRegistration.onupdatefound on ServiceWorker</title>
+</head>
+<body>
+<script>
+  navigator.serviceWorker.onmessage = function(e) {
+    dump("NSM iframe got message " + e.data + "\n");
+    window.parent.postMessage(e.data, "*");
+  };
+</script>
+</body>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/worker_unregister.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/worker_unregister.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/worker_unregister.js	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/worker_unregister.js	2015-04-24 19:31:16.000000000 +0000
@@ -1,11 +1,11 @@
 onmessage = function(e) {
   clients.matchAll().then(function(c) {
-    if (c.length == 0) {
+    if (c.length === 0) {
       // We cannot proceed.
       return;
     }
 
-    unregister().then(function() {
+    registration.unregister().then(function() {
       c[0].postMessage('DONE');
     }, function() {
       c[0].postMessage('ERROR');
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/worker_updatefoundevent2.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/worker_updatefoundevent2.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/worker_updatefoundevent2.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/worker_updatefoundevent2.js	2015-04-24 19:31:16.000000000 +0000
@@ -0,0 +1 @@
+// Not useful.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/worker_updatefoundevent.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/worker_updatefoundevent.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/worker_updatefoundevent.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/worker_updatefoundevent.js	2015-04-24 19:31:16.000000000 +0000
@@ -0,0 +1,23 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+onactivate = function(e) {
+  e.waitUntil(new Promise(function(resolve, reject) {
+    registration.onupdatefound = function(e) {
+      clients.matchAll().then(function(clients) {
+        if (!clients.length) {
+          reject("No clients found");
+        }
+
+        if (registration.scope.match(/updatefoundevent\.html$/)) {
+          clients[0].postMessage("finish");
+          resolve();
+        } else {
+          dump("Scope did not match");
+        }
+      }, reject);
+    }
+  }));
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/worker_update.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/worker_update.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/serviceworkers/worker_update.js	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/serviceworkers/worker_update.js	2015-04-24 19:31:16.000000000 +0000
@@ -2,7 +2,7 @@
 // job queueing works properly when called from the worker thread. We should
 // test actual update scenarios with a SJS test.
 onmessage = function(e) {
-  self.update();
+  self.registration.update();
   clients.matchAll().then(function(c) {
     if (c.length == 0) {
       // We cannot proceed.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/test_worker_interfaces.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/test_worker_interfaces.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/test/test_worker_interfaces.js	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/test/test_worker_interfaces.js	2015-04-24 19:31:16.000000000 +0000
@@ -147,6 +147,8 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "Response",
 // IMPORTANT: Do not change this list without review from a DOM peer!
+    { name: "ServiceWorkerRegistration", pref: "dom.serviceWorkers.enabled" },
+// IMPORTANT: Do not change this list without review from a DOM peer!
     "TextDecoder",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "TextEncoder",
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/URL.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/URL.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/URL.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/URL.h	2015-04-24 19:31:16.000000000 +0000
@@ -13,8 +13,6 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/URLSearchParams.h"
 
-class nsIPrincipal;
-
 namespace mozilla {
 namespace dom {
 class File;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/WorkerPrivate.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/WorkerPrivate.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/WorkerPrivate.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/WorkerPrivate.h	2015-04-24 19:31:16.000000000 +0000
@@ -1195,6 +1195,13 @@
   }
 
   bool
+  ServiceWorkersEnabled() const
+  {
+    AssertIsOnWorkerThread();
+    return mPreferences[WORKERPREF_SERVICEWORKERS];
+  }
+
+  bool
   OnLine() const
   {
     AssertIsOnWorkerThread();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/WorkerRunnable.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/WorkerRunnable.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/WorkerRunnable.cpp	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/WorkerRunnable.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -305,7 +305,12 @@
   MOZ_ASSERT(isMainThread == NS_IsMainThread());
   nsRefPtr<WorkerPrivate> kungFuDeathGrip;
   if (targetIsWorkerThread) {
-    JSObject* global = JS::CurrentGlobalOrNull(GetCurrentThreadJSContext());
+    JSContext* cx = GetCurrentThreadJSContext();
+    if (NS_WARN_IF(!cx)) {
+      return NS_ERROR_FAILURE;
+    }
+
+    JSObject* global = JS::CurrentGlobalOrNull(cx);
     if (global) {
       globalObject = GetGlobalObjectForGlobal(global);
     } else {
@@ -499,6 +504,16 @@
 }
 #endif
 
+NS_IMETHODIMP
+WorkerControlRunnable::Cancel()
+{
+  if (NS_FAILED(Run())) {
+    NS_WARNING("WorkerControlRunnable::Run() failed.");
+  }
+
+  return WorkerRunnable::Cancel();
+}
+
 bool
 WorkerControlRunnable::DispatchInternal()
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/WorkerRunnable.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/WorkerRunnable.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/WorkerRunnable.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/WorkerRunnable.h	2015-04-24 19:31:16.000000000 +0000
@@ -320,6 +320,9 @@
   virtual ~WorkerControlRunnable()
   { }
 
+  NS_IMETHOD
+  Cancel() override;
+
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
@@ -402,7 +405,7 @@
   bool Dispatch(JSContext* aCx);
 
 private:
-  NS_IMETHOD Run() override;  
+  NS_IMETHOD Run() override;
 };
 
 END_WORKERS_NAMESPACE
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/WorkerScope.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/WorkerScope.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/WorkerScope.cpp	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/WorkerScope.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -39,6 +39,7 @@
 #include "WorkerRunnable.h"
 #include "Performance.h"
 #include "ServiceWorkerClients.h"
+#include "ServiceWorkerRegistration.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -430,7 +431,7 @@
 }
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerGlobalScope, WorkerGlobalScope,
-                                   mClients)
+                                   mClients, mRegistration)
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerGlobalScope)
 NS_INTERFACE_MAP_END_INHERITING(WorkerGlobalScope)
 
@@ -473,6 +474,17 @@
   return mClients;
 }
 
+ServiceWorkerRegistrationWorkerThread*
+ServiceWorkerGlobalScope::Registration()
+{
+  if (!mRegistration) {
+    mRegistration =
+      new ServiceWorkerRegistrationWorkerThread(mWorkerPrivate, mScope);
+  }
+
+  return mRegistration;
+}
+
 WorkerDebuggerGlobalScope::WorkerDebuggerGlobalScope(
                                                   WorkerPrivate* aWorkerPrivate)
 : mWorkerPrivate(aWorkerPrivate)
@@ -599,6 +611,7 @@
     nullptr,
     workerdebuggersandbox_enumerate,
     workerdebuggersandbox_resolve,
+    nullptr, /* mayResolve */
     workerdebuggersandbox_convert,
     workerdebuggersandbox_finalize,
     nullptr,
@@ -783,235 +796,4 @@
   return false;
 }
 
-namespace {
-
-class WorkerScopeUnregisterRunnable;
-class UnregisterResultRunnable final : public WorkerRunnable
-{
-public:
-  enum State { Succeeded, Failed };
-
-  UnregisterResultRunnable(WorkerPrivate* aWorkerPrivate,
-                           WorkerScopeUnregisterRunnable* aRunnable,
-                           State aState, bool aValue)
-    : WorkerRunnable(aWorkerPrivate,
-                     WorkerThreadUnchangedBusyCount)
-    , mRunnable(aRunnable), mState(aState), mValue(aValue)
-  {
-    MOZ_ASSERT(NS_IsMainThread());
-    MOZ_ASSERT(mRunnable);
-  }
-
-  virtual bool
-  WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override;
-
-private:
-  nsRefPtr<WorkerScopeUnregisterRunnable> mRunnable;
-  State mState;
-  bool mValue;
-};
-
-class WorkerScopeUnregisterRunnable final : public nsRunnable
-                                          , public nsIServiceWorkerUnregisterCallback
-                                          , public WorkerFeature
-{
-  WorkerPrivate* mWorkerPrivate;
-  nsString mScope;
-
-  // Worker thread only.
-  nsRefPtr<Promise> mWorkerPromise;
-  bool mCleanedUp;
-
-  ~WorkerScopeUnregisterRunnable()
-  {
-    MOZ_ASSERT(mCleanedUp);
-  }
-
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  WorkerScopeUnregisterRunnable(WorkerPrivate* aWorkerPrivate,
-                                Promise* aWorkerPromise,
-                                const nsAString& aScope)
-    : mWorkerPrivate(aWorkerPrivate)
-    , mScope(aScope)
-    , mWorkerPromise(aWorkerPromise)
-    , mCleanedUp(false)
-  {
-    MOZ_ASSERT(aWorkerPrivate);
-    aWorkerPrivate->AssertIsOnWorkerThread();
-    MOZ_ASSERT(aWorkerPromise);
-
-    if (!mWorkerPrivate->AddFeature(mWorkerPrivate->GetJSContext(), this)) {
-      MOZ_ASSERT(false, "cannot add the worker feature!");
-      mWorkerPromise = nullptr;
-      mCleanedUp = true;
-      return;
-    }
-  }
-
-  Promise*
-  WorkerPromise() const
-  {
-    mWorkerPrivate->AssertIsOnWorkerThread();
-    MOZ_ASSERT(!mCleanedUp);
-    return mWorkerPromise;
-  }
-
-  NS_IMETHODIMP
-  UnregisterSucceeded(bool aState) override
-  {
-    AssertIsOnMainThread();
-
-    nsRefPtr<UnregisterResultRunnable> runnable =
-      new UnregisterResultRunnable(mWorkerPrivate, this,
-                                   UnregisterResultRunnable::Succeeded, aState);
-    runnable->Dispatch(nullptr);
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  UnregisterFailed() override
-  {
-    AssertIsOnMainThread();
-
-    nsRefPtr<UnregisterResultRunnable> runnable =
-      new UnregisterResultRunnable(mWorkerPrivate, this,
-                                   UnregisterResultRunnable::Failed, false);
-    runnable->Dispatch(nullptr);
-    return NS_OK;
-  }
-
-  void
-  CleanUp(JSContext* aCx)
-  {
-    mWorkerPrivate->AssertIsOnWorkerThread();
-
-    if (mCleanedUp) {
-      return;
-    }
-
-    mWorkerPrivate->RemoveFeature(aCx, this);
-    mWorkerPromise = nullptr;
-    mCleanedUp = true;
-  }
-
-  NS_IMETHODIMP
-  Run() override
-  {
-    AssertIsOnMainThread();
-
-    nsresult rv;
-    nsCOMPtr<nsIServiceWorkerManager> swm =
-      do_GetService(SERVICEWORKERMANAGER_CONTRACTID, &rv);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      UnregisterFailed();
-      return NS_OK;
-    }
-
-    // We don't need to check if the principal can load this mScope because a
-    // ServiceWorkerGlobalScope can always unregister itself.
-
-    rv = swm->Unregister(mWorkerPrivate->GetPrincipal(), this, mScope);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      UnregisterFailed();
-      return NS_OK;
-    }
-
-    return NS_OK;
-  }
-
-  virtual bool Notify(JSContext* aCx, workers::Status aStatus) override
-  {
-    mWorkerPrivate->AssertIsOnWorkerThread();
-    MOZ_ASSERT(aStatus > workers::Running);
-    CleanUp(aCx);
-    return true;
-  }
-};
-
-NS_IMPL_ISUPPORTS_INHERITED(WorkerScopeUnregisterRunnable, nsRunnable,
-                            nsIServiceWorkerUnregisterCallback)
-
-bool
-UnregisterResultRunnable::WorkerRun(JSContext* aCx,
-                                    WorkerPrivate* aWorkerPrivate)
-{
-  if (mState == Failed) {
-    mRunnable->WorkerPromise()->MaybeReject(aCx, JS::UndefinedHandleValue);
-  } else {
-    mRunnable->WorkerPromise()->MaybeResolve(mValue);
-  }
-
-  mRunnable->CleanUp(aCx);
-  return true;
-}
-
-} // anonymous namespace
-
-already_AddRefed<Promise>
-ServiceWorkerGlobalScope::Unregister(ErrorResult& aRv)
-{
-  mWorkerPrivate->AssertIsOnWorkerThread();
-  MOZ_ASSERT(mWorkerPrivate->IsServiceWorker());
-
-  nsRefPtr<Promise> promise = Promise::Create(this, aRv);
-  if (aRv.Failed()) {
-    return nullptr;
-  }
-
-  nsRefPtr<WorkerScopeUnregisterRunnable> runnable =
-    new WorkerScopeUnregisterRunnable(mWorkerPrivate, promise, mScope);
-
-  // Ensure the AddFeature succeeded before dispatching.
-  // Otherwise we let the promise remain pending since script is going to stop
-  // soon anyway.
-  if (runnable->WorkerPromise()) {
-    NS_DispatchToMainThread(runnable);
-  }
-
-  return promise.forget();
-}
-
-namespace {
-
-class UpdateRunnable final : public nsRunnable
-{
-  nsString mScope;
-
-public:
-  explicit UpdateRunnable(const nsAString& aScope)
-    : mScope(aScope)
-  { }
-
-  NS_IMETHODIMP
-  Run()
-  {
-    AssertIsOnMainThread();
-
-    nsresult rv;
-    nsCOMPtr<nsIServiceWorkerManager> swm =
-      do_GetService(SERVICEWORKERMANAGER_CONTRACTID, &rv);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return NS_OK;
-    }
-
-    swm->Update(mScope);
-    return NS_OK;
-  }
-};
-
-} //anonymous namespace
-
-void
-ServiceWorkerGlobalScope::Update()
-{
-  mWorkerPrivate->AssertIsOnWorkerThread();
-  MOZ_ASSERT(mWorkerPrivate->IsServiceWorker());
-
-  nsRefPtr<UpdateRunnable> runnable =
-    new UpdateRunnable(mScope);
-  NS_DispatchToMainThread(runnable);
-}
-
 END_WORKERS_NAMESPACE
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/WorkerScope.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/WorkerScope.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/WorkerScope.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/WorkerScope.h	2015-04-24 19:31:16.000000000 +0000
@@ -19,6 +19,7 @@
 class Function;
 class Promise;
 class RequestOrUSVString;
+class ServiceWorkerRegistrationWorkerThread;
 
 namespace cache {
 
@@ -198,6 +199,7 @@
 {
   const nsString mScope;
   nsRefPtr<ServiceWorkerClients> mClients;
+  nsRefPtr<ServiceWorkerRegistrationWorkerThread> mRegistration;
 
   ~ServiceWorkerGlobalScope();
 
@@ -218,21 +220,22 @@
     aScope = mScope;
   }
 
-  void
-  Update();
-
-  already_AddRefed<Promise>
-  Unregister(ErrorResult& aRv);
-
   ServiceWorkerClients*
   Clients();
 
+  ServiceWorkerRegistrationWorkerThread*
+  Registration();
+
   IMPL_EVENT_HANDLER(activate)
   IMPL_EVENT_HANDLER(beforeevicted)
   IMPL_EVENT_HANDLER(evicted)
   IMPL_EVENT_HANDLER(fetch)
   IMPL_EVENT_HANDLER(install)
   IMPL_EVENT_HANDLER(message)
+
+  IMPL_EVENT_HANDLER(push)
+  IMPL_EVENT_HANDLER(pushsubscriptionchange)
+
 };
 
 class WorkerDebuggerGlobalScope final : public DOMEventTargetHelper,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/Workers.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/Workers.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/workers/Workers.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/workers/Workers.h	2015-04-24 19:31:16.000000000 +0000
@@ -195,6 +195,7 @@
 {
   WORKERPREF_DUMP = 0, // browser.dom.window.dump.enabled
   WORKERPREF_DOM_CACHES, // dom.caches.enabled
+  WORKERPREF_SERVICEWORKERS, // dom.serviceWorkers.enabled
   WORKERPREF_COUNT
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsBindingManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsBindingManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsBindingManager.cpp	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsBindingManager.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -50,6 +50,7 @@
 #include "nsThreadUtils.h"
 #include "mozilla/dom/NodeListBinding.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/unused.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -405,7 +406,9 @@
     }
     if (NS_SUCCEEDED(rv)) {
       NS_ADDREF_THIS();
-      NS_ADDREF(timer);
+      // We drop our reference to the timer here, since the timer callback is
+      // responsible for releasing the object.
+      unused << timer.forget().take();
     }
   }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsBindingManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsBindingManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsBindingManager.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsBindingManager.h	2015-04-24 19:31:16.000000000 +0000
@@ -25,7 +25,6 @@
 class nsIURI;
 class nsXBLDocumentInfo;
 class nsIStreamListener;
-class nsStyleSet;
 class nsXBLBinding;
 template<class E> class nsRefPtr;
 typedef nsTArray<nsRefPtr<nsXBLBinding> > nsBindingList;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLBinding.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLBinding.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLBinding.cpp	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLBinding.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -93,7 +93,7 @@
     // Our one reserved slot holds the relevant nsXBLPrototypeBinding
     JSCLASS_HAS_RESERVED_SLOTS(1),
     nullptr, nullptr, nullptr, nullptr,
-    XBLEnumerate, nullptr,
+    XBLEnumerate, nullptr, nullptr,
     nullptr, XBLFinalize,
     nullptr, nullptr, nullptr, nullptr
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLBinding.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLBinding.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLBinding.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLBinding.h	2015-04-24 19:31:16.000000000 +0000
@@ -21,7 +21,6 @@
 class nsIContent;
 class nsIAtom;
 class nsIDocument;
-class nsIScriptContext;
 
 namespace mozilla {
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLDocumentInfo.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLDocumentInfo.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLDocumentInfo.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLDocumentInfo.h	2015-04-24 19:31:16.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsCycleCollectionParticipant.h"
 
 class nsXBLPrototypeBinding;
-class nsXBLDocGlobalObject;
 
 class nsXBLDocumentInfo final : public nsSupportsWeakReference
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLProtoImplField.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLProtoImplField.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLProtoImplField.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLProtoImplField.h	2015-04-24 19:31:16.000000000 +0000
@@ -14,7 +14,6 @@
 
 class nsIObjectInputStream;
 class nsIObjectOutputStream;
-class nsIScriptContext;
 class nsIURI;
 
 class nsXBLProtoImplField
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLProtoImplMember.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLProtoImplMember.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLProtoImplMember.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLProtoImplMember.h	2015-04-24 19:31:16.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsContentUtils.h" // For NS_CONTENT_DELETE_LIST_MEMBER.
 #include "nsCycleCollectionParticipant.h"
 
-class nsIContent;
 class nsIObjectOutputStream;
 
 struct nsXBLTextWithLineNumber
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLPrototypeHandler.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLPrototypeHandler.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/nsXBLPrototypeHandler.cpp	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/nsXBLPrototypeHandler.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -24,6 +24,7 @@
 #include "nsIDOMHTMLTextAreaElement.h"
 #include "nsIDOMHTMLInputElement.h"
 #include "nsFocusManager.h"
+#include "nsIFormControl.h"
 #include "nsIDOMEventListener.h"
 #include "nsPIDOMWindow.h"
 #include "nsPIWindowRoot.h"
@@ -476,34 +477,17 @@
         nsFocusManager::GetFocusedDescendant(windowToCheck, true, getter_AddRefs(focusedWindow));
     }
 
-    bool isLink = false;
-    nsIContent *content = focusedContent;
-
-    // if the focused element is a link then we do want space to 
-    // scroll down. The focused element may be an element in a link,
-    // we need to check the parent node too. Only do this check if an
-    // element is focused and has a parent.
-    if (focusedContent && focusedContent->GetParent()) {
-      while (content) {
-        if (content->IsHTMLElement(nsGkAtoms::a)) {
-          isLink = true;
-          break;
-        }
-
-        if (content->HasAttr(kNameSpaceID_XLink, nsGkAtoms::type)) {
-          isLink = content->AttrValueIs(kNameSpaceID_XLink, nsGkAtoms::type,
-                                        nsGkAtoms::simple, eCaseMatters);
-
-          if (isLink) {
-            break;
-          }
-        }
-
-        content = content->GetParent();
-      }
+    // If the focus is in an editable region, don't scroll.
+    if (focusedContent && focusedContent->IsEditable()) {
+      return NS_OK;
+    }
 
-      if (!isLink)
+    // If the focus is in a form control, don't scroll.
+    for (nsIContent* c = focusedContent; c; c = c->GetParent()) {
+      nsCOMPtr<nsIFormControl> formControl = do_QueryInterface(c);
+      if (formControl) {
         return NS_OK;
+      }
     }
   }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/XBLChildrenElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/XBLChildrenElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xbl/XBLChildrenElement.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xbl/XBLChildrenElement.h	2015-04-24 19:31:16.000000000 +0000
@@ -17,8 +17,6 @@
 namespace mozilla {
 namespace dom {
 
-class ExplicitChildIterator;
-
 class XBLChildrenElement : public nsXMLElement
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xml/nsXMLContentSink.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xml/nsXMLContentSink.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xml/nsXMLContentSink.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xml/nsXMLContentSink.h	2015-04-24 19:31:16.000000000 +0000
@@ -22,7 +22,6 @@
 class nsIURI;
 class nsIContent;
 class nsIParser;
-class nsViewManager;
 
 namespace mozilla {
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xml/XMLDocument.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xml/XMLDocument.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xml/XMLDocument.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xml/XMLDocument.h	2015-04-24 19:31:16.000000000 +0000
@@ -11,8 +11,6 @@
 #include "nsIDOMXMLDocument.h"
 #include "nsIScriptContext.h"
 
-class nsIParser;
-class nsIDOMNode;
 class nsIURI;
 class nsIChannel;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xpath/txExpr.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xpath/txExpr.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xpath/txExpr.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xpath/txExpr.h	2015-04-24 19:31:17.000000000 +0000
@@ -24,7 +24,6 @@
 */
 
 class nsIAtom;
-class txIParseContext;
 class txIMatchContext;
 class txIEvalContext;
 class txNodeSet;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xpath/txExprParser.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xpath/txExprParser.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xpath/txExprParser.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xpath/txExprParser.h	2015-04-24 19:31:17.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsAutoPtr.h"
 #include "nsString.h"
 
-class AttributeValueTemplate;
 class Expr;
 class txExprLexer;
 class FunctionCall;
@@ -26,7 +25,6 @@
 class Token;
 class txIParseContext;
 class txNodeTest;
-class txNodeTypeTest;
 
 class txExprParser
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xpath/XPathExpression.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xpath/XPathExpression.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xpath/XPathExpression.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xpath/XPathExpression.h	2015-04-24 19:31:16.000000000 +0000
@@ -17,7 +17,6 @@
 class nsIDocument;
 class nsINode;
 class txResultRecycler;
-class txXPathNode;
 
 namespace mozilla {
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txBufferingHandler.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txBufferingHandler.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txBufferingHandler.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txBufferingHandler.h	2015-04-24 19:31:17.000000000 +0000
@@ -12,7 +12,6 @@
 #include "nsAutoPtr.h"
 
 class txOutputTransaction;
-class txCharacterTransaction;
 
 class txResultBuffer
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txExecutionState.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txExecutionState.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txExecutionState.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txExecutionState.h	2015-04-24 19:31:17.000000000 +0000
@@ -21,7 +21,6 @@
 class txAOutputHandlerFactory;
 class txAXMLEventHandler;
 class txInstruction;
-class txIOutputHandlerFactory;
 
 class txLoadedDocumentEntry : public nsStringHashKey
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -505,7 +505,7 @@
     // Always install in case of redirects
     nsRefPtr<nsCORSListenerProxy> listener =
         new nsCORSListenerProxy(sink, aReferrerPrincipal, false);
-    rv = listener->Init(channel);
+    rv = listener->Init(channel, DataURIHandling::Disallow);
     NS_ENSURE_SUCCESS(rv, rv);
 
     return channel->AsyncOpen(listener, parser);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txMozillaTextOutput.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txMozillaTextOutput.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txMozillaTextOutput.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txMozillaTextOutput.h	2015-04-24 19:31:17.000000000 +0000
@@ -11,7 +11,6 @@
 #include "nsWeakPtr.h"
 #include "txOutputFormat.h"
 
-class nsIDOMCharacterData;
 class nsIDOMDocument;
 class nsIDOMDocumentFragment;
 class nsITransformObserver;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txMozillaXMLOutput.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txMozillaXMLOutput.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txMozillaXMLOutput.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txMozillaXMLOutput.h	2015-04-24 19:31:17.000000000 +0000
@@ -20,9 +20,6 @@
 class nsIDOMDocument;
 class nsIAtom;
 class nsIDOMDocumentFragment;
-class nsIDOMElement;
-class nsIStyleSheet;
-class nsIDOMNode;
 class nsITransformObserver;
 class nsNodeInfoManager;
 class nsIDocument;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.h	2015-04-24 19:31:17.000000000 +0000
@@ -22,7 +22,6 @@
 class nsINode;
 class nsIDOMNode;
 class nsIURI;
-class nsIXMLContentSink;
 class txStylesheet;
 class txResultRecycler;
 class txIGlobalParameter;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txStylesheet.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txStylesheet.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txStylesheet.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txStylesheet.h	2015-04-24 19:31:17.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsISupportsImpl.h"
 
 class txInstruction;
-class txToplevelItem;
 class txTemplateItem;
 class txVariableItem;
 class txStripSpaceItem;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txXSLTFunctions.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txXSLTFunctions.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txXSLTFunctions.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txXSLTFunctions.h	2015-04-24 19:31:17.000000000 +0000
@@ -11,10 +11,7 @@
 #include "nsAutoPtr.h"
 #include "txNamespaceMap.h"
 
-class txPattern;
 class txStylesheet;
-class txKeyValueHashKey;
-class txExecutionState;
 
 /**
  * The definition for the XSLT document() function
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txXSLTPatterns.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txXSLTPatterns.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xslt/xslt/txXSLTPatterns.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xslt/xslt/txXSLTPatterns.h	2015-04-24 19:31:17.000000000 +0000
@@ -11,8 +11,6 @@
 #include "txExpr.h"
 #include "txXMLUtils.h"
 
-class ProcessorState;
-
 class txPattern
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/nsXULElement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/nsXULElement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/nsXULElement.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/nsXULElement.h	2015-04-24 19:31:17.000000000 +0000
@@ -38,7 +38,6 @@
 
 class nsIDocument;
 class nsString;
-class nsIDocShell;
 class nsXULPrototypeDocument;
 
 class nsIObjectInputStream;
@@ -365,8 +364,6 @@
 
 #undef XUL_ELEMENT_FLAG_BIT
 
-class nsScriptEventHandlerOwnerTearoff;
-
 class nsXULElement final : public nsStyledElement,
                            public nsIDOMXULElement
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsContentTestNode.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsContentTestNode.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsContentTestNode.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsContentTestNode.h	2015-04-24 19:31:17.000000000 +0000
@@ -12,7 +12,7 @@
 #include "nsIAtom.h"
 #include "nsIDOMDocument.h"
 
-class nsIXULTemplateBuilder;
+class nsXULTemplateQueryProcessorRDF;
 
 /**
  * The nsContentTestNode is always the top node in a query's rule network. It
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsRDFQuery.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsRDFQuery.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsRDFQuery.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsRDFQuery.h	2015-04-24 19:31:17.000000000 +0000
@@ -15,6 +15,8 @@
   {0x8929ff60, 0x1c9c, 0x4d87, \
     { 0xac, 0x02, 0x09, 0x14, 0x15, 0x3b, 0x48, 0xc4 }}
 
+class nsXULTemplateQueryProcessorRDF;
+
 /**
  * A compiled query in the RDF query processor. This interface should not be
  * used directly outside of the RDF query processor.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsRuleNetwork.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsRuleNetwork.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsRuleNetwork.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsRuleNetwork.h	2015-04-24 19:31:17.000000000 +0000
@@ -37,9 +37,7 @@
 #include "pldhash.h"
 #include "nsIRDFNode.h"
 
-class nsIRDFResource;
 class nsXULTemplateResultSetRDF;
-class nsXULTemplateQueryProcessorRDF;
 
 //----------------------------------------------------------------------
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsXULContentUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsXULContentUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsXULContentUtils.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsXULContentUtils.h	2015-04-24 19:31:17.000000000 +0000
@@ -17,10 +17,7 @@
 class nsIAtom;
 class nsIContent;
 class nsIDocument;
-class nsIDOMNodeList;
 class nsIRDFNode;
-class nsCString;
-class nsString;
 class nsIRDFResource;
 class nsIRDFLiteral;
 class nsIRDFService;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsXULTemplateBuilder.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsXULTemplateBuilder.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsXULTemplateBuilder.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsXULTemplateBuilder.h	2015-04-24 19:31:17.000000000 +0000
@@ -33,7 +33,6 @@
 class nsIContent;
 class nsIObserverService;
 class nsIRDFCompositeDataSource;
-class nsIXULDocument;
 
 /**
  * An object that translates an RDF graph into a presentation using a
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h	2015-04-24 19:31:17.000000000 +0000
@@ -34,7 +34,6 @@
 #endif
 
 class nsIContent;
-class nsIRDFCompositeDataSource;
 class nsXULTemplateResultRDF;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/XULDocument.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/XULDocument.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/dom/xul/XULDocument.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/dom/xul/XULDocument.h	2015-04-24 19:31:17.000000000 +0000
@@ -35,7 +35,6 @@
 #if 0 // XXXbe save me, scc (need NSCAP_FORWARD_DECL(nsXULPrototypeScript))
 class nsIObjectInputStream;
 class nsIObjectOutputStream;
-class nsIXULPrototypeScript;
 #else
 #include "nsIObjectInputStream.h"
 #include "nsIObjectOutputStream.h"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsEditor.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsEditor.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsEditor.cpp	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsEditor.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -2597,23 +2597,42 @@
 
 // BEGIN nsEditor public helper methods
 
+struct SavedRange {
+  nsRefPtr<Selection> mSelection;
+  nsCOMPtr<nsINode> mStartNode;
+  nsCOMPtr<nsINode> mEndNode;
+  int32_t mStartOffset;
+  int32_t mEndOffset;
+};
+
 nsresult
 nsEditor::SplitNodeImpl(nsIContent& aExistingRightNode,
                         int32_t aOffset,
                         nsIContent& aNewLeftNode)
 {
-  // Get selection
-  nsRefPtr<Selection> selection = GetSelection();
-  NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
-
-  // Remember some selection points, if selection is set
-  nsCOMPtr<nsINode> selStartNode, selEndNode;
-  int32_t selStartOffset = 0, selEndOffset = 0;
-  if (selection->GetRangeAt(0)) {
-    selStartNode = selection->GetRangeAt(0)->GetStartParent();
-    selStartOffset = selection->GetRangeAt(0)->StartOffset();
-    selEndNode = selection->GetRangeAt(0)->GetEndParent();
-    selEndOffset = selection->GetRangeAt(0)->EndOffset();
+  // Remember all selection points.
+  nsAutoTArray<SavedRange, 10> savedRanges;
+  for (size_t i = 0; i < nsISelectionController::NUM_SELECTIONTYPES - 1; ++i) {
+    SelectionType type(1 << i);
+    SavedRange range;
+    range.mSelection = GetSelection(type);
+    if (type == nsISelectionController::SELECTION_NORMAL) {
+      NS_ENSURE_TRUE(range.mSelection, NS_ERROR_NULL_POINTER);
+    } else if (!range.mSelection) {
+      // For non-normal selections, skip over the non-existing ones.
+      continue;
+    }
+
+    for (uint32_t j = 0; j < range.mSelection->RangeCount(); ++j) {
+      nsRefPtr<nsRange> r = range.mSelection->GetRangeAt(j);
+      MOZ_ASSERT(r->IsPositioned());
+      range.mStartNode = r->GetStartParent();
+      range.mStartOffset = r->StartOffset();
+      range.mEndNode = r->GetEndParent();
+      range.mEndOffset = r->EndOffset();
+
+      savedRanges.AppendElement(range);
+    }
   }
 
   nsCOMPtr<nsINode> parent = aExistingRightNode.GetParentNode();
@@ -2664,41 +2683,64 @@
     ps->FlushPendingNotifications(Flush_Frames);
   }
 
-  if (GetShouldTxnSetSelection()) {
-    // Editor wants us to set selection at split point
-    selection->Collapse(&aNewLeftNode, aOffset);
-  } else if (selStartNode) {
-    // Else adjust the selection if needed.  If selStartNode is null, then
-    // there was no selection.
-    if (selStartNode == &aExistingRightNode) {
-      if (selStartOffset < aOffset) {
-        selStartNode = &aNewLeftNode;
+  bool shouldSetSelection = GetShouldTxnSetSelection();
+
+  nsRefPtr<Selection> previousSelection;
+  for (size_t i = 0; i < savedRanges.Length(); ++i) {
+    // Adjust the selection if needed.
+    SavedRange& range = savedRanges[i];
+
+    // If we have not seen the selection yet, clear all of its ranges.
+    if (range.mSelection != previousSelection) {
+      nsresult rv = range.mSelection->RemoveAllRanges();
+      NS_ENSURE_SUCCESS(rv, rv);
+      previousSelection = range.mSelection;
+    }
+
+    if (shouldSetSelection &&
+        range.mSelection->Type() ==
+          nsISelectionController::SELECTION_NORMAL) {
+      // If the editor should adjust the selection, don't bother restoring
+      // the ranges for the normal selection here.
+      continue;
+    }
+
+    // Split the selection into existing node and new node.
+    if (range.mStartNode == &aExistingRightNode) {
+      if (range.mStartOffset < aOffset) {
+        range.mStartNode = &aNewLeftNode;
       } else {
-        selStartOffset -= aOffset;
+        range.mStartOffset -= aOffset;
       }
     }
-    if (selEndNode == &aExistingRightNode) {
-      if (selEndOffset < aOffset) {
-        selEndNode = &aNewLeftNode;
+
+    if (range.mEndNode == &aExistingRightNode) {
+      if (range.mEndOffset < aOffset) {
+        range.mEndNode = &aNewLeftNode;
       } else {
-        selEndOffset -= aOffset;
+        range.mEndOffset -= aOffset;
       }
     }
-    selection->Collapse(selStartNode, selStartOffset);
-    selection->Extend(selEndNode, selEndOffset);
+
+    nsRefPtr<nsRange> newRange;
+    nsresult rv = nsRange::CreateRange(range.mStartNode, range.mStartOffset,
+                                       range.mEndNode, range.mEndOffset,
+                                       getter_AddRefs(newRange));
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = range.mSelection->AddRange(newRange);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  if (shouldSetSelection) {
+    // Editor wants us to set selection at split point.
+    nsRefPtr<Selection> selection = GetSelection();
+    NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
+    selection->Collapse(&aNewLeftNode, aOffset);
   }
 
   return NS_OK;
 }
 
-struct SavedRange {
-  nsRefPtr<Selection> mSelection;
-  nsCOMPtr<nsINode> mStartNode;
-  nsCOMPtr<nsINode> mEndNode;
-  int32_t mStartOffset;
-  int32_t mEndOffset;
-};
-
 nsresult
 nsEditor::JoinNodesImpl(nsINode* aNodeToKeep,
                         nsINode* aNodeToJoin,
@@ -2730,9 +2772,7 @@
 
     for (uint32_t j = 0; j < range.mSelection->RangeCount(); ++j) {
       nsRefPtr<nsRange> r = range.mSelection->GetRangeAt(j);
-      if (!r->IsPositioned()) {
-        continue;
-      }
+      MOZ_ASSERT(r->IsPositioned());
       range.mStartNode = r->GetStartParent();
       range.mStartOffset = r->StartOffset();
       range.mEndNode = r->GetEndParent();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsEditor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsEditor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsEditor.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsEditor.h	2015-04-24 19:31:17.000000000 +0000
@@ -33,10 +33,7 @@
 class RemoveStyleSheetTxn;
 class nsIAtom;
 class nsIContent;
-class nsIDOMCharacterData;
-class nsIDOMDataTransfer;
 class nsIDOMDocument;
-class nsIDOMElement;
 class nsIDOMEvent;
 class nsIDOMEventListener;
 class nsIDOMEventTarget;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsHTMLCSSUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsHTMLCSSUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsHTMLCSSUtils.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsHTMLCSSUtils.h	2015-04-24 19:31:17.000000000 +0000
@@ -26,7 +26,6 @@
 }  // namespace mozilla
 
 class nsHTMLEditor;
-class nsIDOMWindow;
 
 typedef void (*nsProcessValueFunc)(const nsAString * aInputString, nsAString & aOutputString,
                                    const char * aDefaultValueString,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsHTMLEditorEventListener.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsHTMLEditorEventListener.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsHTMLEditorEventListener.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsHTMLEditorEventListener.h	2015-04-24 19:31:17.000000000 +0000
@@ -11,7 +11,6 @@
 
 class nsEditor;
 class nsHTMLEditor;
-class nsIDOMEvent;
 
 class nsHTMLEditorEventListener : public nsEditorEventListener
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsHTMLEditor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsHTMLEditor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsHTMLEditor.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsHTMLEditor.h	2015-04-24 19:31:17.000000000 +0000
@@ -43,11 +43,9 @@
 
 class nsIDOMKeyEvent;
 class nsITransferable;
-class nsIDocumentEncoder;
 class nsIClipboard;
 class TypeInState;
 class nsIContentFilter;
-class nsIURL;
 class nsILinkHandler;
 class nsTableOuterFrame;
 class nsIDOMRange;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsIAbsorbingTransaction.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsIAbsorbingTransaction.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsIAbsorbingTransaction.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsIAbsorbingTransaction.h	2015-04-24 19:31:17.000000000 +0000
@@ -20,7 +20,6 @@
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
 
 class nsSelectionState;
-class nsIEditor;
 class nsIAtom;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsPlaintextEditor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsPlaintextEditor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsPlaintextEditor.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsPlaintextEditor.h	2015-04-24 19:31:17.000000000 +0000
@@ -16,11 +16,9 @@
 #include "nscore.h"
 
 class nsIContent;
-class nsIDOMDataTransfer;
 class nsIDOMDocument;
 class nsIDOMElement;
 class nsIDOMEvent;
-class nsIDOMEventTarget;
 class nsIDOMKeyEvent;
 class nsIDOMNode;
 class nsIDocumentEncoder;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsTextEditUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsTextEditUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsTextEditUtils.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsTextEditUtils.h	2015-04-24 19:31:17.000000000 +0000
@@ -8,12 +8,6 @@
 
 #include "nscore.h"
 
-namespace mozilla {
-namespace dom {
-class Element;
-} // namespace dom
-} // namespace mozilla
-
 class nsIDOMNode;
 class nsINode;
 class nsPlaintextEditor;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsWSRunObject.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsWSRunObject.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/nsWSRunObject.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/nsWSRunObject.h	2015-04-24 19:31:17.000000000 +0000
@@ -14,7 +14,6 @@
 #include "mozilla/dom/Text.h"
 
 class nsHTMLEditor;
-class nsIDOMDocument;
 class nsIDOMNode;
 struct DOMPoint;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/PlaceholderTxn.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/PlaceholderTxn.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/PlaceholderTxn.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/PlaceholderTxn.h	2015-04-24 19:31:17.000000000 +0000
@@ -15,8 +15,6 @@
 #include "nsWeakReference.h"
 #include "nsAutoPtr.h"
 
-class nsHTMLEditor;
-
 namespace mozilla {
 namespace dom {
 class IMETextTxn;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/tests/chrome.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/tests/chrome.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/tests/chrome.ini	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/tests/chrome.ini	2015-04-24 19:31:17.000000000 +0000
@@ -24,6 +24,7 @@
 [test_bug1100966.html]
 [test_bug1102906.html]
 [test_bug1101392.html]
+[test_bug1154791.html]
 [test_composition_event_created_in_chrome.html]
 [test_contenteditable_text_input_handling.html]
 [test_dragdrop.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/tests/file_bug915962.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/tests/file_bug915962.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/tests/file_bug915962.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/tests/file_bug915962.html	2015-04-24 19:31:17.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <button>Button</button>
+    <img src="green.png" usemap="#map">
+    <map name="map">
+      <!-- This URL ensures that the link doesn't get clicked, since
+           mochitests cannot access the outside network. -->
+      <area shape="rect" coords="0,0,10,10" href="https://youtube.com/">
+    </map>
+    <div style="height: 20000px;" tabindex="-1"><hr></div>
+  </body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/tests/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/tests/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/tests/mochitest.ini	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/tests/mochitest.ini	2015-04-24 19:31:17.000000000 +0000
@@ -9,6 +9,7 @@
   file_bug549262.html
   file_bug586662.html
   file_bug674770-1.html
+  file_bug915962.html
   file_select_all_without_body.html
   green.png
   spellcheck.js
@@ -137,6 +138,8 @@
 [test_bug832025.html]
 [test_bug857487.html]
 [test_bug858918.html]
+[test_bug915962.html]
+skip-if = toolkit == 'android' || e10s
 [test_bug966155.html]
 skip-if = os != "win"
 [test_bug966552.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/tests/test_bug1154791.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/tests/test_bug1154791.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/tests/test_bug1154791.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/tests/test_bug1154791.html	2015-04-24 19:31:17.000000000 +0000
@@ -0,0 +1,64 @@
+<!DOCTYPE>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1154791
+-->
+<head>
+  <title>Test for Bug 1154791</title>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+</head>
+<body>
+<div id="display">
+</div>
+
+<div id="content" contenteditable>
+<tt>thiss onee is stilll a</tt>
+</div>
+
+<pre id="test">
+</pre>
+
+<script class="testbody" type="application/javascript">
+
+/** Test for Bug 1154791 **/
+SimpleTest.waitForExplicitFinish();
+SimpleTest.waitForFocus(function() {
+  var div = document.getElementById("content");
+  div.focus();
+  synthesizeMouseAtCenter(div, {});
+  synthesizeKey("VK_LEFT", {});
+  synthesizeKey("VK_LEFT", {});
+
+  setTimeout(function() {
+    synthesizeKey("VK_BACK_SPACE", {});
+    setTimeout(function() {
+      synthesizeKey(" ", {});
+
+      var sel = getSpellCheckSelection();
+      is(sel.rangeCount, 2, "We should have two misspelled words");
+      is(String(sel.getRangeAt(0)), "thiss", "Correct misspelled word");
+      is(String(sel.getRangeAt(1)), "onee", "Correct misspelled word");
+
+      SimpleTest.finish();
+    },0);
+  },0);
+
+});
+
+function getSpellCheckSelection() {
+  var Ci = Components.interfaces;
+  var editingSession = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                             .getInterface(Ci.nsIWebNavigation)
+                             .QueryInterface(Ci.nsIInterfaceRequestor)
+                             .getInterface(Ci.nsIEditingSession);
+  var editor = editingSession.getEditorForWindow(window);
+  var selcon = editor.selectionController;
+  return selcon.getSelection(selcon.SELECTION_SPELLCHECK);
+}
+
+</script>
+</body>
+
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/tests/test_bug915962.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/tests/test_bug915962.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/libeditor/tests/test_bug915962.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/libeditor/tests/test_bug915962.html	2015-04-24 19:31:17.000000000 +0000
@@ -0,0 +1,100 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=915962
+-->
+<head>
+  <title>Test for Bug 915962</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=915962">Mozilla Bug 915962</a>
+<p id="display"></p>
+<div id="content">
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 915962 **/
+
+var smoothScrollPref = "general.smoothScroll";
+SimpleTest.waitForExplicitFinish();
+var win = window.open("file_bug915962.html", "_blank",
+                      "width=600,height=600,scrollbars=yes");
+
+// grab the timer right at the start
+var cwu = SpecialPowers.getDOMWindowUtils(win);
+function step() {
+  cwu.advanceTimeAndRefresh(100);
+}
+SimpleTest.waitForFocus(function() {
+  SpecialPowers.pushPrefEnv({"set":[[smoothScrollPref, false]]}, startTest);
+}, win);
+function startTest() {
+  // Make sure that pressing Space when a tabindex=-1 element is focused
+  // will scroll the page.
+  var button = win.document.querySelector("button");
+  var sc = win.document.querySelector("div");
+  sc.focus();
+  is(win.scrollY, 0, "Sanity check");
+  synthesizeKey(" ", {}, win);
+
+  step();
+
+  isnot(win.scrollY, 0, "Page is scrolled down");
+  var oldY = win.scrollY;
+  synthesizeKey(" ", {shiftKey: true}, win);
+
+  step();
+
+  ok(win.scrollY < oldY, "Page is scrolled up");
+
+  // Make sure that pressing Space when a tabindex=-1 element is focused
+  // will not scroll the page, and will activate the element.
+  button.focus();
+  var clicked = false;
+  button.onclick = () => clicked = true;
+  oldY = win.scrollY;
+  synthesizeKey(" ", {}, win);
+
+  step();
+
+  ok(win.scrollY <= oldY, "Page is not scrolled down");
+  ok(clicked, "The button should be clicked");
+  synthesizeKey("VK_TAB", {}, win);
+
+  step();
+
+  oldY = win.scrollY;
+  synthesizeKey(" ", {}, win);
+
+  step()
+
+  ok(win.scrollY >= oldY, "Page is scrolled down");
+
+  win.close();
+  cwu.restoreNormalRefresh();
+
+  win = window.open("file_bug915962.html", "_blank",
+                    "width=600,height=600,scrollbars=yes");
+  cwu = SpecialPowers.getDOMWindowUtils(win);
+  SimpleTest.waitForFocus(function() {
+    is(win.scrollY, 0, "Sanity check");
+    synthesizeKey(" ", {}, win);
+
+    step();
+
+    isnot(win.scrollY, 0, "Page is scrolled down without crashing");
+
+    win.close();
+    cwu.restoreNormalRefresh();
+
+    SimpleTest.finish();
+  }, win);
+}
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/reftests/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/reftests/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/reftests/reftest.list	2015-04-22 13:06:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/reftests/reftest.list	2015-04-24 19:31:17.000000000 +0000
@@ -77,7 +77,7 @@
 == unneeded_scroll.html unneeded_scroll-ref.html
 skip-if(B2G||Mulet) == caret_on_presshell_reinit.html caret_on_presshell_reinit-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) == caret_on_presshell_reinit-2.html caret_on_presshell_reinit-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) skip-if(asyncPanZoom&&winWidget) == 642800.html 642800-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if(B2G||Mulet) == 642800.html 642800-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 == selection_visibility_after_reframe.html selection_visibility_after_reframe-ref.html
 != selection_visibility_after_reframe-2.html selection_visibility_after_reframe-ref.html
 != selection_visibility_after_reframe-3.html selection_visibility_after_reframe-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/txmgr/nsTransactionManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/txmgr/nsTransactionManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/editor/txmgr/nsTransactionManager.h	2015-04-22 13:06:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/editor/txmgr/nsTransactionManager.h	2015-04-24 19:31:17.000000000 +0000
@@ -18,7 +18,6 @@
 
 class nsITransaction;
 class nsITransactionListener;
-class nsTransactionItem;
 
 /** implementation of a transaction manager object.
  *
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/embedding/browser/nsDocShellTreeOwner.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/embedding/browser/nsDocShellTreeOwner.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/embedding/browser/nsDocShellTreeOwner.cpp	2015-04-22 13:06:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/embedding/browser/nsDocShellTreeOwner.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -1174,17 +1174,17 @@
 ChromeTooltipListener::AddTooltipListener()
 {
   if (mEventTarget) {
-    nsresult rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("keydown"),
-                                                 this, false, false);
+    nsresult rv = mEventTarget->AddSystemEventListener(NS_LITERAL_STRING("keydown"),
+                                                       this, false, false);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("mousedown"), this,
-                                        false, false);
+    rv = mEventTarget->AddSystemEventListener(NS_LITERAL_STRING("mousedown"), this,
+                                              false, false);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("mouseout"), this,
-                                        false, false);
+    rv = mEventTarget->AddSystemEventListener(NS_LITERAL_STRING("mouseout"), this,
+                                              false, false);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("mousemove"), this,
-                                        false, false);
+    rv = mEventTarget->AddSystemEventListener(NS_LITERAL_STRING("mousemove"), this,
+                                              false, false);
     NS_ENSURE_SUCCESS(rv, rv);
 
     mTooltipListenerInstalled = true;
@@ -1226,17 +1226,17 @@
 {
   if (mEventTarget) {
     nsresult rv =
-      mEventTarget->RemoveEventListener(NS_LITERAL_STRING("keydown"), this,
-                                        false);
+      mEventTarget->RemoveSystemEventListener(NS_LITERAL_STRING("keydown"), this,
+                                              false);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("mousedown"),
-                                           this, false);
+    rv = mEventTarget->RemoveSystemEventListener(NS_LITERAL_STRING("mousedown"),
+                                                 this, false);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("mouseout"), this,
+    rv = mEventTarget->RemoveSystemEventListener(NS_LITERAL_STRING("mouseout"), this,
                                            false);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("mousemove"),
-                                           this, false);
+    rv = mEventTarget->RemoveSystemEventListener(NS_LITERAL_STRING("mousemove"),
+                                                 this, false);
     NS_ENSURE_SUCCESS(rv, rv);
 
     mTooltipListenerInstalled = false;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/embedding/browser/nsWebBrowser.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/embedding/browser/nsWebBrowser.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/embedding/browser/nsWebBrowser.h	2015-04-22 13:06:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/embedding/browser/nsWebBrowser.h	2015-04-24 19:31:17.000000000 +0000
@@ -41,8 +41,6 @@
 #include "nsTArray.h"
 #include "nsWeakPtr.h"
 
-class nsIContentViewerFile;
-
 class nsWebBrowserInitInfo
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/embedding/components/find/nsFind.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/embedding/components/find/nsFind.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/embedding/components/find/nsFind.h	2015-04-22 13:06:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/embedding/components/find/nsFind.h	2015-04-24 19:31:17.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsIContentIterator.h"
 #include "nsIWordBreaker.h"
 
-class nsIAtom;
 class nsIContent;
 
 #define NS_FIND_CONTRACTID "@mozilla.org/embedcomp/rangefind;1"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/embedding/components/printingui/mac/nsPrintingPromptService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/embedding/components/printingui/mac/nsPrintingPromptService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/embedding/components/printingui/mac/nsPrintingPromptService.h	2015-04-22 13:06:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/embedding/components/printingui/mac/nsPrintingPromptService.h	2015-04-24 19:31:17.000000000 +0000
@@ -21,10 +21,6 @@
 #include "nsPrintProgress.h"
 #include "nsIWebProgressListener.h"
 
-
-class nsIDOMWindow;
-class nsIDialogParamBlock;
-
 class nsPrintingPromptService: public nsIPrintingPromptService,
                                public nsIWebProgressListener
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/embedding/components/windowwatcher/nsWindowWatcher.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/embedding/components/windowwatcher/nsWindowWatcher.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/embedding/components/windowwatcher/nsWindowWatcher.h	2015-04-22 13:06:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/embedding/components/windowwatcher/nsWindowWatcher.h	2015-04-24 19:31:17.000000000 +0000
@@ -23,10 +23,7 @@
 class  nsIDocShellTreeItem;
 class  nsIDocShellTreeOwner;
 class nsPIDOMWindow;
-class  nsIWebBrowserChrome;
-class  nsString;
 class  nsWatcherWindowEnumerator;
-class  nsIScriptContext;
 class  nsPromptService;
 struct nsWatcherWindowEntry;
 struct SizeSpec;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.h	2015-04-22 13:06:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.h	2015-04-24 19:31:18.000000000 +0000
@@ -24,7 +24,6 @@
 #undef KeyPress
 #endif
 
-class nsIDOMMouseEventListener;
 class mozInlineSpellWordUtil;
 class mozInlineSpellChecker;
 class mozInlineSpellResume;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/2D.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/2D.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/2D.h	2015-04-22 13:06:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/2D.h	2015-04-24 19:31:18.000000000 +0000
@@ -44,7 +44,6 @@
 struct IDWriteRenderingParams;
 
 class GrContext;
-struct GrGLInterface;
 
 struct CGContext;
 typedef struct CGContext *CGContextRef;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/DrawTargetD2D1.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/DrawTargetD2D1.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/DrawTargetD2D1.cpp	2015-04-22 13:06:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/DrawTargetD2D1.cpp	2015-04-24 19:31:18.000000000 +0000
@@ -739,7 +739,12 @@
 {
   HRESULT hr;
 
-  hr = Factory::GetD2D1Device()->CreateDeviceContext(D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS, byRef(mDC));
+  ID2D1Device* device = Factory::GetD2D1Device();
+  if (!device) {
+    return false;
+  }
+
+  hr = device->CreateDeviceContext(D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS, byRef(mDC));
 
   if (FAILED(hr)) {
     gfxCriticalError() <<"[D2D1.1] 1Failed to create a DeviceContext, code: " << hexa(hr);
@@ -794,7 +799,12 @@
 {
   HRESULT hr;
 
-  hr = Factory::GetD2D1Device()->CreateDeviceContext(D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS, byRef(mDC));
+  ID2D1Device* device = Factory::GetD2D1Device();
+  if (!device) {
+    return false;
+  }
+
+  hr = device->CreateDeviceContext(D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS, byRef(mDC));
 
   if (FAILED(hr)) {
     gfxCriticalError() <<"[D2D1.1] 2Failed to create a DeviceContext, code: " << hexa(hr);
@@ -915,21 +925,22 @@
 {
   MarkChanged();
 
-  // It's important to do this before FlushTransformToDC! As this will cause
-  // the transform to become dirty.
-  if (!mClipsArePushed) {
-    mClipsArePushed = true;
-    PushClipsToDC(mDC);
-  }
-
-  FlushTransformToDC();
-
   if (aOp == CompositionOp::OP_OVER && IsPatternSupportedByD2D(aPattern)) {
+    // It's important to do this before FlushTransformToDC! As this will cause
+    // the transform to become dirty.
+    PushAllClips();
+
+    FlushTransformToDC();
     return;
   }
 
+  PopAllClips();
+
   mDC->SetTarget(mTempBitmap);
   mDC->Clear(D2D1::ColorF(0, 0));
+
+  PushAllClips();
+  FlushTransformToDC();
 }
 
 void
@@ -941,6 +952,8 @@
     return;
   }
 
+  PopAllClips();
+
   RefPtr<ID2D1Image> image;
   mDC->GetTarget(byRef(image));
 
@@ -951,7 +964,38 @@
 
   if (patternSupported) {
     if (D2DSupportsCompositeMode(aOp)) {
+      D2D1_RECT_F rect;
+      bool isAligned;
+      RefPtr<ID2D1Bitmap> tmpBitmap;
+      bool clipIsComplex = mPushedClips.size() && !GetDeviceSpaceClipRect(rect, isAligned);
+
+      if (clipIsComplex) {
+        if (!IsOperatorBoundByMask(aOp)) {
+          HRESULT hr = mDC->CreateBitmap(D2DIntSize(mSize), D2D1::BitmapProperties(D2DPixelFormat(mFormat)), byRef(tmpBitmap));
+          if (FAILED(hr)) {
+            gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(mSize))) << "[D2D1.1] 6CreateBitmap failure " << mSize << " Code: " << hexa(hr);
+            // For now, crash in this scenario; this should happen because tmpBitmap is
+            // null and CopyFromBitmap call below dereferences it.
+            // return;
+          }
+          mDC->Flush();
+
+          tmpBitmap->CopyFromBitmap(nullptr, mBitmap, nullptr);
+        }
+      } else {
+        PushAllClips();
+      }
       mDC->DrawImage(image, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2DCompositionMode(aOp));
+
+      if (tmpBitmap) {
+        RefPtr<ID2D1BitmapBrush> brush;
+        RefPtr<ID2D1Geometry> inverseGeom = GetInverseClippedGeometry();
+        mDC->CreateBitmapBrush(tmpBitmap, byRef(brush));
+
+        mDC->SetPrimitiveBlend(D2D1_PRIMITIVE_BLEND_COPY);
+        mDC->FillGeometry(inverseGeom, brush);
+        mDC->SetPrimitiveBlend(D2D1_PRIMITIVE_BLEND_SOURCE_OVER);
+      }
       return;
     }
 
@@ -975,7 +1019,6 @@
 
     // This flush is important since the copy method will not know about the context drawing to the surface.
     // We also need to pop all the clips to make sure any drawn content will have made it to the final bitmap.
-    PopAllClips();
     mDC->Flush();
 
     // We need to use a copy here because affects don't accept a surface on
@@ -986,8 +1029,7 @@
     mBlendEffect->SetInput(1, mTempBitmap);
     mBlendEffect->SetValue(D2D1_BLEND_PROP_MODE, D2DBlendMode(aOp));
 
-    PushClipsToDC(mDC);
-    mClipsArePushed = true;
+    PushAllClips();
 
     mDC->DrawImage(mBlendEffect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_BOUNDED_SOURCE_COPY);
     return;
@@ -999,6 +1041,8 @@
     return;
   }
 
+  PushAllClips();
+
   RefPtr<ID2D1Effect> radialGradientEffect;
 
   mDC->CreateEffect(CLSID_RadialGradientEffect, byRef(radialGradientEffect));
@@ -1068,6 +1112,8 @@
     return mCurrentClippedGeometry;
   }
 
+  MOZ_ASSERT(mPushedClips.size());
+
   mCurrentClipBounds = IntRect(IntPoint(0, 0), mSize);
 
   // if pathGeom is null then pathRect represents the path.
@@ -1147,6 +1193,24 @@
   return mCurrentClippedGeometry;
 }
 
+TemporaryRef<ID2D1Geometry>
+DrawTargetD2D1::GetInverseClippedGeometry()
+{
+  IntRect bounds;
+  RefPtr<ID2D1Geometry> geom = GetClippedGeometry(&bounds);
+  RefPtr<ID2D1RectangleGeometry> rectGeom;
+  RefPtr<ID2D1PathGeometry> inverseGeom;
+
+  factory()->CreateRectangleGeometry(D2D1::RectF(0, 0, mSize.width, mSize.height), byRef(rectGeom));
+  factory()->CreatePathGeometry(byRef(inverseGeom));
+  RefPtr<ID2D1GeometrySink> sink;
+  inverseGeom->Open(byRef(sink));
+  rectGeom->CombineWithGeometry(geom, D2D1_COMBINE_MODE_EXCLUDE, D2D1::IdentityMatrix(), sink);
+  sink->Close();
+
+  return inverseGeom;
+}
+
 void
 DrawTargetD2D1::PopAllClips()
 {
@@ -1157,6 +1221,16 @@
   }
 }
 
+void
+DrawTargetD2D1::PushAllClips()
+{
+  if (!mClipsArePushed) {
+    PushClipsToDC(mDC);
+  
+    mClipsArePushed = true;
+  }
+}
+
 void
 DrawTargetD2D1::PushClipsToDC(ID2D1DeviceContext *aDC)
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/DrawTargetD2D1.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/DrawTargetD2D1.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/DrawTargetD2D1.h	2015-04-22 13:06:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/DrawTargetD2D1.h	2015-04-24 19:31:18.000000000 +0000
@@ -23,8 +23,6 @@
 namespace gfx {
 
 class SourceSurfaceD2D1;
-class GradientStopsD2D;
-class ScaledFontDWrite;
 
 const int32_t kLayerCacheSize1 = 5;
 
@@ -175,9 +173,12 @@
   // bounds to correctly reflect the total clip. This is in device space.
   TemporaryRef<ID2D1Geometry> GetClippedGeometry(IntRect *aClipBounds);
 
+  TemporaryRef<ID2D1Geometry> GetInverseClippedGeometry();
+
   bool GetDeviceSpaceClipRect(D2D1_RECT_F& aClipRect, bool& aIsPixelAligned);
 
   void PopAllClips();
+  void PushAllClips();
   void PushClipsToDC(ID2D1DeviceContext *aDC);
   void PopClipsFromDC(ID2D1DeviceContext *aDC);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/Factory.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/Factory.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/Factory.cpp	2015-04-22 13:06:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/Factory.cpp	2015-04-24 19:31:18.000000000 +0000
@@ -681,7 +681,10 @@
 
   RefPtr<IDXGIDevice> device;
   aDevice->QueryInterface((IDXGIDevice**)byRef(device));
-  factory->CreateDevice(device, &mD2D1Device);
+  HRESULT hr = factory->CreateDevice(device, &mD2D1Device);
+  if (FAILED(hr)) {
+    gfxCriticalError() << "[D2D1] Failed to create gfx factory's D2D1 device, code: " << hexa(hr);
+  }
 }
 
 ID3D11Device*
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/PathCairo.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/PathCairo.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/PathCairo.h	2015-04-22 13:06:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/PathCairo.h	2015-04-24 19:31:18.000000000 +0000
@@ -13,7 +13,6 @@
 namespace mozilla {
 namespace gfx {
 
-class DrawTargetCairo;
 class PathCairo;
 
 class PathBuilderCairo : public PathBuilder
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/QuartzSupport.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/QuartzSupport.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/QuartzSupport.h	2015-04-22 13:06:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/QuartzSupport.h	2015-04-24 19:31:18.000000000 +0000
@@ -20,7 +20,6 @@
 CGColorSpaceRef CreateSystemColorSpace();
 
 // Manages a CARenderer
-struct _CGLPBufferObject;
 struct _CGLContextObject;
 
 enum AllowOfflineRendererEnum { ALLOW_OFFLINE_RENDERER, DISALLOW_OFFLINE_RENDERER };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/ScaledFontBase.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/ScaledFontBase.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/ScaledFontBase.h	2015-04-22 13:06:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/ScaledFontBase.h	2015-04-24 19:31:18.000000000 +0000
@@ -21,8 +21,6 @@
 #include "cairo.h"
 #endif
 
-class gfxFont;
-
 namespace mozilla {
 namespace gfx {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/SourceSurfaceSkia.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/SourceSurfaceSkia.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/2d/SourceSurfaceSkia.h	2015-04-22 13:06:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/2d/SourceSurfaceSkia.h	2015-04-24 19:31:18.000000000 +0000
@@ -11,8 +11,6 @@
 #include "skia/SkCanvas.h"
 #include "skia/SkBitmap.h"
 
-class GrContext;
-
 namespace mozilla {
 
 namespace gfx {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/doc/AsyncPanZoom.md thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/doc/AsyncPanZoom.md
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/doc/AsyncPanZoom.md	2015-04-22 13:06:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/doc/AsyncPanZoom.md	2015-04-24 19:31:19.000000000 +0000
@@ -263,7 +263,7 @@
 The bulk of the input processing in the APZ code happens on what we call "the input thread".
 In practice the input thread could be the Gecko main thread, the compositor thread, or some other thread.
 There are obvious downsides to using the Gecko main thread - that is, "asynchronous" panning and zooming is not really asynchronous as input events can only be processed while Gecko is idle.
-However, this is the current state of things on B2G and Metro.
+However, this is the current state of things on B2G.
 Using the compositor thread as the input thread could work on some platforms, but may be inefficient on others.
 For example, on Android (Fennec) we receive input events from the system on a dedicated UI thread.
 We would have to redispatch the input events to the compositor thread if we wanted to the input thread to be the same as the compositor thread.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/doc/Silk.md thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/doc/Silk.md
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/doc/Silk.md	2015-04-22 13:06:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/doc/Silk.md	2015-04-24 19:31:19.000000000 +0000
@@ -21,7 +21,7 @@
 
 The implementation is broken into the following sections and will reference this figure. Note that **Objects** are bold fonts while *Threads* are italicized.
 
-<img src="architecture.png" width="900px" height="630px" />
+<img src="silkArchitecture.png" width="900px" height="630px" />
 
 #Hardware Vsync
 Hardware vsync events from (1), occur on a specific **Display** Object.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/gl/AndroidSurfaceTexture.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/gl/AndroidSurfaceTexture.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/gl/AndroidSurfaceTexture.h	2015-04-22 13:06:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/gl/AndroidSurfaceTexture.h	2015-04-24 19:31:19.000000000 +0000
@@ -18,8 +18,6 @@
 #include "SurfaceTexture.h"
 #include "AndroidNativeWindow.h"
 
-class gfxASurface;
-
 namespace mozilla {
 namespace gfx {
 class Matrix4x4;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/gl/GLContext.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/gl/GLContext.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/gl/GLContext.cpp	2015-04-22 13:06:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/gl/GLContext.cpp	2015-04-24 19:31:19.000000000 +0000
@@ -1674,6 +1674,9 @@
             // doesn't expose the OES_rgb8_rgba8 extension, but it seems to
             // support it (tautologically, as it only runs on desktop GL).
             MarkExtensionSupported(OES_rgb8_rgba8);
+            // there seems to be a similar issue for EXT_texture_format_BGRA8888
+            // on the Android 4.3 emulator
+            MarkExtensionSupported(EXT_texture_format_BGRA8888);
         }
 
         if (Vendor() == GLVendor::VMware &&
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/gl/GLContext.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/gl/GLContext.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/gl/GLContext.h	2015-04-22 13:06:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/gl/GLContext.h	2015-04-24 19:31:19.000000000 +0000
@@ -51,10 +51,6 @@
 #include "gfx2DGlue.h"
 #include "GeckoProfiler.h"
 
-class nsIntRegion;
-class nsIRunnable;
-class nsIThread;
-
 namespace android {
     class GraphicBuffer;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/gl/TextureImageCGL.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/gl/TextureImageCGL.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/gl/TextureImageCGL.h	2015-04-22 13:06:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/gl/TextureImageCGL.h	2015-04-24 19:31:19.000000000 +0000
@@ -11,8 +11,6 @@
 #include "nsAutoPtr.h"
 #include "nsSize.h"
 
-class gfxASurface;
-
 namespace mozilla {
 namespace gl {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/src/APZCTreeManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/src/APZCTreeManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/src/APZCTreeManager.cpp	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/src/APZCTreeManager.cpp	2015-04-24 19:31:20.000000000 +0000
@@ -450,9 +450,15 @@
     // that originated the update, because the only identifying information
     // we are logging about APZCs is the scroll id, and otherwise we could
     // confuse APZCs from different layer trees with the same scroll id.
-    if (aLayersId == aState.mOriginatingLayersId && apzc->GetParent()) {
-      aState.mPaintLogger.LogTestData(aMetrics.GetScrollId(), "parentScrollId",
-          apzc->GetParent()->GetGuid().mScrollId);
+    if (aLayersId == aState.mOriginatingLayersId) {
+      if (apzc->IsRootForLayersId()) {
+        aState.mPaintLogger.LogTestData(aMetrics.GetScrollId(),
+            "isRootForLayersId", true);
+      } else {
+        MOZ_ASSERT(apzc->GetParent());
+        aState.mPaintLogger.LogTestData(aMetrics.GetScrollId(),
+            "parentScrollId", apzc->GetParent()->GetGuid().mScrollId);
+      }
     }
 
     if (newApzc) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/src/APZCTreeManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/src/APZCTreeManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/src/APZCTreeManager.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/src/APZCTreeManager.h	2015-04-24 19:31:20.000000000 +0000
@@ -41,7 +41,6 @@
 class Layer;
 class AsyncPanZoomController;
 class CompositorParent;
-class APZPaintLogHelper;
 class OverscrollHandoffChain;
 struct OverscrollHandoffState;
 class LayerMetricsWrapper;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/src/InputQueue.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/src/InputQueue.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/src/InputQueue.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/src/InputQueue.h	2015-04-24 19:31:20.000000000 +0000
@@ -20,7 +20,6 @@
 namespace layers {
 
 class AsyncPanZoomController;
-class OverscrollHandoffChain;
 class CancelableBlockState;
 class TouchBlockState;
 class WheelBlockState;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/test/apz_test_utils.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/test/apz_test_utils.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/test/apz_test_utils.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/test/apz_test_utils.js	2015-04-24 19:31:20.000000000 +0000
@@ -0,0 +1,101 @@
+// Utilities for writing APZ tests using the framework added in bug 961289
+
+// ----------------------------------------------------------------------
+// Functions that convert the APZ test data into a more usable form.
+// Every place we have a WebIDL sequence whose elements are dictionaries
+// with two elements, a key, and a value, we convert this into a JS
+// object with a property for each key/value pair. (This is the structure
+// we really want, but we can't express in directly in WebIDL.)
+// ----------------------------------------------------------------------
+
+function convertEntries(entries) {
+  var result = {};
+  for (var i = 0; i < entries.length; ++i) {
+    result[entries[i].key] = entries[i].value;
+  }
+  return result;
+}
+
+function convertScrollFrameData(scrollFrames) {
+  var result = {};
+  for (var i = 0; i < scrollFrames.length; ++i) {
+    result[scrollFrames[i].scrollId] = convertEntries(scrollFrames[i].entries);
+  }
+  return result;
+}
+
+function convertBuckets(buckets) {
+  var result = {};
+  for (var i = 0; i < buckets.length; ++i) {
+    result[buckets[i].sequenceNumber] = convertScrollFrameData(buckets[i].scrollFrames);
+  }
+  return result;
+}
+
+function convertTestData(testData) {
+  var result = {};
+  result.paints = convertBuckets(testData.paints);
+  result.repaintRequests = convertBuckets(testData.repaintRequests);
+  return result;
+}
+
+// ----------------------------------------------------------------
+// Utilities for reconstructing the structure of the APZC tree from
+// 'parentScrollId' entries in the APZ test data.
+// ----------------------------------------------------------------
+
+// Create a node with scroll id 'id' in the APZC tree.
+function makeNode(id) {
+  return {scrollId: id, children: []};
+}
+
+// Find a node with scroll id 'id' in the APZC tree rooted at 'root'.
+function findNode(root, id) {
+  if (root.scrollId == id) {
+    return root;
+  }
+  for (var i = 0; i < root.children.length; ++i) {
+    var subtreeResult = findNode(root.children[i], id);
+    if (subtreeResult != null) {
+      return subtreeResult;
+    }
+  }
+  return null;
+}
+
+// Add a child -> parent link to the APZC tree rooted at 'root'.
+function addLink(root, child, parent) {
+  var parentNode = findNode(root, parent);
+  if (parentNode == null) {
+    parentNode = makeNode(parent);
+    root.children.push(parentNode);
+  }
+  parentNode.children.push(makeNode(child));
+}
+
+// Add a root node to the APZC tree. It will become a direct
+// child of 'root'.
+function addRoot(root, id) {
+  root.children.push(makeNode(id));
+}
+
+// Given APZ test data for a single paint on the compositor side,
+// reconstruct the APZC tree structure from the 'parentScrollId'
+// entries that were logged. More specifically, the subset of the
+// APZC tree structure corresponding to the layer subtree for the
+// content process that triggered the paint, is reconstructed (as
+// the APZ test data only contains information abot this subtree).
+function buildApzcTree(paint) {
+  // The APZC tree can potentially have multiple root nodes,
+  // so we invent a node that is the parent of all roots.
+  // This 'root' does not correspond to an APZC.
+  var root = makeNode(-1);
+  for (var scrollId in paint) {
+    if ("isRootForLayersId" in paint[scrollId]) {
+      addRoot(root, scrollId);
+    } else if ("parentScrollId" in paint[scrollId]) {
+      addLink(root, scrollId, paint[scrollId]["parentScrollId"]);
+    }
+  }
+  return root;
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/test/helper_bug1151663.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/test/helper_bug1151663.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/test/helper_bug1151663.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/test/helper_bug1151663.html	2015-04-24 19:31:20.000000000 +0000
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1151663
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1151663, helper page</title>
+  <script type="application/javascript" src="apz_test_utils.js"></script>
+  <script type="application/javascript">
+
+    // -------------------------------------------------------------------
+    // Infrastructure to get the test assertions to run at the right time.
+    // -------------------------------------------------------------------
+    var SimpleTest = window.opener.SimpleTest;
+
+    window.onload = function() {
+        window.addEventListener("MozAfterPaint", afterPaint, false);
+    };
+    var utils = SpecialPowers.getDOMWindowUtils(window);
+    function afterPaint(e) {
+      // If there is another paint pending, wait for it.
+      if (utils.isMozAfterPaintPending) {
+          return;
+      }
+
+      // Once there are no more paints pending, remove the
+      // MozAfterPaint listener and run the test logic.
+      window.removeEventListener("MozAfterPaint", afterPaint, false);
+      testBug1151663();
+    }
+
+    // --------------------------------------------------------------------
+    // The actual logic for testing bug 1151663.
+    //
+    // In this test we have a simple page which is scrollable, with a 
+    // scrollable <div> which is also scrollable. We test that the
+    // <div> does not get an initial APZC, since primary scrollable
+    // frame is the page's root scroll frame.
+    // --------------------------------------------------------------------
+
+    function testBug1151663() {
+      // Get the content- and compositor-side test data from nsIDOMWindowUtils.
+      var contentTestData = utils.getContentAPZTestData();
+      var compositorTestData = utils.getCompositorAPZTestData();
+
+      // Get the sequence number of the last paint on the compositor side.
+      // We do this before converting the APZ test data because the conversion
+      // loses the order of the paints.
+      SimpleTest.ok(compositorTestData.paints.length > 0,
+                    "expected at least one paint in compositor test data");
+      var lastCompositorPaint = compositorTestData.paints[compositorTestData.paints.length - 1];
+      var lastCompositorPaintSeqNo = lastCompositorPaint.sequenceNumber;
+
+      // Convert the test data into a representation that's easier to navigate.
+      contentTestData = convertTestData(contentTestData);
+      compositorTestData = convertTestData(compositorTestData);
+
+      // Reconstruct the APZC tree structure in the last paint.
+      var apzcTree = buildApzcTree(compositorTestData.paints[lastCompositorPaintSeqNo]);
+
+      // The apzc tree for this page should consist of a single root APZC,
+      // and no child APZCs.
+      SimpleTest.is(apzcTree.children.length, 1, "expected a single root APZC");
+      var rootApzc = apzcTree.children[0];
+      SimpleTest.is(rootApzc.children.length, 0, "expected no child APZCs");
+
+      window.opener.finishTest();
+    }
+  </script>
+</head>
+<body style="height: 500px; overflow: scroll">
+  <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1151663">Mozilla Bug 1151663</a>
+  <div style="height: 50px; width: 50px; overflow: scroll">
+    <!-- Put enough content into the subframe to make it have a nonzero scroll range -->
+    <div style="height: 100px; width: 50px"></div>
+  </div>
+  <!-- Put enough content into the page to make it have a nonzero scroll range -->
+  <div style="height: 1000px"></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/test/helper_bug982141.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/test/helper_bug982141.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/test/helper_bug982141.html	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/test/helper_bug982141.html	2015-04-24 19:31:20.000000000 +0000
@@ -6,6 +6,7 @@
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 982141, helper page</title>
+  <script type="application/javascript" src="apz_test_utils.js"></script>
   <script type="application/javascript">
 
     // -------------------------------------------------------------------
@@ -29,103 +30,6 @@
       testBug982141();
     }
 
-    // ----------------------------------------------------------------------
-    // Functions that convert the APZ test data into a more usable form.
-    // Every place we have a WebIDL sequence whose elements are dictionaries
-    // with two elements, a key, and a value, we convert this into a JS
-    // object with a property for each key/value pair. (This is the structure
-    // we really want, but we can't express in directly in WebIDL.)
-    // ----------------------------------------------------------------------
-
-    function convertEntries(entries) {
-      var result = {};
-      for (var i = 0; i < entries.length; ++i) {
-        result[entries[i].key] = entries[i].value;
-      }
-      return result;
-    }
-
-    function convertScrollFrameData(scrollFrames) {
-      var result = {};
-      for (var i = 0; i < scrollFrames.length; ++i) {
-        result[scrollFrames[i].scrollId] = convertEntries(scrollFrames[i].entries);
-      }
-      return result;
-    }
-
-    function convertBuckets(buckets) {
-      var result = {};
-      for (var i = 0; i < buckets.length; ++i) {
-        result[buckets[i].sequenceNumber] = convertScrollFrameData(buckets[i].scrollFrames);
-      }
-      return result;
-    }
-
-    function convertTestData(testData) {
-      var result = {};
-      result.paints = convertBuckets(testData.paints);
-      result.repaintRequests = convertBuckets(testData.repaintRequests);
-      return result;
-    }
-
-    // ----------------------------------------------------------------
-    // Utilities for reconstructing the structure of the APZC tree from
-    // 'parentScrollId' entries in the APZ test data.
-    // ----------------------------------------------------------------
-
-    // Create a node with scroll id 'id' in the APZC tree.
-    function makeNode(id) {
-      return {scrollId: id, children: []};
-    }
-
-    // Find a node with scroll id 'id' in the APZC tree rooted at 'root'.
-    function findNode(root, id) {
-      if (root.scrollId == id) {
-        return root;
-      }
-      for (var i = 0; i < root.children.length; ++i) {
-        var subtreeResult = findNode(root.children[i], id);
-        if (subtreeResult != null) {
-          return subtreeResult;
-        }
-      }
-      return null;
-    }
-
-    // Add a child -> parent link to the APZC tree rooted at 'root'.
-    function addLink(root, child, parent) {
-      var parentNode = findNode(root, parent);
-      if (parentNode == null) {
-        parentNode = makeNode(parent);
-        root.children.push(parentNode);
-      }
-      parentNode.children.push(makeNode(child));
-    }
-
-    // Add a root node to the APZC tree. It will become a direct
-    // child of 'root'.
-    function addRoot(root, id) {
-      root.children.push(makeNode(id));
-    }
-
-    // Given APZ test data for a single paint on the compositor side,
-    // reconstruct the APZC tree structure from the 'parentScrollId'
-    // entries that were logged.
-    function buildApzcTree(paint) {
-      // The APZC tree can potentially have multiple root nodes,
-      // so we invent a node that is the parent of all roots.
-      // This 'root' does not correspond to an APZC.
-      var root = makeNode(-1);
-      for (var scrollId in paint) {
-        if ("parentScrollId" in paint[scrollId]) {
-          addLink(root, scrollId, paint[scrollId]["parentScrollId"]);
-        } else {
-          addRoot(root, scrollId);
-        }
-      }
-      return root;
-    }
-
     // --------------------------------------------------------------------
     // The actual logic for testing bug 982141.
     //
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/test/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/test/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/test/mochitest.ini	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/test/mochitest.ini	2015-04-24 19:31:20.000000000 +0000
@@ -1,4 +1,9 @@
-[test_bug982141.html]
-skip-if = toolkit != 'gonk'  # bug 991198
+[DEFAULT]
 support-files =
+  apz_test_utils.js
   helper_bug982141.html
+  helper_bug1151663.html
+[test_bug982141.html]
+skip-if = toolkit != 'gonk'  # bug 991198
+[test_bug1151663.html]
+skip-if = toolkit != 'gonk'  # bug 991198
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/test/test_bug1151663.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/test/test_bug1151663.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/test/test_bug1151663.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/test/test_bug1151663.html	2015-04-24 19:31:20.000000000 +0000
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1151663
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1151663</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+    SimpleTest.waitForExplicitFinish();
+
+    // Run the actual test in its own window, because it requires that the
+    // root APZC be scrollable. Mochitest pages themselves often run
+    // inside an iframe which means we have no control over the root APZC.
+    var w = null;
+    window.onload = function() {
+      w = window.open("helper_bug1151663.html", "_blank");
+    };
+
+    function finishTest() {
+      w.close();
+      SimpleTest.finish();
+    };
+
+  </script>
+</head>
+<body>
+  <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1151663">Mozilla Bug 1151663</a>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/util/ActiveElementManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/util/ActiveElementManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/util/ActiveElementManager.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/util/ActiveElementManager.h	2015-04-24 19:31:20.000000000 +0000
@@ -9,7 +9,6 @@
 #include "nsCOMPtr.h"
 #include "nsISupportsImpl.h"
 
-class inIDOMUtils;
 class CancelableTask;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/util/ChromeProcessController.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/util/ChromeProcessController.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/apz/util/ChromeProcessController.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/apz/util/ChromeProcessController.h	2015-04-24 19:31:20.000000000 +0000
@@ -22,7 +22,6 @@
 namespace layers {
 
 class APZEventState;
-class CompositorParent;
 
 // A ChromeProcessController is attached to the root of a compositor's layer
 // tree.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicCanvasLayer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicCanvasLayer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicCanvasLayer.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicCanvasLayer.h	2015-04-24 19:31:20.000000000 +0000
@@ -13,8 +13,6 @@
 #include "nsDebug.h"                    // for NS_ASSERTION
 #include "nsRegion.h"                   // for nsIntRegion
 
-class gfxContext;
-
 namespace mozilla {
 namespace layers {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicCompositor.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicCompositor.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicCompositor.cpp	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicCompositor.cpp	2015-04-24 19:31:20.000000000 +0000
@@ -280,7 +280,7 @@
                                                  (uint32_t*)aSource->GetData(),
                                                  aSource->Stride());
 
-  NS_ABORT_IF_FALSE(src && dest, "Failed to create pixman images?");
+  MOZ_ASSERT(src !=0 && dest != 0, "Failed to create pixman images?");
 
   pixman_transform pixTransform = Matrix3DToPixman(aTransform);
   pixman_transform pixTransformInverted;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicCompositor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicCompositor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicCompositor.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicCompositor.h	2015-04-24 19:31:20.000000000 +0000
@@ -11,8 +11,6 @@
 #include "mozilla/gfx/2D.h"
 #include "nsAutoPtr.h"
 
-class gfxContext;
-
 namespace mozilla {
 namespace layers {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicImplData.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicImplData.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicImplData.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicImplData.h	2015-04-24 19:31:20.000000000 +0000
@@ -15,7 +15,6 @@
 namespace layers {
 
 class ReadbackProcessor;
-class SurfaceDescriptor;
 
 /**
  * This is the ImplData for all Basic layers. It also exposes methods
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicLayerManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicLayerManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicLayerManager.cpp	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicLayerManager.cpp	2015-04-24 19:31:20.000000000 +0000
@@ -711,7 +711,7 @@
                                                  (uint32_t*)aSrc->GetData(),
                                                  aSrc->Stride());
 
-  NS_ABORT_IF_FALSE(src && dest, "Failed to create pixman images?");
+  MOZ_ASSERT(src != 0 && dest !=0, "Failed to create pixman images?");
 
   pixman_transform pixTransform = BasicLayerManager_Matrix3DToPixman(aTransform);
   pixman_transform pixTransformInverted;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicLayers.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicLayers.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicLayers.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicLayers.h	2015-04-24 19:31:20.000000000 +0000
@@ -20,18 +20,15 @@
 #include "nsRegion.h"                   // for nsIntRegion
 #include "nscore.h"                     // for nsAString, etc
 
-class gfxPattern;
 class nsIWidget;
 
 namespace mozilla {
 namespace layers {
 
-class BasicShadowableLayer;
 class ImageFactory;
 class ImageLayer;
 class PaintLayerContext;
 class ReadbackLayer;
-class ReadbackProcessor;
 
 /**
  * This is a cairo/Thebes-only, main-thread-only implementation of layers.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicLayersImpl.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicLayersImpl.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/basic/BasicLayersImpl.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/basic/BasicLayersImpl.h	2015-04-24 19:31:20.000000000 +0000
@@ -25,7 +25,6 @@
 namespace layers {
 
 class AutoMoz2DMaskData;
-class BasicContainerLayer;
 class Layer;
 
 class AutoSetOperator {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/ClientPaintedLayer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/ClientPaintedLayer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/ClientPaintedLayer.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/ClientPaintedLayer.h	2015-04-24 19:31:20.000000000 +0000
@@ -18,8 +18,6 @@
 #include "nsRegion.h"                   // for nsIntRegion
 #include "mozilla/layers/PLayerTransaction.h" // for PaintedLayerAttributes
 
-class gfxContext;
-
 namespace mozilla {
 namespace layers {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/ClientTiledPaintedLayer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/ClientTiledPaintedLayer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/ClientTiledPaintedLayer.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/ClientTiledPaintedLayer.h	2015-04-24 19:31:20.000000000 +0000
@@ -12,8 +12,6 @@
 #include "nsDebug.h"                    // for NS_RUNTIMEABORT
 #include "nsRegion.h"                   // for nsIntRegion
 
-class gfxContext;
-
 namespace mozilla {
 namespace layers {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/CompositableClient.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/CompositableClient.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/CompositableClient.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/CompositableClient.h	2015-04-24 19:31:20.000000000 +0000
@@ -27,7 +27,6 @@
 class ImageBridgeChild;
 class CompositableForwarder;
 class CompositableChild;
-class SurfaceDescriptor;
 class PCompositableChild;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/ContentClient.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/ContentClient.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/ContentClient.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/ContentClient.h	2015-04-24 19:31:20.000000000 +0000
@@ -28,8 +28,6 @@
 #include "nsRegion.h"                   // for nsIntRegion
 #include "nsTArray.h"                   // for nsTArray
 
-class gfxContext;
-
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
@@ -37,7 +35,6 @@
 
 namespace layers {
 
-class BasicLayerManager;
 class PaintedLayer;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/TextureClient.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/TextureClient.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/TextureClient.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/TextureClient.h	2015-04-24 19:31:20.000000000 +0000
@@ -29,7 +29,6 @@
 #include "nsISupportsImpl.h"            // for TextureImage::AddRef, etc
 #include "GfxTexturesReporter.h"
 
-class gfxReusableSurfaceWrapper;
 class gfxImageSurface;
 
 namespace mozilla {
@@ -47,11 +46,9 @@
 namespace layers {
 
 class AsyncTransactionTracker;
-class ContentClient;
 class CompositableForwarder;
 class ISurfaceAllocator;
 class CompositableClient;
-class PlanarYCbCrImage;
 struct PlanarYCbCrData;
 class Image;
 class PTextureChild;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/TiledContentClient.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/TiledContentClient.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/client/TiledContentClient.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/client/TiledContentClient.h	2015-04-24 19:31:20.000000000 +0000
@@ -41,7 +41,6 @@
 namespace mozilla {
 namespace layers {
 
-class BasicTileDescriptor;
 class ClientTiledPaintedLayer;
 class ClientLayerManager;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/AsyncCompositionManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/AsyncCompositionManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/AsyncCompositionManager.cpp	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/AsyncCompositionManager.cpp	2015-04-24 19:31:20.000000000 +0000
@@ -406,16 +406,9 @@
 
   TransformData& data = aAnimation.data().get_TransformData();
   nsPoint origin = data.origin();
-  // we expect all our transform data to arrive in css pixels, so here we must
-  // adjust to dev pixels.
-  double cssPerDev = double(nsDeviceContext::AppUnitsPerCSSPixel())
-                     / double(data.appUnitsPerDevPixel());
+  // we expect all our transform data to arrive in device pixels
   Point3D transformOrigin = data.transformOrigin();
-  transformOrigin.x = transformOrigin.x * cssPerDev;
-  transformOrigin.y = transformOrigin.y * cssPerDev;
   Point3D perspectiveOrigin = data.perspectiveOrigin();
-  perspectiveOrigin.x = perspectiveOrigin.x * cssPerDev;
-  perspectiveOrigin.y = perspectiveOrigin.y * cssPerDev;
   nsDisplayTransform::FrameTransformProperties props(interpolatedList,
                                                      transformOrigin,
                                                      perspectiveOrigin,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/CompositableHost.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/CompositableHost.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/CompositableHost.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/CompositableHost.h	2015-04-24 19:31:20.000000000 +0000
@@ -37,9 +37,7 @@
 namespace layers {
 
 class Layer;
-class SurfaceDescriptor;
 class Compositor;
-class ISurfaceAllocator;
 class ThebesBufferData;
 class TiledLayerComposer;
 class CompositableParentManager;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/ContainerLayerComposite.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/ContainerLayerComposite.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/ContainerLayerComposite.cpp	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/ContainerLayerComposite.cpp	2015-04-24 19:31:20.000000000 +0000
@@ -263,17 +263,21 @@
   for (uint32_t i = 0; i < children.Length(); i++) {
     LayerComposite* layerToRender = static_cast<LayerComposite*>(children.ElementAt(i)->ImplData());
 
-    if (layerToRender->GetLayer()->GetEffectiveVisibleRegion().IsEmpty() &&
-        !layerToRender->GetLayer()->AsContainerLayer()) {
-      CULLING_LOG("Sublayer %p has no effective visible region\n", layerToRender->GetLayer());
-      continue;
-    }
-
     RenderTargetIntRect clipRect = layerToRender->GetLayer()->
         CalculateScissorRect(aClipRect);
-    if (clipRect.IsEmpty()) {
-      CULLING_LOG("Sublayer %p has an empty world clip rect\n", layerToRender->GetLayer());
-      continue;
+
+    // We don't want to skip container layers because otherwise their mPrepared
+    // may be null which is not allowed.
+    if (!layerToRender->GetLayer()->AsContainerLayer()) {
+      if (layerToRender->GetLayer()->GetEffectiveVisibleRegion().IsEmpty()) {
+        CULLING_LOG("Sublayer %p has no effective visible region\n", layerToRender->GetLayer());
+        continue;
+      }
+
+      if (clipRect.IsEmpty()) {
+        CULLING_LOG("Sublayer %p has an empty world clip rect\n", layerToRender->GetLayer());
+        continue;
+      }
     }
 
     CULLING_LOG("Preparing sublayer %p\n", layerToRender->GetLayer());
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/ContentHost.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/ContentHost.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/ContentHost.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/ContentHost.h	2015-04-24 19:30:50.000000000 +0000
@@ -42,7 +42,6 @@
 class ThebesBufferData;
 class TiledLayerComposer;
 struct EffectChain;
-class TextureImageTextureSourceOGL;
 
 struct TexturedEffect;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/FPSCounter.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/FPSCounter.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/FPSCounter.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/FPSCounter.h	2015-04-24 19:30:50.000000000 +0000
@@ -16,13 +16,9 @@
 #include "prio.h"                       // for NSPR file i/o
 
 namespace mozilla {
-namespace gl {
-class GLContext;
-}
 namespace layers {
 
 class DataTextureSource;
-class ShaderProgramOGL;
 class Compositor;
 
 // Dump the FPS histogram every 10 seconds or kMaxFrameFPS
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/ImageHost.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/ImageHost.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/ImageHost.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/ImageHost.h	2015-04-24 19:30:50.000000000 +0000
@@ -31,7 +31,6 @@
 namespace layers {
 
 class Compositor;
-class ISurfaceAllocator;
 struct EffectChain;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/LayerManagerComposite.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/LayerManagerComposite.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/LayerManagerComposite.cpp	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/LayerManagerComposite.cpp	2015-04-24 19:30:50.000000000 +0000
@@ -768,7 +768,7 @@
       js::ProfileEntry::Category::GRAPHICS);
 
     mCompositor->EndFrame();
-    mCompositor->SetFBAcquireFence(mRoot);
+    mCompositor->SetDispAcquireFence(mRoot);
   }
 
   if (composer2D) {
@@ -945,7 +945,7 @@
   RootLayer()->RenderLayer(clipRect);
 
   mCompositor->EndFrame();
-  mCompositor->SetFBAcquireFence(mRoot);
+  mCompositor->SetDispAcquireFence(mRoot);
 }
 #endif
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/LayerManagerComposite.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/LayerManagerComposite.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/LayerManagerComposite.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/LayerManagerComposite.h	2015-04-24 19:30:50.000000000 +0000
@@ -43,11 +43,6 @@
 class DrawTarget;
 }
 
-namespace gl {
-class GLContext;
-class TextureImage;
-}
-
 namespace layers {
 
 class CanvasLayerComposite;
@@ -60,7 +55,6 @@
 class ImageLayerComposite;
 class LayerComposite;
 class RefLayerComposite;
-class SurfaceDescriptor;
 class PaintedLayerComposite;
 class TiledLayerComposer;
 class TextRenderer;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/TextureHost.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/TextureHost.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/TextureHost.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/TextureHost.h	2015-04-24 19:30:50.000000000 +0000
@@ -30,8 +30,6 @@
 #include "mozilla/layers/AtomicRefCountedWithFinalize.h"
 #include "mozilla/gfx/Rect.h"
 
-class gfxReusableSurfaceWrapper;
-
 namespace mozilla {
 namespace gl {
 class SharedSurface;
@@ -43,7 +41,6 @@
 namespace layers {
 
 class Compositor;
-class CompositableHost;
 class CompositableParentManager;
 class SurfaceDescriptor;
 class SharedSurfaceDescriptor;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/TiledContentHost.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/TiledContentHost.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/composite/TiledContentHost.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/composite/TiledContentHost.h	2015-04-24 19:30:50.000000000 +0000
@@ -31,8 +31,6 @@
 #include <ui/Fence.h>
 #endif
 
-class gfxReusableSurfaceWrapper;
-
 namespace mozilla {
 namespace gfx {
 class Matrix4x4;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/Compositor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/Compositor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/Compositor.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/Compositor.h	2015-04-24 19:31:20.000000000 +0000
@@ -120,7 +120,6 @@
 struct Effect;
 struct EffectChain;
 class Image;
-class ISurfaceAllocator;
 class Layer;
 class TextureSource;
 class DataTextureSource;
@@ -338,7 +337,7 @@
    */
   virtual void EndFrame() = 0;
 
-  virtual void SetFBAcquireFence(Layer* aLayer) {}
+  virtual void SetDispAcquireFence(Layer* aLayer) {}
 
   virtual FenceHandle GetReleaseFence()
   {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/CopyableCanvasLayer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/CopyableCanvasLayer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/CopyableCanvasLayer.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/CopyableCanvasLayer.h	2015-04-24 19:31:20.000000000 +0000
@@ -21,9 +21,12 @@
 #include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
 
 namespace mozilla {
-namespace layers {
 
-class CanvasClientWebGL;
+namespace gl {
+class SharedSurface;
+}
+
+namespace layers {
 
 /**
  * A shared CanvasLayer implementation that supports copying
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/d3d11/CompositorD3D11.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/d3d11/CompositorD3D11.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/d3d11/CompositorD3D11.cpp	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/d3d11/CompositorD3D11.cpp	2015-04-24 19:30:50.000000000 +0000
@@ -355,47 +355,6 @@
   mDevice->QueryInterface(dxgiDevice.StartAssignment());
   dxgiDevice->GetAdapter(getter_AddRefs(dxgiAdapter));
 
-#ifdef MOZ_METRO
-  if (IsRunningInWindowsMetro()) {
-    nsRefPtr<IDXGIFactory2> dxgiFactory;
-    dxgiAdapter->GetParent(IID_PPV_ARGS(dxgiFactory.StartAssignment()));
-
-    nsIntRect rect;
-    mWidget->GetClientBounds(rect);
-
-    DXGI_SWAP_CHAIN_DESC1 swapDesc = { 0 };
-    // Automatically detect the width and the height from the winrt CoreWindow
-    swapDesc.Width = rect.width;
-    swapDesc.Height = rect.height;
-    // This is the most common swapchain format
-    swapDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
-    swapDesc.Stereo = false;
-    // Don't use multi-sampling
-    swapDesc.SampleDesc.Count = 1;
-    swapDesc.SampleDesc.Quality = 0;
-    swapDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-    // Use double buffering to enable flip
-    swapDesc.BufferCount = 2;
-    swapDesc.Scaling = DXGI_SCALING_NONE;
-    // All Metro style apps must use this SwapEffect
-    swapDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
-    swapDesc.Flags = 0;
-
-    /**
-     * Create a swap chain, this swap chain will contain the backbuffer for
-     * the window we draw to. The front buffer is the full screen front
-     * buffer.
-    */
-    nsRefPtr<IDXGISwapChain1> swapChain1;
-    hr = dxgiFactory->CreateSwapChainForCoreWindow(
-           dxgiDevice, (IUnknown *)mWidget->GetNativeData(NS_NATIVE_ICOREWINDOW),
-           &swapDesc, nullptr, getter_AddRefs(swapChain1));
-    if (FAILED(hr)) {
-        return false;
-    }
-    mSwapChain = swapChain1;
-  } else
-#endif
   {
     nsRefPtr<IDXGIFactory> dxgiFactory;
     dxgiAdapter->GetParent(IID_PPV_ARGS(dxgiFactory.StartAssignment()));
@@ -1236,16 +1195,9 @@
     mDefaultRT = nullptr;
   }
 
-  if (IsRunningInWindowsMetro()) {
-    hr = mSwapChain->ResizeBuffers(2, mSize.width, mSize.height,
-                                   DXGI_FORMAT_B8G8R8A8_UNORM,
-                                   0);
-    mDisableSequenceForNextFrame = true;
-  } else {
-    hr = mSwapChain->ResizeBuffers(1, mSize.width, mSize.height,
-                                   DXGI_FORMAT_B8G8R8A8_UNORM,
-                                   0);
-  }
+  hr = mSwapChain->ResizeBuffers(1, mSize.width, mSize.height,
+                                 DXGI_FORMAT_B8G8R8A8_UNORM,
+                                 0);
 
   return Succeeded(hr);
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/d3d11/TextureD3D11.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/d3d11/TextureD3D11.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/d3d11/TextureD3D11.h	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/d3d11/TextureD3D11.h	2015-04-24 19:30:50.000000000 +0000
@@ -14,8 +14,6 @@
 #include <d3d11.h>
 #include <vector>
 
-class gfxD2DSurface;
-
 namespace mozilla {
 namespace layers {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/d3d9/DeviceManagerD3D9.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/d3d9/DeviceManagerD3D9.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/d3d9/DeviceManagerD3D9.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/d3d9/DeviceManagerD3D9.h	2015-04-24 19:30:50.000000000 +0000
@@ -18,7 +18,6 @@
 namespace layers {
 
 class DeviceManagerD3D9;
-class LayerD3D9;
 class Nv3DVUtils;
 class Layer;
 class TextureSourceD3D9;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ImageContainer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ImageContainer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ImageContainer.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ImageContainer.h	2015-04-24 19:31:20.000000000 +0000
@@ -95,7 +95,6 @@
 
 namespace mozilla {
 
-class CrossProcessMutex;
 
 namespace layers {
 
@@ -103,8 +102,6 @@
 class SharedPlanarYCbCrImage;
 class TextureClient;
 class CompositableClient;
-class CompositableForwarder;
-class SurfaceDescriptor;
 class GrallocImage;
 
 struct ImageBackendData
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/CompositableForwarder.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/CompositableForwarder.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/CompositableForwarder.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/CompositableForwarder.h	2015-04-24 19:30:50.000000000 +0000
@@ -26,7 +26,6 @@
 class SurfaceDescriptor;
 class SurfaceDescriptorTiles;
 class ThebesBufferData;
-class ClientTiledLayerBuffer;
 class PTextureChild;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/CompositableTransactionParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/CompositableTransactionParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/CompositableTransactionParent.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/CompositableTransactionParent.h	2015-04-24 19:30:50.000000000 +0000
@@ -18,7 +18,6 @@
 namespace layers {
 
 class CompositableHost;
-class PTextureChild;
 
 typedef std::vector<mozilla::layers::EditReply> EditReplyVector;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/CompositorChild.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/CompositorChild.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/CompositorChild.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/CompositorChild.h	2015-04-24 19:30:50.000000000 +0000
@@ -20,8 +20,6 @@
 #include "ThreadSafeRefcountingWithMainThreadDestruction.h"
 #include "nsWeakReference.h"
 
-class nsIObserver;
-
 namespace mozilla {
 
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/CompositorParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/CompositorParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/CompositorParent.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/CompositorParent.h	2015-04-24 19:30:50.000000000 +0000
@@ -39,7 +39,6 @@
 
 class CancelableTask;
 class MessageLoop;
-class gfxContext;
 class nsIWidget;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/ImageBridgeChild.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/ImageBridgeChild.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/ImageBridgeChild.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/ImageBridgeChild.h	2015-04-24 19:30:50.000000000 +0000
@@ -32,7 +32,6 @@
 
 namespace layers {
 
-class ClientTiledLayerBuffer;
 class AsyncTransactionTracker;
 class ImageClient;
 class ImageContainer;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/ISurfaceAllocator.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/ISurfaceAllocator.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/ISurfaceAllocator.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/ISurfaceAllocator.h	2015-04-24 19:30:50.000000000 +0000
@@ -30,12 +30,6 @@
 #define MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
 #endif
 
-class gfxSharedImageSurface;
-
-namespace base {
-class Thread;
-}
-
 namespace mozilla {
 namespace ipc {
 class Shmem;
@@ -47,8 +41,6 @@
 namespace layers {
 
 class MaybeMagicGrallocBufferHandle;
-class MemoryTextureClient;
-class MemoryTextureHost;
 
 enum BufferCapabilities {
   DEFAULT_BUFFER_CAPS = 0,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/LayersMessages.ipdlh thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/LayersMessages.ipdlh
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/LayersMessages.ipdlh	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/LayersMessages.ipdlh	2015-04-24 19:30:50.000000000 +0000
@@ -94,26 +94,33 @@
   StepFunction;
 };
 
+// Send the angle with units rather than sending all angles in radians
+// to avoid having floating point error introduced by unit switching.
+struct CSSAngle {
+  float value;
+  int unit; // an nsCSSUnit that is valid for angles
+};
+
 struct LayerColor { gfxRGBA value; };
 struct Perspective { float value; };
-struct RotationX { float radians; };
-struct RotationY { float radians; };
-struct RotationZ { float radians; };
-struct Rotation { float radians; };
+struct RotationX { CSSAngle angle; };
+struct RotationY { CSSAngle angle; };
+struct RotationZ { CSSAngle angle; };
+struct Rotation { CSSAngle angle; };
 struct Rotation3D {
   float x;
   float y;
   float z;
-  float radians;
+  CSSAngle angle;
 };
 struct Scale {
   float x;
   float y;
   float z;
 };
-struct Skew { float x; float y; };
-struct SkewX { float x; };
-struct SkewY { float y; };
+struct Skew { CSSAngle x; CSSAngle y; };
+struct SkewX { CSSAngle x; };
+struct SkewY { CSSAngle y; };
 struct TransformMatrix { Matrix4x4 value; };
 struct Translation {
   float x;
@@ -154,9 +161,9 @@
 struct TransformData {
   // the origin of the frame being transformed in app units
   nsPoint origin;
-  // the transform-origin property for the transform in css pixels
+  // the transform-origin property for the transform in device pixels
   Point3D transformOrigin;
-  // the perspective-origin property for the transform in css pixels
+  // the perspective-origin property for the transform in device pixels
   Point3D perspectiveOrigin;
   nsRect bounds;
   nscoord perspective;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/LayerTransactionParent.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/LayerTransactionParent.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/LayerTransactionParent.cpp	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/LayerTransactionParent.cpp	2015-04-24 19:30:50.000000000 +0000
@@ -720,9 +720,7 @@
         Point3D(NS_round(NSAppUnitsToFloatPixels(data.origin().x, scale)),
                 NS_round(NSAppUnitsToFloatPixels(data.origin().y, scale)),
                 0.0f);
-      double cssPerDev =
-        double(nsDeviceContext::AppUnitsPerCSSPixel()) / double(scale);
-      transformOrigin = data.transformOrigin() * cssPerDev;
+      transformOrigin = data.transformOrigin();
       break;
     }
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/ShadowLayerParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/ShadowLayerParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/ShadowLayerParent.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/ShadowLayerParent.h	2015-04-24 19:30:50.000000000 +0000
@@ -18,7 +18,6 @@
 
 class ContainerLayer;
 class Layer;
-class LayerManager;
 
 class CanvasLayerComposite;
 class ColorLayerComposite;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/ShadowLayers.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/ShadowLayers.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/ShadowLayers.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/ShadowLayers.h	2015-04-24 19:30:50.000000000 +0000
@@ -26,33 +26,16 @@
 namespace mozilla {
 namespace layers {
 
-class ClientTiledLayerBuffer;
-class CanvasClient;
-class CanvasLayerComposite;
-class CanvasSurface;
-class ColorLayerComposite;
-class CompositableChild;
-class ContainerLayerComposite;
-class ContentClient;
-class ContentClientRemote;
 class EditReply;
-class ImageClient;
-class ImageLayerComposite;
 class Layer;
-class OptionalThebesBuffer;
 class PLayerChild;
 class PLayerTransactionChild;
-class PLayerTransactionParent;
 class LayerTransactionChild;
-class RefLayerComposite;
 class ShadowableLayer;
-class ShmemTextureClient;
 class SurfaceDescriptor;
 class TextureClient;
-class PaintedLayerComposite;
 class ThebesBuffer;
 class ThebesBufferData;
-class TiledLayerComposer;
 class Transaction;
 
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/ShadowLayerUtilsGralloc.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/ShadowLayerUtilsGralloc.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/ShadowLayerUtilsGralloc.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/ShadowLayerUtilsGralloc.h	2015-04-24 19:30:50.000000000 +0000
@@ -22,7 +22,6 @@
 
 class MaybeMagicGrallocBufferHandle;
 class SurfaceDescriptor;
-class TextureHost;
 
 struct GrallocBufferRef {
   base::ProcessId mOwner;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/SharedPlanarYCbCrImage.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/SharedPlanarYCbCrImage.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/SharedPlanarYCbCrImage.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/SharedPlanarYCbCrImage.h	2015-04-24 19:30:50.000000000 +0000
@@ -20,8 +20,6 @@
 
 class BufferTextureClient;
 class ImageClient;
-class ISurfaceAllocator;
-class SurfaceDescriptor;
 class TextureClient;
 
 class SharedPlanarYCbCrImage : public PlanarYCbCrImage
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/SharedRGBImage.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/SharedRGBImage.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/ipc/SharedRGBImage.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/ipc/SharedRGBImage.h	2015-04-24 19:30:50.000000000 +0000
@@ -16,17 +16,11 @@
 #include "nsCOMPtr.h"                   // for already_AddRefed
 
 namespace mozilla {
-namespace ipc {
-class Shmem;
-}
-
 namespace layers {
 
 class BufferTextureClient;
 class ImageClient;
-class ISurfaceAllocator;
 class TextureClient;
-class SurfaceDescriptor;
 
 already_AddRefed<Image> CreateSharedRGBImage(ImageContainer* aImageContainer,
                                              nsIntSize aSize,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/Layers.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/Layers.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/Layers.cpp	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/Layers.cpp	2015-04-24 19:31:20.000000000 +0000
@@ -267,6 +267,12 @@
   mPendingAnimations->Clear();
 }
 
+static inline void
+SetCSSAngle(const CSSAngle& aAngle, nsCSSValue& aValue)
+{
+  aValue.SetFloatValue(aAngle.value(), nsCSSUnit(aAngle.unit()));
+}
+
 static nsCSSValueSharedList*
 CreateCSSValueList(const InfallibleTArray<TransformFunction>& aFunctions)
 {
@@ -277,34 +283,34 @@
     switch (aFunctions[i].type()) {
       case TransformFunction::TRotationX:
       {
-        float theta = aFunctions[i].get_RotationX().radians();
+        const CSSAngle& angle = aFunctions[i].get_RotationX().angle();
         arr = StyleAnimationValue::AppendTransformFunction(eCSSKeyword_rotatex,
                                                            resultTail);
-        arr->Item(1).SetFloatValue(theta, eCSSUnit_Radian);
+        SetCSSAngle(angle, arr->Item(1));
         break;
       }
       case TransformFunction::TRotationY:
       {
-        float theta = aFunctions[i].get_RotationY().radians();
+        const CSSAngle& angle = aFunctions[i].get_RotationY().angle();
         arr = StyleAnimationValue::AppendTransformFunction(eCSSKeyword_rotatey,
                                                            resultTail);
-        arr->Item(1).SetFloatValue(theta, eCSSUnit_Radian);
+        SetCSSAngle(angle, arr->Item(1));
         break;
       }
       case TransformFunction::TRotationZ:
       {
-        float theta = aFunctions[i].get_RotationZ().radians();
+        const CSSAngle& angle = aFunctions[i].get_RotationZ().angle();
         arr = StyleAnimationValue::AppendTransformFunction(eCSSKeyword_rotatez,
                                                            resultTail);
-        arr->Item(1).SetFloatValue(theta, eCSSUnit_Radian);
+        SetCSSAngle(angle, arr->Item(1));
         break;
       }
       case TransformFunction::TRotation:
       {
-        float theta = aFunctions[i].get_Rotation().radians();
+        const CSSAngle& angle = aFunctions[i].get_Rotation().angle();
         arr = StyleAnimationValue::AppendTransformFunction(eCSSKeyword_rotate,
                                                            resultTail);
-        arr->Item(1).SetFloatValue(theta, eCSSUnit_Radian);
+        SetCSSAngle(angle, arr->Item(1));
         break;
       }
       case TransformFunction::TRotation3D:
@@ -312,14 +318,14 @@
         float x = aFunctions[i].get_Rotation3D().x();
         float y = aFunctions[i].get_Rotation3D().y();
         float z = aFunctions[i].get_Rotation3D().z();
-        float theta = aFunctions[i].get_Rotation3D().radians();
+        const CSSAngle& angle = aFunctions[i].get_Rotation3D().angle();
         arr =
           StyleAnimationValue::AppendTransformFunction(eCSSKeyword_rotate3d,
                                                        resultTail);
         arr->Item(1).SetFloatValue(x, eCSSUnit_Number);
         arr->Item(2).SetFloatValue(y, eCSSUnit_Number);
         arr->Item(3).SetFloatValue(z, eCSSUnit_Number);
-        arr->Item(4).SetFloatValue(theta, eCSSUnit_Radian);
+        SetCSSAngle(angle, arr->Item(4));
         break;
       }
       case TransformFunction::TScale:
@@ -344,26 +350,28 @@
       }
       case TransformFunction::TSkewX:
       {
-        float x = aFunctions[i].get_SkewX().x();
+        const CSSAngle& x = aFunctions[i].get_SkewX().x();
         arr = StyleAnimationValue::AppendTransformFunction(eCSSKeyword_skewx,
                                                            resultTail);
-        arr->Item(1).SetFloatValue(x, eCSSUnit_Radian);
+        SetCSSAngle(x, arr->Item(1));
         break;
       }
       case TransformFunction::TSkewY:
       {
-        float y = aFunctions[i].get_SkewY().y();
+        const CSSAngle& y = aFunctions[i].get_SkewY().y();
         arr = StyleAnimationValue::AppendTransformFunction(eCSSKeyword_skewy,
                                                            resultTail);
-        arr->Item(1).SetFloatValue(y, eCSSUnit_Radian);
+        SetCSSAngle(y, arr->Item(1));
         break;
       }
       case TransformFunction::TSkew:
       {
+        const CSSAngle& x = aFunctions[i].get_Skew().x();
+        const CSSAngle& y = aFunctions[i].get_Skew().y();
         arr = StyleAnimationValue::AppendTransformFunction(eCSSKeyword_skew,
                                                            resultTail);
-        arr->Item(1).SetFloatValue(aFunctions[i].get_Skew().x(), eCSSUnit_Radian);
-        arr->Item(2).SetFloatValue(aFunctions[i].get_Skew().y(), eCSSUnit_Radian);
+        SetCSSAngle(x, arr->Item(1));
+        SetCSSAngle(y, arr->Item(2));
         break;
       }
       case TransformFunction::TTransformMatrix:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/Layers.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/Layers.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/Layers.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/Layers.h	2015-04-24 19:31:20.000000000 +0000
@@ -57,11 +57,9 @@
 class ComputedTimingFunction;
 class FrameLayerBuilder;
 class StyleAnimationValue;
-class WebGLContext;
 
 namespace gl {
 class GLContext;
-class SharedSurface;
 }
 
 namespace gfx {
@@ -78,7 +76,6 @@
 class AnimationData;
 class AsyncPanZoomController;
 class ClientLayerManager;
-class CommonLayerAttributes;
 class Layer;
 class LayerMetricsWrapper;
 class PaintedLayer;
@@ -95,10 +92,7 @@
 class ShadowLayerForwarder;
 class LayerManagerComposite;
 class SpecificLayerAttributes;
-class SurfaceDescriptor;
 class Compositor;
-struct TextureFactoryIdentifier;
-struct EffectMask;
 
 namespace layerscope {
 class LayersPacket;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/LayersTypes.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/LayersTypes.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/LayersTypes.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/LayersTypes.h	2015-04-24 19:31:20.000000000 +0000
@@ -26,7 +26,6 @@
 #  define MOZ_LAYERS_LOG_IF_SHADOWABLE(layer, _args)         \
   do { if (layer->AsShadowableLayer()) { PR_LOG(LayerManager::GetLog(), PR_LOG_DEBUG, _args); } } while (0)
 #else
-struct PRLogModuleInfo;
 #  define MOZ_LAYERS_LOG(_args)
 #  define MOZ_LAYERS_LOG_IF_SHADOWABLE(layer, _args)
 #endif  // if defined(DEBUG) || defined(PR_LOGGING)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/LayerTreeInvalidation.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/LayerTreeInvalidation.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/LayerTreeInvalidation.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/LayerTreeInvalidation.h	2015-04-24 19:31:20.000000000 +0000
@@ -10,8 +10,6 @@
 #include "mozilla/UniquePtr.h"          // for UniquePtr
 #include "mozilla/gfx/Point.h"
 
-class nsPresContext;
-
 namespace mozilla {
 namespace layers {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/opengl/Composer2D.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/opengl/Composer2D.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/opengl/Composer2D.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/opengl/Composer2D.h	2015-04-24 19:30:50.000000000 +0000
@@ -27,11 +27,6 @@
  */
 
 namespace mozilla {
-
-namespace gfx {
-class Matrix;
-}
-
 namespace layers {
 
 class Layer;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/opengl/CompositorOGL.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/opengl/CompositorOGL.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/opengl/CompositorOGL.cpp	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/opengl/CompositorOGL.cpp	2015-04-24 19:30:50.000000000 +0000
@@ -1284,12 +1284,12 @@
 
 #if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
 void
-CompositorOGL::SetFBAcquireFence(Layer* aLayer)
+CompositorOGL::SetDispAcquireFence(Layer* aLayer)
 {
   // OpenGL does not provide ReleaseFence for rendering.
-  // Instead use FBAcquireFence as layer buffer's ReleaseFence
+  // Instead use DispAcquireFence as layer buffer's ReleaseFence
   // to prevent flickering and tearing.
-  // FBAcquireFence is FramebufferSurface's AcquireFence.
+  // DispAcquireFence is DisplaySurface's AcquireFence.
   // AcquireFence will be signaled when a buffer's content is available.
   // See Bug 974152.
 
@@ -1297,7 +1297,7 @@
     return;
   }
 
-  android::sp<android::Fence> fence = new android::Fence(GetGonkDisplay()->GetPrevFBAcquireFd());
+  android::sp<android::Fence> fence = new android::Fence(GetGonkDisplay()->GetPrevDispAcquireFd());
   if (fence.get() && fence->isValid()) {
     FenceHandle handle = FenceHandle(fence);
     mReleaseFenceHandle.Merge(handle);
@@ -1315,7 +1315,7 @@
 
 #else
 void
-CompositorOGL::SetFBAcquireFence(Layer* aLayer)
+CompositorOGL::SetDispAcquireFence(Layer* aLayer)
 {
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/opengl/CompositorOGL.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/opengl/CompositorOGL.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/opengl/CompositorOGL.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/opengl/CompositorOGL.h	2015-04-24 19:30:50.000000000 +0000
@@ -40,7 +40,6 @@
 class nsIWidget;
 
 namespace mozilla {
-class TimeStamp;
 
 namespace gfx {
 class Matrix4x4;
@@ -237,7 +236,7 @@
                         const gfx::Matrix4x4 &aTransform) override;
 
   virtual void EndFrame() override;
-  virtual void SetFBAcquireFence(Layer* aLayer) override;
+  virtual void SetDispAcquireFence(Layer* aLayer) override;
   virtual FenceHandle GetReleaseFence() override;
   virtual void EndFrameForExternalComposition(const gfx::Matrix& aTransform) override;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/opengl/TextureClientOGL.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/opengl/TextureClientOGL.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/opengl/TextureClientOGL.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/opengl/TextureClientOGL.h	2015-04-24 19:30:50.000000000 +0000
@@ -20,8 +20,6 @@
 
 namespace layers {
 
-class CompositableForwarder;
-
 class EGLImageTextureClient : public TextureClient
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/opengl/TextureHostOGL.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/opengl/TextureHostOGL.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/layers/opengl/TextureHostOGL.h	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/layers/opengl/TextureHostOGL.h	2015-04-24 19:30:50.000000000 +0000
@@ -37,7 +37,6 @@
 #endif
 #endif
 
-class gfxReusableSurfaceWrapper;
 class nsIntRegion;
 
 namespace mozilla {
@@ -54,7 +53,6 @@
 class Compositor;
 class CompositorOGL;
 class TextureImageTextureSourceOGL;
-class TextureSharedDataGonkOGL;
 class GLTextureSource;
 
 inline void ApplyFilterToBoundTexture(gl::GLContext* aGL,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/skia/generate_mozbuild.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/skia/generate_mozbuild.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/skia/generate_mozbuild.py	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/skia/generate_mozbuild.py	2015-04-24 19:30:50.000000000 +0000
@@ -138,10 +138,11 @@
     CXXFLAGS += [
         '-Wno-overloaded-virtual',
         '-Wno-unused-function',
-        '-fomit-frame-pointer',
     ]
     if not CONFIG['CLANG_CXX']:
         CXXFLAGS += ['-Wno-logical-op']
+    if CONFIG['CPU_ARCH'] == 'arm':
+        SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
@@ -346,6 +347,7 @@
     'SkBlitter_ARGB32.cpp',
     'SkBlitter_RGB16.cpp',
     'SkBlitter_Sprite.cpp',
+    'SkBlitRow_opts_arm.cpp',
     'SkScan_Antihair.cpp',
     'SkCondVar.cpp',
     'SkParse.cpp',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/skia/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/skia/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/skia/moz.build	2015-04-22 13:05:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/skia/moz.build	2015-04-24 19:30:50.000000000 +0000
@@ -816,13 +816,15 @@
         'trunk/src/core/SkUtilsArm.cpp',
         'trunk/src/opts/SkBitmapProcState_opts_arm.cpp',
         'trunk/src/opts/SkBlitMask_opts_arm.cpp',
-        'trunk/src/opts/SkBlitRow_opts_arm.cpp',
         'trunk/src/opts/SkBlurImage_opts_arm.cpp',
         'trunk/src/opts/SkMorphology_opts_arm.cpp',
         'trunk/src/opts/SkTextureCompression_opts_arm.cpp',
         'trunk/src/opts/SkUtils_opts_arm.cpp',
         'trunk/src/opts/SkXfermode_opts_arm.cpp',
     ]
+    SOURCES += [
+        'trunk/src/opts/SkBlitRow_opts_arm.cpp',
+    ]
     if CONFIG['BUILD_ARM_NEON']:
         SOURCES += [
             'trunk/src/opts/SkBitmapProcState_arm_neon.cpp',
@@ -964,10 +966,11 @@
     CXXFLAGS += [
         '-Wno-overloaded-virtual',
         '-Wno-unused-function',
-        '-fomit-frame-pointer',
     ]
     if not CONFIG['CLANG_CXX']:
         CXXFLAGS += ['-Wno-logical-op']
+    if CONFIG['CPU_ARCH'] == 'arm':
+        SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/src/FilterSupport.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/src/FilterSupport.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/src/FilterSupport.h	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/src/FilterSupport.h	2015-04-24 19:30:52.000000000 +0000
@@ -158,7 +158,6 @@
 
 class DrawTarget;
 class SourceSurface;
-class FilterNode;
 struct FilterAttribute;
 
 enum class AttributeType {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/src/nsColor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/src/nsColor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/src/nsColor.h	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/src/nsColor.h	2015-04-24 19:30:52.000000000 +0000
@@ -13,7 +13,6 @@
 
 class nsAString;
 class nsString;
-class nsCString;
 
 // A color is a 32 bit unsigned integer with four components: R, G, B
 // and A.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/src/nsITheme.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/src/nsITheme.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/src/nsITheme.h	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/src/nsITheme.h	2015-04-24 19:30:52.000000000 +0000
@@ -15,13 +15,11 @@
 #include "Units.h"
 
 struct nsRect;
-struct nsFont;
 struct nsIntMargin;
 class nsPresContext;
 class nsRenderingContext;
 class nsDeviceContext;
 class nsIFrame;
-class nsIContent;
 class nsIAtom;
 class nsIWidget;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfx2DGlue.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfx2DGlue.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfx2DGlue.h	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfx2DGlue.h	2015-04-24 19:30:53.000000000 +0000
@@ -18,14 +18,6 @@
 
 namespace mozilla {
 namespace gfx {
-class DrawTarget;
-class SourceSurface;
-class ScaledFont;
-}
-}
-
-namespace mozilla {
-namespace gfx {
 
 inline Rect ToRect(const gfxRect &aRect)
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxAndroidPlatform.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxAndroidPlatform.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxAndroidPlatform.h	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxAndroidPlatform.h	2015-04-24 19:30:53.000000000 +0000
@@ -12,8 +12,6 @@
 #include "nsCOMPtr.h"
 #include "nsTArray.h"
 
-class nsIMemoryReporter;
-
 namespace mozilla {
     namespace dom {
         class FontListEntry;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxBlur.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxBlur.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxBlur.h	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxBlur.h	2015-04-24 19:30:53.000000000 +0000
@@ -16,7 +16,6 @@
 class gfxContext;
 struct gfxRect;
 struct gfxRGBA;
-class gfxMatrix;
 
 namespace mozilla {
   namespace gfx {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxDrawable.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxDrawable.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxDrawable.h	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxDrawable.h	2015-04-24 19:30:53.000000000 +0000
@@ -12,7 +12,6 @@
 #include "GraphicsFilter.h"
 #include "mozilla/gfx/2D.h"
 
-class gfxASurface;
 class gfxContext;
 class gfxPattern;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxPattern.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxPattern.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxPattern.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxPattern.h	2015-04-24 19:30:53.000000000 +0000
@@ -17,8 +17,6 @@
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 
-class gfxContext;
-class gfxASurface;
 struct gfxRGBA;
 typedef struct _cairo_pattern cairo_pattern_t;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxPlatform.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxPlatform.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxPlatform.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxPlatform.h	2015-04-24 19:30:53.000000000 +0000
@@ -38,11 +38,9 @@
 class nsIAtom;
 class nsIObserver;
 class SRGBOverrideObserver;
-struct gfxRGBA;
 
 namespace mozilla {
 namespace gl {
-class GLContext;
 class SkiaGLGlue;
 }
 namespace gfx {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxPrefs.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxPrefs.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxPrefs.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxPrefs.h	2015-04-24 19:30:53.000000000 +0000
@@ -205,6 +205,8 @@
   DECL_GFX_PREF(Live, "gfx.canvas.auto_accelerate.min_frames", CanvasAutoAccelerateMinFrames, int32_t, 30);
   DECL_GFX_PREF(Live, "gfx.canvas.auto_accelerate.min_seconds", CanvasAutoAccelerateMinSeconds, float, 5.0f);
   DECL_GFX_PREF(Live, "gfx.canvas.azure.accelerated",          CanvasAzureAccelerated, bool, false);
+  // 0x7fff is the maximum supported xlib surface size and is more than enough for canvases.
+  DECL_GFX_PREF(Live, "gfx.canvas.max-size",                   MaxCanvasSize, int32_t, 0x7fff);
   DECL_GFX_PREF(Once, "gfx.canvas.skiagl.cache-items",         CanvasSkiaGLCacheItems, int32_t, 256);
   DECL_GFX_PREF(Once, "gfx.canvas.skiagl.cache-size",          CanvasSkiaGLCacheSize, int32_t, 96);
   DECL_GFX_PREF(Once, "gfx.canvas.skiagl.dynamic-cache",       CanvasSkiaGLDynamicCache, bool, false);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxQtNativeRenderer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxQtNativeRenderer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxQtNativeRenderer.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxQtNativeRenderer.h	2015-04-24 19:30:53.000000000 +0000
@@ -11,8 +11,6 @@
 #include "gfxXlibSurface.h"
 #include "mozilla/gfx/Rect.h"
 
-class QRect;
-
 /**
  * This class lets us take code that draws into an Xlib surface drawable and lets us
  * use it to draw into any Thebes context. The user should subclass this class,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxTextRun.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxTextRun.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxTextRun.cpp	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxTextRun.cpp	2015-04-24 19:30:53.000000000 +0000
@@ -523,6 +523,7 @@
 struct BufferAlphaColor {
     explicit BufferAlphaColor(gfxContext *aContext)
         : mContext(aContext)
+        , mAlpha(0.0)
     {
 
     }
@@ -2572,10 +2573,13 @@
 }
 
 gfxTextRun *
-gfxFontGroup::GetEllipsisTextRun(int32_t aAppUnitsPerDevPixel,
+gfxFontGroup::GetEllipsisTextRun(int32_t aAppUnitsPerDevPixel, uint32_t aFlags,
                                  LazyReferenceContextGetter& aRefContextGetter)
 {
+    MOZ_ASSERT(!(aFlags & ~TEXT_ORIENT_MASK),
+               "flags here should only be used to specify orientation");
     if (mCachedEllipsisTextRun &&
+        (mCachedEllipsisTextRun->GetFlags() & TEXT_ORIENT_MASK) == aFlags &&
         mCachedEllipsisTextRun->GetAppUnitsPerDevUnit() == aAppUnitsPerDevPixel) {
         return mCachedEllipsisTextRun;
     }
@@ -2595,7 +2599,7 @@
     };
     gfxTextRun* textRun =
         MakeTextRun(ellipsis.get(), ellipsis.Length(), &params,
-                    TEXT_IS_PERSISTENT, nullptr);
+                    aFlags | TEXT_IS_PERSISTENT, nullptr);
     if (!textRun) {
         return nullptr;
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxTextRun.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxTextRun.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxTextRun.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxTextRun.h	2015-04-24 19:30:53.000000000 +0000
@@ -878,10 +878,10 @@
     };
     // The gfxFontGroup keeps ownership of this textrun.
     // It is only guaranteed to exist until the next call to GetEllipsisTextRun
-    // (which might use a different appUnitsPerDev value) for the font group,
-    // or until UpdateUserFonts is called, or the fontgroup is destroyed.
+    // (which might use a different appUnitsPerDev value or flags) for the font
+    // group, or until UpdateUserFonts is called, or the fontgroup is destroyed.
     // Get it/use it/forget it :) - don't keep a reference that might go stale.
-    gfxTextRun* GetEllipsisTextRun(int32_t aAppUnitsPerDevPixel,
+    gfxTextRun* GetEllipsisTextRun(int32_t aAppUnitsPerDevPixel, uint32_t aFlags,
                                    LazyReferenceContextGetter& aRefContextGetter);
 
     // helper method for resolving generic font families
@@ -1042,7 +1042,7 @@
     gfxTextPerfMetrics *mTextPerf;
 
     // Cache a textrun representing an ellipsis (useful for CSS text-overflow)
-    // at a specific appUnitsPerDevPixel size
+    // at a specific appUnitsPerDevPixel size and orientation
     nsAutoPtr<gfxTextRun>   mCachedEllipsisTextRun;
 
     // cache the most recent pref font to avoid general pref font lookup
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxWindowsPlatform.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxWindowsPlatform.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxWindowsPlatform.cpp	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxWindowsPlatform.cpp	2015-04-24 19:30:53.000000000 +0000
@@ -117,8 +117,7 @@
 static const char *kFeatureLevelPref =
   "gfx.direct3d.last_used_feature_level_idx";
 static const int kSupportedFeatureLevels[] =
-  { D3D10_FEATURE_LEVEL_10_1, D3D10_FEATURE_LEVEL_10_0,
-    D3D10_FEATURE_LEVEL_9_3 };
+  { D3D10_FEATURE_LEVEL_10_1, D3D10_FEATURE_LEVEL_10_0 };
 
 class GfxD2DSurfaceReporter final : public nsIMemoryReporter
 {
@@ -676,10 +675,6 @@
     nsRefPtr<ID3D10Device1> device;
 
     int supportedFeatureLevelsCount = ArrayLength(kSupportedFeatureLevels);
-    // If we're not running in Metro don't allow DX9.3
-    if (!IsRunningInWindowsMetro()) {
-      supportedFeatureLevelsCount--;
-    }
 
     nsRefPtr<IDXGIAdapter1> adapter1 = GetDXGIAdapter();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxWindowsPlatform.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxWindowsPlatform.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/gfx/thebes/gfxWindowsPlatform.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/gfx/thebes/gfxWindowsPlatform.h	2015-04-24 19:30:53.000000000 +0000
@@ -57,8 +57,6 @@
 struct ID3D11Device;
 struct IDXGIAdapter1;
 
-class nsIMemoryReporter;
-
 /**
  * Utility to get a Windows HDC from a Moz2D DrawTarget.  If the DrawTarget is
  * not backed by a HDC this will get the HDC for the screen device context
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/android/AndroidGamepad.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/android/AndroidGamepad.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/android/AndroidGamepad.cpp	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/android/AndroidGamepad.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +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 "Hal.h"
-#include "AndroidBridge.h"
-
-using namespace mozilla::hal;
-
-namespace mozilla {
-namespace hal_impl {
-
-void
-StartMonitoringGamepadStatus()
-{
-  widget::GeckoAppShell::StartMonitoringGamepad();
-}
-
-void
-StopMonitoringGamepadStatus()
-{
-  widget::GeckoAppShell::StopMonitoringGamepad();
-}
-
-} // hal_impl
-} // mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/cocoa/CocoaGamepad.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/cocoa/CocoaGamepad.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/cocoa/CocoaGamepad.cpp	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/cocoa/CocoaGamepad.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,522 +0,0 @@
-/* -*- Mode: C++; 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/. */
-
-// mostly derived from the Allegro source code at:
-// http://alleg.svn.sourceforge.net/viewvc/alleg/allegro/branches/4.9/src/macosx/hidjoy.m?revision=13760&view=markup
-
-#include "mozilla/dom/GamepadService.h"
-#include <CoreFoundation/CoreFoundation.h>
-#include <IOKit/hid/IOHIDBase.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <IOKit/hid/IOHIDManager.h>
-
-#include <stdio.h>
-#include <vector>
-
-namespace {
-
-using mozilla::dom::GamepadService;
-
-using std::vector;
-
-struct Button {
-  int id;
-  bool analog;
-  IOHIDElementRef element;
-  CFIndex min;
-  CFIndex max;
-
-  Button(int aId, IOHIDElementRef aElement, CFIndex aMin, CFIndex aMax) :
-    id(aId),
-    analog((aMax - aMin) > 1),
-    element(aElement),
-    min(aMin),
-    max(aMax) {}
-};
-
-struct Axis {
-  int id;
-  IOHIDElementRef element;
-  uint32_t usagePage;
-  uint32_t usage;
-  CFIndex min;
-  CFIndex max;
-};
-
-typedef bool dpad_buttons[4];
-
-// These values can be found in the USB HID Usage Tables:
-// http://www.usb.org/developers/hidpage
-const unsigned kDesktopUsagePage = 0x01;
-const unsigned kSimUsagePage = 0x02;
-const unsigned kAcceleratorUsage = 0xC4;
-const unsigned kBrakeUsage = 0xC5;
-const unsigned kJoystickUsage = 0x04;
-const unsigned kGamepadUsage = 0x05;
-const unsigned kAxisUsageMin = 0x30;
-const unsigned kAxisUsageMax = 0x35;
-const unsigned kDpadUsage = 0x39;
-const unsigned kButtonUsagePage = 0x09;
-const unsigned kConsumerPage = 0x0C;
-const unsigned kHomeUsage = 0x223;
-const unsigned kBackUsage = 0x224;
-
-
-class Gamepad {
- private:
-  IOHIDDeviceRef mDevice;
-  nsTArray<Button> buttons;
-  nsTArray<Axis> axes;
-  IOHIDElementRef mDpad;
-  dpad_buttons mDpadState;
-
- public:
-  Gamepad() : mDevice(nullptr), mDpad(nullptr), mSuperIndex(-1) {}
-  bool operator==(IOHIDDeviceRef device) const { return mDevice == device; }
-  bool empty() const { return mDevice == nullptr; }
-  void clear()
-  {
-    mDevice = nullptr;
-    buttons.Clear();
-    axes.Clear();
-    mDpad = nullptr;
-    mSuperIndex = -1;
-  }
-  void init(IOHIDDeviceRef device);
-  size_t numButtons() { return buttons.Length() + (mDpad ? 4 : 0); }
-  size_t numAxes() { return axes.Length(); }
-
-  // Index given by our superclass.
-  uint32_t mSuperIndex;
-
-  const bool isDpad(IOHIDElementRef element) const
-  {
-    return element == mDpad;
-  }
-
-  const dpad_buttons& getDpadState() const
-  {
-    return mDpadState;
-  }
-
-  void setDpadState(const dpad_buttons& dpadState)
-  {
-    for (unsigned i = 0; i < ArrayLength(mDpadState); i++) {
-      mDpadState[i] = dpadState[i];
-    }
-  }
-
-  const Button* lookupButton(IOHIDElementRef element) const
-  {
-    for (unsigned i = 0; i < buttons.Length(); i++) {
-      if (buttons[i].element == element)
-        return &buttons[i];
-    }
-    return nullptr;
-  }
-
-  const Axis* lookupAxis(IOHIDElementRef element) const
-  {
-    for (unsigned i = 0; i < axes.Length(); i++) {
-      if (axes[i].element == element)
-        return &axes[i];
-    }
-    return nullptr;
-  }
-};
-
-class AxisComparator {
-public:
-  bool Equals(const Axis& a1, const Axis& a2) const
-  {
-    return a1.usagePage == a2.usagePage && a1.usage == a2.usage;
-  }
-  bool LessThan(const Axis& a1, const Axis& a2) const
-  {
-    if (a1.usagePage == a2.usagePage) {
-      return a1.usage < a2.usage;
-    }
-    return a1.usagePage < a2.usagePage;
-  }
-};
-
-void Gamepad::init(IOHIDDeviceRef device)
-{
-  clear();
-  mDevice = device;
-
-  CFArrayRef elements = IOHIDDeviceCopyMatchingElements(device,
-                                                        nullptr,
-                                                        kIOHIDOptionsTypeNone);
-  CFIndex n = CFArrayGetCount(elements);
-  for (CFIndex i = 0; i < n; i++) {
-    IOHIDElementRef element = (IOHIDElementRef)CFArrayGetValueAtIndex(elements,
-                                                                      i);
-    uint32_t usagePage = IOHIDElementGetUsagePage(element);
-    uint32_t usage = IOHIDElementGetUsage(element);
-
-    if (usagePage == kDesktopUsagePage &&
-        usage >= kAxisUsageMin &&
-        usage <= kAxisUsageMax)
-    {
-      Axis axis = { int(axes.Length()),
-                    element,
-                    usagePage,
-                    usage,
-                    IOHIDElementGetLogicalMin(element),
-                    IOHIDElementGetLogicalMax(element) };
-      axes.AppendElement(axis);
-    } else if (usagePage == kDesktopUsagePage && usage == kDpadUsage &&
-               // Don't know how to handle d-pads that return weird values.
-               IOHIDElementGetLogicalMax(element) - IOHIDElementGetLogicalMin(element) == 7) {
-      mDpad = element;
-    } else if ((usagePage == kSimUsagePage &&
-                 (usage == kAcceleratorUsage ||
-                  usage == kBrakeUsage)) ||
-               (usagePage == kButtonUsagePage) ||
-               (usagePage == kConsumerPage &&
-                 (usage == kHomeUsage ||
-                  usage == kBackUsage))) {
-      Button button(int(buttons.Length()), element, IOHIDElementGetLogicalMin(element), IOHIDElementGetLogicalMax(element));
-      buttons.AppendElement(button);
-    } else {
-      //TODO: handle other usage pages
-    }
-  }
-
-  AxisComparator comparator;
-  axes.Sort(comparator);
-  for (unsigned i = 0; i < axes.Length(); i++) {
-    axes[i].id = i;
-  }
-}
-
-class DarwinGamepadService {
- private:
-  IOHIDManagerRef mManager;
-  vector<Gamepad> mGamepads;
-
-  static void DeviceAddedCallback(void* data, IOReturn result,
-                                  void* sender, IOHIDDeviceRef device);
-  static void DeviceRemovedCallback(void* data, IOReturn result,
-                                    void* sender, IOHIDDeviceRef device);
-  static void InputValueChangedCallback(void* data, IOReturn result,
-                                        void* sender, IOHIDValueRef newValue);
-
-  void DeviceAdded(IOHIDDeviceRef device);
-  void DeviceRemoved(IOHIDDeviceRef device);
-  void InputValueChanged(IOHIDValueRef value);
-
- public:
-  DarwinGamepadService();
-  ~DarwinGamepadService();
-  void Startup();
-  void Shutdown();
-};
-
-void
-DarwinGamepadService::DeviceAdded(IOHIDDeviceRef device)
-{
-  size_t slot = size_t(-1);
-  for (size_t i = 0; i < mGamepads.size(); i++) {
-    if (mGamepads[i] == device)
-      return;
-    if (slot == size_t(-1) && mGamepads[i].empty())
-      slot = i;
-  }
-
-  if (slot == size_t(-1)) {
-    slot = mGamepads.size();
-    mGamepads.push_back(Gamepad());
-  }
-  mGamepads[slot].init(device);
-
-  // Gather some identifying information
-  CFNumberRef vendorIdRef =
-    (CFNumberRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDVendorIDKey));
-  CFNumberRef productIdRef =
-    (CFNumberRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductIDKey));
-  CFStringRef productRef =
-    (CFStringRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey));
-  int vendorId, productId;
-  CFNumberGetValue(vendorIdRef, kCFNumberIntType, &vendorId);
-  CFNumberGetValue(productIdRef, kCFNumberIntType, &productId);
-  char product_name[128];
-  CFStringGetCString(productRef, product_name,
-                     sizeof(product_name), kCFStringEncodingASCII);
-  char buffer[256];
-  sprintf(buffer, "%x-%x-%s", vendorId, productId, product_name);
-  nsRefPtr<GamepadService> service(GamepadService::GetService());
-  mGamepads[slot].mSuperIndex = service->AddGamepad(buffer,
-                                                    mozilla::dom::GamepadMappingType::_empty,
-                                                    (int)mGamepads[slot].numButtons(),
-                                                    (int)mGamepads[slot].numAxes());
-}
-
-void
-DarwinGamepadService::DeviceRemoved(IOHIDDeviceRef device)
-{
-  nsRefPtr<GamepadService> service(GamepadService::GetService());
-  for (size_t i = 0; i < mGamepads.size(); i++) {
-    if (mGamepads[i] == device) {
-      service->RemoveGamepad(mGamepads[i].mSuperIndex);
-      mGamepads[i].clear();
-      return;
-    }
-  }
-}
-
-/*
- * Given a value from a d-pad (POV hat in USB HID terminology),
- * represent it as 4 buttons, one for each cardinal direction.
- */
-static void
-UnpackDpad(int dpad_value, int min, int max, dpad_buttons& buttons)
-{
-  const unsigned kUp = 0;
-  const unsigned kDown = 1;
-  const unsigned kLeft = 2;
-  const unsigned kRight = 3;
-
-  // Different controllers have different ways of representing
-  // "nothing is pressed", but they're all outside the range of values.
-  if (dpad_value < min || dpad_value > max) {
-    // Nothing is pressed.
-    return;
-  }
-
-  // Normalize value to start at 0.
-  int value = dpad_value - min;
-
-  // Value will be in the range 0-7. The value represents the
-  // position of the d-pad around a circle, with 0 being straight up,
-  // 2 being right, 4 being straight down, and 6 being left.
-  if (value < 2 || value > 6) {
-    buttons[kUp] = true;
-  }
-  if (value > 2 && value < 6) {
-    buttons[kDown] = true;
-  }
-  if (value > 4) {
-    buttons[kLeft] = true;
-  }
-  if (value > 0 && value < 4) {
-    buttons[kRight] = true;
-  }
-}
-
-void
-DarwinGamepadService::InputValueChanged(IOHIDValueRef value)
-{
-  uint32_t value_length = IOHIDValueGetLength(value);
-  if (value_length > 4) {
-    // Workaround for bizarre issue with PS3 controllers that try to return
-    // massive (30+ byte) values and crash IOHIDValueGetIntegerValue
-    return;
-  }
-  nsRefPtr<GamepadService> service(GamepadService::GetService());
-  IOHIDElementRef element = IOHIDValueGetElement(value);
-  IOHIDDeviceRef device = IOHIDElementGetDevice(element);
-  for (unsigned i = 0; i < mGamepads.size(); i++) {
-    Gamepad &gamepad = mGamepads[i];
-    if (gamepad == device) {
-      if (gamepad.isDpad(element)) {
-        const dpad_buttons& oldState = gamepad.getDpadState();
-        dpad_buttons newState = { false, false, false, false };
-        UnpackDpad(IOHIDValueGetIntegerValue(value),
-                   IOHIDElementGetLogicalMin(element),
-                   IOHIDElementGetLogicalMax(element),
-                   newState);
-        const int numButtons = gamepad.numButtons();
-        for (unsigned b = 0; b < ArrayLength(newState); b++) {
-          if (newState[b] != oldState[b]) {
-            service->NewButtonEvent(i, numButtons - 4 + b, newState[b]);
-          }
-        }
-        gamepad.setDpadState(newState);
-      } else if (const Axis* axis = gamepad.lookupAxis(element)) {
-        double d = IOHIDValueGetIntegerValue(value);
-        double v = 2.0f * (d - axis->min) /
-          (double)(axis->max - axis->min) - 1.0f;
-        service->NewAxisMoveEvent(i, axis->id, v);
-      } else if (const Button* button = gamepad.lookupButton(element)) {
-        int iv = IOHIDValueGetIntegerValue(value);
-        bool pressed = iv != 0;
-        double v = 0;
-        if (button->analog) {
-          double dv = iv;
-          v = (dv - button->min) / (double)(button->max - button->min);
-        } else {
-          v = pressed ? 1.0 : 0.0;
-        }
-        service->NewButtonEvent(i, button->id, pressed, v);
-      }
-      return;
-    }
-  }
-}
-
-void
-DarwinGamepadService::DeviceAddedCallback(void* data, IOReturn result,
-                                         void* sender, IOHIDDeviceRef device)
-{
-  DarwinGamepadService* service = (DarwinGamepadService*)data;
-  service->DeviceAdded(device);
-}
-
-void
-DarwinGamepadService::DeviceRemovedCallback(void* data, IOReturn result,
-                                           void* sender, IOHIDDeviceRef device)
-{
-  DarwinGamepadService* service = (DarwinGamepadService*)data;
-  service->DeviceRemoved(device);
-}
-
-void
-DarwinGamepadService::InputValueChangedCallback(void* data,
-                                               IOReturn result,
-                                               void* sender,
-                                               IOHIDValueRef newValue)
-{
-  DarwinGamepadService* service = (DarwinGamepadService*)data;
-  service->InputValueChanged(newValue);
-}
-
-static CFMutableDictionaryRef
-MatchingDictionary(UInt32 inUsagePage, UInt32 inUsage)
-{
-  CFMutableDictionaryRef dict =
-    CFDictionaryCreateMutable(kCFAllocatorDefault,
-                              0,
-                              &kCFTypeDictionaryKeyCallBacks,
-                              &kCFTypeDictionaryValueCallBacks);
-  if (!dict)
-    return nullptr;
-  CFNumberRef number = CFNumberCreate(kCFAllocatorDefault,
-                                      kCFNumberIntType,
-                                      &inUsagePage);
-  if (!number) {
-    CFRelease(dict);
-    return nullptr;
-  }
-  CFDictionarySetValue(dict, CFSTR(kIOHIDDeviceUsagePageKey), number);
-  CFRelease(number);
-
-  number = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &inUsage);
-  if (!number) {
-    CFRelease(dict);
-    return nullptr;
-  }
-  CFDictionarySetValue(dict, CFSTR(kIOHIDDeviceUsageKey), number);
-  CFRelease(number);
-
-  return dict;
-}
-
-DarwinGamepadService::DarwinGamepadService() : mManager(nullptr) {}
-
-DarwinGamepadService::~DarwinGamepadService()
-{
-  if (mManager != nullptr)
-    CFRelease(mManager);
-}
-
-void DarwinGamepadService::Startup()
-{
-  if (mManager != nullptr)
-    return;
-
-  IOHIDManagerRef manager = IOHIDManagerCreate(kCFAllocatorDefault,
-                                               kIOHIDOptionsTypeNone);
-
-  CFMutableDictionaryRef criteria_arr[2];
-  criteria_arr[0] = MatchingDictionary(kDesktopUsagePage,
-                                       kJoystickUsage);
-  if (!criteria_arr[0]) {
-    CFRelease(manager);
-    return;
-  }
-
-  criteria_arr[1] = MatchingDictionary(kDesktopUsagePage,
-                                       kGamepadUsage);
-  if (!criteria_arr[1]) {
-    CFRelease(criteria_arr[0]);
-    CFRelease(manager);
-    return;
-  }
-
-  CFArrayRef criteria =
-    CFArrayCreate(kCFAllocatorDefault, (const void**)criteria_arr, 2, nullptr);
-  if (!criteria) {
-    CFRelease(criteria_arr[1]);
-    CFRelease(criteria_arr[0]);
-    CFRelease(manager);
-    return;
-  }
-
-  IOHIDManagerSetDeviceMatchingMultiple(manager, criteria);
-  CFRelease(criteria);
-  CFRelease(criteria_arr[1]);
-  CFRelease(criteria_arr[0]);
-
-  IOHIDManagerRegisterDeviceMatchingCallback(manager,
-                                             DeviceAddedCallback,
-                                             this);
-  IOHIDManagerRegisterDeviceRemovalCallback(manager,
-                                            DeviceRemovedCallback,
-                                            this);
-  IOHIDManagerRegisterInputValueCallback(manager,
-                                         InputValueChangedCallback,
-                                         this);
-  IOHIDManagerScheduleWithRunLoop(manager,
-                                  CFRunLoopGetCurrent(),
-                                  kCFRunLoopDefaultMode);
-  IOReturn rv = IOHIDManagerOpen(manager, kIOHIDOptionsTypeNone);
-  if (rv != kIOReturnSuccess) {
-    CFRelease(manager);
-    return;
-  }
-
-  mManager = manager;
-}
-
-void DarwinGamepadService::Shutdown()
-{
-  IOHIDManagerRef manager = (IOHIDManagerRef)mManager;
-  if (manager) {
-    IOHIDManagerClose(manager, 0);
-    CFRelease(manager);
-    mManager = nullptr;
-  }
-}
-
-} // namespace
-
-namespace mozilla {
-namespace hal_impl {
-
-DarwinGamepadService* gService = nullptr;
-
-void StartMonitoringGamepadStatus()
-{
-  if (gService)
-    return;
-
-  gService = new DarwinGamepadService();
-  gService->Startup();
-}
-
-void StopMonitoringGamepadStatus()
-{
-  if (!gService)
-    return;
-
-  gService->Shutdown();
-  delete gService;
-  gService = nullptr;
-}
-
-} // namespace hal_impl
-} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/fallback/FallbackGamepad.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/fallback/FallbackGamepad.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/fallback/FallbackGamepad.cpp	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/fallback/FallbackGamepad.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=8 et ft=cpp : */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "Hal.h"
-
-namespace mozilla {
-namespace hal_impl {
-
-void StartMonitoringGamepadStatus()
-{}
-
-void StopMonitoringGamepadStatus()
-{}
-
-} // hal_impl
-} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/Hal.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/Hal.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/Hal.cpp	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/Hal.cpp	2015-04-24 19:30:53.000000000 +0000
@@ -636,16 +636,6 @@
   PROXY_IF_SANDBOXED(StartForceQuitWatchdog(aMode, aTimeoutSecs));
 }
 
-void StartMonitoringGamepadStatus()
-{
-  PROXY_IF_SANDBOXED(StartMonitoringGamepadStatus());
-}
-
-void StopMonitoringGamepadStatus()
-{
-  PROXY_IF_SANDBOXED(StopMonitoringGamepadStatus());
-}
-
 void
 RegisterWakeLockObserver(WakeLockObserver* aObserver)
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/Hal.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/Hal.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/Hal.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/Hal.h	2015-04-24 19:30:53.000000000 +0000
@@ -17,7 +17,6 @@
 #include "mozilla/dom/battery/Types.h"
 #include "mozilla/dom/network/Types.h"
 #include "mozilla/dom/power/Types.h"
-#include "mozilla/hal_sandbox/PHal.h"
 #include "mozilla/dom/ScreenOrientation.h"
 #include "mozilla/HalScreenConfiguration.h"
 
@@ -599,16 +598,6 @@
 void FactoryReset(mozilla::dom::FactoryResetReason& aReason);
 
 /**
- * Start monitoring the status of gamepads attached to the system.
- */
-void StartMonitoringGamepadStatus();
-
-/**
- * Stop monitoring the status of gamepads attached to the system.
- */
-void StopMonitoringGamepadStatus();
-
-/**
  * Start monitoring disk space for low space situations.
  *
  * This API is currently only allowed to be used from the main process.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/linux/LinuxGamepad.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/linux/LinuxGamepad.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/linux/LinuxGamepad.cpp	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/linux/LinuxGamepad.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,373 +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/. */
-
-/*
- * LinuxGamepadService: A Linux backend for the GamepadService.
- * Derived from the kernel documentation at
- * http://www.kernel.org/doc/Documentation/input/joystick-api.txt
- */
-#include <algorithm>
-#include <cstddef>
-
-#include <glib.h>
-#include <linux/joystick.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-
-#include "nscore.h"
-#include "mozilla/dom/GamepadService.h"
-#include "udev.h"
-
-namespace {
-
-using mozilla::dom::GamepadService;
-using mozilla::udev_lib;
-using mozilla::udev_device;
-using mozilla::udev_list_entry;
-using mozilla::udev_enumerate;
-using mozilla::udev_monitor;
-
-static const float kMaxAxisValue = 32767.0;
-static const char kJoystickPath[] = "/dev/input/js";
-
-//TODO: should find a USB identifier for each device so we can
-// provide something that persists across connect/disconnect cycles.
-typedef struct {
-  int index;
-  guint source_id;
-  int numAxes;
-  int numButtons;
-  char idstring[128];
-  char devpath[PATH_MAX];
-} Gamepad;
-
-class LinuxGamepadService {
-public:
-  LinuxGamepadService() : mMonitor(nullptr),
-                          mMonitorSourceID(0) {
-  }
-
-  void Startup();
-  void Shutdown();
-
-private:
-  void AddDevice(struct udev_device* dev);
-  void RemoveDevice(struct udev_device* dev);
-  void ScanForDevices();
-  void AddMonitor();
-  void RemoveMonitor();
-  bool is_gamepad(struct udev_device* dev);
-  void ReadUdevChange();
-
-  // handler for data from /dev/input/jsN
-  static gboolean OnGamepadData(GIOChannel *source,
-                                GIOCondition condition,
-                                gpointer data);
-
-  // handler for data from udev monitor
-  static gboolean OnUdevMonitor(GIOChannel *source,
-                                GIOCondition condition,
-                                gpointer data);
-
-  udev_lib mUdev;
-  struct udev_monitor* mMonitor;
-  guint mMonitorSourceID;
-  // Information about currently connected gamepads.
-  nsAutoTArray<Gamepad,4> mGamepads;
-};
-
-// singleton instance
-LinuxGamepadService* gService = nullptr;
-
-void
-LinuxGamepadService::AddDevice(struct udev_device* dev)
-{
-  const char* devpath = mUdev.udev_device_get_devnode(dev);
-  if (!devpath) {
-    return;
-  }
-
-  // Ensure that this device hasn't already been added.
-  for (unsigned int i = 0; i < mGamepads.Length(); i++) {
-    if (strcmp(mGamepads[i].devpath, devpath) == 0) {
-      return;
-    }
-  }
-
-  Gamepad gamepad;
-  snprintf(gamepad.devpath, sizeof(gamepad.devpath), "%s", devpath);
-  GIOChannel* channel = g_io_channel_new_file(devpath, "r", nullptr);
-  if (!channel) {
-    return;
-  }
-
-  g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, nullptr);
-  g_io_channel_set_encoding(channel, nullptr, nullptr);
-  g_io_channel_set_buffered(channel, FALSE);
-  int fd = g_io_channel_unix_get_fd(channel);
-  char name[128];
-  if (ioctl(fd, JSIOCGNAME(sizeof(name)), &name) == -1) {
-    strcpy(name, "unknown");
-  }
-  const char* vendor_id =
-    mUdev.udev_device_get_property_value(dev, "ID_VENDOR_ID");
-  const char* model_id =
-    mUdev.udev_device_get_property_value(dev, "ID_MODEL_ID");
-  if (!vendor_id || !model_id) {
-    struct udev_device* parent =
-      mUdev.udev_device_get_parent_with_subsystem_devtype(dev,
-                                                          "input",
-                                                          nullptr);
-    if (parent) {
-      vendor_id = mUdev.udev_device_get_sysattr_value(parent, "id/vendor");
-      model_id = mUdev.udev_device_get_sysattr_value(parent, "id/product");
-    }
-  }
-  snprintf(gamepad.idstring, sizeof(gamepad.idstring),
-           "%s-%s-%s",
-           vendor_id ? vendor_id : "unknown",
-           model_id ? model_id : "unknown",
-           name);
-
-  char numAxes = 0, numButtons = 0;
-  ioctl(fd, JSIOCGAXES, &numAxes);
-  gamepad.numAxes = numAxes;
-  ioctl(fd, JSIOCGBUTTONS, &numButtons);
-  gamepad.numButtons = numButtons;
-
-  nsRefPtr<GamepadService> service(GamepadService::GetService());
-  gamepad.index = service->AddGamepad(gamepad.idstring,
-                                      mozilla::dom::GamepadMappingType::_empty,
-                                      gamepad.numButtons,
-                                      gamepad.numAxes);
-
-  gamepad.source_id =
-    g_io_add_watch(channel,
-                   GIOCondition(G_IO_IN | G_IO_ERR | G_IO_HUP),
-                   OnGamepadData,
-                   GINT_TO_POINTER(gamepad.index));
-  g_io_channel_unref(channel);
-
-  mGamepads.AppendElement(gamepad);
-}
-
-void
-LinuxGamepadService::RemoveDevice(struct udev_device* dev)
-{
-  const char* devpath = mUdev.udev_device_get_devnode(dev);
-  if (!devpath) {
-    return;
-  }
-
-  nsRefPtr<GamepadService> service(GamepadService::GetService());
-  for (unsigned int i = 0; i < mGamepads.Length(); i++) {
-    if (strcmp(mGamepads[i].devpath, devpath) == 0) {
-      g_source_remove(mGamepads[i].source_id);
-      service->RemoveGamepad(mGamepads[i].index);
-      mGamepads.RemoveElementAt(i);
-      break;
-    }
-  }
-}
-
-void
-LinuxGamepadService::ScanForDevices()
-{
-  struct udev_enumerate* en = mUdev.udev_enumerate_new(mUdev.udev);
-  mUdev.udev_enumerate_add_match_subsystem(en, "input");
-  mUdev.udev_enumerate_scan_devices(en);
-
-  struct udev_list_entry* dev_list_entry;
-  for (dev_list_entry = mUdev.udev_enumerate_get_list_entry(en);
-       dev_list_entry != nullptr;
-       dev_list_entry = mUdev.udev_list_entry_get_next(dev_list_entry)) {
-    const char* path = mUdev.udev_list_entry_get_name(dev_list_entry);
-    struct udev_device* dev = mUdev.udev_device_new_from_syspath(mUdev.udev,
-                                                                 path);
-    if (is_gamepad(dev)) {
-      AddDevice(dev);
-    }
-
-    mUdev.udev_device_unref(dev);
-  }
-
-  mUdev.udev_enumerate_unref(en);
-}
-
-void
-LinuxGamepadService::AddMonitor()
-{
-  // Add a monitor to watch for device changes
-  mMonitor =
-    mUdev.udev_monitor_new_from_netlink(mUdev.udev, "udev");
-  if (!mMonitor) {
-    // Not much we can do here.
-    return;
-  }
-  mUdev.udev_monitor_filter_add_match_subsystem_devtype(mMonitor,
-                                                        "input",
-							nullptr);
-
-  int monitor_fd = mUdev.udev_monitor_get_fd(mMonitor);
-  GIOChannel* monitor_channel = g_io_channel_unix_new(monitor_fd);
-  mMonitorSourceID =
-    g_io_add_watch(monitor_channel,
-                   GIOCondition(G_IO_IN | G_IO_ERR | G_IO_HUP),
-                   OnUdevMonitor,
-                   nullptr);
-  g_io_channel_unref(monitor_channel);
-
-  mUdev.udev_monitor_enable_receiving(mMonitor);
-}
-
-void
-LinuxGamepadService::RemoveMonitor()
-{
-  if (mMonitorSourceID) {
-    g_source_remove(mMonitorSourceID);
-    mMonitorSourceID = 0;
-  }
-  if (mMonitor) {
-    mUdev.udev_monitor_unref(mMonitor);
-    mMonitor = nullptr;
-  }
-}
-
-void
-LinuxGamepadService::Startup()
-{
-  // Don't bother starting up if libudev couldn't be loaded or initialized.
-  if (!mUdev)
-    return;
-
-  AddMonitor();
-  ScanForDevices();
-}
-
-void
-LinuxGamepadService::Shutdown()
-{
-  for (unsigned int i = 0; i < mGamepads.Length(); i++) {
-    g_source_remove(mGamepads[i].source_id);
-  }
-  mGamepads.Clear();
-  RemoveMonitor();
-}
-
-bool
-LinuxGamepadService::is_gamepad(struct udev_device* dev)
-{
-  if (!mUdev.udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK"))
-    return false;
-
-  const char* devpath = mUdev.udev_device_get_devnode(dev);
-  if (!devpath) {
-    return false;
-  }
-  if (strncmp(kJoystickPath, devpath, sizeof(kJoystickPath) - 1) != 0) {
-    return false;
-  }
-
-  return true;
-}
-
-void
-LinuxGamepadService::ReadUdevChange()
-{
-  struct udev_device* dev =
-    mUdev.udev_monitor_receive_device(mMonitor);
-  const char* action = mUdev.udev_device_get_action(dev);
-  if (is_gamepad(dev)) {
-    if (strcmp(action, "add") == 0) {
-      AddDevice(dev);
-    } else if (strcmp(action, "remove") == 0) {
-      RemoveDevice(dev);
-    }
-  }
-  mUdev.udev_device_unref(dev);
-}
-
-// static
-gboolean
-LinuxGamepadService::OnGamepadData(GIOChannel* source,
-                                   GIOCondition condition,
-                                   gpointer data)
-{
-  int index = GPOINTER_TO_INT(data);
-  //TODO: remove gamepad?
-  if (condition & G_IO_ERR || condition & G_IO_HUP)
-    return FALSE;
-
-  while (true) {
-    struct js_event event;
-    gsize count;
-    GError* err = nullptr;
-    if (g_io_channel_read_chars(source,
-				(gchar*)&event,
-				sizeof(event),
-				&count,
-				&err) != G_IO_STATUS_NORMAL ||
-	count == 0) {
-      break;
-    }
-
-    //TODO: store device state?
-    if (event.type & JS_EVENT_INIT) {
-      continue;
-    }
-
-    nsRefPtr<GamepadService> service(GamepadService::GetService());
-    switch (event.type) {
-    case JS_EVENT_BUTTON:
-      service->NewButtonEvent(index, event.number, !!event.value);
-      break;
-    case JS_EVENT_AXIS:
-      service->NewAxisMoveEvent(index, event.number,
-                                ((float)event.value) / kMaxAxisValue);
-      break;
-    }
-  }
-
-  return TRUE;
-}
-
-// static
-gboolean
-LinuxGamepadService::OnUdevMonitor(GIOChannel* source,
-                                   GIOCondition condition,
-                                   gpointer data)
-{
-  if (condition & G_IO_ERR || condition & G_IO_HUP)
-    return FALSE;
-
-  gService->ReadUdevChange();
-  return TRUE;
-}
-
-} // namespace
-
-namespace mozilla {
-namespace hal_impl {
-
-void StartMonitoringGamepadStatus()
-{
-  if (!gService) {
-    gService = new LinuxGamepadService();
-    gService->Startup();
-  }
-}
-
-void StopMonitoringGamepadStatus()
-{
-  if (gService) {
-    gService->Shutdown();
-    delete gService;
-    gService = nullptr;
-  }
-}
-
-} // namespace hal_impl
-} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/linux/udev.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/linux/udev.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/linux/udev.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/linux/udev.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +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 defines a wrapper around libudev so we can avoid
- * linking directly to it and use dlopen instead.
- */
-
-#ifndef HAL_LINUX_UDEV_H_
-#define HAL_LINUX_UDEV_H_
-
-#include <dlfcn.h>
-
-#include "mozilla/ArrayUtils.h"
-
-namespace mozilla {
-
-struct udev;
-struct udev_device;
-struct udev_enumerate;
-struct udev_list_entry;
-struct udev_monitor;
-
-class udev_lib {
- public:
-  udev_lib() : lib(nullptr),
-               udev(nullptr) {
-    // Be careful about ABI compat! 0 -> 1 didn't change any
-    // symbols this code relies on, per:
-    // https://lists.fedoraproject.org/pipermail/devel/2012-June/168227.html
-    const char* lib_names[] = {"libudev.so.0", "libudev.so.1"};
-    // Check whether a library is already loaded so we don't load two
-    // conflicting libs.
-    for (unsigned i = 0; i < ArrayLength(lib_names); i++) {
-      lib = dlopen(lib_names[i], RTLD_NOLOAD | RTLD_LAZY | RTLD_GLOBAL);
-      if (lib) {
-        break;
-      }
-    }
-    // If nothing loads the first time through, it means no version of libudev
-    // was already loaded.
-    if (!lib) {
-      for (unsigned i = 0; i < ArrayLength(lib_names); i++) {
-        lib = dlopen(lib_names[i], RTLD_LAZY | RTLD_GLOBAL);
-        if (lib) {
-          break;
-        }
-      }
-    }
-    if (lib && LoadSymbols()) {
-      udev = udev_new();
-    }
-  }
-
-  ~udev_lib() {
-    if (udev) {
-      udev_unref(udev);
-    }
-
-    if (lib) {
-      dlclose(lib);
-    }
-  }
-
-  operator bool() {
-    return udev;
-  }
-
- private:
-  bool LoadSymbols() {
-#define DLSYM(s) \
-  do { \
-    s = (typeof(s))dlsym(lib, #s); \
-    if (!s) return false; \
-  } while (0)
-
-    DLSYM(udev_new);
-    DLSYM(udev_unref);
-    DLSYM(udev_device_unref);
-    DLSYM(udev_device_new_from_syspath);
-    DLSYM(udev_device_get_devnode);
-    DLSYM(udev_device_get_parent_with_subsystem_devtype);
-    DLSYM(udev_device_get_property_value);
-    DLSYM(udev_device_get_action);
-    DLSYM(udev_device_get_sysattr_value);
-    DLSYM(udev_enumerate_new);
-    DLSYM(udev_enumerate_unref);
-    DLSYM(udev_enumerate_add_match_subsystem);
-    DLSYM(udev_enumerate_scan_devices);
-    DLSYM(udev_enumerate_get_list_entry);
-    DLSYM(udev_list_entry_get_next);
-    DLSYM(udev_list_entry_get_name);
-    DLSYM(udev_monitor_new_from_netlink);
-    DLSYM(udev_monitor_filter_add_match_subsystem_devtype);
-    DLSYM(udev_monitor_enable_receiving);
-    DLSYM(udev_monitor_get_fd);
-    DLSYM(udev_monitor_receive_device);
-    DLSYM(udev_monitor_unref);
-#undef DLSYM
-    return true;
-  }
-
-  void* lib;
-
- public:
-  struct udev* udev;
-
-  // Function pointers returned from dlsym.
-  struct udev* (*udev_new)(void);
-  void (*udev_unref)(struct udev*);
-
-  void (*udev_device_unref)(struct udev_device*);
-  struct udev_device* (*udev_device_new_from_syspath)(struct udev*,
-                                                      const char*);
-  const char* (*udev_device_get_devnode)(struct udev_device*);
-  struct udev_device* (*udev_device_get_parent_with_subsystem_devtype)
-    (struct udev_device*, const char*, const char*);
-  const char* (*udev_device_get_property_value)(struct udev_device*,
-                                                const char*);
-  const char* (*udev_device_get_action)(struct udev_device*);
-  const char* (*udev_device_get_sysattr_value)(struct udev_device*,
-                                               const char*);
-
-  struct udev_enumerate* (*udev_enumerate_new)(struct udev*);
-  void (*udev_enumerate_unref)(struct udev_enumerate*);
-  int (*udev_enumerate_add_match_subsystem)(struct udev_enumerate*,
-                                            const char*);
-  int (*udev_enumerate_scan_devices)(struct udev_enumerate*);
-  struct udev_list_entry* (*udev_enumerate_get_list_entry)
-    (struct udev_enumerate*);
-
-  struct udev_list_entry* (*udev_list_entry_get_next)(struct udev_list_entry *);
-  const char* (*udev_list_entry_get_name)(struct udev_list_entry*);
-
-  struct udev_monitor* (*udev_monitor_new_from_netlink)(struct udev*,
-                                                        const char*);
-  int (*udev_monitor_filter_add_match_subsystem_devtype)
-    (struct udev_monitor*, const char*, const char*);
-  int (*udev_monitor_enable_receiving)(struct udev_monitor*);
-  int (*udev_monitor_get_fd)(struct udev_monitor*);
-  struct udev_device* (*udev_monitor_receive_device)(struct udev_monitor*);
-  void (*udev_monitor_unref)(struct udev_monitor*);
-};
-
-} // namespace mozilla
-
-#endif // HAL_LINUX_UDEV_H_
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/moz.build	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/moz.build	2015-04-24 19:30:53.000000000 +0000
@@ -32,27 +32,6 @@
     'Hal.cpp',
 ]
 
-if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
-    UNIFIED_SOURCES += [
-        'fallback/FallbackGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
-    UNIFIED_SOURCES += [
-        'cocoa/CocoaGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
-    UNIFIED_SOURCES += [
-        'windows/WindowsGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
-    UNIFIED_SOURCES += [
-        'linux/LinuxGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'android':
-    UNIFIED_SOURCES += [
-        'android/AndroidGamepad.cpp'
-    ]
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     UNIFIED_SOURCES += [
         'android/AndroidSensor.cpp',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/sandbox/SandboxHal.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/sandbox/SandboxHal.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/sandbox/SandboxHal.cpp	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/sandbox/SandboxHal.cpp	2015-04-24 19:30:53.000000000 +0000
@@ -271,13 +271,6 @@
   Hal()->SendDisableSensorNotifications(aSensor);
 }
 
-//TODO: bug 852944 - IPC implementations of these
-void StartMonitoringGamepadStatus()
-{}
-
-void StopMonitoringGamepadStatus()
-{}
-
 void
 EnableWakeLockNotifications()
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/windows/WindowsGamepad.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/windows/WindowsGamepad.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/hal/windows/WindowsGamepad.cpp	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/hal/windows/WindowsGamepad.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1029 +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 <algorithm>
-#include <cstddef>
-
-#ifndef UNICODE
-#define UNICODE
-#endif
-#include <windows.h>
-#include <hidsdi.h>
-#include <stdio.h>
-#include <xinput.h>
-
-#include "nsIComponentManager.h"
-#include "nsIObserver.h"
-#include "nsIObserverService.h"
-#include "nsITimer.h"
-#include "nsTArray.h"
-#include "mozilla/ArrayUtils.h"
-#include "mozilla/dom/GamepadService.h"
-#include "mozilla/Services.h"
-
-namespace {
-
-using namespace mozilla::dom;
-using mozilla::ArrayLength;
-
-// USB HID usage tables, page 1 (Hat switch)
-const unsigned kUsageDpad = 0x39;
-// USB HID usage tables, page 1, 0x30 = X
-const unsigned kFirstAxis = 0x30;
-
-// USB HID usage tables
-const unsigned kDesktopUsagePage = 0x1;
-const unsigned kButtonUsagePage = 0x9;
-
-// Arbitrary. In practice 10 buttons/6 axes is the near maximum.
-const unsigned kMaxButtons = 32;
-const unsigned kMaxAxes = 32;
-
-// Multiple devices-changed notifications can be sent when a device
-// is connected, because USB devices consist of multiple logical devices.
-// Therefore, we wait a bit after receiving one before looking for
-// device changes.
-const uint32_t kDevicesChangedStableDelay = 200;
-// XInput is a purely polling-driven API, so we need to
-// poll it periodically. 50ms is arbitrarily chosen.
-const uint32_t kXInputPollInterval = 50;
-
-const UINT kRawInputError = (UINT)-1;
-
-#ifndef XUSER_MAX_COUNT
-#define XUSER_MAX_COUNT 4
-#endif
-
-const struct {
-  int usagePage;
-  int usage;
-} kUsagePages[] = {
-  // USB HID usage tables, page 1
-  { kDesktopUsagePage, 4 },  // Joystick
-  { kDesktopUsagePage, 5 }   // Gamepad
-};
-
-const struct {
-  WORD button;
-  int mapped;
-} kXIButtonMap[] = {
-  { XINPUT_GAMEPAD_DPAD_UP, 12 },
-  { XINPUT_GAMEPAD_DPAD_DOWN, 13 },
-  { XINPUT_GAMEPAD_DPAD_LEFT, 14 },
-  { XINPUT_GAMEPAD_DPAD_RIGHT, 15 },
-  { XINPUT_GAMEPAD_START, 9 },
-  { XINPUT_GAMEPAD_BACK, 8 },
-  { XINPUT_GAMEPAD_LEFT_THUMB, 10 },
-  { XINPUT_GAMEPAD_RIGHT_THUMB, 11 },
-  { XINPUT_GAMEPAD_LEFT_SHOULDER, 4 },
-  { XINPUT_GAMEPAD_RIGHT_SHOULDER, 5 },
-  { XINPUT_GAMEPAD_A, 0 },
-  { XINPUT_GAMEPAD_B, 1 },
-  { XINPUT_GAMEPAD_X, 2 },
-  { XINPUT_GAMEPAD_Y, 3 }
-};
-const size_t kNumMappings = ArrayLength(kXIButtonMap);
-
-enum GamepadType {
-  kNoGamepad = 0,
-  kRawInputGamepad,
-  kXInputGamepad
-};
-
-class WindowsGamepadService;
-WindowsGamepadService* gService = nullptr;
-
-struct Gamepad {
-  GamepadType type;
-
-  // Handle to raw input device
-  HANDLE handle;
-
-  // XInput Index of the user's controller. Passed to XInputGetState.
-  DWORD userIndex;
-
-  // Last-known state of the controller.
-  XINPUT_STATE state;
-
-  // ID from the GamepadService, also used as the index into
-  // WindowsGamepadService::mGamepads.
-  int id;
-
-  // Information about the physical device.
-  unsigned numAxes;
-  unsigned numButtons;
-  bool hasDpad;
-  HIDP_VALUE_CAPS dpadCaps;
-
-  bool buttons[kMaxButtons];
-  struct {
-    HIDP_VALUE_CAPS caps;
-    double value;
-  } axes[kMaxAxes];
-
-  // Used during rescan to find devices that were disconnected.
-  bool present;
-};
-
-// Drop this in favor of decltype when we require a new enough SDK.
-typedef void (WINAPI *XInputEnable_func)(BOOL);
-
-// RAII class to wrap loading the XInput DLL
-class XInputLoader {
-public:
-  XInputLoader() : module(nullptr),
-                   mXInputEnable(nullptr),
-                   mXInputGetState(nullptr) {
-    // xinput1_4.dll exists on Windows 8
-    // xinput9_1_0.dll exists on Windows 7 and Vista
-    // xinput1_3.dll shipped with the DirectX SDK
-    const wchar_t* dlls[] = {L"xinput1_4.dll",
-                             L"xinput9_1_0.dll",
-                             L"xinput1_3.dll"};
-    const size_t kNumDLLs = ArrayLength(dlls);
-    for (size_t i = 0; i < kNumDLLs; ++i) {
-      module = LoadLibraryW(dlls[i]);
-      if (module) {
-        mXInputEnable = reinterpret_cast<XInputEnable_func>(
-         GetProcAddress(module, "XInputEnable"));
-        mXInputGetState = reinterpret_cast<decltype(XInputGetState)*>(
-         GetProcAddress(module, "XInputGetState"));
-        if (mXInputEnable) {
-          mXInputEnable(TRUE);
-        }
-        break;
-      }
-    }
-  }
-
-  ~XInputLoader() {
-    //mXInputEnable = nullptr;
-    mXInputGetState = nullptr;
-
-    if (module) {
-      FreeLibrary(module);
-    }
-  }
-
-  operator bool() {
-    return module && mXInputGetState;
-  }
-
-  HMODULE module;
-  decltype(XInputGetState) *mXInputGetState;
-  XInputEnable_func mXInputEnable;
-};
-
-bool
-GetPreparsedData(HANDLE handle, nsTArray<uint8_t>& data)
-{
-  UINT size;
-  if (GetRawInputDeviceInfo(handle, RIDI_PREPARSEDDATA, nullptr, &size) == kRawInputError) {
-    return false;
-  }
-  data.SetLength(size);
-  return GetRawInputDeviceInfo(handle, RIDI_PREPARSEDDATA,
-                               data.Elements(), &size) > 0;
-}
-
-/*
- * Given an axis value and a minimum and maximum range,
- * scale it to be in the range -1.0 .. 1.0.
- */
-double
-ScaleAxis(ULONG value, LONG min, LONG max)
-{
-  return  2.0 * (value - min) / (max - min) - 1.0;
-}
-
-/*
- * Given a value from a d-pad (POV hat in USB HID terminology),
- * represent it as 4 buttons, one for each cardinal direction.
- */
-void
-UnpackDpad(LONG dpad_value, const Gamepad* gamepad, bool buttons[kMaxButtons])
-{
-  const unsigned kUp = gamepad->numButtons - 4;
-  const unsigned kDown = gamepad->numButtons - 3;
-  const unsigned kLeft = gamepad->numButtons - 2;
-  const unsigned kRight = gamepad->numButtons - 1;
-
-  // Different controllers have different ways of representing
-  // "nothing is pressed", but they're all outside the range of values.
-  if (dpad_value < gamepad->dpadCaps.LogicalMin
-      || dpad_value > gamepad->dpadCaps.LogicalMax) {
-    // Nothing is pressed.
-    return;
-  }
-
-  // Normalize value to start at 0.
-  int value = dpad_value - gamepad->dpadCaps.LogicalMin;
-
-  // Value will be in the range 0-7. The value represents the
-  // position of the d-pad around a circle, with 0 being straight up,
-  // 2 being right, 4 being straight down, and 6 being left.
-  if (value < 2 || value > 6) {
-    buttons[kUp] = true;
-  }
-  if (value > 2 && value < 6) {
-    buttons[kDown] = true;
-  }
-  if (value > 4) {
-    buttons[kLeft] = true;
-  }
-  if (value > 0 && value < 4) {
-    buttons[kRight] = true;
-  }
-}
-
-/*
- * Return true if this USB HID usage page and usage are of a type we
- * know how to handle.
- */
-bool
-SupportedUsage(USHORT page, USHORT usage)
-{
-  for (unsigned i = 0; i < ArrayLength(kUsagePages); i++) {
-    if (page == kUsagePages[i].usagePage && usage == kUsagePages[i].usage) {
-      return true;
-    }
-  }
-  return false;
-}
-
-class Observer : public nsIObserver {
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIOBSERVER
-
-  Observer(WindowsGamepadService& svc) : mSvc(svc),
-                                         mObserving(true)
-  {
-    nsresult rv;
-    mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv);
-    nsCOMPtr<nsIObserverService> observerService =
-      mozilla::services::GetObserverService();
-    observerService->AddObserver(this,
-                                 NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID,
-                                 false);
-  }
-
-  void Stop()
-  {
-    if (mTimer) {
-      mTimer->Cancel();
-    }
-    if (mObserving) {
-      nsCOMPtr<nsIObserverService> observerService =
-        mozilla::services::GetObserverService();
-      observerService->RemoveObserver(this, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID);
-      mObserving = false;
-    }
-  }
-
-  void SetDeviceChangeTimer()
-  {
-    // Set stable timer, since we will get multiple devices-changed
-    // notifications at once
-    if (mTimer) {
-      mTimer->Cancel();
-      mTimer->Init(this, kDevicesChangedStableDelay, nsITimer::TYPE_ONE_SHOT);
-    }
-  }
-
-private:
-  virtual ~Observer()
-  {
-    Stop();
-  }
-
-  // Gamepad service owns us, we just hold a reference back to it.
-  WindowsGamepadService& mSvc;
-  nsCOMPtr<nsITimer> mTimer;
-  bool mObserving;
-};
-
-NS_IMPL_ISUPPORTS(Observer, nsIObserver);
-
-class HIDLoader {
-public:
-  HIDLoader() : mModule(LoadLibraryW(L"hid.dll")),
-                mHidD_GetProductString(nullptr),
-                mHidP_GetCaps(nullptr),
-                mHidP_GetButtonCaps(nullptr),
-                mHidP_GetValueCaps(nullptr),
-                mHidP_GetUsages(nullptr),
-                mHidP_GetUsageValue(nullptr),
-                mHidP_GetScaledUsageValue(nullptr)
-  {
-    if (mModule) {
-      mHidD_GetProductString = reinterpret_cast<decltype(HidD_GetProductString)*>(GetProcAddress(mModule, "HidD_GetProductString"));
-      mHidP_GetCaps = reinterpret_cast<decltype(HidP_GetCaps)*>(GetProcAddress(mModule, "HidP_GetCaps"));
-      mHidP_GetButtonCaps = reinterpret_cast<decltype(HidP_GetButtonCaps)*>(GetProcAddress(mModule, "HidP_GetButtonCaps"));
-      mHidP_GetValueCaps = reinterpret_cast<decltype(HidP_GetValueCaps)*>(GetProcAddress(mModule, "HidP_GetValueCaps"));
-      mHidP_GetUsages = reinterpret_cast<decltype(HidP_GetUsages)*>(GetProcAddress(mModule, "HidP_GetUsages"));
-      mHidP_GetUsageValue = reinterpret_cast<decltype(HidP_GetUsageValue)*>(GetProcAddress(mModule, "HidP_GetUsageValue"));
-      mHidP_GetScaledUsageValue = reinterpret_cast<decltype(HidP_GetScaledUsageValue)*>(GetProcAddress(mModule, "HidP_GetScaledUsageValue"));
-    }
-  }
-
-  ~HIDLoader() {
-    if (mModule) {
-      FreeLibrary(mModule);
-    }
-  }
-
-  operator bool() {
-    return mModule &&
-      mHidD_GetProductString &&
-      mHidP_GetCaps &&
-      mHidP_GetButtonCaps &&
-      mHidP_GetValueCaps &&
-      mHidP_GetUsages &&
-      mHidP_GetUsageValue &&
-      mHidP_GetScaledUsageValue;
-  }
-
-  decltype(HidD_GetProductString) *mHidD_GetProductString;
-  decltype(HidP_GetCaps) *mHidP_GetCaps;
-  decltype(HidP_GetButtonCaps) *mHidP_GetButtonCaps;
-  decltype(HidP_GetValueCaps) *mHidP_GetValueCaps;
-  decltype(HidP_GetUsages) *mHidP_GetUsages;
-  decltype(HidP_GetUsageValue) *mHidP_GetUsageValue;
-  decltype(HidP_GetScaledUsageValue) *mHidP_GetScaledUsageValue;
-
-private:
-  HMODULE mModule;
-};
-
-class WindowsGamepadService {
-public:
-  WindowsGamepadService();
-  virtual ~WindowsGamepadService()
-  {
-    Cleanup();
-  }
-
-  enum DeviceChangeType {
-    DeviceChangeNotification,
-    DeviceChangeStable
-  };
-  void DevicesChanged(DeviceChangeType type);
-  void Startup();
-  void Shutdown();
-  // Parse gamepad input from a WM_INPUT message.
-  bool HandleRawInput(HRAWINPUT handle);
-
-private:
-  void ScanForDevices();
-  // Look for connected raw input devices.
-  void ScanForRawInputDevices();
-  // Look for connected XInput devices.
-  bool ScanForXInputDevices();
-  bool HaveXInputGamepad(int userIndex);
-
-  // Timer callback for XInput polling
-  static void XInputPollTimerCallback(nsITimer* aTimer, void* aClosure);
-  void PollXInput();
-  void CheckXInputChanges(Gamepad& gamepad, XINPUT_STATE& state);
-
-  // Get information about a raw input gamepad.
-  bool GetRawGamepad(HANDLE handle);
-  void Cleanup();
-
-  // List of connected devices.
-  nsTArray<Gamepad> mGamepads;
-
-  nsRefPtr<Observer> mObserver;
-  nsCOMPtr<nsITimer> mXInputPollTimer;
-
-  HIDLoader mHID;
-  XInputLoader mXInput;
-};
-
-
-WindowsGamepadService::WindowsGamepadService()
-{
-  nsresult rv;
-  mXInputPollTimer = do_CreateInstance("@mozilla.org/timer;1", &rv);
-  mObserver = new Observer(*this);
-}
-
-void
-WindowsGamepadService::ScanForRawInputDevices()
-{
-  if (!mHID) {
-    return;
-  }
-
-  UINT numDevices;
-  if (GetRawInputDeviceList(nullptr, &numDevices, sizeof(RAWINPUTDEVICELIST))
-      == kRawInputError) {
-    return;
-  }
-  nsTArray<RAWINPUTDEVICELIST> devices(numDevices);
-  devices.SetLength(numDevices);
-  if (GetRawInputDeviceList(devices.Elements(), &numDevices,
-                            sizeof(RAWINPUTDEVICELIST)) == kRawInputError) {
-    return;
-  }
-
-  for (unsigned i = 0; i < devices.Length(); i++) {
-    if (devices[i].dwType == RIM_TYPEHID) {
-      GetRawGamepad(devices[i].hDevice);
-    }
-  }
-}
-
-bool
-WindowsGamepadService::HaveXInputGamepad(int userIndex)
-{
-  for (unsigned int i = 0; i < mGamepads.Length(); i++) {
-    if (mGamepads[i].type == kXInputGamepad
-        && mGamepads[i].userIndex == userIndex) {
-      mGamepads[i].present = true;
-      return true;
-    }
-  }
-  return false;
-}
-
-bool
-WindowsGamepadService::ScanForXInputDevices()
-{
-  MOZ_ASSERT(mXInput, "XInput should be present!");
-
-  nsRefPtr<GamepadService> gamepadsvc(GamepadService::GetService());
-  if (!gamepadsvc) {
-    return false;
-  }
-
-  bool found = false;
-  for (int i = 0; i < XUSER_MAX_COUNT; i++) {
-    XINPUT_STATE state = {};
-    if (mXInput.mXInputGetState(i, &state) != ERROR_SUCCESS) {
-      continue;
-    }
-    found = true;
-    // See if this device is already present in our list.
-    if (HaveXInputGamepad(i)) {
-      continue;
-    }
-
-    // Not already present, add it.
-    Gamepad gamepad = {};
-    gamepad.type = kXInputGamepad;
-    gamepad.present = true;
-    gamepad.state = state;
-    gamepad.userIndex = i;
-    gamepad.numButtons = kStandardGamepadButtons;
-    gamepad.numAxes = kStandardGamepadAxes;
-    gamepad.id = gamepadsvc->AddGamepad("xinput",
-                                        GamepadMappingType::Standard,
-                                        kStandardGamepadButtons,
-                                        kStandardGamepadAxes);
-    mGamepads.AppendElement(gamepad);
-  }
-
-  return found;
-}
-
-void
-WindowsGamepadService::ScanForDevices()
-{
-  for (int i = mGamepads.Length() - 1; i >= 0; i--) {
-    mGamepads[i].present = false;
-  }
-
-  if (mHID) {
-    ScanForRawInputDevices();
-  }
-  if (mXInput) {
-    mXInputPollTimer->Cancel();
-    if (ScanForXInputDevices()) {
-      mXInputPollTimer->InitWithFuncCallback(XInputPollTimerCallback,
-                                             this,
-                                             kXInputPollInterval,
-                                             nsITimer::TYPE_REPEATING_SLACK);
-    }
-  }
-
-  nsRefPtr<GamepadService> gamepadsvc(GamepadService::GetService());
-  if (!gamepadsvc) {
-    return;
-  }
-  // Look for devices that are no longer present and remove them.
-  for (int i = mGamepads.Length() - 1; i >= 0; i--) {
-    if (!mGamepads[i].present) {
-      gamepadsvc->RemoveGamepad(mGamepads[i].id);
-      mGamepads.RemoveElementAt(i);
-    }
-  }
-}
-
-// static
-void
-WindowsGamepadService::XInputPollTimerCallback(nsITimer* aTimer,
-                                               void* aClosure)
-{
-  WindowsGamepadService* self =
-    reinterpret_cast<WindowsGamepadService*>(aClosure);
-  self->PollXInput();
-}
-
-void
-WindowsGamepadService::PollXInput()
-{
-  for (unsigned int i = 0; i < mGamepads.Length(); i++) {
-    if (mGamepads[i].type != kXInputGamepad) {
-      continue;
-    }
-
-    XINPUT_STATE state = {};
-    DWORD res = mXInput.mXInputGetState(mGamepads[i].userIndex, &state);
-    if (res == ERROR_SUCCESS
-        && state.dwPacketNumber != mGamepads[i].state.dwPacketNumber) {
-        CheckXInputChanges(mGamepads[i], state);
-    }
-  }
-}
-
-void WindowsGamepadService::CheckXInputChanges(Gamepad& gamepad,
-                                               XINPUT_STATE& state) {
-  nsRefPtr<GamepadService> gamepadsvc(GamepadService::GetService());
-  // Handle digital buttons first
-  for (size_t b = 0; b < kNumMappings; b++) {
-    if (state.Gamepad.wButtons & kXIButtonMap[b].button &&
-        !(gamepad.state.Gamepad.wButtons & kXIButtonMap[b].button)) {
-      // Button pressed
-      gamepadsvc->NewButtonEvent(gamepad.id, kXIButtonMap[b].mapped, true);
-    } else if (!(state.Gamepad.wButtons & kXIButtonMap[b].button) &&
-               gamepad.state.Gamepad.wButtons & kXIButtonMap[b].button) {
-      // Button released
-      gamepadsvc->NewButtonEvent(gamepad.id, kXIButtonMap[b].mapped, false);
-    }
-  }
-
-  // Then triggers
-  if (state.Gamepad.bLeftTrigger != gamepad.state.Gamepad.bLeftTrigger) {
-    bool pressed =
-      state.Gamepad.bLeftTrigger >= XINPUT_GAMEPAD_TRIGGER_THRESHOLD;
-    gamepadsvc->NewButtonEvent(gamepad.id, kButtonLeftTrigger,
-                               pressed, state.Gamepad.bLeftTrigger / 255.0);
-  }
-  if (state.Gamepad.bRightTrigger != gamepad.state.Gamepad.bRightTrigger) {
-    bool pressed =
-      state.Gamepad.bRightTrigger >= XINPUT_GAMEPAD_TRIGGER_THRESHOLD;
-    gamepadsvc->NewButtonEvent(gamepad.id, kButtonRightTrigger,
-                               pressed, state.Gamepad.bRightTrigger / 255.0);
-  }
-
-  // Finally deal with analog sticks
-  // TODO: bug 1001955 - Support deadzones.
-  if (state.Gamepad.sThumbLX != gamepad.state.Gamepad.sThumbLX) {
-    gamepadsvc->NewAxisMoveEvent(gamepad.id, kLeftStickXAxis,
-                                 state.Gamepad.sThumbLX / 32767.0);
-  }
-  if (state.Gamepad.sThumbLY != gamepad.state.Gamepad.sThumbLY) {
-    gamepadsvc->NewAxisMoveEvent(gamepad.id, kLeftStickYAxis,
-                                 -1.0 * state.Gamepad.sThumbLY / 32767.0);
-  }
-  if (state.Gamepad.sThumbRX != gamepad.state.Gamepad.sThumbRX) {
-    gamepadsvc->NewAxisMoveEvent(gamepad.id, kRightStickXAxis,
-                                 state.Gamepad.sThumbRX / 32767.0);
-  }
-  if (state.Gamepad.sThumbRY != gamepad.state.Gamepad.sThumbRY) {
-    gamepadsvc->NewAxisMoveEvent(gamepad.id, kRightStickYAxis,
-                                 -1.0 * state.Gamepad.sThumbRY / 32767.0);
-  }
-  gamepad.state = state;
-}
-
-// Used to sort a list of axes by HID usage.
-class HidValueComparator {
-public:
-  bool Equals(const HIDP_VALUE_CAPS& c1, const HIDP_VALUE_CAPS& c2) const
-  {
-    return c1.UsagePage == c2.UsagePage && c1.Range.UsageMin == c2.Range.UsageMin;
-  }
-  bool LessThan(const HIDP_VALUE_CAPS& c1, const HIDP_VALUE_CAPS& c2) const
-  {
-    if (c1.UsagePage == c2.UsagePage) {
-      return c1.Range.UsageMin < c2.Range.UsageMin;
-    }
-    return c1.UsagePage < c2.UsagePage;
-  }
-};
-
-bool
-WindowsGamepadService::GetRawGamepad(HANDLE handle)
-{
-  if (!mHID) {
-    return false;
-  }
-
-  for (unsigned i = 0; i < mGamepads.Length(); i++) {
-    if (mGamepads[i].type == kRawInputGamepad && mGamepads[i].handle == handle) {
-      mGamepads[i].present = true;
-      return true;
-    }
-  }
-
-  RID_DEVICE_INFO rdi = {};
-  UINT size = rdi.cbSize = sizeof(RID_DEVICE_INFO);
-  if (GetRawInputDeviceInfo(handle, RIDI_DEVICEINFO, &rdi, &size) == kRawInputError) {
-    return false;
-  }
-  // Ensure that this is a device we care about
-  if (!SupportedUsage(rdi.hid.usUsagePage, rdi.hid.usUsage)) {
-    return false;
-  }
-
-  Gamepad gamepad = {};
-
-  // Device name is a mostly-opaque string.
-  if (GetRawInputDeviceInfo(handle, RIDI_DEVICENAME, nullptr, &size) == kRawInputError) {
-    return false;
-  }
-
-  nsTArray<wchar_t> devname(size);
-  devname.SetLength(size);
-  if (GetRawInputDeviceInfo(handle, RIDI_DEVICENAME, devname.Elements(), &size) == kRawInputError) {
-    return false;
-  }
-
-  // Per http://msdn.microsoft.com/en-us/library/windows/desktop/ee417014.aspx
-  // device names containing "IG_" are XInput controllers. Ignore those
-  // devices since we'll handle them with XInput.
-  if (wcsstr(devname.Elements(), L"IG_")) {
-    return false;
-  }
-
-  // Product string is a human-readable name.
-  // Per http://msdn.microsoft.com/en-us/library/windows/hardware/ff539681%28v=vs.85%29.aspx
-  // "For USB devices, the maximum string length is 126 wide characters (not including the terminating NULL character)."
-  wchar_t name[128] = { 0 };
-  size = sizeof(name);
-  nsTArray<char> gamepad_name;
-  HANDLE hid_handle = CreateFile(devname.Elements(), GENERIC_READ | GENERIC_WRITE,
-    FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
-  if (hid_handle) {
-    if (mHID.mHidD_GetProductString(hid_handle, &name, size)) {
-      int bytes = WideCharToMultiByte(CP_UTF8, 0, name, -1, nullptr, 0, nullptr,
-                                      nullptr);
-      gamepad_name.SetLength(bytes);
-      WideCharToMultiByte(CP_UTF8, 0, name, -1, gamepad_name.Elements(),
-                          bytes, nullptr, nullptr);
-    }
-    CloseHandle(hid_handle);
-  }
-  if (gamepad_name.Length() == 0 || !gamepad_name[0]) {
-    const char kUnknown[] = "Unknown Gamepad";
-    gamepad_name.SetLength(ArrayLength(kUnknown));
-    strcpy_s(gamepad_name.Elements(), gamepad_name.Length(), kUnknown);
-  }
-
-  char gamepad_id[256] = { 0 };
-  _snprintf_s(gamepad_id, _TRUNCATE, "%04x-%04x-%s", rdi.hid.dwVendorId,
-              rdi.hid.dwProductId, gamepad_name.Elements());
-
-  nsTArray<uint8_t> preparsedbytes;
-  if (!GetPreparsedData(handle, preparsedbytes)) {
-    return false;
-  }
-
-  PHIDP_PREPARSED_DATA parsed =
-    reinterpret_cast<PHIDP_PREPARSED_DATA>(preparsedbytes.Elements());
-  HIDP_CAPS caps;
-  if (mHID.mHidP_GetCaps(parsed, &caps) != HIDP_STATUS_SUCCESS) {
-    return false;
-  }
-
-  // Enumerate buttons.
-  USHORT count = caps.NumberInputButtonCaps;
-  nsTArray<HIDP_BUTTON_CAPS> buttonCaps(count);
-  buttonCaps.SetLength(count);
-  if (mHID.mHidP_GetButtonCaps(HidP_Input, buttonCaps.Elements(), &count, parsed)
-      != HIDP_STATUS_SUCCESS) {
-    return false;
-  }
-  for (unsigned i = 0; i < count; i++) {
-    // Each buttonCaps is typically a range of buttons.
-    gamepad.numButtons +=
-      buttonCaps[i].Range.UsageMax - buttonCaps[i].Range.UsageMin + 1;
-  }
-  gamepad.numButtons = std::min(gamepad.numButtons, kMaxButtons);
-
-  // Enumerate value caps, which represent axes and d-pads.
-  count = caps.NumberInputValueCaps;
-  nsTArray<HIDP_VALUE_CAPS> valueCaps(count);
-  valueCaps.SetLength(count);
-  if (mHID.mHidP_GetValueCaps(HidP_Input, valueCaps.Elements(), &count, parsed)
-      != HIDP_STATUS_SUCCESS) {
-    return false;
-  }
-  nsTArray<HIDP_VALUE_CAPS> axes;
-  // Sort the axes by usagePage and usage to expose a consistent ordering.
-  HidValueComparator comparator;
-  for (unsigned i = 0; i < count; i++) {
-    if (valueCaps[i].UsagePage == kDesktopUsagePage
-        && valueCaps[i].Range.UsageMin == kUsageDpad
-        // Don't know how to handle d-pads that return weird values.
-        && valueCaps[i].LogicalMax - valueCaps[i].LogicalMin == 7
-        // Can't overflow buttons
-        && gamepad.numButtons + 4 < kMaxButtons) {
-      // d-pad gets special handling.
-      // Ostensibly HID devices can expose multiple d-pads, but this
-      // doesn't happen in practice.
-      gamepad.hasDpad = true;
-      gamepad.dpadCaps = valueCaps[i];
-      // Expose d-pad as 4 additional buttons.
-      gamepad.numButtons += 4;
-    } else {
-      axes.InsertElementSorted(valueCaps[i], comparator);
-    }
-  }
-
-  gamepad.numAxes = std::min<size_t>(axes.Length(), kMaxAxes);
-  for (unsigned i = 0; i < gamepad.numAxes; i++) {
-    if (i >= kMaxAxes) {
-      break;
-    }
-    gamepad.axes[i].caps = axes[i];
-  }
-  gamepad.type = kRawInputGamepad;
-  gamepad.handle = handle;
-  gamepad.present = true;
-
-  nsRefPtr<GamepadService> gamepadsvc(GamepadService::GetService());
-  if (!gamepadsvc) {
-    return false;
-  }
-
-  gamepad.id = gamepadsvc->AddGamepad(gamepad_id,
-                                      GamepadMappingType::_empty,
-                                      gamepad.numButtons,
-                                      gamepad.numAxes);
-  mGamepads.AppendElement(gamepad);
-  return true;
-}
-
-bool
-WindowsGamepadService::HandleRawInput(HRAWINPUT handle)
-{
-  if (!mHID) {
-    return false;
-  }
-  nsRefPtr<GamepadService> gamepadsvc(GamepadService::GetService());
-  if (!gamepadsvc) {
-    return false;
-  }
-
-  // First, get data from the handle
-  UINT size;
-  GetRawInputData(handle, RID_INPUT, nullptr, &size, sizeof(RAWINPUTHEADER));
-  nsTArray<uint8_t> data(size);
-  data.SetLength(size);
-  if (GetRawInputData(handle, RID_INPUT, data.Elements(), &size,
-                      sizeof(RAWINPUTHEADER)) == kRawInputError) {
-    return false;
-  }
-  PRAWINPUT raw = reinterpret_cast<PRAWINPUT>(data.Elements());
-
-  Gamepad* gamepad = nullptr;
-  for (unsigned i = 0; i < mGamepads.Length(); i++) {
-    if (mGamepads[i].type == kRawInputGamepad
-        && mGamepads[i].handle == raw->header.hDevice) {
-      gamepad = &mGamepads[i];
-      break;
-    }
-  }
-  if (gamepad == nullptr) {
-    return false;
-  }
-
-  // Second, get the preparsed data
-  nsTArray<uint8_t> parsedbytes;
-  if (!GetPreparsedData(raw->header.hDevice, parsedbytes)) {
-    return false;
-  }
-  PHIDP_PREPARSED_DATA parsed =
-    reinterpret_cast<PHIDP_PREPARSED_DATA>(parsedbytes.Elements());
-
-  // Get all the pressed buttons.
-  nsTArray<USAGE> usages(gamepad->numButtons);
-  usages.SetLength(gamepad->numButtons);
-  ULONG usageLength = gamepad->numButtons;
-  if (mHID.mHidP_GetUsages(HidP_Input, kButtonUsagePage, 0, usages.Elements(),
-                     &usageLength, parsed, (PCHAR)raw->data.hid.bRawData,
-                     raw->data.hid.dwSizeHid) != HIDP_STATUS_SUCCESS) {
-    return false;
-  }
-
-  bool buttons[kMaxButtons] = { false };
-  usageLength = std::min<ULONG>(usageLength, kMaxButtons);
-  for (unsigned i = 0; i < usageLength; i++) {
-    buttons[usages[i] - 1] = true;
-  }
-
-  if (gamepad->hasDpad) {
-    // Get d-pad position as 4 buttons.
-    ULONG value;
-    if (mHID.mHidP_GetUsageValue(HidP_Input, gamepad->dpadCaps.UsagePage, 0, gamepad->dpadCaps.Range.UsageMin, &value, parsed, (PCHAR)raw->data.hid.bRawData, raw->data.hid.dwSizeHid) == HIDP_STATUS_SUCCESS) {
-      UnpackDpad(static_cast<LONG>(value), gamepad, buttons);
-    }
-  }
-
-  for (unsigned i = 0; i < gamepad->numButtons; i++) {
-    if (gamepad->buttons[i] != buttons[i]) {
-      gamepadsvc->NewButtonEvent(gamepad->id, i, buttons[i]);
-      gamepad->buttons[i] = buttons[i];
-    }
-  }
-
-  // Get all axis values.
-  for (unsigned i = 0; i < gamepad->numAxes; i++) {
-    double new_value;
-    if (gamepad->axes[i].caps.LogicalMin < 0) {
-LONG value;
-      if (mHID.mHidP_GetScaledUsageValue(HidP_Input, gamepad->axes[i].caps.UsagePage,
-                                   0, gamepad->axes[i].caps.Range.UsageMin,
-                                   &value, parsed,
-                                   (PCHAR)raw->data.hid.bRawData,
-                                   raw->data.hid.dwSizeHid)
-          != HIDP_STATUS_SUCCESS) {
-        continue;
-      }
-      new_value = ScaleAxis(value, gamepad->axes[i].caps.LogicalMin,
-                            gamepad->axes[i].caps.LogicalMax);
-    }
-    else {
-      ULONG value;
-      if (mHID.mHidP_GetUsageValue(HidP_Input, gamepad->axes[i].caps.UsagePage, 0,
-                             gamepad->axes[i].caps.Range.UsageMin, &value,
-                             parsed, (PCHAR)raw->data.hid.bRawData,
-                             raw->data.hid.dwSizeHid) != HIDP_STATUS_SUCCESS) {
-        continue;
-      }
-
-      new_value = ScaleAxis(value, gamepad->axes[i].caps.LogicalMin,
-                            gamepad->axes[i].caps.LogicalMax);
-    }
-    if (gamepad->axes[i].value != new_value) {
-      gamepadsvc->NewAxisMoveEvent(gamepad->id, i, new_value);
-      gamepad->axes[i].value = new_value;
-    }
-  }
-
-  return true;
-}
-
-void
-WindowsGamepadService::Startup()
-{
-  ScanForDevices();
-}
-
-void
-WindowsGamepadService::Shutdown()
-{
-  Cleanup();
-}
-
-void
-WindowsGamepadService::Cleanup()
-{
-  if (mXInputPollTimer) {
-    mXInputPollTimer->Cancel();
-  }
-  mGamepads.Clear();
-}
-
-void
-WindowsGamepadService::DevicesChanged(DeviceChangeType type)
-{
-  if (type == DeviceChangeNotification) {
-    mObserver->SetDeviceChangeTimer();
-  } else if (type == DeviceChangeStable) {
-    ScanForDevices();
-  }
-}
-
-NS_IMETHODIMP
-Observer::Observe(nsISupports* aSubject,
-                  const char* aTopic,
-                  const char16_t* aData)
-{
-  if (strcmp(aTopic, "timer-callback") == 0) {
-    mSvc.DevicesChanged(WindowsGamepadService::DeviceChangeStable);
-  } else if (strcmp(aTopic, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID) == 0) {
-    Stop();
-  }
-  return NS_OK;
-}
-
-HWND sHWnd = nullptr;
-
-bool
-RegisterRawInput(HWND hwnd, bool enable)
-{
-  nsTArray<RAWINPUTDEVICE> rid(ArrayLength(kUsagePages));
-  rid.SetLength(ArrayLength(kUsagePages));
-
-  for (unsigned i = 0; i < rid.Length(); i++) {
-    rid[i].usUsagePage = kUsagePages[i].usagePage;
-    rid[i].usUsage = kUsagePages[i].usage;
-    rid[i].dwFlags =
-      enable ? RIDEV_EXINPUTSINK | RIDEV_DEVNOTIFY : RIDEV_REMOVE;
-    rid[i].hwndTarget = hwnd;
-  }
-
-  if (!RegisterRawInputDevices(rid.Elements(), rid.Length(),
-                               sizeof(RAWINPUTDEVICE))) {
-    return false;
-  }
-  return true;
-}
-
-static
-LRESULT CALLBACK
-GamepadWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-  const unsigned int DBT_DEVICEARRIVAL        = 0x8000;
-  const unsigned int DBT_DEVICEREMOVECOMPLETE = 0x8004;
-  const unsigned int DBT_DEVNODES_CHANGED     = 0x7;
-
-  switch (msg) {
-  case WM_DEVICECHANGE:
-    if (wParam == DBT_DEVICEARRIVAL ||
-        wParam == DBT_DEVICEREMOVECOMPLETE ||
-        wParam == DBT_DEVNODES_CHANGED) {
-      if (gService) {
-        gService->DevicesChanged(WindowsGamepadService::DeviceChangeNotification);
-      }
-    }
-    break;
-  case WM_INPUT:
-    if (gService) {
-      gService->HandleRawInput(reinterpret_cast<HRAWINPUT>(lParam));
-    }
-    break;
-  }
-  return DefWindowProc(hwnd, msg, wParam, lParam);
-}
-
-} // namespace
-
-namespace mozilla {
-namespace hal_impl {
-
-void StartMonitoringGamepadStatus()
-{
-  if (gService) {
-    return;
-  }
-
-  gService = new WindowsGamepadService();
-  gService->Startup();
-
-  if (sHWnd == nullptr) {
-    WNDCLASSW wc;
-    HMODULE hSelf = GetModuleHandle(nullptr);
-
-    if (!GetClassInfoW(hSelf, L"MozillaGamepadClass", &wc)) {
-      ZeroMemory(&wc, sizeof(WNDCLASSW));
-      wc.hInstance = hSelf;
-      wc.lpfnWndProc = GamepadWindowProc;
-      wc.lpszClassName = L"MozillaGamepadClass";
-      RegisterClassW(&wc);
-    }
-
-    sHWnd = CreateWindowW(L"MozillaGamepadClass", L"Gamepad Watcher",
-                          0, 0, 0, 0, 0,
-                          nullptr, nullptr, hSelf, nullptr);
-    RegisterRawInput(sHWnd, true);
-  }
-}
-
-void StopMonitoringGamepadStatus()
-{
-  if (!gService) {
-    return;
-  }
-
-  if (sHWnd) {
-    RegisterRawInput(sHWnd, false);
-    DestroyWindow(sHWnd);
-    sHWnd = nullptr;
-  }
-
-  gService->Shutdown();
-  delete gService;
-  gService = nullptr;
-}
-
-} // namespace hal_impl
-} // namespace mozilla
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/encoders/ico/nsICOEncoder.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/encoders/ico/nsICOEncoder.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/encoders/ico/nsICOEncoder.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/encoders/ico/nsICOEncoder.h	2015-04-24 19:30:53.000000000 +0000
@@ -14,9 +14,6 @@
 #include "nsCOMPtr.h"
 #include "ICOFileHeaders.h"
 
-class nsBMPEncoder;
-class nsPNGEncoder;
-
 #define NS_ICOENCODER_CID \
 { /*92AE3AB2-8968-41B1-8709-B6123BCEAF21 */          \
      0x92ae3ab2,                                     \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/DecodePool.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/DecodePool.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/DecodePool.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/DecodePool.h	2015-04-24 19:30:53.000000000 +0000
@@ -23,7 +23,6 @@
 namespace image {
 
 class Decoder;
-class RasterImage;
 
 /**
  * DecodePool is a singleton class that manages decoding of raster images. It
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/imgLoader.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/imgLoader.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/imgLoader.cpp	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/imgLoader.cpp	2015-04-24 19:30:53.000000000 +0000
@@ -1674,7 +1674,7 @@
       bool withCredentials = aCORSMode == imgIRequest::CORS_USE_CREDENTIALS;
       nsRefPtr<nsCORSListenerProxy> corsproxy =
         new nsCORSListenerProxy(listener, aLoadingPrincipal, withCredentials);
-      rv = corsproxy->Init(newChannel);
+      rv = corsproxy->Init(newChannel, DataURIHandling::Allow);
       if (NS_FAILED(rv)) {
         return false;
       }
@@ -2251,7 +2251,7 @@
 
       nsRefPtr<nsCORSListenerProxy> corsproxy =
         new nsCORSListenerProxy(pl, aLoadingPrincipal, withCredentials);
-      rv = corsproxy->Init(newChannel);
+      rv = corsproxy->Init(newChannel, DataURIHandling::Allow);
       if (NS_FAILED(rv)) {
         PR_LOG(GetImgLog(), PR_LOG_DEBUG,
                ("[this=%p] imgLoader::LoadImage -- nsCORSListenerProxy "
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/moz.build	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/moz.build	2015-04-24 19:30:53.000000000 +0000
@@ -19,7 +19,6 @@
     'ClippedImage.cpp',
     'DecodePool.cpp',
     'Decoder.cpp',
-    'Downscaler.cpp',
     'DynamicImage.cpp',
     'FrameAnimator.cpp',
     'FrozenImage.cpp',
@@ -39,6 +38,8 @@
     'SVGDocumentWrapper.cpp',
     'VectorImage.cpp',
 ]
+if CONFIG['MOZ_ENABLE_SKIA']:
+    UNIFIED_SOURCES += [ 'Downscaler.cpp']
 
 # These files can't be unified because of ImageLogging.h #include order issues.
 SOURCES += [
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/ProgressTracker.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/ProgressTracker.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/ProgressTracker.cpp	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/ProgressTracker.cpp	2015-04-24 19:30:53.000000000 +0000
@@ -87,6 +87,7 @@
 void
 ProgressTracker::SetImage(Image* aImage)
 {
+  MutexAutoLock lock(mImageMutex);
   MOZ_ASSERT(aImage, "Setting null image");
   MOZ_ASSERT(!mImage, "Setting image when we already have one");
   mImage = aImage;
@@ -95,6 +96,7 @@
 void
 ProgressTracker::ResetImage()
 {
+  MutexAutoLock lock(mImageMutex);
   MOZ_ASSERT(mImage, "Resetting image when it's already null!");
   mImage = nullptr;
 }
@@ -183,8 +185,9 @@
   MOZ_ASSERT(NS_IsMainThread());
 
 #ifdef PR_LOGGING
-  if (mImage && mImage->GetURI()) {
-    nsRefPtr<ImageURL> uri(mImage->GetURI());
+  nsRefPtr<Image> image = GetImage();
+  if (image && image->GetURI()) {
+    nsRefPtr<ImageURL> uri(image->GetURI());
     nsAutoCString spec;
     uri->GetSpec(spec);
     LOG_FUNC_WITH_PARAM(GetImgLog(),
@@ -251,9 +254,10 @@
   MOZ_ASSERT(NS_IsMainThread());
 
 #ifdef PR_LOGGING
+  nsRefPtr<Image> image = GetImage();
   nsAutoCString spec;
-  if (mImage && mImage->GetURI()) {
-    mImage->GetURI()->GetSpec(spec);
+  if (image && image->GetURI()) {
+    image->GetURI()->GetSpec(spec);
   }
   LOG_FUNC_WITH_PARAM(GetImgLog(),
                       "ProgressTracker::NotifyCurrentState", "uri", spec.get());
@@ -367,7 +371,7 @@
   CheckProgressConsistency(mProgress);
 
   // Send notifications.
-  SyncNotifyInternal(mObservers, !!mImage, progress, aInvalidRect);
+  SyncNotifyInternal(mObservers, HasImage(), progress, aInvalidRect);
 
   if (progress & FLAG_HAS_ERROR) {
     FireFailureNotification();
@@ -379,19 +383,21 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
+  nsRefPtr<Image> image = GetImage();
+
 #ifdef PR_LOGGING
   nsAutoCString spec;
-  if (mImage && mImage->GetURI()) {
-    mImage->GetURI()->GetSpec(spec);
+  if (image && image->GetURI()) {
+    image->GetURI()->GetSpec(spec);
   }
   LOG_SCOPE_WITH_PARAM(GetImgLog(),
                        "ProgressTracker::SyncNotify", "uri", spec.get());
 #endif
 
   nsIntRect rect;
-  if (mImage) {
-    if (NS_FAILED(mImage->GetWidth(&rect.width)) ||
-        NS_FAILED(mImage->GetHeight(&rect.height))) {
+  if (image) {
+    if (NS_FAILED(image->GetWidth(&rect.width)) ||
+        NS_FAILED(image->GetHeight(&rect.height))) {
       // Either the image has no intrinsic size, or it has an error.
       rect = GetMaxSizedIntRect();
     }
@@ -399,7 +405,7 @@
 
   ObserverArray array;
   array.AppendElement(aObserver);
-  SyncNotifyInternal(array, !!mImage, mProgress, rect);
+  SyncNotifyInternal(array, !!image, mProgress, rect);
 }
 
 void
@@ -511,11 +517,12 @@
 
   // Some kind of problem has happened with image decoding.
   // Report the URI to net:failed-to-process-uri-conent observers.
-  if (mImage) {
+  nsRefPtr<Image> image = GetImage();
+  if (image) {
     // Should be on main thread, so ok to create a new nsIURI.
     nsCOMPtr<nsIURI> uri;
     {
-      nsRefPtr<ImageURL> threadsafeUriData = mImage->GetURI();
+      nsRefPtr<ImageURL> threadsafeUriData = image->GetURI();
       uri = threadsafeUriData ? threadsafeUriData->ToIURI() : nullptr;
     }
     if (uri) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/ProgressTracker.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/ProgressTracker.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/ProgressTracker.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/ProgressTracker.h	2015-04-24 19:30:53.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_image_src_ProgressTracker_h
 #define mozilla_image_src_ProgressTracker_h
 
+#include "mozilla/Mutex.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/WeakPtr.h"
 #include "nsCOMPtr.h"
@@ -15,7 +16,6 @@
 #include "nsRect.h"
 #include "IProgressObserver.h"
 
-class imgIContainer;
 class nsIRunnable;
 
 namespace mozilla {
@@ -77,13 +77,15 @@
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ProgressTracker)
 
   ProgressTracker()
-    : mImage(nullptr)
+    : mImageMutex("ProgressTracker::mImage")
+    , mImage(nullptr)
     , mProgress(NoProgress)
   { }
 
-  bool HasImage() const { return mImage; }
+  bool HasImage() const { MutexAutoLock lock(mImageMutex); return mImage; }
   already_AddRefed<Image> GetImage() const
   {
+    MutexAutoLock lock(mImageMutex);
     nsRefPtr<Image> image = mImage;
     return image.forget();
   }
@@ -191,7 +193,9 @@
 
   nsCOMPtr<nsIRunnable> mRunnable;
 
-  // This weak ref should be set null when the image goes out of scope.
+  // mImage is a weak ref; it should be set to null when the image goes out of
+  // scope. mImageMutex protects mImage.
+  mutable Mutex mImageMutex;
   Image* mImage;
 
   // List of observers attached to the image. Each observer represents a
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/RasterImage.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/RasterImage.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/RasterImage.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/RasterImage.h	2015-04-24 19:30:53.000000000 +0000
@@ -39,7 +39,6 @@
 #endif
 
 class nsIInputStream;
-class nsIThreadPool;
 class nsIRequest;
 
 #define NS_RASTERIMAGE_CID \
@@ -123,7 +122,6 @@
 namespace mozilla {
 
 namespace layers {
-class LayerManager;
 class ImageContainer;
 class Image;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/SVGDocumentWrapper.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/SVGDocumentWrapper.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/SVGDocumentWrapper.h	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/SVGDocumentWrapper.h	2015-04-24 19:30:53.000000000 +0000
@@ -17,7 +17,6 @@
 #include "nsWeakReference.h"
 #include "nsSize.h"
 
-class nsIAtom;
 class nsIPresShell;
 class nsIRequest;
 class nsILoadGroup;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/VectorImage.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/VectorImage.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/src/VectorImage.h	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/src/VectorImage.h	2015-04-24 19:30:53.000000000 +0000
@@ -14,10 +14,6 @@
 class gfxDrawable;
 
 namespace mozilla {
-namespace layers {
-class LayerManager;
-class ImageContainer;
-}
 namespace image {
 
 struct SVGDrawingParameters;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/test/mochitest/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/test/mochitest/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/test/mochitest/mochitest.ini	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/test/mochitest/mochitest.ini	2015-04-24 19:30:53.000000000 +0000
@@ -95,3 +95,4 @@
 [test_image_buffer_limit.html]
 #skip-if = toolkit != "gonk" #Image buffer limit is only set for Firefox OS currently.
 disabled = bug 1060869
+[test_image_crossorigin_data_url.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/test/mochitest/test_image_crossorigin_data_url.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/test/mochitest/test_image_crossorigin_data_url.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/image/test/mochitest/test_image_crossorigin_data_url.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/image/test/mochitest/test_image_crossorigin_data_url.html	2015-04-24 19:30:53.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test for handling of 'crossorigin' attribute on CSS link with data: URL</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<div id="someuniqueidhere"></div>
+<img id="testimg" crossorigin src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4z8AAAAMBAQD3A0FDAAAAAElFTkSuQmCC">
+<script>
+  var t = async_test("img@crossorigin with data: src");
+  window.addEventListener("load", t.step_func_done(function() {
+    var img = document.getElementById("testimg");
+    assert_equals(img.naturalWidth, 1, "Should have 1px width");
+    assert_equals(img.naturalHeight, 1, "Should have 1px height");
+    var c = document.createElement("canvas");
+    c.width = c.height = 1;
+    var ctx = c.getContext("2d");
+    ctx.drawImage(img, 0, 0);
+    var data = ctx.getImageData(0, 0, 1, 1);
+    assert_equals(data.width, 1, "Should have 1px data width");
+    assert_equals(data.height, 1, "Should have 1px data height");
+    assert_equals(data.data[0], 255, "Should have lots of red");
+    assert_equals(data.data[1], 0, "Should have no green");
+    assert_equals(data.data[2], 0, "Should have no blue");
+    assert_equals(data.data[3], 255, "Should have no translucency");
+  }));
+</script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/bluetooth/BluetoothDaemonConnection.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/bluetooth/BluetoothDaemonConnection.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/bluetooth/BluetoothDaemonConnection.h	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/bluetooth/BluetoothDaemonConnection.h	2015-04-24 19:30:58.000000000 +0000
@@ -68,8 +68,8 @@
   void GetHeader(uint8_t& aService, uint8_t& aOpcode,
                  uint16_t& aPayloadSize);
 
-  ssize_t Send(int aFd);
-  ssize_t Receive(int aFd);
+  ssize_t Send(int aFd) override;
+  ssize_t Receive(int aFd) override;
 
   int AcquireFd();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/moz.build	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/moz.build	2015-04-24 19:30:58.000000000 +0000
@@ -50,7 +50,6 @@
     'src/base/pickle.cc',
     'src/base/rand_util.cc',
     'src/base/revocable_store.cc',
-    'src/base/scoped_temp_dir.cc',
     'src/base/string_piece.cc',
     'src/base/string_util.cc',
     'src/base/thread.cc',
@@ -65,6 +64,7 @@
     'src/chrome/common/child_thread.cc',
     'src/chrome/common/chrome_switches.cc',
     'src/chrome/common/env_vars.cc',
+    'src/chrome/common/ipc_channel.cc',
     'src/chrome/common/ipc_channel_proxy.cc',
     'src/chrome/common/ipc_message.cc',
     'src/chrome/common/ipc_sync_channel.cc',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/atomic_sequence_num.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/atomic_sequence_num.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/atomic_sequence_num.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/atomic_sequence_num.h	2015-04-24 19:30:58.000000000 +0000
@@ -0,0 +1,60 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BASE_ATOMIC_SEQUENCE_NUM_H_
+#define BASE_ATOMIC_SEQUENCE_NUM_H_
+
+#include "base/atomicops.h"
+#include "base/basictypes.h"
+
+namespace base {
+
+class AtomicSequenceNumber;
+
+// Static (POD) AtomicSequenceNumber that MUST be used in global scope (or
+// non-function scope) ONLY. This implementation does not generate any static
+// initializer.  Note that it does not implement any constructor which means
+// that its fields are not initialized except when it is stored in the global
+// data section (.data in ELF). If you want to allocate an atomic sequence
+// number on the stack (or heap), please use the AtomicSequenceNumber class
+// declared below.
+class StaticAtomicSequenceNumber {
+ public:
+  inline int GetNext() {
+    return static_cast<int>(
+        base::subtle::NoBarrier_AtomicIncrement(&seq_, 1) - 1);
+  }
+
+ private:
+  friend class AtomicSequenceNumber;
+
+  inline void Reset() {
+    base::subtle::Release_Store(&seq_, 0);
+  }
+
+  base::subtle::Atomic32 seq_;
+};
+
+// AtomicSequenceNumber that can be stored and used safely (i.e. its fields are
+// always initialized as opposed to StaticAtomicSequenceNumber declared above).
+// Please use StaticAtomicSequenceNumber if you want to declare an atomic
+// sequence number in the global scope.
+class AtomicSequenceNumber {
+ public:
+  AtomicSequenceNumber() {
+    seq_.Reset();
+  }
+
+  inline int GetNext() {
+    return seq_.GetNext();
+  }
+
+ private:
+  StaticAtomicSequenceNumber seq_;
+  DISALLOW_COPY_AND_ASSIGN(AtomicSequenceNumber);
+};
+
+}  // namespace base
+
+#endif  // BASE_ATOMIC_SEQUENCE_NUM_H_
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/file_util.cc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/file_util.cc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/file_util.cc	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/file_util.cc	2015-04-24 19:30:58.000000000 +0000
@@ -139,12 +139,6 @@
     path->push_back(FilePath::kSeparators[0]);
   path->append(new_ending);
 }
-bool CopyDirectory(const std::wstring& from_path, const std::wstring& to_path,
-                   bool recursive) {
-  return CopyDirectory(FilePath::FromWStringHack(from_path),
-                       FilePath::FromWStringHack(to_path),
-                       recursive);
-}
 bool CopyFile(const std::wstring& from_path, const std::wstring& to_path) {
   return CopyFile(FilePath::FromWStringHack(from_path),
                   FilePath::FromWStringHack(to_path));
@@ -172,8 +166,8 @@
   *temp_file = temp_file_path.ToWStringHack();
   return true;
 }
-bool Delete(const std::wstring& path, bool recursive) {
-  return Delete(FilePath::FromWStringHack(path), recursive);
+bool Delete(const std::wstring& path) {
+  return Delete(FilePath::FromWStringHack(path));
 }
 bool DirectoryExists(const std::wstring& path) {
   return DirectoryExists(FilePath::FromWStringHack(path));
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/file_util.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/file_util.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/file_util.h	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/file_util.h	2015-04-24 19:30:58.000000000 +0000
@@ -16,7 +16,6 @@
 #include <sys/stat.h>
 #elif defined(OS_POSIX) 
 #include <sys/types.h>
-#include <fts.h>
 #include <sys/stat.h>
 #endif
 
@@ -87,34 +86,17 @@
 
 // Deletes the given path, whether it's a file or a directory.
 // If it's a directory, it's perfectly happy to delete all of the
-// directory's contents.  Passing true to recursive deletes
-// subdirectories and their contents as well.
+// directory's contents.
 // Returns true if successful, false otherwise.
-//
-// WARNING: USING THIS WITH recursive==true IS EQUIVALENT
-//          TO "rm -rf", SO USE WITH CAUTION.
-bool Delete(const FilePath& path, bool recursive);
+bool Delete(const FilePath& path);
 // Deprecated temporary compatibility function.
-bool Delete(const std::wstring& path, bool recursive);
+bool Delete(const std::wstring& path);
 
 // Copies a single file. Use CopyDirectory to copy directories.
 bool CopyFile(const FilePath& from_path, const FilePath& to_path);
 // Deprecated temporary compatibility function.
 bool CopyFile(const std::wstring& from_path, const std::wstring& to_path);
 
-// Copies the given path, and optionally all subdirectories and their contents
-// as well.
-// If there are files existing under to_path, always overwrite.
-// Returns true if successful, false otherwise.
-// Dont't use wildcards on the names, it may stop working without notice.
-//
-// If you only need to copy a file use CopyFile, it's faster.
-bool CopyDirectory(const FilePath& from_path, const FilePath& to_path,
-                   bool recursive);
-// Deprecated temporary compatibility function.
-bool CopyDirectory(const std::wstring& from_path, const std::wstring& to_path,
-                   bool recursive);
-
 // Returns true if the given path exists on the local filesystem,
 // false otherwise.
 bool PathExists(const FilePath& path);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/file_util_posix.cc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/file_util_posix.cc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/file_util_posix.cc	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/file_util_posix.cc	2015-04-24 19:30:58.000000000 +0000
@@ -8,13 +8,10 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
-#ifndef ANDROID
-#include <fts.h>
-#endif
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <sys/mman.h>
 #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
 #include <sys/stat.h>
@@ -53,7 +50,7 @@
 // which works both with and without the recursive flag.  I'm not sure we need
 // that functionality. If not, remove from file_util_win.cc, otherwise add it
 // here.
-bool Delete(const FilePath& path, bool recursive) {
+bool Delete(const FilePath& path) {
   const char* path_str = path.value().c_str();
   struct stat file_info;
   int test = stat(path_str, &file_info);
@@ -64,174 +61,8 @@
   }
   if (!S_ISDIR(file_info.st_mode))
     return (unlink(path_str) == 0);
-  if (!recursive)
-    return (rmdir(path_str) == 0);
-
-#ifdef ANDROID
-  // XXX Need ftsless impl for bionic
-  return false;
-#else
-  bool success = true;
-  int ftsflags = FTS_PHYSICAL | FTS_NOSTAT;
-  char top_dir[PATH_MAX];
-  if (base::strlcpy(top_dir, path_str,
-                    arraysize(top_dir)) >= arraysize(top_dir)) {
-    return false;
-  }
-  char* dir_list[2] = { top_dir, NULL };
-  FTS* fts = fts_open(dir_list, ftsflags, NULL);
-  if (fts) {
-    FTSENT* fts_ent = fts_read(fts);
-    while (success && fts_ent != NULL) {
-      switch (fts_ent->fts_info) {
-        case FTS_DNR:
-        case FTS_ERR:
-          // log error
-          success = false;
-          continue;
-          break;
-        case FTS_DP:
-          success = (rmdir(fts_ent->fts_accpath) == 0);
-          break;
-        case FTS_D:
-          break;
-        case FTS_NSOK:
-        case FTS_F:
-        case FTS_SL:
-        case FTS_SLNONE:
-          success = (unlink(fts_ent->fts_accpath) == 0);
-          break;
-        default:
-          DCHECK(false);
-          break;
-      }
-      fts_ent = fts_read(fts);
-    }
-    fts_close(fts);
-  }
-  return success;
-#endif
-}
-
-bool Move(const FilePath& from_path, const FilePath& to_path) {
-  if (rename(from_path.value().c_str(), to_path.value().c_str()) == 0)
-    return true;
-
-  if (!CopyDirectory(from_path, to_path, true))
-    return false;
-
-  Delete(from_path, true);
-  return true;
-}
 
-bool CopyDirectory(const FilePath& from_path,
-                   const FilePath& to_path,
-                   bool recursive) {
-  // Some old callers of CopyDirectory want it to support wildcards.
-  // After some discussion, we decided to fix those callers.
-  // Break loudly here if anyone tries to do this.
-  // TODO(evanm): remove this once we're sure it's ok.
-  DCHECK(to_path.value().find('*') == std::string::npos);
-  DCHECK(from_path.value().find('*') == std::string::npos);
-
-  char top_dir[PATH_MAX];
-  if (base::strlcpy(top_dir, from_path.value().c_str(),
-                    arraysize(top_dir)) >= arraysize(top_dir)) {
-    return false;
-  }
-
-#ifdef ANDROID
-  // XXX Need ftsless impl for bionic
-  return false;
-#else
-  char* dir_list[] = { top_dir, NULL };
-  FTS* fts = fts_open(dir_list, FTS_PHYSICAL | FTS_NOSTAT, NULL);
-  if (!fts) {
-    CHROMIUM_LOG(ERROR) << "fts_open failed: " << strerror(errno);
-    return false;
-  }
-
-  int error = 0;
-  FTSENT* ent;
-  while (!error && (ent = fts_read(fts)) != NULL) {
-    // ent->fts_path is the source path, including from_path, so paste
-    // the suffix after from_path onto to_path to create the target_path.
-    std::string suffix(&ent->fts_path[from_path.value().size()]);
-    // Strip the leading '/' (if any).
-    if (!suffix.empty()) {
-      DCHECK_EQ('/', suffix[0]);
-      suffix.erase(0, 1);
-    }
-    const FilePath target_path = to_path.Append(suffix);
-    switch (ent->fts_info) {
-      case FTS_D:  // Preorder directory.
-        // If we encounter a subdirectory in a non-recursive copy, prune it
-        // from the traversal.
-        if (!recursive && ent->fts_level > 0) {
-          if (fts_set(fts, ent, FTS_SKIP) != 0)
-            error = errno;
-          continue;
-        }
-
-        // Try creating the target dir, continuing on it if it exists already.
-        // Rely on the user's umask to produce correct permissions.
-        if (mkdir(target_path.value().c_str(), 0777) != 0) {
-          if (errno != EEXIST)
-            error = errno;
-        }
-        break;
-      case FTS_F:     // Regular file.
-      case FTS_NSOK:  // File, no stat info requested.
-        errno = 0;
-        if (!CopyFile(FilePath(ent->fts_path), target_path))
-          error = errno ? errno : EINVAL;
-        break;
-      case FTS_DP:   // Postorder directory.
-      case FTS_DOT:  // "." or ".."
-        // Skip it.
-        continue;
-      case FTS_DC:   // Directory causing a cycle.
-        // Skip this branch.
-        if (fts_set(fts, ent, FTS_SKIP) != 0)
-          error = errno;
-        break;
-      case FTS_DNR:  // Directory cannot be read.
-      case FTS_ERR:  // Error.
-      case FTS_NS:   // Stat failed.
-        // Abort with the error.
-        error = ent->fts_errno;
-        break;
-      case FTS_SL:      // Symlink.
-      case FTS_SLNONE:  // Symlink with broken target.
-        CHROMIUM_LOG(WARNING) << "CopyDirectory() skipping symbolic link: " <<
-            ent->fts_path;
-        continue;
-      case FTS_DEFAULT:  // Some other sort of file.
-        CHROMIUM_LOG(WARNING) << "CopyDirectory() skipping file of unknown type: " <<
-            ent->fts_path;
-        continue;
-      default:
-        NOTREACHED();
-        continue;  // Hope for the best!
-    }
-  }
-  // fts_read may have returned NULL and set errno to indicate an error.
-  if (!error && errno != 0)
-    error = errno;
-
-  if (!fts_close(fts)) {
-    // If we already have an error, let's use that error instead of the error
-    // fts_close set.
-    if (!error)
-      error = errno;
-  }
-
-  if (error) {
-    CHROMIUM_LOG(ERROR) << "CopyDirectory(): " << strerror(error);
-    return false;
-  }
-  return true;
-#endif
+  return (rmdir(path_str) == 0);
 }
 
 bool PathExists(const FilePath& path) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/file_util_win.cc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/file_util_win.cc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/file_util_win.cc	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/file_util_win.cc	2015-04-24 19:30:58.000000000 +0000
@@ -27,14 +27,14 @@
   return true;
 }
 
-bool Delete(const FilePath& path, bool recursive) {
+bool Delete(const FilePath& path) {
   if (path.value().length() >= MAX_PATH)
     return false;
 
-  // If we're not recursing use DeleteFile; it should be faster. DeleteFile
+  // Use DeleteFile; it should be faster. DeleteFile
   // fails if passed a directory though, which is why we fall through on
   // failure to the SHFileOperation.
-  if (!recursive && DeleteFile(path.value().c_str()) != 0)
+  if (DeleteFile(path.value().c_str()) != 0)
     return true;
 
   // SHFILEOPSTRUCT wants the path to be terminated with two NULLs,
@@ -48,8 +48,7 @@
   file_operation.wFunc = FO_DELETE;
   file_operation.pFrom = double_terminated_path;
   file_operation.fFlags = FOF_NOERRORUI | FOF_SILENT | FOF_NOCONFIRMATION;
-  if (!recursive)
-    file_operation.fFlags |= FOF_NORECURSION | FOF_FILESONLY;
+  file_operation.fFlags |= FOF_NORECURSION | FOF_FILESONLY;
   int err = SHFileOperation(&file_operation);
   // Some versions of Windows return ERROR_FILE_NOT_FOUND when
   // deleting an empty directory.
@@ -98,26 +97,6 @@
   return (SHFileOperation(&file_operation) == 0);
 }
 
-bool CopyDirectory(const FilePath& from_path, const FilePath& to_path,
-                   bool recursive) {
-  if (recursive)
-    return ShellCopy(from_path, to_path, true);
-
-  // Instead of creating a new directory, we copy the old one to include the
-  // security information of the folder as part of the copy.
-  if (!PathExists(to_path)) {
-    // Except that Vista fails to do that, and instead do a recursive copy if
-    // the target directory doesn't exist.
-    if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA)
-      CreateDirectory(to_path);
-    else
-      ShellCopy(from_path, to_path, false);
-  }
-
-  FilePath directory = from_path.Append(L"*.*");
-  return ShellCopy(directory, to_path, false);
-}
-
 bool PathExists(const FilePath& path) {
   return (GetFileAttributes(path.value().c_str()) != INVALID_FILE_ATTRIBUTES);
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/scoped_temp_dir.cc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/scoped_temp_dir.cc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/scoped_temp_dir.cc	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/scoped_temp_dir.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/scoped_temp_dir.h"
-
-#include "base/file_util.h"
-#include "base/logging.h"
-#include "base/string_util.h"
-
-ScopedTempDir::ScopedTempDir() {
-}
-
-ScopedTempDir::~ScopedTempDir() {
-  if (!path_.empty() && !file_util::Delete(path_, true))
-    CHROMIUM_LOG(ERROR) << "ScopedTempDir unable to delete " << path_.value();
-}
-
-bool ScopedTempDir::CreateUniqueTempDir() {
-  // This "scoped_dir" prefix is only used on Windows and serves as a template
-  // for the unique name.
-  if (!file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("scoped_dir"),
-                                         &path_))
-    return false;
-
-  return true;
-}
-
-bool ScopedTempDir::Set(const FilePath& path) {
-  DCHECK(path_.empty());
-  if (!file_util::DirectoryExists(path) &&
-      !file_util::CreateDirectory(path)) {
-    return false;
-  }
-  path_ = path;
-  return true;
-}
-
-FilePath ScopedTempDir::Take() {
-  FilePath ret = path_;
-  path_ = FilePath();
-  return ret;
-}
-
-bool ScopedTempDir::IsValid() const {
-  return !path_.empty() && file_util::DirectoryExists(path_);
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/scoped_temp_dir.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/scoped_temp_dir.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/scoped_temp_dir.h	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/scoped_temp_dir.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_SCOPED_TEMP_DIR_H_
-#define BASE_SCOPED_TEMP_DIR_H_
-
-// An object representing a temporary / scratch directory that should be cleaned
-// up (recursively) when this object goes out of scope.  Note that since
-// deletion occurs during the destructor, no further error handling is possible
-// if the directory fails to be deleted.  As a result, deletion is not
-// guaranteed by this class.
-
-#include "base/file_path.h"
-
-class ScopedTempDir {
- public:
-  // No directory is owned/created initially.
-  ScopedTempDir();
-
-  // Recursively delete path_
-  ~ScopedTempDir();
-
-  // Creates a unique directory in TempPath, and takes ownership of it.
-  // See file_util::CreateNewTemporaryDirectory.
-  bool CreateUniqueTempDir();
-
-  // Takes ownership of directory at |path|, creating it if necessary.
-  // Don't call multiple times unless Take() has been called first.
-  bool Set(const FilePath& path);
-
-  // Caller takes ownership of the temporary directory so it won't be destroyed
-  // when this object goes out of scope.
-  FilePath Take();
-
-  const FilePath& path() const { return path_; }
-
-  // Returns true if path_ is non-empty and exists.
-  bool IsValid() const;
-
- private:
-  FilePath path_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedTempDir);
-};
-
-#endif  // BASE_SCOPED_TEMP_DIR_H_
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/shared_memory_posix.cc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/shared_memory_posix.cc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/base/shared_memory_posix.cc	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/base/shared_memory_posix.cc	2015-04-24 19:30:58.000000000 +0000
@@ -93,7 +93,7 @@
 
   FilePath path(WideToUTF8(mem_filename));
   if (file_util::PathExists(path)) {
-    return file_util::Delete(path, false);
+    return file_util::Delete(path);
   }
 
   // Doesn't exist, so success.
@@ -170,7 +170,7 @@
     // Deleting the file prevents anyone else from mapping it in
     // (making it private), and prevents the need for cleanup (once
     // the last fd is closed, it is truly freed).
-    file_util::Delete(path, false);
+    file_util::Delete(path);
   } else {
     std::wstring mem_filename;
     if (FilenameForMemoryName(name, &mem_filename) == false)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/child_process_host.cc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/child_process_host.cc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/child_process_host.cc	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/child_process_host.cc	2015-04-24 19:30:59.000000000 +0000
@@ -74,7 +74,7 @@
 }
 
 bool ChildProcessHost::CreateChannel() {
-  channel_id_ = GenerateRandomChannelID(this);
+  channel_id_ = IPC::Channel::GenerateVerifiedChannelID(std::wstring());
   channel_.reset(new IPC::Channel(
       channel_id_, IPC::Channel::MODE_SERVER, &listener_));
   if (!channel_->Connect())
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/child_process_info.cc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/child_process_info.cc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/child_process_info.cc	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/child_process_info.cc	2015-04-24 19:30:59.000000000 +0000
@@ -7,9 +7,6 @@
 #include <limits>
 
 #include "base/logging.h"
-#include "base/process_util.h"
-#include "base/rand_util.h"
-#include "base/string_util.h"
 
 std::wstring ChildProcessInfo::GetTypeNameInEnglish(
     ChildProcessInfo::ProcessType type) {
@@ -44,16 +41,4 @@
 
 
 ChildProcessInfo::~ChildProcessInfo() {
-}
-
-std::wstring ChildProcessInfo::GenerateRandomChannelID(void* instance) {
-  // Note: the string must start with the current process id, this is how
-  // child processes determine the pid of the parent.
-  // Build the channel ID.  This is composed of a unique identifier for the
-  // parent browser process, an identifier for the child instance, and a random
-  // component. We use a random component so that a hacked child process can't
-  // cause denial of service by causing future named pipe creation to fail.
-  return StringPrintf(L"%d.%x.%d",
-                      base::GetCurrentProcId(), instance,
-                      base::RandInt(0, std::numeric_limits<int>::max()));
-}
+}
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/child_process_info.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/child_process_info.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/child_process_info.h	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/child_process_info.h	2015-04-24 19:30:59.000000000 +0000
@@ -78,10 +78,6 @@
     return process_.handle() == rhs.process_.handle();
   }
 
-  // Generates a unique channel name for a child renderer/plugin process.
-  // The "instance" pointer value is baked into the channel id.
-  static std::wstring GenerateRandomChannelID(void* instance);
-
  protected:
   void set_type(ProcessType type) { type_ = type; }
   void set_name(const std::wstring& name) { name_ = name; }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/ipc_channel.cc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/ipc_channel.cc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/ipc_channel.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/ipc_channel.cc	2015-04-24 19:30:59.000000000 +0000
@@ -0,0 +1,39 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/common/ipc_channel.h"
+
+#include <limits>
+
+#include "base/atomic_sequence_num.h"
+#include "base/process_util.h"
+#include "base/rand_util.h"
+#include "base/string_util.h"
+
+namespace {
+
+// Global atomic used to guarantee channel IDs are unique.
+base::StaticAtomicSequenceNumber g_last_id;
+
+}  // namespace
+
+namespace IPC {
+
+// static
+std::wstring Channel::GenerateUniqueRandomChannelID() {
+  // Note: the string must start with the current process id, this is how
+  // some child processes determine the pid of the parent.
+  //
+  // This is composed of a unique incremental identifier, the process ID of
+  // the creator, an identifier for the child instance, and a strong random
+  // component. The strong random component prevents other processes from
+  // hijacking or squatting on predictable channel names.
+
+  return StringPrintf(L"%d.%u.%d",
+      base::GetCurrentProcId(),
+      g_last_id.GetNext(),
+      base::RandInt(0, std::numeric_limits<int32_t>::max()));
+}
+
+}  // namespace IPC
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/ipc_channel.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/ipc_channel.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/ipc_channel.h	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/ipc_channel.h	2015-04-24 19:30:59.000000000 +0000
@@ -5,6 +5,8 @@
 #ifndef CHROME_COMMON_IPC_CHANNEL_H_
 #define CHROME_COMMON_IPC_CHANNEL_H_
 
+#include <string>
+
 #include <queue>
 #include "chrome/common/ipc_message.h"
 
@@ -131,6 +133,15 @@
   void* GetServerPipeHandle() const;
 #endif  // defined(OS_POSIX)
 
+  // Generates a channel ID that's non-predictable and unique.
+  static std::wstring GenerateUniqueRandomChannelID();
+
+  // Generates a channel ID that, if passed to the client as a shared secret,
+  // will validate that the client's authenticity. On platforms that do not
+  // require additional validation this is simply calls GenerateUniqueRandomChannelID().
+  // For portability the prefix should not include the \ character.
+  static std::wstring GenerateVerifiedChannelID(const std::wstring& prefix);
+
  private:
   // PIMPL to which all channel calls are delegated.
   class ChannelImpl;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc	2015-04-24 19:30:59.000000000 +0000
@@ -1056,4 +1056,16 @@
   return channel_impl_->Unsound_NumQueuedMessages();
 }
 
+// static
+std::wstring Channel::GenerateVerifiedChannelID(const std::wstring& prefix) {
+  // A random name is sufficient validation on posix systems, so we don't need
+  // an additional shared secret.
+
+  std::wstring id = prefix;
+  if (!id.empty())
+    id.append(L".");
+
+  return id.append(GenerateUniqueRandomChannelID());
+}
+
 }  // namespace IPC
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/ipc_channel_win.cc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/ipc_channel_win.cc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/ipc_channel_win.cc	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/ipc_channel_win.cc	2015-04-24 19:30:59.000000000 +0000
@@ -9,6 +9,9 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/process_util.h"
+#include "base/rand_util.h"
+#include "base/string_util.h"
 #include "base/non_thread_safe.h"
 #include "base/win_util.h"
 #include "chrome/common/ipc_message_utils.h"
@@ -33,7 +36,9 @@
                               Listener* listener)
     : ALLOW_THIS_IN_INITIALIZER_LIST(input_state_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(output_state_(this)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)),
+      shared_secret_(0),
+      waiting_for_shared_secret_(false) {
   Init(mode, listener);
 
   if (!CreatePipe(channel_id, mode)) {
@@ -48,7 +53,9 @@
                                   Mode mode, Listener* listener)
     : ALLOW_THIS_IN_INITIALIZER_LIST(input_state_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(output_state_(this)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)),
+      shared_secret_(0),
+      waiting_for_shared_secret_(false) {
   Init(mode, listener);
 
   if (mode == MODE_SERVER) {
@@ -153,18 +160,31 @@
 }
 
 const std::wstring Channel::ChannelImpl::PipeName(
-    const std::wstring& channel_id) const {
+    const std::wstring& channel_id, int32_t* secret) const {
+  MOZ_ASSERT(secret);
+
   std::wostringstream ss;
-  // XXX(darin): get application name from somewhere else
-  ss << L"\\\\.\\pipe\\chrome." << channel_id;
+  ss << L"\\\\.\\pipe\\chrome.";
+
+  // Prevent the shared secret from ending up in the pipe name.
+  size_t index = channel_id.find_first_of(L'\\');
+  if (index != std::string::npos) {
+    StringToInt(channel_id.substr(index + 1), secret);
+    ss << channel_id.substr(0, index - 1);
+  } else {
+    // This case is here to support predictable named pipes in tests.
+    *secret = 0;
+    ss << channel_id;
+  }
   return ss.str();
 }
 
 bool Channel::ChannelImpl::CreatePipe(const std::wstring& channel_id,
                                       Mode mode) {
   DCHECK(pipe_ == INVALID_HANDLE_VALUE);
-  const std::wstring pipe_name = PipeName(channel_id);
+  const std::wstring pipe_name = PipeName(channel_id, &shared_secret_);
   if (mode == MODE_SERVER) {
+    waiting_for_shared_secret_ = !!shared_secret_;
     pipe_ = CreateNamedPipeW(pipe_name.c_str(),
                              PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED |
                                 FILE_FLAG_FIRST_PIPE_INSTANCE,
@@ -200,7 +220,15 @@
   mozilla::UniquePtr<Message> m = mozilla::MakeUnique<Message>(MSG_ROUTING_NONE,
                                                                HELLO_MESSAGE_TYPE,
                                                                IPC::Message::PRIORITY_NORMAL);
-  if (!m->WriteInt(GetCurrentProcessId())) {
+
+  // If we're waiting for our shared secret from the other end's hello message
+  // then don't give the game away by sending it in ours.
+  int32_t secret = waiting_for_shared_secret_ ? 0 : shared_secret_;
+
+  // Also, don't send if the value is zero (for IPC backwards compatability).
+  if (!m->WriteInt(GetCurrentProcessId()) ||
+      (secret && !m->WriteUInt32(secret)))
+  {
     CloseHandle(pipe_);
     pipe_ = INVALID_HANDLE_VALUE;
     return false;
@@ -338,8 +366,19 @@
 #endif
         if (m.routing_id() == MSG_ROUTING_NONE &&
             m.type() == HELLO_MESSAGE_TYPE) {
-          // The Hello message contains only the process id.
-          listener_->OnChannelConnected(MessageIterator(m).NextInt());
+          // The Hello message contains the process id and must include the
+          // shared secret, if we are waiting for it.
+          MessageIterator it = MessageIterator(m);
+          int32_t claimed_pid = it.NextInt();
+          if (waiting_for_shared_secret_ && (it.NextInt() != shared_secret_)) {
+            NOTREACHED();
+            // Something went wrong. Abort connection.
+            Close();
+            listener_->OnChannelError();
+            return false;
+          }
+          waiting_for_shared_secret_ = false;
+          listener_->OnChannelConnected(claimed_pid);
         } else {
           listener_->OnMessageReceived(m);
         }
@@ -502,4 +541,21 @@
   return channel_impl_->Unsound_NumQueuedMessages();
 }
 
+// static
+std::wstring Channel::GenerateVerifiedChannelID(const std::wstring& prefix) {
+  // Windows pipes can be enumerated by low-privileged processes. So, we
+  // append a strong random value after the \ character. This value is not
+  // included in the pipe name, but sent as part of the client hello, to
+  // prevent hijacking the pipe name to spoof the client.
+  std::wstring id = prefix;
+  if (!id.empty())
+    id.append(L".");
+  int secret;
+  do {  // Guarantee we get a non-zero value.
+    secret = base::RandInt(0, std::numeric_limits<int>::max());
+  } while (secret == 0);
+  id.append(GenerateUniqueRandomChannelID());
+  return id.append(StringPrintf(L"\\%d", secret));
+}
+
 }  // namespace IPC
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/ipc_channel_win.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/ipc_channel_win.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/chromium/src/chrome/common/ipc_channel_win.h	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/chromium/src/chrome/common/ipc_channel_win.h	2015-04-24 19:30:59.000000000 +0000
@@ -49,7 +49,8 @@
   void OutputQueuePush(Message* msg);
   void OutputQueuePop();
 
-  const std::wstring PipeName(const std::wstring& channel_id) const;
+  const std::wstring PipeName(const std::wstring& channel_id,
+                              int32_t* secret) const;
   bool CreatePipe(const std::wstring& channel_id, Mode mode);
   bool EnqueueHelloMessage();
 
@@ -108,6 +109,16 @@
 
   ScopedRunnableMethodFactory<ChannelImpl> factory_;
 
+  // This is a unique per-channel value used to authenticate the client end of
+  // a connection. If the value is non-zero, the client passes it in the hello
+  // and the host validates. (We don't send the zero value to preserve IPC
+  // compatibility with existing clients that don't validate the channel.)
+  int32_t shared_secret_;
+
+  // In server-mode, we wait for the channel at the other side of the pipe to
+  // send us back our shared secret, if we are using one.
+  bool waiting_for_shared_secret_;
+
   mozilla::UniquePtr<NonThreadSafe> thread_check_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelImpl);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/dbus/RawDBusConnection.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/dbus/RawDBusConnection.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/dbus/RawDBusConnection.h	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/dbus/RawDBusConnection.h	2015-04-24 19:30:59.000000000 +0000
@@ -10,7 +10,6 @@
 #include "mozilla/Scoped.h"
 
 struct DBusConnection;
-struct DBusError;
 struct DBusMessage;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/glue/GeckoChildProcessHost.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/glue/GeckoChildProcessHost.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/glue/GeckoChildProcessHost.h	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/glue/GeckoChildProcessHost.h	2015-04-24 19:30:59.000000000 +0000
@@ -23,8 +23,6 @@
 #include "sandboxBroker.h"
 #endif
 
-class nsIFile;
-
 namespace mozilla {
 namespace ipc {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/glue/nsIIPCSerializableInputStream.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/glue/nsIIPCSerializableInputStream.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/glue/nsIIPCSerializableInputStream.h	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/glue/nsIIPCSerializableInputStream.h	2015-04-24 19:30:59.000000000 +0000
@@ -8,7 +8,6 @@
 #include "nsISupports.h"
 #include "mozilla/Attributes.h"
 
-struct nsTArrayDefaultAllocator;
 template <class> class nsTArray;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/glue/Transport_posix.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/glue/Transport_posix.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/glue/Transport_posix.cpp	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/glue/Transport_posix.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -25,10 +25,7 @@
 CreateTransport(base::ProcessId /*unused*/,
                 TransportDescriptor* aOne, TransportDescriptor* aTwo)
 {
-  // Gecko doesn't care about this random ID, and the argument to this
-  // function isn't really necessary, it can be just any random
-  // pointer value
-  wstring id = ChildProcessInfo::GenerateRandomChannelID(aOne);
+  wstring id = IPC::Channel::GenerateVerifiedChannelID(std::wstring());
   // Use MODE_SERVER to force creation of the socketpair
   Transport t(id, Transport::MODE_SERVER, nullptr);
   int fd1 = t.GetFileDescriptor();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/glue/Transport_win.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/glue/Transport_win.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/glue/Transport_win.cpp	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/glue/Transport_win.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -22,9 +22,7 @@
 CreateTransport(base::ProcessId aProcIdOne,
                 TransportDescriptor* aOne, TransportDescriptor* aTwo)
 {
-  // This id is used to name the IPC pipe.  The pointer passed to this
-  // function isn't significant.
-  wstring id = ChildProcessInfo::GenerateRandomChannelID(aOne);
+  wstring id = IPC::Channel::GenerateVerifiedChannelID(std::wstring());
   // Use MODE_SERVER to force creation of the pipe
   Transport t(id, Transport::MODE_SERVER, nullptr);
   HANDLE serverPipe = t.GetServerPipeHandle();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/glue/WindowsMessageLoop.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/glue/WindowsMessageLoop.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/glue/WindowsMessageLoop.cpp	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/glue/WindowsMessageLoop.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -79,9 +79,6 @@
 namespace mozilla {
 namespace widget {
 extern UINT sAppShellGeckoMsgId;
-#ifdef MOZ_METRO
-extern UINT sDefaultBrowserMsgId;
-#endif
 }
 }
 
@@ -416,11 +413,6 @@
       if (uMsg && uMsg == mozilla::widget::sAppShellGeckoMsgId) {
         // Widget's registered native event callback
         deferred = new DeferredSendMessage(hwnd, uMsg, wParam, lParam);
-#ifdef MOZ_METRO
-      } else if (uMsg && uMsg == mozilla::widget::sDefaultBrowserMsgId) {
-        // Metro widget's system shutdown message
-        deferred = new DeferredSendMessage(hwnd, uMsg, wParam, lParam);
-#endif
       }
     }
   }
@@ -498,13 +490,6 @@
     return true;
   }
 
-#ifdef MOZ_METRO
-  // immersive UI ICoreWindow
-  if (className.EqualsLiteral("Windows.UI.Core.CoreWindow")) {
-    return true;
-  }
-#endif
-
   // Plugin windows that can trigger ipc calls in child:
   // 'ShockwaveFlashFullScreen' - flash fullscreen window
   // 'QTNSHIDDEN' - QuickTime
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/keystore/KeyStore.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/keystore/KeyStore.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/keystore/KeyStore.cpp	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/keystore/KeyStore.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -810,10 +810,9 @@
 }
 
 void
-KeyStore::StreamSocket::ReceiveSocketData(
-  nsAutoPtr<UnixSocketRawData>& aMessage)
+KeyStore::StreamSocket::ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer)
 {
-  mKeyStore->ReceiveSocketData(aMessage);
+  mKeyStore->ReceiveSocketData(aBuffer);
 }
 
 ConnectionOrientedSocketIO*
@@ -901,13 +900,13 @@
 }
 
 bool
-KeyStore::CheckSize(UnixSocketRawData *aMessage, size_t aExpectSize)
+KeyStore::CheckSize(UnixSocketBuffer *aMessage, size_t aExpectSize)
 {
   return (aMessage->GetSize() >= aExpectSize);
 }
 
 ResponseCode
-KeyStore::ReadCommand(UnixSocketRawData *aMessage)
+KeyStore::ReadCommand(UnixSocketBuffer *aMessage)
 {
   if (mHandlerInfo.state != STATE_IDLE) {
     NS_WARNING("Wrong state in ReadCommand()!");
@@ -946,7 +945,7 @@
 }
 
 ResponseCode
-KeyStore::ReadLength(UnixSocketRawData *aMessage)
+KeyStore::ReadLength(UnixSocketBuffer *aMessage)
 {
   if (mHandlerInfo.state != STATE_READ_PARAM_LEN) {
     NS_WARNING("Wrong state in ReadLength()!");
@@ -971,7 +970,7 @@
 }
 
 ResponseCode
-KeyStore::ReadData(UnixSocketRawData *aMessage)
+KeyStore::ReadData(UnixSocketBuffer *aMessage)
 {
   if (mHandlerInfo.state != STATE_READ_PARAM_DATA) {
     NS_WARNING("Wrong state in ReadData()!");
@@ -1029,7 +1028,7 @@
 }
 
 void
-KeyStore::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage)
+KeyStore::ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aMessage)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/keystore/KeyStore.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/keystore/KeyStore.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/keystore/KeyStore.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/keystore/KeyStore.h	2015-04-24 19:30:59.000000000 +0000
@@ -147,7 +147,7 @@
     void OnConnectError() override;
     void OnDisconnect() override;
 
-    void ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage) override;
+    void ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer) override;
 
     // ConnectionOrientedSocket
     //
@@ -160,7 +160,7 @@
 
   ~KeyStore();
 
-  void ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage);
+  void ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aMessage);
 
   void OnConnectSuccess(enum SocketType aSocketType);
   void OnConnectError(enum SocketType aSocketType);
@@ -176,10 +176,10 @@
   void ResetHandlerInfo();
   void Listen();
 
-  bool CheckSize(UnixSocketRawData *aMessage, size_t aExpectSize);
-  ResponseCode ReadCommand(UnixSocketRawData *aMessage);
-  ResponseCode ReadLength(UnixSocketRawData *aMessage);
-  ResponseCode ReadData(UnixSocketRawData *aMessage);
+  bool CheckSize(UnixSocketBuffer *aMessage, size_t aExpectSize);
+  ResponseCode ReadCommand(UnixSocketBuffer *aMessage);
+  ResponseCode ReadLength(UnixSocketBuffer *aMessage);
+  ResponseCode ReadData(UnixSocketBuffer *aMessage);
   void SendResponse(ResponseCode response);
   void SendData(const uint8_t *data, int length);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/nfc/Nfc.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/nfc/Nfc.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/nfc/Nfc.cpp	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/nfc/Nfc.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -188,12 +188,12 @@
 }
 
 void
-NfcConsumer::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aData)
+NfcConsumer::ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   if (mListener) {
-    mListener->ReceiveSocketData(aData);
+    mListener->ReceiveSocketData(aBuffer);
   }
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/nfc/Nfc.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/nfc/Nfc.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/nfc/Nfc.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/nfc/Nfc.h	2015-04-24 19:30:59.000000000 +0000
@@ -24,7 +24,7 @@
     STREAM_SOCKET
   };
 
-  virtual void ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aData) = 0;
+  virtual void ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aData) = 0;
 
   virtual void OnConnectSuccess(enum SocketType aSocketType) = 0;
   virtual void OnConnectError(enum SocketType aSocketType) = 0;
@@ -72,8 +72,7 @@
   ConnectionOrientedSocketIO* GetIO() override;
 
 private:
-  void ReceiveSocketData(
-    nsAutoPtr<UnixSocketRawData>& aData) override;
+  void ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer) override;
 
   void OnConnectSuccess() override;
   void OnConnectError() override;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/ril/Ril.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/ril/Ril.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/ril/Ril.cpp	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/ril/Ril.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -163,16 +163,16 @@
 class DispatchRILEvent final : public WorkerTask
 {
 public:
-  DispatchRILEvent(unsigned long aClient, UnixSocketRawData* aMessage)
+  DispatchRILEvent(unsigned long aClient, UnixSocketBuffer* aBuffer)
     : mClientId(aClient)
-    , mMessage(aMessage)
+    , mBuffer(aBuffer)
   { }
 
   bool RunTask(JSContext* aCx) override;
 
 private:
   unsigned long mClientId;
-  nsAutoPtr<UnixSocketRawData> mMessage;
+  nsAutoPtr<UnixSocketBuffer> mBuffer;
 };
 
 bool
@@ -181,14 +181,14 @@
   JS::Rooted<JSObject*> obj(aCx, JS::CurrentGlobalOrNull(aCx));
 
   JS::Rooted<JSObject*> array(aCx,
-                              JS_NewUint8Array(aCx, mMessage->GetSize()));
+                              JS_NewUint8Array(aCx, mBuffer->GetSize()));
   if (!array) {
     return false;
   }
   {
     JS::AutoCheckCannotGC nogc;
     memcpy(JS_GetArrayBufferViewData(array, nogc),
-           mMessage->GetData(), mMessage->GetSize());
+           mBuffer->GetData(), mBuffer->GetSize());
   }
 
   JS::AutoValueArray<2> args(aCx);
@@ -369,11 +369,11 @@
 }
 
 void
-RilConsumer::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage)
+RilConsumer::ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  nsRefPtr<DispatchRILEvent> dre(new DispatchRILEvent(mClientId, aMessage.forget()));
+  nsRefPtr<DispatchRILEvent> dre(new DispatchRILEvent(mClientId, aBuffer.forget()));
   mDispatcher->PostTask(dre);
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/ril/Ril.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/ril/Ril.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/ril/Ril.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/ril/Ril.h	2015-04-24 19:30:59.000000000 +0000
@@ -27,7 +27,7 @@
   RilConsumer(unsigned long aClientId,
               mozilla::dom::workers::WorkerCrossThreadDispatcher* aDispatcher);
 
-  void ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage) override;
+  void ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer) override;
 
   void OnConnectSuccess() override;
   void OnConnectError() override;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/unixsocket/SocketBase.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/unixsocket/SocketBase.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/unixsocket/SocketBase.cpp	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/unixsocket/SocketBase.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -18,10 +18,10 @@
 // UnixSocketIOBuffer
 //
 
-UnixSocketIOBuffer::UnixSocketIOBuffer(const void* aData, size_t aSize)
-: mSize(aSize)
-, mOffset(0)
-, mAvailableSpace(aSize)
+UnixSocketBuffer::UnixSocketBuffer(const void* aData, size_t aSize)
+  : mSize(aSize)
+  , mOffset(0)
+  , mAvailableSpace(aSize)
 {
   MOZ_ASSERT(aData || !mSize);
 
@@ -29,19 +29,19 @@
   memcpy(mData, aData, mSize);
 }
 
-UnixSocketIOBuffer::UnixSocketIOBuffer(size_t aAvailableSpace)
-: mSize(0)
-, mOffset(0)
-, mAvailableSpace(aAvailableSpace)
+UnixSocketBuffer::UnixSocketBuffer(size_t aAvailableSpace)
+  : mSize(0)
+  , mOffset(0)
+  , mAvailableSpace(aAvailableSpace)
 {
   mData = new uint8_t[mAvailableSpace];
 }
 
-UnixSocketIOBuffer::~UnixSocketIOBuffer()
+UnixSocketBuffer::~UnixSocketBuffer()
 { }
 
 const uint8_t*
-UnixSocketIOBuffer::Consume(size_t aLen)
+UnixSocketBuffer::Consume(size_t aLen)
 {
   if (NS_WARN_IF(GetSize() < aLen)) {
     return nullptr;
@@ -52,7 +52,7 @@
 }
 
 nsresult
-UnixSocketIOBuffer::Read(void* aValue, size_t aLen)
+UnixSocketBuffer::Read(void* aValue, size_t aLen)
 {
   const uint8_t* data = Consume(aLen);
   if (!data) {
@@ -63,7 +63,7 @@
 }
 
 uint8_t*
-UnixSocketIOBuffer::Append(size_t aLen)
+UnixSocketBuffer::Append(size_t aLen)
 {
   if (((mAvailableSpace - mSize) < aLen)) {
     size_t availableSpace = mAvailableSpace + std::max(mAvailableSpace, aLen);
@@ -78,7 +78,7 @@
 }
 
 nsresult
-UnixSocketIOBuffer::Write(const void* aValue, size_t aLen)
+UnixSocketBuffer::Write(const void* aValue, size_t aLen)
 {
   uint8_t* data = Append(aLen);
   if (!data) {
@@ -89,7 +89,7 @@
 }
 
 void
-UnixSocketIOBuffer::CleanupLeadingSpace()
+UnixSocketBuffer::CleanupLeadingSpace()
 {
   if (GetLeadingSpace()) {
     if (GetSize() <= GetLeadingSpace()) {
@@ -102,6 +102,21 @@
 }
 
 //
+// UnixSocketIOBuffer
+//
+
+UnixSocketIOBuffer::UnixSocketIOBuffer(const void* aData, size_t aSize)
+  : UnixSocketBuffer(aData, aSize)
+{ }
+
+UnixSocketIOBuffer::UnixSocketIOBuffer(size_t aAvailableSpace)
+  : UnixSocketBuffer(aAvailableSpace)
+{ }
+
+UnixSocketIOBuffer::~UnixSocketIOBuffer()
+{ }
+
+//
 // UnixSocketRawData
 //
 
@@ -268,13 +283,13 @@
 { }
 
 void
-SocketIOBase::EnqueueData(UnixSocketRawData* aData)
+SocketIOBase::EnqueueData(UnixSocketIOBuffer* aBuffer)
 {
-  if (!aData->GetSize()) {
-    delete aData; // delete empty data immediately
+  if (!aBuffer->GetSize()) {
+    delete aBuffer; // delete empty data immediately
     return;
   }
-  mOutgoingQ.AppendElement(aData);
+  mOutgoingQ.AppendElement(aBuffer);
 }
 
 bool
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/unixsocket/SocketBase.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/unixsocket/SocketBase.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/unixsocket/SocketBase.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/unixsocket/SocketBase.h	2015-04-24 19:30:59.000000000 +0000
@@ -23,12 +23,18 @@
 namespace ipc {
 
 //
-// UnixSocketIOBuffer
+// UnixSocketBuffer
 //
 
-class UnixSocketIOBuffer
+/**
+ * |UnixSocketBuffer| implements a FIFO buffer that stores raw socket
+ * data, either for sending on a socket or received from a socket.
+ */
+class UnixSocketBuffer
 {
 public:
+  virtual ~UnixSocketBuffer();
+
   const uint8_t* GetData() const
   {
     return mData + mOffset;
@@ -110,15 +116,13 @@
 protected:
 
   /* This constructor copies aData of aSize bytes length into the
-   * new instance of |UnixSocketIOBuffer|.
+   * new instance of |UnixSocketBuffer|.
    */
-  UnixSocketIOBuffer(const void* aData, size_t aSize);
+  UnixSocketBuffer(const void* aData, size_t aSize);
 
   /* This constructor reserves aAvailableSpace bytes of space.
    */
-  UnixSocketIOBuffer(size_t aAvailableSpace);
-
-  ~UnixSocketIOBuffer();
+  UnixSocketBuffer(size_t aAvailableSpace);
 
   size_t GetLeadingSpace() const
   {
@@ -165,6 +169,46 @@
 };
 
 //
+// UnixSocketIOBuffer
+//
+
+/**
+ * |UnixSocketIOBuffer| is a |UnixSocketBuffer| that supports being
+ * received on a socket or being send on a socket. Network protocols
+ * might differ in their exact usage of Unix socket functions and
+ * |UnixSocketIOBuffer| provides a protocol-neutral interface.
+ */
+class UnixSocketIOBuffer : public UnixSocketBuffer
+{
+public:
+  virtual ~UnixSocketIOBuffer();
+
+  /**
+   * Receives data from aFd at the end of the buffer. The returned value
+   * is the number of newly received bytes, or 0 if the peer shut down
+   * its connection, or a negative value on errors.
+   */
+  virtual ssize_t Receive(int aFd) = 0;
+
+  /**
+   * Sends data to aFd from the beginning of the buffer. The returned value
+   * is the number of bytes written, or a negative value on error.
+   */
+  virtual ssize_t Send(int aFd) = 0;
+
+protected:
+
+  /* This constructor copies aData of aSize bytes length into the
+   * new instance of |UnixSocketIOBuffer|.
+   */
+  UnixSocketIOBuffer(const void* aData, size_t aSize);
+
+  /* This constructor reserves aAvailableSpace bytes of space.
+   */
+  UnixSocketIOBuffer(size_t aAvailableSpace);
+};
+
+//
 // UnixSocketRawData
 //
 
@@ -186,13 +230,13 @@
    * is the number of newly received bytes, or 0 if the peer shut down
    * its connection, or a negative value on errors.
    */
-  ssize_t Receive(int aFd);
+  ssize_t Receive(int aFd) override;
 
   /**
    * Sends data to aFd from the beginning of the buffer. The returned value
    * is the number of bytes written, or a negative value on error.
    */
-  ssize_t Send(int aFd);
+  ssize_t Send(int aFd) override;
 };
 
 enum SocketConnectionStatus {
@@ -279,19 +323,17 @@
    * Function to be called whenever data is received. This is only called on the
    * main thread.
    *
-   * @param aMessage Data received from the socket.
+   * @param aBuffer Data received from the socket.
    */
-  virtual void ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage) = 0;
+  virtual void ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer) = 0;
 
   /**
    * Queue data to be sent to the socket on the IO thread. Can only be called on
    * originating thread.
    *
-   * @param aMessage Data to be sent to socket
-   *
-   * @return true if data is queued, false otherwise (i.e. not connected)
+   * @param aBuffer Data to be sent to socket
    */
-  virtual bool SendSocketData(UnixSocketRawData* aMessage) = 0;
+  virtual void SendSocketData(UnixSocketIOBuffer* aBuffer) = 0;
 };
 
 //
@@ -380,9 +422,9 @@
 class SocketIOReceiveRunnable final : public SocketIORunnable<T>
 {
 public:
-  SocketIOReceiveRunnable(T* aIO, UnixSocketRawData* aData)
-  : SocketIORunnable<T>(aIO)
-  , mData(aData)
+  SocketIOReceiveRunnable(T* aIO, UnixSocketBuffer* aBuffer)
+    : SocketIORunnable<T>(aIO)
+    , mBuffer(aBuffer)
   { }
 
   NS_IMETHOD Run() override
@@ -401,13 +443,13 @@
     SocketConsumerBase* consumer = io->GetConsumer();
     MOZ_ASSERT(consumer);
 
-    consumer->ReceiveSocketData(mData);
+    consumer->ReceiveSocketData(mBuffer);
 
     return NS_OK;
   }
 
 private:
-  nsAutoPtr<UnixSocketRawData> mData;
+  nsAutoPtr<UnixSocketBuffer> mBuffer;
 };
 
 template <typename T>
@@ -474,7 +516,7 @@
 public:
   virtual ~SocketIOBase();
 
-  void EnqueueData(UnixSocketRawData* aData);
+  void EnqueueData(UnixSocketIOBuffer* aBuffer);
   bool HasPendingData() const;
 
   template <typename T>
@@ -519,7 +561,7 @@
     MOZ_ASSERT(aIO);
 
     while (HasPendingData()) {
-      UnixSocketRawData* outgoing = mOutgoingQ.ElementAt(0);
+      UnixSocketIOBuffer* outgoing = mOutgoingQ.ElementAt(0);
 
       ssize_t res = outgoing->Send(aFd);
       if (res < 0) {
@@ -549,7 +591,7 @@
   /**
    * Raw data queue. Must be pushed/popped from I/O thread only.
    */
-  nsTArray<UnixSocketRawData*> mOutgoingQ;
+  nsTArray<UnixSocketIOBuffer*> mOutgoingQ;
 };
 
 //
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/unixsocket/StreamSocket.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/unixsocket/StreamSocket.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/unixsocket/StreamSocket.cpp	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/unixsocket/StreamSocket.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -7,7 +7,6 @@
 #include "StreamSocket.h"
 #include <fcntl.h>
 #include "mozilla/RefPtr.h"
-#include "mozilla/unused.h"
 #include "nsXULAppAPI.h"
 #include "UnixSocketConnector.h"
 
@@ -73,7 +72,7 @@
    */
   void Connect();
 
-  void Send(UnixSocketRawData* aData);
+  void Send(UnixSocketIOBuffer* aBuffer);
 
   // I/O callback methods
   //
@@ -327,7 +326,7 @@
 }
 
 void
-StreamSocketIO::Send(UnixSocketRawData* aData)
+StreamSocketIO::Send(UnixSocketIOBuffer* aData)
 {
   EnqueueData(aData);
   AddWatchers(WRITE_WATCHER, false);
@@ -558,20 +557,16 @@
   MOZ_ASSERT(!mIO);
 }
 
-bool
-StreamSocket::SendSocketData(UnixSocketRawData* aData)
+void
+StreamSocket::SendSocketData(UnixSocketIOBuffer* aBuffer)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (!mIO) {
-    return false;
-  }
+  MOZ_ASSERT(mIO);
 
   MOZ_ASSERT(!mIO->IsShutdownOnMainThread());
   XRE_GetIOMessageLoop()->PostTask(
     FROM_HERE,
-    new SocketIOSendTask<StreamSocketIO, UnixSocketRawData>(mIO, aData));
-
-  return true;
+    new SocketIOSendTask<StreamSocketIO, UnixSocketIOBuffer>(mIO, aBuffer));
 }
 
 bool
@@ -581,14 +576,7 @@
     return false;
   }
 
-  nsAutoPtr<UnixSocketRawData> data(
-    new UnixSocketRawData(aStr.BeginReading(), aStr.Length()));
-
-  if (!SendSocketData(data)) {
-    return false;
-  }
-
-  unused << data.forget();
+  SendSocketData(new UnixSocketRawData(aStr.BeginReading(), aStr.Length()));
 
   return true;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/unixsocket/StreamSocket.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/unixsocket/StreamSocket.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/ipc/unixsocket/StreamSocket.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/ipc/unixsocket/StreamSocket.h	2015-04-24 19:30:59.000000000 +0000
@@ -26,17 +26,17 @@
    * Queue data to be sent to the socket on the IO thread. Can only be called on
    * originating thread.
    *
-   * @param aMessage Data to be sent to socket
-   *
-   * @return true if data is queued, false otherwise (i.e. not connected)
+   * @param aBuffer Data to be sent to socket
    */
-  bool SendSocketData(UnixSocketRawData* aMessage);
+  void SendSocketData(UnixSocketIOBuffer* aBuffer);
 
   /**
    * Convenience function for sending strings to the socket (common in bluetooth
    * profile usage). Converts to a UnixSocketRawData struct. Can only be called
    * on originating thread.
    *
+   * TODO: Move this method into Bluetooth module.
+   *
    * @param aMessage String to be sent to socket
    *
    * @return true if data is queued, false otherwise (i.e. not connected)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/ipc/CPOWTimer.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/ipc/CPOWTimer.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/ipc/CPOWTimer.cpp	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/ipc/CPOWTimer.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -19,7 +19,7 @@
     if (!js::IsStopwatchActive(runtime))
         return;
 
-    js::PerformanceData *performance = js::GetPerformanceData(runtime);
+    js::PerformanceData* performance = js::GetPerformanceData(runtime);
     uint64_t duration = PR_IntervalToMicroseconds(PR_IntervalNow() - startInterval);
     performance->totalCPOWTime += duration;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/ipc/CPOWTimer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/ipc/CPOWTimer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/ipc/CPOWTimer.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/ipc/CPOWTimer.h	2015-04-24 19:30:59.000000000 +0000
@@ -10,8 +10,6 @@
 
 #include "prinrval.h"
 
-class JSObject;
-
 /**
  * A stopwatch measuring the duration of a CPOW call.
  *
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/ipc/JavaScriptShared.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/ipc/JavaScriptShared.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/ipc/JavaScriptShared.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/ipc/JavaScriptShared.h	2015-04-24 19:30:59.000000000 +0000
@@ -14,11 +14,6 @@
 #include "nsJSUtils.h"
 
 namespace mozilla {
-
-namespace dom {
-class CPOWManagerGetter;
-}
-
 namespace jsipc {
 
 class ObjectId {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/Class.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/Class.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/Class.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/Class.h	2015-04-24 19:30:59.000000000 +0000
@@ -24,6 +24,7 @@
  * object behavior and, e.g., allows custom slow layout.
  */
 
+struct JSAtomState;
 struct JSFreeOp;
 struct JSFunctionSpec;
 
@@ -31,7 +32,6 @@
 
 struct Class;
 class FreeOp;
-class PropertyName;
 class Shape;
 
 // This is equal to JSFunction::class_.  Use it in places where you don't want
@@ -282,6 +282,18 @@
 (* JSResolveOp)(JSContext* cx, JS::HandleObject obj, JS::HandleId id,
                 bool* resolvedp);
 
+// A class with a resolve hook can optionally have a mayResolve hook. This hook
+// must have no side effects and must return true for a given id if the resolve
+// hook may resolve this id. This is useful when we're doing a "pure" lookup: if
+// mayResolve returns false, we know we don't have to call the effectful resolve
+// hook.
+//
+// maybeObj, if non-null, is the object on which we're doing the lookup. This
+// can be nullptr: during JIT compilation we sometimes know the Class but not
+// the object.
+typedef bool
+(* JSMayResolveOp)(const JSAtomState& names, jsid id, JSObject* maybeObj);
+
 // Convert obj to the given type, returning true with the resulting value in
 // *vp on success, and returning false on error or exception.
 typedef bool
@@ -421,6 +433,7 @@
     JSSetterOp          setProperty;                                          \
     JSEnumerateOp       enumerate;                                            \
     JSResolveOp         resolve;                                              \
+    JSMayResolveOp      mayResolve;                                           \
     JSConvertOp         convert;                                              \
     FinalizeOpType      finalize;                                             \
     JSNative            call;                                                 \
@@ -689,6 +702,8 @@
               "Class and JSClass must be consistent");
 static_assert(offsetof(JSClass, resolve) == offsetof(Class, resolve),
               "Class and JSClass must be consistent");
+static_assert(offsetof(JSClass, mayResolve) == offsetof(Class, mayResolve),
+              "Class and JSClass must be consistent");
 static_assert(offsetof(JSClass, convert) == offsetof(Class, convert),
               "Class and JSClass must be consistent");
 static_assert(offsetof(JSClass, finalize) == offsetof(Class, finalize),
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/Debug.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/Debug.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/Debug.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/Debug.h	2015-04-24 19:30:59.000000000 +0000
@@ -12,10 +12,11 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Move.h"
+#include "mozilla/UniquePtr.h"
 
 #include "jspubtd.h"
 
+#include "js/GCAPI.h"
 #include "js/RootingAPI.h"
 #include "js/TypeDecls.h"
 
@@ -24,6 +25,9 @@
 }
 
 namespace JS {
+
+using mozilla::UniquePtr;
+
 namespace dbg {
 
 // Helping embedding code build objects for Debugger
@@ -262,6 +266,24 @@
 
 
 
+// Debugger and Garbage Collection Events
+// --------------------------------------
+//
+// The Debugger wants to report about its debuggees' GC cycles, however entering
+// JS after a GC is troublesome since SpiderMonkey will often do something like
+// force a GC and then rely on the nursery being empty. If we call into some
+// Debugger's hook after the GC, then JS runs and the nursery won't be
+// empty. Instead, we rely on embedders to call back into SpiderMonkey after a
+// GC and notify Debuggers to call their onGarbageCollection hook.
+
+
+// For each Debugger that observed a debuggee involved in the given GC event,
+// call its `onGarbageCollection` hook.
+JS_PUBLIC_API(bool)
+FireOnGarbageCollectionHook(JSContext* cx, GarbageCollectionEvent::Ptr&& data);
+
+
+
 // Handlers for observing Promises
 // -------------------------------
 //
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/GCAPI.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/GCAPI.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/GCAPI.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/GCAPI.h	2015-04-24 19:30:59.000000000 +0000
@@ -7,12 +7,18 @@
 #ifndef js_GCAPI_h
 #define js_GCAPI_h
 
+#include "mozilla/UniquePtr.h"
+#include "mozilla/Vector.h"
+
 #include "js/HeapAPI.h"
 
 namespace js {
 namespace gc {
 class GCRuntime;
 }
+namespace gcstats {
+struct Statistics;
+}
 }
 
 typedef enum JSGCMode {
@@ -42,6 +48,8 @@
 
 namespace JS {
 
+using mozilla::UniquePtr;
+
 #define GCREASONS(D)                            \
     /* Reasons internal to the JS engine */     \
     D(API)                                      \
@@ -254,6 +262,56 @@
 extern JS_PUBLIC_API(void)
 AbortIncrementalGC(JSRuntime* rt);
 
+namespace dbg {
+
+// The `JS::dbg::GarbageCollectionEvent` class is essentially a view of the
+// `js::gcstats::Statistics` data without the uber implementation-specific bits.
+// It should generally be palatable for web developers.
+class GarbageCollectionEvent
+{
+    // The major GC number of the GC cycle this data pertains to.
+    uint64_t majorGCNumber_;
+
+    // Reference to a non-owned, statically allocated C string. This is a very
+    // short reason explaining why a GC was triggered.
+    const char* reason;
+
+    // Reference to a nullable, non-owned, statically allocated C string. If the
+    // collection was forced to be non-incremental, this is a short reason of
+    // why the GC could not perform an incremental collection.
+    const char* nonincrementalReason;
+
+    // Represents a single slice of a possibly multi-slice incremental garbage
+    // collection.
+    struct Collection {
+        int64_t startTimestamp;
+        int64_t endTimestamp;
+    };
+
+    // The set of garbage collection slices that made up this GC cycle.
+    mozilla::Vector<Collection> collections;
+
+    GarbageCollectionEvent(const GarbageCollectionEvent& rhs) = delete;
+    GarbageCollectionEvent& operator=(const GarbageCollectionEvent& rhs) = delete;
+
+  public:
+    explicit GarbageCollectionEvent(uint64_t majorGCNum)
+        : majorGCNumber_(majorGCNum)
+        , reason(nullptr)
+        , nonincrementalReason(nullptr)
+        , collections()
+    { }
+
+    using Ptr = UniquePtr<GarbageCollectionEvent, DeletePolicy<GarbageCollectionEvent>>;
+    static Ptr Create(JSRuntime* rt, ::js::gcstats::Statistics& stats, uint64_t majorGCNumber);
+
+    JSObject* toJSObject(JSContext* cx) const;
+
+    uint64_t majorGCNumber() const { return majorGCNumber_; }
+};
+
+} // namespace dbg
+
 enum GCProgress {
     /*
      * During non-incremental GC, the GC is bracketed by JSGC_CYCLE_BEGIN/END
@@ -280,6 +338,8 @@
 
     char16_t* formatMessage(JSRuntime* rt) const;
     char16_t* formatJSON(JSRuntime* rt, uint64_t timestamp) const;
+
+    JS::dbg::GarbageCollectionEvent::Ptr toGCEvent(JSRuntime* rt) const;
 };
 
 typedef void
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/ProfilingFrameIterator.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/ProfilingFrameIterator.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/ProfilingFrameIterator.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/ProfilingFrameIterator.h	2015-04-24 19:30:59.000000000 +0000
@@ -14,7 +14,6 @@
 
 #include "js/Utility.h"
 
-class JSAtom;
 struct JSRuntime;
 
 namespace js {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/SliceBudget.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/SliceBudget.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/SliceBudget.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/SliceBudget.h	2015-04-24 19:30:59.000000000 +0000
@@ -33,6 +33,12 @@
  */
 struct JS_PUBLIC_API(SliceBudget)
 {
+    // Memory of the originally requested budget. If isUnlimited, neither of
+    // these are in use. If deadline==0, then workBudget is valid. Otherwise
+    // timeBudget is valid.
+    TimeBudget timeBudget;
+    WorkBudget workBudget;
+
     int64_t deadline; /* in microseconds */
     intptr_t counter;
 
@@ -64,10 +70,12 @@
         return checkOverBudget();
     }
 
-    bool isUnlimited() {
+    bool isUnlimited() const {
         return deadline == unlimitedDeadline;
     }
 
+    int describe(char* buffer, size_t maxlen) const;
+
   private:
     bool checkOverBudget();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/TracingAPI.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/TracingAPI.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/TracingAPI.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/TracingAPI.h	2015-04-24 19:30:59.000000000 +0000
@@ -219,7 +219,7 @@
 class AutoTracingName
 {
     CallbackTracer* trc_;
-    const char *prior_;
+    const char* prior_;
 
   public:
     AutoTracingName(CallbackTracer* trc, const char* name) : trc_(trc), prior_(trc->contextName_) {
@@ -290,7 +290,7 @@
 class AutoOriginalTraceLocation
 {
 #ifdef JS_GC_ZEAL
-    CallbackTracer *trc_;
+    CallbackTracer* trc_;
 
   public:
     template <typename T>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/UbiNode.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/UbiNode.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/UbiNode.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/UbiNode.h	2015-04-24 19:30:59.000000000 +0000
@@ -567,7 +567,6 @@
 
 // Define specializations for some commonly-used public JSAPI types.
 // These can use the generic templates above.
-template<> struct Concrete<JSString> : TracerConcrete<JSString> { };
 template<> struct Concrete<JS::Symbol> : TracerConcrete<JS::Symbol> { };
 template<> struct Concrete<JSScript> : TracerConcreteWithCompartment<JSScript> { };
 
@@ -586,6 +585,17 @@
     }
 };
 
+// For JSString, we extend the generic template with a 'size' implementation.
+template<> struct Concrete<JSString> : TracerConcrete<JSString> {
+    size_t size(mozilla::MallocSizeOf mallocSizeOf) const override;
+
+  protected:
+    explicit Concrete(JSString *ptr) : TracerConcrete<JSString>(ptr) { }
+
+  public:
+    static void construct(void *storage, JSString *ptr) { new (storage) Concrete(ptr); }
+};
+
 // The ubi::Node null pointer. Any attempt to operate on a null ubi::Node asserts.
 template<>
 class Concrete<void> : public Base {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/Utility.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/Utility.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/public/Utility.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/public/Utility.h	2015-04-24 19:30:59.000000000 +0000
@@ -405,23 +405,11 @@
 #  define STATIC_POSTCONDITION_ASSUME(COND) __attribute__((postcondition_assume(#COND)))
 #  define STATIC_INVARIANT(COND)            __attribute__((invariant(#COND)))
 #  define STATIC_INVARIANT_ASSUME(COND)     __attribute__((invariant_assume(#COND)))
-#  define STATIC_PASTE2(X,Y) X ## Y
-#  define STATIC_PASTE1(X,Y) STATIC_PASTE2(X,Y)
-#  define STATIC_ASSERT(COND)                        \
-  JS_BEGIN_MACRO                                     \
-    __attribute__((assert_static(#COND), unused))    \
-    int STATIC_PASTE1(assert_static_, __COUNTER__);  \
-  JS_END_MACRO
 #  define STATIC_ASSUME(COND)                        \
   JS_BEGIN_MACRO                                     \
     __attribute__((assume_static(#COND), unused))    \
     int STATIC_PASTE1(assume_static_, __COUNTER__);  \
   JS_END_MACRO
-#  define STATIC_ASSERT_RUNTIME(COND)                       \
-  JS_BEGIN_MACRO                                            \
-    __attribute__((assert_static_runtime(#COND), unused))   \
-    int STATIC_PASTE1(assert_static_runtime_, __COUNTER__); \
-  JS_END_MACRO
 # else /* XGILL_PLUGIN */
 #  define STATIC_PRECONDITION(COND)          /* nothing */
 #  define STATIC_PRECONDITION_ASSUME(COND)   /* nothing */
@@ -429,9 +417,7 @@
 #  define STATIC_POSTCONDITION_ASSUME(COND)  /* nothing */
 #  define STATIC_INVARIANT(COND)             /* nothing */
 #  define STATIC_INVARIANT_ASSUME(COND)      /* nothing */
-#  define STATIC_ASSERT(COND)          JS_BEGIN_MACRO /* nothing */ JS_END_MACRO
 #  define STATIC_ASSUME(COND)          JS_BEGIN_MACRO /* nothing */ JS_END_MACRO
-#  define STATIC_ASSERT_RUNTIME(COND)  JS_BEGIN_MACRO /* nothing */ JS_END_MACRO
 # endif /* XGILL_PLUGIN */
 # define STATIC_SKIP_INFERENCE STATIC_INVARIANT(skip_inference())
 #endif /* HAVE_STATIC_ANNOTATIONS */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/asmjs/AsmJSFrameIterator.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/asmjs/AsmJSFrameIterator.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/asmjs/AsmJSFrameIterator.h	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/asmjs/AsmJSFrameIterator.h	2015-04-24 19:30:59.000000000 +0000
@@ -24,7 +24,6 @@
 #include "js/ProfilingFrameIterator.h"
 
 class JSAtom;
-struct JSContext;
 
 namespace js {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/asmjs/AsmJSModule.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/asmjs/AsmJSModule.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/asmjs/AsmJSModule.cpp	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/asmjs/AsmJSModule.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -97,6 +97,10 @@
     pod.strict_ = strict;
     pod.usesSignalHandlers_ = canUseSignalHandlers;
 
+    // AsmJSCheckedImmediateRange should be defined to be at most the minimum
+    // heap length so that offsets can be folded into bounds checks.
+    MOZ_ASSERT(pod.minHeapLength_ - AsmJSCheckedImmediateRange <= pod.minHeapLength_);
+
     scriptSource_->incref();
 }
 
@@ -476,6 +480,13 @@
     JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_INDEX);
 }
 
+static void
+OnImpreciseConversion()
+{
+    JSContext* cx = JSRuntime::innermostAsmJSActivation()->cx();
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SIMD_FAILED_CONVERSION);
+}
+
 static bool
 AsmJSHandleExecutionInterrupt()
 {
@@ -672,6 +683,8 @@
         return RedirectCall(FuncCast(OnDetached), Args_General0);
       case AsmJSImm_OnOutOfBounds:
         return RedirectCall(FuncCast(OnOutOfBounds), Args_General0);
+      case AsmJSImm_OnImpreciseConversion:
+        return RedirectCall(FuncCast(OnImpreciseConversion), Args_General0);
       case AsmJSImm_HandleExecutionInterrupt:
         return RedirectCall(FuncCast(AsmJSHandleExecutionInterrupt), Args_General0);
       case AsmJSImm_InvokeFromAsmJS_Ignore:
@@ -994,6 +1007,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     AsmJSModuleObject_finalize,
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -570,14 +570,14 @@
 
     uintptr_t result = address.disp();
 
-    if (address.base() != Registers::Invalid) {
+    if (address.hasBase()) {
         uintptr_t base;
         StoreValueFromGPReg(&base, sizeof(uintptr_t),
                             AddressOfGPRegisterSlot(context, address.base()));
         result += base;
     }
 
-    if (address.index() != Registers::Invalid) {
+    if (address.hasIndex()) {
         uintptr_t index;
         StoreValueFromGPReg(&index, sizeof(uintptr_t),
                             AddressOfGPRegisterSlot(context, address.index()));
@@ -608,15 +608,15 @@
     // Check x64 asm.js heap access invariants.
     MOZ_RELEASE_ASSERT(address.disp() >= 0);
     MOZ_RELEASE_ASSERT(address.base() == HeapReg.code());
-    MOZ_RELEASE_ASSERT(address.index() != HeapReg.code());
+    MOZ_RELEASE_ASSERT(!address.hasIndex() || address.index() != HeapReg.code());
     MOZ_RELEASE_ASSERT(address.scale() == 0);
-    if (address.base() != Registers::Invalid) {
+    if (address.hasBase()) {
         uintptr_t base;
         StoreValueFromGPReg(&base, sizeof(uintptr_t),
                             AddressOfGPRegisterSlot(context, address.base()));
         MOZ_RELEASE_ASSERT(reinterpret_cast<uint8_t*>(base) == module.maybeHeap());
     }
-    if (address.index() != Registers::Invalid) {
+    if (address.hasIndex()) {
         uintptr_t index;
         StoreValueFromGPReg(&index, sizeof(uintptr_t),
                             AddressOfGPRegisterSlot(context, address.index()));
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/asmjs/AsmJSValidate.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/asmjs/AsmJSValidate.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/asmjs/AsmJSValidate.cpp	2015-04-22 13:05:34.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/asmjs/AsmJSValidate.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -1405,6 +1405,7 @@
     NonAssertingLabel              syncInterruptLabel_;
     NonAssertingLabel              onDetachedLabel_;
     NonAssertingLabel              onOutOfBoundsLabel_;
+    NonAssertingLabel              onConversionErrorLabel_;
 
     UniquePtr<char[], JS::FreePolicy> errorString_;
     uint32_t                       errorOffset_;
@@ -1624,6 +1625,7 @@
     Label& syncInterruptLabel() { return syncInterruptLabel_; }
     Label& onDetachedLabel() { return onDetachedLabel_; }
     Label& onOutOfBoundsLabel() { return onOutOfBoundsLabel_; }
+    Label& onConversionErrorLabel() { return onConversionErrorLabel_; }
     bool hasError() const { return errorString_ != nullptr; }
     const AsmJSModule& module() const { return *module_.get(); }
     bool usesSignalHandlersForInterrupt() const { return module_->usesSignalHandlersForInterrupt(); }
@@ -2525,6 +2527,7 @@
                                            options, alloc_,
                                            graph_, info_, optimizationInfo,
                                            &m().onOutOfBoundsLabel(),
+                                           &m().onConversionErrorLabel(),
                                            m().usesSignalHandlersForOOB());
 
         if (!newBlock(/* pred = */ nullptr, &curBlock_, fn_))
@@ -5950,10 +5953,10 @@
 
       case AsmJSSimdOperation_fromInt32x4:
         return CheckSimdCast<MSimdConvert>(f, call, AsmJSSimdType_int32x4, opType, def, type);
-      case AsmJSSimdOperation_fromInt32x4Bits:
-        return CheckSimdCast<MSimdReinterpretCast>(f, call, AsmJSSimdType_int32x4, opType, def, type);
       case AsmJSSimdOperation_fromFloat32x4:
         return CheckSimdCast<MSimdConvert>(f, call, AsmJSSimdType_float32x4, opType, def, type);
+      case AsmJSSimdOperation_fromInt32x4Bits:
+        return CheckSimdCast<MSimdReinterpretCast>(f, call, AsmJSSimdType_int32x4, opType, def, type);
       case AsmJSSimdOperation_fromFloat32x4Bits:
         return CheckSimdCast<MSimdReinterpretCast>(f, call, AsmJSSimdType_float32x4, opType, def, type);
 
@@ -9035,10 +9038,10 @@
 }
 
 static bool
-GenerateOnOutOfBoundsLabelExit(ModuleCompiler& m, Label* throwLabel)
+GenerateExceptionLabelExit(ModuleCompiler& m, Label* throwLabel, Label* exit, AsmJSImmKind func)
 {
     MacroAssembler& masm = m.masm();
-    masm.bind(&m.onOutOfBoundsLabel());
+    masm.bind(exit);
 
     // sp can be anything at this point, so ensure it is aligned when calling
     // into C++.  We unconditionally jump to throw so don't worry about restoring sp.
@@ -9046,10 +9049,10 @@
 
     // OnOutOfBounds always throws.
     masm.assertStackAlignment(ABIStackAlignment);
-    masm.call(AsmJSImmPtr(AsmJSImm_OnOutOfBounds));
+    masm.call(AsmJSImmPtr(func));
     masm.jump(throwLabel);
 
-    return m.finishGeneratingInlineStub(&m.onOutOfBoundsLabel()) && !masm.oom();
+    return m.finishGeneratingInlineStub(exit) && !masm.oom();
 }
 
 static const LiveRegisterSet AllRegsExceptSP(
@@ -9290,7 +9293,9 @@
     if (m.onDetachedLabel().used() && !GenerateOnDetachedLabelExit(m, &throwLabel))
         return false;
 
-    if (!GenerateOnOutOfBoundsLabelExit(m, &throwLabel))
+    if (!GenerateExceptionLabelExit(m, &throwLabel, &m.onOutOfBoundsLabel(), AsmJSImm_OnOutOfBounds))
+        return false;
+    if (!GenerateExceptionLabelExit(m, &throwLabel, &m.onConversionErrorLabel(), AsmJSImm_OnImpreciseConversion))
         return false;
 
     if (!GenerateAsyncInterruptExit(m, &throwLabel))
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/asmjs/AsmJSValidate.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/asmjs/AsmJSValidate.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/asmjs/AsmJSValidate.h	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/asmjs/AsmJSValidate.h	2015-04-24 19:30:59.000000000 +0000
@@ -67,12 +67,12 @@
 // the internal ArrayBuffer data array is inflated to 4GiB (only the
 // byteLength portion of which is accessible) so that out-of-bounds accesses
 // (made using a uint32 index) are guaranteed to raise a SIGSEGV.
-// Then, an additional extent is added to permit folding of small immediate
+// Then, an additional extent is added to permit folding of immediate
 // values into addresses. And finally, unaligned accesses and mask optimizations
 // might also try to access a few bytes after this limit, so just inflate it by
 // AsmJSPageSize.
 static const size_t AsmJSMappedSize = 4 * 1024ULL * 1024ULL * 1024ULL +
-                                      jit::AsmJSCheckedImmediateRange +
+                                      jit::AsmJSImmediateRange +
                                       AsmJSPageSize;
 
 #endif // defined(ASMJS_MAY_USE_SIGNAL_HANDLERS_FOR_OOB)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/Intl.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/Intl.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/Intl.cpp	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/Intl.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -565,6 +565,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     collator_finalize
 };
@@ -1057,6 +1058,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     numberFormat_finalize
 };
@@ -1516,6 +1518,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     dateTimeFormat_finalize
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/MapObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/MapObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/MapObject.cpp	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/MapObject.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -880,6 +880,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     MapIteratorObject::finalize
 };
@@ -1024,6 +1025,7 @@
     nullptr, // setProperty
     nullptr, // enumerate
     nullptr, // resolve
+    nullptr, // mayResolve
     nullptr, // convert
     finalize,
     nullptr, // call
@@ -1616,6 +1618,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     SetIteratorObject::finalize
 };
@@ -1756,6 +1759,7 @@
     nullptr, // setProperty
     nullptr, // enumerate
     nullptr, // resolve
+    nullptr, // mayResolve
     nullptr, // convert
     finalize,
     nullptr, // call
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/Object.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/Object.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/Object.cpp	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/Object.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -1189,6 +1189,7 @@
     nullptr,  /* setProperty */
     nullptr,  /* enumerate */
     nullptr,  /* resolve */
+    nullptr,  /* mayResolve */
     nullptr,  /* convert */
     nullptr,  /* finalize */
     nullptr,  /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/SIMD.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/SIMD.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/SIMD.cpp	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/SIMD.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -14,6 +14,7 @@
 #include "builtin/SIMD.h"
 
 #include "mozilla/IntegerTypeTraits.h"
+
 #include "jsapi.h"
 #include "jsfriendapi.h"
 
@@ -180,6 +181,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     TypeDescr::finalize,
     call
@@ -488,126 +490,135 @@
 // Unary SIMD operators
 template<typename T>
 struct Identity {
-    static inline T apply(T x) { return x; }
+    static T apply(T x) { return x; }
 };
 template<typename T>
 struct Abs {
-    static inline T apply(T x) { return mozilla::Abs(x); }
+    static T apply(T x) { return mozilla::Abs(x); }
 };
 template<typename T>
 struct Neg {
-    static inline T apply(T x) { return -1 * x; }
+    static T apply(T x) { return -1 * x; }
 };
 template<typename T>
 struct Not {
-    static inline T apply(T x) { return ~x; }
+    static T apply(T x) { return ~x; }
 };
 template<typename T>
 struct RecApprox {
-    static inline T apply(T x) { return 1 / x; }
+    static T apply(T x) { return 1 / x; }
 };
 template<typename T>
 struct RecSqrtApprox {
-    static inline T apply(T x) { return 1 / sqrt(x); }
+    static T apply(T x) { return 1 / sqrt(x); }
 };
 template<typename T>
 struct Sqrt {
-    static inline T apply(T x) { return sqrt(x); }
+    static T apply(T x) { return sqrt(x); }
 };
 
 // Binary SIMD operators
 template<typename T>
 struct Add {
-    static inline T apply(T l, T r) { return l + r; }
+    static T apply(T l, T r) { return l + r; }
 };
 template<typename T>
 struct Sub {
-    static inline T apply(T l, T r) { return l - r; }
+    static T apply(T l, T r) { return l - r; }
 };
 template<typename T>
 struct Div {
-    static inline T apply(T l, T r) { return l / r; }
+    static T apply(T l, T r) { return l / r; }
 };
 template<typename T>
 struct Mul {
-    static inline T apply(T l, T r) { return l * r; }
+    static T apply(T l, T r) { return l * r; }
 };
 template<typename T>
 struct Minimum {
-    static inline T apply(T l, T r) { return math_min_impl(l, r); }
+    static T apply(T l, T r) { return math_min_impl(l, r); }
 };
 template<typename T>
 struct MinNum {
-    static inline T apply(T l, T r) { return IsNaN(l) ? r : (IsNaN(r) ? l : math_min_impl(l, r)); }
+    static T apply(T l, T r) { return IsNaN(l) ? r : (IsNaN(r) ? l : math_min_impl(l, r)); }
 };
 template<typename T>
 struct Maximum {
-    static inline T apply(T l, T r) { return math_max_impl(l, r); }
+    static T apply(T l, T r) { return math_max_impl(l, r); }
 };
 template<typename T>
 struct MaxNum {
-    static inline T apply(T l, T r) { return IsNaN(l) ? r : (IsNaN(r) ? l : math_max_impl(l, r)); }
+    static T apply(T l, T r) { return IsNaN(l) ? r : (IsNaN(r) ? l : math_max_impl(l, r)); }
 };
 template<typename T>
 struct LessThan {
-    static inline int32_t apply(T l, T r) { return l < r ? 0xFFFFFFFF : 0x0; }
+    static int32_t apply(T l, T r) { return l < r ? 0xFFFFFFFF : 0x0; }
 };
 template<typename T>
 struct LessThanOrEqual {
-    static inline int32_t apply(T l, T r) { return l <= r ? 0xFFFFFFFF : 0x0; }
+    static int32_t apply(T l, T r) { return l <= r ? 0xFFFFFFFF : 0x0; }
 };
 template<typename T>
 struct GreaterThan {
-    static inline int32_t apply(T l, T r) { return l > r ? 0xFFFFFFFF : 0x0; }
+    static int32_t apply(T l, T r) { return l > r ? 0xFFFFFFFF : 0x0; }
 };
 template<typename T>
 struct GreaterThanOrEqual {
-    static inline int32_t apply(T l, T r) { return l >= r ? 0xFFFFFFFF : 0x0; }
+    static int32_t apply(T l, T r) { return l >= r ? 0xFFFFFFFF : 0x0; }
 };
 template<typename T>
 struct Equal {
-    static inline int32_t apply(T l, T r) { return l == r ? 0xFFFFFFFF : 0x0; }
+    static int32_t apply(T l, T r) { return l == r ? 0xFFFFFFFF : 0x0; }
 };
 template<typename T>
 struct NotEqual {
-    static inline int32_t apply(T l, T r) { return l != r ? 0xFFFFFFFF : 0x0; }
+    static int32_t apply(T l, T r) { return l != r ? 0xFFFFFFFF : 0x0; }
 };
 template<typename T>
 struct Xor {
-    static inline T apply(T l, T r) { return l ^ r; }
+    static T apply(T l, T r) { return l ^ r; }
 };
 template<typename T>
 struct And {
-    static inline T apply(T l, T r) { return l & r; }
+    static T apply(T l, T r) { return l & r; }
 };
 template<typename T>
 struct Or {
-    static inline T apply(T l, T r) { return l | r; }
+    static T apply(T l, T r) { return l | r; }
 };
 template<typename T>
 struct WithX {
-    static inline T apply(int32_t lane, T scalar, T x) { return lane == 0 ? scalar : x; }
+    static T apply(int32_t lane, T scalar, T x) { return lane == 0 ? scalar : x; }
 };
 template<typename T>
 struct WithY {
-    static inline T apply(int32_t lane, T scalar, T x) { return lane == 1 ? scalar : x; }
+    static T apply(int32_t lane, T scalar, T x) { return lane == 1 ? scalar : x; }
 };
 template<typename T>
 struct WithZ {
-    static inline T apply(int32_t lane, T scalar, T x) { return lane == 2 ? scalar : x; }
+    static T apply(int32_t lane, T scalar, T x) { return lane == 2 ? scalar : x; }
 };
 template<typename T>
 struct WithW {
-    static inline T apply(int32_t lane, T scalar, T x) { return lane == 3 ? scalar : x; }
+    static T apply(int32_t lane, T scalar, T x) { return lane == 3 ? scalar : x; }
 };
+// For the following three operators, if the value v we're trying to shift is
+// such that v << bits can't fit in the int32 range, then we have undefined
+// behavior, according to C++11 [expr.shift]p2.
 struct ShiftLeft {
-    static inline int32_t apply(int32_t v, int32_t bits) { return v << bits; }
+    static int32_t apply(int32_t v, int32_t bits) {
+        return uint32_t(bits) >= 32 ? 0 : v << bits;
+    }
 };
-struct ShiftRight {
-    static inline int32_t apply(int32_t v, int32_t bits) { return v >> bits; }
+struct ShiftRightArithmetic {
+    static int32_t apply(int32_t v, int32_t bits) {
+        return v >> (uint32_t(bits) >= 32 ? 31 : bits);
+    }
 };
 struct ShiftRightLogical {
-    static inline int32_t apply(int32_t v, int32_t bits) { return uint32_t(v) >> (bits & 31); }
+    static int32_t apply(int32_t v, int32_t bits) {
+        return uint32_t(bits) >= 32 ? 0 : uint32_t(v) >> bits;
+    }
 };
 }
 
@@ -812,6 +823,62 @@
     return StoreResult<Int32x4>(cx, args, result);
 }
 
+// This struct defines whether we should throw during a conversion attempt,
+// when trying to convert a value of type from From to the type To.  This
+// happens whenever a C++ conversion would have undefined behavior (and perhaps
+// be platform-dependent).
+template<typename From, typename To>
+struct ThrowOnConvert;
+
+struct NeverThrow
+{
+    static bool value(int32_t v) {
+        return false;
+    }
+};
+
+// While int32 to float conversions can be lossy, these conversions have
+// defined behavior in C++, so we don't need to care about them here. In practice,
+// this means round to nearest, tie with even (zero bit in significand).
+template<>
+struct ThrowOnConvert<int32_t, float> : public NeverThrow {};
+
+// All int32 can be safely converted to doubles.
+template<>
+struct ThrowOnConvert<int32_t, double> : public NeverThrow {};
+
+// All floats can be safely converted to doubles.
+template<>
+struct ThrowOnConvert<float, double> : public NeverThrow {};
+
+// Double to float conversion for inputs which aren't in the float range are
+// undefined behavior in C++, but they're defined in IEEE754.
+template<>
+struct ThrowOnConvert<double, float> : public NeverThrow {};
+
+// Float to integer conversions have undefined behavior if the float value
+// is out of the representable integer range (on x86, will yield the undefined
+// value pattern, namely 0x80000000; on arm, will clamp the input value), so
+// check this here.
+template<typename From, typename IntegerType>
+struct ThrowIfNotInRange
+{
+    static_assert(mozilla::IsIntegral<IntegerType>::value, "bad destination type");
+
+    static bool value(From v) {
+        double d(v);
+        return mozilla::IsNaN(d) ||
+               d < double(mozilla::MinValue<IntegerType>::value) ||
+               d > double(mozilla::MaxValue<IntegerType>::value);
+    }
+};
+
+template<>
+struct ThrowOnConvert<double, int32_t> : public ThrowIfNotInRange<double, int32_t> {};
+
+template<>
+struct ThrowOnConvert<float, int32_t> : public ThrowIfNotInRange<float, int32_t> {};
+
 template<typename V, typename Vret>
 static bool
 FuncConvert(JSContext* cx, unsigned argc, Value* vp)
@@ -824,9 +891,20 @@
         return ErrorBadArgs(cx);
 
     Elem* val = TypedObjectMemory<Elem*>(args[0]);
+
     RetElem result[Vret::lanes];
-    for (unsigned i = 0; i < Vret::lanes; i++)
-        result[i] = i < V::lanes ? ConvertScalar<RetElem>(val[i]) : 0;
+    for (unsigned i = 0; i < Min(V::lanes, Vret::lanes); i++) {
+        if (ThrowOnConvert<Elem, RetElem>::value(val[i])) {
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                                 JSMSG_SIMD_FAILED_CONVERSION);
+            return false;
+        }
+        result[i] = ConvertScalar<RetElem>(val[i]);
+    }
+
+    // Fill remaining lanes with 0
+    for (unsigned i = V::lanes; i < Vret::lanes; i++)
+        result[i] = 0;
 
     return StoreResult<Vret>(cx, args, result);
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/SIMD.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/SIMD.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/SIMD.h	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/SIMD.h	2015-04-24 19:31:00.000000000 +0000
@@ -157,7 +157,7 @@
   V(or, (BinaryFunc<Int32x4, Or, Int32x4>), 2)                                        \
   V(sub, (BinaryFunc<Int32x4, Sub, Int32x4>), 2)                                      \
   V(shiftLeftByScalar, (Int32x4BinaryScalar<ShiftLeft>), 2)                           \
-  V(shiftRightArithmeticByScalar, (Int32x4BinaryScalar<ShiftRight>), 2)               \
+  V(shiftRightArithmeticByScalar, (Int32x4BinaryScalar<ShiftRightArithmetic>), 2)     \
   V(shiftRightLogicalByScalar, (Int32x4BinaryScalar<ShiftRightLogical>), 2)           \
   V(store,    (Store<Int32x4, 4>), 3)                                                 \
   V(storeXYZ, (Store<Int32x4, 3>), 3)                                                 \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/SymbolObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/SymbolObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/SymbolObject.cpp	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/SymbolObject.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -25,6 +25,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     convert
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/TestingFunctions.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/TestingFunctions.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/TestingFunctions.cpp	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/TestingFunctions.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -211,7 +211,7 @@
     if (!JS_SetProperty(cx, info, "moz-memory", value))
         return false;
 
-    value.setInt32(sizeof(void *));
+    value.setInt32(sizeof(void*));
     if (!JS_SetProperty(cx, info, "pointer-byte-size", value))
         return false;
 
@@ -1154,6 +1154,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     finalize_counter_finalize
 };
@@ -1835,6 +1836,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     Finalize
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/TypedArray.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/TypedArray.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/TypedArray.js	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/TypedArray.js	2015-04-24 19:31:00.000000000 +0000
@@ -2,6 +2,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/. */
 
+#include "TypedObjectConstants.h"
+
 // ES6 draft 20150304 %TypedArray%.prototype.copyWithin
 function TypedArrayCopyWithin(target, start, end = undefined) {
     // This function is not generic.
@@ -649,6 +651,142 @@
     return O;
 }
 
+function ViewedArrayBufferIfReified(tarray) {
+    assert(IsTypedArray(tarray), "non-typed array asked for its buffer");
+
+    var buf = UnsafeGetReservedSlot(tarray, JS_TYPEDARRAYLAYOUT_BUFFER_SLOT);
+    assert(buf === null || (IsObject(buf) && IsArrayBuffer(buf)),
+           "unexpected value in buffer slot");
+    return buf;
+}
+
+function IsDetachedBuffer(buffer) {
+    // Typed arrays whose buffers are null use inline storage and can't have
+    // been neutered.
+    if (buffer === null)
+        return false;
+
+    assert(IsArrayBuffer(buffer),
+           "non-ArrayBuffer passed to IsDetachedBuffer");
+
+    var flags = UnsafeGetInt32FromReservedSlot(buffer, JS_ARRAYBUFFER_FLAGS_SLOT);
+    return (flags & JS_ARRAYBUFFER_NEUTERED_FLAG) !== 0;
+}
+
+// ES6 draft 20150220 22.2.3.22.1 %TypedArray%.prototype.set(array [, offset])
+function SetFromNonTypedArray(target, array, targetOffset, targetLength, targetBuffer) {
+    assert(!IsPossiblyWrappedTypedArray(array),
+           "typed arrays must be passed to SetFromTypedArray");
+
+    // Steps 1-11 provided by caller.
+
+    // Steps 16-17.
+    var src = ToObject(array);
+
+    // Steps 18-19.
+    var srcLength = ToLength(src.length);
+
+    // Step 20.
+    var limitOffset = targetOffset + srcLength;
+    if (limitOffset > targetLength)
+        ThrowRangeError(JSMSG_BAD_INDEX);
+
+    // Step 22.
+    var k = 0;
+
+    // Steps 12-15, 21, 23-24.
+    while (targetOffset < limitOffset) {
+        // Steps 24a-c.
+        var kNumber = ToNumber(src[k]);
+
+        // Step 24d.  This explicit check will be unnecessary when we implement
+        // throw-on-getting/setting-element-in-detached-buffer semantics.
+        if (targetBuffer === null) {
+            // A typed array previously using inline storage may acquire a
+            // buffer, so we must check with the source.
+            targetBuffer = ViewedArrayBufferIfReified(target);
+        }
+        if (IsDetachedBuffer(targetBuffer))
+            ThrowTypeError(JSMSG_TYPED_ARRAY_DETACHED);
+
+        // Step 24e.
+        target[targetOffset] = kNumber;
+
+        // Steps 24f-g.
+        k++;
+        targetOffset++;
+    }
+
+    // Step 25.
+    return undefined;
+}
+
+// ES6 draft 20150220 22.2.3.22.2 %TypedArray%.prototype.set(typedArray [, offset])
+function SetFromTypedArray(target, typedArray, targetOffset, targetLength) {
+    assert(IsPossiblyWrappedTypedArray(typedArray),
+           "only typed arrays may be passed to this method");
+
+    // Steps 1-11 provided by caller.
+
+    // Steps 12-24.
+    var res = SetFromTypedArrayApproach(target, typedArray, targetOffset,
+                                        targetLength | 0);
+    assert(res === JS_SETTYPEDARRAY_SAME_TYPE ||
+           res === JS_SETTYPEDARRAY_OVERLAPPING ||
+           res === JS_SETTYPEDARRAY_DISJOINT,
+           "intrinsic didn't return one of its enumerated return values");
+
+    // If the elements had the same type, then SetFromTypedArrayApproach also
+    // performed step 29.
+    if (res == JS_SETTYPEDARRAY_SAME_TYPE)
+        return undefined; // Step 25: done.
+
+    // Otherwise, all checks and side effects except the actual element-writing
+    // happened.  Either we're assigning from one range to a non-overlapping
+    // second range, or we're not.
+
+    if (res === JS_SETTYPEDARRAY_DISJOINT) {
+        SetDisjointTypedElements(target, targetOffset | 0, typedArray);
+        return undefined; // Step 25: done.
+    }
+
+    // Now the hard case: overlapping memory ranges.  Delegate to yet another
+    // intrinsic.
+    SetOverlappingTypedElements(target, targetOffset | 0, typedArray);
+
+    // Step 25.
+    return undefined;
+}
+
+// ES6 draft 20150304 %TypedArray%.prototype.set
+function TypedArraySet(overloaded, offset) {
+    // Steps 2-5, either algorithm.
+    var target = this;
+    if (!IsObject(target) || !IsTypedArray(target)) {
+        return callFunction(CallTypedArrayMethodIfWrapped,
+                            target, overloaded, offset, "TypedArraySet");
+    }
+
+    // Steps 6-8, either algorithm.
+    var targetOffset = ToInteger(offset);
+    if (targetOffset < 0)
+        ThrowRangeError(JSMSG_TYPED_ARRAY_NEGATIVE_ARG, "2");
+
+    // Steps 9-10.
+    var targetBuffer = ViewedArrayBufferIfReified(target);
+    if (IsDetachedBuffer(targetBuffer))
+        ThrowTypeError(JSMSG_TYPED_ARRAY_DETACHED);
+
+    // Step 11.
+    var targetLength = TypedArrayLength(target);
+
+    // Steps 12 et seq.
+    if (IsPossiblyWrappedTypedArray(overloaded))
+        return SetFromTypedArray(target, overloaded, targetOffset, targetLength);
+
+    return SetFromNonTypedArray(target, overloaded, targetOffset, targetLength, targetBuffer);
+}
+
 // ES6 draft rev32 (2015-02-02) 22.2.3.23 %TypedArray%.prototype.slice(start, end).
 function TypedArraySlice(start, end) {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/TypedObjectConstants.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/TypedObjectConstants.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/TypedObjectConstants.h	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/TypedObjectConstants.h	2015-04-24 19:31:00.000000000 +0000
@@ -10,6 +10,27 @@
 #define builtin_TypedObjectConstants_h
 
 ///////////////////////////////////////////////////////////////////////////
+// Values to be returned by SetFromTypedArrayApproach
+
+#define JS_SETTYPEDARRAY_SAME_TYPE 0
+#define JS_SETTYPEDARRAY_OVERLAPPING 1
+#define JS_SETTYPEDARRAY_DISJOINT 2
+
+///////////////////////////////////////////////////////////////////////////
+// Slots for objects using the typed array layout
+
+#define JS_TYPEDARRAYLAYOUT_BUFFER_SLOT 0
+#define JS_TYPEDARRAYLAYOUT_LENGTH_SLOT 1
+#define JS_TYPEDARRAYLAYOUT_BYTEOFFSET_SLOT 2
+
+///////////////////////////////////////////////////////////////////////////
+// Slots and flags for ArrayBuffer objects
+
+#define JS_ARRAYBUFFER_FLAGS_SLOT            3
+
+#define JS_ARRAYBUFFER_NEUTERED_FLAG 0x4
+
+///////////////////////////////////////////////////////////////////////////
 // Slots for typed prototypes
 
 #define JS_TYPROTO_SLOTS                 0
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/TypedObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/TypedObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/builtin/TypedObject.cpp	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/builtin/TypedObject.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -224,6 +224,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     TypeDescr::finalize,
     ScalarTypeDescr::call
@@ -321,6 +322,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     TypeDescr::finalize,
     ReferenceTypeDescr::call
@@ -500,6 +502,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     TypeDescr::finalize,
     nullptr, /* call */
@@ -727,6 +730,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     TypeDescr::finalize,
     nullptr, /* call */
@@ -2246,6 +2250,7 @@
         nullptr,        /* setProperty */                \
         nullptr,        /* enumerate   */                \
         nullptr,        /* resolve     */                \
+        nullptr,        /* mayResolve  */                \
         nullptr,        /* convert     */                \
         nullptr,        /* finalize    */                \
         nullptr,        /* call        */                \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/configure.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/configure.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/configure.in	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/configure.in	2015-04-24 19:31:00.000000000 +0000
@@ -190,6 +190,11 @@
 
 if test -n "$gonkdir" ; then
     kernel_name=`uname -s | tr "[[:upper:]]" "[[:lower:]]"`
+    dnl Default to ICS
+    ANDROID_VERSION=15
+    if test -n "${PLATFORM_SDK_VERSION}"; then
+        ANDROID_VERSION="${PLATFORM_SDK_VERSION}"
+    fi
 
     dnl set up compilers
     AS="$gonk_toolchain_prefix"as
@@ -295,14 +300,6 @@
 dnl Special win32 checks
 dnl ========================================================
 
-MOZ_ARG_ENABLE_BOOL(metro,
-[  --enable-metro           Enable Windows Metro build targets],
-    MOZ_METRO=1,
-    MOZ_METRO=)
-if test -n "$MOZ_METRO"; then
-    AC_DEFINE(MOZ_METRO)
-fi
-
 # Target the Windows 8.1 SDK by default
 WINSDK_TARGETVER=603
 WINVER=502
@@ -2964,10 +2961,18 @@
 dnl ========================================================
 dnl = Enable jemalloc
 dnl ========================================================
-MOZ_MEMORY=1
+
+LOCAL_MOZ_MEMORY=1
 MOZ_ARG_DISABLE_BOOL(jemalloc,
 [  --disable-jemalloc       Don't replace memory allocator with jemalloc],
-    MOZ_MEMORY=)
+    LOCAL_MOZ_MEMORY=)
+
+dnl Consult the command-line arguments in stand alone-builds only. In
+dnl non-stand-alone builds, we always use the value of MOZ_MEMORY inherited from
+dnl the top-level configure script.
+if test "$JS_STANDALONE"; then
+    MOZ_MEMORY=$LOCAL_MOZ_MEMORY
+fi
 
 case "${OS_TARGET}" in
 Android|WINNT|Darwin)
@@ -3740,7 +3745,6 @@
 AC_SUBST(OS_LDFLAGS)
 AC_SUBST(OS_LIBS)
 AC_SUBST(CROSS_COMPILE)
-AC_SUBST(MOZ_METRO)
 
 AC_SUBST(HOST_CC)
 AC_SUBST(HOST_CXX)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/ctypes/CTypes.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/ctypes/CTypes.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/ctypes/CTypes.cpp	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/ctypes/CTypes.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -32,6 +32,7 @@
 #endif
 
 #include "jscntxt.h"
+#include "jsexn.h"
 #include "jsfun.h"
 #include "jsnum.h"
 #include "jsprf.h"
@@ -40,6 +41,8 @@
 #include "ctypes/Library.h"
 #include "gc/Zone.h"
 
+#include "jsatominlines.h"
+
 using namespace std;
 using mozilla::NumericLimits;
 
@@ -530,7 +533,7 @@
 static const JSClass sCTypeProtoClass = {
   "CType",
   JSCLASS_HAS_RESERVED_SLOTS(CTYPEPROTO_SLOTS),
-  nullptr, nullptr, nullptr, nullptr,
+  nullptr, nullptr, nullptr, nullptr, nullptr,
   nullptr, nullptr, nullptr, nullptr,
   ConstructAbstract, nullptr, ConstructAbstract
 };
@@ -545,7 +548,7 @@
 static const JSClass sCTypeClass = {
   "CType",
   JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_HAS_RESERVED_SLOTS(CTYPE_SLOTS),
-  nullptr, nullptr, nullptr, nullptr,
+  nullptr, nullptr, nullptr, nullptr, nullptr,
   nullptr, nullptr, nullptr, CType::Finalize,
   CType::ConstructData, CType::HasInstance, CType::ConstructData,
   CType::Trace
@@ -555,14 +558,14 @@
   "CData",
   JSCLASS_HAS_RESERVED_SLOTS(CDATA_SLOTS),
   nullptr, nullptr, ArrayType::Getter, ArrayType::Setter,
-  nullptr, nullptr, nullptr, CData::Finalize,
+  nullptr, nullptr, nullptr, nullptr, CData::Finalize,
   FunctionType::Call, nullptr, FunctionType::Call
 };
 
 static const JSClass sCClosureClass = {
   "CClosure",
   JSCLASS_IMPLEMENTS_BARRIERS | JSCLASS_HAS_RESERVED_SLOTS(CCLOSURE_SLOTS),
-  nullptr, nullptr, nullptr, nullptr,
+  nullptr, nullptr, nullptr, nullptr, nullptr,
   nullptr, nullptr, nullptr, CClosure::Finalize,
   nullptr, nullptr, nullptr, CClosure::Trace
 };
@@ -584,7 +587,7 @@
 static const JSClass sCDataFinalizerClass = {
   "CDataFinalizer",
   JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(CDATAFINALIZER_SLOTS),
-  nullptr, nullptr, nullptr, nullptr,
+  nullptr, nullptr, nullptr, nullptr, nullptr,
   nullptr, nullptr, nullptr, CDataFinalizer::Finalize
 };
 
@@ -770,14 +773,14 @@
 static const JSClass sInt64Class = {
   "Int64",
   JSCLASS_HAS_RESERVED_SLOTS(INT64_SLOTS),
-  nullptr, nullptr, nullptr, nullptr,
+  nullptr, nullptr, nullptr, nullptr, nullptr,
   nullptr, nullptr, nullptr, Int64Base::Finalize
 };
 
 static const JSClass sUInt64Class = {
   "UInt64",
   JSCLASS_HAS_RESERVED_SLOTS(INT64_SLOTS),
-  nullptr, nullptr, nullptr, nullptr,
+  nullptr, nullptr, nullptr, nullptr, nullptr,
   nullptr, nullptr, nullptr, Int64Base::Finalize
 };
 
@@ -876,21 +879,594 @@
   return nullptr;
 }
 
+static const char*
+EncodeLatin1(JSContext* cx, AutoString& str, JSAutoByteString& bytes)
+{
+  return bytes.encodeLatin1(cx, NewUCString(cx, str));
+}
+
+static const char*
+CTypesToSourceForError(JSContext* cx, HandleValue val, JSAutoByteString& bytes)
+{
+  if (val.isObject() &&
+      (CType::IsCType(&val.toObject()) || CData::IsCData(&val.toObject()))) {
+    RootedString str(cx, JS_ValueToSource(cx, val));
+    return bytes.encodeLatin1(cx, str);
+  }
+  return ValueToSourceForError(cx, val, bytes);
+}
+
+static void
+BuildCStyleFunctionTypeSource(JSContext* cx, HandleObject typeObj,
+                              HandleString nameStr, unsigned ptrCount,
+                              AutoString& source);
+
+static void
+BuildCStyleTypeSource(JSContext* cx, JSObject* typeObj_, AutoString& source)
+{
+  RootedObject typeObj(cx, typeObj_);
+
+  MOZ_ASSERT(CType::IsCType(typeObj));
+
+  switch (CType::GetTypeCode(typeObj)) {
+#define BUILD_SOURCE(name, fromType, ffiType)                                  \
+  case TYPE_##name:                                                            \
+    AppendString(source, #name);                                               \
+    break;
+  CTYPES_FOR_EACH_TYPE(BUILD_SOURCE)
+#undef BUILD_SOURCE
+  case TYPE_void_t:
+    AppendString(source, "void");
+    break;
+  case TYPE_pointer: {
+    unsigned ptrCount = 0;
+    TypeCode type;
+    RootedObject baseTypeObj(cx, typeObj);
+    do {
+      baseTypeObj = PointerType::GetBaseType(baseTypeObj);
+      ptrCount++;
+      type = CType::GetTypeCode(baseTypeObj);
+    } while (type == TYPE_pointer || type == TYPE_array);
+    if (type == TYPE_function) {
+      BuildCStyleFunctionTypeSource(cx, baseTypeObj, NullPtr(), ptrCount,
+                                    source);
+      break;
+    }
+    BuildCStyleTypeSource(cx, baseTypeObj, source);
+    AppendChars(source, '*', ptrCount);
+    break;
+  }
+  case TYPE_struct: {
+    RootedString name(cx, CType::GetName(cx, typeObj));
+    AppendString(source, "struct ");
+    AppendString(source, name);
+    break;
+  }
+  case TYPE_function:
+    BuildCStyleFunctionTypeSource(cx, typeObj, NullPtr(), 0, source);
+    break;
+  case TYPE_array:
+    MOZ_CRASH("TYPE_array shouldn't appear in function type");
+  }
+}
+
+static void
+BuildCStyleFunctionTypeSource(JSContext* cx, HandleObject typeObj,
+                              HandleString nameStr, unsigned ptrCount,
+                              AutoString& source)
+{
+  MOZ_ASSERT(CType::IsCType(typeObj));
+
+  FunctionInfo* fninfo = FunctionType::GetFunctionInfo(typeObj);
+  BuildCStyleTypeSource(cx, fninfo->mReturnType, source);
+  AppendString(source, " ");
+  if (nameStr) {
+    MOZ_ASSERT(ptrCount == 0);
+    AppendString(source, nameStr);
+  } else if (ptrCount) {
+    AppendString(source, "(");
+    AppendChars(source, '*', ptrCount);
+    AppendString(source, ")");
+  }
+  AppendString(source, "(");
+  if (fninfo->mArgTypes.length() > 0) {
+    for (size_t i = 0; i < fninfo->mArgTypes.length(); ++i) {
+      BuildCStyleTypeSource(cx, fninfo->mArgTypes[i], source);
+      if (i != fninfo->mArgTypes.length() - 1 || fninfo->mIsVariadic) {
+          AppendString(source, ", ");
+      }
+    }
+    if (fninfo->mIsVariadic) {
+      AppendString(source, "...");
+    }
+  }
+  AppendString(source, ")");
+}
+
+static void
+BuildFunctionTypeSource(JSContext* cx, HandleObject funObj, AutoString& source)
+{
+  MOZ_ASSERT(CData::IsCData(funObj) || CType::IsCType(funObj));
+
+  if (CData::IsCData(funObj)) {
+    jsval slot = JS_GetReservedSlot(funObj, SLOT_REFERENT);
+    if (!slot.isUndefined() && Library::IsLibrary(&slot.toObject())) {
+      slot = JS_GetReservedSlot(funObj, SLOT_FUNNAME);
+      MOZ_ASSERT(!slot.isUndefined());
+      RootedObject typeObj(cx, CData::GetCType(funObj));
+      RootedObject baseTypeObj(cx, PointerType::GetBaseType(typeObj));
+      RootedString nameStr(cx, slot.toString());
+      BuildCStyleFunctionTypeSource(cx, baseTypeObj, nameStr, 0, source);
+      return;
+    }
+  }
+
+  RootedValue funVal(cx, ObjectValue(*funObj));
+  RootedString funcStr(cx, JS_ValueToSource(cx, funVal));
+  if (!funcStr) {
+    JS_ClearPendingException(cx);
+    AppendString(source, "<<error converting function to string>>");
+    return;
+  }
+  AppendString(source, funcStr);
+}
+
+enum class ConversionType {
+  Argument = 0,
+  Construct,
+  Finalizer,
+  Return,
+  Setter
+};
+
+static void
+BuildConversionPosition(JSContext* cx, ConversionType convType,
+                        HandleObject funObj, unsigned argIndex,
+                        AutoString& source)
+{
+  switch (convType) {
+  case ConversionType::Argument: {
+    MOZ_ASSERT(funObj);
+
+    AppendString(source, " at argument ");
+    AppendUInt(source, argIndex + 1);
+    AppendString(source, " of ");
+    BuildFunctionTypeSource(cx, funObj, source);
+    break;
+  }
+  case ConversionType::Finalizer:
+    MOZ_ASSERT(funObj);
+
+    AppendString(source, " at argument 1 of ");
+    BuildFunctionTypeSource(cx, funObj, source);
+    break;
+  case ConversionType::Return:
+    MOZ_ASSERT(funObj);
+
+    AppendString(source, " at the return value of ");
+    BuildFunctionTypeSource(cx, funObj, source);
+    break;
+  default:
+    MOZ_ASSERT(!funObj);
+    break;
+  }
+}
+
+static JSFlatString*
+GetFieldName(HandleObject structObj, unsigned fieldIndex)
+{
+  const FieldInfoHash* fields = StructType::GetFieldInfo(structObj);
+  for (FieldInfoHash::Range r = fields->all(); !r.empty(); r.popFront()) {
+    if (r.front().value().mIndex == fieldIndex) {
+      return (&r.front())->key();
+    }
+  }
+  return nullptr;
+}
+
+static void
+BuildTypeSource(JSContext* cx, JSObject* typeObj_, bool makeShort,
+                AutoString& result);
+
 static bool
-TypeError(JSContext* cx, const char* expected, HandleValue actual)
+ConvError(JSContext* cx, const char* expectedStr, HandleValue actual,
+          ConversionType convType,
+          HandleObject funObj = NullPtr(), unsigned argIndex = 0,
+          HandleObject arrObj = NullPtr(), unsigned arrIndex = 0)
 {
-  JSString* str = JS_ValueToSource(cx, actual);
-  JSAutoByteString bytes;
+  JSAutoByteString valBytes;
+  const char* valStr = CTypesToSourceForError(cx, actual, valBytes);
+  if (!valStr)
+    return false;
 
-  const char* src;
-  if (str) {
-    src = bytes.encodeLatin1(cx, str);
-    if (!src)
+  if (arrObj) {
+    MOZ_ASSERT(CType::IsCType(arrObj));
+
+    switch (CType::GetTypeCode(arrObj)) {
+    case TYPE_array: {
+      MOZ_ASSERT(!funObj);
+
+      char indexStr[16];
+      JS_snprintf(indexStr, 16, "%u", arrIndex);
+
+      AutoString arrSource;
+      JSAutoByteString arrBytes;
+      BuildTypeSource(cx, arrObj, true, arrSource);
+      const char* arrStr = EncodeLatin1(cx, arrSource, arrBytes);
+      if (!arrStr)
+        return false;
+
+      JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                           CTYPESMSG_CONV_ERROR_ARRAY,
+                           valStr, indexStr, arrStr);
+      break;
+    }
+    case TYPE_struct: {
+      JSFlatString* name = GetFieldName(arrObj, arrIndex);
+      MOZ_ASSERT(name);
+      JSAutoByteString nameBytes;
+      const char* nameStr = nameBytes.encodeLatin1(cx, name);
+      if (!nameStr)
+        return false;
+
+      AutoString structSource;
+      JSAutoByteString structBytes;
+      BuildTypeSource(cx, arrObj, true, structSource);
+      const char* structStr = EncodeLatin1(cx, structSource, structBytes);
+      if (!structStr)
+        return false;
+
+      JSAutoByteString posBytes;
+      const char* posStr;
+      if (funObj) {
+        AutoString posSource;
+        BuildConversionPosition(cx, convType, funObj, argIndex, posSource);
+        posStr = EncodeLatin1(cx, posSource, posBytes);
+        if (!posStr)
+          return false;
+      } else {
+        posStr = "";
+      }
+
+      JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                           CTYPESMSG_CONV_ERROR_STRUCT,
+                           valStr, nameStr, expectedStr, structStr, posStr);
+      break;
+    }
+    default:
+      MOZ_CRASH("invalid arrObj value");
+    }
+    return false;
+  }
+
+  switch (convType) {
+  case ConversionType::Argument: {
+    MOZ_ASSERT(funObj);
+
+    char indexStr[16];
+    JS_snprintf(indexStr, 16, "%u", argIndex + 1);
+
+    AutoString funSource;
+    JSAutoByteString funBytes;
+    BuildFunctionTypeSource(cx, funObj, funSource);
+    const char* funStr = EncodeLatin1(cx, funSource, funBytes);
+    if (!funStr)
+      return false;
+
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                         CTYPESMSG_CONV_ERROR_ARG,
+                         valStr, indexStr, funStr);
+    break;
+  }
+  case ConversionType::Finalizer: {
+    MOZ_ASSERT(funObj);
+
+    AutoString funSource;
+    JSAutoByteString funBytes;
+    BuildFunctionTypeSource(cx, funObj, funSource);
+    const char* funStr = EncodeLatin1(cx, funSource, funBytes);
+    if (!funStr)
+      return false;
+
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                         CTYPESMSG_CONV_ERROR_FIN, valStr, funStr);
+    break;
+  }
+  case ConversionType::Return: {
+    MOZ_ASSERT(funObj);
+
+    AutoString funSource;
+    JSAutoByteString funBytes;
+    BuildFunctionTypeSource(cx, funObj, funSource);
+    const char* funStr = EncodeLatin1(cx, funSource, funBytes);
+    if (!funStr)
+      return false;
+
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                         CTYPESMSG_CONV_ERROR_RET, valStr, funStr);
+    break;
+  }
+  case ConversionType::Setter:
+  case ConversionType::Construct:
+    MOZ_ASSERT(!funObj);
+
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                         CTYPESMSG_CONV_ERROR_SET, valStr, expectedStr);
+    break;
+  }
+
+  return false;
+}
+
+static bool
+ConvError(JSContext* cx, HandleObject expectedType, HandleValue actual,
+          ConversionType convType,
+          HandleObject funObj = NullPtr(), unsigned argIndex = 0,
+          HandleObject arrObj = NullPtr(), unsigned arrIndex = 0)
+{
+  MOZ_ASSERT(CType::IsCType(expectedType));
+
+  AutoString expectedSource;
+  JSAutoByteString expectedBytes;
+  BuildTypeSource(cx, expectedType, true, expectedSource);
+  const char* expectedStr = EncodeLatin1(cx, expectedSource, expectedBytes);
+  if (!expectedStr)
+    return false;
+
+  return ConvError(cx, expectedStr, actual, convType, funObj, argIndex,
+                   arrObj, arrIndex);
+}
+
+static bool
+ArgumentConvError(JSContext* cx, HandleValue actual, const char* funStr,
+                  unsigned argIndex)
+{
+  JSAutoByteString valBytes;
+  const char* valStr = CTypesToSourceForError(cx, actual, valBytes);
+  if (!valStr)
+    return false;
+
+  char indexStr[16];
+  JS_snprintf(indexStr, 16, "%u", argIndex + 1);
+
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_CONV_ERROR_ARG, valStr, indexStr, funStr);
+  return false;
+}
+
+static bool
+ArgumentLengthError(JSContext* cx, const char* fun, const char* count,
+                    const char* s)
+{
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_WRONG_ARG_LENGTH, fun, count, s);
+  return false;
+}
+
+static bool
+ArrayLengthMismatch(JSContext* cx, unsigned expectedLength, HandleObject arrObj,
+                    unsigned actualLength, HandleValue actual,
+                    ConversionType convType)
+{
+  MOZ_ASSERT(arrObj && CType::IsCType(arrObj));
+
+  JSAutoByteString valBytes;
+  const char* valStr = CTypesToSourceForError(cx, actual, valBytes);
+  if (!valStr)
+    return false;
+
+  char expectedLengthStr[16];
+  JS_snprintf(expectedLengthStr, 16, "%u", expectedLength);
+  char actualLengthStr[16];
+  JS_snprintf(actualLengthStr, 16, "%u", actualLength);
+
+  AutoString arrSource;
+  JSAutoByteString arrBytes;
+  BuildTypeSource(cx, arrObj, true, arrSource);
+  const char* arrStr = EncodeLatin1(cx, arrSource, arrBytes);
+  if (!arrStr)
+    return false;
+
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_ARRAY_MISMATCH,
+                       valStr, arrStr, expectedLengthStr, actualLengthStr);
+  return false;
+}
+
+static bool
+ArrayLengthOverflow(JSContext* cx, unsigned expectedLength, HandleObject arrObj,
+                    unsigned actualLength, HandleValue actual,
+                    ConversionType convType)
+{
+  MOZ_ASSERT(arrObj && CType::IsCType(arrObj));
+
+  JSAutoByteString valBytes;
+  const char* valStr = CTypesToSourceForError(cx, actual, valBytes);
+  if (!valStr)
+    return false;
+
+  char expectedLengthStr[16];
+  JS_snprintf(expectedLengthStr, 16, "%u", expectedLength);
+  char actualLengthStr[16];
+  JS_snprintf(actualLengthStr, 16, "%u", actualLength);
+
+  AutoString arrSource;
+  JSAutoByteString arrBytes;
+  BuildTypeSource(cx, arrObj, true, arrSource);
+  const char* arrStr = EncodeLatin1(cx, arrSource, arrBytes);
+  if (!arrStr)
+    return false;
+
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_ARRAY_OVERFLOW,
+                       valStr, arrStr, expectedLengthStr, actualLengthStr);
+  return false;
+}
+
+static bool
+ArgumentRangeMismatch(JSContext* cx, const char* arg, const char* func,
+                     const char* range)
+{
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_ARG_RANGE_MISMATCH, arg, func, range);
+  return false;
+}
+
+static bool
+ArgumentTypeMismatch(JSContext* cx, const char* arg, const char* func,
+                     const char* type)
+{
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_ARG_TYPE_MISMATCH, arg, func, type);
+  return false;
+}
+
+static bool
+EmptyFinalizerError(JSContext* cx, ConversionType convType,
+                    HandleObject funObj = NullPtr(), unsigned argIndex = 0)
+{
+  JSAutoByteString posBytes;
+  const char* posStr;
+  if (funObj) {
+    AutoString posSource;
+    BuildConversionPosition(cx, convType, funObj, argIndex, posSource);
+    posStr = EncodeLatin1(cx, posSource, posBytes);
+    if (!posStr)
       return false;
   } else {
-    JS_ClearPendingException(cx);
-    src = "<<error converting value to string>>";
+    posStr = "";
   }
+
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_EMPTY_FIN, posStr);
+  return false;
+}
+
+static bool
+FieldCountMismatch(JSContext* cx,
+                   unsigned expectedCount, HandleObject structObj,
+                   unsigned actualCount, HandleValue actual,
+                   ConversionType convType,
+                   HandleObject funObj = NullPtr(), unsigned argIndex = 0)
+{
+  MOZ_ASSERT(structObj && CType::IsCType(structObj));
+
+  JSAutoByteString valBytes;
+  const char* valStr = CTypesToSourceForError(cx, actual, valBytes);
+  if (!valStr)
+    return false;
+
+  AutoString structSource;
+  JSAutoByteString structBytes;
+  BuildTypeSource(cx, structObj, true, structSource);
+  const char* structStr = EncodeLatin1(cx, structSource, structBytes);
+  if (!structStr)
+    return false;
+
+  char expectedCountStr[16];
+  JS_snprintf(expectedCountStr, 16, "%u", expectedCount);
+  char actualCountStr[16];
+  JS_snprintf(actualCountStr, 16, "%u", actualCount);
+
+  JSAutoByteString posBytes;
+  const char* posStr;
+  if (funObj) {
+    AutoString posSource;
+    BuildConversionPosition(cx, convType, funObj, argIndex, posSource);
+    posStr = EncodeLatin1(cx, posSource, posBytes);
+    if (!posStr)
+      return false;
+  } else {
+    posStr = "";
+  }
+
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_FIELD_MISMATCH,
+                       valStr, structStr, expectedCountStr, actualCountStr,
+                       posStr);
+  return false;
+}
+
+static bool
+FinalizerSizeError(JSContext* cx, HandleObject funObj, HandleValue actual)
+{
+  MOZ_ASSERT(CType::IsCType(funObj));
+
+  JSAutoByteString valBytes;
+  const char* valStr = CTypesToSourceForError(cx, actual, valBytes);
+  if (!valStr)
+    return false;
+
+  AutoString funSource;
+  JSAutoByteString funBytes;
+  BuildFunctionTypeSource(cx, funObj, funSource);
+  const char* funStr = EncodeLatin1(cx, funSource, funBytes);
+  if (!funStr)
+    return false;
+
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_FIN_SIZE_ERROR, funStr, valStr);
+  return false;
+}
+
+static bool
+NonPrimitiveError(JSContext* cx, HandleObject typeObj)
+{
+  MOZ_ASSERT(CType::IsCType(typeObj));
+
+  AutoString typeSource;
+  JSAutoByteString typeBytes;
+  BuildTypeSource(cx, typeObj, true, typeSource);
+  const char* typeStr = EncodeLatin1(cx, typeSource, typeBytes);
+  if (!typeStr)
+    return false;
+
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_NON_PRIMITIVE, typeStr);
+  return false;
+}
+
+static bool
+PropNameNonStringError(JSContext* cx, HandleId id, HandleValue actual,
+                       ConversionType convType,
+                       HandleObject funObj = NullPtr(), unsigned argIndex = 0)
+{
+  JSAutoByteString valBytes;
+  const char* valStr = CTypesToSourceForError(cx, actual, valBytes);
+  if (!valStr)
+    return false;
+
+  JSAutoByteString idBytes;
+  RootedValue idVal(cx, IdToValue(id));
+  const char* propStr = CTypesToSourceForError(cx, idVal, idBytes);
+  if (!propStr)
+    return false;
+
+  JSAutoByteString posBytes;
+  const char* posStr;
+  if (funObj) {
+    AutoString posSource;
+    BuildConversionPosition(cx, convType, funObj, argIndex, posSource);
+    posStr = EncodeLatin1(cx, posSource, posBytes);
+    if (!posStr)
+      return false;
+  } else {
+    posStr = "";
+  }
+
+  JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
+                       CTYPESMSG_PROP_NONSTRING, propStr, valStr, posStr);
+  return false;
+}
+
+static bool
+TypeError(JSContext* cx, const char* expected, HandleValue actual)
+{
+  JSAutoByteString bytes;
+  const char* src = CTypesToSourceForError(cx, actual, bytes);
+  if (!src)
+    return false;
+
   JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                        CTYPESMSG_TYPE_ERROR, expected, src);
   return false;
@@ -2210,8 +2786,7 @@
     // We're about to create a new CData object to return. If the caller doesn't
     // want this, return early.
     if (wantPrimitive) {
-      JS_ReportError(cx, "cannot convert to primitive value");
-      return false;
+      return NonPrimitiveError(cx, typeObj);
     }
 
     JSObject* obj = CData::Create(cx, typeObj, parentObj, data, ownResult);
@@ -2276,18 +2851,20 @@
 // coercion between types. There are two cases in which this function is used:
 // 1) The target buffer is internal to a CData object; we simply write data
 //    into it.
-// 2) We are converting an argument for an ffi call, in which case 'isArgument'
-//    will be true. This allows us to handle a special case: if necessary,
-//    we can autoconvert a JS string primitive to a pointer-to-character type.
-//    In this case, ownership of the allocated string is handed off to the
-//    caller; 'freePointer' will be set to indicate this.
+// 2) We are converting an argument for an ffi call, in which case 'convType'
+//    will be 'ConversionType::Argument'. This allows us to handle a special
+//    case: if necessary, we can autoconvert a JS string primitive to a
+//    pointer-to-character type. In this case, ownership of the allocated string
+//    is handed off to the caller; 'freePointer' will be set to indicate this.
 static bool
 ImplicitConvert(JSContext* cx,
                 HandleValue val,
                 JSObject* targetType_,
                 void* buffer,
-                bool isArgument,
-                bool* freePointer)
+                ConversionType convType,
+                bool* freePointer,
+                HandleObject funObj = NullPtr(), unsigned argIndex = 0,
+                HandleObject arrObj = NullPtr(), unsigned arrIndex = 0)
 {
   RootedObject targetType(cx, targetType_);
   MOZ_ASSERT(CType::IsSizeDefined(targetType));
@@ -2319,8 +2896,7 @@
 
       if (!p) {
         // We have called |dispose| or |forget| already.
-        JS_ReportError(cx, "Attempting to convert an empty CDataFinalizer");
-        return false;
+        return EmptyFinalizerError(cx, convType, funObj, argIndex);
       }
 
       // If the types are equal, copy the buffer contained within the CData.
@@ -2339,7 +2915,8 @@
     // Programs can convert explicitly, if needed, using `Boolean(v)` or `!!v`.
     bool result;
     if (!jsvalToBool(cx, val, &result))
-      return TypeError(cx, "boolean", val);
+      return ConvError(cx, "boolean", val, convType, funObj, argIndex,
+                       arrObj, arrIndex);
     *static_cast<bool*>(buffer) = result;
     break;
   }
@@ -2351,13 +2928,15 @@
     if (val.isString()) {                                                      \
       JSString* str = val.toString();                                          \
       if (str->length() != 1)                                                  \
-        return TypeError(cx, #name, val);                                      \
+        return ConvError(cx, #name, val, convType, funObj, argIndex,           \
+                         arrObj, arrIndex);                                    \
       JSLinearString* linear = str->ensureLinear(cx);                          \
       if (!linear)                                                             \
         return false;                                                          \
       result = linear->latin1OrTwoByteChar(0);                                 \
     } else if (!jsvalToInteger(cx, val, &result)) {                            \
-      return TypeError(cx, #name, val);                                        \
+      return ConvError(cx, #name, val, convType, funObj, argIndex,             \
+                       arrObj, arrIndex);                                      \
     }                                                                          \
     *static_cast<type*>(buffer) = result;                                      \
     break;                                                                     \
@@ -2369,7 +2948,8 @@
     /* Do not implicitly lose bits. */                                         \
     type result;                                                               \
     if (!jsvalToInteger(cx, val, &result))                                     \
-      return TypeError(cx, #name, val);                                        \
+      return ConvError(cx, #name, val, convType, funObj, argIndex,             \
+                       arrObj, arrIndex);                                      \
     *static_cast<type*>(buffer) = result;                                      \
     break;                                                                     \
   }
@@ -2385,7 +2965,8 @@
   case TYPE_##name: {                                                          \
     type result;                                                               \
     if (!jsvalToFloat(cx, val, &result))                                       \
-      return TypeError(cx, #name, val);                                        \
+      return ConvError(cx, #name, val, convType, funObj, argIndex,             \
+                       arrObj, arrIndex);                                      \
     *static_cast<type*>(buffer) = result;                                      \
     break;                                                                     \
   }
@@ -2420,7 +3001,7 @@
         }
       }
 
-    } else if (isArgument && val.isString()) {
+    } else if (convType == ConversionType::Argument && val.isString()) {
       // Convert the string for the ffi call. This requires allocating space
       // which the caller assumes ownership of.
       // TODO: Extend this so we can safely convert strings at other times also.
@@ -2474,7 +3055,8 @@
         break;
       }
       default:
-        return TypeError(cx, "string pointer", val);
+        return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                         arrObj, arrIndex);
       }
       break;
     } else if (val.isObject() && JS_IsArrayBufferObject(valObj)) {
@@ -2482,8 +3064,9 @@
       // when converting an argument to a function call, as it is possible for
       // the pointer to be invalidated by anything that runs JS code. (It is
       // invalid to invoke JS code from a ctypes function call.)
-      if (!isArgument) {
-        return TypeError(cx, "arraybuffer pointer", val);
+      if (convType != ConversionType::Argument) {
+        return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                         arrObj, arrIndex);
       }
       void* ptr;
       {
@@ -2491,7 +3074,8 @@
           ptr = JS_GetArrayBufferData(valObj, nogc);
       }
       if (!ptr) {
-        return TypeError(cx, "arraybuffer pointer", val);
+        return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                         arrObj, arrIndex);
       }
       *static_cast<void**>(buffer) = ptr;
       break;
@@ -2499,10 +3083,12 @@
       // Same as ArrayBuffer, above, though note that this will take the
       // offset of the view into account.
       if(!CanConvertTypedArrayItemTo(baseType, valObj, cx)) {
-        return TypeError(cx, "typed array with the appropriate type", val);
+        return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                         arrObj, arrIndex);
       }
-      if (!isArgument) {
-        return TypeError(cx, "typed array pointer", val);
+      if (convType != ConversionType::Argument) {
+        return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                         arrObj, arrIndex);
       }
       void* ptr;
       {
@@ -2510,14 +3096,18 @@
           ptr = JS_GetArrayBufferViewData(valObj, nogc);
       }
       if (!ptr) {
-        return TypeError(cx, "typed array pointer", val);
+        return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                         arrObj, arrIndex);
       }
       *static_cast<void**>(buffer) = ptr;
       break;
     }
-    return TypeError(cx, "pointer", val);
+    return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                     arrObj, arrIndex);
   }
   case TYPE_array: {
+    MOZ_ASSERT(!funObj);
+
     RootedObject baseType(cx, ArrayType::GetBaseType(targetType));
     size_t targetLength = ArrayType::GetLength(targetType);
 
@@ -2539,8 +3129,9 @@
           return false;
 
         if (targetLength < nbytes) {
-          JS_ReportError(cx, "ArrayType has insufficient length");
-          return false;
+          MOZ_ASSERT(!funObj);
+          return ArrayLengthOverflow(cx, targetLength, targetType, nbytes, val,
+                                     convType);
         }
 
         char* charBuffer = static_cast<char*>(buffer);
@@ -2556,8 +3147,9 @@
         // Copy the string data, char16_t for char16_t, including the terminator
         // if there's space.
         if (targetLength < sourceLength) {
-          JS_ReportError(cx, "ArrayType has insufficient length");
-          return false;
+          MOZ_ASSERT(!funObj);
+          return ArrayLengthOverflow(cx, targetLength, targetType,
+                                     sourceLength, val, convType);
         }
 
         char16_t* dest = static_cast<char16_t*>(buffer);
@@ -2575,7 +3167,8 @@
         break;
       }
       default:
-        return TypeError(cx, "array", val);
+        return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                         arrObj, arrIndex);
       }
 
     } else if (val.isObject() && JS_IsArrayObject(cx, valObj)) {
@@ -2583,8 +3176,9 @@
       uint32_t sourceLength;
       if (!JS_GetArrayLength(cx, valObj, &sourceLength) ||
           targetLength != size_t(sourceLength)) {
-        JS_ReportError(cx, "ArrayType length does not match source array length");
-        return false;
+        MOZ_ASSERT(!funObj);
+        return ArrayLengthMismatch(cx, targetLength, targetType,
+                                   size_t(sourceLength), val, convType);
       }
 
       // Convert into an intermediate, in case of failure.
@@ -2602,7 +3196,8 @@
           return false;
 
         char* data = intermediate.get() + elementSize * i;
-        if (!ImplicitConvert(cx, item, baseType, data, false, nullptr))
+        if (!ImplicitConvert(cx, item, baseType, data, convType, nullptr,
+                             funObj, argIndex, targetType, i))
           return false;
       }
 
@@ -2615,8 +3210,9 @@
       size_t elementSize = CType::GetSize(baseType);
       size_t arraySize = elementSize * targetLength;
       if (arraySize != size_t(sourceLength)) {
-        JS_ReportError(cx, "ArrayType length does not match source ArrayBuffer length");
-        return false;
+        MOZ_ASSERT(!funObj);
+        return ArrayLengthMismatch(cx, arraySize, targetType,
+                                   size_t(sourceLength), val, convType);
       }
       JS::AutoCheckCannotGC nogc;
       memcpy(buffer, JS_GetArrayBufferData(valObj, nogc), sourceLength);
@@ -2625,15 +3221,17 @@
       // Check that array is consistent with type, then
       // copy the array.
       if(!CanConvertTypedArrayItemTo(baseType, valObj, cx)) {
-        return TypeError(cx, "typed array with the appropriate type", val);
+        return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                         arrObj, arrIndex);
       }
 
       uint32_t sourceLength = JS_GetTypedArrayByteLength(valObj);
       size_t elementSize = CType::GetSize(baseType);
       size_t arraySize = elementSize * targetLength;
       if (arraySize != size_t(sourceLength)) {
-        JS_ReportError(cx, "typed array length does not match source TypedArray length");
-        return false;
+        MOZ_ASSERT(!funObj);
+        return ArrayLengthMismatch(cx, arraySize, targetType,
+                                   size_t(sourceLength), val, convType);
       }
       JS::AutoCheckCannotGC nogc;
       memcpy(buffer, JS_GetArrayBufferViewData(valObj, nogc), sourceLength);
@@ -2641,7 +3239,8 @@
     } else {
       // Don't implicitly convert to string. Users can implicitly convert
       // with `String(x)` or `""+x`.
-      return TypeError(cx, "array", val);
+      return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                       arrObj, arrIndex);
     }
     break;
   }
@@ -2663,8 +3262,9 @@
 
       const FieldInfoHash* fields = StructType::GetFieldInfo(targetType);
       if (props.length() != fields->count()) {
-        JS_ReportError(cx, "missing fields");
-        return false;
+        return FieldCountMismatch(cx, fields->count(), targetType,
+                                  props.length(), val, convType,
+                                  funObj, argIndex);
       }
 
       RootedId id(cx);
@@ -2672,8 +3272,8 @@
         id = props[i];
 
         if (!JSID_IS_STRING(id)) {
-          JS_ReportError(cx, "property name is not a string");
-          return false;
+          return PropNameNonStringError(cx, id, val, convType,
+                                        funObj, argIndex);
         }
 
         JSFlatString* name = JSID_TO_FLAT_STRING(id);
@@ -2687,7 +3287,8 @@
 
         // Convert the field via ImplicitConvert().
         char* fieldData = intermediate.get() + field->mOffset;
-        if (!ImplicitConvert(cx, prop, field->mType, fieldData, false, nullptr))
+        if (!ImplicitConvert(cx, prop, field->mType, fieldData, convType,
+                             nullptr, funObj, argIndex, targetType, i))
           return false;
       }
 
@@ -2695,7 +3296,8 @@
       break;
     }
 
-    return TypeError(cx, "struct", val);
+    return ConvError(cx, targetType, val, convType, funObj, argIndex,
+                     arrObj, arrIndex);
   }
   case TYPE_void_t:
   case TYPE_function:
@@ -2709,10 +3311,11 @@
 // storing the result in 'buffer'. This function is more forceful than
 // ImplicitConvert.
 static bool
-ExplicitConvert(JSContext* cx, HandleValue val, HandleObject targetType, void* buffer)
+ExplicitConvert(JSContext* cx, HandleValue val, HandleObject targetType,
+                void* buffer, ConversionType convType)
 {
   // If ImplicitConvert succeeds, use that result.
-  if (ImplicitConvert(cx, val, targetType, buffer, false, nullptr))
+  if (ImplicitConvert(cx, val, targetType, buffer, convType, nullptr))
     return true;
 
   // If ImplicitConvert failed, and there is no pending exception, then assume
@@ -2741,7 +3344,7 @@
     if (!jsvalToIntegerExplicit(val, &result) &&                               \
         (!val.isString() ||                                                    \
          !StringToInteger(cx, val.toString(), &result)))                       \
-      return TypeError(cx, #name, val);                                        \
+      return ConvError(cx, #name, val, convType);                              \
     *static_cast<type*>(buffer) = result;                                      \
     break;                                                                     \
   }
@@ -2754,7 +3357,7 @@
     // Convert a number, Int64 object, or UInt64 object to a pointer.
     uintptr_t result;
     if (!jsvalToPtrExplicit(cx, val, &result))
-      return TypeError(cx, "pointer", val);
+      return ConvError(cx, targetType, val, convType);
     *static_cast<uintptr_t*>(buffer) = result;
     break;
   }
@@ -3258,8 +3861,7 @@
                       const CallArgs& args)
 {
   if (args.length() > 1) {
-    JS_ReportError(cx, "CType constructor takes zero or one argument");
-    return false;
+    return ArgumentLengthError(cx, "CType constructor", "at most one", "");
   }
 
   // construct a CData object
@@ -3268,7 +3870,8 @@
     return false;
 
   if (args.length() == 1) {
-    if (!ExplicitConvert(cx, args[0], obj, CData::GetData(result)))
+    if (!ExplicitConvert(cx, args[0], obj, CData::GetData(result),
+                         ConversionType::Construct))
       return false;
   }
 
@@ -3426,6 +4029,18 @@
 }
 
 void
+TraceFieldInfoHash(JSTracer* trc, FieldInfoHash* fields)
+{
+  for (FieldInfoHash::Enum e(*fields); !e.empty(); e.popFront()) {
+    JSString* key = e.front().key();
+    JS_CallUnbarrieredStringTracer(trc, &key, "fieldName");
+    if (key != e.front().key())
+      e.rekeyFront(JS_ASSERT_STRING_IS_FLAT(key));
+    JS_CallObjectTracer(trc, &e.front().value().mType, "fieldType");
+  }
+}
+
+void
 CType::Trace(JSTracer* trc, JSObject* obj)
 {
   // Make sure our TypeCode slot is legit. If it's not, bail.
@@ -3441,14 +4056,7 @@
       return;
 
     FieldInfoHash* fields = static_cast<FieldInfoHash*>(slot.toPrivate());
-    for (FieldInfoHash::Enum e(*fields); !e.empty(); e.popFront()) {
-      JSString* key = e.front().key();
-      JS_CallUnbarrieredStringTracer(trc, &key, "fieldName");
-      if (key != e.front().key())
-          e.rekeyFront(JS_ASSERT_STRING_IS_FLAT(key));
-      JS_CallObjectTracer(trc, &e.front().value().mType, "fieldType");
-    }
-
+    TraceFieldInfoHash(trc, fields);
     break;
   }
   case TYPE_function: {
@@ -3780,15 +4388,14 @@
 
   // Construct and return a new ArrayType object.
   if (args.length() > 1) {
-    JS_ReportError(cx, "array takes zero or one argument");
-    return false;
+    return ArgumentLengthError(cx, "CType.prototype.array", "at most one", "");
   }
 
   // Convert the length argument to a size_t.
   size_t length = 0;
   if (args.length() == 1 && !jsvalToSize(cx, args[0], false, &length)) {
-    JS_ReportError(cx, "argument must be a nonnegative integer");
-    return false;
+    return ArgumentTypeMismatch(cx, "", "CType.prototype.array",
+                                "a nonnegative integer");
   }
 
   JSObject* result = ArrayType::CreateInternal(cx, baseType, length, args.length() == 1);
@@ -3920,8 +4527,7 @@
 {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() != 0) {
-    JS_ReportError(cx, "toSource takes zero arguments");
-    return false;
+    return ArgumentLengthError(cx, "ABI.prototype.toSource", "no", "s");
   }
 
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
@@ -3965,15 +4571,13 @@
   CallArgs args = CallArgsFromVp(argc, vp);
   // Construct and return a new PointerType object.
   if (args.length() != 1) {
-    JS_ReportError(cx, "PointerType takes one argument");
-    return false;
+    return ArgumentLengthError(cx, "PointerType", "one", "");
   }
 
   jsval arg = args[0];
   RootedObject obj(cx);
   if (arg.isPrimitive() || !CType::IsCType(obj = &arg.toObject())) {
-    JS_ReportError(cx, "first argument must be a CType");
-    return false;
+    return ArgumentTypeMismatch(cx, "", "PointerType", "a CType");
   }
 
   JSObject* result = CreateInternal(cx, obj);
@@ -4031,8 +4635,8 @@
   }
 
   if (args.length() > 3) {
-    JS_ReportError(cx, "constructor takes 0, 1, 2, or 3 arguments");
-    return false;
+    return ArgumentLengthError(cx, "PointerType constructor", "0, 1, 2, or 3",
+                               "s");
   }
 
   RootedObject result(cx, CData::Create(cx, obj, NullPtr(), nullptr, true));
@@ -4066,10 +4670,10 @@
   //
   if (!looksLikeClosure) {
     if (args.length() != 1) {
-      JS_ReportError(cx, "first argument must be a function");
-      return false;
+      return ArgumentLengthError(cx, "FunctionType constructor", "one", "");
     }
-    return ExplicitConvert(cx, args[0], obj, CData::GetData(result));
+    return ExplicitConvert(cx, args[0], obj, CData::GetData(result),
+                           ConversionType::Construct);
   }
 
   //
@@ -4253,7 +4857,8 @@
   }
 
   args.rval().setUndefined();
-  return ImplicitConvert(cx, args.get(0), baseType, data, false, nullptr);
+  return ImplicitConvert(cx, args.get(0), baseType, data,
+                         ConversionType::Setter, nullptr);
 }
 
 /*******************************************************************************
@@ -4266,21 +4871,18 @@
   CallArgs args = CallArgsFromVp(argc, vp);
   // Construct and return a new ArrayType object.
   if (args.length() < 1 || args.length() > 2) {
-    JS_ReportError(cx, "ArrayType takes one or two arguments");
-    return false;
+    return ArgumentLengthError(cx, "ArrayType", "one or two", "s");
   }
 
-  if (args[0].isPrimitive() ||
-      !CType::IsCType(&args[0].toObject())) {
-    JS_ReportError(cx, "first argument must be a CType");
-    return false;
+  if (args[0].isPrimitive() || !CType::IsCType(&args[0].toObject())) {
+    return ArgumentTypeMismatch(cx, "first ", "ArrayType", "a CType");
   }
 
   // Convert the length argument to a size_t.
   size_t length = 0;
   if (args.length() == 2 && !jsvalToSize(cx, args[1], false, &length)) {
-    JS_ReportError(cx, "second argument must be a nonnegative integer");
-    return false;
+    return ArgumentTypeMismatch(cx, "second ", "ArrayType",
+                                "a nonnegative integer");
   }
 
   RootedObject baseType(cx, &args[0].toObject());
@@ -4367,14 +4969,14 @@
   // with a length argument, or with an actual JS array.
   if (CType::IsSizeDefined(obj)) {
     if (args.length() > 1) {
-      JS_ReportError(cx, "constructor takes zero or one argument");
-      return false;
+      return ArgumentLengthError(cx, "size defined ArrayType constructor",
+                                 "at most one", "");
     }
 
   } else {
     if (args.length() != 1) {
-      JS_ReportError(cx, "constructor takes one argument");
-      return false;
+      return ArgumentLengthError(cx, "size undefined ArrayType constructor",
+                                 "one", "");
     }
 
     RootedObject baseType(cx, GetBaseType(obj));
@@ -4391,8 +4993,9 @@
       RootedValue lengthVal(cx);
       if (!JS_GetProperty(cx, arg, "length", &lengthVal) ||
           !jsvalToSize(cx, lengthVal, false, &length)) {
-        JS_ReportError(cx, "argument must be an array object or length");
-        return false;
+        return ArgumentTypeMismatch(cx, "",
+                                    "size undefined ArrayType constructor",
+                                    "an array object or integer");
       }
 
     } else if (args[0].isString()) {
@@ -4420,12 +5023,13 @@
         length = sourceLength + 1;
         break;
       default:
-        return TypeError(cx, "array", args[0]);
+        return ConvError(cx, obj, args[0], ConversionType::Construct);
       }
 
     } else {
-      JS_ReportError(cx, "argument must be an array object or length");
-      return false;
+      return ArgumentTypeMismatch(cx, "",
+                                  "size undefined ArrayType constructor",
+                                  "an array object or integer");
     }
 
     // Construct a new ArrayType of defined length, for the new CData object.
@@ -4441,7 +5045,8 @@
   args.rval().setObject(*result);
 
   if (convertObject) {
-    if (!ExplicitConvert(cx, args[0], obj, CData::GetData(result)))
+    if (!ExplicitConvert(cx, args[0], obj, CData::GetData(result),
+                         ConversionType::Construct))
       return false;
   }
 
@@ -4611,7 +5216,8 @@
   size_t length = GetLength(typeObj);
   bool ok = jsidToSize(cx, idval, true, &index);
   int32_t dummy;
-  if (!ok && JSID_IS_STRING(idval) && !StringToInteger(cx, JSID_TO_STRING(idval), &dummy)) {
+  if (!ok && JSID_IS_STRING(idval) &&
+      !StringToInteger(cx, JSID_TO_STRING(idval), &dummy)) {
     // String either isn't a number, or doesn't fit in size_t.
     // Chances are it's a regular property lookup, so return.
     return true;
@@ -4639,7 +5245,7 @@
 
   // Bail early if we're not an ArrayType. (This setter is present for all
   // CData, regardless of CType.)
-  JSObject* typeObj = CData::GetCType(obj);
+  RootedObject typeObj(cx, CData::GetCType(obj));
   if (CType::GetTypeCode(typeObj) != TYPE_array)
     return result.succeed();
 
@@ -4648,7 +5254,8 @@
   size_t length = GetLength(typeObj);
   bool ok = jsidToSize(cx, idval, true, &index);
   int32_t dummy;
-  if (!ok && JSID_IS_STRING(idval) && !StringToInteger(cx, JSID_TO_STRING(idval), &dummy)) {
+  if (!ok && JSID_IS_STRING(idval) &&
+      !StringToInteger(cx, JSID_TO_STRING(idval), &dummy)) {
     // String either isn't a number, or doesn't fit in size_t.
     // Chances are it's a regular property lookup, so return.
     return result.succeed();
@@ -4658,10 +5265,11 @@
     return false;
   }
 
-  JSObject* baseType = GetBaseType(typeObj);
+  RootedObject baseType(cx, GetBaseType(typeObj));
   size_t elementSize = CType::GetSize(baseType);
   char* data = static_cast<char*>(CData::GetData(obj)) + elementSize * index;
-  if (!ImplicitConvert(cx, vp, baseType, data, false, nullptr))
+  if (!ImplicitConvert(cx, vp, baseType, data, ConversionType::Setter,
+                       nullptr, NullPtr(), 0, typeObj, index))
     return false;
   return result.succeed();
 }
@@ -4685,8 +5293,8 @@
   }
 
   if (args.length() != 1) {
-    JS_ReportError(cx, "addressOfElement takes one argument");
-    return false;
+    return ArgumentLengthError(cx, "ArrayType.prototype.addressOfElement",
+                               "one", "");
   }
 
   RootedObject baseType(cx, GetBaseType(typeObj));
@@ -4806,14 +5414,12 @@
 
   // Construct and return a new StructType object.
   if (args.length() < 1 || args.length() > 2) {
-    JS_ReportError(cx, "StructType takes one or two arguments");
-    return false;
+    return ArgumentLengthError(cx, "StructType", "one or two", "s");
   }
 
   jsval name = args[0];
   if (!name.isString()) {
-    JS_ReportError(cx, "first argument must be a string");
-    return false;
+    return ArgumentTypeMismatch(cx, "first ", "StructType", "a string");
   }
 
   // Get ctypes.StructType.prototype from the ctypes.StructType constructor.
@@ -4830,8 +5436,7 @@
   if (args.length() == 2) {
     RootedObject arr(cx, args[1].isPrimitive() ? nullptr : &args[1].toObject());
     if (!arr || !JS_IsArrayObject(cx, arr)) {
-      JS_ReportError(cx, "second argument must be an array");
-      return false;
+      return ArgumentTypeMismatch(cx, "second ", "StructType", "an array");
     }
 
     // Define the struct fields.
@@ -4857,6 +5462,31 @@
     table->rekeyIfMoved(JS_ASSERT_STRING_IS_FLAT(prior), JS_ASSERT_STRING_IS_FLAT(key));
 }
 
+// Holds a pointer to a FieldInfoHash while it is being constructed, tracing it
+// on GC and destroying it when it dies unless release() has been called first.
+class FieldInfoHolder : public JS::CustomAutoRooter
+{
+  public:
+    FieldInfoHolder(JSContext* cx, FieldInfoHash* fields)
+      : CustomAutoRooter(cx), fields_(fields) {}
+    ~FieldInfoHolder() {
+      delete fields_;
+    }
+    virtual void trace(JSTracer* trc) override {
+      if (fields_)
+        TraceFieldInfoHash(trc, fields_);
+    }
+    FieldInfoHash* operator->() { return fields_; }
+    operator FieldInfoHash*() { return fields_; }
+    FieldInfoHash* release() {
+      FieldInfoHash* result = fields_;
+      fields_ = nullptr;
+      return result;
+    }
+  private:
+    FieldInfoHash* fields_;
+};
+
 bool
 StructType::DefineInternal(JSContext* cx, JSObject* typeObj_, JSObject* fieldsObj_)
 {
@@ -4887,16 +5517,11 @@
   // its constituents. (We cannot simply stash the hash in a reserved slot now
   // to get GC safety for free, since if anything in this function fails we
   // do not want to mutate 'typeObj'.)
-  auto fields = cx->make_unique<FieldInfoHash>();
+  FieldInfoHolder fields(cx, cx->new_<FieldInfoHash>());
   if (!fields || !fields->init(len)) {
     JS_ReportOutOfMemory(cx);
     return false;
   }
-  JS::AutoValueVector fieldRoots(cx);
-  if (!fieldRoots.resize(len)) {
-    JS_ReportOutOfMemory(cx);
-    return false;
-  }
 
   // Process the field types.
   size_t structSize, structAlign;
@@ -4913,7 +5538,6 @@
       Rooted<JSFlatString*> name(cx, ExtractStructField(cx, item, &fieldType));
       if (!name)
         return false;
-      fieldRoots[i].setObject(*fieldType);
 
       // Make sure each field name is unique
       FieldInfoHash::AddPtr entryPtr = fields->lookupForAdd(name);
@@ -4967,7 +5591,7 @@
       info.mIndex = i;
       info.mOffset = fieldOffset;
       ASSERT_OK(fields->add(entryPtr, name, info));
-      JS_StoreStringPostBarrierCallback(cx, PostBarrierCallback, name, fields.get());
+      JS_StoreStringPostBarrierCallback(cx, PostBarrierCallback, name, fields);
 
       structSize = fieldOffset + fieldSize;
 
@@ -5095,19 +5719,18 @@
   }
 
   if (args.length() != 1) {
-    JS_ReportError(cx, "define takes one argument");
-    return false;
+    return ArgumentLengthError(cx, "StructType.prototype.define", "one", "");
   }
 
   jsval arg = args[0];
   if (arg.isPrimitive()) {
-    JS_ReportError(cx, "argument must be an array");
-    return false;
+    return ArgumentTypeMismatch(cx, "", "StructType.prototype.define",
+                                "an array");
   }
   RootedObject arr(cx, arg.toObjectOrNull());
   if (!JS_IsArrayObject(cx, arr)) {
-    JS_ReportError(cx, "argument must be an array");
-    return false;
+    return ArgumentTypeMismatch(cx, "", "StructType.prototype.define",
+                                "an array");
   }
 
   return DefineInternal(cx, obj, arr);
@@ -5150,7 +5773,7 @@
     // are mutually exclusive, so we can pick the right one.
 
     // Try option 1) first.
-    if (ExplicitConvert(cx, args[0], obj, buffer))
+    if (ExplicitConvert(cx, args[0], obj, buffer, ConversionType::Construct))
       return true;
 
     if (fields->count() != 1)
@@ -5175,17 +5798,22 @@
       const FieldInfo& field = r.front().value();
       STATIC_ASSUME(field.mIndex < fields->count());  /* Quantified invariant */
       if (!ImplicitConvert(cx, args[field.mIndex], field.mType,
-             buffer + field.mOffset,
-             false, nullptr))
+                           buffer + field.mOffset, ConversionType::Construct,
+                           nullptr, NullPtr(), 0, obj, field.mIndex))
         return false;
     }
 
     return true;
   }
 
-  JS_ReportError(cx, "constructor takes 0, 1, or %u arguments",
-    fields->count());
-  return false;
+  size_t count = fields->count();
+  if (count >= 2) {
+    char fieldLengthStr[32];
+    JS_snprintf(fieldLengthStr, 32, "0, 1, or %u", count);
+    return ArgumentLengthError(cx, "StructType constructor", fieldLengthStr,
+                               "s");
+  }
+  return ArgumentLengthError(cx, "StructType constructor", "at most one", "");
 }
 
 const FieldInfoHash*
@@ -5340,7 +5968,7 @@
     return false;
   }
 
-  JSObject* typeObj = CData::GetCType(obj);
+  RootedObject typeObj(cx, CData::GetCType(obj));
   if (CType::GetTypeCode(typeObj) != TYPE_struct) {
     JS_ReportError(cx, "not a StructType");
     return false;
@@ -5358,7 +5986,8 @@
   args.rval().setUndefined();
 
   char* data = static_cast<char*>(CData::GetData(obj)) + field->mOffset;
-  return ImplicitConvert(cx, args.get(0), field->mType, data, false, nullptr);
+  return ImplicitConvert(cx, args.get(0), field->mType, data, ConversionType::Setter, nullptr,
+                         NullPtr(), 0, typeObj, field->mIndex);
 }
 
 bool
@@ -5380,13 +6009,13 @@
   }
 
   if (args.length() != 1) {
-    JS_ReportError(cx, "addressOfField takes one argument");
-    return false;
+    return ArgumentLengthError(cx, "StructType.prototype.addressOfField",
+                               "one", "");
   }
 
   if (!args[0].isString()) {
-    JS_ReportError(cx, "argument must be a string");
-    return false;
+    return ArgumentTypeMismatch(cx, "", "StructType.prototype.addressOfField",
+                                "a string");
   }
 
   JSFlatString* str = JS_FlattenString(cx, args[0].toString());
@@ -5725,8 +6354,7 @@
   // Construct and return a new FunctionType object.
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() < 2 || args.length() > 3) {
-    JS_ReportError(cx, "FunctionType takes two or three arguments");
-    return false;
+    return ArgumentLengthError(cx, "FunctionType", "two or three", "s");
   }
 
   AutoValueVector argTypes(cx);
@@ -5737,8 +6365,7 @@
     if (args[2].isObject())
       arrayObj = &args[2].toObject();
     if (!arrayObj || !JS_IsArrayObject(cx, arrayObj)) {
-      JS_ReportError(cx, "third argument must be an array");
-      return false;
+      return ArgumentTypeMismatch(cx, "third ", "FunctionType", "an array");
     }
 
     uint32_t len;
@@ -5844,6 +6471,8 @@
 
 static bool
 ConvertArgument(JSContext* cx,
+                HandleObject funObj,
+                unsigned argIndex,
                 HandleValue arg,
                 JSObject* type,
                 AutoValue* value,
@@ -5855,7 +6484,9 @@
   }
 
   bool freePointer = false;
-  if (!ImplicitConvert(cx, arg, type, value->mData, true, &freePointer))
+  if (!ImplicitConvert(cx, arg, type, value->mData,
+                       ConversionType::Argument, &freePointer,
+                       funObj, argIndex))
     return false;
 
   if (freePointer) {
@@ -5924,7 +6555,8 @@
   }
 
   for (unsigned i = 0; i < argcFixed; ++i)
-    if (!ConvertArgument(cx, args[i], fninfo->mArgTypes[i], &values[i], &strings))
+    if (!ConvertArgument(cx, obj, i, args[i], fninfo->mArgTypes[i],
+                         &values[i], &strings))
       return false;
 
   if (fninfo->mIsVariadic) {
@@ -5949,7 +6581,7 @@
           !(type = PrepareType(cx, OBJECT_TO_JSVAL(type))) ||
           // Relying on ImplicitConvert only for the limited purpose of
           // converting one CType to another (e.g., T[] to T*).
-          !ConvertArgument(cx, args[i], type, &values[i], &strings) ||
+          !ConvertArgument(cx, obj, i, args[i], type, &values[i], &strings) ||
           !(fninfo->mFFITypes[i] = CType::GetFFIType(cx, type))) {
         // These functions report their own errors.
         return false;
@@ -6175,7 +6807,8 @@
       return nullptr;
 
     // Do the value conversion. This might fail, in which case we throw.
-    if (!ImplicitConvert(cx, errVal, fninfo->mReturnType, errResult.get(), false, nullptr))
+    if (!ImplicitConvert(cx, errVal, fninfo->mReturnType, errResult.get(),
+                         ConversionType::Return, nullptr, typeObj))
       return nullptr;
   }
 
@@ -6322,14 +6955,14 @@
   RootedValue rval(cx);
   bool success = JS_CallFunctionValue(cx, thisObj, jsfnVal, argv, &rval);
 
-  // Convert the result. Note that we pass 'isArgument = false', such that
+  // Convert the result. Note that we pass 'ConversionType::Return', such that
   // ImplicitConvert will *not* autoconvert a JS string into a pointer-to-char
   // type, which would require an allocation that we can't track. The JS
   // function must perform this conversion itself and return a PointerType
   // CData; thusly, the burden of freeing the data is left to the user.
   if (success && cif->rtype != &ffi_type_void)
-    success = ImplicitConvert(cx, rval, fninfo->mReturnType, result, false,
-                              nullptr);
+    success = ImplicitConvert(cx, rval, fninfo->mReturnType, result,
+                              ConversionType::Return, nullptr, typeObj);
 
   if (!success) {
     // Something failed. The callee may have thrown, or it may not have
@@ -6556,7 +7189,8 @@
 {
   RootedObject obj(cx, &args.thisv().toObject());
   args.rval().setUndefined();
-  return ImplicitConvert(cx, args.get(0), GetCType(obj), GetData(obj), false, nullptr);
+  return ImplicitConvert(cx, args.get(0), GetCType(obj), GetData(obj),
+                         ConversionType::Setter, nullptr);
 }
 
 bool
@@ -6564,8 +7198,7 @@
 {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() != 0) {
-    JS_ReportError(cx, "address takes zero arguments");
-    return false;
+    return ArgumentLengthError(cx, "CData.prototype.address", "no", "s");
   }
 
   RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
@@ -6599,20 +7232,17 @@
 {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() != 2) {
-    JS_ReportError(cx, "cast takes two arguments");
-    return false;
+    return ArgumentLengthError(cx, "ctypes.cast", "two", "s");
   }
 
   if (args[0].isPrimitive() || !CData::IsCData(&args[0].toObject())) {
-    JS_ReportError(cx, "first argument must be a CData");
-    return false;
+    return ArgumentTypeMismatch(cx, "first ", "ctypes.cast", "a CData");
   }
   RootedObject sourceData(cx, &args[0].toObject());
   JSObject* sourceType = CData::GetCType(sourceData);
 
   if (args[1].isPrimitive() || !CType::IsCType(&args[1].toObject())) {
-    JS_ReportError(cx, "second argument must be a CType");
-    return false;
+    return ArgumentTypeMismatch(cx, "second ", "ctypes.cast", "a CType");
   }
 
   RootedObject targetType(cx, &args[1].toObject());
@@ -6640,13 +7270,11 @@
 {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() != 1) {
-    JS_ReportError(cx, "getRuntime takes one argument");
-    return false;
+    return ArgumentLengthError(cx, "ctypes.getRuntime", "one", "");
   }
 
   if (args[0].isPrimitive() || !CType::IsCType(&args[0].toObject())) {
-    JS_ReportError(cx, "first argument must be a CType");
-    return false;
+    return ArgumentTypeMismatch(cx, "", "ctypes.getRuntime", "a CType");
   }
 
   RootedObject targetType(cx, &args[0].toObject());
@@ -6673,8 +7301,11 @@
 {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() != 0) {
-    JS_ReportError(cx, "readString takes zero arguments");
-    return false;
+    if (inflateUTF8 == JS::UTF8CharsToNewTwoByteCharsZ) {
+      return ArgumentLengthError(cx, "CData.prototype.readString", "no", "s");
+    }
+    return ArgumentLengthError(cx, "CData.prototype.readStringReplaceMalformed",
+                               "no", "s");
   }
 
   JSObject* obj = CDataFinalizer::GetCData(cx, JS_THIS_OBJECT(cx, vp));
@@ -6789,8 +7420,7 @@
 {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() != 0) {
-    JS_ReportError(cx, "toSource takes zero arguments");
-    return false;
+    return ArgumentLengthError(cx, "CData.prototype.toSource", "no", "s");
   }
 
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
@@ -7018,8 +7648,7 @@
   }
 
   if (args.length() != 2) {
-    JS_ReportError(cx, "CDataFinalizer takes 2 arguments");
-    return false;
+    return ArgumentLengthError(cx, "CDataFinalizer constructor", "two", "s");
   }
 
   JS::HandleValue valCodePtr = args[1];
@@ -7044,7 +7673,7 @@
   TypeCode typCodePtr = CType::GetTypeCode(objCodePtrType);
   if (typCodePtr != TYPE_pointer) {
     return TypeError(cx, "a CData object of a function _pointer_ type",
-                     valCodePtrType);
+                     valCodePtr);
   }
 
   JSObject* objCodeType = PointerType::GetBaseType(objCodePtrType);
@@ -7053,12 +7682,12 @@
   TypeCode typCode = CType::GetTypeCode(objCodeType);
   if (typCode != TYPE_function) {
     return TypeError(cx, "a CData object of a _function_ pointer type",
-                     valCodePtrType);
+                     valCodePtr);
   }
   uintptr_t code = *reinterpret_cast<uintptr_t*>(CData::GetData(objCodePtr));
   if (!code) {
     return TypeError(cx, "a CData object of a _non-NULL_ function pointer type",
-                     valCodePtrType);
+                     valCodePtr);
   }
 
   FunctionInfo* funInfoFinalizer =
@@ -7084,16 +7713,17 @@
   size_t sizeArg;
   RootedValue valData(cx, args[0]);
   if (!CType::GetSafeSize(objArgType, &sizeArg)) {
-    return TypeError(cx, "(an object with known size)", valData);
+    RootedValue valCodeType(cx, ObjectValue(*objCodeType));
+    return TypeError(cx, "a function with one known size argument",
+                     valCodeType);
   }
 
   ScopedJSFreePtr<void> cargs(malloc(sizeArg));
 
   if (!ImplicitConvert(cx, valData, objArgType, cargs.get(),
-                       false, &freePointer)) {
-    RootedValue valArgType(cx, ObjectValue(*objArgType));
-    return TypeError(cx, "(an object that can be converted to the following type)",
-                     valArgType);
+                       ConversionType::Finalizer, &freePointer,
+                       objCodePtrType, 0)) {
+    return false;
   }
   if (freePointer) {
     // Note: We could handle that case, if necessary.
@@ -7129,7 +7759,7 @@
         MOZ_CRASH("object with unknown size");
       }
       if (sizeBestArg != sizeArg) {
-        return TypeError(cx, "(an object with the same size as that expected by the C finalization function)", valData);
+        return FinalizerSizeError(cx, objCodePtrType, valData);
       }
     }
   }
@@ -7232,16 +7862,16 @@
 {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() != 0) {
-    JS_ReportError(cx, "CDataFinalizer.prototype.forget takes no arguments");
-    return false;
+    return ArgumentLengthError(cx, "CDataFinalizer.prototype.forget", "no",
+                               "s");
   }
 
   JS::Rooted<JSObject*> obj(cx, args.thisv().toObjectOrNull());
   if (!obj)
     return false;
   if (!CDataFinalizer::IsCDataFinalizer(obj)) {
-    RootedValue val(cx, ObjectValue(*obj));
-    return TypeError(cx, "a CDataFinalizer", val);
+    JS_ReportError(cx, "not a CDataFinalizer");
+    return false;
   }
 
   CDataFinalizer::Private* p = (CDataFinalizer::Private*)
@@ -7280,16 +7910,16 @@
 {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() != 0) {
-    JS_ReportError(cx, "CDataFinalizer.prototype.dispose takes no arguments");
-    return false;
+    return ArgumentLengthError(cx, "CDataFinalizer.prototype.dispose", "no",
+                               "s");
   }
 
   RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
   if (!obj)
     return false;
   if (!CDataFinalizer::IsCDataFinalizer(obj)) {
-    RootedValue val(cx, ObjectValue(*obj));
-    return TypeError(cx, "a CDataFinalizer", val);
+    JS_ReportError(cx, "not a CDataFinalizer");
+    return false;
   }
 
   CDataFinalizer::Private* p = (CDataFinalizer::Private*)
@@ -7454,8 +8084,12 @@
                     bool isUnsigned)
 {
   if (args.length() > 1) {
-    JS_ReportError(cx, "toString takes zero or one argument");
-    return false;
+    if (isUnsigned) {
+      return ArgumentLengthError(cx, "UInt64.prototype.toString",
+                                 "at most one", "");
+    }
+    return ArgumentLengthError(cx, "Int64.prototype.toString",
+                               "at most one", "");
   }
 
   int radix = 10;
@@ -7464,8 +8098,10 @@
     if (arg.isInt32())
       radix = arg.toInt32();
     if (!arg.isInt32() || radix < 2 || radix > 36) {
-      JS_ReportError(cx, "radix argument must be an integer between 2 and 36");
-      return false;
+      if (isUnsigned) {
+        return ArgumentRangeMismatch(cx, "", "UInt64.prototype.toString", "an integer at least 2 and no greater than 36");
+      }
+      return ArgumentRangeMismatch(cx, "", "Int64.prototype.toString", "an integer at least 2 and no greater than 36");
     }
   }
 
@@ -7491,8 +8127,10 @@
                     bool isUnsigned)
 {
   if (args.length() != 0) {
-    JS_ReportError(cx, "toSource takes zero arguments");
-    return false;
+    if (isUnsigned) {
+      return ArgumentLengthError(cx, "UInt64.prototype.toSource", "no", "s");
+    }
+    return ArgumentLengthError(cx, "Int64.prototype.toSource", "no", "s");
   }
 
   // Return a decimal string suitable for constructing the number.
@@ -7523,13 +8161,13 @@
 
   // Construct and return a new Int64 object.
   if (args.length() != 1) {
-    JS_ReportError(cx, "Int64 takes one argument");
-    return false;
+    return ArgumentLengthError(cx, "Int64 constructor", "one", "");
   }
 
   int64_t i = 0;
-  if (!jsvalToBigInteger(cx, args[0], true, &i))
-    return TypeError(cx, "int64", args[0]);
+  if (!jsvalToBigInteger(cx, args[0], true, &i)) {
+    return ArgumentConvError(cx, args[0], "Int64", 0);
+  }
 
   // Get ctypes.Int64.prototype from the 'prototype' property of the ctor.
   RootedValue slot(cx);
@@ -7586,13 +8224,14 @@
 Int64::Compare(JSContext* cx, unsigned argc, jsval* vp)
 {
   CallArgs args = CallArgsFromVp(argc, vp);
-  if (args.length() != 2 ||
-      args[0].isPrimitive() ||
-      args[1].isPrimitive() ||
-      !Int64::IsInt64(&args[0].toObject()) ||
-      !Int64::IsInt64(&args[1].toObject())) {
-    JS_ReportError(cx, "compare takes two Int64 arguments");
-    return false;
+  if (args.length() != 2) {
+    return ArgumentLengthError(cx, "Int64.compare", "two", "s");
+  }
+  if (args[0].isPrimitive() || !Int64::IsInt64(&args[0].toObject())) {
+    return ArgumentTypeMismatch(cx, "first ", "Int64.compare", "a Int64");
+  }
+  if (args[1].isPrimitive() ||!Int64::IsInt64(&args[1].toObject())) {
+    return ArgumentTypeMismatch(cx, "second ", "Int64.compare", "a Int64");
   }
 
   JSObject* obj1 = &args[0].toObject();
@@ -7619,10 +8258,11 @@
 Int64::Lo(JSContext* cx, unsigned argc, jsval* vp)
 {
   CallArgs args = CallArgsFromVp(argc, vp);
-  if (args.length() != 1 || args[0].isPrimitive() ||
-      !Int64::IsInt64(&args[0].toObject())) {
-    JS_ReportError(cx, "lo takes one Int64 argument");
-    return false;
+  if (args.length() != 1) {
+    return ArgumentLengthError(cx, "Int64.lo", "one", "");
+  }
+  if (args[0].isPrimitive() || !Int64::IsInt64(&args[0].toObject())) {
+    return ArgumentTypeMismatch(cx, "", "Int64.lo", "a Int64");
   }
 
   JSObject* obj = &args[0].toObject();
@@ -7637,10 +8277,11 @@
 Int64::Hi(JSContext* cx, unsigned argc, jsval* vp)
 {
   CallArgs args = CallArgsFromVp(argc, vp);
-  if (args.length() != 1 || args[0].isPrimitive() ||
-      !Int64::IsInt64(&args[0].toObject())) {
-    JS_ReportError(cx, "hi takes one Int64 argument");
-    return false;
+  if (args.length() != 1) {
+    return ArgumentLengthError(cx, "Int64.hi", "one", "");
+  }
+  if (args[0].isPrimitive() || !Int64::IsInt64(&args[0].toObject())) {
+    return ArgumentTypeMismatch(cx, "", "Int64.hi", "a Int64");
   }
 
   JSObject* obj = &args[0].toObject();
@@ -7656,16 +8297,15 @@
 {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() != 2) {
-    JS_ReportError(cx, "join takes two arguments");
-    return false;
+    return ArgumentLengthError(cx, "Int64.join", "two", "s");
   }
 
   int32_t hi;
   uint32_t lo;
   if (!jsvalToInteger(cx, args[0], &hi))
-    return TypeError(cx, "int32", args[0]);
+    return ArgumentConvError(cx, args[0], "Int64.join", 0);
   if (!jsvalToInteger(cx, args[1], &lo))
-    return TypeError(cx, "uint32", args[1]);
+    return ArgumentConvError(cx, args[1], "Int64.join", 1);
 
   int64_t i = (int64_t(hi) << 32) + int64_t(lo);
 
@@ -7693,13 +8333,13 @@
 
   // Construct and return a new UInt64 object.
   if (args.length() != 1) {
-    JS_ReportError(cx, "UInt64 takes one argument");
-    return false;
+    return ArgumentLengthError(cx, "UInt64 constructor", "one", "");
   }
 
   uint64_t u = 0;
-  if (!jsvalToBigInteger(cx, args[0], true, &u))
-    return TypeError(cx, "uint64", args[0]);
+  if (!jsvalToBigInteger(cx, args[0], true, &u)) {
+    return ArgumentConvError(cx, args[0], "UInt64", 0);
+  }
 
   // Get ctypes.UInt64.prototype from the 'prototype' property of the ctor.
   RootedValue slot(cx);
@@ -7756,13 +8396,14 @@
 UInt64::Compare(JSContext* cx, unsigned argc, jsval* vp)
 {
   CallArgs args = CallArgsFromVp(argc, vp);
-  if (args.length() != 2 ||
-      args[0].isPrimitive() ||
-      args[1].isPrimitive() ||
-      !UInt64::IsUInt64(&args[0].toObject()) ||
-      !UInt64::IsUInt64(&args[1].toObject())) {
-    JS_ReportError(cx, "compare takes two UInt64 arguments");
-    return false;
+  if (args.length() != 2) {
+    return ArgumentLengthError(cx, "UInt64.compare", "two", "s");
+  }
+  if (args[0].isPrimitive() || !UInt64::IsUInt64(&args[0].toObject())) {
+    return ArgumentTypeMismatch(cx, "first ", "UInt64.compare", "a UInt64");
+  }
+  if (args[1].isPrimitive() || !UInt64::IsUInt64(&args[1].toObject())) {
+    return ArgumentTypeMismatch(cx, "second ", "UInt64.compare", "a UInt64");
   }
 
   JSObject* obj1 = &args[0].toObject();
@@ -7785,10 +8426,11 @@
 UInt64::Lo(JSContext* cx, unsigned argc, jsval* vp)
 {
   CallArgs args = CallArgsFromVp(argc, vp);
-  if (args.length() != 1 || args[0].isPrimitive() ||
-      !UInt64::IsUInt64(&args[0].toObject())) {
-    JS_ReportError(cx, "lo takes one UInt64 argument");
-    return false;
+  if (args.length() != 1) {
+    return ArgumentLengthError(cx, "UInt64.lo", "one", "");
+  }
+  if (args[0].isPrimitive() || !UInt64::IsUInt64(&args[0].toObject())) {
+    return ArgumentTypeMismatch(cx, "", "UInt64.lo", "a UInt64");
   }
 
   JSObject* obj = &args[0].toObject();
@@ -7803,10 +8445,11 @@
 UInt64::Hi(JSContext* cx, unsigned argc, jsval* vp)
 {
   CallArgs args = CallArgsFromVp(argc, vp);
-  if (args.length() != 1 || args[0].isPrimitive() ||
-      !UInt64::IsUInt64(&args[0].toObject())) {
-    JS_ReportError(cx, "hi takes one UInt64 argument");
-    return false;
+  if (args.length() != 1) {
+    return ArgumentLengthError(cx, "UInt64.hi", "one", "");
+  }
+  if (args[0].isPrimitive() || !UInt64::IsUInt64(&args[0].toObject())) {
+    return ArgumentTypeMismatch(cx, "", "UInt64.hi", "a UInt64");
   }
 
   JSObject* obj = &args[0].toObject();
@@ -7822,16 +8465,15 @@
 {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (args.length() != 2) {
-    JS_ReportError(cx, "join takes two arguments");
-    return false;
+    return ArgumentLengthError(cx, "UInt64.join", "two", "s");
   }
 
   uint32_t hi;
   uint32_t lo;
   if (!jsvalToInteger(cx, args[0], &hi))
-    return TypeError(cx, "uint32_t", args[0]);
+    return ArgumentConvError(cx, args[0], "UInt64.join", 0);
   if (!jsvalToInteger(cx, args[1], &lo))
-    return TypeError(cx, "uint32_t", args[1]);
+    return ArgumentConvError(cx, args[1], "UInt64.join", 1);
 
   uint64_t u = (uint64_t(hi) << 32) + uint64_t(lo);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/ctypes/CTypes.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/ctypes/CTypes.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/ctypes/CTypes.h	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/ctypes/CTypes.h	2015-04-24 19:31:00.000000000 +0000
@@ -10,6 +10,7 @@
 
 #include "ffi.h"
 #include "jsalloc.h"
+#include "jsprf.h"
 #include "prlink.h"
 
 #include "ctypes/typedefs.h"
@@ -53,6 +54,32 @@
     v[i + vlen] = array[i];
 }
 
+template <class T, size_t N, class AP>
+void
+AppendChars(Vector<T, N, AP>& v, const char c, size_t count)
+{
+  size_t vlen = v.length();
+  if (!v.resize(vlen + count))
+    return;
+
+  for (size_t i = 0; i < count; ++i)
+    v[i + vlen] = c;
+}
+
+template <class T, size_t N, class AP>
+void
+AppendUInt(Vector<T, N, AP>& v, unsigned n)
+{
+  char array[16];
+  size_t alen = JS_snprintf(array, 16, "%u", n);
+  size_t vlen = v.length();
+  if (!v.resize(vlen + alen))
+    return;
+
+  for (size_t i = 0; i < alen; ++i)
+    v[i + vlen] = array[i];
+}
+
 template <class T, size_t N, size_t M, class AP>
 void
 AppendString(Vector<T, N, AP>& v, Vector<T, M, AP>& w)
@@ -254,6 +281,9 @@
 
 typedef HashMap<JSFlatString*, FieldInfo, FieldHashPolicy, SystemAllocPolicy> FieldInfoHash;
 
+void
+TraceFieldInfoHash(JSTracer* trc, FieldInfoHash* fields);
+
 // Descriptor of ABI, return type, argument types, and variadicity for a
 // FunctionType.
 struct FunctionInfo
@@ -375,6 +405,7 @@
   SLOT_REFERENT = 1, // JSObject this object must keep alive, if any
   SLOT_DATA     = 2, // pointer to a buffer containing the binary data
   SLOT_OWNS     = 3, // JSVAL_TRUE if this CData owns its own buffer
+  SLOT_FUNNAME  = 4, // JSString representing the function name
   CDATA_SLOTS
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/ctypes/ctypes.msg thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/ctypes/ctypes.msg
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/ctypes/ctypes.msg	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/ctypes/ctypes.msg	2015-04-24 19:31:00.000000000 +0000
@@ -10,5 +10,30 @@
  */
 
 MSG_DEF(CTYPESMSG_PLACEHOLDER_0, 0, JSEXN_NONE, NULL)
-MSG_DEF(CTYPESMSG_TYPE_ERROR,    2, JSEXN_TYPEERR, "expected type {0}, got {1}")
 
+/* type conversion */
+MSG_DEF(CTYPESMSG_CONV_ERROR_ARG,3, JSEXN_TYPEERR, "can't pass {0} to argument {1} of {2}")
+MSG_DEF(CTYPESMSG_CONV_ERROR_ARRAY,3, JSEXN_TYPEERR, "can't convert {0} to element {1} of the type {2}")
+MSG_DEF(CTYPESMSG_CONV_ERROR_FIN,2, JSEXN_TYPEERR, "can't convert {0} to the type of argument 1 of {1}")
+MSG_DEF(CTYPESMSG_CONV_ERROR_RET,2, JSEXN_TYPEERR, "can't convert {0} to the return type of {1}")
+MSG_DEF(CTYPESMSG_CONV_ERROR_SET,2, JSEXN_TYPEERR, "can't convert {0} to the type {1}")
+MSG_DEF(CTYPESMSG_CONV_ERROR_STRUCT,5, JSEXN_TYPEERR, "can't convert {0} to the '{1}' field ({2}) of {3}{4}")
+MSG_DEF(CTYPESMSG_NON_PRIMITIVE, 1, JSEXN_TYPEERR, ".value only works on character and numeric types, not `{0}`")
+MSG_DEF(CTYPESMSG_TYPE_ERROR,    2, JSEXN_TYPEERR, "expected {0}, got {1}")
+
+/* array */
+MSG_DEF(CTYPESMSG_ARRAY_MISMATCH,4, JSEXN_TYPEERR, "length of {0} does not match to the length of the type {1} (expected {2}, got {3})")
+MSG_DEF(CTYPESMSG_ARRAY_OVERFLOW,4, JSEXN_TYPEERR, "length of {0} does not fit to the length of the type {1} (expected {2} or lower, got {3})")
+
+/* struct */
+MSG_DEF(CTYPESMSG_FIELD_MISMATCH,5, JSEXN_TYPEERR, "property count of {0} does not match to field count of the type {1} (expected {2}, got {3}){4}")
+MSG_DEF(CTYPESMSG_PROP_NONSTRING,3, JSEXN_TYPEERR, "property name {0} of {1} is not a string{2}")
+
+/* data finalizer */
+MSG_DEF(CTYPESMSG_EMPTY_FIN,     1, JSEXN_TYPEERR, "attempting to convert an empty CDataFinalizer{0}")
+MSG_DEF(CTYPESMSG_FIN_SIZE_ERROR,2, JSEXN_TYPEERR, "expected an object with the same size as argument 1 of {0}, got {1}")
+
+/* native function */
+MSG_DEF(CTYPESMSG_ARG_RANGE_MISMATCH,3, JSEXN_RANGEERR, "{0}argument of {1} must be {2}")
+MSG_DEF(CTYPESMSG_ARG_TYPE_MISMATCH,3, JSEXN_TYPEERR, "{0}argument of {1} must be {2}")
+MSG_DEF(CTYPESMSG_WRONG_ARG_LENGTH,3, JSEXN_TYPEERR, "{0} takes {1} argument{2}")
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/ctypes/Library.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/ctypes/Library.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/ctypes/Library.cpp	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/ctypes/Library.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -35,7 +35,7 @@
 static const JSClass sLibraryClass = {
   "Library",
   JSCLASS_HAS_RESERVED_SLOTS(LIBRARY_SLOTS),
-  nullptr, nullptr, nullptr, nullptr,
+  nullptr, nullptr, nullptr, nullptr, nullptr,
   nullptr, nullptr, nullptr, Library::Finalize
 };
 
@@ -321,7 +321,7 @@
 
   void* data;
   PRFuncPtr fnptr;
-  JSString* nameStr = args[0].toString();
+  RootedString nameStr(cx, args[0].toString());
   AutoCString symbol;
   if (isFunction) {
     // Build the symbol, with mangling if necessary.
@@ -352,6 +352,9 @@
   if (!result)
     return false;
 
+  if (isFunction)
+    JS_SetReservedSlot(result, SLOT_FUNNAME, StringValue(nameStr));
+
   args.rval().setObject(*result);
 
   // Seal the CData object, to prevent modification of the function pointer.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Barrier.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Barrier.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Barrier.h	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Barrier.h	2015-04-24 19:31:00.000000000 +0000
@@ -173,7 +173,6 @@
 class LazyScript;
 class NativeObject;
 class NestedScopeObject;
-class Nursery;
 class PlainObject;
 class PropertyName;
 class SavedFrame;
@@ -405,7 +404,7 @@
     static JS::shadow::Runtime* shadowRuntimeFromAnyThread(jsid id) {
         return reinterpret_cast<JS::shadow::Runtime*>(runtimeFromAnyThread(id));
     }
-    static void preBarrierImpl(Zone *zone, jsid id) {
+    static void preBarrierImpl(Zone* zone, jsid id) {
         JS::shadow::Zone* shadowZone = JS::shadow::Zone::asShadowZone(zone);
         if (shadowZone->needsIncrementalBarrier()) {
             jsid tmp(id);
@@ -590,7 +589,8 @@
         value = ptr;
     }
 
-    const T * address() { return &value; }
+    T get() const { return value; }
+    const T* address() { return &value; }
 };
 
 /*
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/GCRuntime.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/GCRuntime.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/GCRuntime.h	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/GCRuntime.h	2015-04-24 19:31:00.000000000 +0000
@@ -30,11 +30,8 @@
 
 typedef Vector<JS::Zone*, 4, SystemAllocPolicy> ZoneVector;
 
-struct FinalizePhase;
 class MarkingValidator;
-struct AutoPrepareForTracing;
 class AutoTraceSession;
-struct ArenasToUpdate;
 struct MovingTracer;
 
 class ChunkPool
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Heap.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Heap.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Heap.h	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Heap.h	2015-04-24 19:31:00.000000000 +0000
@@ -27,8 +27,6 @@
 #include "js/HeapAPI.h"
 #include "js/TracingAPI.h"
 
-struct JSCompartment;
-
 struct JSRuntime;
 
 namespace JS {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Marking.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Marking.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Marking.cpp	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Marking.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -42,53 +42,6 @@
 
 JS_PUBLIC_DATA(void * const) JS::NullPtr::constNullValue = nullptr;
 
-static void
-PushMarkStack(GCMarker* gcmarker, JSObject* thing) {
-    gcmarker->traverse(thing);
-}
-static void
-PushMarkStack(GCMarker* gcmarker, ObjectGroup* thing) {
-    gcmarker->traverse(thing);
-}
-static void
-PushMarkStack(GCMarker* gcmarker, jit::JitCode* thing) {
-    gcmarker->traverse(thing);
-}
-static void
-PushMarkStack(GCMarker* gcmarker, JSScript* thing) {
-    gcmarker->traverse(thing);
-}
-static void
-PushMarkStack(GCMarker* gcmarker, LazyScript* thing) {
-    gcmarker->traverse(thing);
-}
-static void
-PushMarkStack(GCMarker* gcmarker, Shape* thing) {
-    gcmarker->traverse(thing);
-}
-static void
-PushMarkStack(GCMarker* gcmarker, BaseShape* thing) {
-    gcmarker->traverse(thing);
-}
-static void
-PushMarkStack(GCMarker* gcmarker, JSString* str) {
-    // Permanent atoms might not be associated with this runtime.
-    if (str->isPermanentAtom())
-        return;
-
-    gcmarker->traverse(str);
-}
-static void
-PushMarkStack(GCMarker* gcmarker, JS::Symbol* sym) {
-    // Well-known symbols might not be associated with this runtime.
-    if (sym->isWellKnownSymbol())
-        return;
-
-    gcmarker->traverse(sym);
-}
-
-/*** Object Marking ***/
-
 #if defined(DEBUG)
 template<typename T>
 static inline bool
@@ -147,8 +100,8 @@
 }
 
 template<typename T>
-static inline void
-CheckMarkedThing(JSTracer* trc, T thing)
+void
+js::CheckTracedThing(JSTracer* trc, T thing)
 {
 #ifdef DEBUG
     MOZ_ASSERT(trc);
@@ -214,32 +167,39 @@
 #endif
 }
 
+namespace js {
 template<>
 void
-CheckMarkedThing<Value>(JSTracer* trc, Value val)
+CheckTracedThing<Value>(JSTracer* trc, Value val)
 {
 #ifdef DEBUG
     if (val.isString())
-        CheckMarkedThing(trc, val.toString());
+        CheckTracedThing(trc, val.toString());
     else if (val.isObject())
-        CheckMarkedThing(trc, &val.toObject());
+        CheckTracedThing(trc, &val.toObject());
     else if (val.isSymbol())
-        CheckMarkedThing(trc, val.toSymbol());
+        CheckTracedThing(trc, val.toSymbol());
 #endif
 }
 
 template <>
 void
-CheckMarkedThing<jsid>(JSTracer* trc, jsid id)
+CheckTracedThing<jsid>(JSTracer* trc, jsid id)
 {
 #ifdef DEBUG
     if (JSID_IS_STRING(id))
-        CheckMarkedThing(trc, JSID_TO_STRING(id));
+        CheckTracedThing(trc, JSID_TO_STRING(id));
     else if (JSID_IS_SYMBOL(id))
-        CheckMarkedThing(trc, JSID_TO_SYMBOL(id));
+        CheckTracedThing(trc, JSID_TO_SYMBOL(id));
 #endif
 }
 
+#define IMPL_CHECK_TRACED_THING(_, type, __) \
+    template void CheckTracedThing<type*>(JSTracer*, type*);
+FOR_EACH_GC_LAYOUT(IMPL_CHECK_TRACED_THING);
+#undef IMPL_CHECK_TRACED_THING
+} // namespace js
+
 #define JS_ROOT_MARKING_ASSERT(trc) \
     MOZ_ASSERT_IF(trc->isMarkingTracer(), \
                   trc->runtime()->gc.state() == NO_INCREMENTAL || \
@@ -416,6 +376,28 @@
 template void js::TraceCrossCompartmentEdge<Value>(JSTracer*, JSObject*, BarrieredBase<Value>*,
                                                    const char*);
 
+template <typename T>
+void
+js::TraceProcessGlobalRoot(JSTracer* trc, T* thing, const char* name)
+{
+    JS_ROOT_MARKING_ASSERT(trc);
+    MOZ_ASSERT(ThingIsPermanentAtomOrWellKnownSymbol(thing));
+
+    // We have to mark permanent atoms and well-known symbols through a special
+    // method because the default DoMarking implementation automatically skips
+    // them. Fortunately, atoms (permanent and non) cannot refer to other GC
+    // things so they do not need to go through the mark stack and may simply
+    // be marked directly.  Moreover, well-known symbols can refer only to
+    // permanent atoms, so likewise require no subsquent marking.
+    CheckTracedThing(trc, thing);
+    if (trc->isMarkingTracer())
+        thing->markIfUnmarked(gc::BLACK);
+    else
+        DoCallback(trc->asCallbackTracer(), ConvertToBase(&thing), name);
+}
+template void js::TraceProcessGlobalRoot<JSAtom>(JSTracer*, JSAtom*, const char*);
+template void js::TraceProcessGlobalRoot<JS::Symbol>(JSTracer*, JS::Symbol*, const char*);
+
 // This method is responsible for dynamic dispatch to the real tracer
 // implementation. Consider replacing this choke point with virtual dispatch:
 // a sufficiently smart C++ compiler may be able to devirtualize some paths.
@@ -430,8 +412,6 @@
             mozilla::IsSame<T, jsid>::value,
             "Only the base cell layout types are allowed into marking/tracing internals");
 #undef IS_SAME_TYPE_OR
-    CheckMarkedThing(trc, *thingp);
-
     if (trc->isMarkingTracer())
         return DoMarking(static_cast<GCMarker*>(trc), *thingp);
     return DoCallback(trc->asCallbackTracer(), thingp, name);
@@ -467,7 +447,7 @@
 MustSkipMarking<JSString*>(JSString* str)
 {
     // Don't mark permanent atoms, as they may be associated with another
-    // runtime. Note that PushMarkStack() also checks this, but we need to not
+    // runtime. Note that traverse() also checks this, but we need to not
     // run the isGCMarking test from off-main-thread, so have to check it here
     // too.
     return str->isPermanentAtom() ||
@@ -492,7 +472,7 @@
     if (MustSkipMarking(thing))
         return;
 
-    PushMarkStack(gcmarker, thing);
+    gcmarker->traverse(thing);
 
     // Mark the compartment as live.
     SetMaybeAliveFlag(thing);
@@ -520,41 +500,67 @@
         DoMarking(gcmarker, JSID_TO_SYMBOL(id));
 }
 
-namespace js {
-namespace gc {
-
+// The default traversal calls out to the fully generic traceChildren function
+// to visit the child edges. In the absense of other traversal mechanisms, this
+// function will rapidly grow the stack past its bounds and crash the process.
+// Thus, this generic tracing should only be used in cases where subsequent
+// tracing will not recurse.
+template <typename T>
 void
-MarkPermanentAtom(JSTracer* trc, JSAtom* atom, const char* name)
+js::GCMarker::traverse(T* thing)
 {
-    MOZ_ASSERT(atom->isPermanent());
-
-    // We have to mark permanent atoms through a special method because the
-    // default DoMarking implementation automatically skips them. Fortunatly,
-    // atoms cannot refer to other GC things, so they do not need to go through
-    // the mark stack and may simply be marked directly.
-    CheckMarkedThing(trc, atom);
-    if (trc->isMarkingTracer())
-        atom->markIfUnmarked();
-    else
-        DoCallback(trc->asCallbackTracer(), reinterpret_cast<JSString**>(&atom), name);
+    auto asBase = static_cast<typename BaseGCType<T>::type*>(thing);
+    MOZ_ASSERT(!ThingIsPermanentAtomOrWellKnownSymbol(asBase));
+    if (mark(asBase))
+        thing->traceChildren(this);
 }
 
+// Shape, BaseShape, String, and Symbol are extremely common, but have simple
+// patterns of recursion. We traverse trees of these edges immediately, with
+// aggressive, manual inlining, implemented by eagerlyTraceChildren.
+template <typename T>
 void
-MarkWellKnownSymbol(JSTracer* trc, JS::Symbol* sym)
+js::GCMarker::markAndScan(T* thing)
 {
-    if (!sym)
+    if (ThingIsPermanentAtomOrWellKnownSymbol(thing))
         return;
-    MOZ_ASSERT(sym->isWellKnownSymbol());
+    if (mark(thing))
+        eagerlyMarkChildren(thing);
+}
+namespace js {
+template <> void GCMarker::traverse(Shape* thing) { markAndScan(thing); }
+template <> void GCMarker::traverse(BaseShape* thing) { markAndScan(thing); }
+template <> void GCMarker::traverse(JSString* thing) { markAndScan(thing); }
+template <> void GCMarker::traverse(JS::Symbol* thing) { markAndScan(thing); }
+} // namespace js
+
+// Object and ObjectGroup are extremely common and can contain arbitrarily
+// nested graphs, so are not trivially inlined. In this case we use a mark
+// stack to control recursion. JitCode shares none of these properties, but is
+// included for historical reasons.
+template <typename T>
+void
+js::GCMarker::markAndPush(StackTag tag, T* thing)
+{
+    if (mark(thing))
+        pushTaggedPtr(tag, thing);
+}
+namespace js {
+template <> void GCMarker::traverse(JSObject* thing) { markAndPush(ObjectTag, thing); }
+template <> void GCMarker::traverse(ObjectGroup* thing) { markAndPush(GroupTag, thing); }
+template <> void GCMarker::traverse(jit::JitCode* thing) { markAndPush(JitCodeTag, thing); }
+} // namespace js
 
-    // As per permanent atoms, the normal marking path is not adequate.
-    CheckMarkedThing(trc, sym);
-    if (trc->isMarkingTracer()) {
-        // Permanent atoms are marked before well-known symbols.
-        MOZ_ASSERT(sym->description()->isMarked());
-        sym->markIfUnmarked();
-    } else {
-        DoCallback(trc->asCallbackTracer(), &sym, "wellKnownSymbol");
-    }
+template <typename T>
+bool
+js::GCMarker::mark(T* thing)
+{
+    CheckTracedThing(this, thing);
+    JS_COMPARTMENT_ASSERT(runtime(), thing);
+    MOZ_ASSERT(!IsInsideNursery(gc::TenuredCell::fromPointer(thing)));
+    return gc::ParticipatesInCC<T>::value
+           ? gc::TenuredCell::fromPointer(thing)->markIfUnmarked(markColor())
+           : gc::TenuredCell::fromPointer(thing)->markIfUnmarked(gc::BLACK);
 }
 
 template <typename T>
@@ -707,6 +713,9 @@
     return rv;
 }
 
+namespace js {
+namespace gc {
+
 template <typename T>
 bool
 IsMarkedUnbarriered(T* thingp)
@@ -926,7 +935,7 @@
 /*** Push Mark Stack ***/
 
 /*
- * PushMarkStack for BaseShape unpacks its children directly onto the mark
+ * GCMarker::traverse for BaseShape unpacks its children directly onto the mark
  * stack. For a pre-barrier between incremental slices, this may result in
  * objects in the nursery getting pushed onto the mark stack. It is safe to
  * ignore these objects because they will be marked by the matching
@@ -956,13 +965,13 @@
 GCMarker::eagerlyMarkChildren(Shape* shape)
 {
   restart:
-    PushMarkStack(this, shape->base());
+    traverse(shape->base());
 
     const BarrieredBase<jsid>& id = shape->propidRef();
     if (JSID_IS_STRING(id))
-        PushMarkStack(this, JSID_TO_STRING(id));
+        traverse(JSID_TO_STRING(id));
     else if (JSID_IS_SYMBOL(id))
-        PushMarkStack(this, JSID_TO_SYMBOL(id));
+        traverse(JSID_TO_SYMBOL(id));
 
     if (shape->hasGetterObject())
         MaybePushMarkStackBetweenSlices(this, shape->getterObject());
@@ -1087,7 +1096,7 @@
 GCMarker::eagerlyMarkChildren(JS::Symbol* sym)
 {
     if (JSString* desc = sym->description())
-        PushMarkStack(this, desc);
+        traverse(desc);
 }
 
 /*
@@ -1148,7 +1157,7 @@
     group->compartment()->mark();
 
     if (GlobalObject* global = group->compartment()->unsafeUnbarrieredMaybeGlobal())
-        PushMarkStack(gcmarker, global);
+        gcmarker->traverse(global);
 
     if (group->newScript())
         group->newScript()->trace(gcmarker);
@@ -1160,7 +1169,7 @@
         group->unboxedLayout().trace(gcmarker);
 
     if (ObjectGroup* unboxedGroup = group->maybeOriginalUnboxedGroup())
-        PushMarkStack(gcmarker, unboxedGroup);
+        gcmarker->traverse(unboxedGroup);
 
     if (TypeDescr* descr = group->maybeTypeDescr())
         gcmarker->traverse(descr);
@@ -1211,7 +1220,7 @@
 PushArenaTyped(GCMarker* gcmarker, ArenaHeader* aheader)
 {
     for (ArenaCellIterUnderGC i(aheader); !i.done(); i.next())
-        PushMarkStack(gcmarker, i.get<T>());
+        gcmarker->traverse(i.get<T>());
 }
 
 void
@@ -1532,7 +1541,7 @@
                           clasp->flags & JSCLASS_IMPLEMENTS_BARRIERS);
             if (clasp->trace == InlineTypedObject::obj_trace) {
                 Shape* shape = obj->as<InlineTypedObject>().shapeFromGC();
-                PushMarkStack(this, shape);
+                traverse(shape);
                 TypeDescr* descr = &obj->as<InlineTypedObject>().typeDescr();
                 if (!descr->hasTraceList())
                     return;
@@ -1560,7 +1569,7 @@
         NativeObject* nobj = &obj->as<NativeObject>();
 
         Shape* shape = nobj->lastProperty();
-        PushMarkStack(this, shape);
+        traverse(shape);
 
         unsigned nslots = nobj->slotSpan();
 
@@ -1642,24 +1651,6 @@
     return true;
 }
 
-template <typename T>
-void
-GCMarker::dispatchToTraceChildren(T* thing)
-{
-    thing->traceChildren(this);
-}
-
-template <typename T>
-bool
-GCMarker::mark(T* thing)
-{
-    JS_COMPARTMENT_ASSERT(runtime(), thing);
-    MOZ_ASSERT(!IsInsideNursery(gc::TenuredCell::fromPointer(thing)));
-    return gc::ParticipatesInCC<T>::value
-           ? gc::TenuredCell::fromPointer(thing)->markIfUnmarked(markColor())
-           : gc::TenuredCell::fromPointer(thing)->markIfUnmarked(gc::BLACK);
-}
-
 struct TraceChildrenFunctor {
     template <typename T>
     void operator()(JSTracer* trc, void* thing) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Marking.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Marking.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Marking.h	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Marking.h	2015-04-24 19:31:00.000000000 +0000
@@ -56,15 +56,14 @@
 TraceManuallyBarrieredCrossCompartmentEdge(JSTracer* trc, JSObject* src, T* dst,
                                            const char* name);
 
-namespace gc {
-
-/*** Object Marking ***/
-
+// Permanent atoms and well-known symbols are shared between runtimes and must
+// use a separate marking path so that we can filter them out of normal heap
+// tracing.
+template <typename T>
 void
-MarkPermanentAtom(JSTracer* trc, JSAtom* atom, const char* name);
+TraceProcessGlobalRoot(JSTracer* trc, T* thing, const char* name);
 
-void
-MarkWellKnownSymbol(JSTracer* trc, JS::Symbol* sym);
+namespace gc {
 
 /* Return true if the pointer is nullptr, or if it is a tagged pointer to
  * nullptr.
@@ -173,6 +172,10 @@
 bool
 UnmarkGrayShapeRecursively(Shape* shape);
 
+template<typename T>
+void
+CheckTracedThing(JSTracer* trc, T thing);
+
 } /* namespace js */
 
 #endif /* gc_Marking_h */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Memory.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Memory.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Memory.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Memory.h	2015-04-24 19:31:00.000000000 +0000
@@ -9,8 +9,6 @@
 
 #include <stddef.h>
 
-struct JSRuntime;
-
 namespace js {
 namespace gc {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Nursery.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Nursery.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Nursery.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Nursery.h	2015-04-24 19:31:00.000000000 +0000
@@ -27,7 +27,6 @@
 
 namespace js {
 
-class TypedArrayObject;
 class ObjectElements;
 class NativeObject;
 class HeapSlot;
@@ -37,15 +36,11 @@
 
 namespace gc {
 struct Cell;
-class Collector;
 class MinorCollectionTracer;
 } /* namespace gc */
 
 namespace jit {
-class CodeGenerator;
 class MacroAssembler;
-class ICStubCompiler;
-class BaselineCompiler;
 }
 
 class Nursery
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Statistics.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Statistics.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Statistics.cpp	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Statistics.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -529,6 +529,9 @@
                 continue;
             }
 
+            char budgetDescription[200];
+            slices[i].budget.describe(budgetDescription, sizeof(budgetDescription) - 1);
+
             ss.beginObject(nullptr);
             ss.extra("    ");
             ss.appendNumber("Slice", "%d", "", i);
@@ -536,6 +539,7 @@
             ss.extra(" (");
             ss.appendDecimal("When", "ms", t(slices[i].start - slices[0].start));
             ss.appendString("Reason", ExplainReason(slices[i].reason));
+            ss.appendString("Budget", budgetDescription);
             if (ss.isJSON()) {
                 ss.appendDecimal("Page Faults", "",
                                  double(slices[i].endFaults - slices[i].startFaults));
@@ -629,13 +633,16 @@
 UniqueChars
 Statistics::formatSliceDescription(unsigned i, const SliceData& slice)
 {
+    char budgetDescription[200];
+    slice.budget.describe(budgetDescription, sizeof(budgetDescription) - 1);
+
     const char* format =
 "\
   ---- Slice %u ----\n\
     Reason: %s\n\
     Reset: %s%s\n\
     Page Faults: %ld\n\
-    Pause: %.3fms  (@ %.3fms)\n\
+    Pause: %.3fms of %s budget (@ %.3fms)\n\
 ";
     char buffer[1024];
     memset(buffer, 0, sizeof(buffer));
@@ -643,7 +650,7 @@
                 ExplainReason(slice.reason),
                 slice.resetReason ? "yes - " : "no", slice.resetReason ? slice.resetReason : "",
                 uint64_t(slice.endFaults - slice.startFaults),
-                t(slice.duration()), t(slice.start - slices[0].start));
+                t(slice.duration()), budgetDescription, t(slice.start - slices[0].start));
     return make_string_copy(buffer);
 }
 
@@ -974,9 +981,6 @@
     if (fp)
         printStats();
 
-    if (!aborted)
-        Debugger::onGarbageCollection(runtime, *this);
-
     // Clear the timers at the end of a GC because we accumulate time in
     // between GCs for some (which come before PHASE_GC_BEGIN in the list.)
     PodZero(&phaseStartTimes[PHASE_GC_BEGIN], PHASE_LIMIT - PHASE_GC_BEGIN);
@@ -988,7 +992,7 @@
 
 void
 Statistics::beginSlice(const ZoneGCStats& zoneStats, JSGCInvocationKind gckind,
-                       JS::gcreason::Reason reason)
+                       SliceBudget budget, JS::gcreason::Reason reason)
 {
     this->zoneStats = zoneStats;
 
@@ -996,7 +1000,7 @@
     if (first)
         beginGC(gckind);
 
-    SliceData data(reason, PRMJ_Now(), GetPageFaultCount());
+    SliceData data(budget, reason, PRMJ_Now(), GetPageFaultCount());
     if (!slices.append(data)) {
         // OOM testing fails if we CrashAtUnhandlableOOM here.
         aborted = true;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Statistics.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Statistics.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Statistics.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Statistics.h	2015-04-24 19:31:00.000000000 +0000
@@ -18,8 +18,6 @@
 #include "js/GCAPI.h"
 #include "js/Vector.h"
 
-struct JSCompartment;
-
 namespace js {
 
 class GCParallelTask;
@@ -164,7 +162,7 @@
     void endParallelPhase(Phase phase, const GCParallelTask* task);
 
     void beginSlice(const ZoneGCStats& zoneStats, JSGCInvocationKind gckind,
-                    JS::gcreason::Reason reason);
+                    SliceBudget budget, JS::gcreason::Reason reason);
     void endSlice();
 
     void startTimingMutator();
@@ -208,13 +206,16 @@
     static const size_t MAX_NESTING = 20;
 
     struct SliceData {
-        SliceData(JS::gcreason::Reason reason, int64_t start, size_t startFaults)
-          : reason(reason), resetReason(nullptr), start(start), startFaults(startFaults)
+        SliceData(SliceBudget budget, JS::gcreason::Reason reason, int64_t start, size_t startFaults)
+          : budget(budget), reason(reason),
+            resetReason(nullptr),
+            start(start), startFaults(startFaults)
         {
             for (size_t i = 0; i < MAX_MULTIPARENT_PHASES + 1; i++)
                 mozilla::PodArrayZero(phaseTimes[i]);
         }
 
+        SliceBudget budget;
         JS::gcreason::Reason reason;
         const char* resetReason;
         int64_t start, end;
@@ -320,12 +321,12 @@
 struct AutoGCSlice
 {
     AutoGCSlice(Statistics& stats, const ZoneGCStats& zoneStats, JSGCInvocationKind gckind,
-                JS::gcreason::Reason reason
+                SliceBudget budget, JS::gcreason::Reason reason
                 MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
       : stats(stats)
     {
         MOZ_GUARD_OBJECT_NOTIFIER_INIT;
-        stats.beginSlice(zoneStats, gckind, reason);
+        stats.beginSlice(zoneStats, gckind, budget, reason);
     }
     ~AutoGCSlice() { stats.endSlice(); }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Tracer.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Tracer.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Tracer.cpp	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Tracer.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -29,10 +29,17 @@
 using namespace js::gc;
 using mozilla::DebugOnly;
 
+namespace js {
+template<typename T>
+void
+CheckTracedThing(JSTracer* trc, T thing);
+} // namespace js
+
 template <typename T>
 void
 DoCallback(JS::CallbackTracer* trc, T* thingp, const char* name)
 {
+    CheckTracedThing(trc, *thingp);
     JSGCTraceKind kind = MapTypeToTraceKind<typename mozilla::RemovePointer<T>::Type>::kind;
     JS::AutoTracingName ctx(trc, name);
     trc->invoke((void**)thingp, kind);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Tracer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Tracer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Tracer.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Tracer.h	2015-04-24 19:31:00.000000000 +0000
@@ -158,20 +158,7 @@
     void reset();
 
     // Mark the given GC thing and traverse its children at some point.
-    void traverse(JSObject* thing) { markAndPush(ObjectTag, thing); }
-    void traverse(ObjectGroup* thing) { markAndPush(GroupTag, thing); }
-    void traverse(jit::JitCode* thing) { markAndPush(JitCodeTag, thing); }
-    // Mark the given GC thing and then eagerly mark all children.
-    void traverse(Shape* thing) { markAndScan(thing); }
-    void traverse(BaseShape* thing) { markAndScan(thing); }
-    void traverse(JSString* thing) { markAndScan(thing); }
-    void traverse(JS::Symbol* thing) { markAndScan(thing); }
-    // The following traverse methods traverse immediately, go out-of-line to do so.
-    void traverse(JSScript* thing) { markAndTraverse(thing); }
-    void traverse(LazyScript* thing) { markAndTraverse(thing); }
-    // The other types are marked immediately and inline via a ScanFoo shared
-    // between PushMarkStack and the processMarkStackTop. Since ScanFoo is
-    // inline in Marking.cpp, we cannot inline it here, yet.
+    template <typename T> void traverse(T* thing);
 
     /*
      * Care must be taken changing the mark color from gray to black. The cycle
@@ -249,28 +236,13 @@
         pushTaggedPtr(ObjectTag, obj);
     }
 
-    template <typename T>
-    void markAndPush(StackTag tag, T* thing) {
-        if (mark(thing))
-            pushTaggedPtr(tag, thing);
-    }
-
-    template <typename T>
-    void markAndScan(T* thing) {
-        if (mark(thing))
-            eagerlyMarkChildren(thing);
-    }
+    template <typename T> void markAndPush(StackTag tag, T* thing);
+    template <typename T> void markAndScan(T* thing);
     void eagerlyMarkChildren(Shape* shape);
     void eagerlyMarkChildren(BaseShape* base);
     void eagerlyMarkChildren(JSString* str);
     void eagerlyMarkChildren(JS::Symbol* sym);
 
-    template <typename T>
-    void markAndTraverse(T* thing) {
-        if (mark(thing))
-            dispatchToTraceChildren(thing);
-    }
-
     // We may not have concrete types yet, so this has to be out of the header.
     template <typename T>
     void dispatchToTraceChildren(T* thing);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Zone.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Zone.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gc/Zone.cpp	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gc/Zone.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -264,7 +264,8 @@
 Zone::notifyObservingDebuggers()
 {
     for (CompartmentsInZoneIter comps(this); !comps.done(); comps.next()) {
-        RootedGlobalObject global(runtimeFromAnyThread(), comps->maybeGlobal());
+        JSRuntime* rt = runtimeFromAnyThread();
+        RootedGlobalObject global(rt, comps->maybeGlobal());
         if (!global)
             continue;
 
@@ -272,8 +273,16 @@
         if (!dbgs)
             continue;
 
-        for (GlobalObject::DebuggerVector::Range r = dbgs->all(); !r.empty(); r.popFront())
-            r.front()->debuggeeIsBeingCollected();
+        for (GlobalObject::DebuggerVector::Range r = dbgs->all(); !r.empty(); r.popFront()) {
+            if (!r.front()->debuggeeIsBeingCollected(rt->gc.majorGCCount())) {
+#ifdef DEBUG
+                fprintf(stderr,
+                        "OOM while notifying observing Debuggers of a GC: The onGarbageCollection\n"
+                        "hook will not be fired for this GC for some Debuggers!\n");
+#endif
+                return;
+            }
+        }
     }
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/gdb-tests.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/gdb-tests.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/gdb-tests.cpp	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/gdb-tests.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -17,7 +17,7 @@
     "global", JSCLASS_GLOBAL_FLAGS,
     nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, nullptr,
-    nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr,
     JS_GlobalObjectTraceHook
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/gdb-tests-gdb.py.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/gdb-tests-gdb.py.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/gdb-tests-gdb.py.in	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/gdb-tests-gdb.py.in	2015-04-24 19:31:00.000000000 +0000
@@ -6,3 +6,6 @@
 
 import mozilla.autoload
 mozilla.autoload.register(gdb.current_objfile())
+
+import mozilla.asmjs
+mozilla.asmjs.install()
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/moz.build	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/moz.build	2015-04-24 19:31:00.000000000 +0000
@@ -8,6 +8,7 @@
 
 UNIFIED_SOURCES += [
     'gdb-tests.cpp',
+    'tests/test-asmjs.cpp',
     'tests/test-Interpreter.cpp',
     'tests/test-jsid.cpp',
     'tests/test-JSObject.cpp',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/mozilla/asmjs.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/mozilla/asmjs.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/mozilla/asmjs.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/mozilla/asmjs.py	2015-04-24 19:31:00.000000000 +0000
@@ -0,0 +1,40 @@
+"""
+In asm code, out-of-bounds heap accesses cause segfaults, which the engine
+handles internally. Make GDB ignore them.
+"""
+
+import gdb
+
+SIGSEGV = 11
+
+# A sigaction buffer for each inferior process.
+sigaction_buffers = {}
+
+def on_stop(event):
+    if isinstance(event, gdb.SignalEvent) and event.stop_signal == 'SIGSEGV':
+        # Allocate memory for sigaction, once per js shell process.
+        process = gdb.selected_inferior()
+        buf = sigaction_buffers.get(process)
+        if buf is None:
+            buf = gdb.parse_and_eval("(struct sigaction *) malloc(sizeof(struct sigaction))")
+            sigaction_buffers[process] = buf
+
+        # See if AsmJSFaultHandler is installed as the SIGSEGV signal action.
+        sigaction_fn = gdb.parse_and_eval('__sigaction')
+        sigaction_fn(SIGSEGV, 0, buf)
+        AsmJSFaultHandler = gdb.parse_and_eval("AsmJSFaultHandler")
+        if buf['__sigaction_handler']['sa_handler'] == AsmJSFaultHandler:
+            # Advise the user that magic is happening.
+            print "js/src/gdb/mozilla/asmjs.py: Allowing AsmJSFaultHandler to run."
+
+            # If AsmJSFaultHandler doesn't handle this segfault, it will unhook
+            # itself and re-raise.
+            gdb.execute("continue")
+
+def on_exited(event):
+    if event.inferior in sigaction_buffers:
+        del sigaction_buffers[event.inferior]
+
+def install():
+    gdb.events.stop.connect(on_stop)
+    gdb.events.exited.connect(on_exited)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/README thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/README
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/README	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/README	2015-04-24 19:31:00.000000000 +0000
@@ -137,11 +137,11 @@
 
 These extensions have unit tests, invoked as follows:
 
-$ python run-tests.py [OPTIONS] LIBDIR [TESTS...]
+$ python run-tests.py [OPTIONS] OBJDIR [TESTS...]
 
-where LIBDIR is a directory containing a compiled SpiderMonkey library,
-libmozjs.so; TESTS are names of selected tests to run (if omitted, we run
-them all); and OPTIONS are drawn from the list below.
+where OBJDIR is a directory containing a standalone SpiderMonkey build; TESTS
+are names of selected tests to run (if omitted, we run them all); and OPTIONS
+are drawn from the list below.
 
 --gdb=EXECUTABLE
   Instead of running whatever 'gdb' we find in our search path, use
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/run-tests.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/run-tests.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/run-tests.py	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/run-tests.py	2015-04-24 19:31:00.000000000 +0000
@@ -157,7 +157,7 @@
                 '-nw',          # Don't create a window (unnecessary?)
                 '-nx',          # Don't read .gdbinit.
                 '--ex', 'add-auto-load-safe-path %s' % (OPTIONS.builddir,),
-                '--ex', 'set env LD_LIBRARY_PATH %s' % (OPTIONS.libdir,),
+                '--ex', 'set env LD_LIBRARY_PATH %s' % os.path.join(OPTIONS.objdir, 'js', 'src'),
                 '--ex', 'file %s' % (os.path.join(OPTIONS.builddir, 'gdb-tests'),),
                 '--eval-command', 'python testlibdir=%r' % (testlibdir,),
                 '--eval-command', 'python testscript=%r' % (self.test_path,),
@@ -230,13 +230,13 @@
     script_path = os.path.abspath(__file__)
     script_dir = os.path.dirname(script_path)
 
-    # LIBDIR is the directory in which we find the SpiderMonkey shared
-    # library, to link against.
+    # OBJDIR is a standalone SpiderMonkey build directory. This is where we
+    # find the SpiderMonkey shared library to link against.
     #
     # The [TESTS] optional arguments are paths of test files relative
     # to the jit-test/tests directory.
     from optparse import OptionParser
-    op = OptionParser(usage='%prog [options] LIBDIR [TESTS...]')
+    op = OptionParser(usage='%prog [options] OBJDIR [TESTS...]')
     op.add_option('-s', '--show-cmd', dest='show_cmd', action='store_true',
                   help='show GDB shell command run')
     op.add_option('-o', '--show-output', dest='show_output', action='store_true',
@@ -269,16 +269,17 @@
                   help='Build test executable in [BUILDDIR].')
     (OPTIONS, args) = op.parse_args(argv)
     if len(args) < 1:
-        op.error('missing LIBDIR argument')
-    OPTIONS.libdir = os.path.abspath(args[0])
+        op.error('missing OBJDIR argument')
+    OPTIONS.objdir = os.path.abspath(args[0])
+
     test_args = args[1:]
 
     if not OPTIONS.workercount:
         OPTIONS.workercount = get_cpu_count()
 
-    # Compute default for OPTIONS.builddir now, since we've computed OPTIONS.libdir.
+    # Compute default for OPTIONS.builddir now, since we've computed OPTIONS.objdir.
     if not OPTIONS.builddir:
-        OPTIONS.builddir = os.path.join(OPTIONS.libdir, 'gdb')
+        OPTIONS.builddir = os.path.join(OPTIONS.objdir, 'js', 'src', 'gdb')
 
     test_set = set()
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/tests/test-asmjs.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/tests/test-asmjs.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/tests/test-asmjs.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/tests/test-asmjs.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -0,0 +1,38 @@
+#include "gdb-tests.h"
+#include "jsapi.h"
+
+#include <string.h>
+
+FRAGMENT(asmjs, segfault) {
+    using namespace JS;
+
+    int line0 = __LINE__;
+    const char* bytes = "\n"
+        "function f(glob, ffi, heap) {\n"
+        "    \"use asm\";\n"
+        "    var f32 = new glob.Float32Array(heap);\n"
+        "    function g(n) {\n"
+        "        n = n | 0;\n"
+        "        return +f32[n>>2];\n"
+        "    }\n"
+        "    return g;\n"
+        "}\n"
+        "\n"
+        "var func = f(this, null, new ArrayBuffer(0x10000));\n"
+        "func(0x10000 << 2);\n"
+        "'ok'\n";
+
+    CompileOptions opts(cx);
+    opts.setFileAndLine(__FILE__, line0 + 1);
+    opts.asmJSOption = true;
+    RootedValue rval(cx);
+    bool ok;
+    ok = false;
+
+    ok = Evaluate(cx, opts, bytes, strlen(bytes), &rval);
+
+    breakpoint();
+
+    (void) ok;
+    (void) rval;
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/tests/test-asmjs.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/tests/test-asmjs.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/gdb/tests/test-asmjs.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/gdb/tests/test-asmjs.py	2015-04-24 19:31:00.000000000 +0000
@@ -0,0 +1,15 @@
+# Test for special asmjs SIGSEGV-handling.
+#
+# Expected behavior is for the asm.js code in the following fragment to trigger
+# SIGSEGV. The code in js/src/gdb/mozilla/asmjs.py should prevent GDB from
+# handling that signal.
+
+run_fragment('asmjs.segfault')
+
+# If SIGSEGV handling is broken, GDB would have stopped at the SIGSEGV signal.
+# The breakpoint would not have hit, and run_fragment would have thrown.
+#
+# So if we get here, and the asm.js code actually ran, we win.
+
+assert_pretty('ok', 'true')
+assert_pretty('rval', '$jsval("ok")')
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/arm/Assembler-arm.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/arm/Assembler-arm.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/arm/Assembler-arm.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/arm/Assembler-arm.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -2722,7 +2722,8 @@
 void
 Assembler::WritePoolHeader(uint8_t* start, Pool* p, bool isNatural)
 {
-    STATIC_ASSERT(sizeof(PoolHeader) == 4);
+    static_assert(sizeof(PoolHeader) == 4,
+                  "PoolHandler must have the correct size.");
     uint8_t* pool = start + 4;
     // Go through the usual rigmarole to get the size of the pool.
     pool += p->getPoolSize();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/arm/MoveEmitter-arm.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/arm/MoveEmitter-arm.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/arm/MoveEmitter-arm.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/arm/MoveEmitter-arm.h	2015-04-24 19:31:05.000000000 +0000
@@ -13,8 +13,6 @@
 namespace js {
 namespace jit {
 
-class CodeGenerator;
-
 class MoveEmitterARM
 {
     uint32_t inCycle_;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Bailouts.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Bailouts.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Bailouts.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Bailouts.h	2015-04-24 19:31:04.000000000 +0000
@@ -104,8 +104,6 @@
 // are making an attempt to mark the stack during a bailout.
 static uint8_t * const FAKE_JIT_TOP_FOR_BAILOUT = reinterpret_cast<uint8_t*>(0xba1);
 
-class JitCompartment;
-
 // BailoutStack is an architecture specific pointer to the stack, given by the
 // bailout handler.
 class BailoutStack;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/BaselineIC.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/BaselineIC.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/BaselineIC.cpp	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/BaselineIC.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -351,13 +351,13 @@
         break;
       }
       case ICStub::In_Native: {
-        ICIn_Native *inStub = toIn_Native();
+        ICIn_Native* inStub = toIn_Native();
         TraceEdge(trc, &inStub->shape(), "baseline-innative-stub-shape");
         TraceEdge(trc, &inStub->name(), "baseline-innative-stub-name");
         break;
       }
       case ICStub::In_NativePrototype: {
-        ICIn_NativePrototype *inStub = toIn_NativePrototype();
+        ICIn_NativePrototype* inStub = toIn_NativePrototype();
         TraceEdge(trc, &inStub->shape(), "baseline-innativeproto-stub-shape");
         TraceEdge(trc, &inStub->name(), "baseline-innativeproto-stub-name");
         TraceEdge(trc, &inStub->holder(), "baseline-innativeproto-stub-holder");
@@ -365,7 +365,7 @@
         break;
       }
       case ICStub::In_NativeDoesNotExist: {
-        ICIn_NativeDoesNotExist *inStub = toIn_NativeDoesNotExist();
+        ICIn_NativeDoesNotExist* inStub = toIn_NativeDoesNotExist();
         TraceEdge(trc, &inStub->name(), "baseline-innativedoesnotexist-stub-name");
         JS_STATIC_ASSERT(ICIn_NativeDoesNotExist::MAX_PROTO_CHAIN_DEPTH == 8);
         switch (inStub->protoChainDepth()) {
@@ -383,7 +383,7 @@
         break;
       }
       case ICStub::In_Dense: {
-        ICIn_Dense *inStub = toIn_Dense();
+        ICIn_Dense* inStub = toIn_Dense();
         TraceEdge(trc, &inStub->shape(), "baseline-in-dense-shape");
         break;
       }
@@ -3806,7 +3806,7 @@
 }
 
 static bool
-IsOptimizableElementPropertyName(JSContext *cx, HandleValue key, MutableHandleId idp)
+IsOptimizableElementPropertyName(JSContext* cx, HandleValue key, MutableHandleId idp)
 {
     if (!key.isString())
         return false;
@@ -5856,8 +5856,8 @@
 //
 
 static bool
-TryAttachDenseInStub(JSContext *cx, HandleScript script, ICIn_Fallback *stub,
-                     HandleValue key, HandleObject obj, bool *attached)
+TryAttachDenseInStub(JSContext* cx, HandleScript script, ICIn_Fallback* stub,
+                     HandleValue key, HandleObject obj, bool* attached)
 {
     MOZ_ASSERT(!*attached);
 
@@ -5866,7 +5866,7 @@
 
     JitSpew(JitSpew_BaselineIC, "  Generating In(Native[Int32] dense) stub");
     ICIn_Dense::Compiler compiler(cx, obj->as<NativeObject>().lastProperty());
-    ICStub *denseStub = compiler.getStub(compiler.getStubSpace(script));
+    ICStub* denseStub = compiler.getStub(compiler.getStubSpace(script));
     if (!denseStub)
         return false;
 
@@ -5876,8 +5876,8 @@
 }
 
 static bool
-TryAttachNativeInStub(JSContext *cx, HandleScript script, ICIn_Fallback *stub,
-                      HandleValue key, HandleObject obj, bool *attached)
+TryAttachNativeInStub(JSContext* cx, HandleScript script, ICIn_Fallback* stub,
+                      HandleValue key, HandleObject obj, bool* attached)
 {
     MOZ_ASSERT(!*attached);
 
@@ -5897,7 +5897,7 @@
         JitSpew(JitSpew_BaselineIC, "  Generating In(Native %s) stub",
                     (obj == holder) ? "direct" : "prototype");
         ICInNativeCompiler compiler(cx, kind, obj, holder, name);
-        ICStub *newStub = compiler.getStub(compiler.getStubSpace(script));
+        ICStub* newStub = compiler.getStub(compiler.getStubSpace(script));
         if (!newStub)
             return false;
 
@@ -5910,9 +5910,9 @@
 }
 
 static bool
-TryAttachNativeInDoesNotExistStub(JSContext *cx, HandleScript script,
-                                  ICIn_Fallback *stub, HandleValue key,
-                                  HandleObject obj, bool *attached)
+TryAttachNativeInDoesNotExistStub(JSContext* cx, HandleScript script,
+                                  ICIn_Fallback* stub, HandleValue key,
+                                  HandleObject obj, bool* attached)
 {
     MOZ_ASSERT(!*attached);
 
@@ -5934,7 +5934,7 @@
     // Confirmed no-such-property. Add stub.
     JitSpew(JitSpew_BaselineIC, "  Generating In_NativeDoesNotExist stub");
     ICInNativeDoesNotExistCompiler compiler(cx, obj, name, protoChainDepth);
-    ICStub *newStub = compiler.getStub(compiler.getStubSpace(script));
+    ICStub* newStub = compiler.getStub(compiler.getStubSpace(script));
     if (!newStub)
         return false;
 
@@ -5944,7 +5944,7 @@
 }
 
 static bool
-DoInFallback(JSContext *cx, BaselineFrame *frame, ICIn_Fallback *stub_,
+DoInFallback(JSContext* cx, BaselineFrame* frame, ICIn_Fallback* stub_,
              HandleValue key, HandleValue objValue, MutableHandleValue res)
 {
     // This fallback stub may trigger debug mode toggling.
@@ -5993,7 +5993,7 @@
     return true;
 }
 
-typedef bool (*DoInFallbackFn)(JSContext *, BaselineFrame *, ICIn_Fallback *, HandleValue,
+typedef bool (*DoInFallbackFn)(JSContext*, BaselineFrame*, ICIn_Fallback*, HandleValue,
                                HandleValue, MutableHandleValue);
 static const VMFunction DoInFallbackInfo =
     FunctionInfo<DoInFallbackFn>(DoInFallback, TailCall, PopValues(2));
@@ -6017,7 +6017,7 @@
 }
 
 bool
-ICInNativeCompiler::generateStubCode(MacroAssembler &masm)
+ICInNativeCompiler::generateStubCode(MacroAssembler& masm)
 {
     Label failure, failurePopR0Scratch;
 
@@ -6061,8 +6061,8 @@
     return true;
 }
 
-ICStub *
-ICInNativeDoesNotExistCompiler::getStub(ICStubSpace *space)
+ICStub*
+ICInNativeDoesNotExistCompiler::getStub(ICStubSpace* space)
 {
     AutoShapeVector shapes(cx);
     if (!shapes.append(obj_->as<NativeObject>().lastProperty()))
@@ -6073,7 +6073,7 @@
 
     JS_STATIC_ASSERT(ICIn_NativeDoesNotExist::MAX_PROTO_CHAIN_DEPTH == 8);
 
-    ICStub *stub = nullptr;
+    ICStub* stub = nullptr;
     switch (protoChainDepth_) {
       case 0: stub = getStubSpecific<0>(space, &shapes); break;
       case 1: stub = getStubSpecific<1>(space, &shapes); break;
@@ -6092,7 +6092,7 @@
 }
 
 bool
-ICInNativeDoesNotExistCompiler::generateStubCode(MacroAssembler &masm)
+ICInNativeDoesNotExistCompiler::generateStubCode(MacroAssembler& masm)
 {
     Label failure, failurePopR0Scratch;
 
@@ -6149,7 +6149,7 @@
 }
 
 bool
-ICIn_Dense::Compiler::generateStubCode(MacroAssembler &masm)
+ICIn_Dense::Compiler::generateStubCode(MacroAssembler& masm)
 {
     Label failure;
 
@@ -7335,10 +7335,10 @@
 }
 
 static bool
-TryAttachNativeGetPropDoesNotExistStub(JSContext *cx, HandleScript script,
-                                       jsbytecode *pc, ICGetProp_Fallback *stub,
+TryAttachNativeGetPropDoesNotExistStub(JSContext* cx, HandleScript script,
+                                       jsbytecode* pc, ICGetProp_Fallback* stub,
                                        HandlePropertyName name, HandleValue val,
-                                       bool *attached)
+                                       bool* attached)
 {
     MOZ_ASSERT(!*attached);
 
@@ -9790,7 +9790,7 @@
            ION_COMMONX4_SIMD_OP(ADD_INT32X4_SIMD_OP_NAME_)
            COMP_COMMONX4_TO_INT32X4_SIMD_OP(ADD_INT32X4_SIMD_OP_NAME_)
            COMP_COMMONX4_TO_INT32X4_SIMD_OP(ADD_FLOAT32X4_SIMD_OP_NAME_)
-           CONVERSION_INT32X4_SIMD_OP(ADD_INT32X4_SIMD_OP_NAME_)
+           FOREACH_INT32X4_SIMD_OP(ADD_INT32X4_SIMD_OP_NAME_)
            ION_ONLY_INT32X4_SIMD_OP(ADD_INT32X4_SIMD_OP_NAME_))
        {
             Rooted<SimdTypeDescr*> descr(cx, &cx->global()->int32x4TypeDescr().as<SimdTypeDescr>());
@@ -12372,14 +12372,14 @@
     extra_ |= (static_cast<uint16_t>(expectOutOfBounds) << 8);
 }
 
-ICInNativeStub::ICInNativeStub(ICStub::Kind kind, JitCode *stubCode, HandleShape shape,
+ICInNativeStub::ICInNativeStub(ICStub::Kind kind, JitCode* stubCode, HandleShape shape,
                                HandlePropertyName name)
   : ICStub(kind, stubCode),
     shape_(shape),
     name_(name)
 { }
 
-ICIn_NativePrototype::ICIn_NativePrototype(JitCode *stubCode, HandleShape shape,
+ICIn_NativePrototype::ICIn_NativePrototype(JitCode* stubCode, HandleShape shape,
                                            HandlePropertyName name, HandleObject holder,
                                            HandleShape holderShape)
   : ICInNativeStub(In_NativePrototype, stubCode, shape, name),
@@ -12387,7 +12387,7 @@
     holderShape_(holderShape)
 { }
 
-ICIn_NativeDoesNotExist::ICIn_NativeDoesNotExist(JitCode *stubCode, size_t protoChainDepth,
+ICIn_NativeDoesNotExist::ICIn_NativeDoesNotExist(JitCode* stubCode, size_t protoChainDepth,
                                                  HandlePropertyName name)
   : ICStub(In_NativeDoesNotExist, stubCode),
     name_(name)
@@ -12407,7 +12407,7 @@
 
 template <size_t ProtoChainDepth>
 ICIn_NativeDoesNotExistImpl<ProtoChainDepth>::ICIn_NativeDoesNotExistImpl(
-        JitCode *stubCode, const AutoShapeVector *shapes, HandlePropertyName name)
+        JitCode* stubCode, const AutoShapeVector* shapes, HandlePropertyName name)
   : ICIn_NativeDoesNotExist(stubCode, ProtoChainDepth, name)
 {
     MOZ_ASSERT(shapes->length() == NumShapes);
@@ -12416,7 +12416,7 @@
 }
 
 ICInNativeDoesNotExistCompiler::ICInNativeDoesNotExistCompiler(
-        JSContext *cx, HandleObject obj, HandlePropertyName name, size_t protoChainDepth)
+        JSContext* cx, HandleObject obj, HandlePropertyName name, size_t protoChainDepth)
   : ICStubCompiler(cx, ICStub::In_NativeDoesNotExist),
     obj_(cx, obj),
     name_(cx, name),
@@ -12425,7 +12425,7 @@
     MOZ_ASSERT(protoChainDepth_ <= ICIn_NativeDoesNotExist::MAX_PROTO_CHAIN_DEPTH);
 }
 
-ICIn_Dense::ICIn_Dense(JitCode *stubCode, HandleShape shape)
+ICIn_Dense::ICIn_Dense(JitCode* stubCode, HandleShape shape)
   : ICStub(In_Dense, stubCode),
     shape_(shape)
 { }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/BaselineIC.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/BaselineIC.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/BaselineIC.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/BaselineIC.h	2015-04-24 19:31:04.000000000 +0000
@@ -22,9 +22,6 @@
 #include "vm/UnboxedObject.h"
 
 namespace js {
-
-class TypedArrayLayout;
-
 namespace jit {
 
 //
@@ -3425,18 +3422,18 @@
     HeapPtrPropertyName name_;
 
   protected:
-    ICInNativeStub(ICStub::Kind kind, JitCode *stubCode, HandleShape shape,
+    ICInNativeStub(ICStub::Kind kind, JitCode* stubCode, HandleShape shape,
                    HandlePropertyName name);
 
   public:
-    HeapPtrShape &shape() {
+    HeapPtrShape& shape() {
         return shape_;
     }
     static size_t offsetOfShape() {
         return offsetof(ICInNativeStub, shape_);
     }
 
-    HeapPtrPropertyName &name() {
+    HeapPtrPropertyName& name() {
         return name_;
     }
     static size_t offsetOfName() {
@@ -3449,7 +3446,7 @@
 {
     friend class ICStubSpace;
 
-    ICIn_Native(JitCode *stubCode, HandleShape shape, HandlePropertyName name)
+    ICIn_Native(JitCode* stubCode, HandleShape shape, HandlePropertyName name)
       : ICInNativeStub(In_Native, stubCode, shape, name)
     {}
 };
@@ -3464,14 +3461,14 @@
     HeapPtrObject holder_;
     HeapPtrShape holderShape_;
 
-    ICIn_NativePrototype(JitCode *stubCode, HandleShape shape, HandlePropertyName name,
+    ICIn_NativePrototype(JitCode* stubCode, HandleShape shape, HandlePropertyName name,
                          HandleObject holder, HandleShape holderShape);
 
   public:
-    HeapPtrObject &holder() {
+    HeapPtrObject& holder() {
         return holder_;
     }
-    HeapPtrShape &holderShape() {
+    HeapPtrShape& holderShape() {
         return holderShape_;
     }
     static size_t offsetOfHolder() {
@@ -3489,10 +3486,10 @@
     RootedObject holder_;
     RootedPropertyName name_;
 
-    bool generateStubCode(MacroAssembler &masm);
+    bool generateStubCode(MacroAssembler& masm);
 
   public:
-    ICInNativeCompiler(JSContext *cx, ICStub::Kind kind, HandleObject obj, HandleObject holder,
+    ICInNativeCompiler(JSContext* cx, ICStub::Kind kind, HandleObject obj, HandleObject holder,
                        HandlePropertyName name)
       : ICStubCompiler(cx, kind),
         obj_(cx, obj),
@@ -3500,7 +3497,7 @@
         name_(cx, name)
     {}
 
-    ICStub *getStub(ICStubSpace *space) {
+    ICStub* getStub(ICStubSpace* space) {
         RootedShape shape(cx, obj_->as<NativeObject>().lastProperty());
         if (kind == ICStub::In_Native) {
             MOZ_ASSERT(obj_ == holder_);
@@ -3527,7 +3524,7 @@
     static const size_t MAX_PROTO_CHAIN_DEPTH = 8;
 
   protected:
-    ICIn_NativeDoesNotExist(JitCode *stubCode, size_t protoChainDepth,
+    ICIn_NativeDoesNotExist(JitCode* stubCode, size_t protoChainDepth,
                             HandlePropertyName name);
 
   public:
@@ -3535,14 +3532,14 @@
         MOZ_ASSERT(extra_ <= MAX_PROTO_CHAIN_DEPTH);
         return extra_;
     }
-    HeapPtrPropertyName &name() {
+    HeapPtrPropertyName& name() {
         return name_;
     }
 
     template <size_t ProtoChainDepth>
-    ICIn_NativeDoesNotExistImpl<ProtoChainDepth> *toImpl() {
+    ICIn_NativeDoesNotExistImpl<ProtoChainDepth>* toImpl() {
         MOZ_ASSERT(ProtoChainDepth == protoChainDepth());
-        return static_cast<ICIn_NativeDoesNotExistImpl<ProtoChainDepth> *>(this);
+        return static_cast<ICIn_NativeDoesNotExistImpl<ProtoChainDepth>*>(this);
     }
 
     static size_t offsetOfShape(size_t idx);
@@ -3563,11 +3560,11 @@
   private:
     mozilla::Array<HeapPtrShape, NumShapes> shapes_;
 
-    ICIn_NativeDoesNotExistImpl(JitCode *stubCode, const AutoShapeVector *shapes,
+    ICIn_NativeDoesNotExistImpl(JitCode* stubCode, const AutoShapeVector* shapes,
                                 HandlePropertyName name);
 
   public:
-    void traceShapes(JSTracer *trc) {
+    void traceShapes(JSTracer* trc) {
         for (size_t i = 0; i < NumShapes; i++)
             TraceEdge(trc, &shapes_[i], "baseline-innativedoesnotexist-stub-shape");
     }
@@ -3588,19 +3585,19 @@
         return static_cast<int32_t>(kind) | (static_cast<int32_t>(protoChainDepth_) << 16);
     }
 
-    bool generateStubCode(MacroAssembler &masm);
+    bool generateStubCode(MacroAssembler& masm);
 
   public:
-    ICInNativeDoesNotExistCompiler(JSContext *cx, HandleObject obj, HandlePropertyName name,
+    ICInNativeDoesNotExistCompiler(JSContext* cx, HandleObject obj, HandlePropertyName name,
                                    size_t protoChainDepth);
 
     template <size_t ProtoChainDepth>
-    ICStub *getStubSpecific(ICStubSpace *space, const AutoShapeVector *shapes) {
+    ICStub* getStubSpecific(ICStubSpace* space, const AutoShapeVector* shapes) {
         return ICStub::New<ICIn_NativeDoesNotExistImpl<ProtoChainDepth>>(space, getStubCode(),
                                                                          shapes, name_);
     }
 
-    ICStub *getStub(ICStubSpace *space);
+    ICStub* getStub(ICStubSpace* space);
 };
 
 class ICIn_Dense : public ICStub
@@ -3609,10 +3606,10 @@
 
     HeapPtrShape shape_;
 
-    ICIn_Dense(JitCode *stubCode, HandleShape shape);
+    ICIn_Dense(JitCode* stubCode, HandleShape shape);
 
   public:
-    HeapPtrShape &shape() {
+    HeapPtrShape& shape() {
         return shape_;
     }
     static size_t offsetOfShape() {
@@ -3623,15 +3620,15 @@
       RootedShape shape_;
 
       protected:
-        bool generateStubCode(MacroAssembler &masm);
+        bool generateStubCode(MacroAssembler& masm);
 
       public:
-        Compiler(JSContext *cx, Shape *shape)
+        Compiler(JSContext* cx, Shape* shape)
           : ICStubCompiler(cx, ICStub::In_Dense),
             shape_(cx, shape)
         {}
 
-        ICStub *getStub(ICStubSpace *space) {
+        ICStub* getStub(ICStubSpace* space) {
             return ICStub::New<ICIn_Dense>(space, getStubCode(), shape_);
         }
     };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/C1Spewer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/C1Spewer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/C1Spewer.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/C1Spewer.h	2015-04-24 19:31:04.000000000 +0000
@@ -17,8 +17,6 @@
 namespace jit {
 
 class BacktrackingAllocator;
-class MDefinition;
-class MInstruction;
 class MBasicBlock;
 class MIRGraph;
 class LNode;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/CodeGenerator.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/CodeGenerator.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/CodeGenerator.cpp	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/CodeGenerator.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -1023,7 +1023,7 @@
 }
 
 static Address
-RegExpPairCountAddress(MacroAssembler &masm, size_t inputOutputDataStartOffset)
+RegExpPairCountAddress(MacroAssembler& masm, size_t inputOutputDataStartOffset)
 {
     return Address(masm.getStackPointer(), inputOutputDataStartOffset
                                            + sizeof(irregexp::InputOutputData)
@@ -4975,6 +4975,22 @@
 }
 
 void
+CodeGenerator::visitSetDisjointTypedElements(LSetDisjointTypedElements* lir)
+{
+    Register target = ToRegister(lir->target());
+    Register targetOffset = ToRegister(lir->targetOffset());
+    Register source = ToRegister(lir->source());
+
+    Register temp = ToRegister(lir->temp());
+
+    masm.setupUnalignedABICall(3, temp);
+    masm.passABIArg(target);
+    masm.passABIArg(targetOffset);
+    masm.passABIArg(source);
+    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void*, js::SetDisjointTypedElements));
+}
+
+void
 CodeGenerator::visitTypedObjectDescr(LTypedObjectDescr* lir)
 {
     Register obj = ToRegister(lir->object());
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/CodeGenerator.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/CodeGenerator.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/CodeGenerator.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/CodeGenerator.h	2015-04-24 19:31:04.000000000 +0000
@@ -37,7 +37,6 @@
 class OutOfLineUnboxFloatingPoint;
 class OutOfLineStoreElementHole;
 class OutOfLineTypeOfV;
-class OutOfLineLoadTypedArray;
 class OutOfLineUpdateCache;
 class OutOfLineCallPostWriteBarrier;
 class OutOfLineIsCallable;
@@ -181,6 +180,7 @@
     void visitSetArrayLength(LSetArrayLength* lir);
     void visitTypedArrayLength(LTypedArrayLength* lir);
     void visitTypedArrayElements(LTypedArrayElements* lir);
+    void visitSetDisjointTypedElements(LSetDisjointTypedElements* lir);
     void visitTypedObjectElements(LTypedObjectElements* lir);
     void visitSetTypedObjectOffset(LSetTypedObjectOffset* lir);
     void visitTypedObjectDescr(LTypedObjectDescr* ins);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Disassembler.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Disassembler.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Disassembler.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Disassembler.h	2015-04-24 19:31:04.000000000 +0000
@@ -97,13 +97,21 @@
         return disp_;
     }
 
+    bool hasBase() const {
+        return base_ != Registers::Invalid;
+    }
+
     Register::Encoding base() const {
-        MOZ_ASSERT(base_ != Registers::Invalid);
+        MOZ_ASSERT(hasBase());
         return base_;
     }
 
+    bool hasIndex() const {
+        return index_ != Registers::Invalid;
+    }
+
     Register::Encoding index() const {
-        MOZ_ASSERT(index_ != Registers::Invalid);
+        MOZ_ASSERT(hasIndex());
         return index_;
     }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/EffectiveAddressAnalysis.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/EffectiveAddressAnalysis.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/EffectiveAddressAnalysis.cpp	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/EffectiveAddressAnalysis.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -101,8 +101,38 @@
 }
 
 template<typename MAsmJSHeapAccessType>
-static void
-AnalyzeAsmHeapAccess(MAsmJSHeapAccessType* ins, MIRGraph& graph)
+bool
+EffectiveAddressAnalysis::tryAddDisplacement(MAsmJSHeapAccessType* ins, int32_t o)
+{
+    // Compute the new offset. Check for overflow and negative. In theory it
+    // ought to be possible to support negative offsets, but it'd require
+    // more elaborate bounds checking mechanisms than we currently have.
+    MOZ_ASSERT(ins->offset() >= 0);
+    int32_t newOffset = uint32_t(ins->offset()) + o;
+    if (newOffset < 0)
+        return false;
+
+    // Compute the new offset to the end of the access. Check for overflow
+    // and negative here also.
+    int32_t newEnd = uint32_t(newOffset) + ins->byteSize();
+    if (newEnd < 0)
+        return false;
+    MOZ_ASSERT(uint32_t(newEnd) >= uint32_t(newOffset));
+
+    // Determine the range of valid offsets which can be folded into this
+    // instruction and check whether our computed offset is within that range.
+    size_t range = mir_->foldableOffsetRange(ins);
+    if (size_t(newEnd) > range)
+        return false;
+
+    // Everything checks out. This is the new offset.
+    ins->setOffset(newOffset);
+    return true;
+}
+
+template<typename MAsmJSHeapAccessType>
+void
+EffectiveAddressAnalysis::analyzeAsmHeapAccess(MAsmJSHeapAccessType* ins)
 {
     MDefinition* ptr = ins->ptr();
 
@@ -113,8 +143,8 @@
         // a situation where the sum of a constant pointer value and a non-zero
         // offset doesn't actually fit into the address mode immediate.
         int32_t imm = ptr->constantValue().toInt32();
-        if (imm != 0 && ins->tryAddDisplacement(imm)) {
-            MInstruction* zero = MConstant::New(graph.alloc(), Int32Value(0));
+        if (imm != 0 && tryAddDisplacement(ins, imm)) {
+            MInstruction* zero = MConstant::New(graph_.alloc(), Int32Value(0));
             ins->block()->insertBefore(ins, zero);
             ins->replacePtr(zero);
         }
@@ -128,7 +158,7 @@
             mozilla::Swap(op0, op1);
         if (op1->isConstantValue()) {
             int32_t imm = op1->constantValue().toInt32();
-            if (ins->tryAddDisplacement(imm))
+            if (tryAddDisplacement(ins, imm))
                 ins->replacePtr(op0);
         }
     }
@@ -159,9 +189,9 @@
             if (i->isLsh())
                 AnalyzeLsh(graph_.alloc(), i->toLsh());
             else if (i->isAsmJSLoadHeap())
-                AnalyzeAsmHeapAccess(i->toAsmJSLoadHeap(), graph_);
+                analyzeAsmHeapAccess(i->toAsmJSLoadHeap());
             else if (i->isAsmJSStoreHeap())
-                AnalyzeAsmHeapAccess(i->toAsmJSStoreHeap(), graph_);
+                analyzeAsmHeapAccess(i->toAsmJSStoreHeap());
         }
     }
     return true;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/EffectiveAddressAnalysis.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/EffectiveAddressAnalysis.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/EffectiveAddressAnalysis.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/EffectiveAddressAnalysis.h	2015-04-24 19:31:04.000000000 +0000
@@ -14,11 +14,18 @@
 
 class EffectiveAddressAnalysis
 {
+    MIRGenerator* mir_;
     MIRGraph& graph_;
 
+    template<typename MAsmJSHeapAccessType>
+    bool tryAddDisplacement(MAsmJSHeapAccessType* ins, int32_t o);
+
+    template<typename MAsmJSHeapAccessType>
+    void analyzeAsmHeapAccess(MAsmJSHeapAccessType* ins);
+
   public:
-    explicit EffectiveAddressAnalysis(MIRGraph& graph)
-      : graph_(graph)
+    EffectiveAddressAnalysis(MIRGenerator* mir, MIRGraph& graph)
+      : mir_(mir), graph_(graph)
     {}
 
     bool analyze();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/IonBuilder.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/IonBuilder.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/IonBuilder.cpp	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/IonBuilder.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -899,8 +899,7 @@
     if (!processIterators())
         return false;
 
-    if (!abortedPreliminaryGroups().empty()) {
-        MOZ_ASSERT(!info().isAnalysis());
+    if (!info().isAnalysis() && !abortedPreliminaryGroups().empty()) {
         abortReason_ = AbortReason_PreliminaryObjects;
         return false;
     }
@@ -1057,8 +1056,7 @@
     // Discard unreferenced & pre-allocated resume points.
     replaceMaybeFallbackFunctionGetter(nullptr);
 
-    if (!abortedPreliminaryGroups().empty()) {
-        MOZ_ASSERT(!info().isAnalysis());
+    if (!info().isAnalysis() && !abortedPreliminaryGroups().empty()) {
         abortReason_ = AbortReason_PreliminaryObjects;
         return false;
     }
@@ -6583,7 +6581,7 @@
     // intializer, and that arrays are marked as non-packed when writing holes
     // to them during initialization.
     bool needStub = false;
-    if (obj->isUnknownValue()) {
+    if (obj->isUnknownValue() || shouldAbortOnPreliminaryGroups(obj)) {
         needStub = true;
     } else {
         TypeSet::ObjectKey* initializer = obj->resultTypeSet()->getObject(0);
@@ -7104,18 +7102,8 @@
         return name == comp->runtime()->names().length;
 
     // Resolve hooks can install new properties on objects on demand.
-    if (!clasp->resolve)
-        return false;
-
-    if (clasp->resolve == str_resolve) {
-        // str_resolve only resolves integers, not names.
-        return false;
-    }
-
-    if (clasp->resolve == fun_resolve)
-        return FunctionHasResolveHook(comp->runtime()->names(), NameToId(name));
-
-    return true;
+    JSObject* singleton = object->isSingleton() ? object->singleton() : nullptr;
+    return ClassMayResolveId(comp->runtime()->names(), clasp, NameToId(name), singleton);
 }
 
 void
@@ -7710,7 +7698,7 @@
 
     // Always use a call if we are performing analysis and not actually
     // emitting code, to simplify later analysis.
-    if (info().isAnalysis()) {
+    if (info().isAnalysis() || shouldAbortOnPreliminaryGroups(obj)) {
         MInstruction* ins = MCallGetElement::New(alloc(), obj, index);
 
         current->add(ins);
@@ -8761,6 +8749,13 @@
     trackTypeInfo(TrackedTypeSite::Index, index->type(), index->resultTypeSet());
     trackTypeInfo(TrackedTypeSite::Value, value->type(), value->resultTypeSet());
 
+    if (shouldAbortOnPreliminaryGroups(object)) {
+        MInstruction* ins = MCallSetElement::New(alloc(), object, index, value, IsStrictSetPC(pc));
+        current->add(ins);
+        current->push(value);
+        return resumeAfter(ins);
+    }
+
     trackOptimizationAttempt(TrackedStrategy::SetElem_TypedObject);
     if (!setElemTryTypedObject(&emitted, object, index, value) || emitted)
         return emitted;
@@ -9448,37 +9443,6 @@
         return UINT32_MAX;
     }
 
-    // Watch for groups which still have preliminary object information and
-    // have not had the new script properties other analyses performed on their
-    // preliminary objects. Normally this is done after a small number of the
-    // objects have been created, but if only a few have been created we can
-    // still perform the analysis with a smaller object population. The
-    // analysis can have side effects so abort the builder and retry later.
-    //
-    // We always check this, so that even if we aren't able to find a common
-    // slot we ensure that the new script analysis is performed on all accessed
-    // objects. Later, this will let us elide baseline IC stubs for preliminary
-    // objects, which often have a different number of fixed slots from
-    // subsequent objects.
-    for (size_t i = 0; i < types->getObjectCount(); i++) {
-        TypeSet::ObjectKey* key = types->getObject(i);
-        if (!key)
-            continue;
-
-        if (ObjectGroup* group = key->maybeGroup()) {
-            if (group->newScript() && !group->newScript()->analyzed()) {
-                addAbortedPreliminaryGroup(group);
-                trackOptimizationOutcome(TrackedOutcome::NoAnalysisInfo);
-                return UINT32_MAX;
-            }
-            if (group->maybePreliminaryObjects()) {
-                addAbortedPreliminaryGroup(group);
-                trackOptimizationOutcome(TrackedOutcome::NoAnalysisInfo);
-                return UINT32_MAX;
-            }
-        }
-    }
-
     uint32_t slot = UINT32_MAX;
 
     for (size_t i = 0; i < types->getObjectCount(); i++) {
@@ -9949,6 +9913,37 @@
 }
 
 bool
+IonBuilder::shouldAbortOnPreliminaryGroups(MDefinition *obj)
+{
+    // Watch for groups which still have preliminary object information and
+    // have not had the new script properties or unboxed layout analyses
+    // performed. Normally this is done after a small number of the objects
+    // have been created, but if only a few have been created we can still
+    // perform the analysis with a smaller object population. The analysis can
+    // have side effects so we will end up aborting compilation after building
+    // finishes and retrying later.
+    TemporaryTypeSet *types = obj->resultTypeSet();
+    if (!types || types->unknownObject())
+        return false;
+
+    bool preliminary = false;
+    for (size_t i = 0; i < types->getObjectCount(); i++) {
+        TypeSet::ObjectKey* key = types->getObject(i);
+        if (!key)
+            continue;
+
+        if (ObjectGroup* group = key->maybeGroup()) {
+            if (group->hasUnanalyzedPreliminaryObjects()) {
+                addAbortedPreliminaryGroup(group);
+                preliminary = true;
+            }
+        }
+    }
+
+    return preliminary;
+}
+
+bool
 IonBuilder::jsop_getprop(PropertyName* name)
 {
     bool emitted = false;
@@ -9989,7 +9984,7 @@
     // not actually emitting code, to simplify later analysis. Also skip deeper
     // analysis if there are no known types for this operation, as it will
     // always invalidate when executing.
-    if (info().isAnalysis() || types->empty()) {
+    if (info().isAnalysis() || types->empty() || shouldAbortOnPreliminaryGroups(obj)) {
         if (types->empty()) {
             // Since no further optimizations will be tried, use the IC
             // strategy, which would have been the last one to be tried, as a
@@ -11096,7 +11091,7 @@
 
     // Always use a call if we are doing the definite properties analysis and
     // not actually emitting code, to simplify later analysis.
-    if (info().isAnalysis()) {
+    if (info().isAnalysis() || shouldAbortOnPreliminaryGroups(obj)) {
         bool strict = IsStrictSetPC(pc);
         MInstruction* ins = MCallSetProperty::New(alloc(), obj, value, name, strict);
         current->add(ins);
@@ -12235,7 +12230,8 @@
     MDefinition* obj = current->peek(-1);
     MDefinition* id = current->peek(-2);
 
-    if (ElementAccessIsDenseNative(constraints(), obj, id) &&
+    if (!shouldAbortOnPreliminaryGroups(obj) &&
+        ElementAccessIsDenseNative(constraints(), obj, id) &&
         !ElementAccessHasExtraIndexedProperty(constraints(), obj))
     {
         return jsop_in_dense();
@@ -12883,7 +12879,7 @@
     MOZ_ASSERT(!v.isString() || v.toString()->isAtom(),
                "To handle non-atomized strings, you should use constantMaybeAtomize instead of constant.");
     if (v.isString() && MOZ_UNLIKELY(!v.toString()->isAtom())) {
-        MConstant *cst = constantMaybeAtomize(v);
+        MConstant* cst = constantMaybeAtomize(v);
         if (!cst)
             js::CrashAtUnhandlableOOM("Use constantMaybeAtomize.");
         return cst;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/IonBuilder.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/IonBuilder.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/IonBuilder.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/IonBuilder.h	2015-04-24 19:31:04.000000000 +0000
@@ -422,6 +422,7 @@
                    MIRType slotType = MIRType_None);
     bool storeSlot(MDefinition* obj, Shape* shape, MDefinition* value, bool needsBarrier,
                    MIRType slotType = MIRType_None);
+    bool shouldAbortOnPreliminaryGroups(MDefinition *obj);
 
     MDefinition* tryInnerizeWindow(MDefinition* obj);
 
@@ -803,8 +804,12 @@
                                                MIRType knownValueType);
 
     // TypedArray intrinsics.
+    enum WrappingBehavior { AllowWrappedTypedArrays, RejectWrappedTypedArrays };
+    InliningStatus inlineIsTypedArrayHelper(CallInfo& callInfo, WrappingBehavior wrappingBehavior);
     InliningStatus inlineIsTypedArray(CallInfo& callInfo);
+    InliningStatus inlineIsPossiblyWrappedTypedArray(CallInfo& callInfo);
     InliningStatus inlineTypedArrayLength(CallInfo& callInfo);
+    InliningStatus inlineSetDisjointTypedElements(CallInfo& callInfo);
 
     // TypedObject intrinsics and natives.
     InliningStatus inlineObjectIsTypeDescr(CallInfo& callInfo);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/IonCaches.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/IonCaches.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/IonCaches.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/IonCaches.h	2015-04-24 19:31:04.000000000 +0000
@@ -17,9 +17,6 @@
 #include "vm/TypedArrayCommon.h"
 
 namespace js {
-
-class LockedJSContext;
-
 namespace jit {
 
 class LInstruction;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/IonCode.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/IonCode.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/IonCode.h	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/IonCode.h	2015-04-24 19:31:04.000000000 +0000
@@ -22,13 +22,9 @@
 #include "vm/TypeInference.h"
 
 namespace js {
-
-class AsmJSModule;
-
 namespace jit {
 
 class MacroAssembler;
-class CodeOffsetLabel;
 class PatchableBackedge;
 class IonBuilder;
 
@@ -728,9 +724,6 @@
 
 struct VMFunction;
 
-class JitCompartment;
-class JitRuntime;
-
 struct AutoFlushICache
 {
   private:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Ion.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Ion.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Ion.cpp	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Ion.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -1411,7 +1411,7 @@
 
     if (mir->optimizationInfo().eaaEnabled()) {
         AutoTraceLog log(logger, TraceLogger_EffectiveAddressAnalysis);
-        EffectiveAddressAnalysis eaa(graph);
+        EffectiveAddressAnalysis eaa(mir, graph);
         if (!eaa.analyze())
             return false;
         IonSpewPass("Effective Address Analysis");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/IonTypes.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/IonTypes.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/IonTypes.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/IonTypes.h	2015-04-24 19:31:04.000000000 +0000
@@ -545,7 +545,19 @@
 IsSimdType(MIRType type)
 {
     return type == MIRType_Int32x4 || type == MIRType_Float32x4;
-};
+}
+
+static inline bool
+IsFloatingPointSimdType(MIRType type)
+{
+    return type == MIRType_Float32x4;
+}
+
+static inline bool
+IsIntegerSimdType(MIRType type)
+{
+    return type == MIRType_Int32x4;
+}
 
 static inline bool
 IsMagicType(MIRType type)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/JitCompartment.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/JitCompartment.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/JitCompartment.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/JitCompartment.h	2015-04-24 19:31:04.000000000 +0000
@@ -57,7 +57,6 @@
                              CalleeToken calleeToken, JSObject* scopeChain,
                              size_t numStackValues, Value* vp);
 
-class IonBuilder;
 class JitcodeGlobalTable;
 
 // ICStubSpace is an abstraction for allocation policy and storage for stub data.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/JitFrames.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/JitFrames.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/JitFrames.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/JitFrames.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -528,7 +528,7 @@
 }
 
 static void
-SettleOnTryNote(JSContext* cx, JSTryNote *tn, const JitFrameIterator& frame,
+SettleOnTryNote(JSContext* cx, JSTryNote* tn, const JitFrameIterator& frame,
                 ScopeIter& si, ResumeFromException* rfe, jsbytecode** pc)
 {
     RootedScript script(cx, frame.baselineFrame()->script());
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/JSONSpewer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/JSONSpewer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/JSONSpewer.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/JSONSpewer.h	2015-04-24 19:31:04.000000000 +0000
@@ -16,8 +16,6 @@
 
 class BacktrackingAllocator;
 class MDefinition;
-class MInstruction;
-class MBasicBlock;
 class MIRGraph;
 class MResumePoint;
 class LNode;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/LIR-Common.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/LIR-Common.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/LIR-Common.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/LIR-Common.h	2015-04-24 19:31:04.000000000 +0000
@@ -566,6 +566,9 @@
     MSimdShift::Operation operation() const {
         return mir_->toSimdShift()->operation();
     }
+    const char* extraName() const {
+        return MSimdShift::OperationName(operation());
+    }
     MSimdShift* mir() const {
         return mir_->toSimdShift();
     }
@@ -3759,12 +3762,19 @@
     }
 };
 
-class LFloat32x4ToInt32x4 : public LInstructionHelper<1, 1, 0>
+class LFloat32x4ToInt32x4 : public LInstructionHelper<1, 1, 1>
 {
   public:
     LIR_HEADER(Float32x4ToInt32x4);
-    explicit LFloat32x4ToInt32x4(const LAllocation& input) {
+    explicit LFloat32x4ToInt32x4(const LAllocation& input, const LDefinition& temp) {
         setOperand(0, input);
+        setTemp(0, temp);
+    }
+    const LDefinition* temp() {
+        return getTemp(0);
+    }
+    const MSimdConvert* mir() const {
+        return mir_->toSimdConvert();
     }
 };
 
@@ -4235,6 +4245,43 @@
     }
 };
 
+// Assign
+//
+//   target[targetOffset..targetOffset + source.length] = source[0..source.length]
+//
+// where the source element range doesn't overlap the target element range in
+// memory.
+class LSetDisjointTypedElements : public LCallInstructionHelper<0, 3, 1>
+{
+  public:
+    LIR_HEADER(SetDisjointTypedElements)
+
+    explicit LSetDisjointTypedElements(const LAllocation& target, const LAllocation& targetOffset,
+                                       const LAllocation& source, const LDefinition& temp)
+    {
+        setOperand(0, target);
+        setOperand(1, targetOffset);
+        setOperand(2, source);
+        setTemp(0, temp);
+    }
+
+    const LAllocation* target() {
+        return getOperand(0);
+    }
+
+    const LAllocation* targetOffset() {
+        return getOperand(1);
+    }
+
+    const LAllocation* source() {
+        return getOperand(2);
+    }
+
+    const LDefinition* temp() {
+        return getTemp(0);
+    }
+};
+
 // Load a typed object's descriptor.
 class LTypedObjectDescr : public LInstructionHelper<1, 1, 0>
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/LIR.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/LIR.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/LIR.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/LIR.h	2015-04-24 19:31:04.000000000 +0000
@@ -32,9 +32,7 @@
 class LArgument;
 class LConstantIndex;
 class MBasicBlock;
-class MTableSwitch;
 class MIRGenerator;
-class MSnapshot;
 
 static const uint32_t VREG_INCREMENT = 1;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/LOpcodes.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/LOpcodes.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/LOpcodes.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/LOpcodes.h	2015-04-24 19:31:04.000000000 +0000
@@ -284,6 +284,7 @@
     _(SetArrayLength)               \
     _(TypedArrayLength)             \
     _(TypedArrayElements)           \
+    _(SetDisjointTypedElements)     \
     _(TypedObjectDescr)             \
     _(TypedObjectElements)          \
     _(SetTypedObjectOffset)         \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Lowering.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Lowering.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Lowering.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Lowering.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -2434,6 +2434,27 @@
 }
 
 void
+LIRGenerator::visitSetDisjointTypedElements(MSetDisjointTypedElements* ins)
+{
+    MOZ_ASSERT(ins->type() == MIRType_None);
+
+    MDefinition* target = ins->target();
+    MOZ_ASSERT(target->type() == MIRType_Object);
+
+    MDefinition* targetOffset = ins->targetOffset();
+    MOZ_ASSERT(targetOffset->type() == MIRType_Int32);
+
+    MDefinition* source = ins->source();
+    MOZ_ASSERT(source->type() == MIRType_Object);
+
+    auto lir = new(alloc()) LSetDisjointTypedElements(useRegister(target),
+                                                      useRegister(targetOffset),
+                                                      useRegister(source),
+                                                      temp());
+    add(lir, ins);
+}
+
+void
 LIRGenerator::visitTypedObjectDescr(MTypedObjectDescr* ins)
 {
     MOZ_ASSERT(ins->type() == MIRType_Object);
@@ -3869,11 +3890,13 @@
 {
     MOZ_ASSERT(IsSimdType(ins->type()));
     MDefinition* input = ins->input();
-    LUse use = useRegisterAtStart(input);
-
+    LUse use = useRegister(input);
     if (ins->type() == MIRType_Int32x4) {
         MOZ_ASSERT(input->type() == MIRType_Float32x4);
-        define(new(alloc()) LFloat32x4ToInt32x4(use), ins);
+        LFloat32x4ToInt32x4* lir = new(alloc()) LFloat32x4ToInt32x4(use, temp());
+        if (!gen->conversionErrorLabel())
+            assignSnapshot(lir, Bailout_BoundsCheck);
+        define(lir, ins);
     } else if (ins->type() == MIRType_Float32x4) {
         MOZ_ASSERT(input->type() == MIRType_Int32x4);
         define(new(alloc()) LInt32x4ToFloat32x4(use), ins);
@@ -4080,6 +4103,8 @@
 LIRGenerator::visitSimdShift(MSimdShift* ins)
 {
     MOZ_ASSERT(ins->type() == MIRType_Int32x4);
+    MOZ_ASSERT(ins->lhs()->type() == MIRType_Int32x4);
+    MOZ_ASSERT(ins->rhs()->type() == MIRType_Int32);
 
     LUse vector = useRegisterAtStart(ins->lhs());
     LAllocation value = useRegisterOrConstant(ins->rhs());
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Lowering.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Lowering.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Lowering.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Lowering.h	2015-04-24 19:31:04.000000000 +0000
@@ -181,6 +181,7 @@
     void visitSetArrayLength(MSetArrayLength* ins);
     void visitTypedArrayLength(MTypedArrayLength* ins);
     void visitTypedArrayElements(MTypedArrayElements* ins);
+    void visitSetDisjointTypedElements(MSetDisjointTypedElements* ins);
     void visitTypedObjectElements(MTypedObjectElements* ins);
     void visitSetTypedObjectOffset(MSetTypedObjectOffset* ins);
     void visitTypedObjectDescr(MTypedObjectDescr* ins);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MacroAssembler.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MacroAssembler.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MacroAssembler.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MacroAssembler.h	2015-04-24 19:31:04.000000000 +0000
@@ -970,15 +970,15 @@
     // On ARM64, sp can function as the zero register depending on context.
     // Code shared across platforms must use these functions to be valid.
     template <typename T>
-    void branchTestStackPtr(Condition cond, T t, Label *label) {
+    void branchTestStackPtr(Condition cond, T t, Label* label) {
         branchTestPtr(cond, getStackPointer(), t, label);
     }
     template <typename T>
-    void branchStackPtr(Condition cond, T rhs, Label *label) {
+    void branchStackPtr(Condition cond, T rhs, Label* label) {
         branchPtr(cond, getStackPointer(), rhs, label);
     }
     template <typename T>
-    void branchStackPtrRhs(Condition cond, T lhs, Label *label) {
+    void branchStackPtrRhs(Condition cond, T lhs, Label* label) {
         branchPtr(cond, lhs, getStackPointer(), label);
     }
 #endif // !JS_CODEGEN_ARM64
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MCallOptimize.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MCallOptimize.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MCallOptimize.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MCallOptimize.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -46,6 +46,13 @@
     // Default failure reason is observing an unsupported type.
     trackOptimizationOutcome(TrackedOutcome::CantInlineNativeBadType);
 
+    if (shouldAbortOnPreliminaryGroups(callInfo.thisArg()))
+        return InliningStatus_NotInlined;
+    for (size_t i = 0; i < callInfo.argc(); i++) {
+        if (shouldAbortOnPreliminaryGroups(callInfo.getArg(i)))
+            return InliningStatus_NotInlined;
+    }
+
     // Atomic natives.
     if (native == atomics_compareExchange)
         return inlineAtomicsCompareExchange(callInfo);
@@ -217,8 +224,12 @@
     // TypedArray intrinsics.
     if (native == intrinsic_IsTypedArray)
         return inlineIsTypedArray(callInfo);
+    if (native == intrinsic_IsPossiblyWrappedTypedArray)
+        return inlineIsPossiblyWrappedTypedArray(callInfo);
     if (native == intrinsic_TypedArrayLength)
         return inlineTypedArrayLength(callInfo);
+    if (native == intrinsic_SetDisjointTypedElements)
+        return inlineSetDisjointTypedElements(callInfo);
 
     // TypedObject intrinsics.
     if (native == js::ObjectIsTypedObject)
@@ -287,6 +298,13 @@
     BITWISE_COMMONX4_SIMD_OP(INLINE_SIMD_BITWISE_)
 #undef INLINE_SIMD_BITWISE_
 
+    if (native == js::simd_int32x4_shiftLeftByScalar)
+        return inlineBinarySimd<MSimdShift>(callInfo, native, MSimdShift::lsh, SimdTypeDescr::Int32x4);
+    if (native == js::simd_int32x4_shiftRightArithmeticByScalar)
+        return inlineBinarySimd<MSimdShift>(callInfo, native, MSimdShift::rsh, SimdTypeDescr::Int32x4);
+    if (native == js::simd_int32x4_shiftRightLogicalByScalar)
+        return inlineBinarySimd<MSimdShift>(callInfo, native, MSimdShift::ursh, SimdTypeDescr::Int32x4);
+
 #define INLINE_SIMD_COMPARISON_(OP)                                                                \
     if (native == js::simd_int32x4_##OP)                                                           \
         return inlineCompSimd(callInfo, native, MSimdBinaryComp::OP, SimdTypeDescr::Int32x4);      \
@@ -2219,10 +2237,11 @@
 }
 
 IonBuilder::InliningStatus
-IonBuilder::inlineIsTypedArray(CallInfo& callInfo)
+IonBuilder::inlineIsTypedArrayHelper(CallInfo& callInfo, WrappingBehavior wrappingBehavior)
 {
     MOZ_ASSERT(!callInfo.constructing());
     MOZ_ASSERT(callInfo.argc() == 1);
+
     if (callInfo.getArg(0)->type() != MIRType_Object)
         return InliningStatus_NotInlined;
     if (getInlineReturnType() != MIRType_Boolean)
@@ -2238,12 +2257,22 @@
     bool result = false;
     switch (types->forAllClasses(constraints(), IsTypedArrayClass)) {
       case TemporaryTypeSet::ForAllResult::ALL_FALSE:
-      case TemporaryTypeSet::ForAllResult::EMPTY:
+      case TemporaryTypeSet::ForAllResult::EMPTY: {
+        // Wrapped typed arrays won't appear to be typed arrays per a
+        // |forAllClasses| query.  If wrapped typed arrays are to be considered
+        // typed arrays, a negative answer is not conclusive.  Don't inline in
+        // that case.
+        if (wrappingBehavior == AllowWrappedTypedArrays)
+            return InliningStatus_NotInlined;
+
         result = false;
         break;
+      }
+
       case TemporaryTypeSet::ForAllResult::ALL_TRUE:
         result = true;
         break;
+
       case TemporaryTypeSet::ForAllResult::MIXED:
         return InliningStatus_NotInlined;
     }
@@ -2255,6 +2284,18 @@
 }
 
 IonBuilder::InliningStatus
+IonBuilder::inlineIsTypedArray(CallInfo& callInfo)
+{
+    return inlineIsTypedArrayHelper(callInfo, RejectWrappedTypedArrays);
+}
+
+IonBuilder::InliningStatus
+IonBuilder::inlineIsPossiblyWrappedTypedArray(CallInfo& callInfo)
+{
+    return inlineIsTypedArrayHelper(callInfo, AllowWrappedTypedArrays);
+}
+
+IonBuilder::InliningStatus
 IonBuilder::inlineTypedArrayLength(CallInfo& callInfo)
 {
     MOZ_ASSERT(!callInfo.constructing());
@@ -2275,6 +2316,58 @@
 }
 
 IonBuilder::InliningStatus
+IonBuilder::inlineSetDisjointTypedElements(CallInfo& callInfo)
+{
+    MOZ_ASSERT(!callInfo.constructing());
+    MOZ_ASSERT(callInfo.argc() == 3);
+
+    // Initial argument requirements.
+
+    MDefinition* target = callInfo.getArg(0);
+    if (target->type() != MIRType_Object)
+        return InliningStatus_NotInlined;
+
+    if (getInlineReturnType() != MIRType_Undefined)
+        return InliningStatus_NotInlined;
+
+    MDefinition* targetOffset = callInfo.getArg(1);
+    MOZ_ASSERT(targetOffset->type() == MIRType_Int32);
+
+    MDefinition* sourceTypedArray = callInfo.getArg(2);
+    if (sourceTypedArray->type() != MIRType_Object)
+        return InliningStatus_NotInlined;
+
+    // Only attempt to optimize if |target| and |sourceTypedArray| are both
+    // definitely typed arrays.  (The former always is.  The latter is not,
+    // necessarily, because of wrappers.)
+
+    MDefinition* arrays[] = { target, sourceTypedArray };
+
+    for (MDefinition* def : arrays) {
+        TemporaryTypeSet* types = def->resultTypeSet();
+        if (!types)
+            return InliningStatus_NotInlined;
+
+        if (types->forAllClasses(constraints(), IsTypedArrayClass) !=
+            TemporaryTypeSet::ForAllResult::ALL_TRUE)
+        {
+            return InliningStatus_NotInlined;
+        }
+    }
+
+    auto sets = MSetDisjointTypedElements::New(alloc(), target, targetOffset, sourceTypedArray);
+    current->add(sets);
+
+    pushConstant(UndefinedValue());
+
+    if (!resumeAfter(sets))
+        return InliningStatus_Error;
+
+    callInfo.setImplicitlyUsedUnchecked();
+    return InliningStatus_Inlined;
+}
+
+IonBuilder::InliningStatus
 IonBuilder::inlineObjectIsTypeDescr(CallInfo& callInfo)
 {
     if (callInfo.constructing() || callInfo.argc() != 1) {
@@ -3030,7 +3123,7 @@
     // Generic constructor of SIMD valuesX4.
     MIRType simdType = SimdTypeDescrToMIRType(descr->type());
 
-    // TODO Happens for TYPE_FLOAT64 (Bug 1124205)
+    // TODO Happens for Float64x2 (Bug 1124205)
     if (simdType == MIRType_Undefined)
         return InliningStatus_NotInlined;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/mips/Architecture-mips.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/mips/Architecture-mips.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/mips/Architecture-mips.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/mips/Architecture-mips.h	2015-04-24 19:31:05.000000000 +0000
@@ -112,7 +112,7 @@
         ra = r31,
         invalid_reg
     };
-    typedef RegisterID Code;
+    typedef uint8_t Code;
     typedef RegisterID Encoding;
 
     // Content spilled during bailouts.
@@ -134,8 +134,8 @@
 
     static Code FromName(const char* name);
 
-    static const Code StackPointer = sp;
-    static const Code Invalid = invalid_reg;
+    static const Encoding StackPointer = sp;
+    static const Encoding Invalid = invalid_reg;
 
     static const uint32_t Total = 32;
     static const uint32_t Allocatable = 14;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/mips/Assembler-mips.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/mips/Assembler-mips.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/mips/Assembler-mips.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/mips/Assembler-mips.h	2015-04-24 19:31:05.000000000 +0000
@@ -256,7 +256,6 @@
 class InstReg;
 class InstImm;
 class InstJump;
-class BranchInstBlock;
 
 uint32_t RS(Register r);
 uint32_t RT(Register r);
@@ -445,7 +444,6 @@
     ff_null        = 0
 };
 
-class MacroAssemblerMIPS;
 class Operand;
 
 // A BOffImm16 is a 16 bit immediate that is used for branches.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/mips/MoveEmitter-mips.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/mips/MoveEmitter-mips.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/mips/MoveEmitter-mips.h	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/mips/MoveEmitter-mips.h	2015-04-24 19:31:05.000000000 +0000
@@ -13,8 +13,6 @@
 namespace js {
 namespace jit {
 
-class CodeGenerator;
-
 class MoveEmitterMIPS
 {
     uint32_t inCycle_;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MIR.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MIR.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MIR.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MIR.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -1017,6 +1017,11 @@
 {
     PrintOpcodeOperation(this, fp);
 }
+void
+MSimdShift::printOpcode(FILE* fp) const
+{
+    PrintOpcodeOperation(this, fp);
+}
 
 void
 MSimdInsertElement::printOpcode(FILE* fp) const
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MIRGenerator.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MIRGenerator.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MIRGenerator.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MIRGenerator.h	2015-04-24 19:31:04.000000000 +0000
@@ -29,9 +29,7 @@
 namespace js {
 namespace jit {
 
-class MBasicBlock;
 class MIRGraph;
-class MStart;
 class OptimizationInfo;
 
 class MIRGenerator
@@ -40,7 +38,9 @@
     MIRGenerator(CompileCompartment* compartment, const JitCompileOptions& options,
                  TempAllocator* alloc, MIRGraph* graph,
                  CompileInfo* info, const OptimizationInfo* optimizationInfo,
-                 Label* outOfBoundsLabel = nullptr, bool usesSignalHandlersForAsmJSOOB = false);
+                 Label* outOfBoundsLabel = nullptr,
+                 Label* conversionErrorLabel = nullptr,
+                 bool usesSignalHandlersForAsmJSOOB = false);
 
     TempAllocator& alloc() {
         return *alloc_;
@@ -204,6 +204,10 @@
     void addAbortedPreliminaryGroup(ObjectGroup* group);
 
     Label* outOfBoundsLabel_;
+    // Label where we should jump in asm.js mode, in the case where we have an
+    // invalid conversion or a loss of precision (when converting from a
+    // floating point SIMD type into an integer SIMD type).
+    Label* conversionErrorLabel_;
 #if defined(ASMJS_MAY_USE_SIGNAL_HANDLERS_FOR_OOB)
     bool usesSignalHandlersForAsmJSOOB_;
 #endif
@@ -231,20 +235,16 @@
         return nurseryObjects_;
     }
 
+    Label* conversionErrorLabel() const {
+        MOZ_ASSERT((conversionErrorLabel_ != nullptr) == compilingAsmJS());
+        return conversionErrorLabel_;
+    }
     Label* outOfBoundsLabel() const {
+        MOZ_ASSERT(compilingAsmJS());
         return outOfBoundsLabel_;
     }
-    bool needsAsmJSBoundsCheckBranch(const MAsmJSHeapAccess* access) const {
-        // A heap access needs a bounds-check branch if we're not relying on signal
-        // handlers to catch errors, and if it's not proven to be within bounds.
-        // We use signal-handlers on x64, but on x86 there isn't enough address
-        // space for a guard region.
-#if defined(ASMJS_MAY_USE_SIGNAL_HANDLERS_FOR_OOB)
-        if (usesSignalHandlersForAsmJSOOB_)
-            return false;
-#endif
-        return access->needsBoundsCheck();
-    }
+    bool needsAsmJSBoundsCheckBranch(const MAsmJSHeapAccess* access) const;
+    size_t foldableOffsetRange(const MAsmJSHeapAccess* access) const;
 };
 
 } // namespace jit
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MIRGraph.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MIRGraph.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MIRGraph.cpp	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MIRGraph.cpp	2015-04-24 19:31:04.000000000 +0000
@@ -20,7 +20,9 @@
 MIRGenerator::MIRGenerator(CompileCompartment* compartment, const JitCompileOptions& options,
                            TempAllocator* alloc, MIRGraph* graph, CompileInfo* info,
                            const OptimizationInfo* optimizationInfo,
-                           Label* outOfBoundsLabel, bool usesSignalHandlersForAsmJSOOB)
+                           Label* outOfBoundsLabel,
+                           Label* conversionErrorLabel,
+                           bool usesSignalHandlersForAsmJSOOB)
   : compartment(compartment),
     info_(info),
     optimizationInfo_(optimizationInfo),
@@ -42,6 +44,7 @@
     instrumentedProfilingIsCached_(false),
     nurseryObjects_(*alloc),
     outOfBoundsLabel_(outOfBoundsLabel),
+    conversionErrorLabel_(conversionErrorLabel),
 #if defined(ASMJS_MAY_USE_SIGNAL_HANDLERS_FOR_OOB)
     usesSignalHandlersForAsmJSOOB_(usesSignalHandlersForAsmJSOOB),
 #endif
@@ -108,6 +111,45 @@
         CrashAtUnhandlableOOM("addAbortedPreliminaryGroup");
 }
 
+bool
+MIRGenerator::needsAsmJSBoundsCheckBranch(const MAsmJSHeapAccess* access) const
+{
+    // A heap access needs a bounds-check branch if we're not relying on signal
+    // handlers to catch errors, and if it's not proven to be within bounds.
+    // We use signal-handlers on x64, but on x86 there isn't enough address
+    // space for a guard region.
+#if defined(ASMJS_MAY_USE_SIGNAL_HANDLERS_FOR_OOB)
+    if (usesSignalHandlersForAsmJSOOB_)
+        return false;
+#endif
+    return access->needsBoundsCheck();
+}
+
+size_t
+MIRGenerator::foldableOffsetRange(const MAsmJSHeapAccess* access) const
+{
+    // This determines whether it's ok to fold up to AsmJSImmediateSize
+    // offsets, instead of just AsmJSCheckedImmediateSize.
+
+#if defined(ASMJS_MAY_USE_SIGNAL_HANDLERS_FOR_OOB)
+    // With signal-handler OOB handling, we reserve guard space for the full
+    // immediate size.
+    if (usesSignalHandlersForAsmJSOOB_)
+        return AsmJSImmediateRange;
+#endif
+
+    // On 32-bit platforms, if we've proven the access is in bounds after
+    // 32-bit wrapping, we can fold full offsets because they're added with
+    // 32-bit arithmetic.
+    if (sizeof(intptr_t) == sizeof(int32_t) && !access->needsBoundsCheck())
+        return AsmJSImmediateRange;
+
+    // Otherwise, only allow the checked size. This is always less than the
+    // minimum heap length, and allows explicit bounds checks to fold in the
+    // offset without overflow.
+    return AsmJSCheckedImmediateRange;
+}
+
 void
 MIRGraph::addBlock(MBasicBlock* block)
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MIR.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MIR.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MIR.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MIR.h	2015-04-24 19:31:04.000000000 +0000
@@ -1531,9 +1531,14 @@
       : MUnaryInstruction(obj)
     {
         MOZ_ASSERT(IsSimdType(toType));
-        setMovable();
         setResultType(toType);
         specialization_ = fromType; // expects fromType as input
+
+        setMovable();
+        if (IsFloatingPointSimdType(fromType) && IsIntegerSimdType(toType)) {
+            // Does the extra range check => do not remove
+            setGuard();
+        }
     }
 
   public:
@@ -2271,7 +2276,7 @@
 
 class MSimdShift
   : public MBinaryInstruction,
-    public NoTypePolicy::Data
+    public MixPolicy<SimdSameAsReturnedTypePolicy<0>, SimdScalarPolicy<1> >::Data
 {
   public:
     enum Operation {
@@ -2286,7 +2291,6 @@
     MSimdShift(MDefinition* left, MDefinition* right, Operation op)
       : MBinaryInstruction(left, right), operation_(op)
     {
-        MOZ_ASSERT(left->type() == MIRType_Int32x4 && right->type() == MIRType_Int32);
         setResultType(MIRType_Int32x4);
         setMovable();
     }
@@ -2296,6 +2300,14 @@
     static MSimdShift* NewAsmJS(TempAllocator& alloc, MDefinition* left,
                                 MDefinition* right, Operation op)
     {
+        MOZ_ASSERT(left->type() == MIRType_Int32x4 && right->type() == MIRType_Int32);
+        return new(alloc) MSimdShift(left, right, op);
+    }
+
+    static MSimdShift* New(TempAllocator& alloc, MDefinition* left, MDefinition* right,
+                           Operation op, MIRType type)
+    {
+        MOZ_ASSERT(type == MIRType_Int32x4);
         return new(alloc) MSimdShift(left, right, op);
     }
 
@@ -2305,6 +2317,17 @@
 
     Operation operation() const { return operation_; }
 
+    static const char* OperationName(Operation op) {
+        switch (op) {
+          case lsh:  return "lsh";
+          case rsh:  return "rsh-arithmetic";
+          case ursh: return "rhs-logical";
+        }
+        MOZ_CRASH("unexpected operation");
+    }
+
+    void printOpcode(FILE* fp) const override;
+
     bool congruentTo(const MDefinition* ins) const override {
         if (!binaryCongruentTo(ins))
             return false;
@@ -7944,6 +7967,49 @@
     ALLOW_CLONE(MTypedArrayElements)
 };
 
+class MSetDisjointTypedElements
+  : public MTernaryInstruction,
+    public NoTypePolicy::Data
+{
+    explicit MSetDisjointTypedElements(MDefinition* target, MDefinition* targetOffset,
+                                       MDefinition* source)
+      : MTernaryInstruction(target, targetOffset, source)
+    {
+        MOZ_ASSERT(target->type() == MIRType_Object);
+        MOZ_ASSERT(targetOffset->type() == MIRType_Int32);
+        MOZ_ASSERT(source->type() == MIRType_Object);
+        setResultType(MIRType_None);
+    }
+
+  public:
+    INSTRUCTION_HEADER(SetDisjointTypedElements)
+
+    static MSetDisjointTypedElements*
+    New(TempAllocator& alloc, MDefinition* target, MDefinition* targetOffset,
+        MDefinition* source)
+    {
+        return new(alloc) MSetDisjointTypedElements(target, targetOffset, source);
+    }
+
+    MDefinition* target() const {
+        return getOperand(0);
+    }
+
+    MDefinition* targetOffset() const {
+        return getOperand(1);
+    }
+
+    MDefinition* source() const {
+        return getOperand(2);
+    }
+
+    AliasSet getAliasSet() const override {
+        return AliasSet::Store(AliasSet::UnboxedElement);
+    }
+
+    ALLOW_CLONE(MSetDisjointTypedElements)
+};
+
 // Load a binary data object's "elements", which is just its opaque
 // binary data space. Eventually this should probably be
 // unified with `MTypedArrayElements`.
@@ -8047,7 +8113,7 @@
             cacheOperandMightEmulateUndefined(constraints);
     }
 
-    void cacheOperandMightEmulateUndefined(CompilerConstraintList *constraints);
+    void cacheOperandMightEmulateUndefined(CompilerConstraintList* constraints);
 
   public:
     static MNot* New(TempAllocator& alloc, MDefinition* elements,
@@ -12611,32 +12677,9 @@
     bool needsBoundsCheck() const { return needsBoundsCheck_; }
     void removeBoundsCheck() { needsBoundsCheck_ = false; }
     unsigned numSimdElems() const { MOZ_ASSERT(Scalar::isSimdType(accessType_)); return numSimdElems_; }
-
-    bool tryAddDisplacement(int32_t o) {
-        // Compute the new offset. Check for overflow and negative. In theory it
-        // ought to be possible to support negative offsets, but it'd require
-        // more elaborate bounds checking mechanisms than we currently have.
-        MOZ_ASSERT(offset_ >= 0);
-        int32_t newOffset = uint32_t(offset_) + o;
-        if (newOffset < 0)
-            return false;
-
-        // Compute the new offset to the end of the access. Check for overflow
-        // and negative here also.
-        int32_t newEnd = uint32_t(newOffset) + byteSize();
-        if (newEnd < 0)
-            return false;
-        MOZ_ASSERT(uint32_t(newEnd) >= uint32_t(newOffset));
-
-        // If we need bounds checking, keep it within the more restrictive
-        // AsmJSCheckedImmediateRange. Otherwise, just keep it within what
-        // the instruction set can support.
-        size_t range = needsBoundsCheck() ? AsmJSCheckedImmediateRange : AsmJSImmediateRange;
-        if (size_t(newEnd) > range)
-            return false;
-
-        offset_ = newOffset;
-        return true;
+    void setOffset(int32_t o) {
+        MOZ_ASSERT(o >= 0);
+        offset_ = o;
     }
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MOpcodes.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MOpcodes.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/MOpcodes.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/MOpcodes.h	2015-04-24 19:31:04.000000000 +0000
@@ -172,6 +172,7 @@
     _(SetArrayLength)                                                       \
     _(TypedArrayLength)                                                     \
     _(TypedArrayElements)                                                   \
+    _(SetDisjointTypedElements)                                             \
     _(TypedObjectDescr)                                                     \
     _(TypedObjectElements)                                                  \
     _(SetTypedObjectOffset)                                                 \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/none/MacroAssembler-none.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/none/MacroAssembler-none.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/none/MacroAssembler-none.h	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/none/MacroAssembler-none.h	2015-04-24 19:31:05.000000000 +0000
@@ -15,8 +15,6 @@
 namespace js {
 namespace jit {
 
-class MDefinition;
-
 static MOZ_CONSTEXPR_VAR Register StackPointer = { Registers::invalid_reg };
 static MOZ_CONSTEXPR_VAR Register FramePointer = { Registers::invalid_reg };
 static MOZ_CONSTEXPR_VAR Register ReturnReg = { Registers::invalid_reg };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Safepoints.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Safepoints.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/Safepoints.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/Safepoints.h	2015-04-24 19:31:04.000000000 +0000
@@ -15,7 +15,6 @@
 namespace jit {
 
 struct SafepointSlotEntry;
-struct SafepointNunboxEntry;
 
 class LAllocation;
 class LSafepoint;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/shared/Assembler-shared.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/shared/Assembler-shared.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/shared/Assembler-shared.h	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/shared/Assembler-shared.h	2015-04-24 19:31:05.000000000 +0000
@@ -889,6 +889,7 @@
     AsmJSImm_ReportOverRecursed,
     AsmJSImm_OnDetached,
     AsmJSImm_OnOutOfBounds,
+    AsmJSImm_OnImpreciseConversion,
     AsmJSImm_HandleExecutionInterrupt,
     AsmJSImm_InvokeFromAsmJS_Ignore,
     AsmJSImm_InvokeFromAsmJS_ToInt32,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/shared/Lowering-shared.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/shared/Lowering-shared.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/shared/Lowering-shared.h	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/shared/Lowering-shared.h	2015-04-24 19:31:05.000000000 +0000
@@ -16,8 +16,6 @@
 namespace js {
 namespace jit {
 
-class MBasicBlock;
-class MTableSwitch;
 class MIRGenerator;
 class MIRGraph;
 class MDefinition;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/ValueNumbering.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/ValueNumbering.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/ValueNumbering.h	2015-04-22 13:05:48.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/ValueNumbering.h	2015-04-24 19:31:04.000000000 +0000
@@ -17,7 +17,6 @@
 class MBasicBlock;
 class MIRGraph;
 class MPhi;
-class MInstruction;
 class MIRGenerator;
 class MResumePoint;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -2175,7 +2175,58 @@
 {
     FloatRegister in = ToFloatRegister(ins->input());
     FloatRegister out = ToFloatRegister(ins->output());
+    Register temp = ToRegister(ins->temp());
+
     masm.convertFloat32x4ToInt32x4(in, out);
+
+    OutOfLineSimdFloatToIntCheck *ool = new(alloc()) OutOfLineSimdFloatToIntCheck(temp, in, ins);
+    addOutOfLineCode(ool, ins->mir());
+
+    static const SimdConstant InvalidResult = SimdConstant::SplatX4(int32_t(-2147483648));
+
+    masm.loadConstantInt32x4(InvalidResult, ScratchSimdReg);
+    masm.packedEqualInt32x4(Operand(out), ScratchSimdReg);
+    // TODO (bug 1156228): If we have SSE4.1, we can use PTEST here instead of
+    // the two following instructions.
+    masm.vmovmskps(ScratchSimdReg, temp);
+    masm.cmp32(temp, Imm32(0));
+    masm.j(Assembler::NotEqual, ool->entry());
+
+    masm.bind(ool->rejoin());
+}
+
+void
+CodeGeneratorX86Shared::visitOutOfLineSimdFloatToIntCheck(OutOfLineSimdFloatToIntCheck *ool)
+{
+    static const SimdConstant Int32MaxX4 = SimdConstant::SplatX4(2147483647.f);
+    static const SimdConstant Int32MinX4 = SimdConstant::SplatX4(-2147483648.f);
+
+    Label bail;
+    Label* onConversionError = gen->conversionErrorLabel();
+    if (!onConversionError)
+        onConversionError = &bail;
+
+    FloatRegister input = ool->input();
+    Register temp = ool->temp();
+
+    masm.loadConstantFloat32x4(Int32MinX4, ScratchSimdReg);
+    masm.vcmpleps(Operand(input), ScratchSimdReg, ScratchSimdReg);
+    masm.vmovmskps(ScratchSimdReg, temp);
+    masm.cmp32(temp, Imm32(15));
+    masm.j(Assembler::NotEqual, onConversionError);
+
+    masm.loadConstantFloat32x4(Int32MaxX4, ScratchSimdReg);
+    masm.vcmpleps(Operand(input), ScratchSimdReg, ScratchSimdReg);
+    masm.vmovmskps(ScratchSimdReg, temp);
+    masm.cmp32(temp, Imm32(0));
+    masm.j(Assembler::NotEqual, onConversionError);
+
+    masm.jump(ool->rejoin());
+
+    if (bail.used()) {
+        masm.bind(&bail);
+        bailout(ool->ins()->snapshot());
+    }
 }
 
 void
@@ -3104,15 +3155,12 @@
     FloatRegister out = ToFloatRegister(ins->output());
     MOZ_ASSERT(ToFloatRegister(ins->vector()) == out); // defineReuseInput(0);
 
-    // TODO: If the shift count is greater than 31, this will just zero all
-    // lanes by default for lsh and ursh, and set the count to 32 for rsh
-    // (which will just extend the sign bit to all bits). Plain JS doesn't do
-    // this: instead it only keeps the five low bits of the mask. Spec isn't
-    // clear about that topic so this might need to be fixed. See also bug
-    // 1068028.
+    // If the shift count is greater than 31, this will just zero all lanes by
+    // default for lsh and ursh, and for rsh extend the sign bit to all bits,
+    // per the SIMD.js spec (as of March 19th 2015).
     const LAllocation* val = ins->value();
     if (val->isConstant()) {
-        int32_t c = ToInt32(val);
+        uint32_t c = uint32_t(ToInt32(val));
         if (c > 31) {
             switch (ins->operation()) {
               case MSimdShift::lsh:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/x86-shared/CodeGenerator-x86-shared.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/x86-shared/CodeGenerator-x86-shared.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/x86-shared/CodeGenerator-x86-shared.h	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/x86-shared/CodeGenerator-x86-shared.h	2015-04-24 19:31:05.000000000 +0000
@@ -69,6 +69,28 @@
         }
     };
 
+    // Additional bounds check for vector Float to Int conversion, when the
+    // undefined pattern is seen. Might imply a bailout.
+    class OutOfLineSimdFloatToIntCheck : public OutOfLineCodeBase<CodeGeneratorX86Shared>
+    {
+        Register temp_;
+        FloatRegister input_;
+        LInstruction* ins_;
+
+      public:
+        OutOfLineSimdFloatToIntCheck(Register temp, FloatRegister input, LInstruction *ins)
+          : temp_(temp), input_(input), ins_(ins)
+        {}
+
+        Register temp() const { return temp_; }
+        FloatRegister input() const { return input_; }
+        LInstruction* ins() const { return ins_; }
+
+        void accept(CodeGeneratorX86Shared* codegen) {
+            codegen->visitOutOfLineSimdFloatToIntCheck(this);
+        }
+    };
+
     // Functions for emitting bounds-checking code with branches.
     MOZ_WARN_UNUSED_RESULT
     uint32_t emitAsmJSBoundsCheckBranch(const MAsmJSHeapAccess* mir, const MInstruction* ins,
@@ -282,6 +304,7 @@
     void visitModOverflowCheck(ModOverflowCheck* ool);
     void visitReturnZero(ReturnZero* ool);
     void visitOutOfLineTableSwitch(OutOfLineTableSwitch* ool);
+    void visitOutOfLineSimdFloatToIntCheck(OutOfLineSimdFloatToIntCheck* ool);
     void generateInvalidateEpilogue();
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/x86-shared/Disassembler-x86-shared.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/x86-shared/Disassembler-x86-shared.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/x86-shared/Disassembler-x86-shared.cpp	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/x86-shared/Disassembler-x86-shared.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -531,8 +531,8 @@
 
     if (access.address().isPCRelative()) {
         fprintf(stderr, MEM_o32r " ", ADDR_o32r(access.address().disp()));
-    } else if (access.address().index() != X86Encoding::invalid_reg) {
-        if (access.address().base() != X86Encoding::invalid_reg) {
+    } else if (access.address().hasIndex()) {
+        if (access.address().hasBase()) {
             fprintf(stderr, MEM_obs " ",
                     ADDR_obs(access.address().disp(), access.address().base(),
                              access.address().index(), access.address().scale()));
@@ -541,7 +541,7 @@
                     ADDR_os(access.address().disp(),
                             access.address().index(), access.address().scale()));
         }
-    } else if (access.address().base() != X86Encoding::invalid_reg) {
+    } else if (access.address().hasBase()) {
         fprintf(stderr, MEM_ob " ", ADDR_ob(access.address().disp(), access.address().base()));
     } else {
         fprintf(stderr, MEM_o " ", ADDR_o(access.address().disp()));
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/x86-shared/MacroAssembler-x86-shared.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/x86-shared/MacroAssembler-x86-shared.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/x86-shared/MacroAssembler-x86-shared.h	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/x86-shared/MacroAssembler-x86-shared.h	2015-04-24 19:31:05.000000000 +0000
@@ -934,11 +934,10 @@
     }
 
     void convertFloat32x4ToInt32x4(FloatRegister src, FloatRegister dest) {
-        // TODO: Note that if the conversion failed (because the converted
+        // Note that if the conversion failed (because the converted
         // result is larger than the maximum signed int32, or less than the
         // least signed int32, or NaN), this will return the undefined integer
-        // value (0x8000000). Spec should define what to do in such cases. See
-        // also bug 1068020.
+        // value (0x8000000).
         vcvttps2dq(src, dest);
     }
     void convertInt32x4ToFloat32x4(FloatRegister src, FloatRegister dest) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/x86-shared/MoveEmitter-x86-shared.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/x86-shared/MoveEmitter-x86-shared.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit/x86-shared/MoveEmitter-x86-shared.h	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit/x86-shared/MoveEmitter-x86-shared.h	2015-04-24 19:31:05.000000000 +0000
@@ -13,8 +13,6 @@
 namespace js {
 namespace jit {
 
-class CodeGenerator;
-
 class MoveEmitterX86
 {
     bool inCycle_;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/lib/asserts.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/lib/asserts.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/lib/asserts.js	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/lib/asserts.js	2015-04-24 19:31:00.000000000 +0000
@@ -65,3 +65,35 @@
         }
     };
 }
+
+if (typeof assertErrorMessage === 'undefined') {
+    var assertErrorMessage = function assertErrorMessage(f, ctor, test) {
+        try {
+            f();
+        } catch (e) {
+            if (!(e instanceof ctor))
+                throw new Error("Assertion failed: expected exception " + ctor.name + ", got " + e);
+            if (typeof test == "string") {
+                if (test != e.message)
+                    throw new Error("Assertion failed: expeceted " + test + ", got " + e.message);
+            } else {
+                if (!test.test(e.message))
+                    throw new Error("Assertion failed: expeceted " + test.toString() + ", got " + e.message);
+            }
+            return;
+        }
+        throw new Error("Assertion failed: expected exception " + ctor.name + ", no exception thrown");
+    };
+}
+
+if (typeof assertTypeErrorMessage === 'undefined') {
+    var assertTypeErrorMessage = function assertTypeErrorMessage(f, test) {
+      assertErrorMessage(f, TypeError, test);
+    };
+}
+
+if (typeof assertRangeErrorMessage === 'undefined') {
+    var assertRangeErrorMessage = function assertRangeErrorMessage(f, test) {
+      assertErrorMessage(f, RangeError, test);
+    };
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/lib/class.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/lib/class.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/lib/class.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/lib/class.js	2015-04-24 19:31:01.000000000 +0000
@@ -0,0 +1 @@
+load(libdir + "../../tests/ecma_6/Class/shell.js");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/asm.js/testHeapAccess.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/asm.js/testHeapAccess.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/asm.js/testHeapAccess.js	2015-04-22 13:05:38.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/asm.js/testHeapAccess.js	2015-04-24 19:31:01.000000000 +0000
@@ -505,3 +505,20 @@
 assertEq(f(0x1000000),0);
 assertEq(asmLink(m, this, null, new ArrayBuffer(0x2000000))(0),0);
 assertEq(asmLink(m, this, null, new ArrayBuffer(0x3000000))(0),0);
+
+// Heap offsets
+var asmMod = function test (glob, env, b) {
+    'use asm';
+    var i8 = new glob.Int8Array(b);
+    function f(i) {
+        i = i | 0;
+        i = i & 1;
+        i = (i - 0x40000)|0;
+        i8[0x3ffff] = 0;
+        return i8[(i + 0x7fffe) >> 0] | 0;
+    }
+    return f;
+};
+var buffer = new ArrayBuffer(0x40000);
+var asm = asmMod(this, {}, buffer);
+assertEq(asm(-1),0);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/asm.js/testSIMD.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/asm.js/testSIMD.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/asm.js/testSIMD.js	2015-04-22 13:05:38.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/asm.js/testSIMD.js	2015-04-24 19:31:01.000000000 +0000
@@ -1,4 +1,5 @@
 load(libdir + "asm.js");
+load(libdir + "asserts.js");
 var heap = new ArrayBuffer(0x10000);
 
 // Set to true to see more JS debugging spew
@@ -729,14 +730,19 @@
 assertEqX4(f(SIMD.int32x4(1,2,3,4)), [1, 2, 3, 4]);
 assertEqX4(f(SIMD.int32x4(0,INT32_MIN,INT32_MAX,-1)), [0, Math.fround(INT32_MIN), Math.fround(INT32_MAX), -1]);
 
-// TODO amend tests once int32x4.fromFloat32x4 is fully specified, when float
-// values can't be converted into an int32 without overflowing.  In these
-// tests, we assume x86/x64, so a conversion which failed will return the
-// undefined int32 value. See also bug 1068028.
-const UNDEFINED_INT32 = 0x80000000 | 0;
 var f = asmLink(asmCompile('glob', USE_ASM + I32 + CI32 + F32 + CF32 + CVTFI + 'function f(x){x=cf4(x); var y=i4(0,0,0,0); y=cvt(x); return ci4(y);} return f'), this);
 assertEqX4(f(SIMD.float32x4(1,2,3,4)), [1, 2, 3, 4]);
-assertEqX4(f(SIMD.float32x4(NaN,Infinity,-Infinity,-0)), [UNDEFINED_INT32, UNDEFINED_INT32, UNDEFINED_INT32, 0]);
+// Test that INT32_MIN (exactly representable as an float32) and the first
+// integer representable as an float32 can be converted.
+assertEqX4(f(SIMD.float32x4(INT32_MIN, INT32_MAX - 64, -0, 0)), [INT32_MIN, INT32_MAX - 64, 0, 0].map(Math.fround));
+// Test boundaries: first integer less than INT32_MIN and representable as a float32
+assertThrowsInstanceOf(() => f(SIMD.float32x4(INT32_MIN - 129, 0, 0, 0)), RangeError);
+// INT_MAX + 1
+assertThrowsInstanceOf(() => f(SIMD.float32x4(Math.pow(2, 31), 0, 0, 0)), RangeError);
+// Special values
+assertThrowsInstanceOf(() => f(SIMD.float32x4(NaN, 0, 0, 0)), RangeError);
+assertThrowsInstanceOf(() => f(SIMD.float32x4(Infinity, 0, 0, 0)), RangeError);
+assertThrowsInstanceOf(() => f(SIMD.float32x4(-Infinity, 0, 0, 0)), RangeError);
 
 // Cast operators
 const CVTIFB = 'var cvt=f4.fromInt32x4Bits;';
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/basic/semicolon-less-return.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/basic/semicolon-less-return.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/basic/semicolon-less-return.js	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/basic/semicolon-less-return.js	2015-04-24 19:31:01.000000000 +0000
@@ -1,6 +1,8 @@
 // Warning should be shown for expression-like statement after semicolon-less
 // return (bug 1005110).
 
+load(libdir + "class.js");
+
 if (options().indexOf("werror") == -1)
   options("werror");
 
@@ -239,12 +241,14 @@
 `, 4, 4);
 
 // TOK_CLASS
-testWarn(`
+if (classesEnabled()) {
+  testWarn(`
 function f() {
   return
     class A { constructor() {} };
 }
 `, 4, 4);
+}
 
 // TOK_ADD
 testWarn(`
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/collections/Array-of-nonconfigurable-1.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/collections/Array-of-nonconfigurable-1.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/collections/Array-of-nonconfigurable-1.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/collections/Array-of-nonconfigurable-1.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,8 @@
+// If Array.of tries to overwrite a non-configurable property, it throws a TypeError.
+
+load(libdir + "asserts.js");
+
+function C() {
+    Object.defineProperty(this, 0, {value: "v", configurable: false});
+}
+assertThrowsInstanceOf(() => Array.of.call(C, 1, 2, 3), TypeError);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/collections/Array-of-nonconfigurable-2.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/collections/Array-of-nonconfigurable-2.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/collections/Array-of-nonconfigurable-2.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/collections/Array-of-nonconfigurable-2.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,16 @@
+// Array.of does not overwrite non-configurable properties.
+
+load(libdir + "asserts.js");
+
+var obj;
+function C() {
+    obj = this;
+    Object.defineProperty(this, 0, {value: "v", configurable: false});
+}
+try { Array.of.call(C, 1); } catch (e) {}
+assertDeepEq(Object.getOwnPropertyDescriptor(obj, 0), {
+    configurable: false,
+    enumerable: false,
+    value: "v",
+    writable: false
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-abi.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-abi.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-abi.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-abi.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,9 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.default_abi.toSource(1); },
+                         "ABI.prototype.toSource takes no arguments");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-array.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-array.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-array.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-array.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,15 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.ArrayType(); },
+                         "ArrayType takes one or two arguments");
+  assertTypeErrorMessage(() => { ctypes.int32_t.array(10)(1, 2); },
+                         "size defined ArrayType constructor takes at most one argument");
+  assertTypeErrorMessage(() => { ctypes.int32_t.array()(1, 2); },
+                         "size undefined ArrayType constructor takes one argument");
+  assertTypeErrorMessage(() => { ctypes.int32_t.array(10)().addressOfElement(); },
+                         "ArrayType.prototype.addressOfElement takes one argument");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-cdata.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-cdata.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-cdata.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-cdata.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,15 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.int32_t(0).address(1); },
+                         "CData.prototype.address takes no arguments");
+  assertTypeErrorMessage(() => { ctypes.char.array(10)().readString(1); },
+                         "CData.prototype.readString takes no arguments");
+  assertTypeErrorMessage(() => { ctypes.char.array(10)().readStringReplaceMalformed(1); },
+                         "CData.prototype.readStringReplaceMalformed takes no arguments");
+  assertTypeErrorMessage(() => { ctypes.int32_t(0).toSource(1); },
+                         "CData.prototype.toSource takes no arguments");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-ctypes.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-ctypes.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-ctypes.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-ctypes.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,11 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.cast(); },
+                         "ctypes.cast takes two arguments");
+  assertTypeErrorMessage(() => { ctypes.getRuntime(); },
+                         "ctypes.getRuntime takes one argument");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-finalizer.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-finalizer.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-finalizer.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-finalizer.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,16 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.CDataFinalizer(1); },
+                         "CDataFinalizer constructor takes two arguments");
+
+  let fin = ctypes.CDataFinalizer(ctypes.int32_t(0), ctypes.FunctionType(ctypes.default_abi, ctypes.int32_t, [ctypes.int32_t]).ptr(x => x));
+  assertTypeErrorMessage(() => { fin.forget(1); },
+                         "CDataFinalizer.prototype.forget takes no arguments");
+  assertTypeErrorMessage(() => { fin.dispose(1); },
+                         "CDataFinalizer.prototype.dispose takes no arguments");
+  fin.forget();
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-function.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-function.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-function.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-function.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,11 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.FunctionType(); },
+                         "FunctionType takes two or three arguments");
+  assertTypeErrorMessage(() => { ctypes.FunctionType(ctypes.default_abi, ctypes.void_t, []).ptr({}, 1); },
+                         "FunctionType constructor takes one argument");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-int64.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-int64.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-int64.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-int64.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,36 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.Int64(1).toString(1, 2); },
+                         "Int64.prototype.toString takes at most one argument");
+  assertTypeErrorMessage(() => { ctypes.Int64(1).toSource(1); },
+                         "Int64.prototype.toSource takes no arguments");
+  assertTypeErrorMessage(() => { ctypes.Int64(); },
+                         "Int64 constructor takes one argument");
+  assertTypeErrorMessage(() => { ctypes.Int64.compare(); },
+                         "Int64.compare takes two arguments");
+  assertTypeErrorMessage(() => { ctypes.Int64.lo(); },
+                         "Int64.lo takes one argument");
+  assertTypeErrorMessage(() => { ctypes.Int64.hi(); },
+                         "Int64.hi takes one argument");
+  assertTypeErrorMessage(() => { ctypes.Int64.join(); },
+                         "Int64.join takes two arguments");
+
+  assertTypeErrorMessage(() => { ctypes.UInt64(1).toString(1, 2); },
+                         "UInt64.prototype.toString takes at most one argument");
+  assertTypeErrorMessage(() => { ctypes.UInt64(1).toSource(1); },
+                         "UInt64.prototype.toSource takes no arguments");
+  assertTypeErrorMessage(() => { ctypes.UInt64(); },
+                         "UInt64 constructor takes one argument");
+  assertTypeErrorMessage(() => { ctypes.UInt64.compare(); },
+                         "UInt64.compare takes two arguments");
+  assertTypeErrorMessage(() => { ctypes.UInt64.lo(); },
+                         "UInt64.lo takes one argument");
+  assertTypeErrorMessage(() => { ctypes.UInt64.hi(); },
+                         "UInt64.hi takes one argument");
+  assertTypeErrorMessage(() => { ctypes.UInt64.join(); },
+                         "UInt64.join takes two arguments");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-pointer.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-pointer.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-pointer.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-pointer.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,11 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.PointerType(); },
+                         "PointerType takes one argument");
+  assertTypeErrorMessage(() => { ctypes.int32_t.ptr(1, 2, 3, 4); },
+                         "PointerType constructor takes 0, 1, 2, or 3 arguments");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-primitive.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-primitive.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-primitive.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-primitive.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,11 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.int32_t(1, 2, 3); },
+                         "CType constructor takes at most one argument");
+  assertTypeErrorMessage(() => { ctypes.int32_t.array(1, 2); },
+                         "CType.prototype.array takes at most one argument");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-struct.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-struct.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-length-struct.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-length-struct.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,17 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.StructType(); },
+                         "StructType takes one or two arguments");
+  assertTypeErrorMessage(() => { ctypes.StructType("a").define(); },
+                         "StructType.prototype.define takes one argument");
+  assertTypeErrorMessage(() => { ctypes.StructType("a", [])(1, 2, 3); },
+                         "StructType constructor takes at most one argument");
+  assertTypeErrorMessage(() => { ctypes.StructType("a", [ {"x": ctypes.int32_t }, {"y": ctypes.int32_t }, {"z": ctypes.int32_t }])(1, 2); },
+                         "StructType constructor takes 0, 1, or 3 arguments");
+  assertTypeErrorMessage(() => { ctypes.StructType("a", [ {"x": ctypes.int32_t } ])().addressOfField(); },
+                         "StructType.prototype.addressOfField takes one argument");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-array.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-array.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-array.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-array.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,17 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.int32_t.array({}); },
+                         "argument of CType.prototype.array must be a nonnegative integer");
+  assertTypeErrorMessage(() => { ctypes.ArrayType(1); },
+                         "first argument of ArrayType must be a CType");
+  assertTypeErrorMessage(() => { ctypes.ArrayType(ctypes.int32_t, {}); },
+                         "second argument of ArrayType must be a nonnegative integer");
+  assertTypeErrorMessage(() => { ctypes.char.array()({}); },
+                         "argument of size undefined ArrayType constructor must be an array object or integer");
+  assertTypeErrorMessage(() => { ctypes.char.array()(false); },
+                         "argument of size undefined ArrayType constructor must be an array object or integer");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-ctypes.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-ctypes.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-ctypes.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-ctypes.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,13 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.cast(1, 2); },
+                         "first argument of ctypes.cast must be a CData");
+  assertTypeErrorMessage(() => { ctypes.cast(ctypes.int32_t(0), 2); },
+                         "second argument of ctypes.cast must be a CType");
+  assertTypeErrorMessage(() => { ctypes.getRuntime(1); },
+                         "argument of ctypes.getRuntime must be a CType");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-function.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-function.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-function.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-function.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,9 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.FunctionType(ctypes.default_abi, ctypes.int32_t, 1); },
+                         "third argument of FunctionType must be an array");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-int64.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-int64.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-int64.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-int64.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,28 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertRangeErrorMessage(() => { ctypes.Int64(0).toString("a"); },
+                         "argument of Int64.prototype.toString must be an integer at least 2 and no greater than 36");
+  assertTypeErrorMessage(() => { ctypes.Int64.compare(1, 2); },
+                         "first argument of Int64.compare must be a Int64");
+  assertTypeErrorMessage(() => { ctypes.Int64.compare(ctypes.Int64(0), 2); },
+                         "second argument of Int64.compare must be a Int64");
+  assertTypeErrorMessage(() => { ctypes.Int64.lo(1); },
+                         "argument of Int64.lo must be a Int64");
+  assertTypeErrorMessage(() => { ctypes.Int64.hi(1); },
+                         "argument of Int64.hi must be a Int64");
+
+  assertRangeErrorMessage(() => { ctypes.UInt64(0).toString("a"); },
+                         "argument of UInt64.prototype.toString must be an integer at least 2 and no greater than 36");
+  assertTypeErrorMessage(() => { ctypes.UInt64.compare(1, 2); },
+                         "first argument of UInt64.compare must be a UInt64");
+  assertTypeErrorMessage(() => { ctypes.UInt64.compare(ctypes.UInt64(0), 2); },
+                         "second argument of UInt64.compare must be a UInt64");
+  assertTypeErrorMessage(() => { ctypes.UInt64.lo(1); },
+                         "argument of UInt64.lo must be a UInt64");
+  assertTypeErrorMessage(() => { ctypes.UInt64.hi(1); },
+                         "argument of UInt64.hi must be a UInt64");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-pointer.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-pointer.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-pointer.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-pointer.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,9 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.PointerType({}); },
+                         "argument of PointerType must be a CType");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-struct.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-struct.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/argument-type-struct.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/argument-type-struct.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,17 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.StructType(1); },
+                         "first argument of StructType must be a string");
+  assertTypeErrorMessage(() => { ctypes.StructType("a", 1); },
+                         "second argument of StructType must be an array");
+  assertTypeErrorMessage(() => { ctypes.StructType("a").define(1); },
+                         "argument of StructType.prototype.define must be an array");
+  assertTypeErrorMessage(() => { ctypes.StructType("a").define({}); },
+                         "argument of StructType.prototype.define must be an array");
+  assertTypeErrorMessage(() => { ctypes.StructType("a", [{x:ctypes.int32_t}])().addressOfField(1); },
+                         "argument of StructType.prototype.addressOfField must be a string");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/bug1155985.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/bug1155985.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/bug1155985.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/bug1155985.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,14 @@
+function test() {
+  for (let i = 0; i < 100; i++) {
+    let test_struct = ctypes.StructType("test_struct", [{ "x": ctypes.int32_t },
+                                                        { "bar": ctypes.uint32_t }]);
+
+    try {
+      new test_struct("foo", "x");
+    } catch (e) {
+    }
+  }
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-array.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-array.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-array.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-array.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,36 @@
+// Type conversion error should report its type.
+
+load(libdir + 'asserts.js');
+
+function test() {
+  // constructor
+  assertTypeErrorMessage(() => { ctypes.int32_t.array()("foo"); },
+                         "can't convert the string \"foo\" to the type ctypes.int32_t.array()");
+  assertTypeErrorMessage(() => { ctypes.int32_t.array(10)("foo"); },
+                         "can't convert the string \"foo\" to the type ctypes.int32_t.array(10)");
+  assertTypeErrorMessage(() => { ctypes.char.array(2)("foo"); },
+                         "length of the string \"foo\" does not fit to the length of the type ctypes.char.array(2) (expected 2 or lower, got 3)");
+  assertTypeErrorMessage(() => { ctypes.char16_t.array(2)("foo"); },
+                         "length of the string \"foo\" does not fit to the length of the type ctypes.char16_t.array(2) (expected 2 or lower, got 3)");
+  assertTypeErrorMessage(() => { ctypes.int8_t.array(2)(new ArrayBuffer(8)); },
+                         "length of the array buffer ({}) does not match to the length of the type ctypes.int8_t.array(2) (expected 2, got 8)");
+  assertTypeErrorMessage(() => { ctypes.int8_t.array(2)(new Int8Array(8)); },
+                         "length of the typed array ({0:0, 1:0, 2:0, 3:0, 4:0, 5:0, 6:0, 7:0}) does not match to the length of the type ctypes.int8_t.array(2) (expected 2, got 8)");
+
+  // elem setter
+  assertTypeErrorMessage(() => { ctypes.int32_t.array(10)()[0] = "foo"; },
+                         "can't convert the string \"foo\" to element 0 of the type ctypes.int32_t.array(10)");
+  assertTypeErrorMessage(() => { ctypes.int32_t.array(10)()[1] = "foo"; },
+                         "can't convert the string \"foo\" to element 1 of the type ctypes.int32_t.array(10)");
+
+  // value setter
+  assertTypeErrorMessage(() => { ctypes.int32_t.array(1)().value = ["foo"]; },
+                         "can't convert the string \"foo\" to element 0 of the type ctypes.int32_t.array(1)");
+  assertTypeErrorMessage(() => { ctypes.int32_t.array(1)().value = [2, "foo"]; },
+                         "length of the array [2, \"foo\"] does not match to the length of the type ctypes.int32_t.array(1) (expected 1, got 2)");
+  assertTypeErrorMessage(() => { ctypes.int32_t.array(2)().value = [2, "foo"]; },
+                         "can't convert the string \"foo\" to element 1 of the type ctypes.int32_t.array(2)");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-error.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-error.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-error.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-error.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,14 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  let obj = {
+    toSource() {
+      throw 1;
+    }
+  };
+  assertTypeErrorMessage(() => { ctypes.double().value = obj; },
+                         "can't convert <<error converting value to string>> to the type double");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-finalizer.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-finalizer.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-finalizer.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-finalizer.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,61 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  // non object
+  assertTypeErrorMessage(() => { ctypes.CDataFinalizer(0, "foo"); },
+                         "expected _a CData object_ of a function pointer type, got the string \"foo\"");
+  // non CData object
+  assertTypeErrorMessage(() => { ctypes.CDataFinalizer(0, ["foo"]); },
+                         "expected a _CData_ object of a function pointer type, got the array [\"foo\"]");
+
+  // a CData which is not a pointer
+  assertTypeErrorMessage(() => { ctypes.CDataFinalizer(0, ctypes.int32_t(0)); },
+                         "expected a CData object of a function _pointer_ type, got ctypes.int32_t(0)");
+  // a pointer CData which is not a function
+  assertTypeErrorMessage(() => { ctypes.CDataFinalizer(0, ctypes.int32_t.ptr(0)); },
+                         "expected a CData object of a _function_ pointer type, got ctypes.int32_t.ptr(ctypes.UInt64(\"0x0\"))");
+
+  // null function
+  let func_type = ctypes.FunctionType(ctypes.default_abi, ctypes.voidptr_t,
+                                      [ctypes.int32_t, ctypes.int32_t]).ptr;
+  let f0 = func_type(0);
+  assertTypeErrorMessage(() => { ctypes.CDataFinalizer(0, f0); },
+                         "expected a CData object of a _non-NULL_ function pointer type, got ctypes.FunctionType(ctypes.default_abi, ctypes.voidptr_t, [ctypes.int32_t, ctypes.int32_t]).ptr(ctypes.UInt64(\"0x0\"))");
+
+  // a function with 2 arguments
+  let f1 = func_type(x => x);
+  assertTypeErrorMessage(() => { ctypes.CDataFinalizer(0, f1); },
+                         "expected a function accepting exactly one argument, got ctypes.FunctionType(ctypes.default_abi, ctypes.voidptr_t, [ctypes.int32_t, ctypes.int32_t])");
+
+  // non CData in argument 1
+  let func_type2 = ctypes.FunctionType(ctypes.default_abi, ctypes.voidptr_t,
+                                       [ctypes.int32_t.ptr]).ptr;
+  let f2 = func_type2(x => x);
+  assertTypeErrorMessage(() => { ctypes.CDataFinalizer(0, f2); },
+                         "can't convert the number 0 to the type of argument 1 of ctypes.FunctionType(ctypes.default_abi, ctypes.voidptr_t, [ctypes.int32_t.ptr]).ptr");
+
+  // wrong struct in argument 1
+  let test_struct = ctypes.StructType("test_struct", [{ "x": ctypes.int32_t }]);
+  let func_type3 = ctypes.FunctionType(ctypes.default_abi, ctypes.voidptr_t,
+                                       [test_struct]).ptr;
+  let f3 = func_type3(x => x);
+  assertTypeErrorMessage(() => { ctypes.CDataFinalizer({ "x": "foo" }, f3); },
+                         "can't convert the string \"foo\" to the 'x' field (int32_t) of test_struct at argument 1 of ctypes.FunctionType(ctypes.default_abi, ctypes.voidptr_t, [test_struct]).ptr");
+
+  // different size in argument 1
+  let func_type4 = ctypes.FunctionType(ctypes.default_abi, ctypes.int32_t,
+                                       [ctypes.int32_t]).ptr;
+  let f4 = func_type4(x => x);
+  assertTypeErrorMessage(() => { ctypes.CDataFinalizer(ctypes.int16_t(0), f4); },
+                         "expected an object with the same size as argument 1 of ctypes.FunctionType(ctypes.default_abi, ctypes.int32_t, [ctypes.int32_t]).ptr, got ctypes.int16_t(0)");
+
+  let fin = ctypes.CDataFinalizer(ctypes.int32_t(0), f4);
+  fin.dispose();
+  assertTypeErrorMessage(() => { ctypes.int32_t(0).value = fin; },
+                         "attempting to convert an empty CDataFinalizer");
+  assertTypeErrorMessage(() => { f4(fin); },
+                         /attempting to convert an empty CDataFinalizer at argument 1 of ctypes\.FunctionType\(ctypes\.default_abi, ctypes\.int32_t, \[ctypes\.int32_t\]\)\.ptr\(ctypes\.UInt64\(\"[x0-9A-Fa-f]+\"\)\)/);
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-function.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-function.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-function.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-function.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,33 @@
+// Type conversion error should report its type.
+
+load(libdir + 'asserts.js');
+
+function test() {
+  // Note: js shell cannot handle the exception in return value.
+
+  // primitive
+  let func_type = ctypes.FunctionType(ctypes.default_abi, ctypes.voidptr_t,
+                                      [ctypes.int32_t]).ptr;
+  let f1 = func_type(function() {});
+  assertTypeErrorMessage(() => { f1("foo"); },
+                         /can't pass the string "foo" to argument 1 of ctypes\.FunctionType\(ctypes\.default_abi, ctypes\.voidptr_t, \[ctypes\.int32_t\]\)\.ptr\(ctypes\.UInt64\("[x0-9A-Fa-f]+"\)\)/);
+
+  // struct
+  let test_struct = ctypes.StructType("test_struct", [{ "x": ctypes.int32_t }]);
+  let func_type2 = ctypes.FunctionType(ctypes.default_abi, ctypes.int32_t,
+                                       [test_struct]).ptr;
+  let f2 = func_type2(function() {});
+  assertTypeErrorMessage(() => { f2({ "x": "foo" }); },
+                         /can't convert the string \"foo\" to the 'x' field \(int32_t\) of test_struct at argument 1 of ctypes\.FunctionType\(ctypes\.default_abi, ctypes.int32_t, \[test_struct\]\)\.ptr\(ctypes\.UInt64\(\"[x0-9A-Fa-f]+\"\)\)/);
+  assertTypeErrorMessage(() => { f2({ "x": "foo", "y": "bar" }); },
+                         /property count of the object \(\{x:\"foo\", y:\"bar\"\}\) does not match to field count of the type test_struct \(expected 1, got 2\) at argument 1 of ctypes\.FunctionType\(ctypes\.default_abi, ctypes\.int32_t, \[test_struct\]\)\.ptr\(ctypes\.UInt64\(\"[x0-9A-Fa-f]+\"\)\)/);
+  assertTypeErrorMessage(() => { f2({ 0: "foo" }); },
+                         /property name the number 0 of the object \(\{0:\"foo\"\}\) is not a string at argument 1 of ctypes\.FunctionType\(ctypes\.default_abi, ctypes\.int32_t, \[test_struct\]\)\.ptr\(ctypes\.UInt64\(\"[x0-9A-Fa-f]+\"\)\)/);
+
+  // error sentinel
+  assertTypeErrorMessage(() => { func_type(function() {}, null, "foo"); },
+                         "can't convert the string \"foo\" to the return type of ctypes.FunctionType(ctypes.default_abi, ctypes.voidptr_t, [ctypes.int32_t])");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-int64.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-int64.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-int64.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-int64.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,20 @@
+load(libdir + 'asserts.js');
+
+function test() {
+  assertTypeErrorMessage(() => { ctypes.Int64("0xfffffffffffffffffffffff"); },
+                         "can't pass the string \"0xfffffffffffffffffffffff\" to argument 1 of Int64");
+  assertTypeErrorMessage(() => { ctypes.Int64.join("foo", 0); },
+                         "can't pass the string \"foo\" to argument 1 of Int64.join");
+  assertTypeErrorMessage(() => { ctypes.Int64.join(0, "foo"); },
+                         "can't pass the string \"foo\" to argument 2 of Int64.join");
+
+  assertTypeErrorMessage(() => { ctypes.UInt64("0xfffffffffffffffffffffff"); },
+                         "can't pass the string \"0xfffffffffffffffffffffff\" to argument 1 of UInt64");
+  assertTypeErrorMessage(() => { ctypes.UInt64.join("foo", 0); },
+                         "can't pass the string \"foo\" to argument 1 of UInt64.join");
+  assertTypeErrorMessage(() => { ctypes.UInt64.join(0, "foo"); },
+                         "can't pass the string \"foo\" to argument 2 of UInt64.join");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-native-function.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-native-function.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-native-function.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-native-function.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,37 @@
+// Type conversion error for native function should report its name and type
+// in C style.
+
+load(libdir + 'asserts.js');
+
+function test() {
+  let lib;
+  try {
+    lib = ctypes.open(ctypes.libraryName("c"));
+  } catch (e) {
+  }
+  if (!lib)
+    return;
+
+  let func = lib.declare("hypot",
+                         ctypes.default_abi,
+                         ctypes.double,
+                         ctypes.double, ctypes.double);
+  assertTypeErrorMessage(() => { func(1, "xyzzy"); },
+                         "can't pass the string \"xyzzy\" to argument 2 of double hypot(double, double)");
+
+  // test C style source for various types
+  let test_struct = ctypes.StructType("test_struct", [{ "x": ctypes.int32_t }]);
+  let test_func = ctypes.FunctionType(ctypes.default_abi, ctypes.voidptr_t,
+                                      [ctypes.int32_t]).ptr;
+  func = lib.declare("hypot",
+                     ctypes.default_abi,
+                     ctypes.double,
+                     ctypes.double, ctypes.int32_t.ptr.ptr.ptr.array(),
+                     test_struct, test_struct.ptr.ptr,
+                     test_func, test_func.ptr.ptr.ptr, "...");
+  assertTypeErrorMessage(() => { func("xyzzy", 1, 2, 3, 4, 5); },
+                         "can't pass the string \"xyzzy\" to argument 1 of double hypot(double, int32_t****, struct test_struct, struct test_struct**, void* (*)(int32_t), void* (****)(int32_t), ...)");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-pointer.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-pointer.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-pointer.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-pointer.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,29 @@
+// Type conversion error should report its type.
+
+load(libdir + 'asserts.js');
+
+function test() {
+  let test_struct = ctypes.StructType("test_struct", [{ "x": ctypes.int32_t }]);
+  let struct_val = test_struct();
+
+  // constructor
+  assertTypeErrorMessage(() => { ctypes.int32_t.ptr("foo"); },
+                         "can't convert the string \"foo\" to the type ctypes.int32_t.ptr");
+
+  // value setter
+  assertTypeErrorMessage(() => { test_struct.ptr().value = "foo"; },
+                         "can't convert the string \"foo\" to the type test_struct.ptr");
+  assertTypeErrorMessage(() => { test_struct.ptr().value = {}; },
+                         "can't convert the object ({}) to the type test_struct.ptr");
+  assertTypeErrorMessage(() => { test_struct.ptr().value = [1, 2]; },
+                         "can't convert the array [1, 2] to the type test_struct.ptr");
+  assertTypeErrorMessage(() => { test_struct.ptr().value = Int8Array([1, 2]); },
+                         "can't convert the typed array ({0:1, 1:2}) to the type test_struct.ptr");
+
+  // contents setter
+  assertTypeErrorMessage(() => { ctypes.int32_t().address().contents = {}; },
+                         "can't convert the object ({}) to the type int32_t");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-primitive.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-primitive.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-primitive.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-primitive.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,44 @@
+// Type conversion error should report its type.
+
+load(libdir + 'asserts.js');
+
+function test() {
+  // constructor
+  assertTypeErrorMessage(() => { ctypes.int32_t("foo"); },
+                         "can't convert the string \"foo\" to the type int32_t");
+  assertTypeErrorMessage(() => { ctypes.int32_t(null); },
+                         "can't convert null to the type int32_t");
+  assertTypeErrorMessage(() => { ctypes.int32_t(undefined); },
+                         "can't convert undefined to the type int32_t");
+  assertTypeErrorMessage(() => { ctypes.int32_t({}); },
+                         "can't convert the object ({}) to the type int32_t");
+  assertTypeErrorMessage(() => { ctypes.int32_t([]); },
+                         "can't convert the array [] to the type int32_t");
+  assertTypeErrorMessage(() => { ctypes.int32_t(new Int8Array([])); },
+                         "can't convert the typed array ({}) to the type int32_t");
+  assertTypeErrorMessage(() => { ctypes.int32_t(ctypes.int32_t); },
+                         "can't convert ctypes.int32_t to the type int32_t");
+  assertTypeErrorMessage(() => { ctypes.int32_t("0xfffffffffffffffffffffff"); },
+                         "can't convert the string \"0xfffffffffffffffffffffff\" to the type int32_t");
+  if (typeof Symbol === "function") {
+    assertTypeErrorMessage(() => { ctypes.int32_t(Symbol.iterator); },
+                           "can't convert Symbol.iterator to the type int32_t");
+    assertTypeErrorMessage(() => { ctypes.int32_t(Symbol("foo")); },
+                           "can't convert Symbol(\"foo\") to the type int32_t");
+  }
+
+  // value setter
+  let test_struct = ctypes.StructType("test_struct", [{ "x": ctypes.int32_t }]);
+  let struct_val = test_struct();
+  assertTypeErrorMessage(() => { ctypes.bool().value = struct_val; },
+                         "can't convert test_struct(0) to the type boolean");
+  assertTypeErrorMessage(() => { ctypes.char16_t().value = struct_val; },
+                         "can't convert test_struct(0) to the type char16_t");
+  assertTypeErrorMessage(() => { ctypes.int8_t().value = struct_val; },
+                         "can't convert test_struct(0) to the type int8_t");
+  assertTypeErrorMessage(() => { ctypes.double().value = struct_val; },
+                         "can't convert test_struct(0) to the type double");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-struct.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-struct.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-struct.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-struct.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,36 @@
+// Type conversion error should report its type.
+
+load(libdir + 'asserts.js');
+
+function test() {
+  let test_struct = ctypes.StructType("test_struct", [{ "x": ctypes.int32_t },
+                                                      { "bar": ctypes.int32_t }]);
+
+  // constructor
+  assertTypeErrorMessage(() => { new test_struct("foo"); },
+                         "can't convert the string \"foo\" to the type test_struct");
+  assertTypeErrorMessage(() => { new test_struct("foo", "x"); },
+                         "can't convert the string \"foo\" to the 'x' field (int32_t) of test_struct");
+  assertTypeErrorMessage(() => { new test_struct({ "x": "foo", "bar": 1 }); },
+                         "can't convert the string \"foo\" to the 'x' field (int32_t) of test_struct");
+  assertTypeErrorMessage(() => { new test_struct({ 0: 1, "bar": 1 }); },
+                         "property name the number 0 of the object ({0:1, bar:1}) is not a string");
+
+  // field setter
+  let struct_val = test_struct();
+  assertTypeErrorMessage(() => { struct_val.x = "foo"; },
+                         "can't convert the string \"foo\" to the 'x' field (int32_t) of test_struct");
+  assertTypeErrorMessage(() => { struct_val.bar = "foo"; },
+                         "can't convert the string \"foo\" to the 'bar' field (int32_t) of test_struct");
+
+  // value setter
+  assertTypeErrorMessage(() => { struct_val.value = { "x": "foo" }; },
+                         "property count of the object ({x:\"foo\"}) does not match to field count of the type test_struct (expected 2, got 1)");
+  assertTypeErrorMessage(() => { struct_val.value = { "x": "foo", "bar": 1 }; },
+                         "can't convert the string \"foo\" to the 'x' field (int32_t) of test_struct");
+  assertTypeErrorMessage(() => { struct_val.value = "foo"; },
+                         "can't convert the string \"foo\" to the type test_struct");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-to-primitive.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-to-primitive.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/ctypes/conversion-to-primitive.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/ctypes/conversion-to-primitive.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,20 @@
+// Accessing `value` property of non primitive type should report its type.
+
+load(libdir + 'asserts.js');
+
+function test() {
+  let test_struct = ctypes.StructType("test_struct", [{ "x": ctypes.voidptr_t }]);
+  assertTypeErrorMessage(() => test_struct().value,
+                         ".value only works on character and numeric types, not `test_struct`");
+
+  let test_array = ctypes.ArrayType(test_struct);
+  assertTypeErrorMessage(() => test_array(10).value,
+                         ".value only works on character and numeric types, not `test_struct.array(10)`");
+
+  let test_pointer = ctypes.PointerType(test_struct);
+  assertTypeErrorMessage(() => test_pointer(10).value,
+                         ".value only works on character and numeric types, not `test_struct.ptr`");
+}
+
+if (typeof ctypes === "object")
+  test();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-01.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-01.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-01.js	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-// Test basic usage of onGarbageCollection
-
-const root = newGlobal();
-const dbg = new Debugger();
-const wrappedRoot = dbg.addDebuggee(root)
-
-const NUM_SLICES = root.NUM_SLICES = 10;
-
-let fired = false;
-let slicesFound = 0;
-
-dbg.memory.onGarbageCollection = data => {
-  fired = true;
-
-  print("Got onGarbageCollection: " + JSON.stringify(data, null, 2));
-
-  assertEq(typeof data.reason, "string");
-  assertEq(typeof data.nonincrementalReason == "string" || data.nonincrementalReason === null,
-           true);
-
-  let lastStartTimestamp = 0;
-  for (let i = 0; i < data.collections.length; i++) {
-    let slice = data.collections[i];
-
-    assertEq(slice.startTimestamp >= lastStartTimestamp, true);
-    assertEq(slice.startTimestamp <= slice.endTimestamp, true);
-
-    lastStartTimestamp = slice.startTimestamp;
-  }
-
-  assertEq(data.collections.length >= 1, true);
-  slicesFound += data.collections.length;
-}
-
-root.eval(
-  `
-  this.allocs = [];
-
-  // GC slices
-  for (var i = 0; i < NUM_SLICES; i++) {
-    this.allocs.push({});
-    gcslice();
-  }
-
-  // Full GC
-  this.allocs.push({});
-  gc();
-  `
-);
-
-// The hook should have been fired at least once.
-assertEq(fired, true);
-
-// NUM_SLICES + 1 full gc + however many were triggered naturally (due to
-// whatever zealousness setting).
-print("Found " + slicesFound + " slices");
-assertEq(slicesFound >= NUM_SLICES + 1, true);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-02.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-02.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-02.js	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-// Test multiple debuggers, GCs, and zones interacting with each other.
-
-gczeal(0);
-
-const root1 = newGlobal();
-const dbg1 = new Debugger();
-dbg1.addDebuggee(root1)
-
-const root2 = newGlobal();
-const dbg2 = new Debugger();
-dbg2.addDebuggee(root2)
-
-let fired1 = false;
-let fired2 = false;
-dbg1.memory.onGarbageCollection = _ => fired1 = true;
-dbg2.memory.onGarbageCollection = _ => fired2 = true;
-
-function reset() {
-  fired1 = false;
-  fired2 = false;
-}
-
-// GC 1 only
-root1.eval(`gc(this)`);
-assertEq(fired1, true);
-assertEq(fired2, false);
-
-// GC 2 only
-reset();
-root2.eval(`gc(this)`);
-assertEq(fired1, false);
-assertEq(fired2, true);
-
-// Full GC
-reset();
-gc();
-assertEq(fired1, true);
-assertEq(fired2, true);
-
-// Full GC with no debuggees
-reset();
-dbg1.removeAllDebuggees();
-dbg2.removeAllDebuggees();
-gc();
-assertEq(fired1, false);
-assertEq(fired2, false);
-
-// One debugger with multiple debuggees in different zones.
-
-dbg1.addDebuggee(root1);
-dbg1.addDebuggee(root2);
-
-// Just debuggee 1
-reset();
-root1.eval(`gc(this)`);
-assertEq(fired1, true);
-assertEq(fired2, false);
-
-// Just debuggee 2
-reset();
-root2.eval(`gc(this)`);
-assertEq(fired1, true);
-assertEq(fired2, false);
-
-// All debuggees
-reset();
-gc();
-assertEq(fired1, true);
-assertEq(fired2, false);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-03.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-03.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-03.js	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-03.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// Test that the onGarbageCollection hook is not reentrant.
-
-gczeal(0);
-
-const root = newGlobal();
-const dbg = new Debugger();
-const wrappedRoot = dbg.addDebuggee(root)
-
-let timesFired = 0;
-
-dbg.memory.onGarbageCollection = _ => {
-  timesFired++;
-  root.eval(`gc()`);
-}
-
-root.eval(`gc()`);
-
-assertEq(timesFired, 1);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-04.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-04.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-04.js	2015-04-22 13:05:43.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/debug/Memory-onGarbageCollection-04.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-// Test that the onGarbageCollection reentrancy guard is on a per Debugger
-// basis. That is if our first Debugger is observing our second Debugger's
-// compartment, and this second Debugger triggers a GC inside its
-// onGarbageCollection hook, the first Debugger's onGarbageCollection hook is
-// still called.
-//
-// This is the scenario we are setting up: top level debugging the `debuggeree`
-// global, which is debugging the `debuggee` global. Then, we trigger the
-// following events:
-//
-//     debuggee gc
-//         |
-//         V
-//     debuggeree's onGarbageCollection
-//         |
-//         V
-//     debuggeree gc
-//         |
-//         V
-//     top level onGarbageCollection
-//
-// Note that the top level's onGarbageCollection hook should be fired, at the
-// same time that we are preventing reentrancy into debuggeree's
-// onGarbageCollection hook.
-
-gczeal(0);
-
-const debuggeree = newGlobal();
-const debuggee = debuggeree.debuggee = newGlobal();
-
-debuggeree.eval(
-  `
-  const dbg = new Debugger(this.debuggee);
-  let fired = 0;
-  dbg.memory.onGarbageCollection = _ => {
-    fired++;
-    gc(this);
-  };
-  `
-);
-
-const dbg = new Debugger(debuggeree);
-let fired = 0;
-dbg.memory.onGarbageCollection = _ => {
-  fired++;
-};
-
-debuggee.eval(`gc(this)`);
-
-assertEq(debuggeree.fired, 1);
-assertEq(fired, 1);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/debug/Object-defineProperty-14.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/debug/Object-defineProperty-14.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/debug/Object-defineProperty-14.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/debug/Object-defineProperty-14.js	2015-04-24 19:31:02.000000000 +0000
@@ -0,0 +1,15 @@
+// defineProperty accepts undefined for desc.get/set.
+
+load(libdir + "asserts.js");
+
+var g = newGlobal();
+var dbg = new Debugger;
+var gw = dbg.addDebuggee(g);
+
+gw.defineProperty("p", {get: undefined, set: undefined});
+
+var desc = g.eval("Object.getOwnPropertyDescriptor(this, 'p')");
+assertEq("get" in desc, true);
+assertEq("set" in desc, true);
+assertEq(desc.get, undefined);
+assertEq(desc.set, undefined);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/heap-analysis/byteSize-of-object.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/heap-analysis/byteSize-of-object.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/heap-analysis/byteSize-of-object.js	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/heap-analysis/byteSize-of-object.js	2015-04-24 19:31:03.000000000 +0000
@@ -26,7 +26,7 @@
 // being tenured. (We use 'survives a GC' as an approximation for 'tenuring'.)
 function tByteSize(obj) {
   var size = byteSize(obj);
-  gc();
+  minorgc();
   if (size != byteSize(obj))
     return 0;
   return size;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/heap-analysis/byteSize-of-string.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/heap-analysis/byteSize-of-string.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/heap-analysis/byteSize-of-string.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/heap-analysis/byteSize-of-string.js	2015-04-24 19:31:03.000000000 +0000
@@ -0,0 +1,131 @@
+// Check JS::ubi::Node::size results for strings.
+
+// We actually hard-code specific sizes into this test, even though they're
+// implementation details, because in practice there are only two architecture
+// variants to consider (32-bit and 64-bit), and if these sizes change, that's
+// something SpiderMonkey hackers really want to know; they're supposed to be
+// stable.
+
+// Run this test only if we're using jemalloc. Other malloc implementations
+// exhibit surprising behaviors. For example, 32-bit Fedora builds have
+// non-deterministic allocation sizes.
+var config = getBuildConfiguration();
+if (!config['moz-memory'])
+  quit(0);
+
+if (config['pointer-byte-size'] == 4)
+  var s = (s32, s64) => s32
+else
+  var s = (s32, s64) => s64
+
+// Return the byte size of |obj|, ensuring that the size is not affected by
+// being tenured. (We use 'survives a GC' as an approximation for 'tenuring'.)
+function tByteSize(obj) {
+  var nurserySize = byteSize(obj);
+  minorgc();
+  var tenuredSize = byteSize(obj);
+  if (nurserySize != tenuredSize) {
+    print("nursery size: " + nurserySize + "  tenured size: " + tenuredSize);
+    return -1; // make the stack trace point at the real test
+  }
+
+  return tenuredSize;
+}
+
+// There are four representations of flat strings, with the following capacities
+// (excluding a terminating null character):
+//
+//                      32-bit                  64-bit                test
+// representation       Latin-1   char16_t      Latin-1   char16_t    label
+// ========================================================================
+// JSExternalString            (cannot be tested in shell)            -
+// JSThinInlineString   7         3             15        7           T
+// JSFatInlineString    23        11            23        11          F
+// JSExtensibleString          - limited by available memory -        X
+// JSUndependedString          - same as JSExtensibleString -
+
+// Latin-1
+assertEq(tByteSize(""),                                                 s(16, 24)); // T, T
+assertEq(tByteSize("1"),                                                s(16, 24)); // T, T
+assertEq(tByteSize("1234567"),                                          s(16, 24)); // T, T
+assertEq(tByteSize("12345678"),                                         s(32, 24)); // F, T
+assertEq(tByteSize("123456789.12345"),                                  s(32, 24)); // F, T
+assertEq(tByteSize("123456789.123456"),                                 s(32, 32)); // F, F
+assertEq(tByteSize("123456789.123456789.123"),                          s(32, 32)); // F, F
+assertEq(tByteSize("123456789.123456789.1234"),                         s(48, 56)); // X, X
+assertEq(tByteSize("123456789.123456789.123456789.1"),                  s(48, 56)); // X, X
+assertEq(tByteSize("123456789.123456789.123456789.12"),                 s(64, 72)); // X, X
+
+// Inline char16_t atoms.
+// "Impassionate gods have never seen the red that is the Tatsuta River."
+//   - Ariwara no Narihira
+assertEq(tByteSize("千"),						s(16, 24)); // T, T
+assertEq(tByteSize("千早"),    						s(16, 24)); // T, T
+assertEq(tByteSize("千早ぶ"),    					s(16, 24)); // T, T
+assertEq(tByteSize("千早ぶる"),    					s(32, 24)); // F, T
+assertEq(tByteSize("千早ぶる神"),    					s(32, 24)); // F, T
+assertEq(tByteSize("千早ぶる神代"),					s(32, 24)); // F, T
+assertEq(tByteSize("千早ぶる神代も"),					s(32, 24)); // F, T
+assertEq(tByteSize("千早ぶる神代もき"),					s(32, 32)); // F, F
+assertEq(tByteSize("千早ぶる神代もきかず龍"),				s(32, 32)); // F, F
+assertEq(tByteSize("千早ぶる神代もきかず龍田"),    			s(48, 56)); // X, X
+assertEq(tByteSize("千早ぶる神代もきかず龍田川 か"),    			s(48, 56)); // X, X
+assertEq(tByteSize("千早ぶる神代もきかず龍田川 から"),    			s(64, 72)); // X, X
+assertEq(tByteSize("千早ぶる神代もきかず龍田川 からくれなゐに水く"),    	s(64, 72)); // X, X
+assertEq(tByteSize("千早ぶる神代もきかず龍田川 からくれなゐに水くく"),    	s(80, 88)); // X, X
+assertEq(tByteSize("千早ぶる神代もきかず龍田川 からくれなゐに水くくるとは"),	s(80, 88)); // X, X
+
+// A Latin-1 rope. This changes size when flattened.
+// "In a village of La Mancha, the name of which I have no desire to call to mind"
+//   - Miguel de Cervantes, Don Quixote
+var fragment8 = "En un lugar de la Mancha, de cuyo nombre no quiero acordarme"; // 60 characters
+var rope8 = fragment8;
+for (var i = 0; i < 10; i++) // 1024 repetitions
+  rope8 = rope8 + rope8;
+assertEq(tByteSize(rope8),                                              s(16, 24));
+var matches8 = rope8.match(/(de cuyo nombre no quiero acordarme)/);
+assertEq(tByteSize(rope8),                                              s(16 + 65536,  24 + 65536));
+
+// Test extensible strings.
+//
+// Appending another copy of the fragment should yield another rope.
+//
+// Flatting that should turn the original rope into a dependent string, and
+// yield a new linear string, of the some size as the original.
+rope8a = rope8 + fragment8;
+assertEq(tByteSize(rope8a),                                             s(16, 24));
+rope8a.match(/x/, function() { assertEq(true, false); });
+assertEq(tByteSize(rope8a),                                             s(16 + 65536,  24 + 65536));
+assertEq(tByteSize(rope8),                                              s(16, 24));
+
+
+// A char16_t rope. This changes size when flattened.
+// "From the Heliconian Muses let us begin to sing"
+//   --- Hesiod, Theogony
+var fragment16 = "μουσάων Ἑλικωνιάδων ἀρχώμεθ᾽ ἀείδειν";
+var rope16 = fragment16;
+for (var i = 0; i < 10; i++) // 1024 repetitions
+  rope16 = rope16 + rope16;
+assertEq(tByteSize(rope16),                                     s(16,  24));
+let matches16 = rope16.match(/(Ἑλικωνιάδων ἀρχώμεθ᾽)/);
+assertEq(tByteSize(rope16),                                     s(16 + 131072,  24 + 131072));
+
+// Latin-1 and char16_t dependent strings.
+assertEq(tByteSize(rope8.substr(1000, 2000)),                   s(16,  24));
+assertEq(tByteSize(rope16.substr(1000, 2000)),                  s(16,  24));
+assertEq(tByteSize(matches8[0]),                                s(16,  24));
+assertEq(tByteSize(matches8[1]),                                s(16,  24));
+assertEq(tByteSize(matches16[0]),                               s(16,  24));
+assertEq(tByteSize(matches16[1]),                               s(16,  24));
+
+// Test extensible strings.
+//
+// Appending another copy of the fragment should yield another rope.
+//
+// Flatting that should turn the original rope into a dependent string, and
+// yield a new linear string, of the some size as the original.
+rope16a = rope16 + fragment16;
+assertEq(tByteSize(rope16a),                                    s(16, 24));
+rope16a.match(/x/, function() { assertEq(true, false); });
+assertEq(tByteSize(rope16a),                                    s(16 + 131072,  24 + 131072));
+assertEq(tByteSize(rope16),                                     s(16, 24));
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/SIMD/convert.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/SIMD/convert.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/SIMD/convert.js	2015-04-22 13:05:38.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/SIMD/convert.js	2015-04-24 19:31:01.000000000 +0000
@@ -1,6 +1,6 @@
 load(libdir + 'simd.js');
 
-setJitCompilerOption("ion.warmup.trigger", 50);
+setJitCompilerOption("ion.warmup.trigger", 30);
 
 var cast = (function() {
     var i32 = new Int32Array(1);
@@ -19,6 +19,7 @@
 })();
 
 function f() {
+    // No bailout here.
     var f4 = SIMD.float32x4(1, 2, 3, 4);
     var i4 = SIMD.int32x4(1, 2, 3, 4);
     var BitOrZero = (x) => x | 0;
@@ -30,5 +31,40 @@
     }
 }
 
+function uglyDuckling(val) {
+    // We bail out when i == 149 because the conversion will return
+    // 0x80000000 and the input actually wasn't in bounds.
+    print('entering uglyDuckling');
+    val = Math.fround(val);
+    for (var i = 0; i < 150; i++) {
+        var caught = false;
+        try {
+            var v = SIMD.float32x4(i < 149 ? 0 : val, 0, 0, 0)
+            SIMD.int32x4.fromFloat32x4(v);
+        } catch(e) {
+            assertEq(e instanceof RangeError, true);
+            assertEq(i, 149);
+            caught = true;
+        }
+        assertEq(i < 149 || caught, true);
+    }
+}
+
+function dontBail() {
+    print('entering dontbail');
+    // On x86, the conversion will return 0x80000000, which will imply that we
+    // check the input values. However, we shouldn't bail out in this case.
+    for (var i = 0; i < 150; i++) {
+        var v = SIMD.float32x4(i < 149 ? 0 : -Math.pow(2, 31), 0, 0, 0)
+        SIMD.int32x4.fromFloat32x4(v);
+    }
+}
+
 f();
 
+dontBail();
+dontBail();
+
+uglyDuckling(Math.pow(2, 31));
+uglyDuckling(NaN);
+uglyDuckling(-Math.pow(2, 32));
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/SIMD/shift.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/SIMD/shift.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jit-test/tests/SIMD/shift.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jit-test/tests/SIMD/shift.js	2015-04-24 19:31:01.000000000 +0000
@@ -0,0 +1,57 @@
+load(libdir + 'simd.js');
+
+setJitCompilerOption("ion.warmup.trigger", 50);
+
+function curry(f, arg) { return f.bind(null, arg); }
+
+function binaryLsh(count, v) { if (count>>>0 >= 32) return 0; return (v << count) | 0; }
+function lsh(count) { return curry(binaryLsh, count); }
+
+function binaryRsh(count, v) { if (count>>>0 >= 32) count = 31; return (v >> count) | 0; }
+function rsh(count) { return curry(binaryRsh, count); }
+
+function binaryUrsh(count, v) { if (count>>>0 >= 32) return 0; return (v >>> count) | 0; }
+function ursh(count) { return curry(binaryUrsh, count); }
+
+function f() {
+    var v = SIMD.int32x4(1, 2, -3, 4);
+    var a = [1, 2, -3, 4];
+    var zeros = [0,0,0,0];
+
+    var shifts = [-1, 0, 1, 31, 32];
+
+    var r;
+    for (var i = 0; i < 150; i++) {
+        // Constant shift counts
+        assertEqX4(SIMD.int32x4.shiftLeftByScalar(v, -1), a.map(lsh(-1)));
+        assertEqX4(SIMD.int32x4.shiftLeftByScalar(v, 0),  a.map(lsh(0)));
+        assertEqX4(SIMD.int32x4.shiftLeftByScalar(v, 1),  a.map(lsh(1)));
+        assertEqX4(SIMD.int32x4.shiftLeftByScalar(v, 2),  a.map(lsh(2)));
+        assertEqX4(SIMD.int32x4.shiftLeftByScalar(v, 31), a.map(lsh(31)));
+        assertEqX4(SIMD.int32x4.shiftLeftByScalar(v, 32), a.map(lsh(32)));
+
+        assertEqX4(SIMD.int32x4.shiftRightArithmeticByScalar(v, -1), a.map(rsh(31)));
+        assertEqX4(SIMD.int32x4.shiftRightArithmeticByScalar(v, 0),  a.map(rsh(0)));
+        assertEqX4(SIMD.int32x4.shiftRightArithmeticByScalar(v, 1),  a.map(rsh(1)));
+        assertEqX4(SIMD.int32x4.shiftRightArithmeticByScalar(v, 2),  a.map(rsh(2)));
+        assertEqX4(SIMD.int32x4.shiftRightArithmeticByScalar(v, 31), a.map(rsh(31)));
+        assertEqX4(SIMD.int32x4.shiftRightArithmeticByScalar(v, 32), a.map(rsh(31)));
+
+        assertEqX4(SIMD.int32x4.shiftRightLogicalByScalar(v, -1), a.map(ursh(-1)));
+        assertEqX4(SIMD.int32x4.shiftRightLogicalByScalar(v, 0),  a.map(ursh(0)));
+        assertEqX4(SIMD.int32x4.shiftRightLogicalByScalar(v, 1),  a.map(ursh(1)));
+        assertEqX4(SIMD.int32x4.shiftRightLogicalByScalar(v, 2),  a.map(ursh(2)));
+        assertEqX4(SIMD.int32x4.shiftRightLogicalByScalar(v, 31), a.map(ursh(31)));
+        assertEqX4(SIMD.int32x4.shiftRightLogicalByScalar(v, 32), a.map(ursh(32)));
+
+        // Non constant shift counts
+        var c = shifts[i % shifts.length];
+        assertEqX4(SIMD.int32x4.shiftLeftByScalar(v, c), a.map(lsh(c)));
+        assertEqX4(SIMD.int32x4.shiftRightArithmeticByScalar(v, c), a.map(rsh(c)));
+        assertEqX4(SIMD.int32x4.shiftRightLogicalByScalar(v, c), a.map(ursh(c)));
+    }
+    return r;
+}
+
+f();
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -1138,13 +1138,12 @@
 } JSStdName;
 
 static const JSStdName*
-LookupStdName(JSRuntime* rt, HandleString name, const JSStdName* table)
+LookupStdName(const JSAtomState& names, JSAtom* name, const JSStdName* table)
 {
-    MOZ_ASSERT(name->isAtom());
     for (unsigned i = 0; !table[i].isSentinel(); i++) {
         if (table[i].isDummy())
             continue;
-        JSAtom* atom = AtomStateOffsetToName(*rt->commonNames, table[i].atomOffset);
+        JSAtom* atom = AtomStateOffsetToName(names, table[i].atomOffset);
         MOZ_ASSERT(atom);
         if (name == atom)
             return &table[i];
@@ -1220,11 +1219,10 @@
     if (!rt->hasContexts() || !JSID_IS_ATOM(id))
         return true;
 
-    RootedString idstr(cx, JSID_TO_STRING(id));
-
     /* Check whether we're resolving 'undefined', and define it if so. */
+    JSAtom* idAtom = JSID_TO_ATOM(id);
     JSAtom* undefinedAtom = cx->names().undefined;
-    if (idstr == undefinedAtom) {
+    if (idAtom == undefinedAtom) {
         *resolved = true;
         return DefineProperty(cx, obj, undefinedAtom->asPropertyName(),
                               UndefinedHandleValue, nullptr, nullptr,
@@ -1232,11 +1230,11 @@
     }
 
     /* Try for class constructors/prototypes named by well-known atoms. */
-    stdnm = LookupStdName(rt, idstr, standard_class_names);
+    stdnm = LookupStdName(cx->names(), idAtom, standard_class_names);
 
     /* Try less frequently used top-level functions and constants. */
     if (!stdnm)
-        stdnm = LookupStdName(rt, idstr, builtin_property_names);
+        stdnm = LookupStdName(cx->names(), idAtom, builtin_property_names);
 
     // If this class is anonymous, then it doesn't exist as a global
     // property, so we won't resolve anything.
@@ -1261,6 +1259,27 @@
 }
 
 JS_PUBLIC_API(bool)
+JS_MayResolveStandardClass(const JSAtomState& names, jsid id, JSObject* maybeObj)
+{
+    MOZ_ASSERT_IF(maybeObj, maybeObj->is<GlobalObject>());
+
+    // The global object's resolve hook is special: JS_ResolveStandardClass
+    // initializes the prototype chain lazily. Only attempt to optimize here
+    // if we know the prototype chain has been initialized.
+    if (!maybeObj || !maybeObj->getProto())
+        return true;
+
+    if (!JSID_IS_ATOM(id))
+        return false;
+
+    JSAtom* atom = JSID_TO_ATOM(id);
+
+    return atom == names.undefined ||
+           LookupStdName(names, atom, standard_class_names) ||
+           LookupStdName(names, atom, builtin_property_names);
+}
+
+JS_PUBLIC_API(bool)
 JS_EnumerateStandardClasses(JSContext* cx, HandleObject obj)
 {
     AssertHeapIsIdle(cx);
@@ -1305,8 +1324,9 @@
 
     if (!JSID_IS_ATOM(id))
         return JSProto_Null;
-    RootedString idstr(cx, JSID_TO_STRING(id));
-    const JSStdName* stdnm = LookupStdName(cx->runtime(), idstr, standard_class_names);
+
+    JSAtom* atom = JSID_TO_ATOM(id);
+    const JSStdName* stdnm = LookupStdName(cx->names(), atom, standard_class_names);
     if (!stdnm)
         return JSProto_Null;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi.h	2015-04-24 19:31:05.000000000 +0000
@@ -37,7 +37,6 @@
 
 namespace JS {
 
-class Latin1CharsZ;
 class TwoByteChars;
 
 #ifdef JS_DEBUG
@@ -985,7 +984,7 @@
 JS_ValueToSource(JSContext* cx, JS::Handle<JS::Value> v);
 
 extern JS_PUBLIC_API(bool)
-JS_DoubleIsInt32(double d, int32_t *ip);
+JS_DoubleIsInt32(double d, int32_t* ip);
 
 extern JS_PUBLIC_API(JSType)
 JS_TypeOfValue(JSContext* cx, JS::Handle<JS::Value> v);
@@ -1508,6 +1507,9 @@
 JS_ResolveStandardClass(JSContext* cx, JS::HandleObject obj, JS::HandleId id, bool* resolved);
 
 extern JS_PUBLIC_API(bool)
+JS_MayResolveStandardClass(const JSAtomState& names, jsid id, JSObject* maybeObj);
+
+extern JS_PUBLIC_API(bool)
 JS_EnumerateStandardClasses(JSContext* cx, JS::HandleObject obj);
 
 extern JS_PUBLIC_API(bool)
@@ -2701,7 +2703,19 @@
         value().set(v);
     }
 
-    void setEnumerable() { desc()->attrs |= JSPROP_ENUMERATE; }
+    void setConfigurable(bool configurable) {
+        setAttributes((desc()->attrs & ~(JSPROP_IGNORE_PERMANENT | JSPROP_PERMANENT)) |
+                      (configurable ? 0 : JSPROP_PERMANENT));
+    }
+    void setEnumerable(bool enumerable) {
+        setAttributes((desc()->attrs & ~(JSPROP_IGNORE_ENUMERATE | JSPROP_ENUMERATE)) |
+                      (enumerable ? JSPROP_ENUMERATE : 0));
+    }
+    void setWritable(bool writable) {
+        MOZ_ASSERT(!(desc()->attrs & (JSPROP_GETTER | JSPROP_SETTER)));
+        setAttributes((desc()->attrs & ~(JSPROP_IGNORE_READONLY | JSPROP_READONLY)) |
+                      (writable ? 0 : JSPROP_READONLY));
+    }
     void setAttributes(unsigned attrs) { desc()->attrs = attrs; }
 
     void setGetter(JSGetterOp op) {
@@ -2712,8 +2726,16 @@
         MOZ_ASSERT(op != JS_StrictPropertyStub);
         desc()->setter = op;
     }
-    void setGetterObject(JSObject* obj) { desc()->getter = reinterpret_cast<JSGetterOp>(obj); }
-    void setSetterObject(JSObject* obj) { desc()->setter = reinterpret_cast<JSSetterOp>(obj); }
+    void setGetterObject(JSObject* obj) {
+        desc()->getter = reinterpret_cast<JSGetterOp>(obj);
+        desc()->attrs &= ~(JSPROP_IGNORE_VALUE | JSPROP_IGNORE_READONLY | JSPROP_READONLY);
+        desc()->attrs |= JSPROP_GETTER | JSPROP_SHARED;
+    }
+    void setSetterObject(JSObject* obj) {
+        desc()->setter = reinterpret_cast<JSSetterOp>(obj);
+        desc()->attrs &= ~(JSPROP_IGNORE_VALUE | JSPROP_IGNORE_READONLY | JSPROP_READONLY);
+        desc()->attrs |= JSPROP_SETTER | JSPROP_SHARED;
+    }
 
     JS::MutableHandleObject getterObject() {
         MOZ_ASSERT(this->hasGetterObject());
@@ -5411,14 +5433,14 @@
 
     // Mark that an instance of `AutoStopwatch` is monitoring
     // the performance of this group for a given iteration.
-    void acquireStopwatch(uint64_t iteration, const AutoStopwatch *stopwatch) {
+    void acquireStopwatch(uint64_t iteration, const AutoStopwatch* stopwatch) {
         iteration_ = iteration;
         stopwatch_ = stopwatch;
     }
 
     // Mark that no `AutoStopwatch` is monitoring the
     // performance of this group for the iteration.
-    void releaseStopwatch(uint64_t iteration, const AutoStopwatch *stopwatch) {
+    void releaseStopwatch(uint64_t iteration, const AutoStopwatch* stopwatch) {
         if (iteration_ != iteration)
             return;
 
@@ -5441,7 +5463,7 @@
 
     // The stopwatch currently monitoring the group,
     // or `nullptr` if none. Used ony for comparison.
-    const AutoStopwatch *stopwatch_;
+    const AutoStopwatch* stopwatch_;
 
     // The current iteration of the event loop. If necessary,
     // may safely overflow.
@@ -5471,7 +5493,7 @@
     // Get the group.
     // On first call, this causes a single Hashtable lookup.
     // Successive calls do not require further lookups.
-    js::PerformanceGroup *getGroup();
+    js::PerformanceGroup* getGroup();
 
     // `true` if the this holder is currently associated to a
     // PerformanceGroup, `false` otherwise. Use this method to avoid
@@ -5486,7 +5508,7 @@
     // (new values of `isSystem()`, `principals()` or `addonId`).
     void unlink();
 
-    PerformanceGroupHolder(JSRuntime *runtime, JSCompartment *compartment)
+    PerformanceGroupHolder(JSRuntime* runtime, JSCompartment* compartment)
       : runtime_(runtime)
       , compartment_(compartment)
       , group_(nullptr)
@@ -5498,13 +5520,13 @@
     // Do not deallocate the key.
     void* getHashKey();
 
-    JSRuntime *runtime_;
-    JSCompartment *compartment_;
+    JSRuntime* runtime_;
+    JSCompartment* compartment_;
 
     // The PerformanceGroup held by this object.
     // Initially set to `nullptr` until the first cal to `getGroup`.
     // May be reset to `nullptr` by a call to `unlink`.
-    js::PerformanceGroup *group_;
+    js::PerformanceGroup* group_;
 };
 
 /**
@@ -5541,7 +5563,7 @@
      * If this group represents an add-on, the ID of the addon,
      * otherwise `nullptr`.
      */
-    JSAddonId *addonId;
+    JSAddonId* addonId;
 
     /**
      * If this group represents a webpage, the process itself or a special
@@ -5579,7 +5601,7 @@
  * representing the entire process.
  */
 extern JS_PUBLIC_API(bool)
-GetPerformanceStats(JSRuntime *rt, js::PerformanceStatsVector &stats, js::PerformanceStats &global);
+GetPerformanceStats(JSRuntime* rt, js::PerformanceStatsVector& stats, js::PerformanceStats& global);
 
 } /* namespace js */
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testChromeBuffer.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testChromeBuffer.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testChromeBuffer.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testChromeBuffer.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -22,6 +22,7 @@
     nullptr,
     nullptr,
     nullptr,
+    nullptr,
     JS_GlobalObjectTraceHook
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -25,7 +25,7 @@
         "global", JSCLASS_GLOBAL_FLAGS,
         nullptr, nullptr, nullptr, nullptr,
         GlobalEnumerate, GlobalResolve, nullptr,
-        nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr,
         JS_GlobalObjectTraceHook
     };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testGCNursery.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testGCNursery.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testGCNursery.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testGCNursery.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -27,6 +27,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* ??? */
     _finalize,
     nullptr, /* call */
@@ -47,6 +48,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* ??? */
     _finalize,
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testNewObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testNewObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testNewObject.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testNewObject.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -98,7 +98,7 @@
         0,
         nullptr, nullptr, nullptr, nullptr,
         nullptr, nullptr, nullptr, nullptr,
-        nullptr, nullptr, constructHook
+        nullptr, nullptr, nullptr, constructHook
     };
     JS::RootedObject ctor(cx, JS_NewObject(cx, &cls));
     CHECK(ctor);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testOps.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testOps.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testOps.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testOps.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -23,7 +23,7 @@
     "MyClass",
     0,
     nullptr, nullptr, nullptr, nullptr,
-    nullptr, nullptr, my_convert
+    nullptr, nullptr, nullptr, my_convert
 };
 
 static bool
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testPersistentRooted.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testPersistentRooted.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testPersistentRooted.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testPersistentRooted.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -29,6 +29,7 @@
     nullptr,
     nullptr,
     nullptr,
+    nullptr,
     finalize,
     nullptr,
     nullptr,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/tests.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/tests.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/tests.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/tests.h	2015-04-24 19:31:05.000000000 +0000
@@ -230,7 +230,7 @@
             "global", JSCLASS_GLOBAL_FLAGS,
             nullptr, nullptr, nullptr, nullptr,
             nullptr, nullptr, nullptr, nullptr,
-            nullptr, nullptr, nullptr,
+            nullptr, nullptr, nullptr, nullptr,
             JS_GlobalObjectTraceHook
         };
         return &c;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testWeakMap.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testWeakMap.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsapi-tests/testWeakMap.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsapi-tests/testWeakMap.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -148,6 +148,7 @@
         nullptr, /* setProperty */
         nullptr, /* enumerate */
         nullptr, /* resolve */
+        nullptr, /* mayResolve */
         nullptr, /* convert */
         nullptr, /* finalize */
         nullptr, /* call */
@@ -204,6 +205,7 @@
         nullptr, /* setProperty */
         nullptr, /* enumerate */
         nullptr, /* resolve */
+        nullptr, /* mayResolve */
         nullptr, /* convert */
         nullptr, /* finalize */
         nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsarray.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsarray.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsarray.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsarray.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -3249,6 +3249,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     nullptr, /* finalize */
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsatom.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsatom.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsatom.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsatom.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -226,7 +226,7 @@
             const AtomStateEntry& entry = r.front();
 
             JSAtom* atom = entry.asPtr();
-            MarkPermanentAtom(trc, atom, "permanent_table");
+            TraceProcessGlobalRoot(trc, atom, "permanent_table");
         }
     }
 }
@@ -241,7 +241,7 @@
 
     if (WellKnownSymbols* wks = rt->wellKnownSymbols) {
         for (size_t i = 0; i < JS::WellKnownSymbolLimit; i++)
-            MarkWellKnownSymbol(trc, wks->get(i));
+            TraceProcessGlobalRoot(trc, wks->get(i).get(), "well_known_symbol");
     }
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jscntxt.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jscntxt.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jscntxt.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jscntxt.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -764,9 +764,9 @@
 }
 
 static bool
-ExpandErrorArguments(ExclusiveContext *cx, JSErrorCallback callback,
-                     void *userRef, const unsigned errorNumber,
-                     char **messagep, JSErrorReport *reportp,
+ExpandErrorArguments(ExclusiveContext* cx, JSErrorCallback callback,
+                     void* userRef, const unsigned errorNumber,
+                     char** messagep, JSErrorReport* reportp,
                      ErrorArgumentsType argumentsType, ...)
 {
     va_list ap;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jscntxt.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jscntxt.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jscntxt.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jscntxt.h	2015-04-24 19:31:05.000000000 +0000
@@ -25,7 +25,6 @@
 
 namespace jit {
 class JitContext;
-class CompileCompartment;
 class DebugModeOSRVolatileJitFrameIterator;
 }
 
@@ -62,8 +61,6 @@
 TraceCycleDetectionSet(JSTracer* trc, ObjectSet& set);
 
 struct AutoResolving;
-class DtoaCache;
-class RegExpStatics;
 
 namespace frontend { struct CompileError; }
 
@@ -843,13 +840,19 @@
 bool intrinsic_IsArrayIterator(JSContext* cx, unsigned argc, Value* vp);
 bool intrinsic_IsStringIterator(JSContext* cx, unsigned argc, Value* vp);
 
+bool intrinsic_IsArrayBuffer(JSContext* cx, unsigned argc, Value* vp);
+
 bool intrinsic_IsTypedArray(JSContext* cx, unsigned argc, Value* vp);
+bool intrinsic_IsPossiblyWrappedTypedArray(JSContext* cx, unsigned argc, Value* vp);
 bool intrinsic_TypedArrayBuffer(JSContext* cx, unsigned argc, Value* vp);
 bool intrinsic_TypedArrayByteOffset(JSContext* cx, unsigned argc, Value* vp);
 bool intrinsic_TypedArrayElementShift(JSContext* cx, unsigned argc, Value* vp);
 bool intrinsic_TypedArrayLength(JSContext* cx, unsigned argc, Value* vp);
 
 bool intrinsic_MoveTypedArrayElements(JSContext* cx, unsigned argc, Value* vp);
+bool intrinsic_SetFromTypedArrayApproach(JSContext* cx, unsigned argc, Value* vp);
+bool intrinsic_SetDisjointTypedElements(JSContext* cx, unsigned argc, Value* vp);
+bool intrinsic_SetOverlappingTypedElements(JSContext* cx, unsigned argc, Value* vp);
 
 class AutoLockForExclusiveAccess
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jscompartment.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jscompartment.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jscompartment.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jscompartment.h	2015-04-24 19:31:05.000000000 +0000
@@ -125,13 +125,10 @@
 
 } /* namespace js */
 
-namespace JS {
-struct TypeInferenceSizes;
-}
-
 namespace js {
 class DebugScopes;
 class ObjectWeakMap;
+class WatchpointMap;
 class WeakMapBase;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsdate.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsdate.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsdate.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsdate.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -3044,6 +3044,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     date_convert,
     nullptr, /* finalize */
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsexn.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsexn.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsexn.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsexn.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -77,6 +77,7 @@
         nullptr,                 /* setProperty */ \
         nullptr,                 /* enumerate */ \
         nullptr,                 /* resolve */ \
+        nullptr,                 /* mayResolve */ \
         nullptr,                 /* convert */ \
         exn_finalize, \
         nullptr,                 /* call        */ \
@@ -108,6 +109,7 @@
         nullptr,                 /* setProperty */
         nullptr,                 /* enumerate */
         nullptr,                 /* resolve */
+        nullptr,                 /* mayResolve */
         nullptr,                 /* convert */
         exn_finalize,
         nullptr,                 /* call        */
@@ -930,3 +932,43 @@
     rval.setObject(*obj);
     return true;
 }
+
+const char*
+js::ValueToSourceForError(JSContext* cx, HandleValue val, JSAutoByteString& bytes)
+{
+    if (val.isUndefined()) {
+        return "undefined";
+    }
+    if (val.isNull()) {
+        return "null";
+    }
+
+    RootedString str(cx, JS_ValueToSource(cx, val));
+    if (!str) {
+        JS_ClearPendingException(cx);
+        return "<<error converting value to string>>";
+    }
+
+    StringBuffer sb(cx);
+    if (val.isObject()) {
+        RootedObject valObj(cx, val.toObjectOrNull());
+        if (JS_IsArrayObject(cx, valObj)) {
+            sb.append("the array ");
+        } else if (JS_IsArrayBufferObject(valObj)) {
+            sb.append("the array buffer ");
+        } else if (JS_IsArrayBufferViewObject(valObj)) {
+            sb.append("the typed array ");
+        } else {
+            sb.append("the object ");
+        }
+    } else if (val.isNumber()) {
+        sb.append("the number ");
+    } else if (val.isString()) {
+        sb.append("the string ");
+    } else {
+        MOZ_ASSERT(val.isBoolean() || val.isSymbol());
+        return bytes.encodeLatin1(cx, str);
+    }
+    sb.append(str);
+    return bytes.encodeLatin1(cx, sb.finishString());
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsexn.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsexn.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsexn.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsexn.h	2015-04-24 19:31:05.000000000 +0000
@@ -129,6 +129,9 @@
     }
 };
 
+extern const char*
+ValueToSourceForError(JSContext* cx, HandleValue val, JSAutoByteString& bytes);
+
 } // namespace js
 
 #endif /* jsexn_h */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsfriendapi.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsfriendapi.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsfriendapi.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsfriendapi.h	2015-04-24 19:31:05.000000000 +0000
@@ -319,6 +319,7 @@
         nullptr,                 /* setProperty */                                      \
         nullptr,                 /* enumerate */                                        \
         nullptr,                 /* resolve */                                          \
+        nullptr,                 /* mayResolve */                                       \
         js::proxy_Convert,                                                              \
         js::proxy_Finalize,      /* finalize    */                                      \
         nullptr,                 /* call        */                                      \
@@ -1430,8 +1431,9 @@
 
 namespace Scalar {
 
-/* Scalar types which can appear in typed arrays and typed objects.  The enum
- * values need to be kept in sync with the JS_SCALARTYPEREPR_ constants, as
+/*
+ * Scalar types that can appear in typed arrays and typed objects.  The enum
+ * values must to be kept in sync with the JS_SCALARTYPEREPR_ constants, as
  * well as the TypedArrayObject::classes and TypedArrayObject::protoClasses
  * definitions.
  */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsfun.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsfun.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsfun.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsfun.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -419,18 +419,18 @@
     return proto;
 }
 
-bool
-js::FunctionHasResolveHook(const JSAtomState& atomState, jsid id)
+static bool
+fun_mayResolve(const JSAtomState& names, jsid id, JSObject*)
 {
     if (!JSID_IS_ATOM(id))
         return false;
 
     JSAtom* atom = JSID_TO_ATOM(id);
-    return atom == atomState.prototype || atom == atomState.length || atom == atomState.name;
+    return atom == names.prototype || atom == names.length || atom == names.name;
 }
 
-bool
-js::fun_resolve(JSContext* cx, HandleObject obj, HandleId id, bool* resolvedp)
+static bool
+fun_resolve(JSContext* cx, HandleObject obj, HandleId id, bool* resolvedp)
 {
     if (!JSID_IS_ATOM(id))
         return true;
@@ -891,7 +891,8 @@
     nullptr,                 /* getProperty */
     nullptr,                 /* setProperty */
     fun_enumerate,
-    js::fun_resolve,
+    fun_resolve,
+    fun_mayResolve,
     nullptr,                 /* convert     */
     nullptr,                 /* finalize    */
     nullptr,                 /* call        */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsfun.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsfun.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsfun.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsfun.h	2015-04-24 19:31:05.000000000 +0000
@@ -53,8 +53,8 @@
                                        must be constructible but not decompilable. */
         HAS_REST         = 0x0200,  /* function has a rest (...) parameter */
         INTERPRETED_LAZY = 0x0400,  /* function is interpreted but doesn't have a script yet */
-        RESOLVED_LENGTH  = 0x0800,  /* f.length has been resolved (see js::fun_resolve). */
-        RESOLVED_NAME    = 0x1000,  /* f.name has been resolved (see js::fun_resolve). */
+        RESOLVED_LENGTH  = 0x0800,  /* f.length has been resolved (see fun_resolve). */
+        RESOLVED_NAME    = 0x1000,  /* f.name has been resolved (see fun_resolve). */
 
         FUNCTION_KIND_SHIFT = 13,
         FUNCTION_KIND_MASK  = 0x3 << FUNCTION_KIND_SHIFT,
@@ -569,9 +569,6 @@
 FunctionHasResolveHook(const JSAtomState& atomState, jsid id);
 
 extern bool
-fun_resolve(JSContext* cx, HandleObject obj, HandleId id, bool* resolvedp);
-
-extern bool
 fun_toString(JSContext* cx, unsigned argc, Value* vp);
 
 extern bool
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsgc.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsgc.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsgc.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsgc.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -2924,11 +2924,13 @@
 }
 
 SliceBudget::SliceBudget()
+  : timeBudget(Unlimited), workBudget(Unlimited)
 {
     makeUnlimited();
 }
 
 SliceBudget::SliceBudget(TimeBudget time)
+  : timeBudget(time), workBudget(Unlimited)
 {
     if (time.budget < 0) {
         makeUnlimited();
@@ -2940,6 +2942,7 @@
 }
 
 SliceBudget::SliceBudget(WorkBudget work)
+  : timeBudget(Unlimited), workBudget(work)
 {
     if (work.budget < 0) {
         makeUnlimited();
@@ -2949,6 +2952,17 @@
     }
 }
 
+int
+SliceBudget::describe(char* buffer, size_t maxlen) const
+{
+    if (isUnlimited())
+        return JS_snprintf(buffer, maxlen, "unlimited");
+    else if (deadline == 0)
+        return JS_snprintf(buffer, maxlen, "work(%lld)", workBudget.budget);
+    else
+        return JS_snprintf(buffer, maxlen, "%lldms", timeBudget.budget);
+}
+
 bool
 SliceBudget::checkOverBudget()
 {
@@ -6094,7 +6108,7 @@
     AutoStopVerifyingBarriers av(rt, reason == JS::gcreason::SHUTDOWN_CC ||
                                      reason == JS::gcreason::DESTROY_RUNTIME);
 
-    gcstats::AutoGCSlice agc(stats, scanZonesBeforeGC(), invocationKind, reason);
+    gcstats::AutoGCSlice agc(stats, scanZonesBeforeGC(), invocationKind, budget, reason);
 
     bool repeat = false;
     do {
@@ -6206,7 +6220,9 @@
 
     AutoStopVerifyingBarriers av(rt, false);
 
-    gcstats::AutoGCSlice agc(stats, scanZonesBeforeGC(), invocationKind, JS::gcreason::ABORT_GC);
+    SliceBudget unlimited;
+    gcstats::AutoGCSlice agc(stats, scanZonesBeforeGC(), invocationKind,
+                             unlimited, JS::gcreason::ABORT_GC);
 
     evictNursery(JS::gcreason::ABORT_GC);
     AutoDisableStoreBuffer adsb(this);
@@ -7029,6 +7045,12 @@
     return rt->gc.stats.formatMessage();
 }
 
+JS::dbg::GarbageCollectionEvent::Ptr
+JS::GCDescription::toGCEvent(JSRuntime* rt) const
+{
+    return JS::dbg::GarbageCollectionEvent::Create(rt, rt->gc.stats, rt->gc.majorGCCount());
+}
+
 char16_t*
 JS::GCDescription::formatJSON(JSRuntime* rt, uint64_t timestamp) const
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsgcinlines.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsgcinlines.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsgcinlines.h	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsgcinlines.h	2015-04-24 19:31:05.000000000 +0000
@@ -13,9 +13,6 @@
 #include "gc/Zone.h"
 
 namespace js {
-
-class Shape;
-
 namespace gc {
 
 static inline AllocKind
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsiter.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsiter.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsiter.cpp	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsiter.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -988,6 +988,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     finalize,
     nullptr, /* call        */
@@ -1375,6 +1376,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     nullptr, /* finalize */
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/js.msg thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/js.msg
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/js.msg	2015-04-22 13:05:50.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/js.msg	2015-04-24 19:31:05.000000000 +0000
@@ -53,7 +53,6 @@
 MSG_DEF(JSMSG_CANT_TRUNCATE_ARRAY,     0, JSEXN_TYPEERR, "can't delete non-configurable array element")
 MSG_DEF(JSMSG_NOT_FUNCTION,            1, JSEXN_TYPEERR, "{0} is not a function")
 MSG_DEF(JSMSG_NOT_CONSTRUCTOR,         1, JSEXN_TYPEERR, "{0} is not a constructor")
-MSG_DEF(JSMSG_CANT_CONVERT,            1, JSEXN_ERR, "can't convert {0} to an integer")
 MSG_DEF(JSMSG_CANT_CONVERT_TO,         2, JSEXN_TYPEERR, "can't convert {0} to {1}")
 MSG_DEF(JSMSG_NO_PROPERTIES,           1, JSEXN_TYPEERR, "{0} has no properties")
 MSG_DEF(JSMSG_BAD_REGEXP_FLAG,         1, JSEXN_SYNTAXERR, "invalid regular expression flag {0}")
@@ -95,7 +94,6 @@
 MSG_DEF(JSMSG_NOT_ITERABLE,            1, JSEXN_TYPEERR, "{0} is not iterable")
 MSG_DEF(JSMSG_ALREADY_HAS_PRAGMA,      2, JSEXN_NONE, "{0} is being assigned a {1}, but already has one")
 MSG_DEF(JSMSG_NEXT_RETURNED_PRIMITIVE, 0, JSEXN_TYPEERR, "iterator.next() returned a non-object value")
-MSG_DEF(JSMSG_WRONG_VALUE,             2, JSEXN_ERR, "expected {0} but found {1}")
 MSG_DEF(JSMSG_CANT_SET_PROTO,          0, JSEXN_TYPEERR, "can't set prototype of this object")
 MSG_DEF(JSMSG_CANT_SET_PROTO_OF,       1, JSEXN_TYPEERR, "can't set prototype of {0}")
 MSG_DEF(JSMSG_CANT_SET_PROTO_CYCLE,    0, JSEXN_TYPEERR, "can't set prototype: it would cause a prototype chain cycle")
@@ -442,13 +440,14 @@
 MSG_DEF(JSMSG_DEFAULT_LOCALE_ERROR,    0, JSEXN_ERR, "internal error getting the default locale")
 MSG_DEF(JSMSG_NO_SUCH_SELF_HOSTED_PROP,1, JSEXN_ERR, "No such property on self-hosted object: {0}")
 
-// Typed object
+// Typed object / SIMD
 MSG_DEF(JSMSG_INVALID_PROTOTYPE,       0, JSEXN_TYPEERR, "prototype field is not an object")
 MSG_DEF(JSMSG_TYPEDOBJECT_BAD_ARGS,    0, JSEXN_TYPEERR, "invalid arguments")
 MSG_DEF(JSMSG_TYPEDOBJECT_BINARYARRAY_BAD_INDEX, 0, JSEXN_RANGEERR, "invalid or out-of-range index")
 MSG_DEF(JSMSG_TYPEDOBJECT_HANDLE_UNATTACHED, 0, JSEXN_TYPEERR, "handle unattached")
 MSG_DEF(JSMSG_TYPEDOBJECT_STRUCTTYPE_BAD_ARGS, 0, JSEXN_RANGEERR, "invalid field descriptor")
 MSG_DEF(JSMSG_TYPEDOBJECT_TOO_BIG,     0, JSEXN_ERR, "Type is too large to allocate")
+MSG_DEF(JSMSG_SIMD_FAILED_CONVERSION,  0, JSEXN_RANGEERR, "SIMD conversion loses precision")
 
 // Typed array
 MSG_DEF(JSMSG_BAD_INDEX,               0, JSEXN_RANGEERR, "invalid or out-of-range index")
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsobj.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsobj.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsobj.cpp	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsobj.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -128,14 +128,20 @@
 }
 
 bool
-js::FromPropertyDescriptor(JSContext* cx, Handle<PropertyDescriptor> desc,
-                           MutableHandleValue vp)
+js::FromPropertyDescriptor(JSContext* cx, Handle<PropertyDescriptor> desc, MutableHandleValue vp)
 {
     if (!desc.object()) {
         vp.setUndefined();
         return true;
     }
 
+    return FromPropertyDescriptorToObject(cx, desc, vp);
+}
+
+bool
+js::FromPropertyDescriptorToObject(JSContext* cx, Handle<PropertyDescriptor> desc,
+                                   MutableHandleValue vp)
+{
     RootedObject obj(cx, NewBuiltinClassInstance<PlainObject>(cx));
     if (!obj)
         return false;
@@ -809,9 +815,9 @@
 void
 js::CompletePropertyDescriptor(MutableHandle<PropertyDescriptor> desc)
 {
+    desc.assertValid();
+
     if (desc.isGenericDescriptor() || desc.isDataDescriptor()) {
-        if (!desc.hasValue())
-            desc.value().setUndefined();
         if (!desc.hasWritable())
             desc.attributesRef() |= JSPROP_READONLY;
         desc.attributesRef() &= ~(JSPROP_IGNORE_READONLY | JSPROP_IGNORE_VALUE);
@@ -822,11 +828,11 @@
             desc.setSetterObject(nullptr);
         desc.attributesRef() |= JSPROP_GETTER | JSPROP_SETTER | JSPROP_SHARED;
     }
-    if (!desc.hasEnumerable())
-        desc.attributesRef() &= ~JSPROP_ENUMERATE;
     if (!desc.hasConfigurable())
         desc.attributesRef() |= JSPROP_PERMANENT;
     desc.attributesRef() &= ~(JSPROP_IGNORE_PERMANENT | JSPROP_IGNORE_ENUMERATE);
+
+    desc.assertComplete();
 }
 
 bool
@@ -968,8 +974,6 @@
                     desc.setAttributes(AllowConfigureAndWritable | JSPROP_PERMANENT | JSPROP_READONLY);
             }
 
-            desc.object().set(obj);
-
             // 8.a.i-ii. / 9.a.iii.3-4
             if (!StandardDefineProperty(cx, obj, id, desc))
                 return false;
@@ -2780,19 +2784,10 @@
                 return true;
             }
 
-            // Fail if there's a resolve hook. We allow the JSFunction resolve hook
-            // if we know it will never add a property with this name or str_resolve
-            // with a non-integer property.
-            do {
-                const Class* clasp = obj->getClass();
-                if (!clasp->resolve)
-                    break;
-                if (clasp->resolve == fun_resolve && !FunctionHasResolveHook(cx->names(), id))
-                    break;
-                if (clasp->resolve == str_resolve && !JSID_IS_INT(id))
-                    break;
+            // Fail if there's a resolve hook, unless the mayResolve hook tells
+            // us the resolve hook won't define a property with this id.
+            if (ClassMayResolveId(cx->names(), obj->getClass(), id, obj))
                 return false;
-            } while (0);
         } else if (obj->is<UnboxedPlainObject>()) {
             if (obj->as<UnboxedPlainObject>().containsUnboxedOrExpandoProperty(cx, id)) {
                 *objp = obj;
@@ -3081,7 +3076,7 @@
     MOZ_ASSERT(!(attrs & JSPROP_PROPOP_ACCESSORS));
 
     Rooted<PropertyDescriptor> desc(cx);
-    desc.initFields(obj, value, attrs, getter, setter);
+    desc.initFields(NullPtr(), value, attrs, getter, setter);
     if (DefinePropertyOp op = obj->getOps()->defineProperty) {
         if (!cx->shouldBeJSContext())
             return false;
@@ -4037,17 +4032,17 @@
 
     MOZ_ASSERT(!isTenured());
 
-    const Nursery &nursery = compartment()->runtimeFromAnyThread()->gc.nursery;
+    const Nursery& nursery = compartment()->runtimeFromAnyThread()->gc.nursery;
     size_t size = Arena::thingSize(allocKindForTenure(nursery));
 
     if (is<NativeObject>()) {
-        const NativeObject &native = as<NativeObject>();
+        const NativeObject& native = as<NativeObject>();
 
         size += native.numFixedSlots() * sizeof(Value);
         size += native.numDynamicSlots() * sizeof(Value);
 
         if (native.hasDynamicElements()) {
-            js::ObjectElements &elements = *native.getElementsHeader();
+            js::ObjectElements& elements = *native.getElementsHeader();
             if (!elements.isCopyOnWrite() || elements.ownerObject() == this)
                 size += elements.capacity * sizeof(HeapSlot);
         }
@@ -4059,7 +4054,7 @@
 size_t
 JS::ubi::Concrete<JSObject>::size(mozilla::MallocSizeOf mallocSizeOf) const
 {
-    JSObject &obj = get();
+    JSObject& obj = get();
 
     if (!obj.isTenured())
         return obj.sizeOfIncludingThisInNursery();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsobj.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsobj.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsobj.h	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsobj.h	2015-04-24 19:31:05.000000000 +0000
@@ -35,10 +35,7 @@
 
 class AutoPropertyDescriptorVector;
 class GCMarker;
-struct NativeIterator;
 class Nursery;
-class ObjectElements;
-struct StackShape;
 
 namespace gc {
 class RelocationOverlay;
@@ -75,11 +72,7 @@
 extern const Class MathClass;
 
 class GlobalObject;
-class MapObject;
 class NewObjectCache;
-class NormalArgumentsObject;
-class SetObject;
-class StrictArgumentsObject;
 
 // Forward declarations, required for later friend declarations.
 bool PreventExtensions(JSContext* cx, JS::HandleObject obj, JS::ObjectOpResult& result);
@@ -290,7 +283,7 @@
     static MOZ_ALWAYS_INLINE void writeBarrierPostRemove(JSObject* obj, void* cellp);
 
     /* Return the allocKind we would use if we were to tenure this object. */
-    js::gc::AllocKind allocKindForTenure(const js::Nursery &nursery) const;
+    js::gc::AllocKind allocKindForTenure(const js::Nursery& nursery) const;
 
     size_t tenuredSizeOfThis() const {
         MOZ_ASSERT(isTenured());
@@ -1222,10 +1215,26 @@
 bool
 GetOwnPropertyDescriptor(JSContext* cx, HandleObject obj, HandleId id, MutableHandleValue vp);
 
-/* ES6 draft rev 32 (2015 Feb 2) 6.2.4.4 FromPropertyDescriptor(Desc) */
-bool
+/*
+ * ES6 draft rev 32 (2015 Feb 2) 6.2.4.4 FromPropertyDescriptor(Desc).
+ *
+ * If desc.object() is null, then vp is set to undefined.
+ */
+extern bool
 FromPropertyDescriptor(JSContext* cx, Handle<PropertyDescriptor> desc, MutableHandleValue vp);
 
+/*
+ * Like FromPropertyDescriptor, but ignore desc.object() and always set vp
+ * to an object on success.
+ *
+ * Use FromPropertyDescriptor for getOwnPropertyDescriptor, since desc.object()
+ * is used to indicate whether a result was found or not.  Use this instead for
+ * defineProperty: it would be senseless to define a "missing" property.
+ */
+extern bool
+FromPropertyDescriptorToObject(JSContext* cx, Handle<PropertyDescriptor> desc,
+                               MutableHandleValue vp);
+
 extern bool
 IsDelegate(JSContext* cx, HandleObject obj, const Value& v, bool* result);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsobjinlines.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsobjinlines.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsobjinlines.h	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsobjinlines.h	2015-04-24 19:31:05.000000000 +0000
@@ -826,40 +826,6 @@
     return true;
 }
 
-static inline unsigned
-ApplyAttributes(unsigned attrs, bool enumerable, bool writable, bool configurable)
-{
-    /*
-     * Respect the fact that some callers may want to preserve existing attributes as much as
-     * possible, or install defaults otherwise.
-     */
-    if (attrs & JSPROP_IGNORE_ENUMERATE) {
-        attrs &= ~JSPROP_IGNORE_ENUMERATE;
-        if (enumerable)
-            attrs |= JSPROP_ENUMERATE;
-        else
-            attrs &= ~JSPROP_ENUMERATE;
-    }
-    if (attrs & JSPROP_IGNORE_READONLY) {
-        attrs &= ~JSPROP_IGNORE_READONLY;
-        // Only update the writability if it's relevant
-        if (!(attrs & (JSPROP_GETTER | JSPROP_SETTER))) {
-            if (!writable)
-                attrs |= JSPROP_READONLY;
-            else
-                attrs &= ~JSPROP_READONLY;
-        }
-    }
-    if (attrs & JSPROP_IGNORE_PERMANENT) {
-        attrs &= ~JSPROP_IGNORE_PERMANENT;
-        if (!configurable)
-            attrs |= JSPROP_PERMANENT;
-        else
-            attrs &= ~JSPROP_PERMANENT;
-    }
-    return attrs;
-}
-
 extern NativeObject*
 InitClass(JSContext* cx, HandleObject obj, HandleObject parent_proto,
           const Class* clasp, JSNative constructor, unsigned nargs,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jspropertytree.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jspropertytree.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jspropertytree.cpp	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jspropertytree.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -310,7 +310,7 @@
 }
 
 void
-Shape::fixupGetterSetterForBarrier(JSTracer *trc)
+Shape::fixupGetterSetterForBarrier(JSTracer* trc)
 {
     // Relocating the getterObj or setterObj will change our location in our
     // parent's KidsHash, so remove ourself first if we're going to get moved.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsscript.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsscript.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsscript.cpp	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsscript.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -1361,6 +1361,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     finalize,
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsscript.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsscript.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsscript.h	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsscript.h	2015-04-24 19:31:05.000000000 +0000
@@ -43,11 +43,11 @@
 
 class BreakpointSite;
 class BindingIter;
+class Debugger;
 class LazyScript;
 class RegExpObject;
 struct SourceCompressionTask;
 class Shape;
-class WatchpointMap;
 class NestedScopeObject;
 
 namespace frontend {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsstr.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsstr.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsstr.cpp	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsstr.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -394,8 +394,15 @@
     return true;
 }
 
-bool
-js::str_resolve(JSContext* cx, HandleObject obj, HandleId id, bool* resolvedp)
+static bool
+str_mayResolve(const JSAtomState&, jsid id, JSObject*)
+{
+    // str_resolve ignores non-integer ids.
+    return JSID_IS_INT(id);
+}
+
+static bool
+str_resolve(JSContext* cx, HandleObject obj, HandleId id, bool* resolvedp)
 {
     if (!JSID_IS_INT(id))
         return true;
@@ -424,7 +431,8 @@
     nullptr, /* getProperty */
     nullptr, /* setProperty */
     str_enumerate,
-    str_resolve
+    str_resolve,
+    str_mayResolve
 };
 
 /*
@@ -603,7 +611,7 @@
         size_t i = 0;
         for (; i < length; i++) {
             char16_t c = chars[i];
-            if (unicode::ToLowerCase(c) != c)
+            if (unicode::CanLowerCase(c))
                 break;
         }
 
@@ -722,7 +730,7 @@
         size_t i = 0;
         for (; i < length; i++) {
             char16_t c = chars[i];
-            if (unicode::ToUpperCase(c) != c)
+            if (unicode::CanUpperCase(c))
                 break;
         }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsstr.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsstr.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsstr.h	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsstr.h	2015-04-24 19:31:05.000000000 +0000
@@ -19,15 +19,12 @@
 #include "vm/Unicode.h"
 
 class JSAutoByteString;
-class JSFlatString;
 class JSLinearString;
 
 namespace js {
 
 class StringBuffer;
 
-class MutatingRopeSegmentRange;
-
 template <AllowGC allowGC>
 extern JSString*
 ConcatStrings(ExclusiveContext* cx,
@@ -412,9 +409,6 @@
 str_split_string(JSContext* cx, HandleObjectGroup group, HandleString str, HandleString sep);
 
 bool
-str_resolve(JSContext* cx, HandleObject obj, HandleId id, bool* resolvedp);
-
-bool
 str_replace_regexp_raw(JSContext* cx, HandleString string, HandleObject regexp,
                        HandleString replacement, MutableHandleValue rval);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsweakmap.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsweakmap.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jsweakmap.cpp	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jsweakmap.cpp	2015-04-24 19:31:05.000000000 +0000
@@ -616,6 +616,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     WeakMap_finalize,
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jswrapper.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jswrapper.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/jswrapper.h	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/jswrapper.h	2015-04-24 19:31:05.000000000 +0000
@@ -13,8 +13,6 @@
 
 namespace js {
 
-class DummyFrameGuard;
-
 /*
  * Helper for Wrapper::New default options.
  *
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/perf/jsperf.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/perf/jsperf.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/perf/jsperf.cpp	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/perf/jsperf.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -163,7 +163,7 @@
 
 static const JSClass pm_class = {
     "PerfMeasurement", JSCLASS_HAS_PRIVATE,
-    nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, pm_finalize
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -574,7 +574,7 @@
 
     // step 9
     RootedValue descObj(cx);
-    if (!FromPropertyDescriptor(cx, desc, &descObj))
+    if (!FromPropertyDescriptorToObject(cx, desc, &descObj))
         return false;
 
     // steps 10-11
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -203,7 +203,7 @@
     RootedObject handler(cx, GetIndirectProxyHandlerObject(proxy));
     RootedValue fval(cx), value(cx);
     return GetFundamentalTrap(cx, handler, cx->names().defineProperty, &fval) &&
-           FromPropertyDescriptor(cx, desc, &value) &&
+           FromPropertyDescriptorToObject(cx, desc, &value) &&
            Trap2(cx, handler, fval, id, value, &value) &&
            result.succeed();
 }
@@ -407,7 +407,6 @@
     if (!receiver.isObject())
         return result.fail(JSMSG_SET_NON_OBJECT_RECEIVER);
     RootedObject receiverObj(cx, &receiver.toObject());
-    desc.object().set(receiverObj);
     return DefineProperty(cx, receiverObj, id, desc, result);
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/shell/js.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/shell/js.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/shell/js.cpp	2015-04-22 13:05:52.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/shell/js.cpp	2015-04-24 19:31:06.000000000 +0000
@@ -2660,7 +2660,7 @@
     JSCLASS_GLOBAL_FLAGS,
     nullptr, nullptr, nullptr, nullptr,
     sandbox_enumerate, sandbox_resolve,
-    nullptr, nullptr,
+    nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr,
     JS_GlobalObjectTraceHook
 };
@@ -5119,10 +5119,16 @@
     return true;
 }
 
+static bool
+global_mayResolve(const JSAtomState& names, jsid id, JSObject* maybeObj)
+{
+    return JS_MayResolveStandardClass(names, id, maybeObj);
+}
+
 static const JSClass global_class = {
     "global", JSCLASS_GLOBAL_FLAGS,
     nullptr, nullptr, nullptr, nullptr,
-    global_enumerate, global_resolve,
+    global_enumerate, global_resolve, global_mayResolve,
     nullptr, nullptr,
     nullptr, nullptr, nullptr,
     JS_GlobalObjectTraceHook
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/shell/js-gdb.gdb thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/shell/js-gdb.gdb
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/shell/js-gdb.gdb	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/shell/js-gdb.gdb	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-define hookpost-run
-    if ($sigaction)
-        call free($sigaction)
-        set $sigaction = 0
-    end
-end
-
-catch signal SIGSEGV
-commands
-    if !$sigaction
-        set $sigaction = malloc(sizeof(sigaction))
-    end
-    set $ignored = __sigaction(11, 0, $sigaction)
-    set $handler = ((struct sigaction *)$sigaction)->__sigaction_handler.sa_handler
-    if $handler == AsmJSFaultHandler
-        continue
-    end
-end
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/shell/js-gdb.py.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/shell/js-gdb.py.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/shell/js-gdb.py.in	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/shell/js-gdb.py.in	2015-04-24 19:31:06.000000000 +0000
@@ -6,3 +6,6 @@
 
 import mozilla.autoload
 mozilla.autoload.register(gdb.current_objfile())
+
+import mozilla.asmjs
+mozilla.asmjs.install()
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/shell/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/shell/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/shell/Makefile.in	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/shell/Makefile.in	2015-04-24 19:31:06.000000000 +0000
@@ -24,10 +24,6 @@
 SHELL_INSTALL_AUTOLOAD_FILES := $(CURDIR)/js-gdb.py
 SHELL_INSTALL_AUTOLOAD_DEST := $(DIST)/bin
 
-INSTALL_TARGETS += SHELL_INSTALL_AUTOLOAD_SCRIPT
-SHELL_INSTALL_AUTOLOAD_SCRIPT_FILES := js-gdb.gdb
-SHELL_INSTALL_AUTOLOAD_SCRIPT_DEST := $(CURDIR)
-
 include $(topsrcdir)/config/rules.mk
 
 # People expect the js shell to wind up in the top-level JS dir.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/tests/ecma_6/Class/classPrototype.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/tests/ecma_6/Class/classPrototype.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/tests/ecma_6/Class/classPrototype.js	2015-04-22 13:05:56.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/tests/ecma_6/Class/classPrototype.js	2015-04-24 19:31:07.000000000 +0000
@@ -22,16 +22,6 @@
     assertDeepEq(prototype, desiredPrototype);
 }
 
-try {
-    eval(\`class a {
-            constructor() { };
-            static [\"prototype\"]() { };
-          }\`);
-} catch (e if e instanceof TypeError) {
-    throw new Error("Congrats on making initprop respect non-writable " +
-                    "non-configurable properties. Uncomment the test below " +
-                    "for bonus points.");
-/*
 // As such, it should by a TypeError to try and overwrite "prototype" with a
 // static member. The only way to try is with a computed property name; the rest
 // are early errors.
@@ -72,8 +62,6 @@
                                     static set ["prototype"](x) { }
                                   }
                                   )\`), TypeError);
-*/
-}
 `;
 
 if (classesEnabled())
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/tests/ecma_7/SIMD/conversions.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/tests/ecma_7/SIMD/conversions.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/tests/ecma_7/SIMD/conversions.js	2015-04-22 13:05:57.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/tests/ecma_7/SIMD/conversions.js	2015-04-24 19:31:07.000000000 +0000
@@ -19,6 +19,48 @@
   for (var v of vals) {
     assertEqX4(float32x4.fromFloat64x2(float64x2(...v)), expected(v));
   }
+
+  // Test rounding to nearest, break tie with even
+  var f1 = makeFloat(0, 127, 0);
+  assertEq(f1, 1);
+
+  var f2 = makeFloat(0, 127, 1);
+  var d = makeDouble(0, 1023, 0x0000020000000);
+  assertEq(f2, d);
+
+  var mid = makeDouble(0, 1023, 0x0000010000000);
+  assertEq((1 + d) / 2, mid);
+
+  var nextMid = makeDouble(0, 1023, 0x0000010000001);
+
+  // mid is halfway between f1 and f2 => tie to even, which is f1
+  var v = float64x2(mid, nextMid);
+  assertEqX4(float32x4.fromFloat64x2(v), [f1, f2, 0, 0]);
+
+  var f3 = makeFloat(0, 127, 2);
+  var d = makeDouble(0, 1023, 0x0000040000000);
+  assertEq(f3, d);
+
+  mid = makeDouble(0, 1023, 0x0000030000000);
+  assertEq((f2 + f3) / 2, mid);
+
+  // same here. tie to even, which is f3 here
+  nextMid = makeDouble(0, 1023, 0x0000030000001);
+  var v = float64x2(mid, nextMid);
+  assertEqX4(float32x4.fromFloat64x2(v), [f3, f3, 0, 0]);
+
+  // Test boundaries
+  var biggestFloat = makeFloat(0, 127 + 127, 0x7fffff);
+  assertEq(makeDouble(0, 1023 + 127, 0xfffffe0000000), biggestFloat);
+
+  var lowestFloat = makeFloat(1, 127 + 127, 0x7fffff);
+  assertEq(makeDouble(1, 1023 + 127, 0xfffffe0000000), lowestFloat);
+
+  var v = float64x2(lowestFloat, biggestFloat);
+  assertEqX4(float32x4.fromFloat64x2(v), [lowestFloat, biggestFloat, 0, 0]);
+
+  var v = float64x2(makeDouble(0, 1023 + 127, 0xfffffe0000001), makeDouble(0, 1023 + 127, 0xffffff0000000));
+  assertEqX4(float32x4.fromFloat64x2(v), [biggestFloat, Infinity, 0, 0]);
 }
 
 function testFloat32x4FromFloat64x2Bits() {
@@ -45,6 +87,45 @@
   for (var v of vals) {
     assertEqX4(float32x4.fromInt32x4(int32x4(...v)), expected(v));
   }
+
+  // Check that rounding to nearest, even is applied.
+  {
+      var num = makeFloat(0, 150 + 2, 0);
+      var next = makeFloat(0, 150 + 2, 1);
+      assertEq(num + 4, next);
+
+      v = float32x4.fromInt32x4(int32x4(num, num + 1, num + 2, num + 3));
+      assertEqX4(v, [num, num, /* even */ num, next]);
+  }
+
+  {
+      var num = makeFloat(0, 150 + 2, 1);
+      var next = makeFloat(0, 150 + 2, 2);
+      assertEq(num + 4, next);
+
+      v = float32x4.fromInt32x4(int32x4(num, num + 1, num + 2, num + 3));
+      assertEqX4(v, [num, num, /* even */ next, next]);
+  }
+
+  {
+      var last = makeFloat(0, 157, 0x7fffff);
+
+      assertEq(last, Math.fround(last), "float");
+      assertEq(last < Math.pow(2, 31), true, "less than 2**31");
+      assertEq(last | 0, last, "it should be an integer, as exponent >= 150");
+
+      var diff = (Math.pow(2, 31) - 1) - last;
+      v = float32x4.fromInt32x4(int32x4(Math.pow(2, 31) - 1,
+                                        Math.pow(2, 30) + 1,
+                                        last + (diff / 2) | 0,      // nearest is last
+                                        last + (diff / 2) + 1 | 0   // nearest is Math.pow(2, 31)
+                                ));
+      assertEqX4(v, [Math.pow(2, 31),
+                     Math.pow(2, 30),
+                     last,
+                     Math.pow(2, 31)
+                    ]);
+  }
 }
 
 function testFloat32x4FromInt32x4Bits() {
@@ -113,14 +194,35 @@
 }
 
 function testInt32x4FromFloat32x4() {
-  var valsExp = [
-    [[1.1, 2.2, 3.3, 4.6], [1, 2, 3, 4]],
-    [[NaN, -0, Infinity, -Infinity], [0, 0, 0, 0]]
-  ];
+  var d = float32x4(1.1, 2.2, 3.3, 4.6);
+  assertEqX4(int32x4.fromFloat32x4(d), [1, 2, 3, 4]);
 
-  for (var [v,w] of valsExp) {
-    assertEqX4(int32x4.fromFloat32x4(float32x4(...v)), w);
-  }
+  var d = float32x4(NaN, 0, 0, 0);
+  assertThrowsInstanceOf(() => SIMD.int32x4.fromFloat32x4(d), RangeError);
+
+  var d = float32x4(Infinity, 0, 0, 0);
+  assertThrowsInstanceOf(() => SIMD.int32x4.fromFloat32x4(d), RangeError);
+
+  var d = float32x4(-Infinity, 0, 0, 0);
+  assertThrowsInstanceOf(() => SIMD.int32x4.fromFloat32x4(d), RangeError);
+
+  // Test high boundaries: float(0, 157, 0x7fffff) < INT32_MAX < float(0, 158, 0)
+  var d = float32x4(makeFloat(0, 127 + 31, 0), 0, 0, 0);
+  assertThrowsInstanceOf(() => SIMD.int32x4.fromFloat32x4(d), RangeError);
+
+  var lastFloat = makeFloat(0, 127 + 30, 0x7FFFFF);
+  var d = float32x4(lastFloat, 0, 0, 0);
+  var e = SIMD.int32x4.fromFloat32x4(d);
+  assertEqX4(e, [lastFloat, 0, 0, 0]);
+
+  // Test low boundaries
+  assertEq(makeFloat(1, 127 + 31, 0), INT32_MIN);
+  var d = float32x4(makeFloat(1, 127 + 31, 0), 0, 0, 0);
+  var e = SIMD.int32x4.fromFloat32x4(d);
+  assertEqX4(e, [INT32_MIN, 0, 0, 0]);
+
+  var d = float32x4(makeFloat(1, 127 + 31, 1), 0, 0, 0);
+  assertThrowsInstanceOf(() => SIMD.int32x4.fromFloat32x4(d), RangeError);
 }
 
 function testInt32x4FromFloat32x4Bits() {
@@ -135,16 +237,39 @@
 }
 
 function testInt32x4FromFloat64x2() {
-  var valsExp = [
-    [[1, 2.2], [1, 2, 0, 0]],
-    [[NaN, -0], [0, 0, 0, 0]],
-    [[Infinity, -Infinity], [0, 0, 0, 0]],
-    [[Math.pow(2, 31), -Math.pow(2, 31) - 1], [INT32_MIN, INT32_MAX, 0, 0]]
-  ];
+  assertEqX4(int32x4.fromFloat64x2(float64x2(1, 2.2)), [1, 2, 0, 0]);
+
+  var g = float64x2(Infinity, 0);
+  assertThrowsInstanceOf(() => int32x4.fromFloat64x2(g), RangeError);
+
+  var g = float64x2(-Infinity, 0);
+  assertThrowsInstanceOf(() => int32x4.fromFloat64x2(g), RangeError);
+
+  var g = float64x2(NaN, 0);
+  assertThrowsInstanceOf(() => int32x4.fromFloat64x2(g), RangeError);
+
+  // Testing high boundaries
+  // double(0, 1023 + 30, 0) < INT32_MAX < double(0, 1023 + 31, 0), so the
+  // lowest exactly representable quantity at this scale is 2**(-52 + 30) ==
+  // 2**-22.
+  assertEq(makeDouble(0, 1023 + 30, 0) + Math.pow(2, -22), makeDouble(0, 1023 + 30, 1));
+  assertEq(makeDouble(0, 1023 + 30, 0) + Math.pow(2, -23), makeDouble(0, 1023 + 30, 0));
+
+  var g = float64x2(INT32_MAX, 0);
+  assertEqX4(int32x4.fromFloat64x2(g), [INT32_MAX, 0, 0, 0]);
+
+  var g = float64x2(INT32_MAX + Math.pow(2, -22), 0);
+  assertThrowsInstanceOf(() => int32x4.fromFloat64x2(g), RangeError);
+
+  // Testing low boundaries
+  assertEq(makeDouble(1, 1023 + 31, 0), INT32_MIN);
+
+  var g = float64x2(makeDouble(1, 1023 + 31, 0), 0);
+  assertEqX4(int32x4.fromFloat64x2(g), [INT32_MIN, 0, 0, 0]);
+
+  var g = float64x2(makeDouble(1, 1023 + 31, 1), 0);
+  assertThrowsInstanceOf(() => int32x4.fromFloat64x2(g), RangeError);
 
-  for (var [v,w] of valsExp) {
-    assertEqX4(int32x4.fromFloat64x2(float64x2(...v)), w);
-  }
 }
 
 function testInt32x4FromFloat64x2Bits() {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/tests/ecma_7/SIMD/shell.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/tests/ecma_7/SIMD/shell.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/tests/ecma_7/SIMD/shell.js	2015-04-22 13:05:57.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/tests/ecma_7/SIMD/shell.js	2015-04-24 19:31:07.000000000 +0000
@@ -1,3 +1,34 @@
+function makeFloat(sign, exp, mantissa) {
+    assertEq(sign, sign & 0x1);
+    assertEq(exp, exp & 0xFF);
+    assertEq(mantissa, mantissa & 0x7FFFFF);
+
+    var i32 = new Int32Array(1);
+    var f32 = new Float32Array(i32.buffer);
+
+    i32[0] = (sign << 31) | (exp << 23) | mantissa;
+    return f32[0];
+}
+
+function makeDouble(sign, exp, mantissa) {
+    assertEq(sign, sign & 0x1);
+    assertEq(exp, exp & 0x7FF);
+
+    // Can't use bitwise operations on mantissa, as it might be a double
+    assertEq(mantissa <= 0xfffffffffffff, true);
+    var highBits = (mantissa / Math.pow(2, 32)) | 0;
+    var lowBits = mantissa - highBits * Math.pow(2, 32);
+
+    var i32 = new Int32Array(2);
+    var f64 = new Float64Array(i32.buffer);
+
+    // Note that this assumes little-endian order, which is the case on tier-1
+    // platforms.
+    i32[0] = lowBits;
+    i32[1] = (sign << 31) | (exp << 20) | highBits;
+    return f64[0];
+}
+
 function assertEqX2(v, arr) {
     try {
         assertEq(v.x, arr[0]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/tests/ecma_7/SIMD/shifts.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/tests/ecma_7/SIMD/shifts.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/tests/ecma_7/SIMD/shifts.js	2015-04-22 13:05:57.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/tests/ecma_7/SIMD/shifts.js	2015-04-24 19:31:07.000000000 +0000
@@ -8,13 +8,13 @@
 var int32x4 = SIMD.int32x4;
 
 function lsh(a, b) {
-    return (a << b) | 0;
+    return (b >>> 0) >= 32 ? 0 : (a << b) | 0;
 }
 function rsh(a, b) {
-    return (a >> b) | 0;
+    return (a >> Math.min(b >>> 0, 31)) | 0;
 }
 function ursh(a, b) {
-    return (a >>> b) | 0;
+    return (b >>> 0) >= 32 ? 0 : (a >>> b) | 0;
 }
 
 function test() {
@@ -28,7 +28,7 @@
             int32x4(INT32_MAX, INT32_MIN, INT32_MAX - 1, INT32_MIN + 1)
        ])
   {
-      for (var bits = 0; bits < 32; bits++) {
+      for (var bits = -2; bits < 36; bits++) {
           testBinaryScalarFunc(v, bits, int32x4.shiftLeftByScalar, lsh);
           testBinaryScalarFunc(v, bits, int32x4.shiftRightArithmeticByScalar, rsh);
           testBinaryScalarFunc(v, bits, int32x4.shiftRightLogicalByScalar, ursh);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ArgumentsObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ArgumentsObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ArgumentsObject.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ArgumentsObject.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -560,6 +560,7 @@
     nullptr,                 /* setProperty */
     args_enumerate,
     args_resolve,
+    nullptr,                 /* mayResolve  */
     nullptr,                 /* convert     */
     ArgumentsObject::finalize,
     nullptr,                 /* call        */
@@ -584,6 +585,7 @@
     nullptr,                 /* setProperty */
     strictargs_enumerate,
     strictargs_resolve,
+    nullptr,                 /* mayResolve  */
     nullptr,                 /* convert     */
     ArgumentsObject::finalize,
     nullptr,                 /* call        */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ArrayBufferObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ArrayBufferObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ArrayBufferObject.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ArrayBufferObject.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -108,6 +108,7 @@
     nullptr,                 /* setProperty */
     nullptr,                 /* enumerate */
     nullptr,                 /* resolve */
+    nullptr,                 /* mayResolve */
     nullptr,                 /* convert */
     ArrayBufferObject::finalize,
     nullptr,        /* call        */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ArrayBufferObject.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ArrayBufferObject.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ArrayBufferObject.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ArrayBufferObject.h	2015-04-24 19:31:11.000000000 +0000
@@ -118,6 +118,10 @@
 
     static const size_t ARRAY_BUFFER_ALIGNMENT = 8;
 
+    static_assert(FLAGS_SLOT == JS_ARRAYBUFFER_FLAGS_SLOT,
+                  "self-hosted code with burned-in constants must get the "
+                  "right flags slot");
+
   public:
 
     enum OwnsState {
@@ -163,6 +167,9 @@
         TYPED_OBJECT_VIEWS  = 0x20
     };
 
+    static_assert(JS_ARRAYBUFFER_NEUTERED_FLAG == NEUTERED,
+                  "self-hosted code with burned-in constants must use the "
+                  "correct NEUTERED bit value");
   public:
 
     class BufferContents {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Debugger.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Debugger.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Debugger.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Debugger.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -44,6 +44,7 @@
 using mozilla::ArrayLength;
 using mozilla::DebugOnly;
 using mozilla::Maybe;
+using mozilla::UniquePtr;
 
 
 /*** Forward declarations ************************************************************************/
@@ -358,9 +359,8 @@
   : object(dbg),
     uncaughtExceptionHook(nullptr),
     enabled(true),
+    observedGCs(cx),
     allowUnobservedAsmJS(false),
-    debuggeeWasCollected(false),
-    inOnGCHook(false),
     trackingAllocationSites(false),
     allocationSamplingProbability(1.0),
     allocationsLogLength(0),
@@ -408,6 +408,7 @@
               scripts.init() &&
               sources.init() &&
               objects.init() &&
+              observedGCs.init() &&
               environments.init();
     if (!ok)
         ReportOutOfMemory(cx);
@@ -878,71 +879,6 @@
     return true;
 }
 
-JSObject*
-Debugger::translateGCStatistics(JSContext* cx, const gcstats::Statistics& stats)
-{
-    // If this functions triggers a GC then the statistics object will change
-    // underneath us.
-    gc::AutoSuppressGC suppressGC(cx);
-
-    RootedObject obj(cx, NewBuiltinClassInstance<PlainObject>(cx));
-    if (!obj)
-        return nullptr;
-
-    const char* nonincrementalReason = stats.nonincrementalReason();
-    RootedValue nonincrementalReasonValue(cx, NullValue());
-    if (nonincrementalReason) {
-        JSAtom* atomized = Atomize(cx, nonincrementalReason, strlen(nonincrementalReason));
-        if (!atomized)
-            return nullptr;
-        nonincrementalReasonValue.setString(atomized);
-    }
-
-    if (!DefineProperty(cx, obj, cx->names().nonincrementalReason, nonincrementalReasonValue))
-        return nullptr;
-
-    RootedArrayObject slicesArray(cx, NewDenseEmptyArray(cx));
-    if (!slicesArray)
-        return nullptr;
-
-    size_t idx = 0;
-    for (auto range = stats.sliceRange(); !range.empty(); range.popFront()) {
-        if (idx == 0) {
-            // There is only one GC reason for the whole cycle, but for legacy
-            // reasons, this data is stored and replicated on each slice.
-            const char* reason = gcstats::ExplainReason(range.front().reason);
-            JSAtom* atomized = Atomize(cx, reason, strlen(reason));
-            if (!atomized)
-                return nullptr;
-            RootedValue reasonVal(cx, StringValue(atomized));
-            if (!DefineProperty(cx, obj, cx->names().reason, reasonVal))
-                return nullptr;
-        }
-
-        RootedPlainObject collectionObj(cx, NewBuiltinClassInstance<PlainObject>(cx));
-        if (!collectionObj)
-            return nullptr;
-
-        RootedValue start(cx, NumberValue(range.front().start));
-        RootedValue end(cx, NumberValue(range.front().end));
-        if (!DefineProperty(cx, collectionObj, cx->names().startTimestamp, start) ||
-            !DefineProperty(cx, collectionObj, cx->names().endTimestamp, end))
-        {
-            return nullptr;
-        }
-
-        RootedValue collectionVal(cx, ObjectValue(*collectionObj));
-        if (!DefineElement(cx, slicesArray, idx++, collectionVal))
-            return nullptr;
-    }
-
-    RootedValue slicesValue(cx, ObjectValue(*slicesArray));
-    if (!DefineProperty(cx, obj, cx->names().collections, slicesValue))
-        return nullptr;
-
-    return obj.get();
-}
-
 bool
 Debugger::unwrapDebuggeeObject(JSContext* cx, MutableHandleObject obj)
 {
@@ -1016,20 +952,22 @@
 
     if (desc.hasGetterObject()) {
         RootedObject get(cx, desc.getterObject());
-        if (!unwrapDebuggeeObject(cx, &get) ||
-            !CheckArgCompartment(cx, obj, get, "defineProperty", "get"))
-        {
-            return false;
+        if (get) {
+            if (!unwrapDebuggeeObject(cx, &get))
+                return false;
+            if (!CheckArgCompartment(cx, obj, get, "defineProperty", "get"))
+                return false;
         }
         desc.setGetterObject(get);
     }
 
     if (desc.hasSetterObject()) {
         RootedObject set(cx, desc.setterObject());
-        if (!unwrapDebuggeeObject(cx, &set) ||
-            !CheckArgCompartment(cx, obj, set, "defineProperty", "set"))
-        {
-            return false;
+        if (set) {
+            if (!unwrapDebuggeeObject(cx, &set))
+                return false;
+            if (!CheckArgCompartment(cx, obj, set, "defineProperty", "set"))
+                return false;
         }
         desc.setSetterObject(set);
     }
@@ -1332,18 +1270,11 @@
 }
 
 void
-Debugger::fireOnGarbageCollectionHook(JSRuntime* rt, const gcstats::Statistics& stats)
+Debugger::fireOnGarbageCollectionHook(JSContext* cx,
+                                      const JS::dbg::GarbageCollectionEvent::Ptr& gcData)
 {
-    if (inOnGCHook)
-        return;
-
-    AutoOnGCHookReentrancyGuard guard(*this);
-
-    MOZ_ASSERT(debuggeeWasCollected);
-    debuggeeWasCollected = false;
-
-    JSContext* cx = DefaultJSContext(rt);
-    MOZ_ASSERT(cx);
+    MOZ_ASSERT(observedGC(gcData->majorGCNumber()));
+    observedGCs.remove(gcData->majorGCNumber());
 
     RootedObject hook(cx, getHook(OnGarbageCollection));
     MOZ_ASSERT(hook);
@@ -1352,15 +1283,15 @@
     Maybe<AutoCompartment> ac;
     ac.emplace(cx, object);
 
-    JSObject* statsObj = translateGCStatistics(cx, stats);
-    if (!statsObj) {
+    JSObject* dataObj = gcData->toJSObject(cx);
+    if (!dataObj) {
         handleUncaughtException(ac, false);
         return;
     }
 
-    RootedValue statsVal(cx, ObjectValue(*statsObj));
+    RootedValue dataVal(cx, ObjectValue(*dataObj));
     RootedValue rv(cx);
-    if (!Invoke(cx, ObjectValue(*object), ObjectValue(*hook), 1, statsVal.address(), &rv))
+    if (!Invoke(cx, ObjectValue(*object), ObjectValue(*hook), 1, dataVal.address(), &rv))
         handleUncaughtException(ac, true);
 }
 
@@ -2474,7 +2405,7 @@
     "Debugger",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUG_COUNT),
-    nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, Debugger::finalize,
     nullptr,              /* call        */
     nullptr,              /* hasInstance */
@@ -4273,7 +4204,7 @@
     "Script",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGSCRIPT_COUNT),
-    nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, nullptr,
     nullptr,              /* call        */
     nullptr,              /* hasInstance */
@@ -5294,7 +5225,7 @@
     "Source",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGSOURCE_COUNT),
-    nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, nullptr,
     nullptr,              /* call        */
     nullptr,              /* hasInstance */
@@ -5649,7 +5580,7 @@
 
 const Class DebuggerFrame_class = {
     "Frame", JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGFRAME_COUNT),
-    nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, DebuggerFrame_finalize
 };
 
@@ -6411,7 +6342,7 @@
     "Object",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGOBJECT_COUNT),
-    nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, nullptr,
     nullptr,              /* call        */
     nullptr,              /* hasInstance */
@@ -7321,7 +7252,7 @@
     "Environment",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGENV_COUNT),
-    nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, nullptr,
     nullptr,              /* call        */
     nullptr,              /* hasInstance */
@@ -7863,3 +7794,129 @@
 
     return js::Debugger::fromJSObject(&obj) != nullptr;
 }
+
+
+/*** JS::dbg::GarbageCollectionEvent **************************************************************/
+
+namespace JS {
+namespace dbg {
+
+/* static */ GarbageCollectionEvent::Ptr
+GarbageCollectionEvent::Create(JSRuntime* rt, ::js::gcstats::Statistics& stats, uint64_t gcNumber)
+{
+    auto data = rt->make_unique<GarbageCollectionEvent>(gcNumber);
+    if (!data)
+        return nullptr;
+
+    data->nonincrementalReason = stats.nonincrementalReason();
+
+    for (auto range = stats.sliceRange(); !range.empty(); range.popFront()) {
+        if (!data->reason) {
+            // There is only one GC reason for the whole cycle, but for legacy
+            // reasons this data is stored and replicated on each slice. Each
+            // slice used to have its own GCReason, but now they are all the
+            // same.
+            data->reason = gcstats::ExplainReason(range.front().reason);
+            MOZ_ASSERT(data->reason);
+        }
+
+        if (!data->collections.growBy(1))
+            return nullptr;
+
+        data->collections.back().startTimestamp = range.front().start;
+        data->collections.back().endTimestamp = range.front().end;
+    }
+
+
+    return data;
+}
+
+static bool
+DefineStringProperty(JSContext* cx, HandleObject obj, PropertyName* propName, const char* strVal)
+{
+    RootedValue val(cx, UndefinedValue());
+    if (strVal) {
+        JSAtom* atomized = Atomize(cx, strVal, strlen(strVal));
+        if (!atomized)
+            return false;
+        val = StringValue(atomized);
+    }
+    return DefineProperty(cx, obj, propName, val);
+}
+
+JSObject*
+GarbageCollectionEvent::toJSObject(JSContext* cx) const
+{
+    RootedObject obj(cx, NewBuiltinClassInstance<PlainObject>(cx));
+    if (!obj ||
+        !DefineStringProperty(cx, obj, cx->names().nonincrementalReason, nonincrementalReason) ||
+        !DefineStringProperty(cx, obj, cx->names().reason, reason))
+    {
+        return nullptr;
+    }
+
+    RootedArrayObject slicesArray(cx, NewDenseEmptyArray(cx));
+    if (!slicesArray)
+        return nullptr;
+
+    size_t idx = 0;
+    for (auto range = collections.all(); !range.empty(); range.popFront()) {
+        RootedPlainObject collectionObj(cx, NewBuiltinClassInstance<PlainObject>(cx));
+        if (!collectionObj)
+            return nullptr;
+
+        RootedValue start(cx, NumberValue(range.front().startTimestamp));
+        RootedValue end(cx, NumberValue(range.front().endTimestamp));
+        if (!DefineProperty(cx, collectionObj, cx->names().startTimestamp, start) ||
+            !DefineProperty(cx, collectionObj, cx->names().endTimestamp, end))
+        {
+            return nullptr;
+        }
+
+        RootedValue collectionVal(cx, ObjectValue(*collectionObj));
+        if (!DefineElement(cx, slicesArray, idx++, collectionVal))
+            return nullptr;
+    }
+
+    RootedValue slicesValue(cx, ObjectValue(*slicesArray));
+    if (!DefineProperty(cx, obj, cx->names().collections, slicesValue))
+        return nullptr;
+
+    return obj;
+}
+
+JS_PUBLIC_API(bool)
+FireOnGarbageCollectionHook(JSContext* cx, JS::dbg::GarbageCollectionEvent::Ptr&& data)
+{
+    AutoObjectVector triggered(cx);
+
+    {
+        // We had better not GC (and potentially get a dangling Debugger
+        // pointer) while finding all Debuggers observing a debuggee that
+        // participated in this GC.
+        AutoCheckCannotGC noGC;
+
+        for (Debugger* dbg = cx->runtime()->debuggerList.getFirst(); dbg; dbg = dbg->getNext()) {
+            if (dbg->enabled &&
+                dbg->observedGC(data->majorGCNumber()) &&
+                dbg->getHook(Debugger::OnGarbageCollection))
+            {
+                if (!triggered.append(dbg->object)) {
+                    JS_ReportOutOfMemory(cx);
+                    return false;
+                }
+            }
+        }
+    }
+
+    for ( ; !triggered.empty(); triggered.popBack()) {
+        Debugger* dbg = Debugger::fromJSObject(triggered.back());
+        dbg->fireOnGarbageCollectionHook(cx, data);
+        MOZ_ASSERT(!cx->isExceptionPending());
+    }
+
+    return true;
+}
+
+} // namespace dbg
+} // namespace JS
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Debugger.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Debugger.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Debugger.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Debugger.h	2015-04-24 19:31:11.000000000 +0000
@@ -10,6 +10,8 @@
 #include "mozilla/GuardObjects.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/Range.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/Vector.h"
 
 #include "jsclist.h"
 #include "jscntxt.h"
@@ -190,6 +192,8 @@
     friend JSObject* SavedStacksMetadataCallback(JSContext* cx);
     friend void JS::dbg::onNewPromise(JSContext* cx, HandleObject promise);
     friend void JS::dbg::onPromiseSettled(JSContext* cx, HandleObject promise);
+    friend bool JS::dbg::FireOnGarbageCollectionHook(JSContext* cx,
+                                                     JS::dbg::GarbageCollectionEvent::Ptr&& data);
 
   public:
     enum Hook {
@@ -242,9 +246,17 @@
     // false otherwise.
     bool isDebuggee(const JSCompartment* compartment) const;
 
-    // Notify this Debugger that one of its debuggee compartments' zones is
-    // being collected.
-    void debuggeeIsBeingCollected() { debuggeeWasCollected = true; }
+    // Return true if this Debugger observed a debuggee that participated in the
+    // GC identified by the given GC number. Return false otherwise.
+    bool observedGC(uint64_t majorGCNumber) const {
+        return observedGCs.has(majorGCNumber);
+    }
+
+    // Notify this Debugger that one or more of its debuggees is participating
+    // in the GC identified by the given GC number.
+    bool debuggeeIsBeingCollected(uint64_t majorGCNumber) {
+        return observedGCs.put(majorGCNumber);
+    }
 
   private:
     HeapPtrNativeObject object;         /* The Debugger object. Strong reference. */
@@ -253,6 +265,10 @@
     bool enabled;
     JSCList breakpoints;                /* Circular list of all js::Breakpoints in this debugger */
 
+    // The set of GC numbers for which one or more of this Debugger's observed
+    // debuggees participated in.
+    js::HashSet<uint64_t> observedGCs;
+
     struct AllocationSite : public mozilla::LinkedListElement<AllocationSite>
     {
         AllocationSite(HandleObject frame, int64_t when, const char* className)
@@ -270,38 +286,6 @@
     typedef mozilla::LinkedList<AllocationSite> AllocationSiteList;
 
     bool allowUnobservedAsmJS;
-
-    // During a GC cycle, this is true if one of this Debugger's debuggees was
-    // collected. When the GC cycle completes, this flag is reset.
-    bool debuggeeWasCollected;
-
-    // True while we are executing the onGarbageCollection hook, and therefore
-    // should not fire the hook for this Debugger instance again if there is a
-    // GC while we are executing the hook. See also
-    // `AutoOnGCHookReentrancyGuard` below.
-    bool inOnGCHook;
-
-    // RAII class to automatically guard against reentrancy into the
-    // OnGarbageCollection hook.
-    class MOZ_STACK_CLASS AutoOnGCHookReentrancyGuard {
-        MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER;
-        Debugger& dbg;
-
-    public:
-        explicit AutoOnGCHookReentrancyGuard(Debugger& dbg MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
-            : dbg(dbg)
-        {
-            MOZ_GUARD_OBJECT_NOTIFIER_INIT;
-            MOZ_ASSERT(!dbg.inOnGCHook);
-            dbg.inOnGCHook = true;
-        }
-
-        ~AutoOnGCHookReentrancyGuard() {
-            MOZ_ASSERT(dbg.inOnGCHook);
-            dbg.inOnGCHook = false;
-        }
-    };
-
     bool trackingAllocationSites;
     double allocationSamplingProbability;
     AllocationSiteList allocationsLog;
@@ -554,9 +538,10 @@
 
     /*
      * Receive a "garbage collection" event from the engine. A GC cycle with the
-     * given statistics was just completed.
+     * given data was recently completed.
      */
-    void fireOnGarbageCollectionHook(JSRuntime* rt, const gcstats::Statistics& stats);
+    void fireOnGarbageCollectionHook(JSContext* cx,
+                                     const JS::dbg::GarbageCollectionEvent::Ptr& gcData);
 
     /*
      * Gets a Debugger.Frame object. If maybeIter is non-null, we eagerly copy
@@ -675,7 +660,6 @@
     static inline void onNewGlobalObject(JSContext* cx, Handle<GlobalObject*> global);
     static inline bool onLogAllocationSite(JSContext* cx, JSObject* obj, HandleSavedFrame frame,
                                            int64_t when);
-    static inline void onGarbageCollection(JSRuntime* rt, const gcstats::Statistics& stats);
     static JSTrapStatus onTrap(JSContext* cx, MutableHandleValue vp);
     static JSTrapStatus onSingleStep(JSContext* cx, MutableHandleValue vp);
     static bool handleBaselineOsr(JSContext* cx, InterpreterFrame* from, jit::BaselineFrame* to);
@@ -725,13 +709,6 @@
     bool wrapDebuggeeValue(JSContext* cx, MutableHandleValue vp);
 
     /*
-     * Converts an implementor level of detail gcstats::Statistics object into a
-     * JSObject that web developers should be able to make sense of. Returns
-     * nullptr on failure.
-     */
-    JSObject* translateGCStatistics(JSContext* cx, const gcstats::Statistics& stats);
-
-    /*
      * Unwrap a Debug.Object, without rewrapping it for any particular debuggee
      * compartment.
      *
@@ -992,18 +969,9 @@
     return Debugger::slowPathOnLogAllocationSite(cx, hobj, frame, when, *dbgs);
 }
 
-/* static */ void
-Debugger::onGarbageCollection(JSRuntime* rt, const gcstats::Statistics& stats)
-{
-    for (Debugger* dbg = rt->debuggerList.getFirst(); dbg; dbg = dbg->getNext()) {
-        if (dbg->debuggeeWasCollected && dbg->getHook(OnGarbageCollection)) {
-            dbg->fireOnGarbageCollectionHook(rt, stats);
-        }
-    }
-}
-
 bool ReportObjectRequired(JSContext* cx);
 
 } /* namespace js */
 
+
 #endif /* vm_Debugger_h */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ErrorObject.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ErrorObject.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ErrorObject.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ErrorObject.h	2015-04-24 19:31:11.000000000 +0000
@@ -13,8 +13,6 @@
 #include "vm/SavedStacks.h"
 #include "vm/Shape.h"
 
-struct JSExnPrivate;
-
 namespace js {
 
 /*
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/GlobalObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/GlobalObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/GlobalObject.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/GlobalObject.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -506,7 +506,7 @@
 static const Class
 GlobalDebuggees_class = {
     "GlobalDebuggee", JSCLASS_HAS_PRIVATE,
-    nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, GlobalDebuggees_finalize
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/HelperThreads.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/HelperThreads.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/HelperThreads.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/HelperThreads.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -192,7 +192,7 @@
     "internal-parse-task-global", JSCLASS_GLOBAL_FLAGS,
     nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, nullptr,
-    nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr,
     JS_GlobalObjectTraceHook
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Interpreter.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Interpreter.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Interpreter.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Interpreter.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -408,7 +408,7 @@
     // stopwatch.
     //
     // Previous owner is restored upon destruction.
-    explicit inline AutoStopwatch(JSContext *cx MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+    explicit inline AutoStopwatch(JSContext* cx MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
       : compartment_(nullptr)
       , runtime_(nullptr)
       , iteration_(0)
@@ -428,7 +428,7 @@
             return;
         iteration_ = runtime_->stopwatch.iteration;
 
-        PerformanceGroup *group = compartment_->performanceMonitoring.getGroup();
+        PerformanceGroup* group = compartment_->performanceMonitoring.getGroup();
         MOZ_ASSERT(group);
 
         if (group->hasStopwatch(iteration_)) {
@@ -477,7 +477,7 @@
             return;
         }
 
-        PerformanceGroup *group = compartment_->performanceMonitoring.getGroup();
+        PerformanceGroup* group = compartment_->performanceMonitoring.getGroup();
         MOZ_ASSERT(group);
 
         // Compute time spent.
@@ -606,11 +606,11 @@
   private:
     // The compartment with which this object was initialized.
     // Non-null.
-    JSCompartment *compartment_;
+    JSCompartment* compartment_;
 
     // The runtime with which this object was initialized.
     // Non-null.
-    JSRuntime *runtime_;
+    JSRuntime* runtime_;
 
     // An indication of the number of times we have entered the event
     // loop.  Used only for comparison.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Interpreter.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Interpreter.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Interpreter.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Interpreter.h	2015-04-24 19:31:11.000000000 +0000
@@ -323,7 +323,7 @@
 };
 
 bool
-HandleClosingGeneratorReturn(JSContext *cx, AbstractFramePtr frame, bool ok);
+HandleClosingGeneratorReturn(JSContext* cx, AbstractFramePtr frame, bool ok);
 
 /************************************************************************/
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/NativeObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/NativeObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/NativeObject.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/NativeObject.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -1079,15 +1079,6 @@
     return true;
 }
 
-static unsigned
-ApplyOrDefaultAttributes(unsigned attrs, const Shape* shape = nullptr)
-{
-    bool enumerable = shape ? shape->enumerable() : false;
-    bool writable = shape ? shape->writable() : false;
-    bool configurable = shape ? shape->configurable() : false;
-    return ApplyAttributes(attrs, enumerable, writable, configurable);
-}
-
 static bool
 PurgeProtoChain(ExclusiveContext* cx, JSObject* objArg, HandleId id)
 {
@@ -1156,41 +1147,8 @@
     return true;
 }
 
-/*
- * Check whether we're redefining away a non-configurable getter, and
- * throw if so.
- */
-static inline bool
-CheckAccessorRedefinition(ExclusiveContext* cx, HandleObject obj, HandleShape shape,
-                          Handle<PropertyDescriptor> desc)
-{
-    MOZ_ASSERT(shape->isAccessorDescriptor());
-    if (shape->configurable())
-        return true;
-    if (desc.getter() == shape->getter() && desc.setter() == shape->setter())
-        return true;
-
-    /*
-     *  Only allow redefining if JSPROP_REDEFINE_NONCONFIGURABLE is set _and_
-     *  the object is a non-DOM global.  The idea is that a DOM object can
-     *  never have such a thing on its proto chain directly on the web, so we
-     *  should be OK optimizing access to accessors found on such an object.
-     */
-    if ((desc.attributes() & JSPROP_REDEFINE_NONCONFIGURABLE) &&
-        obj->is<GlobalObject>() &&
-        !obj->getClass()->isDOMClass())
-    {
-        return true;
-    }
-
-    if (!cx->isJSContext())
-        return false;
-
-    return Throw(cx->asJSContext(), shape->propid(), JSMSG_CANT_REDEFINE_PROP);
-}
-
 static bool
-AddOrChangeProperty(ExclusiveContext *cx, HandleNativeObject obj, HandleId id,
+AddOrChangeProperty(ExclusiveContext* cx, HandleNativeObject obj, HandleId id,
                     Handle<PropertyDescriptor> desc)
 {
     desc.assertComplete();
@@ -1247,6 +1205,40 @@
     return CallAddPropertyHook(cx, obj, shape, desc.value());
 }
 
+static bool IsConfigurable(unsigned attrs) { return (attrs & JSPROP_PERMANENT) == 0; }
+static bool IsEnumerable(unsigned attrs) { return (attrs & JSPROP_ENUMERATE) != 0; }
+static bool IsWritable(unsigned attrs) { return (attrs & JSPROP_READONLY) == 0; }
+
+static bool IsAccessorDescriptor(unsigned attrs) {
+    return (attrs & (JSPROP_GETTER | JSPROP_SETTER)) != 0;
+}
+
+static bool IsDataDescriptor(unsigned attrs) {
+    MOZ_ASSERT((attrs & (JSPROP_IGNORE_VALUE | JSPROP_IGNORE_READONLY)) == 0);
+    return !IsAccessorDescriptor(attrs);
+}
+
+template <AllowGC allowGC>
+static MOZ_ALWAYS_INLINE bool
+GetExistingProperty(JSContext* cx,
+                    typename MaybeRooted<JSObject*, allowGC>::HandleType receiver,
+                    typename MaybeRooted<NativeObject*, allowGC>::HandleType obj,
+                    typename MaybeRooted<Shape*, allowGC>::HandleType shape,
+                    typename MaybeRooted<Value, allowGC>::MutableHandleType vp);
+
+static bool
+GetExistingPropertyValue(ExclusiveContext* cx, HandleNativeObject obj, HandleId id,
+                         HandleShape shape, MutableHandleValue vp)
+{
+    if (IsImplicitDenseOrTypedArrayElement(shape)) {
+        vp.set(obj->getDenseOrTypedArrayElement(JSID_TO_INT(id)));
+        return true;
+    }
+    if (!cx->shouldBeJSContext())
+        return false;
+    return GetExistingProperty<CanGC>(cx->asJSContext(), obj, obj, shape, vp);
+}
+
 bool
 js::NativeDefineProperty(ExclusiveContext* cx, HandleNativeObject obj, HandleId id,
                          Handle<PropertyDescriptor> desc_,
@@ -1298,59 +1290,9 @@
         }
     }
 
-    Rooted<PropertyDescriptor> desc(cx, desc_);
-
+    // 9.1.6.1 OrdinaryDefineOwnProperty steps 1-2.
     RootedShape shape(cx);
-
-    // If defining a getter or setter, we must check for its counterpart and
-    // update the attributes and property ops.  A getter or setter is really
-    // only half of a property.
-    if (desc.isAccessorDescriptor()) {
-        if (!NativeLookupOwnProperty<CanGC>(cx, obj, id, &shape))
-            return false;
-        if (shape) {
-            // If we are defining a getter whose setter was already defined, or
-            // vice versa, finish the job via obj->changeProperty.
-            if (IsImplicitDenseOrTypedArrayElement(shape)) {
-                if (IsAnyTypedArray(obj)) {
-                    // Ignore getter/setter properties added to typed arrays.
-                    return result.succeed();
-                }
-                if (!NativeObject::sparsifyDenseElement(cx, obj, JSID_TO_INT(id)))
-                    return false;
-                shape = obj->lookup(cx, id);
-            }
-            if (shape->isAccessorDescriptor()) {
-                if (!CheckAccessorRedefinition(cx, obj, shape, desc))
-                    return false;
-
-                desc.setAttributes(ApplyOrDefaultAttributes(desc.attributes(), shape));
-                if (!desc.hasGetterObject())
-                    desc.setGetter(shape->getter());
-                if (!desc.hasSetterObject())
-                    desc.setSetter(shape->setter());
-                desc.attributesRef() |= JSPROP_GETTER | JSPROP_SETTER;
-                desc.assertComplete();
-
-                shape = NativeObject::changeProperty(cx, obj, shape, desc.attributes(),
-                                                     desc.getter(), desc.setter());
-                if (!shape)
-                    return false;
-                if (!PurgeScopeChain(cx, obj, id))
-                    return false;
-
-                JS_ALWAYS_TRUE(UpdateShapeTypeAndValue(cx, obj, shape, desc.value()));
-                if (!CallAddPropertyHook(cx, obj, shape, desc.value()))
-                    return false;
-                return result.succeed();
-            }
-        }
-
-        // Either we are converting a data property to an accessor property, or
-        // creating a new accessor property; either way [[Get]] and [[Set]]
-        // must both be filled in.
-        desc.attributesRef() |= JSPROP_GETTER | JSPROP_SETTER;
-    } else if (desc.hasValue()) {
+    if (desc_.hasValue()) {
         // If we did a normal lookup here, it would cause resolve hook recursion in
         // the following case. Suppose the first script we run in a lazy global is
         // |parseInt()|.
@@ -1364,78 +1306,166 @@
         //
         // Therefore we do a special lookup that does not call the resolve hook.
         NativeLookupOwnPropertyNoResolve(cx, obj, id, &shape);
-
-        if (shape) {
-            // If any other JSPROP_IGNORE_* attributes are present, copy the
-            // corresponding JSPROP_* attributes from the existing property.
-            if (IsImplicitDenseOrTypedArrayElement(shape)) {
-                desc.setAttributes(ApplyAttributes(desc.attributes(), true, true,
-                                                   !IsAnyTypedArray(obj)));
-            } else {
-                desc.setAttributes(ApplyOrDefaultAttributes(desc.attributes(), shape));
-
-                // Do not redefine a nonconfigurable accessor property.
-                if (shape->isAccessorDescriptor()) {
-                    if (!CheckAccessorRedefinition(cx, obj, shape, desc))
-                        return false;
-                }
-            }
-        }
     } else {
-        // We have been asked merely to update JSPROP_PERMANENT and/or JSPROP_ENUMERATE.
         if (!NativeLookupOwnProperty<CanGC>(cx, obj, id, &shape))
             return false;
+    }
 
-        if (shape) {
-            // Don't forget about arrays.
+    // From this point, the step numbers refer to
+    // 9.1.6.3, ValidateAndApplyPropertyDescriptor.
+    // Step 1 is a redundant assertion.
+
+    // Filling in desc: Here we make a copy of the desc_ argument. We will turn
+    // it into a complete descriptor before updating obj. The spec algorithm
+    // does not explicitly do this, but the end result is the same. Search for
+    // "fill in" below for places where the filling-in actually occurs.
+    Rooted<PropertyDescriptor> desc(cx, desc_);
+
+    // Step 2.
+    if (!shape) {
+        if (!obj->nonProxyIsExtensible())
+            return result.fail(JSMSG_OBJECT_NOT_EXTENSIBLE);
+
+        // Fill in missing desc fields with defaults.
+        CompletePropertyDescriptor(&desc);
+
+        if (!AddOrChangeProperty(cx, obj, id, desc))
+            return false;
+        return result.succeed();
+    }
+
+    MOZ_ASSERT(shape);
+
+    // Non-standard hack: Allow redefining non-configurable properties if
+    // JSPROP_REDEFINE_NONCONFIGURABLE is set _and_ the object is a non-DOM
+    // global. The idea is that a DOM object can never have such a thing on
+    // its proto chain directly on the web, so we should be OK optimizing
+    // access to accessors found on such an object. Bug 1105518 contemplates
+    // removing this hack.
+    bool skipRedefineChecks = (desc.attributes() & JSPROP_REDEFINE_NONCONFIGURABLE) &&
+                              obj->is<GlobalObject>() &&
+                              !obj->getClass()->isDOMClass();
+
+    // Steps 3-4 are redundant.
+
+    // Step 5. We use shapeAttrs as a stand-in for shape in many places below
+    // since shape might not be a pointer to a real Shape (see
+    // IsImplicitDenseOrTypedArrayElement).
+    unsigned shapeAttrs = GetShapeAttributes(obj, shape);
+    if (!IsConfigurable(shapeAttrs) && !skipRedefineChecks) {
+        if (desc.hasConfigurable() && desc.configurable())
+            return result.fail(JSMSG_CANT_REDEFINE_PROP);
+        if (desc.hasEnumerable() && desc.enumerable() != IsEnumerable(shapeAttrs))
+            return result.fail(JSMSG_CANT_REDEFINE_PROP);
+    }
+
+    // Fill in desc.[[Configurable]] and desc.[[Enumerable]] if missing.
+    if (!desc.hasConfigurable())
+        desc.setConfigurable(IsConfigurable(shapeAttrs));
+    if (!desc.hasEnumerable())
+        desc.setEnumerable(IsEnumerable(shapeAttrs));
+
+    // Steps 6-9.
+    if (desc.isGenericDescriptor()) {
+        // Step 6. No further validation is required.
+
+        // Fill in desc. A generic descriptor has none of these fields, so copy
+        // everything from shape.
+        MOZ_ASSERT(!desc.hasValue());
+        MOZ_ASSERT(!desc.hasWritable());
+        MOZ_ASSERT(!desc.hasGetterObject());
+        MOZ_ASSERT(!desc.hasSetterObject());
+        if (IsDataDescriptor(shapeAttrs)) {
+            RootedValue currentValue(cx);
+            if (!GetExistingPropertyValue(cx, obj, id, shape, &currentValue))
+                return false;
+            desc.setValue(currentValue);
+            desc.setWritable(IsWritable(shapeAttrs));
+        } else {
+            desc.setGetterObject(shape->getterObject());
+            desc.setSetterObject(shape->setterObject());
+        }
+    } else if (desc.isDataDescriptor() != IsDataDescriptor(shapeAttrs)) {
+        // Step 7.
+        if (!IsConfigurable(shapeAttrs) && !skipRedefineChecks)
+            return result.fail(JSMSG_CANT_REDEFINE_PROP);
+
+        if (IsImplicitDenseOrTypedArrayElement(shape)) {
+            MOZ_ASSERT(!IsAnyTypedArray(obj));
+            if (!NativeObject::sparsifyDenseElement(cx, obj, JSID_TO_INT(id)))
+                return false;
+            shape = obj->lookup(cx, id);
+        }
+
+        // Fill in desc fields with default values (steps 7.b.i and 7.c.i).
+        CompletePropertyDescriptor(&desc);
+    } else if (desc.isDataDescriptor()) {
+        // Step 8.
+        bool frozen = !IsConfigurable(shapeAttrs) && !IsWritable(shapeAttrs);
+        if (frozen && desc.hasWritable() && desc.writable() && !skipRedefineChecks)
+            return result.fail(JSMSG_CANT_REDEFINE_PROP);
+
+        if (frozen || !desc.hasValue()) {
             if (IsImplicitDenseOrTypedArrayElement(shape)) {
-                if (IsAnyTypedArray(obj)) {
-                    // Silently ignore attempts to change individual index attributes.
-                    // FIXME: Uses the same broken behavior as for accessors. This should
-                    //        fail.
-                    return result.succeed();
-                }
+                MOZ_ASSERT(!IsAnyTypedArray(obj));
                 if (!NativeObject::sparsifyDenseElement(cx, obj, JSID_TO_INT(id)))
                     return false;
                 shape = obj->lookup(cx, id);
             }
 
-            if (shape->isAccessorDescriptor() &&
-                !CheckAccessorRedefinition(cx, obj, shape, desc))
-            {
+            RootedValue currentValue(cx);
+            if (!GetExistingPropertyValue(cx, obj, id, shape, &currentValue))
                 return false;
-            }
 
-            desc.setAttributes(ApplyOrDefaultAttributes(desc.attributes(), shape));
-
-            if (shape->isAccessorDescriptor() && desc.hasWritable()) {
-                // ES6 draft 2014-10-14 9.1.6.3 step 7.c: Since [[Writable]]
-                // is present, change the existing accessor property to a data
-                // property.
-                desc.value().setUndefined();
+            if (!desc.hasValue()) {
+                // Fill in desc.[[Value]].
+                desc.setValue(currentValue);
             } else {
-                // We are at most changing some attributes, and cannot convert
-                // from data descriptor to accessor, or vice versa. Take
-                // everything from the shape that we aren't changing.
-                uint32_t propMask = JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT;
-                desc.setAttributes((shape->attributes() & ~propMask) |
-                                   (desc.attributes() & propMask));
-                desc.setGetter(shape->getter());
-                desc.setSetter(shape->setter());
-                if (shape->hasSlot())
-                    desc.value().set(obj->getSlot(shape->slot()));
+                // Step 8.a.ii.1.
+                bool same;
+                if (!cx->shouldBeJSContext())
+                    return false;
+                if (!SameValue(cx->asJSContext(), desc.value(), currentValue, &same))
+                    return false;
+                if (!same && !skipRedefineChecks)
+                    return result.fail(JSMSG_CANT_REDEFINE_PROP);
             }
         }
-    }
 
-    // Dispense with any remaining JSPROP_IGNORE_* attributes. Any bits that
-    // needed to be copied from an existing property have been copied by
-    // now. Since we can never get here with JSPROP_IGNORE_VALUE relevant, just
-    // clear it.
-    desc.setAttributes(ApplyOrDefaultAttributes(desc.attributes()) & ~JSPROP_IGNORE_VALUE);
+        if (!desc.hasWritable())
+            desc.setWritable(IsWritable(shapeAttrs));
+    } else {
+        // Step 9.
+        MOZ_ASSERT(shape->isAccessorDescriptor());
+        MOZ_ASSERT(desc.isAccessorDescriptor());
+
+        // The spec says to use SameValue, but since the values in
+        // question are objects, we can just compare pointers.
+        if (desc.hasSetterObject()) {
+            if (!IsConfigurable(shapeAttrs) &&
+                desc.setterObject() != shape->setterObject() &&
+                !skipRedefineChecks)
+            {
+                return result.fail(JSMSG_CANT_REDEFINE_PROP);
+            }
+        } else {
+            // Fill in desc.[[Set]] from shape.
+            desc.setSetterObject(shape->setterObject());
+        }
+        if (desc.hasGetterObject()) {
+            if (!IsConfigurable(shapeAttrs) &&
+                desc.getterObject() != shape->getterObject() &&
+                !skipRedefineChecks)
+            {
+                return result.fail(JSMSG_CANT_REDEFINE_PROP);
+            }
+        } else {
+            // Fill in desc.[[Get]] from shape.
+            desc.setGetterObject(shape->getterObject());
+        }
+    }
 
-    // At this point, no mutation has happened yet, but all ES6 error cases
-    // have been dealt with.
+    // Step 10.
     if (!AddOrChangeProperty(cx, obj, id, desc))
         return false;
     return result.succeed();
@@ -1447,7 +1477,7 @@
                          ObjectOpResult& result)
 {
     Rooted<PropertyDescriptor> desc(cx);
-    desc.initFields(obj, value, attrs, getter, setter);
+    desc.initFields(NullPtr(), value, attrs, getter, setter);
     return NativeDefineProperty(cx, obj, id, desc, result);
 }
 
@@ -2005,17 +2035,6 @@
             return false;
     }
 
-    // If the property doesn't already exist, check for an inextensible
-    // receiver. (According to the specification, this is supposed to be
-    // enforced by [[DefineOwnProperty]], but we haven't implemented that yet.)
-    if (!existing) {
-        bool extensible;
-        if (!IsExtensible(cx, receiver, &extensible))
-            return false;
-        if (!extensible)
-            return result.fail(JSMSG_OBJECT_NOT_EXTENSIBLE);
-    }
-
     // Invalidate SpiderMonkey-specific caches or bail.
     const Class* clasp = receiver->getClass();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/NativeObject.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/NativeObject.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/NativeObject.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/NativeObject.h	2015-04-24 19:31:11.000000000 +0000
@@ -282,11 +282,9 @@
 
 struct Class;
 class GCMarker;
-struct ObjectOps;
 class Shape;
 
 class NewObjectCache;
-class TaggedProto;
 
 #ifdef DEBUG
 static inline bool
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/NativeObject-inl.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/NativeObject-inl.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/NativeObject-inl.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/NativeObject-inl.h	2015-04-24 19:31:11.000000000 +0000
@@ -414,6 +414,11 @@
     if (!resolved)
         return true;
 
+    // Assert the mayResolve hook, if there is one, returns true for this
+    // property.
+    MOZ_ASSERT_IF(obj->getClass()->mayResolve,
+                  obj->getClass()->mayResolve(cx->names(), id, obj));
+
     if (JSID_IS_INT(id) && obj->containsDenseElement(JSID_TO_INT(id))) {
         MarkDenseOrTypedArrayElementFound<CanGC>(propp);
         return true;
@@ -425,6 +430,28 @@
     return true;
 }
 
+static MOZ_ALWAYS_INLINE bool
+ClassMayResolveId(const JSAtomState& names, const Class* clasp, jsid id, JSObject* maybeObj)
+{
+    MOZ_ASSERT_IF(maybeObj, maybeObj->getClass() == clasp);
+
+    if (!clasp->resolve) {
+        // Sanity check: we should only have a mayResolve hook if we have a
+        // resolve hook.
+        MOZ_ASSERT(!clasp->mayResolve, "Class with mayResolve hook but no resolve hook");
+        return false;
+    }
+
+    if (clasp->mayResolve) {
+        // Tell the analysis our mayResolve hooks won't trigger GC.
+        JS::AutoSuppressGCAnalysis nogc;
+        if (!clasp->mayResolve(names, id, maybeObj))
+            return false;
+    }
+
+    return true;
+}
+
 template <AllowGC allowGC>
 static MOZ_ALWAYS_INLINE bool
 LookupOwnPropertyInline(ExclusiveContext* cx,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ObjectGroup.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ObjectGroup.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ObjectGroup.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ObjectGroup.h	2015-04-24 19:31:11.000000000 +0000
@@ -329,6 +329,10 @@
         setAddendum(Addendum_None, nullptr);
     }
 
+    bool hasUnanalyzedPreliminaryObjects() {
+        return (newScript() && !newScript()->analyzed()) || maybePreliminaryObjects();
+    }
+
     UnboxedLayout* maybeUnboxedLayout() {
         maybeSweep(nullptr);
         return maybeUnboxedLayoutDontCheckGeneration();
@@ -540,7 +544,7 @@
 
     inline void clearProperties();
     void maybeSweep(AutoClearTypeInferenceStateOnOOM* oom);
-    void traceChildren(JSTracer *trc);
+    void traceChildren(JSTracer* trc);
 
   private:
 #ifdef DEBUG
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/PIC.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/PIC.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/PIC.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/PIC.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -296,7 +296,7 @@
 
 const Class ForOfPIC::jsclass = {
     "ForOfPIC", JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS,
-    nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, ForOfPIC_finalize,
     nullptr,              /* call        */
     nullptr,              /* hasInstance */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/RegExpObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/RegExpObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/RegExpObject.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/RegExpObject.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -269,6 +269,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     nullptr, /* finalize */
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/RegExpObject.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/RegExpObject.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/RegExpObject.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/RegExpObject.h	2015-04-24 19:31:11.000000000 +0000
@@ -41,6 +41,7 @@
 struct MatchPair;
 class MatchPairs;
 class RegExpShared;
+class RegExpStatics;
 
 namespace frontend { class TokenStream; }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/RegExpStatics.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/RegExpStatics.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/RegExpStatics.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/RegExpStatics.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -44,6 +44,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     resc_finalize,
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Runtime.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Runtime.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Runtime.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Runtime.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -870,21 +870,21 @@
 }
 
 void
-js::ResetStopwatches(JSRuntime *rt)
+js::ResetStopwatches(JSRuntime* rt)
 {
     MOZ_ASSERT(rt);
     rt->stopwatch.reset();
 }
 
 bool
-js::SetStopwatchActive(JSRuntime *rt, bool isActive)
+js::SetStopwatchActive(JSRuntime* rt, bool isActive)
 {
     MOZ_ASSERT(rt);
     return rt->stopwatch.setIsActive(isActive);
 }
 
 bool
-js::IsStopwatchActive(JSRuntime *rt)
+js::IsStopwatchActive(JSRuntime* rt)
 {
     MOZ_ASSERT(rt);
     return rt->stopwatch.isActive();
@@ -931,7 +931,7 @@
     js_delete(group);
 }
 
-PerformanceGroup *
+PerformanceGroup*
 js::PerformanceGroupHolder::getGroup()
 {
     if (group_)
@@ -954,7 +954,7 @@
 }
 
 PerformanceData*
-js::GetPerformanceData(JSRuntime *rt)
+js::GetPerformanceData(JSRuntime* rt)
 {
     return &rt->stopwatch.performance;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Runtime.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Runtime.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Runtime.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Runtime.h	2015-04-24 19:31:11.000000000 +0000
@@ -31,6 +31,7 @@
 #include "gc/GCRuntime.h"
 #include "gc/Tracer.h"
 #include "irregexp/RegExpStack.h"
+#include "js/Debug.h"
 #include "js/HashTable.h"
 #ifdef DEBUG
 # include "js/Proxy.h" // For AutoEnterPolicy
@@ -569,8 +570,6 @@
 };
 
 class AutoLockForExclusiveAccess;
-
-struct AutoStopwatch;
 } // namespace js
 
 struct JSRuntime : public JS::shadow::Runtime,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/SavedStacks.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/SavedStacks.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/SavedStacks.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/SavedStacks.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -185,6 +185,7 @@
     nullptr,                    // setProperty
     nullptr,                    // enumerate
     nullptr,                    // resolve
+    nullptr,                    // mayResolve
     nullptr,                    // convert
     SavedFrame::finalize,       // finalize
     nullptr,                    // call
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ScopeObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ScopeObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/ScopeObject.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/ScopeObject.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -540,6 +540,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     nullptr, /* finalize */
     nullptr, /* call */
@@ -977,6 +978,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     nullptr, /* finalize */
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/SelfHosting.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/SelfHosting.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/SelfHosting.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/SelfHosting.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "vm/SelfHosting.h"
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Casting.h"
 #include "mozilla/DebugOnly.h"
 
@@ -42,6 +43,8 @@
 using namespace js::selfhosted;
 
 using JS::AutoCheckCannotGC;
+using mozilla::IsInRange;
+using mozilla::PodMove;
 using mozilla::UniquePtr;
 
 static void
@@ -671,6 +674,17 @@
 }
 
 bool
+js::intrinsic_IsArrayBuffer(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    MOZ_ASSERT(args.length() == 1);
+    MOZ_ASSERT(args[0].isObject());
+
+    args.rval().setBoolean(args[0].toObject().is<ArrayBufferObject>());
+    return true;
+}
+
+bool
 js::intrinsic_IsTypedArray(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
@@ -682,6 +696,27 @@
 }
 
 bool
+js::intrinsic_IsPossiblyWrappedTypedArray(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    MOZ_ASSERT(args.length() == 1);
+
+    bool isTypedArray = false;
+    if (args[0].isObject()) {
+        JSObject* obj = CheckedUnwrap(&args[0].toObject());
+        if (!obj) {
+            JS_ReportError(cx, "Permission denied to access object");
+            return false;
+        }
+
+        isTypedArray = obj->is<TypedArrayObject>();
+    }
+
+    args.rval().setBoolean(isTypedArray);
+    return true;
+}
+
+bool
 js::intrinsic_TypedArrayBuffer(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
@@ -779,7 +814,362 @@
 #endif
 
     uint8_t* data = static_cast<uint8_t*>(tarray->viewData());
-    mozilla::PodMove(&data[byteDest], &data[byteSrc], byteSize);
+    PodMove(&data[byteDest], &data[byteSrc], byteSize);
+
+    args.rval().setUndefined();
+    return true;
+}
+
+// Extract the TypedArrayObject* underlying |obj| and return it.  This method,
+// in a TOTALLY UNSAFE manner, completely violates the normal compartment
+// boundaries, returning an object not necessarily in the current compartment
+// or in |obj|'s compartment.
+//
+// All callers of this method are expected to sigil this TypedArrayObject*, and
+// all values and information derived from it, with an "unsafe" prefix, to
+// indicate the extreme caution required when dealing with such values.
+//
+// If calling code discipline ever fails to be maintained, it's gonna have a
+// bad time.
+static TypedArrayObject*
+DangerouslyUnwrapTypedArray(JSContext* cx, JSObject* obj)
+{
+    // An unwrapped pointer to an object potentially on the other side of a
+    // compartment boundary!  Isn't this such fun?
+    JSObject* unwrapped = CheckedUnwrap(obj);
+    if (!unwrapped->is<TypedArrayObject>()) {
+        // By *appearances* this can't happen, as self-hosted TypedArraySet
+        // checked this.  But.  Who's to say a GC couldn't happen between
+        // the check that this value was a typed array, and this extraction
+        // occurring?  A GC might turn a cross-compartment wrapper |obj| into
+        // |unwrapped == obj|, a dead object no longer connected its typed
+        // array.
+        //
+        // Yeah, yeah, it's pretty unlikely.  Are you willing to stake a
+        // sec-critical bug on that assessment, now and forever, against
+        // all changes those pesky GC and JIT people might make?
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+        return nullptr;
+    }
+
+    // Be super-duper careful using this, as we've just punched through
+    // the compartment boundary, and things like buffer() on this aren't
+    // same-compartment with anything else in the calling method.
+    return &unwrapped->as<TypedArrayObject>();
+}
+
+// ES6 draft 20150403 22.2.3.22.2, steps 12-24, 29.
+bool
+js::intrinsic_SetFromTypedArrayApproach(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    MOZ_ASSERT(args.length() == 4);
+
+    Rooted<TypedArrayObject*> target(cx, &args[0].toObject().as<TypedArrayObject>());
+    MOZ_ASSERT(!target->hasBuffer() || !target->buffer()->isNeutered(),
+               "something should have defended against a neutered target");
+
+    // As directed by |DangerouslyUnwrapTypedArray|, sigil this pointer and all
+    // variables derived from it to counsel extreme caution here.
+    Rooted<TypedArrayObject*> unsafeTypedArrayCrossCompartment(cx);
+    unsafeTypedArrayCrossCompartment = DangerouslyUnwrapTypedArray(cx, &args[1].toObject());
+    if (!unsafeTypedArrayCrossCompartment)
+        return false;
+
+    double doubleTargetOffset = args[2].toNumber();
+    MOZ_ASSERT(doubleTargetOffset >= 0, "caller failed to ensure |targetOffset >= 0|");
+
+    uint32_t targetLength = uint32_t(args[3].toInt32());
+
+    // Handle all checks preceding the actual element-setting.  A visual skim
+    // of 22.2.3.22.2 should confirm these are the only steps after steps 1-11
+    // that might abort processing (other than for reason of internal error.)
+
+    // Steps 12-13.
+    if (unsafeTypedArrayCrossCompartment->hasBuffer() &&
+        unsafeTypedArrayCrossCompartment->buffer()->isNeutered())
+    {
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_DETACHED);
+        return false;
+    }
+
+    // Steps 21, 23.
+    uint32_t unsafeSrcLengthCrossCompartment = unsafeTypedArrayCrossCompartment->length();
+    if (unsafeSrcLengthCrossCompartment + doubleTargetOffset > targetLength) {
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_INDEX);
+        return false;
+    }
+
+    // Now that that's confirmed, we can use |targetOffset| of a sane type.
+    uint32_t targetOffset = uint32_t(doubleTargetOffset);
+
+    // The remaining steps are unobservable *except* through their effect on
+    // which elements are copied and how.
+
+    Scalar::Type targetType = target->type();
+    Scalar::Type unsafeSrcTypeCrossCompartment = unsafeTypedArrayCrossCompartment->type();
+
+    size_t targetElementSize = TypedArrayElemSize(targetType);
+    uint8_t* targetData =
+        static_cast<uint8_t*>(target->viewData()) + targetOffset * targetElementSize;
+
+    uint8_t* unsafeSrcDataCrossCompartment =
+        static_cast<uint8_t*>(unsafeTypedArrayCrossCompartment->viewData());
+
+    uint32_t unsafeSrcElementSizeCrossCompartment =
+        TypedArrayElemSize(unsafeSrcTypeCrossCompartment);
+    uint32_t unsafeSrcByteLengthCrossCompartment =
+        unsafeSrcLengthCrossCompartment * unsafeSrcElementSizeCrossCompartment;
+
+    // Step 29.
+    //
+    // The same-type case requires exact copying preserving the bit-level
+    // encoding of the source data, so move the values.  (We could PodCopy if
+    // we knew the buffers differed, but it's doubtful the work to check
+    // wouldn't swap any minor wins PodCopy would afford.  Because of the
+    // TOTALLY UNSAFE CROSS-COMPARTMENT NONSENSE here, comparing buffer
+    // pointers directly could give an incorrect answer.)  If this occurs,
+    // the %TypedArray%.prototype.set operation is completely finished.
+    if (targetType == unsafeSrcTypeCrossCompartment) {
+        PodMove(targetData, unsafeSrcDataCrossCompartment, unsafeSrcByteLengthCrossCompartment);
+        args.rval().setInt32(JS_SETTYPEDARRAY_SAME_TYPE);
+        return true;
+    }
+
+    // Every other bit of element-copying is handled by step 28.  Indicate
+    // whether such copying must take care not to overlap, so that self-hosted
+    // code may correctly perform the copying.
+
+    uint8_t* unsafeSrcDataLimitCrossCompartment =
+        unsafeSrcDataCrossCompartment + unsafeSrcByteLengthCrossCompartment;
+    uint8_t* targetDataLimit =
+        static_cast<uint8_t*>(target->viewData()) + targetLength * targetElementSize;
+
+    // Step 24 test (but not steps 24a-d -- the caller handles those).
+    bool overlap =
+        IsInRange(targetData, unsafeSrcDataCrossCompartment, unsafeSrcDataLimitCrossCompartment) ||
+        IsInRange(unsafeSrcDataCrossCompartment, targetData, targetDataLimit);
+
+    args.rval().setInt32(overlap ? JS_SETTYPEDARRAY_OVERLAPPING : JS_SETTYPEDARRAY_DISJOINT);
+    return true;
+}
+
+template <typename From, typename To>
+static void
+CopyValues(To* dest, const From* src, uint32_t count)
+{
+#ifdef DEBUG
+    void* destVoid = static_cast<void*>(dest);
+    void* destVoidEnd = static_cast<void*>(dest + count);
+    const void* srcVoid = static_cast<const void*>(src);
+    const void* srcVoidEnd = static_cast<const void*>(src + count);
+    MOZ_ASSERT(!IsInRange(destVoid, srcVoid, srcVoidEnd));
+    MOZ_ASSERT(!IsInRange(srcVoid, destVoid, destVoidEnd));
+#endif
+
+    for (; count > 0; count--)
+        *dest++ = To(*src++);
+}
+
+struct DisjointElements
+{
+    template <typename To>
+    static void
+    copy(To* dest, const void* src, Scalar::Type fromType, uint32_t count) {
+        switch (fromType) {
+          case Scalar::Int8:
+            CopyValues(dest, static_cast<const int8_t*>(src), count);
+            return;
+
+          case Scalar::Uint8:
+            CopyValues(dest, static_cast<const uint8_t*>(src), count);
+            return;
+
+          case Scalar::Int16:
+            CopyValues(dest, static_cast<const int16_t*>(src), count);
+            return;
+
+          case Scalar::Uint16:
+            CopyValues(dest, static_cast<const uint16_t*>(src), count);
+            return;
+
+          case Scalar::Int32:
+            CopyValues(dest, static_cast<const int32_t*>(src), count);
+            return;
+
+          case Scalar::Uint32:
+            CopyValues(dest, static_cast<const uint32_t*>(src), count);
+            return;
+
+          case Scalar::Float32:
+            CopyValues(dest, static_cast<const float*>(src), count);
+            return;
+
+          case Scalar::Float64:
+            CopyValues(dest, static_cast<const double*>(src), count);
+            return;
+
+          case Scalar::Uint8Clamped:
+            CopyValues(dest, static_cast<const uint8_clamped*>(src), count);
+            return;
+
+          default:
+            MOZ_CRASH("NonoverlappingSet with bogus from-type");
+        }
+    }
+};
+
+static void
+CopyToDisjointArray(TypedArrayObject* target, uint32_t targetOffset, const void* src,
+                    Scalar::Type srcType, uint32_t count)
+{
+    Scalar::Type destType = target->type();
+    void* dest =
+        static_cast<uint8_t*>(target->viewData()) + targetOffset * TypedArrayElemSize(destType);
+
+    switch (destType) {
+      case Scalar::Int8: {
+        int8_t* dst = reinterpret_cast<int8_t*>(dest);
+        DisjointElements::copy(dst, src, srcType, count);
+        break;
+      }
+
+      case Scalar::Uint8: {
+        uint8_t* dst = reinterpret_cast<uint8_t*>(dest);
+        DisjointElements::copy(dst, src, srcType, count);
+        break;
+      }
+
+      case Scalar::Int16: {
+        int16_t* dst = reinterpret_cast<int16_t*>(dest);
+        DisjointElements::copy(dst, src, srcType, count);
+        break;
+      }
+
+      case Scalar::Uint16: {
+        uint16_t* dst = reinterpret_cast<uint16_t*>(dest);
+        DisjointElements::copy(dst, src, srcType, count);
+        break;
+      }
+
+      case Scalar::Int32: {
+        int32_t* dst = reinterpret_cast<int32_t*>(dest);
+        DisjointElements::copy(dst, src, srcType, count);
+        break;
+      }
+
+      case Scalar::Uint32: {
+        uint32_t* dst = reinterpret_cast<uint32_t*>(dest);
+        DisjointElements::copy(dst, src, srcType, count);
+        break;
+      }
+
+      case Scalar::Float32: {
+        float* dst = reinterpret_cast<float*>(dest);
+        DisjointElements::copy(dst, src, srcType, count);
+        break;
+      }
+
+      case Scalar::Float64: {
+        double* dst = reinterpret_cast<double*>(dest);
+        DisjointElements::copy(dst, src, srcType, count);
+        break;
+      }
+
+      case Scalar::Uint8Clamped: {
+        uint8_clamped* dst = reinterpret_cast<uint8_clamped*>(dest);
+        DisjointElements::copy(dst, src, srcType, count);
+        break;
+      }
+
+      default:
+        MOZ_CRASH("setFromAnyTypedArray with a typed array with bogus type");
+    }
+}
+
+// |unsafeSrcCrossCompartment| is produced by |DangerouslyUnwrapTypedArray|,
+// counseling extreme caution when using it.  As directed by
+// |DangerouslyUnwrapTypedArray|, sigil this pointer and all variables derived
+// from it to counsel extreme caution here.
+void
+js::SetDisjointTypedElements(TypedArrayObject* target, uint32_t targetOffset,
+                             TypedArrayObject* unsafeSrcCrossCompartment)
+{
+    Scalar::Type unsafeSrcTypeCrossCompartment = unsafeSrcCrossCompartment->type();
+
+    const void* unsafeSrcDataCrossCompartment = unsafeSrcCrossCompartment->viewData();
+    uint32_t count = unsafeSrcCrossCompartment->length();
+
+    CopyToDisjointArray(target, targetOffset,
+                        unsafeSrcDataCrossCompartment, unsafeSrcTypeCrossCompartment, count);
+}
+
+bool
+js::intrinsic_SetDisjointTypedElements(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    MOZ_ASSERT(args.length() == 3);
+
+    Rooted<TypedArrayObject*> target(cx, &args[0].toObject().as<TypedArrayObject>());
+    MOZ_ASSERT(!target->hasBuffer() || !target->buffer()->isNeutered(),
+               "a neutered typed array has no elements to set, so "
+               "it's nonsensical to be setting them");
+
+    uint32_t targetOffset = uint32_t(args[1].toInt32());
+
+    // As directed by |DangerouslyUnwrapTypedArray|, sigil this pointer and all
+    // variables derived from it to counsel extreme caution here.
+    Rooted<TypedArrayObject*> unsafeSrcCrossCompartment(cx);
+    unsafeSrcCrossCompartment = DangerouslyUnwrapTypedArray(cx, &args[2].toObject());
+    if (!unsafeSrcCrossCompartment)
+        return false;
+
+    SetDisjointTypedElements(target, targetOffset, unsafeSrcCrossCompartment);
+
+    args.rval().setUndefined();
+    return true;
+}
+
+bool
+js::intrinsic_SetOverlappingTypedElements(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    MOZ_ASSERT(args.length() == 3);
+
+    Rooted<TypedArrayObject*> target(cx, &args[0].toObject().as<TypedArrayObject>());
+    MOZ_ASSERT(!target->hasBuffer() || !target->buffer()->isNeutered(),
+               "shouldn't be setting elements if neutered");
+
+    uint32_t targetOffset = uint32_t(args[1].toInt32());
+
+    // As directed by |DangerouslyUnwrapTypedArray|, sigil this pointer and all
+    // variables derived from it to counsel extreme caution here.
+    Rooted<TypedArrayObject*> unsafeSrcCrossCompartment(cx);
+    unsafeSrcCrossCompartment = DangerouslyUnwrapTypedArray(cx, &args[2].toObject());
+    if (!unsafeSrcCrossCompartment)
+        return false;
+
+    // Smarter algorithms exist to perform overlapping transfers of the sort
+    // this method performs (for example, v8's self-hosted implementation).
+    // But it seems likely deliberate overlapping transfers are rare enough
+    // that it's not worth the trouble to implement one (and worry about its
+    // safety/correctness!).  Make a copy and do a disjoint set from that.
+    uint32_t count = unsafeSrcCrossCompartment->length();
+    Scalar::Type unsafeSrcTypeCrossCompartment = unsafeSrcCrossCompartment->type();
+    size_t sourceByteLen = count * TypedArrayElemSize(unsafeSrcTypeCrossCompartment);
+
+    const void* unsafeSrcDataCrossCompartment = unsafeSrcCrossCompartment->viewData();
+
+    auto copyOfSrcData = target->zone()->make_pod_array<uint8_t>(sourceByteLen);
+    if (!copyOfSrcData)
+        return false;
+
+    mozilla::PodCopy(copyOfSrcData.get(),
+                     static_cast<const uint8_t*>(unsafeSrcDataCrossCompartment),
+                     sourceByteLen);
+
+    CopyToDisjointArray(target, targetOffset, copyOfSrcData.get(),
+                        unsafeSrcTypeCrossCompartment, count);
 
     args.rval().setUndefined();
     return true;
@@ -1022,13 +1412,19 @@
     JS_FN("GeneratorIsRunning",      intrinsic_GeneratorIsRunning,      1,0),
     JS_FN("GeneratorSetClosed",      intrinsic_GeneratorSetClosed,      1,0),
 
+    JS_FN("IsArrayBuffer",           intrinsic_IsArrayBuffer,           1,0),
+
     JS_FN("IsTypedArray",            intrinsic_IsTypedArray,            1,0),
+    JS_FN("IsPossiblyWrappedTypedArray",intrinsic_IsPossiblyWrappedTypedArray,1,0),
     JS_FN("TypedArrayBuffer",        intrinsic_TypedArrayBuffer,        1,0),
     JS_FN("TypedArrayByteOffset",    intrinsic_TypedArrayByteOffset,    1,0),
     JS_FN("TypedArrayElementShift",  intrinsic_TypedArrayElementShift,  1,0),
     JS_FN("TypedArrayLength",        intrinsic_TypedArrayLength,        1,0),
 
     JS_FN("MoveTypedArrayElements",  intrinsic_MoveTypedArrayElements,  4,0),
+    JS_FN("SetFromTypedArrayApproach",intrinsic_SetFromTypedArrayApproach, 4, 0),
+    JS_FN("SetDisjointTypedElements",intrinsic_SetDisjointTypedElements,3,0),
+    JS_FN("SetOverlappingTypedElements",intrinsic_SetOverlappingTypedElements,3,0),
 
     JS_FN("CallTypedArrayMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<TypedArrayObject>>, 2, 0),
@@ -1146,7 +1542,7 @@
         "self-hosting-global", JSCLASS_GLOBAL_FLAGS,
         nullptr, nullptr, nullptr, nullptr,
         nullptr, nullptr, nullptr, nullptr,
-        nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr,
         JS_GlobalObjectTraceHook
     };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Shape.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Shape.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Shape.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Shape.h	2015-04-24 19:31:12.000000000 +0000
@@ -110,7 +110,6 @@
 namespace js {
 
 class Bindings;
-class Debugger;
 class Nursery;
 class StaticBlockObject;
 
@@ -971,7 +970,7 @@
     inline Shape* searchLinear(jsid id);
 
     void fixupAfterMovingGC();
-    void fixupGetterSetterForBarrier(JSTracer *trc);
+    void fixupGetterSetterForBarrier(JSTracer* trc);
 
     /* For JIT usage */
     static inline size_t offsetOfBase() { return offsetof(Shape, base_); }
@@ -1253,14 +1252,14 @@
 {
     MOZ_ASSERT(shape);
     if (shape->hasGetterObject()) {
-        gc::StoreBuffer *sb = reinterpret_cast<gc::Cell*>(shape->getterObject())->storeBuffer();
+        gc::StoreBuffer* sb = reinterpret_cast<gc::Cell*>(shape->getterObject())->storeBuffer();
         if (sb) {
             sb->putGeneric(ShapeGetterSetterRef(shape));
             return;
         }
     }
     if (shape->hasSetterObject()) {
-        gc::StoreBuffer *sb = reinterpret_cast<gc::Cell*>(shape->setterObject())->storeBuffer();
+        gc::StoreBuffer* sb = reinterpret_cast<gc::Cell*>(shape->setterObject())->storeBuffer();
         if (sb) {
             sb->putGeneric(ShapeGetterSetterRef(shape));
             return;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/SharedArrayObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/SharedArrayObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/SharedArrayObject.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/SharedArrayObject.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -313,6 +313,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     SharedArrayBufferObject::Finalize,
     nullptr, /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/SharedTypedArrayObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/SharedTypedArrayObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/SharedTypedArrayObject.cpp	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/SharedTypedArrayObject.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -711,6 +711,7 @@
     nullptr,                 /* setProperty */                                 \
     nullptr,                 /* enumerate   */                                 \
     nullptr,                 /* resolve     */                                 \
+    nullptr,                 /* mayResolve  */                                 \
     nullptr,                 /* convert     */                                 \
     nullptr,                 /* finalize    */                                 \
     nullptr,                 /* call        */                                 \
@@ -732,6 +733,7 @@
     nullptr,                 /* setProperty */                                 \
     nullptr,                 /* enumerate   */                                 \
     nullptr,                 /* resolve     */                                 \
+    nullptr,                 /* mayResolve  */                                 \
     nullptr,                 /* convert     */                                 \
     nullptr,                 /* finalize    */                                 \
     nullptr,                 /* call        */                                 \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Stack.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Stack.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Stack.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Stack.h	2015-04-24 19:31:12.000000000 +0000
@@ -28,7 +28,6 @@
 class InterpreterRegs;
 class CallObject;
 class ScopeObject;
-class ClonedBlockObject;
 class ScriptFrameIter;
 class SPSProfiler;
 class InterpreterFrame;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/String.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/String.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/String.cpp	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/String.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/TypeTraits.h"
 
 #include "gc/Marking.h"
+#include "js/UbiNode.h"
 
 #include "jscntxtinlines.h"
 #include "jscompartmentinlines.h"
@@ -66,6 +67,23 @@
            : mallocSizeOf(flat.rawTwoByteChars());
 }
 
+size_t
+JS::ubi::Concrete<JSString>::size(mozilla::MallocSizeOf mallocSizeOf) const
+{
+    JSString &str = get();
+    size_t size = str.isFatInline() ? sizeof(JSFatInlineString) : sizeof(JSString);
+
+    // We can't use mallocSizeof on things in the nursery. At the moment,
+    // strings are never in the nursery, but that may change.
+    MOZ_ASSERT(!IsInsideNursery(&str));
+    size += str.sizeOfExcludingThis(mallocSizeOf);
+
+    return size;
+}
+
+template<> const char16_t JS::ubi::TracerConcrete<JSString>::concreteTypeName[] =
+    MOZ_UTF16("JSString");
+
 #ifdef DEBUG
 
 template <typename CharT>
@@ -809,14 +827,14 @@
     /* These strings never change, so barriers are not needed. */
 
     for (uint32_t i = 0; i < UNIT_STATIC_LIMIT; i++)
-        MarkPermanentAtom(trc, unitStaticTable[i], "unit-static-string");
+        TraceProcessGlobalRoot(trc, unitStaticTable[i], "unit-static-string");
 
     for (uint32_t i = 0; i < NUM_SMALL_CHARS * NUM_SMALL_CHARS; i++)
-        MarkPermanentAtom(trc, length2StaticTable[i], "length2-static-string");
+        TraceProcessGlobalRoot(trc, length2StaticTable[i], "length2-static-string");
 
     /* This may mark some strings more than once, but so be it. */
     for (uint32_t i = 0; i < INT_STATIC_LIMIT; i++)
-        MarkPermanentAtom(trc, intStaticTable[i], "int-static-string");
+        TraceProcessGlobalRoot(trc, intStaticTable[i], "int-static-string");
 }
 
 template <typename CharT>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/TypedArrayObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/TypedArrayObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/TypedArrayObject.cpp	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/TypedArrayObject.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -784,7 +784,11 @@
 /* static */ const JSFunctionSpec
 TypedArrayObject::protoFunctions[] = {
     JS_SELF_HOSTED_FN("subarray", "TypedArraySubarray", 2, 0),
+#if 0 /* disabled until perf-testing is completed */
+    JS_SELF_HOSTED_FN("set", "TypedArraySet", 2, 0),
+#else
     JS_FN("set", TypedArrayObject::set, 2, 0),
+#endif
     JS_SELF_HOSTED_FN("copyWithin", "TypedArrayCopyWithin", 3, 0),
     JS_SELF_HOSTED_FN("every", "TypedArrayEvery", 2, 0),
     JS_SELF_HOSTED_FN("fill", "TypedArrayFill", 3, 0),
@@ -835,6 +839,7 @@
     nullptr,                /* setProperty */
     nullptr,                /* enumerate */
     nullptr,                /* resolve */
+    nullptr,                /* mayResolve */
     nullptr,                /* convert */
     nullptr,                /* finalize */
     nullptr,                /* call */
@@ -1797,6 +1802,7 @@
     nullptr,                 /* setProperty */                                 \
     nullptr,                 /* enumerate   */                                 \
     nullptr,                 /* resolve     */                                 \
+    nullptr,                 /* mayResolve  */                                 \
     nullptr,                 /* convert     */                                 \
     nullptr,                 /* finalize    */                                 \
     nullptr,                 /* call        */                                 \
@@ -1842,6 +1848,7 @@
     nullptr, /* setProperty */ \
     nullptr, /* enumerate */ \
     nullptr, /* resolve */ \
+    nullptr, /* mayResolve */ \
     nullptr, /* convert */ \
     nullptr, /* finalize */ \
     nullptr, /* call */ \
@@ -1897,6 +1904,7 @@
     nullptr, /* setProperty */
     nullptr, /* enumerate */
     nullptr, /* resolve */
+    nullptr, /* mayResolve */
     nullptr, /* convert */
     nullptr, /* finalize */
     nullptr, /* call */
@@ -2107,8 +2115,8 @@
 
 /* ES6 draft rev 34 (2015 Feb 20) 9.4.5.3 [[DefineOwnProperty]] step 3.c. */
 bool
-js::DefineTypedArrayElement(JSContext *cx, HandleObject obj, uint64_t index,
-                            Handle<PropertyDescriptor> desc, ObjectOpResult &result)
+js::DefineTypedArrayElement(JSContext* cx, HandleObject obj, uint64_t index,
+                            Handle<PropertyDescriptor> desc, ObjectOpResult& result)
 {
     MOZ_ASSERT(IsAnyTypedArray(obj));
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/TypedArrayObject.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/TypedArrayObject.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/TypedArrayObject.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/TypedArrayObject.h	2015-04-24 19:31:12.000000000 +0000
@@ -47,12 +47,21 @@
 
     // Underlying (Shared)ArrayBufferObject.
     static const size_t BUFFER_SLOT = 0;
+    static_assert(BUFFER_SLOT == JS_TYPEDARRAYLAYOUT_BUFFER_SLOT,
+                  "self-hosted code with burned-in constants must get the "
+                  "right buffer slot");
 
     // Slot containing length of the view in number of typed elements.
     static const size_t LENGTH_SLOT = 1;
+    static_assert(LENGTH_SLOT == JS_TYPEDARRAYLAYOUT_LENGTH_SLOT,
+                  "self-hosted code with burned-in constants must get the "
+                  "right length slot");
 
     // Offset of view within underlying (Shared)ArrayBufferObject.
     static const size_t BYTEOFFSET_SLOT = 2;
+    static_assert(BYTEOFFSET_SLOT == JS_TYPEDARRAYLAYOUT_BYTEOFFSET_SLOT,
+                  "self-hosted code with burned-in constants must get the "
+                  "right byteOffset slot");
 
     static const size_t RESERVED_SLOTS = 3;
 
@@ -282,8 +291,8 @@
  * when the property key is a TypedArray index.
  */
 bool
-DefineTypedArrayElement(JSContext *cx, HandleObject arr, uint64_t index,
-                        Handle<PropertyDescriptor> desc, ObjectOpResult &result);
+DefineTypedArrayElement(JSContext* cx, HandleObject arr, uint64_t index,
+                        Handle<PropertyDescriptor> desc, ObjectOpResult& result);
 
 static inline unsigned
 TypedArrayShift(Scalar::Type viewType)
@@ -316,6 +325,19 @@
     return 1u << TypedArrayShift(viewType);
 }
 
+// Assign
+//
+//   target[targetOffset] = unsafeSrcCrossCompartment[0]
+//   ...
+//   target[targetOffset + unsafeSrcCrossCompartment.length - 1] =
+//       unsafeSrcCrossCompartment[unsafeSrcCrossCompartment.length - 1]
+//
+// where the source element range doesn't overlap the target element range in
+// memory.
+extern void
+SetDisjointTypedElements(TypedArrayObject* target, uint32_t targetOffset,
+                         TypedArrayObject* unsafeSrcCrossCompartment);
+
 extern JSObject*
 InitDataViewClass(JSContext* cx, HandleObject obj);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/UbiNode.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/UbiNode.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/UbiNode.cpp	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/UbiNode.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -228,8 +228,6 @@
     return Concrete::get().getClass()->name;
 }
 
-template<> const char16_t TracerConcrete<JSString>::concreteTypeName[] =
-    MOZ_UTF16("JSString");
 template<> const char16_t TracerConcrete<JS::Symbol>::concreteTypeName[] =
     MOZ_UTF16("JS::Symbol");
 template<> const char16_t TracerConcrete<JSScript>::concreteTypeName[] =
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/UnboxedObject.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/UnboxedObject.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/UnboxedObject.cpp	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/UnboxedObject.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -893,6 +893,7 @@
     nullptr,        /* setProperty */
     nullptr,        /* enumerate   */
     nullptr,        /* resolve     */
+    nullptr,        /* mayResolve  */
     nullptr,        /* convert     */
     nullptr,        /* finalize    */
     nullptr,        /* call        */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Unicode.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Unicode.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Unicode.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Unicode.h	2015-04-24 19:31:12.000000000 +0000
@@ -191,6 +191,12 @@
 inline char16_t
 ToUpperCase(char16_t ch)
 {
+    if (ch < 128) {
+        if (ch >= 'a' && ch <= 'z')
+            return ch - ('a' - 'A');
+        return ch;
+    }
+
     const CharacterInfo& info = CharInfo(ch);
 
     return uint16_t(ch) + info.upperCase;
@@ -199,11 +205,35 @@
 inline char16_t
 ToLowerCase(char16_t ch)
 {
+    if (ch < 128) {
+        if (ch >= 'A' && ch <= 'Z')
+            return ch + ('a' - 'A');
+        return ch;
+    }
+
     const CharacterInfo& info = CharInfo(ch);
 
     return uint16_t(ch) + info.lowerCase;
 }
 
+// Returns true iff ToUpperCase(ch) != ch.
+inline bool
+CanUpperCase(char16_t ch)
+{
+    if (ch < 128)
+        return ch >= 'a' && ch <= 'z';
+    return CharInfo(ch).upperCase != 0;
+}
+
+// Returns true iff ToLowerCase(ch) != ch.
+inline bool
+CanLowerCase(char16_t ch)
+{
+    if (ch < 128)
+        return ch >= 'A' && ch <= 'Z';
+    return CharInfo(ch).lowerCase != 0;
+}
+
 } /* namespace unicode */
 } /* namespace js */
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Xdr.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Xdr.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/src/vm/Xdr.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/src/vm/Xdr.h	2015-04-24 19:31:12.000000000 +0000
@@ -29,11 +29,11 @@
  *
  *  https://developer.mozilla.org/en-US/docs/SpiderMonkey/Internals/Bytecode
  */
-static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 278;
+static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 280;
 static const uint32_t XDR_BYTECODE_VERSION =
     uint32_t(0xb973c0de - XDR_BYTECODE_VERSION_SUBTRAHEND);
 
-static_assert(JSErr_Limit == 393,
+static_assert(JSErr_Limit == 392,
               "GREETINGS, POTENTIAL SUBTRAHEND INCREMENTER! If you added or "
               "removed MSG_DEFs from js.msg, you should increment "
               "XDR_BYTECODE_VERSION_SUBTRAHEND and update this assertion's "
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/loader/mozJSLoaderUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/loader/mozJSLoaderUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/loader/mozJSLoaderUtils.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/loader/mozJSLoaderUtils.h	2015-04-24 19:31:12.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "nsString.h"
 
-class nsIURI;
 namespace mozilla {
 namespace scache {
 class StartupCache;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/public/nsAXPCNativeCallContext.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/public/nsAXPCNativeCallContext.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/public/nsAXPCNativeCallContext.h	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/public/nsAXPCNativeCallContext.h	2015-04-24 19:31:12.000000000 +0000
@@ -7,8 +7,6 @@
 #ifndef nsAXPCNativeCallContext_h__
 #define nsAXPCNativeCallContext_h__
 
-class nsIXPConnectWrappedNative;
-
 /**
 * A native call context is allocated on the stack when XPConnect calls a
 * native method. Holding a pointer to this object beyond the currently
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/Sandbox.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/Sandbox.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/Sandbox.cpp	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/Sandbox.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -468,7 +468,9 @@
     "Sandbox",
     XPCONNECT_GLOBAL_FLAGS_WITH_EXTRA_SLOTS(1),
     nullptr, nullptr, nullptr, nullptr,
-    sandbox_enumerate, sandbox_resolve, sandbox_convert,  sandbox_finalize,
+    sandbox_enumerate, sandbox_resolve,
+    nullptr,        /* mayResolve */
+    sandbox_convert,  sandbox_finalize,
     nullptr, nullptr, nullptr, JS_GlobalObjectTraceHook,
     JS_NULL_CLASS_SPEC,
     {
@@ -487,7 +489,9 @@
     "Sandbox",
     XPCONNECT_GLOBAL_FLAGS_WITH_EXTRA_SLOTS(1),
     sandbox_addProperty, nullptr, nullptr, nullptr,
-    sandbox_enumerate, sandbox_resolve, sandbox_convert,  sandbox_finalize,
+    sandbox_enumerate, sandbox_resolve,
+    nullptr,        /* mayResolve */
+    sandbox_convert,  sandbox_finalize,
     nullptr, nullptr, nullptr, JS_GlobalObjectTraceHook,
     JS_NULL_CLASS_SPEC,
     {
@@ -885,6 +889,8 @@
     JS::CompartmentOptions compartmentOptions;
     if (options.sameZoneAs)
         compartmentOptions.setSameZoneAs(js::UncheckedUnwrap(options.sameZoneAs));
+    else if (options.freshZone)
+        compartmentOptions.setZone(JS::FreshZone);
     else
         compartmentOptions.setZone(JS::SystemZone);
 
@@ -1360,18 +1366,28 @@
 bool
 SandboxOptions::Parse()
 {
-    return ParseObject("sandboxPrototype", &proto) &&
-           ParseBoolean("wantXrays", &wantXrays) &&
-           ParseBoolean("wantComponents", &wantComponents) &&
-           ParseBoolean("wantExportHelpers", &wantExportHelpers) &&
-           ParseString("sandboxName", sandboxName) &&
-           ParseObject("sameZoneAs", &sameZoneAs) &&
-           ParseBoolean("invisibleToDebugger", &invisibleToDebugger) &&
-           ParseBoolean("discardSource", &discardSource) &&
-           ParseJSString("addonId", &addonId) &&
-           ParseBoolean("writeToGlobalPrototype", &writeToGlobalPrototype) &&
-           ParseGlobalProperties() &&
-           ParseValue("metadata", &metadata);
+    bool ok = ParseObject("sandboxPrototype", &proto) &&
+              ParseBoolean("wantXrays", &wantXrays) &&
+              ParseBoolean("wantComponents", &wantComponents) &&
+              ParseBoolean("wantExportHelpers", &wantExportHelpers) &&
+              ParseString("sandboxName", sandboxName) &&
+              ParseObject("sameZoneAs", &sameZoneAs) &&
+              ParseBoolean("freshZone", &freshZone) &&
+              ParseBoolean("invisibleToDebugger", &invisibleToDebugger) &&
+              ParseBoolean("discardSource", &discardSource) &&
+              ParseJSString("addonId", &addonId) &&
+              ParseBoolean("writeToGlobalPrototype", &writeToGlobalPrototype) &&
+              ParseGlobalProperties() &&
+              ParseValue("metadata", &metadata);
+    if (!ok)
+        return false;
+
+    if (freshZone && sameZoneAs) {
+        JS_ReportError(mCx, "Cannot use both sameZoneAs and freshZone");
+        return false;
+    }
+
+    return true;
 }
 
 static nsresult
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCConvert.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCConvert.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCConvert.cpp	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCConvert.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -565,7 +565,7 @@
         if (length == size_t(-1)) {
             return false;
         }
-        char* buffer = static_cast<char *>(moz_xmalloc(length + 1));
+        char* buffer = static_cast<char*>(moz_xmalloc(length + 1));
         if (!buffer) {
             return false;
         }
@@ -1721,7 +1721,7 @@
                 len = count;
 
             uint32_t alloc_len = (len + 1) * sizeof(char);
-            char* buffer = static_cast<char *>(moz_xmalloc(alloc_len));
+            char* buffer = static_cast<char*>(moz_xmalloc(alloc_len));
             if (!buffer) {
                 return false;
             }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCJSRuntime.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCJSRuntime.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCJSRuntime.cpp	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCJSRuntime.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -521,6 +521,8 @@
     CompartmentPrivate* priv = CompartmentPrivate::Get(compartment);
     if (!priv)
         return true;
+    if (priv->universalXPConnectEnabled)
+        return true;
     priv->universalXPConnectEnabled = true;
 
     // Recompute all the cross-compartment wrappers leaving the newly-privileged
@@ -3388,7 +3390,7 @@
     // Windows PGO stack frames have unfortunately gotten pretty large lately. :-(
     const size_t kStackQuota = 900 * 1024;
     const size_t kTrustedScriptBuffer = (sizeof(size_t) == 8) ? 140 * 1024
-                                                              : 80 * 1024;
+                                                              : 100 * 1024;
     // The following two configurations are linux-only. Given the numbers above,
     // we use 50k and 100k trusted buffers on 32-bit and 64-bit respectively.
 #elif defined(DEBUG)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/xpcprivate.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/xpcprivate.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/xpcprivate.h	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/xpcprivate.h	2015-04-24 19:31:12.000000000 +0000
@@ -3438,6 +3438,7 @@
         , addonId(cx)
         , writeToGlobalPrototype(false)
         , sameZoneAs(cx)
+        , freshZone(false)
         , invisibleToDebugger(false)
         , discardSource(false)
         , metadata(cx)
@@ -3453,6 +3454,7 @@
     JS::RootedString addonId;
     bool writeToGlobalPrototype;
     JS::RootedObject sameZoneAs;
+    bool freshZone;
     bool invisibleToDebugger;
     bool discardSource;
     GlobalProperties globalProperties;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCWrappedJSClass.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCWrappedJSClass.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCWrappedJSClass.cpp	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCWrappedJSClass.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -1456,6 +1456,7 @@
     nullptr,   /* setProperty */
     nullptr,   /* enumerate */
     nullptr,   /* resolve */
+    nullptr,   /* mayResolve */
     nullptr,   /* convert */
     FinalizeStub,
     nullptr,   /* call */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCWrappedNativeJSOps.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCWrappedNativeJSOps.cpp	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCWrappedNativeJSOps.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -648,6 +648,7 @@
 
     XPC_WN_Shared_Enumerate,           // enumerate
     XPC_WN_NoHelper_Resolve,           // resolve
+    nullptr,                           // mayResolve
     XPC_WN_Shared_Convert,             // convert
     XPC_WN_NoHelper_Finalize,          // finalize
 
@@ -1288,6 +1289,7 @@
     nullptr,                        // setProperty;
     XPC_WN_Shared_Proto_Enumerate,  // enumerate;
     XPC_WN_ModsAllowed_Proto_Resolve, // resolve;
+    nullptr,                        // mayResolve;
     nullptr,                        // convert;
     XPC_WN_Shared_Proto_Finalize,   // finalize;
 
@@ -1313,6 +1315,7 @@
     nullptr,                        // setProperty;
     XPC_WN_Shared_Proto_Enumerate,  // enumerate;
     XPC_WN_ModsAllowed_Proto_Resolve, // resolve;
+    nullptr,                        // mayResolve;
     nullptr,                        // convert;
     XPC_WN_Shared_Proto_Finalize,   // finalize;
 
@@ -1391,6 +1394,7 @@
     nullptr,                                   // setProperty;
     XPC_WN_Shared_Proto_Enumerate,             // enumerate;
     XPC_WN_NoMods_Proto_Resolve,               // resolve;
+    nullptr,                                   // mayResolve;
     nullptr,                                   // convert;
     XPC_WN_Shared_Proto_Finalize,              // finalize;
 
@@ -1416,6 +1420,7 @@
     nullptr,                                   // setProperty;
     XPC_WN_Shared_Proto_Enumerate,             // enumerate;
     XPC_WN_NoMods_Proto_Resolve,               // resolve;
+    nullptr,                                   // mayResolve;
     nullptr,                                   // convert;
     XPC_WN_Shared_Proto_Finalize,              // finalize;
 
@@ -1511,6 +1516,7 @@
     nullptr,                                   // setProperty;
     XPC_WN_TearOff_Enumerate,                  // enumerate;
     XPC_WN_TearOff_Resolve,                    // resolve;
+    nullptr,                                   // mayResolve;
     XPC_WN_Shared_Convert,                     // convert;
     XPC_WN_TearOff_Finalize,                   // finalize;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCWrappedNativeScope.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCWrappedNativeScope.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCWrappedNativeScope.cpp	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCWrappedNativeScope.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -197,9 +197,16 @@
     RootedObject global(aCx, GetGlobalJSObject());
     MOZ_ASSERT(js::IsObjectInContextCompartment(global, aCx));
 
+    // The global Components property is non-configurable if it's a full
+    // nsXPCComponents object. That way, if it's an nsXPCComponentsBase,
+    // enableUniversalXPConnect can upgrade it later.
+    unsigned attrs = JSPROP_READONLY;
+    nsCOMPtr<nsIXPCComponents> c = do_QueryInterface(mComponents);
+    if (c)
+        attrs |= JSPROP_PERMANENT;
+
     RootedId id(aCx, XPCJSRuntime::Get()->GetStringID(XPCJSRuntime::IDX_COMPONENTS));
-    return JS_DefinePropertyById(aCx, global, id, components,
-                                 JSPROP_PERMANENT | JSPROP_READONLY);
+    return JS_DefinePropertyById(aCx, global, id, components, attrs);
 }
 
 static bool
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCWrapper.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCWrapper.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/src/XPCWrapper.h	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/src/XPCWrapper.h	2015-04-24 19:31:12.000000000 +0000
@@ -10,8 +10,6 @@
 #include "xpcprivate.h"
 #include "jswrapper.h"
 
-class nsIScriptSecurityManager;
-
 namespace XPCNativeWrapper {
 
 // Given an XPCWrappedNative pointer and the name of the function on
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/chrome/chrome.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/chrome/chrome.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/chrome/chrome.ini	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/chrome/chrome.ini	2015-04-24 19:31:12.000000000 +0000
@@ -92,6 +92,7 @@
 [test_localstorage_with_nsEp.xul]
 [test_matches.xul]
 [test_nodelists.xul]
+[test_onGarbageCollection.html]
 [test_paris_weakmap_keys.xul]
 [test_precisegc.xul]
 [test_sandboxImport.xul]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/chrome/test_onGarbageCollection.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/chrome/test_onGarbageCollection.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/chrome/test_onGarbageCollection.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/chrome/test_onGarbageCollection.html	2015-04-24 19:31:12.000000000 +0000
@@ -0,0 +1,35 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Bug 1150253 - Sanity test for the SpiderMonkey Debugger API's onGarbageCollection hook</title>
+    <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js">
+    </script>
+  </head>
+  <body xmlns="http://www.w3.org/1999/xhtml">
+    <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1150253"
+       target="_blank">Mozilla Bug 1150253</a>
+
+    <script type="application/javascript">
+    SimpleTest.waitForExplicitFinish();
+    const Cu = Components.utils;
+
+    Cu.import("resource://gre/modules/devtools/Loader.jsm");
+    const require = devtools.require;
+
+    const { gc } = Cu.getJSTestingFunctions();
+
+    const Debugger = require("Debugger");
+    const dbg = new Debugger(this);
+
+    dbg.memory.onGarbageCollection = function (data) {
+      // Don't keep calling this hook after we finish.
+      dbg.enabled = false;
+
+      ok(data, "The onGarbageCollection hook was fired.");
+      SimpleTest.finish();
+    };
+
+    gc();
+    </script>
+  </body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul	2015-04-24 19:31:12.000000000 +0000
@@ -498,13 +498,16 @@
        "Underlying object has getter");
     is(trickyObject.nonConfigurableGetterSetterProp, undefined,
        "Filtering properly over Xray here too");
+    is((trickyObject.nonConfigurableGetterSetterProp = 'redefined'), 'redefined',
+       "Assigning to non-configurable prop should fail silently in non-strict mode");
     checkThrows(function() {
-	trickyObject.nonConfigurableGetterSetterProp = 'redefined';
-    }, /config/, "Should throw when redefining non-configurable prop");
+      "use strict";
+      trickyObject.nonConfigurableGetterSetterProp = 'redefined';
+    }, /config/, "Should throw when redefining non-configurable prop in strict mode");
     is(trickyObject.nonConfigurableGetterSetterProp, undefined,
-       "Redefinition should have thrown");
+       "Redefinition should have failed");
     is(trickyObject.wrappedJSObject.nonConfigurableGetterSetterProp, 5,
-       "Redefinition really should have thrown");
+       "Redefinition really should have failed");
 
     checkThrows(function() { trickyObject.hasOwnProperty = 33; }, /shadow/,
                 "Should reject shadowing of pre-existing inherited properties over Xrays");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/head_ongc.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/head_ongc.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/head_ongc.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/head_ongc.js	2015-04-24 19:31:12.000000000 +0000
@@ -0,0 +1,41 @@
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/jsdebugger.jsm");
+
+const testingFunctions = Cu.getJSTestingFunctions();
+const systemPrincipal = Cc["@mozilla.org/systemprincipal;1"].createInstance(Ci.nsIPrincipal);
+
+function addTestingFunctionsToGlobal(global) {
+  for (let k in testingFunctions) {
+    global[k] = testingFunctions[k];
+  }
+  global.print = do_print;
+  global.newGlobal = newGlobal;
+  addDebuggerToGlobal(global);
+}
+
+function newGlobal() {
+  const global = new Cu.Sandbox(systemPrincipal, { freshZone: true });
+  addTestingFunctionsToGlobal(global);
+  return global;
+}
+
+addTestingFunctionsToGlobal(this);
+
+function executeSoon(f) {
+  Services.tm.mainThread.dispatch({ run: f },
+                                  Ci.nsIThread.DISPATCH_NORMAL);
+}
+
+// The onGarbageCollection tests don't play well gczeal settings and lead to
+// intermittents.
+if (typeof gczeal == "function") {
+  gczeal(0);
+}
+
+// Make sure to GC before we start the test, so that no zones are scheduled for
+// GC before we start testing onGarbageCollection hooks.
+gc();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-01.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-01.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-01.js	2015-04-24 19:31:12.000000000 +0000
@@ -0,0 +1,64 @@
+// Test basic usage of onGarbageCollection
+
+const root = newGlobal();
+const dbg = new Debugger();
+const wrappedRoot = dbg.addDebuggee(root)
+
+const NUM_SLICES = root.NUM_SLICES = 10;
+
+let fired = false;
+let slicesFound = 0;
+
+dbg.memory.onGarbageCollection = data => {
+  fired = true;
+
+  print("Got onGarbageCollection: " + JSON.stringify(data, null, 2));
+
+  equal(typeof data.reason, "string");
+  equal(typeof data.nonincrementalReason == "string" || data.nonincrementalReason === null,
+        true);
+
+  let lastStartTimestamp = 0;
+  for (let i = 0; i < data.collections.length; i++) {
+    let slice = data.collections[i];
+
+    equal(slice.startTimestamp >= lastStartTimestamp, true);
+    equal(slice.startTimestamp <= slice.endTimestamp, true);
+
+    lastStartTimestamp = slice.startTimestamp;
+  }
+
+  equal(data.collections.length >= 1, true);
+  slicesFound += data.collections.length;
+}
+
+function run_test() {
+  do_test_pending();
+
+  root.eval(
+    `
+    this.allocs = [];
+
+    // GC slices
+    for (var i = 0; i < NUM_SLICES; i++) {
+      this.allocs.push({});
+      gcslice();
+    }
+
+    // Full GC
+    this.allocs.push({});
+    gc();
+    `
+  );
+
+  executeSoon(() => {
+    equal(fired, true, "The GC hook should have fired at least once");
+
+    // NUM_SLICES + 1 full gc + however many were triggered naturally (due to
+    // whatever zealousness setting).
+    print("Found " + slicesFound + " slices");
+    equal(slicesFound >= NUM_SLICES + 1, true);
+
+    do_test_finished();
+  });
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-02.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-02.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-02.js	2015-04-24 19:31:12.000000000 +0000
@@ -0,0 +1,94 @@
+// Test multiple debuggers, GCs, and zones interacting with each other.
+//
+// Note: when observing both globals, but GC'ing in only one, we don't test that
+// we *didn't* GC in the other zone because GCs are finicky and unreliable. That
+// used to work when this was a jit-test, but in the process of migrating to
+// xpcshell, we lost some amount of reliability and determinism.
+
+const root1 = newGlobal();
+const dbg1 = new Debugger();
+dbg1.addDebuggee(root1)
+
+const root2 = newGlobal();
+const dbg2 = new Debugger();
+dbg2.addDebuggee(root2)
+
+let fired1 = false;
+let fired2 = false;
+dbg1.memory.onGarbageCollection = _ => fired1 = true;
+dbg2.memory.onGarbageCollection = _ => fired2 = true;
+
+function reset() {
+  fired1 = false;
+  fired2 = false;
+}
+
+function run_test() {
+  do_test_pending();
+
+  gc();
+  executeSoon(() => {
+    reset();
+
+    // GC 1 only
+    root1.eval(`gc(this)`);
+    executeSoon(() => {
+      equal(fired1, true);
+
+      // GC 2 only
+      reset();
+      root2.eval(`gc(this)`);
+      executeSoon(() => {
+        equal(fired2, true);
+
+        // Full GC
+        reset();
+        gc();
+        executeSoon(() => {
+          equal(fired1, true);
+          equal(fired2, true);
+
+          // Full GC with no debuggees
+          reset();
+          dbg1.removeAllDebuggees();
+          dbg2.removeAllDebuggees();
+          gc();
+          executeSoon(() => {
+            equal(fired1, false);
+            equal(fired2, false);
+
+            // One debugger with multiple debuggees in different zones.
+
+            dbg1.addDebuggee(root1);
+            dbg1.addDebuggee(root2);
+
+            // Just debuggee 1
+            reset();
+            root1.eval(`gc(this)`);
+            executeSoon(() => {
+              equal(fired1, true);
+              equal(fired2, false);
+
+              // Just debuggee 2
+              reset();
+              root2.eval(`gc(this)`);
+              executeSoon(() => {
+                equal(fired1, true);
+                equal(fired2, false);
+
+                // All debuggees
+                reset();
+                gc();
+                executeSoon(() => {
+                  equal(fired1, true);
+                  equal(fired2, false);
+                  do_test_finished();
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-03.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-03.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-03.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-03.js	2015-04-24 19:31:12.000000000 +0000
@@ -0,0 +1,35 @@
+// Test that the onGarbageCollection hook is not reentrant.
+
+
+function run_test() {
+  do_test_pending();
+
+  const root = newGlobal();
+  const dbg = new Debugger();
+  const wrappedRoot = dbg.addDebuggee(root)
+
+  let fired = true;
+  let depth = 0;
+
+  dbg.memory.onGarbageCollection = _ => {
+    fired = true;
+
+    equal(depth, 0);
+    depth++;
+    try {
+      root.eval(`gc()`);
+    } finally {
+      equal(depth, 1);
+      depth--;
+    }
+  }
+
+  root.eval(`gc()`);
+
+  executeSoon(() => {
+    ok(fired);
+    equal(depth, 0);
+    dbg.memory.onGarbageCollection = undefined;
+    do_test_finished();
+  });
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-04.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-04.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-04.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/test_onGarbageCollection-04.js	2015-04-24 19:31:12.000000000 +0000
@@ -0,0 +1,67 @@
+// Test that the onGarbageCollection reentrancy guard is on a per Debugger
+// basis. That is if our first Debugger is observing our second Debugger's
+// compartment, and this second Debugger triggers a GC inside its
+// onGarbageCollection hook, the first Debugger's onGarbageCollection hook is
+// still called.
+//
+// This is the scenario we are setting up: top level debugging the `debuggeree`
+// global, which is debugging the `debuggee` global. Then, we trigger the
+// following events:
+//
+//     debuggee gc
+//         |
+//         V
+//     debuggeree's onGarbageCollection
+//         |
+//         V
+//     debuggeree gc
+//         |
+//         V
+//     top level onGarbageCollection
+//
+// Note that the top level's onGarbageCollection hook should be fired, at the
+// same time that we are preventing reentrancy into debuggeree's
+// onGarbageCollection hook.
+
+function run_test() {
+  do_test_pending();
+
+  const debuggeree = newGlobal();
+  const debuggee = debuggeree.debuggee = newGlobal();
+
+  debuggeree.eval(
+    `
+    const dbg = new Debugger(this.debuggee);
+    let fired = 0;
+    dbg.memory.onGarbageCollection = _ => {
+      fired++;
+      gc(this);
+    };
+    `
+  );
+
+  const dbg = new Debugger(debuggeree);
+  let fired = 0;
+  dbg.memory.onGarbageCollection = _ => {
+    fired++;
+  };
+
+  debuggee.eval(`gc(this)`);
+
+  // Let first onGarbageCollection runnable get run.
+  executeSoon(() => {
+
+    // Let second onGarbageCollection runnable get run.
+    executeSoon(() => {
+
+      // Even though we request GC'ing a single zone, we can't rely on that
+      // behavior and both zones could have been scheduled for gc for both
+      // gc(this) calls.
+      ok(debuggeree.fired >= 1);
+      ok(fired >= 1);
+
+      debuggeree.dbg.enabled = dbg.enabled = false;
+      do_test_finished();
+    });
+  });
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/xpcshell.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/xpcshell.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/tests/unit/xpcshell.ini	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/tests/unit/xpcshell.ini	2015-04-24 19:31:12.000000000 +0000
@@ -66,6 +66,14 @@
 [test_interposition.js]
 [test_isModuleLoaded.js]
 [test_js_weak_references.js]
+[test_onGarbageCollection-01.js]
+head = head_ongc.js
+[test_onGarbageCollection-02.js]
+head = head_ongc.js
+[test_onGarbageCollection-03.js]
+head = head_ongc.js
+[test_onGarbageCollection-04.js]
+head = head_ongc.js
 [test_reflect_parse.js]
 [test_localeCompare.js]
 # Bug 676965: test fails consistently on Android
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -887,7 +887,7 @@
 const JSClass ExpandoObjectClass = {
     "XrayExpandoObject",
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_EXPANDO_COUNT),
-    nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, ExpandoObjectFinalize
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/ActiveLayerTracker.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/ActiveLayerTracker.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/ActiveLayerTracker.cpp	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/ActiveLayerTracker.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -310,23 +310,11 @@
       return true;
     }
   }
-  nsIContent* content = aFrame->GetContent();
-  if (content) {
-    static const nsCSSProperty properties[] = {
-      eCSSProperty_left,
-      eCSSProperty_top,
-      eCSSProperty_right,
-      eCSSProperty_bottom,
-      eCSSProperty_margin_left,
-      eCSSProperty_margin_top,
-      eCSSProperty_margin_right,
-      eCSSProperty_margin_bottom
-    };
-    if (nsLayoutUtils::HasCurrentAnimationsForProperties(
-          content, properties, MOZ_ARRAY_LENGTH(properties))) {
-      return true;
-    }
-  }
+  // We should also check for running CSS animations of these properties once
+  // bug 1009693 is fixed. Until that happens, layerization isn't useful for
+  // animations of these properties because we'll invalidate the layer contents
+  // on every change anyway.
+  // See bug 1151346 for a patch that adds a check for CSS animations.
   return false;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/DisplayItemClip.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/DisplayItemClip.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/DisplayItemClip.h	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/DisplayItemClip.h	2015-04-24 19:31:12.000000000 +0000
@@ -12,7 +12,6 @@
 #include "nsStyleConsts.h"
 
 class gfxContext;
-class nsDisplayItem;
 class nsPresContext;
 class nsRegion;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/FrameLayerBuilder.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/FrameLayerBuilder.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/FrameLayerBuilder.cpp	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/FrameLayerBuilder.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -49,6 +49,8 @@
 
 class PaintedDisplayItemLayerUserData;
 
+static nsTHashtable<nsPtrHashKey<FrameLayerBuilder::DisplayItemData>>* sAliveDisplayItemDatas;
+
 FrameLayerBuilder::DisplayItemData::DisplayItemData(LayerManagerData* aParent, uint32_t aKey,
                                                     Layer* aLayer, nsIFrame* aFrame)
 
@@ -59,10 +61,19 @@
   , mUsed(true)
   , mIsInvalid(false)
 {
+  MOZ_COUNT_CTOR(FrameLayerBuilder::DisplayItemData);
+
+  if (!sAliveDisplayItemDatas) {
+    sAliveDisplayItemDatas = new nsTHashtable<nsPtrHashKey<FrameLayerBuilder::DisplayItemData>>();
+  }
+  MOZ_RELEASE_ASSERT(!sAliveDisplayItemDatas->Contains(this));
+  sAliveDisplayItemDatas->PutEntry(this);
+
   MOZ_RELEASE_ASSERT(mLayer);
   if (aFrame) {
     AddFrame(aFrame);
   }
+
 }
 
 void
@@ -164,6 +175,7 @@
 static nsIFrame* sDestroyedFrame = nullptr;
 FrameLayerBuilder::DisplayItemData::~DisplayItemData()
 {
+  MOZ_COUNT_DTOR(FrameLayerBuilder::DisplayItemData);
   MOZ_RELEASE_ASSERT(mLayer);
   for (uint32_t i = 0; i < mFrameList.Length(); i++) {
     nsIFrame* frame = mFrameList[i];
@@ -174,6 +186,13 @@
       reinterpret_cast<nsTArray<DisplayItemData*>*>(frame->Properties().Get(LayerManagerDataProperty()));
     array->RemoveElement(this);
   }
+
+  MOZ_RELEASE_ASSERT(sAliveDisplayItemDatas && sAliveDisplayItemDatas->Contains(this));
+  sAliveDisplayItemDatas->RemoveEntry(this);
+  if (sAliveDisplayItemDatas->Count() == 0) {
+    delete sAliveDisplayItemDatas;
+    sAliveDisplayItemDatas = nullptr;
+  }
 }
 
 const nsTArray<nsIFrame*>&
@@ -1397,6 +1416,15 @@
   aContext->Paint();
 }
 
+static FrameLayerBuilder::DisplayItemData*
+AssertDisplayItemData(FrameLayerBuilder::DisplayItemData* aData)
+{
+  MOZ_RELEASE_ASSERT(aData);
+  MOZ_RELEASE_ASSERT(sAliveDisplayItemDatas && sAliveDisplayItemDatas->Contains(aData));
+  MOZ_RELEASE_ASSERT(aData->mLayer);
+  return aData;
+}
+
 FrameLayerBuilder::DisplayItemData*
 FrameLayerBuilder::GetDisplayItemData(nsIFrame* aFrame, uint32_t aKey)
 {
@@ -1404,9 +1432,7 @@
     static_cast<nsTArray<DisplayItemData*>*>(aFrame->Properties().Get(LayerManagerDataProperty()));
   if (array) {
     for (uint32_t i = 0; i < array->Length(); i++) {
-      DisplayItemData* item = array->ElementAt(i);
-      MOZ_RELEASE_ASSERT(item);
-      MOZ_RELEASE_ASSERT(item->mLayer);
+      DisplayItemData* item = AssertDisplayItemData(array->ElementAt(i));
       if (item->mDisplayItemKey == aKey &&
           item->mLayer->Manager() == mRetainingManager) {
         return item;
@@ -1701,7 +1727,7 @@
     static_cast<nsTArray<DisplayItemData*>*>(aItem->Frame()->Properties().Get(LayerManagerDataProperty()));
   if (array) {
     for (uint32_t i = 0; i < array->Length(); i++) {
-      DisplayItemData* item = array->ElementAt(i);
+      DisplayItemData* item = AssertDisplayItemData(array->ElementAt(i));
       if (item->mDisplayItemKey == aItem->GetPerFrameKey() &&
           item->mLayer->Manager() == aManager) {
         return item;
@@ -1718,7 +1744,7 @@
     static_cast<nsTArray<DisplayItemData*>*>(aFrame->Properties().Get(LayerManagerDataProperty()));
   if (array) {
     for (uint32_t i = 0; i < array->Length(); i++) {
-      if (array->ElementAt(i)->mDisplayItemKey == aDisplayItemKey) {
+      if (AssertDisplayItemData(array->ElementAt(i))->mDisplayItemKey == aDisplayItemKey) {
         return true;
       }
     }
@@ -1736,7 +1762,7 @@
   }
 
   for (uint32_t i = 0; i < array->Length(); i++) {
-    DisplayItemData* data = array->ElementAt(i);
+    DisplayItemData* data = AssertDisplayItemData(array->ElementAt(i));
     if (data->mDisplayItemKey != nsDisplayItem::TYPE_ZERO) {
       aCallback(aFrame, data);
     }
@@ -1804,7 +1830,7 @@
   }
 
   for (uint32_t i = 0; i < array->Length(); i++) {
-    DisplayItemData *data = array->ElementAt(i);
+    DisplayItemData *data = AssertDisplayItemData(array->ElementAt(i));
 
     if (data->mDisplayItemKey == aDisplayItemKey) {
       return data->mLayer;
@@ -1825,6 +1851,7 @@
 
   Layer* layer = nullptr;
   for (DisplayItemData* data : *array) {
+    AssertDisplayItemData(data);
     if (layer && layer != data->mLayer) {
       // More than one layer assigned, bail.
       return nullptr;
@@ -4874,7 +4901,7 @@
     static_cast<nsTArray<DisplayItemData*>*>(aFrame->Properties().Get(LayerManagerDataProperty()));
   if (array) {
     for (uint32_t i = 0; i < array->Length(); i++) {
-      array->ElementAt(i)->mParent->mInvalidateAllLayers = true;
+      AssertDisplayItemData(array->ElementAt(i))->mParent->mInvalidateAllLayers = true;
     }
   }
 }
@@ -4891,7 +4918,7 @@
     static_cast<nsTArray<DisplayItemData*>*>(aFrame->Properties().Get(LayerManagerDataProperty()));
   if (array) {
     for (uint32_t i = 0; i < array->Length(); i++) {
-      DisplayItemData *element = array->ElementAt(i);
+      DisplayItemData *element = AssertDisplayItemData(array->ElementAt(i));
       if (!element->mParent->mLayerManager->IsWidgetLayerManager()) {
         continue;
       }
@@ -4950,7 +4977,7 @@
     }
 
     for (uint32_t i = 0; i < array->Length(); i++) {
-      Layer* layer = array->ElementAt(i)->mLayer;
+      Layer* layer = AssertDisplayItemData(array->ElementAt(i))->mLayer;
       ContainerLayer* container = layer->AsContainerLayer();
       if (!container ||
           !layer->Manager()->IsWidgetLayerManager()) {
@@ -5402,7 +5429,7 @@
   // Find our display item data, if it exists, and return its geometry.
   uint32_t itemPerFrameKey = aItem->GetPerFrameKey();
   for (uint32_t i = 0; i < dataArray->Length(); i++) {
-    DisplayItemData* data = dataArray->ElementAt(i);
+    DisplayItemData* data = AssertDisplayItemData(dataArray->ElementAt(i));
     if (data->GetDisplayItemKey() == itemPerFrameKey) {
       return data->GetGeometry();
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/FrameLayerBuilder.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/FrameLayerBuilder.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/FrameLayerBuilder.h	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/FrameLayerBuilder.h	2015-04-24 19:31:12.000000000 +0000
@@ -50,8 +50,6 @@
   bool mIsInfinite;
 };
 
-struct NewLayerEntry;
-
 struct ContainerLayerParameters {
   ContainerLayerParameters()
     : mXScale(1)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/GeometryUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/GeometryUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/GeometryUtils.h	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/GeometryUtils.h	2015-04-24 19:31:12.000000000 +0000
@@ -16,7 +16,6 @@
  */
 
 class nsINode;
-class nsIDocument;
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsBidiPresUtils.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsBidiPresUtils.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsBidiPresUtils.cpp	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsBidiPresUtils.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -1410,11 +1410,7 @@
   const LogicalMargin& aBorderPadding)
 {
   nsIAtom* frameType = aFrame->GetType();
-  MOZ_ASSERT(frameType == nsGkAtoms::rubyFrame ||
-             frameType == nsGkAtoms::rubyBaseFrame ||
-             frameType == nsGkAtoms::rubyTextFrame ||
-             frameType == nsGkAtoms::rubyBaseContainerFrame ||
-             frameType == nsGkAtoms::rubyTextContainerFrame);
+  MOZ_ASSERT(RubyUtils::IsRubyBox(frameType));
 
   nscoord icoord = 0;
   WritingMode frameWM = aFrame->GetWritingMode();
@@ -1551,7 +1547,7 @@
     }
     icoord += reverseDir ?
       borderPadding.IStart(frameWM) : borderPadding.IEnd(frameWM);
-  } else if (aFrame->StyleDisplay()->IsRubyDisplayType()) {
+  } else if (RubyUtils::IsRubyBox(aFrame->GetType())) {
     icoord += RepositionRubyFrame(aFrame, aContinuationStates,
                                   aContainerWM, borderPadding);
   } else {
@@ -1593,8 +1589,7 @@
   state->mFirstVisualFrame = nullptr;
   state->mFrameCount = 0;
 
-  if (!IsBidiLeaf(aFrame) ||
-      aFrame->StyleDisplay()->IsRubyDisplayType()) {
+  if (!IsBidiLeaf(aFrame) || RubyUtils::IsRubyBox(aFrame->GetType())) {
     // Continue for child frames
     nsIFrame* frame;
     for (frame = aFrame->GetFirstPrincipalChild();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsCSSFrameConstructor.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsCSSFrameConstructor.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsCSSFrameConstructor.cpp	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsCSSFrameConstructor.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -62,6 +62,7 @@
 #include "nsBoxLayout.h"
 #include "nsFlexContainerFrame.h"
 #include "nsGridContainerFrame.h"
+#include "RubyUtils.h"
 #include "nsRubyFrame.h"
 #include "nsRubyBaseFrame.h"
 #include "nsRubyBaseContainerFrame.h"
@@ -9146,8 +9147,7 @@
   // Check ruby containers
   nsIAtom* parentType = parent->GetType();
   if (parentType == nsGkAtoms::rubyFrame ||
-      parentType == nsGkAtoms::rubyBaseContainerFrame ||
-      parentType == nsGkAtoms::rubyTextContainerFrame) {
+      RubyUtils::IsRubyContainerBox(parentType)) {
     // In ruby containers, pseudo frames may be created from
     // whitespaces or even nothing. There are two cases we actually
     // need to handle here, but hard to check exactly:
@@ -11911,8 +11911,7 @@
   nsIAtom* frameType = aFrame->GetType();
   if (IsRubyPseudo(aFrame) ||
       frameType == nsGkAtoms::rubyFrame ||
-      frameType == nsGkAtoms::rubyBaseContainerFrame ||
-      frameType == nsGkAtoms::rubyTextContainerFrame) {
+      RubyUtils::IsRubyContainerBox(frameType)) {
     // We want to optimize it better, and avoid reframing as much as
     // possible. But given the cases above, and the fact that a ruby
     // usually won't be very large, it should be fine to reframe it.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsCSSFrameConstructor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsCSSFrameConstructor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsCSSFrameConstructor.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsCSSFrameConstructor.h	2015-04-24 19:31:13.000000000 +0000
@@ -24,10 +24,8 @@
 #include "ScrollbarStyles.h"
 
 struct nsFrameItems;
-struct nsAbsoluteItems;
 class nsStyleContext;
 struct nsStyleDisplay;
-class nsIDOMHTMLSelectElement;
 struct nsGenConInitializer;
 
 class nsContainerFrame;
@@ -38,7 +36,6 @@
 class nsGenericDOMDataNode;
 
 class nsFrameConstructorState;
-class nsFrameConstructorSaveState;
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsDisplayList.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsDisplayList.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsDisplayList.cpp	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsDisplayList.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -106,6 +106,12 @@
   return nsLayoutUtils::GetTransformRootFrame(aFrame);
 }
 
+static inline CSSAngle
+MakeCSSAngle(const nsCSSValue& aValue)
+{
+  return CSSAngle(aValue.GetAngleValue(), aValue.GetUnit());
+}
+
 static void AddTransformFunctions(nsCSSValueList* aList,
                                   nsStyleContext* aContext,
                                   nsPresContext* aPresContext,
@@ -125,25 +131,25 @@
     switch (nsStyleTransformMatrix::TransformFunctionOf(array)) {
       case eCSSKeyword_rotatex:
       {
-        double theta = array->Item(1).GetAngleValueInRadians();
+        CSSAngle theta = MakeCSSAngle(array->Item(1));
         aFunctions.AppendElement(RotationX(theta));
         break;
       }
       case eCSSKeyword_rotatey:
       {
-        double theta = array->Item(1).GetAngleValueInRadians();
+        CSSAngle theta = MakeCSSAngle(array->Item(1));
         aFunctions.AppendElement(RotationY(theta));
         break;
       }
       case eCSSKeyword_rotatez:
       {
-        double theta = array->Item(1).GetAngleValueInRadians();
+        CSSAngle theta = MakeCSSAngle(array->Item(1));
         aFunctions.AppendElement(RotationZ(theta));
         break;
       }
       case eCSSKeyword_rotate:
       {
-        double theta = array->Item(1).GetAngleValueInRadians();
+        CSSAngle theta = MakeCSSAngle(array->Item(1));
         aFunctions.AppendElement(Rotation(theta));
         break;
       }
@@ -152,7 +158,7 @@
         double x = array->Item(1).GetFloatValue();
         double y = array->Item(2).GetFloatValue();
         double z = array->Item(3).GetFloatValue();
-        double theta = array->Item(4).GetAngleValueInRadians();
+        CSSAngle theta = MakeCSSAngle(array->Item(4));
         aFunctions.AppendElement(Rotation3D(x, y, z, theta));
         break;
       }
@@ -246,23 +252,23 @@
       }
       case eCSSKeyword_skewx:
       {
-        double x = array->Item(1).GetAngleValueInRadians();
+        CSSAngle x = MakeCSSAngle(array->Item(1));
         aFunctions.AppendElement(SkewX(x));
         break;
       }
       case eCSSKeyword_skewy:
       {
-        double y = array->Item(1).GetAngleValueInRadians();
+        CSSAngle y = MakeCSSAngle(array->Item(1));
         aFunctions.AppendElement(SkewY(y));
         break;
       }
       case eCSSKeyword_skew:
       {
-        double x = array->Item(1).GetAngleValueInRadians();
+        CSSAngle x = MakeCSSAngle(array->Item(1));
         // skew(x) is shorthand for skew(x, 0)
-        double y = 0;
+        CSSAngle y(0.0f, eCSSUnit_Degree);
         if (array->Count() == 3) {
-          y = array->Item(2).GetAngleValueInRadians();
+          y = MakeCSSAngle(array->Item(2));
         }
         aFunctions.AppendElement(Skew(x, y));
         break;
@@ -530,8 +536,9 @@
   AnimationData data;
   if (aProperty == eCSSProperty_transform) {
     nsRect bounds = nsDisplayTransform::GetFrameBoundsForTransform(aFrame);
-    // all data passed directly to the compositor should be in css pixels
-    float scale = nsDeviceContext::AppUnitsPerCSSPixel();
+    // all data passed directly to the compositor should be in dev pixels
+    int32_t devPixelsToAppUnits = aFrame->PresContext()->AppUnitsPerDevPixel();
+    float scale = devPixelsToAppUnits;
     Point3D offsetToTransformOrigin =
       nsDisplayTransform::GetDeltaToTransformOrigin(aFrame, scale, &bounds);
     Point3D offsetToPerspectiveOrigin =
@@ -557,7 +564,7 @@
 
     data = TransformData(origin, offsetToTransformOrigin,
                          offsetToPerspectiveOrigin, bounds, perspective,
-                         aFrame->PresContext()->AppUnitsPerDevPixel());
+                         devPixelsToAppUnits);
   } else if (aProperty == eCSSProperty_opacity) {
     data = null_t();
   }
@@ -3097,6 +3104,14 @@
   mCaret->PaintCaret(aBuilder, *aCtx->GetDrawTarget(), mFrame, ToReferenceFrame());
 }
 
+nsDisplayBorder::nsDisplayBorder(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame)
+  : nsDisplayItem(aBuilder, aFrame)
+{
+  MOZ_COUNT_CTOR(nsDisplayBorder);
+
+  mBounds = CalculateBounds(*mFrame->StyleBorder());
+}
+
 bool
 nsDisplayBorder::IsInvisibleInRect(const nsRect& aRect)
 {
@@ -3155,7 +3170,7 @@
 nsDisplayBorder::GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
 {
   *aSnap = true;
-  return CalculateBounds(*mFrame->StyleBorder());
+  return mBounds;
 }
 
 nsRect
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsDisplayList.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsDisplayList.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsDisplayList.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsDisplayList.h	2015-04-24 19:31:13.000000000 +0000
@@ -2149,11 +2149,8 @@
  */
 class nsDisplayBorder : public nsDisplayItem {
 public:
-  nsDisplayBorder(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame) :
-    nsDisplayItem(aBuilder, aFrame)
-  {
-    MOZ_COUNT_CTOR(nsDisplayBorder);
-  }
+  nsDisplayBorder(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame);
+
 #ifdef NS_BUILD_REFCNT_LOGGING
   virtual ~nsDisplayBorder() {
     MOZ_COUNT_DTOR(nsDisplayBorder);
@@ -2173,6 +2170,8 @@
 
 protected:
   nsRect CalculateBounds(const nsStyleBorder& aStyleBorder);
+
+  nsRect mBounds;
 };
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsDocumentViewer.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsDocumentViewer.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsDocumentViewer.cpp	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsDocumentViewer.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -60,6 +60,7 @@
 #include "nsIImageLoadingContent.h"
 #include "nsCopySupport.h"
 #include "nsIDOMHTMLFrameSetElement.h"
+#include "nsIDOMHTMLImageElement.h"
 #ifdef MOZ_XUL
 #include "nsIXULDocument.h"
 #include "nsXULPopupManager.h"
@@ -2707,6 +2708,20 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP nsDocumentViewer::SetCommandNode(nsIDOMNode* aNode)
+{
+  nsIDocument* document = GetDocument();
+  NS_ENSURE_STATE(document);
+
+  nsCOMPtr<nsPIDOMWindow> window(document->GetWindow());
+  NS_ENSURE_TRUE(window, NS_ERROR_NOT_AVAILABLE);
+
+  nsCOMPtr<nsPIWindowRoot> root = window->GetTopWindowRoot();
+  NS_ENSURE_STATE(root);
+
+  root->SetPopupNode(aNode);
+  return NS_OK;
+}
 
 /* ========================================================================================
  * nsIContentViewerFile
@@ -3529,8 +3544,16 @@
   if (NS_FAILED(rv)) return rv;
   NS_ENSURE_TRUE(node, NS_ERROR_FAILURE);
 
-  // if we made it here, we're in an image
-  *aInImage = true;
+  // Make sure there is a URI assigned. This allows <input type="image"> to
+  // be an image but rejects other <input> types. This matches what
+  // nsContextMenu.js does.
+  nsCOMPtr<nsIURI> uri;
+  node->GetCurrentURI(getter_AddRefs(uri));
+  if (uri) {
+    // if we made it here, we're in an image
+    *aInImage = true;
+  }
+
   return NS_OK;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsIDocumentViewerPrint.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsIDocumentViewerPrint.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsIDocumentViewerPrint.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsIDocumentViewerPrint.h	2015-04-24 19:31:13.000000000 +0000
@@ -11,7 +11,6 @@
 class nsStyleSet;
 class nsIPresShell;
 class nsPresContext;
-class nsIWidget;
 class nsViewManager;
 
 // {c6f255cf-cadd-4382-b57f-cd2a9874169b}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsIPresShell.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsIPresShell.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsIPresShell.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsIPresShell.h	2015-04-24 19:31:13.000000000 +0000
@@ -94,7 +94,6 @@
 } // namespace a11y
 } // namespace mozilla
 #endif
-class nsIWidget;
 struct nsArenaMemoryStats;
 class nsITimer;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsLayoutUtils.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsLayoutUtils.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsLayoutUtils.cpp	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsLayoutUtils.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -3008,12 +3008,25 @@
   TimeStamp startBuildDisplayList = TimeStamp::Now();
   nsDisplayListBuilder builder(aFrame, nsDisplayListBuilder::PAINTING,
                            !(aFlags & PAINT_HIDE_CARET));
+  if (aFlags & PAINT_IN_TRANSFORM) {
+    builder.SetInTransform(true);
+  }
+  if (aFlags & PAINT_SYNC_DECODE_IMAGES) {
+    builder.SetSyncDecodeImages(true);
+  }
+  if (aFlags & (PAINT_WIDGET_LAYERS | PAINT_TO_WINDOW)) {
+    builder.SetPaintingToWindow(true);
+  }
+  if (aFlags & PAINT_IGNORE_SUPPRESSION) {
+    builder.IgnorePaintSuppression();
+  }
 
   nsIFrame* rootScrollFrame = presShell->GetRootScrollFrame();
   bool usingDisplayPort = false;
   nsRect displayport;
   if (rootScrollFrame && !aFrame->GetParent() &&
-      (aFlags & (PAINT_WIDGET_LAYERS | PAINT_TO_WINDOW))) {
+      (aFlags & (PAINT_WIDGET_LAYERS | PAINT_TO_WINDOW)) &&
+      gfxPrefs::LayoutUseContainersForRootFrames()) {
     nsRect displayportBase(
         nsPoint(0,0),
         nsLayoutUtils::CalculateCompositionSizeForFrame(rootScrollFrame));
@@ -3044,18 +3057,6 @@
   bool willFlushRetainedLayers = (aFlags & PAINT_HIDE_CARET) != 0;
 
   nsDisplayList list;
-  if (aFlags & PAINT_IN_TRANSFORM) {
-    builder.SetInTransform(true);
-  }
-  if (aFlags & PAINT_SYNC_DECODE_IMAGES) {
-    builder.SetSyncDecodeImages(true);
-  }
-  if (aFlags & (PAINT_WIDGET_LAYERS | PAINT_TO_WINDOW)) {
-    builder.SetPaintingToWindow(true);
-  }
-  if (aFlags & PAINT_IGNORE_SUPPRESSION) {
-    builder.IgnorePaintSuppression();
-  }
 
   // If the root has embedded plugins, flag the builder so we know we'll need
   // to update plugin geometry after painting.
@@ -5831,11 +5832,12 @@
 
   // Avoid unnecessarily large offsets.
   bool doTile = !aDest.Contains(aFill);
-  nsRect dest = doTile ? TileNearRect(aDest, aFill.Intersect(aDirty)) : aDest;
-  nsPoint anchor = aAnchor + (dest.TopLeft() - aDest.TopLeft());
+  nsRect appUnitDest = doTile ? TileNearRect(aDest, aFill.Intersect(aDirty))
+                              : aDest;
+  nsPoint anchor = aAnchor + (appUnitDest.TopLeft() - aDest.TopLeft());
 
   gfxRect devPixelDest =
-    nsLayoutUtils::RectToGfxRect(dest, aAppUnitsPerDevPixel);
+    nsLayoutUtils::RectToGfxRect(appUnitDest, aAppUnitsPerDevPixel);
   gfxRect devPixelFill =
     nsLayoutUtils::RectToGfxRect(aFill, aAppUnitsPerDevPixel);
   gfxRect devPixelDirty =
@@ -5843,52 +5845,57 @@
 
   gfxMatrix currentMatrix = aCtx->CurrentMatrix();
   gfxRect fill = devPixelFill;
+  gfxRect dest = devPixelDest;
   bool didSnap;
   // Snap even if we have a scale in the context. But don't snap if
   // we have something that's not translation+scale, or if the scale flips in
   // the X or Y direction, because snapped image drawing can't handle that yet.
   if (!currentMatrix.HasNonAxisAlignedTransform() &&
       currentMatrix._11 > 0.0 && currentMatrix._22 > 0.0 &&
-      aCtx->UserToDevicePixelSnapped(fill, true)) {
+      aCtx->UserToDevicePixelSnapped(fill, true) &&
+      aCtx->UserToDevicePixelSnapped(dest, true)) {
+    // We snapped. On this code path, |fill| and |dest| take into account
+    // currentMatrix's transform.
     didSnap = true;
-    if (fill.IsEmpty()) {
-      return SnappedImageDrawingParameters();
-    }
   } else {
+    // We didn't snap. On this code path, |fill| and |dest| do not take into
+    // account currentMatrix's transform.
     didSnap = false;
     fill = devPixelFill;
+    dest = devPixelDest;
   }
 
-  // Apply the context's scale to the dest rect.
-  gfxSize destScale = didSnap ? gfxSize(currentMatrix._11, currentMatrix._22)
-                              : currentMatrix.ScaleFactors(true);
-  gfxSize appUnitScaledDest(dest.width * destScale.width,
-                            dest.height * destScale.height);
-  gfxSize scaledDest = appUnitScaledDest / aAppUnitsPerDevPixel;
-  if (scaledDest.IsEmpty()) {
-    return SnappedImageDrawingParameters();
+  // If we snapped above, |dest| already takes into account |currentMatrix|'s scale
+  // and has integer coordinates. If not, we need these properties to compute
+  // the optimal drawn image size, so compute |snappedDestSize| here.
+  gfxSize snappedDestSize = dest.Size();
+  if (!didSnap) {
+    gfxSize scaleFactors = currentMatrix.ScaleFactors(true);
+    snappedDestSize.Scale(scaleFactors.width, scaleFactors.height);
+    snappedDestSize.width = NS_round(snappedDestSize.width);
+    snappedDestSize.height = NS_round(snappedDestSize.height);
   }
 
-  // Compute a snapped version of the scaled dest rect, which we'll use to
-  // determine the optimal image size to draw with. We need to be sure that
-  // this rect is at least one pixel in width and height, or we'll end up
-  // drawing nothing even if we have a nonempty fill.
-  gfxSize snappedScaledDest =
-    gfxSize(NSAppUnitsToIntPixels(appUnitScaledDest.width, aAppUnitsPerDevPixel),
-            NSAppUnitsToIntPixels(appUnitScaledDest.height, aAppUnitsPerDevPixel));
-  snappedScaledDest.width = std::max(snappedScaledDest.width, 1.0);
-  snappedScaledDest.height = std::max(snappedScaledDest.height, 1.0);
+  // We need to be sure that this is at least one pixel in width and height,
+  // or we'll end up drawing nothing even if we have a nonempty fill.
+  snappedDestSize.width = std::max(snappedDestSize.width, 1.0);
+  snappedDestSize.height = std::max(snappedDestSize.height, 1.0);
+
+  // Bail if we're not going to end up drawing anything.
+  if (fill.IsEmpty() || snappedDestSize.IsEmpty()) {
+    return SnappedImageDrawingParameters();
+  }
 
   nsIntSize intImageSize =
-    aImage->OptimalImageSizeForDest(snappedScaledDest,
+    aImage->OptimalImageSizeForDest(snappedDestSize,
                                     imgIContainer::FRAME_CURRENT,
                                     aGraphicsFilter, aImageFlags);
   gfxSize imageSize(intImageSize.width, intImageSize.height);
 
+  // XXX(seth): May be buggy; see bug 1151016.
   CSSIntSize svgViewportSize = currentMatrix.IsIdentity()
     ? CSSIntSize(intImageSize.width, intImageSize.height)
-    : CSSIntSize(NSAppUnitsToIntPixels(dest.width, aAppUnitsPerDevPixel), //XXX BUG!
-                 NSAppUnitsToIntPixels(dest.height, aAppUnitsPerDevPixel)); //XXX BUG!
+    : CSSIntSize(devPixelDest.width, devPixelDest.height);
 
   // Compute the set of pixels that would be sampled by an ideal rendering
   gfxPoint subimageTopLeft =
@@ -5904,8 +5911,9 @@
   gfxMatrix transform;
   gfxMatrix invTransform;
 
-  bool anchorAtUpperLeft = anchor.x == dest.x && anchor.y == dest.y;
-  bool exactlyOneImageCopy = aFill.IsEqualEdges(dest);
+  bool anchorAtUpperLeft = anchor.x == appUnitDest.x &&
+                           anchor.y == appUnitDest.y;
+  bool exactlyOneImageCopy = aFill.IsEqualEdges(appUnitDest);
   if (anchorAtUpperLeft && exactlyOneImageCopy) {
     // The simple case: we can ignore the anchor point and compute the
     // transformation from the sampled region (the subimage) to the fill rect.
@@ -5933,7 +5941,14 @@
       anchorPoint = StableRound(anchorPoint);
     }
 
-    gfxRect anchoredDestRect(anchorPoint, scaledDest);
+    // Compute an unsnapped version of the dest rect's size. We continue to
+    // follow the pattern that we take |currentMatrix| into account only if
+    // |didSnap| is true.
+    gfxSize unsnappedDestSize
+      = didSnap ? devPixelDest.Size() * currentMatrix.ScaleFactors(true)
+                : devPixelDest.Size();
+
+    gfxRect anchoredDestRect(anchorPoint, unsnappedDestSize);
     gfxRect anchoredImageRect(imageSpaceAnchorPoint, imageSize);
 
     // Calculate anchoredDestRect with snapped fill rect when the devPixelFill rect
@@ -6457,42 +6472,42 @@
   default:
     break;
   }
+  return result | GetTextRunOrientFlagsForStyle(aStyleContext);
+}
+
+/* static */ uint32_t
+nsLayoutUtils::GetTextRunOrientFlagsForStyle(nsStyleContext* aStyleContext)
+{
   WritingMode wm(aStyleContext);
   if (wm.IsVertical()) {
     switch (aStyleContext->StyleVisibility()->mTextOrientation) {
     case NS_STYLE_TEXT_ORIENTATION_MIXED:
-      result |= gfxTextRunFactory::TEXT_ORIENT_VERTICAL_MIXED;
-      break;
+      return gfxTextRunFactory::TEXT_ORIENT_VERTICAL_MIXED;
     case NS_STYLE_TEXT_ORIENTATION_UPRIGHT:
-      result |= gfxTextRunFactory::TEXT_ORIENT_VERTICAL_UPRIGHT;
-      break;
+      return gfxTextRunFactory::TEXT_ORIENT_VERTICAL_UPRIGHT;
     case NS_STYLE_TEXT_ORIENTATION_SIDEWAYS:
       // This should depend on writing mode vertical-lr vs vertical-rl,
       // but until we support SIDEWAYS_LEFT, we'll treat this the same
       // as SIDEWAYS_RIGHT and simply fall through.
       /*
       if (wm.IsVerticalLR()) {
-        result |= gfxTextRunFactory::TEXT_ORIENT_VERTICAL_SIDEWAYS_LEFT;
+        return gfxTextRunFactory::TEXT_ORIENT_VERTICAL_SIDEWAYS_LEFT;
       } else {
-        result |= gfxTextRunFactory::TEXT_ORIENT_VERTICAL_SIDEWAYS_RIGHT;
+        return gfxTextRunFactory::TEXT_ORIENT_VERTICAL_SIDEWAYS_RIGHT;
       }
-      break;
       */
     case NS_STYLE_TEXT_ORIENTATION_SIDEWAYS_RIGHT:
-      result |= gfxTextRunFactory::TEXT_ORIENT_VERTICAL_SIDEWAYS_RIGHT;
-      break;
+      return gfxTextRunFactory::TEXT_ORIENT_VERTICAL_SIDEWAYS_RIGHT;
     case NS_STYLE_TEXT_ORIENTATION_SIDEWAYS_LEFT:
       // Not yet supported, so fall through to the default (error) case.
       /*
-      result |= gfxTextRunFactory::TEXT_ORIENT_VERTICAL_SIDEWAYS_LEFT;
-      break;
+      return gfxTextRunFactory::TEXT_ORIENT_VERTICAL_SIDEWAYS_LEFT;
       */
     default:
       NS_NOTREACHED("unknown text-orientation");
-      break;
     }
   }
-  return result;
+  return 0;
 }
 
 /* static */ void
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsLayoutUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsLayoutUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsLayoutUtils.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsLayoutUtils.h	2015-04-24 19:31:13.000000000 +0000
@@ -34,7 +34,6 @@
 #include <limits>
 #include <algorithm>
 
-class nsIFormControlFrame;
 class nsPresContext;
 class nsIContent;
 class nsIAtom;
@@ -80,7 +79,6 @@
 } // namespace gfx
 namespace layers {
 class Layer;
-class ClientLayerManager;
 }
 }
 
@@ -1926,6 +1924,11 @@
                                           nscoord aLetterSpacing);
 
   /**
+   * Get orientation flags for textrun construction.
+   */
+  static uint32_t GetTextRunOrientFlagsForStyle(nsStyleContext* aStyleContext);
+
+  /**
    * Takes two rectangles whose origins must be the same, and computes
    * the difference between their union and their intersection as two
    * rectangles. (This difference is a superset of the difference
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsPresContext.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsPresContext.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsPresContext.cpp	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsPresContext.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -1702,6 +1702,12 @@
   }
 }
 
+static void
+NotifyThemeChanged(TabParent* aTabParent, void* aArg)
+{
+  aTabParent->ThemeChanged();
+}
+
 void
 nsPresContext::ThemeChangedInternal()
 {
@@ -1735,6 +1741,11 @@
   // changes are not), and -moz-appearance (whose changes likewise are
   // not), so we need to reflow.
   MediaFeatureValuesChanged(eRestyle_Subtree, NS_STYLE_HINT_REFLOW);
+
+  // Recursively notify all remote leaf descendants that the
+  // system theme has changed.
+  nsContentUtils::CallOnAllRemoteChildren(mDocument->GetWindow(),
+                                          NotifyThemeChanged, nullptr);
 }
 
 void
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsPresContext.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsPresContext.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsPresContext.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsPresContext.h	2015-04-24 19:31:14.000000000 +0000
@@ -39,7 +39,6 @@
 #include "nsIMessageManager.h"
 #include "mozilla/RestyleLogging.h"
 
-class nsBidiPresUtils;
 class nsAString;
 class nsIPrintSettings;
 class nsDocShell;
@@ -52,14 +51,10 @@
 class nsFrameManager;
 class nsILinkHandler;
 class nsIAtom;
-class nsICSSPseudoComparator;
-struct nsStyleBackground;
-struct nsStyleBorder;
 class nsIRunnable;
 class gfxUserFontEntry;
 class gfxUserFontSet;
 class gfxTextPerfMetrics;
-struct nsFontFaceRuleContainer;
 class nsPluginFrame;
 class nsTransitionManager;
 class nsAnimationManager;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsPresShell.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsPresShell.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsPresShell.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsPresShell.h	2015-04-24 19:31:14.000000000 +0000
@@ -38,7 +38,6 @@
 #include "mozilla/MemoryReporting.h"
 
 class nsRange;
-class nsIDragService;
 
 struct RangePaintInfo;
 struct nsCallbackEventRequest;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsRefreshDriver.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsRefreshDriver.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/nsRefreshDriver.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/nsRefreshDriver.h	2015-04-24 19:31:14.000000000 +0000
@@ -28,7 +28,6 @@
 class nsIPresShell;
 class nsIDocument;
 class imgIRequest;
-class nsIRunnable;
 
 namespace mozilla {
 class RefreshDriverTimer;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/RestyleManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/RestyleManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/RestyleManager.cpp	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/RestyleManager.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -4185,7 +4185,7 @@
   bool any = false;
   const char* names[] = { "Self", "Subtree", "LaterSiblings", "CSSTransitions",
                           "CSSAnimations", "SVGAttrAnimations", "StyleAttribute",
-                          "Force", "ForceDescendants" };
+                          "StyleAttribute_Animations", "Force", "ForceDescendants" };
   uint32_t hint = aHint & ((1 << ArrayLength(names)) - 1);
   uint32_t rest = aHint & ~((1 << ArrayLength(names)) - 1);
   for (uint32_t i = 0; i < ArrayLength(names); i++) {
@@ -4223,8 +4223,8 @@
     "UpdateSubtreeOverflow", "UpdatePostTransformOverflow",
     "UpdateParentOverflow",
     "ChildrenOnlyTransform", "RecomputePosition", "AddOrRemoveTransform",
-    "BorderStyleNoneChange", "UpdateTextPath", "NeutralChange",
-    "InvalidateRenderingObservers"
+    "BorderStyleNoneChange", "UpdateTextPath", "SchedulePaint",
+    "NeutralChange", "InvalidateRenderingObservers"
   };
   uint32_t hint = aHint & ((1 << ArrayLength(names)) - 1);
   uint32_t rest = aHint & ~((1 << ArrayLength(names)) - 1);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/SelectionCarets.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/SelectionCarets.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/SelectionCarets.h	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/SelectionCarets.h	2015-04-24 19:31:13.000000000 +0000
@@ -18,16 +18,11 @@
 #include "mozilla/EventForwards.h"
 #include "mozilla/WeakPtr.h"
 
-class nsCanvasFrame;
 class nsDocShell;
 class nsFrameSelection;
 class nsIContent;
-class nsIDocument;
-class nsIFrame;
 class nsIPresShell;
 class nsITimer;
-class nsIWidget;
-class nsPresContext;
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/tests/chrome/chrome.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/tests/chrome/chrome.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/base/tests/chrome/chrome.ini	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/base/tests/chrome/chrome.ini	2015-04-24 19:31:14.000000000 +0000
@@ -54,7 +54,7 @@
 [test_fixed_bg_scrolling_repaints.html]
 skip-if = buildapp == 'b2g'
 [test_leaf_layers_partition_browser_window.xul]
-skip-if = (!debug) || (toolkit == "cocoa") || (buildapp == 'b2g') || (toolkit == 'windows') # Disabled on Mac because of Bug 748219
+skip-if = (!debug) || (toolkit == "cocoa") || (buildapp == 'b2g') # Disabled on Mac because of Bug 748219
 [test_no_clip_iframe.xul]
 skip-if = buildapp == 'b2g'
 [test_passpointerevents.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/build/nsContentDLF.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/build/nsContentDLF.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/build/nsContentDLF.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/build/nsContentDLF.h	2015-04-24 19:31:14.000000000 +0000
@@ -11,8 +11,6 @@
 
 class nsIChannel;
 class nsIContentViewer;
-class nsIFile;
-class nsIInputStream;
 class nsILoadGroup;
 class nsIStreamListener;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/build/nsLayoutModule.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/build/nsLayoutModule.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/build/nsLayoutModule.cpp	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/build/nsLayoutModule.cpp	2015-04-24 19:31:14.000000000 +0000
@@ -209,7 +209,7 @@
 #include "nsGeolocation.h"
 #include "nsDeviceSensors.h"
 #ifdef MOZ_GAMEPAD
-#include "mozilla/dom/GamepadService.h"
+#include "mozilla/dom/GamepadServiceTest.h"
 #endif
 #include "mozilla/dom/nsCSPService.h"
 #include "mozilla/dom/nsCSPContext.h"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/crashtests/crashtests.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/crashtests/crashtests.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/crashtests/crashtests.list	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/crashtests/crashtests.list	2015-04-24 19:31:14.000000000 +0000
@@ -47,7 +47,7 @@
 load 513113-1.html
 load 538062-1.xhtml
 load 570624-1.html
-skip-if(B2G) skip-if(asyncPanZoom&&winWidget) load 498698-1.html # bug 833371
+skip-if(B2G) load 498698-1.html # bug 833371
 asserts(1) load 578604-1.html # bug 584564
 asserts(4-7) load 590302-1.xhtml # bug 584564
 load 626014.xhtml
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsComboboxControlFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsComboboxControlFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsComboboxControlFrame.cpp	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsComboboxControlFrame.cpp	2015-04-24 19:31:14.000000000 +0000
@@ -47,6 +47,12 @@
 #include "mozilla/MouseEvents.h"
 #include "mozilla/unused.h"
 
+#ifdef XP_WIN
+#define COMBOBOX_ROLLUP_CONSUME_EVENT 0
+#else
+#define COMBOBOX_ROLLUP_CONSUME_EVENT 1
+#endif
+
 using namespace mozilla;
 using namespace mozilla::gfx;
 
@@ -1109,6 +1115,18 @@
     return NS_OK;
   }
 
+#if COMBOBOX_ROLLUP_CONSUME_EVENT == 0
+  if (aEvent->message == NS_MOUSE_BUTTON_DOWN) {
+    nsIWidget* widget = GetNearestWidget();
+    if (widget && GetContent() == widget->GetLastRollup()) {
+      // This event did a Rollup on this control - prevent it from opening
+      // the dropdown again!
+      *aEventStatus = nsEventStatus_eConsumeNoDefault;
+      return NS_OK;
+    }
+  }
+#endif
+
   // If we have style that affects how we are selected, feed event down to
   // nsFrame::HandleEvent so that selection takes place when appropriate.
   const nsStyleUserInterface* uiStyle = StyleUserInterface();
@@ -1400,10 +1418,7 @@
     return false;
   }
 
-  bool consume = true;
-#ifdef XP_WIN
-  consume = false;
-#endif
+  bool consume = !!COMBOBOX_ROLLUP_CONSUME_EVENT;
   nsWeakFrame weakFrame(this);
   mListControlFrame->AboutToRollup(); // might destroy us
   if (!weakFrame.IsAlive()) {
@@ -1421,6 +1436,9 @@
     viewManager->UpdateWidgetGeometry();
   }
 
+  if (aLastRolledUp) {
+    *aLastRolledUp = GetContent();
+  }
   return consume;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsFileControlFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsFileControlFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsFileControlFrame.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsFileControlFrame.h	2015-04-24 19:31:14.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsIAnonymousContentCreator.h"
 #include "nsCOMPtr.h"
 
-class nsTextControlFrame;
 class nsIDOMDataTransfer;
 
 class nsFileControlFrame : public nsBlockFrame,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsListControlFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsListControlFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsListControlFrame.cpp	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsListControlFrame.cpp	2015-04-24 19:31:14.000000000 +0000
@@ -2092,6 +2092,9 @@
 
   // Don't check defaultPrevented value because other browsers don't prevent
   // the key navigation of list control even if preventDefault() is called.
+  // XXXmats 2015-04-16: the above is not true anymore, Chrome prevents all
+  // XXXmats keyboard events, even tabbing, when preventDefault() is called
+  // XXXmats in onkeydown. That seems sub-optimal though.
 
   const WidgetKeyboardEvent* keyEvent =
     aKeyEvent->GetInternalNSEvent()->AsKeyboardEvent();
@@ -2449,16 +2452,33 @@
 
   nsAutoString eventType;
   aEvent->GetType(eventType);
-  if (eventType.EqualsLiteral("keydown"))
+  if (eventType.EqualsLiteral("keydown")) {
     return mFrame->nsListControlFrame::KeyDown(aEvent);
-  if (eventType.EqualsLiteral("keypress"))
+  }
+  if (eventType.EqualsLiteral("keypress")) {
     return mFrame->nsListControlFrame::KeyPress(aEvent);
-  if (eventType.EqualsLiteral("mousedown"))
+  }
+  if (eventType.EqualsLiteral("mousedown")) {
+    bool defaultPrevented = false;
+    aEvent->GetDefaultPrevented(&defaultPrevented);
+    if (defaultPrevented) {
+      return NS_OK;
+    }
     return mFrame->nsListControlFrame::MouseDown(aEvent);
-  if (eventType.EqualsLiteral("mouseup"))
+  }
+  if (eventType.EqualsLiteral("mouseup")) {
+    bool defaultPrevented = false;
+    aEvent->GetDefaultPrevented(&defaultPrevented);
+    if (defaultPrevented) {
+      return NS_OK;
+    }
     return mFrame->nsListControlFrame::MouseUp(aEvent);
-  if (eventType.EqualsLiteral("mousemove"))
+  }
+  if (eventType.EqualsLiteral("mousemove")) {
+    // I don't think we want to honor defaultPrevented on mousemove
+    // in general, and it would only prevent highlighting here.
     return mFrame->nsListControlFrame::MouseMove(aEvent);
+  }
 
   NS_ABORT();
   return NS_OK;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsListControlFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsListControlFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsListControlFrame.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsListControlFrame.h	2015-04-24 19:31:14.000000000 +0000
@@ -29,8 +29,6 @@
 #undef KeyPress
 #endif
 
-class nsIDOMHTMLSelectElement;
-class nsIDOMHTMLOptionsCollection;
 class nsIComboboxControlFrame;
 class nsPresContext;
 class nsListEventListener;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsMeterFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsMeterFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsMeterFrame.cpp	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsMeterFrame.cpp	2015-04-24 19:31:14.000000000 +0000
@@ -135,7 +135,7 @@
                              const nsHTMLReflowState& aReflowState,
                              nsReflowStatus&          aStatus)
 {
-  bool vertical = StyleDisplay()->mOrient == NS_STYLE_ORIENT_VERTICAL;
+  bool vertical = ResolvedOrientationIsVertical();
   WritingMode wm = aBarFrame->GetWritingMode();
   LogicalSize availSize = aReflowState.ComputedSize(wm);
   availSize.BSize(wm) = NS_UNCONSTRAINEDSIZE;
@@ -158,7 +158,7 @@
 
   size = NSToCoordRound(size * position);
 
-  if (!vertical && StyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL) {
+  if (!vertical && (wm.IsVertical() ? wm.IsVerticalRL() : !wm.IsBidiLTR())) {
     xoffset += aReflowState.ComputedWidth() - size;
   }
 
@@ -230,7 +230,7 @@
   LogicalSize autoSize(wm);
   autoSize.BSize(wm) = autoSize.ISize(wm) = fontMet->Font().size; // 1em
 
-  if (StyleDisplay()->mOrient == NS_STYLE_ORIENT_VERTICAL) {
+  if (ResolvedOrientationIsVertical()) {
     autoSize.Height(wm) *= 5; // 5em
   } else {
     autoSize.Width(wm) *= 5; // 5em
@@ -246,15 +246,14 @@
   NS_ENSURE_SUCCESS(
       nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet)), 0);
 
-  nscoord minWidth = fontMet->Font().size; // 1em
+  nscoord minISize = fontMet->Font().size; // 1em
 
-  if (StyleDisplay()->mOrient == NS_STYLE_ORIENT_AUTO ||
-      StyleDisplay()->mOrient == NS_STYLE_ORIENT_HORIZONTAL) {
-    // The orientation is horizontal
-    minWidth *= 5; // 5em
+  if (ResolvedOrientationIsVertical() == GetWritingMode().IsVertical()) {
+    // The orientation is inline
+    minISize *= 5; // 5em
   }
 
-  return minWidth;
+  return minISize;
 }
 
 nscoord
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsProgressFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsProgressFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsProgressFrame.cpp	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsProgressFrame.cpp	2015-04-24 19:31:14.000000000 +0000
@@ -139,7 +139,7 @@
                                 const nsHTMLReflowState& aReflowState,
                                 nsReflowStatus&          aStatus)
 {
-  bool vertical = StyleDisplay()->mOrient == NS_STYLE_ORIENT_VERTICAL;
+  bool vertical = ResolvedOrientationIsVertical();
   WritingMode wm = aBarFrame->GetWritingMode();
   LogicalSize availSize = aReflowState.ComputedSize(wm);
   availSize.BSize(wm) = NS_UNCONSTRAINEDSIZE;
@@ -158,7 +158,7 @@
     size *= position;
   }
 
-  if (!vertical && StyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL) {
+  if (!vertical && (wm.IsVertical() ? wm.IsVerticalRL() : !wm.IsBidiLTR())) {
     xoffset += aReflowState.ComputedWidth() - size;
   }
 
@@ -236,7 +236,7 @@
     NSToCoordRound(StyleFont()->mFont.size *
                    nsLayoutUtils::FontSizeInflationFor(this)); // 1em
 
-  if (StyleDisplay()->mOrient == NS_STYLE_ORIENT_VERTICAL) {
+  if (ResolvedOrientationIsVertical()) {
     autoSize.Height(wm) *= 10; // 10em
   } else {
     autoSize.Width(wm) *= 10; // 10em
@@ -252,15 +252,14 @@
   NS_ENSURE_SUCCESS(
       nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet)), 0);
 
-  nscoord minWidth = fontMet->Font().size; // 1em
+  nscoord minISize = fontMet->Font().size; // 1em
 
-  if (StyleDisplay()->mOrient == NS_STYLE_ORIENT_AUTO ||
-      StyleDisplay()->mOrient == NS_STYLE_ORIENT_HORIZONTAL) {
-    // The orientation is horizontal
-    minWidth *= 10; // 10em
+  if (ResolvedOrientationIsVertical() == GetWritingMode().IsVertical()) {
+    // The orientation is inline
+    minISize *= 10; // 10em
   }
 
-  return minWidth;
+  return minISize;
 }
 
 nscoord
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsProgressFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsProgressFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsProgressFrame.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsProgressFrame.h	2015-04-24 19:31:14.000000000 +0000
@@ -11,8 +11,6 @@
 #include "nsIAnonymousContentCreator.h"
 #include "nsCOMPtr.h"
 
-class nsBaseContentList;
-
 class nsProgressFrame : public nsContainerFrame,
                         public nsIAnonymousContentCreator
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsRangeFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsRangeFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/forms/nsRangeFrame.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/forms/nsRangeFrame.h	2015-04-24 19:31:14.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsIDOMEventListener.h"
 #include "nsCOMPtr.h"
 
-class nsBaseContentList;
 class nsDisplayRangeFocusRing;
 
 class nsRangeFrame : public nsContainerFrame,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/crashtests/1156222.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/crashtests/1156222.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/crashtests/1156222.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/crashtests/1156222.html	2015-04-24 19:31:14.000000000 +0000
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+<div><span dir="rtl"></span><audio style="display: ruby-base;"></audio></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/crashtests/1157011.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/crashtests/1157011.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/crashtests/1157011.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/crashtests/1157011.html	2015-04-24 19:31:14.000000000 +0000
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<html>
+<body style="display: inline-flex;"><div><div style="display: ruby-base;">f<br style="display: ruby-base-container;"></div></div></body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/crashtests/crashtests.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/crashtests/crashtests.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/crashtests/crashtests.list	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/crashtests/crashtests.list	2015-04-24 19:31:15.000000000 +0000
@@ -363,7 +363,7 @@
 load 499138.html
 load 499862-1.html
 load 499857-1.html
-asserts-if(winWidget,0-3) skip-if(asyncPanZoom&&winWidget) load 499885-1.xhtml
+asserts-if(winWidget,0-3) load 499885-1.xhtml
 load 501535-1.html
 load 503961-1.xhtml
 load 503961-2.html
@@ -582,3 +582,5 @@
 load 1146103.html
 load 1146107.html
 load 1146114.html
+load 1156222.html
+load 1157011.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsBlockFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsBlockFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsBlockFrame.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsBlockFrame.h	2015-04-24 19:31:15.000000000 +0000
@@ -44,7 +44,6 @@
 class nsBlockReflowState;
 class nsBlockInFlowLineIterator;
 class nsBulletFrame;
-class nsFirstLineFrame;
 
 /**
  * Some invariants:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsBlockReflowContext.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsBlockReflowContext.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsBlockReflowContext.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsBlockReflowContext.h	2015-04-24 19:31:15.000000000 +0000
@@ -16,8 +16,6 @@
 struct nsHTMLReflowState;
 class nsLineBox;
 class nsPresContext;
-class nsLineLayout;
-struct nsBlockHorizontalAlign;
 
 /**
  * An encapsulation of the state and algorithm for reflowing block frames.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsBRFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsBRFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsBRFrame.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsBRFrame.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -96,9 +96,13 @@
   aMetrics.SetBlockStartAscent(0);
 
   // Only when the BR is operating in a line-layout situation will it
-  // behave like a BR. BR is suppressed when it is inside ruby frames.
+  // behave like a BR. Additionally, we suppress breaks from BR inside
+  // of ruby frames. To determine if we're inside ruby, we have to rely
+  // on the *parent's* ShouldSuppressLineBreak() method, instead of our
+  // own, because we may have custom "display" value that makes our
+  // ShouldSuppressLineBreak() return false.
   nsLineLayout* ll = aReflowState.mLineLayout;
-  if (ll && !StyleContext()->ShouldSuppressLineBreak()) {
+  if (ll && !GetParent()->StyleContext()->ShouldSuppressLineBreak()) {
     // Note that the compatibility mode check excludes AlmostStandards
     // mode, since this is the inline box model.  See bug 161691.
     if ( ll->LineIsEmpty() ||
@@ -165,7 +169,7 @@
 BRFrame::AddInlineMinISize(nsRenderingContext *aRenderingContext,
                            nsIFrame::InlineMinISizeData *aData)
 {
-  if (!StyleContext()->ShouldSuppressLineBreak()) {
+  if (!GetParent()->StyleContext()->ShouldSuppressLineBreak()) {
     aData->ForceBreak(aRenderingContext);
   }
 }
@@ -174,7 +178,7 @@
 BRFrame::AddInlinePrefISize(nsRenderingContext *aRenderingContext,
                             nsIFrame::InlinePrefISizeData *aData)
 {
-  if (!StyleContext()->ShouldSuppressLineBreak()) {
+  if (!GetParent()->StyleContext()->ShouldSuppressLineBreak()) {
     aData->ForceBreak(aRenderingContext);
   }
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsContainerFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsContainerFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsContainerFrame.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsContainerFrame.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -1679,6 +1679,24 @@
   return frame;
 }
 
+bool
+nsContainerFrame::ResolvedOrientationIsVertical()
+{
+  uint8_t orient = StyleDisplay()->mOrient;
+  switch (orient) {
+    case NS_STYLE_ORIENT_HORIZONTAL:
+      return false;
+    case NS_STYLE_ORIENT_VERTICAL:
+      return true;
+    case NS_STYLE_ORIENT_INLINE:
+      return GetWritingMode().IsVertical();
+    case NS_STYLE_ORIENT_BLOCK:
+      return !GetWritingMode().IsVertical();
+  }
+  NS_NOTREACHED("unexpected -moz-orient value");
+  return false;
+}
+
 nsOverflowContinuationTracker::nsOverflowContinuationTracker(nsContainerFrame* aFrame,
                                                              bool              aWalkOOFFrames,
                                                              bool              aSkipOverflowContainerChildren)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsContainerFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsContainerFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsContainerFrame.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsContainerFrame.h	2015-04-24 19:31:15.000000000 +0000
@@ -613,6 +613,12 @@
 
   // ==========================================================================
 
+  // Helper used by Progress and Meter frames. Returns true if the bar should
+  // be rendered vertically, based on writing-mode and -moz-orient properties.
+  bool ResolvedOrientationIsVertical();
+
+  // ==========================================================================
+
   nsFrameList mFrames;
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsFrame.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsFrame.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -57,6 +57,7 @@
 #include "FrameLayerBuilder.h"
 
 #include "nsBidiPresUtils.h"
+#include "RubyUtils.h"
 
 // For triple-click pref
 #include "imgIContainer.h"
@@ -481,10 +482,11 @@
   }
 
   nsIContent *content = aFrame->GetContent();
+  nsIAtom* frameType = aFrame->GetType();
   bool isInline = (aFrame->GetDisplay() == NS_STYLE_DISPLAY_INLINE ||
-                   aFrame->StyleDisplay()->IsRubyDisplayType() ||
+                   RubyUtils::IsRubyBox(frameType) ||
                    (aFrame->IsFloating() &&
-                    aFrame->GetType() == nsGkAtoms::letterFrame) ||
+                    frameType == nsGkAtoms::letterFrame) ||
                    // Given multiple frames for the same node, only the
                    // outer one should be considered a container.
                    // (Important, e.g., for nsSelectsAreaFrame.)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsFrame.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsFrame.h	2015-04-24 19:31:15.000000000 +0000
@@ -97,7 +97,6 @@
 //----------------------------------------------------------------------
 
 struct nsBoxLayoutMetrics;
-class nsDisplayBackgroundImage;
 struct nsRect;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsFrameSelection.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsFrameSelection.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsFrameSelection.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsFrameSelection.h	2015-04-24 19:31:15.000000000 +0000
@@ -20,7 +20,6 @@
 #include "nsBidiPresUtils.h"
 
 class nsRange;
-class nsTableOuterFrame;
 
 // IID for the nsFrameSelection interface
 // 3c6ae2d0-4cf1-44a1-9e9d-2411867f19c6
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsGfxScrollFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsGfxScrollFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsGfxScrollFrame.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsGfxScrollFrame.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -395,7 +395,7 @@
   aState->mShowVScrollbar = aAssumeVScroll;
   nsPoint scrollPortOrigin(aState->mComputedBorder.left,
                            aState->mComputedBorder.top);
-  if (mHelper.GetScrollbarSide() == ScrollFrameHelper::eScrollbarOnLeft) {
+  if (!mHelper.IsScrollbarOnRight()) {
     scrollPortOrigin.x += vScrollbarActualWidth;
   }
   mHelper.mScrollPort = nsRect(scrollPortOrigin, scrollPortSize);
@@ -1009,7 +1009,7 @@
   if (mVScrollbarBox) {
     nsSize size = mVScrollbarBox->GetPrefSize(*aState);
     nsBox::AddMargin(mVScrollbarBox, size);
-    if (GetScrollbarSide() == eScrollbarOnRight)
+    if (IsScrollbarOnRight())
       result.left = size.width;
     else
       result.right = size.width;
@@ -3001,7 +3001,7 @@
     if (aBuilder->IsPaintingToWindow() &&
         !mShouldBuildScrollableLayer &&
         shouldBuildLayer &&
-        gfxPrefs::LayoutEventRegionsEnabled())
+        aBuilder->IsBuildingLayerEventRegions())
     {
       inactiveRegionItem = new (aBuilder) nsDisplayLayerEventRegions(aBuilder, mScrolledFrame);
       inactiveRegionItem->AddInactiveScrollPort(mScrollPort + aBuilder->ToReferenceFrame(mOuter));
@@ -3766,7 +3766,7 @@
     nsAutoString dir;
     switch (resizeStyle) {
       case NS_STYLE_RESIZE_HORIZONTAL:
-        if (GetScrollbarSide() == eScrollbarOnRight) {
+        if (IsScrollbarOnRight()) {
           dir.AssignLiteral("right");
         }
         else {
@@ -4213,8 +4213,8 @@
   return wm.IsVertical() ? wm.IsVerticalLR() : wm.IsBidiLTR();
 }
 
-ScrollFrameHelper::eScrollbarSide
-ScrollFrameHelper::GetScrollbarSide() const
+bool
+ScrollFrameHelper::IsScrollbarOnRight() const
 {
   nsPresContext *presContext = mOuter->PresContext();
 
@@ -4222,19 +4222,18 @@
   // layout.scrollbar.side. For non-top-level elements, it depends only on the
   // directionaliy of the element (equivalent to a value of "1" for the pref).
   if (!mIsRoot)
-    return IsLTR() ? eScrollbarOnRight : eScrollbarOnLeft;
+    return IsLTR();
   switch (presContext->GetCachedIntPref(kPresContext_ScrollbarSide)) {
     default:
     case 0: // UI directionality
-      return (presContext->GetCachedIntPref(kPresContext_BidiDirection)
-              == IBMBIDI_TEXTDIRECTION_LTR)
-        ? eScrollbarOnRight : eScrollbarOnLeft;
+      return presContext->GetCachedIntPref(kPresContext_BidiDirection)
+             == IBMBIDI_TEXTDIRECTION_LTR;
     case 1: // Document / content directionality
-      return IsLTR() ? eScrollbarOnRight : eScrollbarOnLeft;
+      return IsLTR();
     case 2: // Always right
-      return eScrollbarOnRight;
+      return true;
     case 3: // Always left
-      return eScrollbarOnLeft;
+      return false;
   }
 }
 
@@ -4272,8 +4271,7 @@
 nsresult
 nsXULScrollFrame::Layout(nsBoxLayoutState& aState)
 {
-  bool scrollbarRight =
-    (mHelper.GetScrollbarSide() == ScrollFrameHelper::eScrollbarOnRight);
+  bool scrollbarRight = mHelper.IsScrollbarOnRight();
   bool scrollbarBottom = true;
 
   // get the content rect
@@ -4740,7 +4738,7 @@
                "This should have been suppressed");
 
   bool hasResizer = HasResizer();
-  bool scrollbarOnLeft = (GetScrollbarSide() == eScrollbarOnLeft);
+  bool scrollbarOnLeft = !IsScrollbarOnRight();
 
   // place the scrollcorner
   if (mScrollCornerBox || mResizerBox) {
@@ -4806,14 +4804,9 @@
     vRect.width = aContentArea.width - mScrollPort.width;
     vRect.x = scrollbarOnLeft ? aContentArea.x : mScrollPort.XMost();
     if (mHasVerticalScrollbar) {
-      nsScrollbarFrame* scrollbar = do_QueryFrame(mVScrollbarBox);
-      NS_ASSERTION(scrollbar, "Frame must be a scrollbar");
-
-      if (scrollbar) {
-        nsMargin margin;
-        scrollbar->GetScrollbarMargin(margin, GetScrollbarSide());
-        vRect.Deflate(margin);
-      }
+      nsMargin margin;
+      mVScrollbarBox->GetMargin(margin);
+      vRect.Deflate(margin);
     }
     AdjustScrollbarRectForResizer(mOuter, presContext, vRect, hasResizer, true);
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsGfxScrollFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsGfxScrollFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsGfxScrollFrame.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsGfxScrollFrame.h	2015-04-24 19:31:15.000000000 +0000
@@ -27,7 +27,6 @@
 class nsIPresShell;
 class nsIContent;
 class nsIAtom;
-class nsIScrollFrameInternal;
 class nsPresState;
 class nsIScrollPositionListener;
 struct ScrollReflowState;
@@ -307,8 +306,7 @@
   nsMargin GetDesiredScrollbarSizes(nsBoxLayoutState* aState);
   nscoord GetNondisappearingScrollbarWidth(nsBoxLayoutState* aState);
   bool IsLTR() const;
-  enum eScrollbarSide { eScrollbarOnLeft, eScrollbarOnRight };
-  eScrollbarSide GetScrollbarSide() const;
+  bool IsScrollbarOnRight() const;
   bool IsScrollingActive(nsDisplayListBuilder* aBuilder) const;
   bool IsMaybeScrollingActive() const;
   bool IsProcessingAsyncScroll() const {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsHTMLParts.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsHTMLParts.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsHTMLParts.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsHTMLParts.h	2015-04-24 19:31:15.000000000 +0000
@@ -14,14 +14,12 @@
 class nsIAtom;
 class nsNodeInfoManager;
 class nsIContent;
-class nsIContentIterator;
 class nsIDocument;
 class nsIFrame;
 class nsIHTMLContentSink;
 class nsIFragmentContentSink;
 class nsStyleContext;
 class nsIURI;
-class nsString;
 class nsIPresShell;
 class nsIChannel;
 class nsTableColFrame;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsIAnonymousContentCreator.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsIAnonymousContentCreator.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsIAnonymousContentCreator.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsIAnonymousContentCreator.h	2015-04-24 19:31:15.000000000 +0000
@@ -15,7 +15,6 @@
 #include "nsStyleContext.h"
 #include "nsTArrayForwardDeclare.h"
 
-class nsBaseContentList;
 class nsIContent;
 class nsIFrame;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsIFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsIFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsIFrame.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsIFrame.h	2015-04-24 19:31:15.000000000 +0000
@@ -59,14 +59,12 @@
  */
 
 struct nsHTMLReflowState;
-class nsHTMLReflowCommand;
 class nsIAtom;
 class nsPresContext;
 class nsIPresShell;
 class nsRenderingContext;
 class nsView;
 class nsIWidget;
-class nsIDOMRange;
 class nsISelectionController;
 class nsBoxLayoutState;
 class nsBoxLayout;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsPluginFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsPluginFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsPluginFrame.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsPluginFrame.h	2015-04-24 19:31:15.000000000 +0000
@@ -29,7 +29,6 @@
 class nsPresContext;
 class nsRootPresContext;
 class nsDisplayPlugin;
-class nsIOSurface;
 class PluginBackgroundSink;
 class nsPluginInstanceOwner;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsRubyFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsRubyFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsRubyFrame.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsRubyFrame.h	2015-04-24 19:31:15.000000000 +0000
@@ -12,7 +12,6 @@
 #include "nsInlineFrame.h"
 
 class nsRubyBaseContainerFrame;
-class nsRubyTextContainerFrame;
 
 typedef nsInlineFrame nsRubyFrameSuper;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsTextFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsTextFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/nsTextFrame.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/nsTextFrame.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -6008,7 +6008,7 @@
 
   uint32_t offset = *aStartOffset;
   uint32_t maxLength = *aMaxLength;
-  const nscoord frameWidth = GetSize().width;
+  const nscoord frameISize = ISize();
   const bool rtl = mTextRun->IsRightToLeft();
   gfxFloat advanceWidth = 0;
   const nscoord startEdge = rtl ? aRightEdge : aLeftEdge;
@@ -6032,7 +6032,7 @@
 
   const nscoord endEdge = rtl ? aLeftEdge : aRightEdge;
   if (endEdge > 0) {
-    const gfxFloat maxAdvance = gfxFloat(frameWidth - endEdge);
+    const gfxFloat maxAdvance = gfxFloat(frameISize - endEdge);
     while (maxLength > 0) {
       uint32_t clusterLength =
         GetClusterLength(mTextRun, offset, maxLength, rtl);
@@ -6048,7 +6048,7 @@
     }
     maxLength = offset - *aStartOffset;
     nscoord* snappedEndEdge = rtl ? aSnappedLeftEdge : aSnappedRightEdge;
-    *snappedEndEdge = NSToCoordFloor(gfxFloat(frameWidth) - advanceWidth);
+    *snappedEndEdge = NSToCoordFloor(gfxFloat(frameISize) - advanceWidth);
   }
   *aMaxLength = maxLength;
   return maxLength != 0;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/RubyUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/RubyUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/RubyUtils.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/RubyUtils.h	2015-04-24 19:31:14.000000000 +0000
@@ -53,13 +53,28 @@
 class RubyUtils
 {
 public:
+  static inline bool IsRubyContentBox(nsIAtom* aFrameType)
+  {
+    return aFrameType == nsGkAtoms::rubyBaseFrame ||
+           aFrameType == nsGkAtoms::rubyTextFrame;
+  }
+
+  static inline bool IsRubyContainerBox(nsIAtom* aFrameType)
+  {
+    return aFrameType == nsGkAtoms::rubyBaseContainerFrame ||
+           aFrameType == nsGkAtoms::rubyTextContainerFrame;
+  }
+
+  static inline bool IsRubyBox(nsIAtom* aFrameType)
+  {
+    return aFrameType == nsGkAtoms::rubyFrame ||
+      IsRubyContentBox(aFrameType) || IsRubyContainerBox(aFrameType);
+  }
+
   static inline bool IsExpandableRubyBox(nsIFrame* aFrame)
   {
     nsIAtom* type = aFrame->GetType();
-    return type == nsGkAtoms::rubyBaseFrame ||
-           type == nsGkAtoms::rubyTextFrame ||
-           type == nsGkAtoms::rubyBaseContainerFrame ||
-           type == nsGkAtoms::rubyTextContainerFrame;
+    return IsRubyContentBox(type) || IsRubyContainerBox(type);
   }
 
   static void SetReservedISize(nsIFrame* aFrame, nscoord aISize);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/ScrollbarActivity.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/ScrollbarActivity.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/ScrollbarActivity.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/ScrollbarActivity.h	2015-04-24 19:31:14.000000000 +0000
@@ -15,7 +15,6 @@
 class nsIContent;
 class nsIScrollbarMediator;
 class nsITimer;
-class nsIAtom;
 
 namespace mozilla {
 namespace layout {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/TextOverflow.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/TextOverflow.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/TextOverflow.cpp	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/TextOverflow.cpp	2015-04-24 19:31:14.000000000 +0000
@@ -49,7 +49,9 @@
     nsLayoutUtils::FontSizeInflationFor(aFrame));
   LazyReferenceRenderingContextGetterFromFrame lazyRefContextGetter(aFrame);
   return fm->GetThebesFontGroup()->GetEllipsisTextRun(
-      aFrame->PresContext()->AppUnitsPerDevPixel(), lazyRefContextGetter);
+    aFrame->PresContext()->AppUnitsPerDevPixel(),
+    nsLayoutUtils::GetTextRunOrientFlagsForStyle(aFrame->StyleContext()),
+    lazyRefContextGetter);
 }
 
 static nsIFrame*
@@ -87,7 +89,7 @@
 }
 
 static bool
-IsHorizontalOverflowVisible(nsIFrame* aFrame)
+IsInlineAxisOverflowVisible(nsIFrame* aFrame)
 {
   NS_PRECONDITION(nsLayoutUtils::GetAsBlock(aFrame) != nullptr,
                   "expected a block frame");
@@ -97,7 +99,12 @@
          f->GetType() != nsGkAtoms::scrollFrame) {
     f = f->GetParent();
   }
-  return !f || f->StyleDisplay()->mOverflowX == NS_STYLE_OVERFLOW_VISIBLE;
+  if (!f) {
+    return true;
+  }
+  auto overflow = aFrame->GetWritingMode().IsVertical() ?
+    f->StyleDisplay()->mOverflowY : f->StyleDisplay()->mOverflowX;
+  return overflow == NS_STYLE_OVERFLOW_VISIBLE;
 }
 
 static void
@@ -123,17 +130,17 @@
 }
 
 static void
-InflateLeft(nsRect* aRect, nscoord aDelta)
+InflateIStart(WritingMode aWM, LogicalRect* aRect, nscoord aDelta)
 {
-  nscoord xmost = aRect->XMost();
-  aRect->x -= aDelta;
-  aRect->width = std::max(xmost - aRect->x, 0);
+  nscoord iend = aRect->IEnd(aWM);
+  aRect->IStart(aWM) -= aDelta;
+  aRect->ISize(aWM) = std::max(iend - aRect->IStart(aWM), 0);
 }
 
 static void
-InflateRight(nsRect* aRect, nscoord aDelta)
+InflateIEnd(WritingMode aWM, LogicalRect* aRect, nscoord aDelta)
 {
-  aRect->width = std::max(aRect->width + aDelta, 0);
+  aRect->ISize(aWM) = std::max(aRect->ISize(aWM) + aDelta, 0);
 }
 
 static bool
@@ -218,10 +225,21 @@
 nsDisplayTextOverflowMarker::PaintTextToContext(nsRenderingContext* aCtx,
                                                 nsPoint aOffsetFromRect)
 {
-  gfxFloat y = nsLayoutUtils::GetSnappedBaselineY(mFrame, aCtx->ThebesContext(),
-                                                  mRect.y, mAscent);
-  nsPoint baselinePt(mRect.x, NSToCoordFloor(y));
-  nsPoint pt = baselinePt + aOffsetFromRect;
+  WritingMode wm = mFrame->GetWritingMode();
+  nsPoint pt(mRect.x, mRect.y);
+  if (wm.IsVertical()) {
+    if (wm.IsVerticalLR()) {
+      pt.x = NSToCoordFloor(nsLayoutUtils::GetSnappedBaselineX(
+        mFrame, aCtx->ThebesContext(), pt.x, mAscent));
+    } else {
+      pt.x = NSToCoordFloor(nsLayoutUtils::GetSnappedBaselineX(
+        mFrame, aCtx->ThebesContext(), pt.x + mRect.width, -mAscent));
+    }
+  } else {
+    pt.y = NSToCoordFloor(nsLayoutUtils::GetSnappedBaselineY(
+      mFrame, aCtx->ThebesContext(), pt.y, mAscent));
+  }
+  pt += aOffsetFromRect;
 
   if (mStyle->mType == NS_STYLE_TEXT_OVERFLOW_ELLIPSIS) {
     gfxTextRun* textRun = GetEllipsisTextRun(mFrame);
@@ -241,17 +259,18 @@
   }
 }
 
-void
-TextOverflow::Init(nsDisplayListBuilder*   aBuilder,
-                   nsIFrame*               aBlockFrame)
+TextOverflow::TextOverflow(nsDisplayListBuilder* aBuilder,
+                           nsIFrame* aBlockFrame)
+  : mContentArea(aBlockFrame->GetWritingMode(),
+                 aBlockFrame->GetContentRectRelativeToSelf(),
+                 aBlockFrame->GetRect().width)
+  , mBuilder(aBuilder)
+  , mBlock(aBlockFrame)
+  , mScrollableFrame(nsLayoutUtils::GetScrollableFrameFor(aBlockFrame))
+  , mBlockWidth(aBlockFrame->GetRect().width)
+  , mBlockWM(aBlockFrame->GetWritingMode())
+  , mAdjustForPixelSnapping(false)
 {
-  mBuilder = aBuilder;
-  mBlock = aBlockFrame;
-  mContentArea = aBlockFrame->GetContentRectRelativeToSelf();
-  mScrollableFrame = nsLayoutUtils::GetScrollableFrameFor(aBlockFrame);
-  uint8_t direction = aBlockFrame->StyleVisibility()->mDirection;
-  mBlockIsRTL = direction == NS_STYLE_DIRECTION_RTL;
-  mAdjustForPixelSnapping = false;
 #ifdef MOZ_XUL
   if (!mScrollableFrame) {
     nsIAtom* pseudoType = aBlockFrame->StyleContext()->GetPseudo();
@@ -262,26 +281,36 @@
       // for RTL blocks (also for overflow:hidden), so we need to move
       // the edges 1px outward in ExamineLineFrames to avoid triggering
       // a text-overflow marker in this case.
-      mAdjustForPixelSnapping = mBlockIsRTL;
+      mAdjustForPixelSnapping = !mBlockWM.IsBidiLTR();
     }
   }
 #endif
-  mCanHaveHorizontalScrollbar = false;
+  mCanHaveInlineAxisScrollbar = false;
   if (mScrollableFrame) {
-    mCanHaveHorizontalScrollbar =
-      mScrollableFrame->GetScrollbarStyles().mHorizontal != NS_STYLE_OVERFLOW_HIDDEN;
+    auto scrollbarStyle = mBlockWM.IsVertical() ?
+      mScrollableFrame->GetScrollbarStyles().mVertical :
+      mScrollableFrame->GetScrollbarStyles().mHorizontal;
+    mCanHaveInlineAxisScrollbar = scrollbarStyle != NS_STYLE_OVERFLOW_HIDDEN;
     if (!mAdjustForPixelSnapping) {
       // Scrolling to the end position can leave some text still overflowing due
       // to pixel snapping behaviour in our scrolling code.
-      mAdjustForPixelSnapping = mCanHaveHorizontalScrollbar;
+      mAdjustForPixelSnapping = mCanHaveInlineAxisScrollbar;
     }
-    mContentArea.MoveBy(mScrollableFrame->GetScrollPosition());
+    mContentArea.MoveBy(mBlockWM,
+                        LogicalPoint(mBlockWM,
+                                     mScrollableFrame->GetScrollPosition(), 0));
     nsIFrame* scrollFrame = do_QueryFrame(mScrollableFrame);
     scrollFrame->AddStateBits(NS_SCROLLFRAME_INVALIDATE_CONTENTS_ON_SCROLL);
   }
+  uint8_t direction = aBlockFrame->StyleVisibility()->mDirection;
   const nsStyleTextReset* style = aBlockFrame->StyleTextReset();
-  mLeft.Init(style->mTextOverflow.GetLeft(direction));
-  mRight.Init(style->mTextOverflow.GetRight(direction));
+  if (mBlockWM.IsBidiLTR()) {
+    mIStart.Init(style->mTextOverflow.GetLeft(direction));
+    mIEnd.Init(style->mTextOverflow.GetRight(direction));
+  } else {
+    mIStart.Init(style->mTextOverflow.GetRight(direction));
+    mIEnd.Init(style->mTextOverflow.GetLeft(direction));
+  }
   // The left/right marker string is setup in ExamineLineFrames when a line
   // has overflow on that side.
 }
@@ -298,15 +327,13 @@
     // If the APZ is actively scrolling this, don't bother with markers.
     return nullptr;
   }
-  nsAutoPtr<TextOverflow> textOverflow(new TextOverflow);
-  textOverflow->Init(aBuilder, aBlockFrame);
-  return textOverflow.forget();
+  return new TextOverflow(aBuilder, aBlockFrame);
 }
 
 void
 TextOverflow::ExamineFrameSubtree(nsIFrame*       aFrame,
-                                  const nsRect&   aContentArea,
-                                  const nsRect&   aInsideMarkersArea,
+                                  const LogicalRect& aContentArea,
+                                  const LogicalRect& aInsideMarkersArea,
                                   FrameHashtable* aFramesToHide,
                                   AlignmentEdges* aAlignmentEdges,
                                   bool*           aFoundVisibleTextOrAtomic,
@@ -319,18 +346,20 @@
   }
   const bool isAtomic = IsAtomicElement(aFrame, frameType);
   if (aFrame->StyleVisibility()->IsVisible()) {
-    nsRect childRect = aFrame->GetScrollableOverflowRect() +
-                       aFrame->GetOffsetTo(mBlock);
-    bool overflowLeft = childRect.x < aContentArea.x;
-    bool overflowRight = childRect.XMost() > aContentArea.XMost();
-    if (overflowLeft) {
-      mLeft.mHasOverflow = true;
+    LogicalRect childRect =
+      GetLogicalScrollableOverflowRectRelativeToBlock(aFrame);
+    bool overflowIStart =
+      childRect.IStart(mBlockWM) < aContentArea.IStart(mBlockWM);
+    bool overflowIEnd =
+      childRect.IEnd(mBlockWM) > aContentArea.IEnd(mBlockWM);
+    if (overflowIStart) {
+      mIStart.mHasOverflow = true;
     }
-    if (overflowRight) {
-      mRight.mHasOverflow = true;
+    if (overflowIEnd) {
+      mIEnd.mHasOverflow = true;
     }
-    if (isAtomic && ((mLeft.mActive && overflowLeft) ||
-                     (mRight.mActive && overflowRight))) {
+    if (isAtomic && ((mIStart.mActive && overflowIStart) ||
+                     (mIEnd.mActive && overflowIEnd))) {
       aFramesToHide->PutEntry(aFrame);
     } else if (isAtomic || frameType == nsGkAtoms::textFrame) {
       AnalyzeMarkerEdges(aFrame, frameType, aInsideMarkersArea,
@@ -356,66 +385,75 @@
 void
 TextOverflow::AnalyzeMarkerEdges(nsIFrame*       aFrame,
                                  const nsIAtom*  aFrameType,
-                                 const nsRect&   aInsideMarkersArea,
+                                 const LogicalRect& aInsideMarkersArea,
                                  FrameHashtable* aFramesToHide,
                                  AlignmentEdges* aAlignmentEdges,
                                  bool*           aFoundVisibleTextOrAtomic,
                                  InnerClipEdges* aClippedMarkerEdges)
 {
-  nsRect borderRect(aFrame->GetOffsetTo(mBlock), aFrame->GetSize());
-  nscoord leftOverlap =
-    std::max(aInsideMarkersArea.x - borderRect.x, 0);
-  nscoord rightOverlap =
-    std::max(borderRect.XMost() - aInsideMarkersArea.XMost(), 0);
-  bool insideLeftEdge = aInsideMarkersArea.x <= borderRect.XMost();
-  bool insideRightEdge = borderRect.x <= aInsideMarkersArea.XMost();
-
-  if (leftOverlap > 0) {
-    aClippedMarkerEdges->AccumulateLeft(borderRect);
-    if (!mLeft.mActive) {
-      leftOverlap = 0;
-    }
-  }
-  if (rightOverlap > 0) {
-    aClippedMarkerEdges->AccumulateRight(borderRect);
-    if (!mRight.mActive) {
-      rightOverlap = 0;
+  LogicalRect borderRect(mBlockWM,
+                         nsRect(aFrame->GetOffsetTo(mBlock),
+                                aFrame->GetSize()),
+                         mBlockWidth);
+  nscoord istartOverlap = std::max(
+    aInsideMarkersArea.IStart(mBlockWM) - borderRect.IStart(mBlockWM), 0);
+  nscoord iendOverlap = std::max(
+    borderRect.IEnd(mBlockWM) - aInsideMarkersArea.IEnd(mBlockWM), 0);
+  bool insideIStartEdge =
+    aInsideMarkersArea.IStart(mBlockWM) <= borderRect.IEnd(mBlockWM);
+  bool insideIEndEdge =
+    borderRect.IStart(mBlockWM) <= aInsideMarkersArea.IEnd(mBlockWM);
+
+  if (istartOverlap > 0) {
+    aClippedMarkerEdges->AccumulateIStart(mBlockWM, borderRect);
+    if (!mIStart.mActive) {
+      istartOverlap = 0;
+    }
+  }
+  if (iendOverlap > 0) {
+    aClippedMarkerEdges->AccumulateIEnd(mBlockWM, borderRect);
+    if (!mIEnd.mActive) {
+      iendOverlap = 0;
     }
   }
 
-  if ((leftOverlap > 0 && insideLeftEdge) ||
-      (rightOverlap > 0 && insideRightEdge)) {
+  if ((istartOverlap > 0 && insideIStartEdge) ||
+      (iendOverlap > 0 && insideIEndEdge)) {
     if (aFrameType == nsGkAtoms::textFrame) {
-      if (aInsideMarkersArea.x < aInsideMarkersArea.XMost()) {
+      if (aInsideMarkersArea.IStart(mBlockWM) <
+          aInsideMarkersArea.IEnd(mBlockWM)) {
         // a clipped text frame and there is some room between the markers
-        nscoord snappedLeft, snappedRight;
-        bool isFullyClipped =
-          IsFullyClipped(static_cast<nsTextFrame*>(aFrame),
-                         leftOverlap, rightOverlap, &snappedLeft, &snappedRight);
+        nscoord snappedIStart, snappedIEnd;
+        auto textFrame = static_cast<nsTextFrame*>(aFrame);
+        bool isFullyClipped = mBlockWM.IsBidiLTR() ?
+          IsFullyClipped(textFrame, istartOverlap, iendOverlap,
+                         &snappedIStart, &snappedIEnd) :
+          IsFullyClipped(textFrame, iendOverlap, istartOverlap,
+                         &snappedIEnd, &snappedIStart);
         if (!isFullyClipped) {
-          nsRect snappedRect = borderRect;
-          if (leftOverlap > 0) {
-            snappedRect.x += snappedLeft;
-            snappedRect.width -= snappedLeft;
+          LogicalRect snappedRect = borderRect;
+          if (istartOverlap > 0) {
+            snappedRect.IStart(mBlockWM) += snappedIStart;
+            snappedRect.ISize(mBlockWM) -= snappedIStart;
           }
-          if (rightOverlap > 0) {
-            snappedRect.width -= snappedRight;
+          if (iendOverlap > 0) {
+            snappedRect.ISize(mBlockWM) -= snappedIEnd;
           }
-          aAlignmentEdges->Accumulate(snappedRect);
+          aAlignmentEdges->Accumulate(mBlockWM, snappedRect);
           *aFoundVisibleTextOrAtomic = true;
         }
       }
     } else {
       aFramesToHide->PutEntry(aFrame);
     }
-  } else if (!insideLeftEdge || !insideRightEdge) {
+  } else if (!insideIStartEdge || !insideIEndEdge) {
     // frame is outside
     if (IsAtomicElement(aFrame, aFrameType)) {
       aFramesToHide->PutEntry(aFrame);
     }
   } else {
     // frame is inside
-    aAlignmentEdges->Accumulate(borderRect);
+    aAlignmentEdges->Accumulate(mBlockWM, borderRect);
     *aFoundVisibleTextOrAtomic = true;
   }
 }
@@ -426,74 +464,73 @@
                                 AlignmentEdges* aAlignmentEdges)
 {
   // No ellipsing for 'clip' style.
-  bool suppressLeft = mLeft.mStyle->mType == NS_STYLE_TEXT_OVERFLOW_CLIP;
-  bool suppressRight = mRight.mStyle->mType == NS_STYLE_TEXT_OVERFLOW_CLIP;
-  if (mCanHaveHorizontalScrollbar) {
-    nsPoint pos = mScrollableFrame->GetScrollPosition();
-    nsRect scrollRange = mScrollableFrame->GetScrollRange();
+  bool suppressIStart = mIStart.mStyle->mType == NS_STYLE_TEXT_OVERFLOW_CLIP;
+  bool suppressIEnd = mIEnd.mStyle->mType == NS_STYLE_TEXT_OVERFLOW_CLIP;
+  if (mCanHaveInlineAxisScrollbar) {
+    LogicalPoint pos(mBlockWM, mScrollableFrame->GetScrollPosition(),
+                     mBlockWidth);
+    LogicalRect scrollRange(mBlockWM, mScrollableFrame->GetScrollRange(),
+                            mBlockWidth);
     // No ellipsing when nothing to scroll to on that side (this includes
     // overflow:auto that doesn't trigger a horizontal scrollbar).
-    if (pos.x <= scrollRange.x) {
-      suppressLeft = true;
+    if (pos.I(mBlockWM) <= scrollRange.IStart(mBlockWM)) {
+      suppressIStart = true;
     }
-    if (pos.x >= scrollRange.XMost()) {
-      suppressRight = true;
+    if (pos.I(mBlockWM) >= scrollRange.IEnd(mBlockWM)) {
+      suppressIEnd = true;
     }
   }
 
-  nsRect contentArea = mContentArea;
+  LogicalRect contentArea = mContentArea;
   const nscoord scrollAdjust = mAdjustForPixelSnapping ?
     mBlock->PresContext()->AppUnitsPerDevPixel() : 0;
-  InflateLeft(&contentArea, scrollAdjust);
-  InflateRight(&contentArea, scrollAdjust);
-  nsRect lineRect = aLine->GetScrollableOverflowArea();
-  const bool leftOverflow =
-    !suppressLeft && lineRect.x < contentArea.x;
-  const bool rightOverflow =
-    !suppressRight && lineRect.XMost() > contentArea.XMost();
-  if (!leftOverflow && !rightOverflow) {
+  InflateIStart(mBlockWM, &contentArea, scrollAdjust);
+  InflateIEnd(mBlockWM, &contentArea, scrollAdjust);
+  LogicalRect lineRect(mBlockWM, aLine->GetScrollableOverflowArea(),
+                       mBlockWidth);
+  const bool istartOverflow =
+    !suppressIStart && lineRect.IStart(mBlockWM) < contentArea.IStart(mBlockWM);
+  const bool iendOverflow =
+    !suppressIEnd && lineRect.IEnd(mBlockWM) > contentArea.IEnd(mBlockWM);
+  if (!istartOverflow && !iendOverflow) {
     // The line does not overflow on a side we should ellipsize.
     return;
   }
 
   int pass = 0;
   bool retryEmptyLine = true;
-  bool guessLeft = leftOverflow;
-  bool guessRight = rightOverflow;
-  mLeft.mActive = leftOverflow;
-  mRight.mActive = rightOverflow;
-  bool clippedLeftMarker = false;
-  bool clippedRightMarker = false;
+  bool guessIStart = istartOverflow;
+  bool guessIEnd = iendOverflow;
+  mIStart.mActive = istartOverflow;
+  mIEnd.mActive = iendOverflow;
+  bool clippedIStartMarker = false;
+  bool clippedIEndMarker = false;
   do {
     // Setup marker strings as needed.
-    if (guessLeft) {
-      mLeft.SetupString(mBlock);
+    if (guessIStart) {
+      mIStart.SetupString(mBlock);
     }
-    if (guessRight) {
-      mRight.SetupString(mBlock);
+    if (guessIEnd) {
+      mIEnd.SetupString(mBlock);
     }
     
     // If there is insufficient space for both markers then keep the one on the
     // end side per the block's 'direction'.
-    nscoord rightMarkerWidth = mRight.mActive ? mRight.mWidth : 0;
-    nscoord leftMarkerWidth = mLeft.mActive ? mLeft.mWidth : 0;
-    if (leftMarkerWidth && rightMarkerWidth &&
-        leftMarkerWidth + rightMarkerWidth > contentArea.width) {
-      if (mBlockIsRTL) {
-        rightMarkerWidth = 0;
-      } else {
-        leftMarkerWidth = 0;
-      }
+    nscoord istartMarkerISize = mIStart.mActive ? mIStart.mISize : 0;
+    nscoord iendMarkerISize = mIEnd.mActive ? mIEnd.mISize : 0;
+    if (istartMarkerISize && iendMarkerISize &&
+        istartMarkerISize + iendMarkerISize > contentArea.ISize(mBlockWM)) {
+      istartMarkerISize = 0;
     }
 
     // Calculate the area between the potential markers aligned at the
     // block's edge.
-    nsRect insideMarkersArea = mContentArea;
-    if (guessLeft) {
-      InflateLeft(&insideMarkersArea, -leftMarkerWidth);
+    LogicalRect insideMarkersArea = mContentArea;
+    if (guessIStart) {
+      InflateIStart(mBlockWM, &insideMarkersArea, -istartMarkerISize);
     }
-    if (guessRight) {
-      InflateRight(&insideMarkersArea, -rightMarkerWidth);
+    if (guessIEnd) {
+      InflateIEnd(mBlockWM, &insideMarkersArea, -iendMarkerISize);
     }
 
     // Analyze the frames on aLine for the overflow situation at the content
@@ -512,56 +549,57 @@
       aAlignmentEdges->mAssigned = false;
       aFramesToHide->Clear();
       pass = -1;
-      if (mLeft.IsNeeded() && mLeft.mActive && !clippedLeftMarker) {
-        if (clippedMarkerEdges.mAssignedLeft &&
-            clippedMarkerEdges.mLeft - mContentArea.X() > 0) {
-          mLeft.mWidth = clippedMarkerEdges.mLeft - mContentArea.X();
-          NS_ASSERTION(mLeft.mWidth < mLeft.mIntrinsicISize,
-                       "clipping a marker should make it strictly smaller");
-          clippedLeftMarker = true;
+      if (mIStart.IsNeeded() && mIStart.mActive && !clippedIStartMarker) {
+        if (clippedMarkerEdges.mAssignedIStart &&
+            clippedMarkerEdges.mIStart > mContentArea.IStart(mBlockWM)) {
+          mIStart.mISize =
+            clippedMarkerEdges.mIStart - mContentArea.IStart(mBlockWM);
+          NS_ASSERTION(mIStart.mISize < mIStart.mIntrinsicISize,
+                      "clipping a marker should make it strictly smaller");
+          clippedIStartMarker = true;
         } else {
-          mLeft.mActive = guessLeft = false;
+          mIStart.mActive = guessIStart = false;
         }
         continue;
       }
-      if (mRight.IsNeeded() && mRight.mActive && !clippedRightMarker) {
-        if (clippedMarkerEdges.mAssignedRight &&
-            mContentArea.XMost() - clippedMarkerEdges.mRight > 0) {
-          mRight.mWidth = mContentArea.XMost() - clippedMarkerEdges.mRight;
-          NS_ASSERTION(mRight.mWidth < mRight.mIntrinsicISize,
-                       "clipping a marker should make it strictly smaller");
-          clippedRightMarker = true;
+      if (mIEnd.IsNeeded() && mIEnd.mActive && !clippedIEndMarker) {
+        if (clippedMarkerEdges.mAssignedIEnd &&
+            mContentArea.IEnd(mBlockWM) > clippedMarkerEdges.mIEnd) {
+          mIEnd.mISize = mContentArea.IEnd(mBlockWM) - clippedMarkerEdges.mIEnd;
+          NS_ASSERTION(mIEnd.mISize < mIEnd.mIntrinsicISize,
+                      "clipping a marker should make it strictly smaller");
+          clippedIEndMarker = true;
         } else {
-          mRight.mActive = guessRight = false;
+          mIEnd.mActive = guessIEnd = false;
         }
         continue;
       }
       // The line simply has no visible content even without markers,
       // so examine the line again without suppressing markers.
       retryEmptyLine = false;
-      mLeft.mWidth = mLeft.mIntrinsicISize;
-      mLeft.mActive = guessLeft = leftOverflow;
-      mRight.mWidth = mRight.mIntrinsicISize;
-      mRight.mActive = guessRight = rightOverflow;
+      mIStart.mISize = mIStart.mIntrinsicISize;
+      mIStart.mActive = guessIStart = istartOverflow;
+      mIEnd.mISize = mIEnd.mIntrinsicISize;
+      mIEnd.mActive = guessIEnd = iendOverflow;
       continue;
     }
-    if (guessLeft == (mLeft.mActive && mLeft.IsNeeded()) &&
-        guessRight == (mRight.mActive && mRight.IsNeeded())) {
+    if (guessIStart == (mIStart.mActive && mIStart.IsNeeded()) &&
+        guessIEnd == (mIEnd.mActive && mIEnd.IsNeeded())) {
       break;
     } else {
-      guessLeft = mLeft.mActive && mLeft.IsNeeded();
-      guessRight = mRight.mActive && mRight.IsNeeded();
-      mLeft.Reset();
-      mRight.Reset();
+      guessIStart = mIStart.mActive && mIStart.IsNeeded();
+      guessIEnd = mIEnd.mActive && mIEnd.IsNeeded();
+      mIStart.Reset();
+      mIEnd.Reset();
       aFramesToHide->Clear();
     }
     NS_ASSERTION(pass == 0, "2nd pass should never guess wrong");
   } while (++pass != 2);
-  if (!leftOverflow || !mLeft.mActive) {
-    mLeft.Reset();
+  if (!istartOverflow || !mIStart.mActive) {
+    mIStart.Reset();
   }
-  if (!rightOverflow || !mRight.mActive) {
-    mRight.Reset();
+  if (!iendOverflow || !mIEnd.mActive) {
+    mIEnd.Reset();
   }
 }
 
@@ -569,47 +607,44 @@
 TextOverflow::ProcessLine(const nsDisplayListSet& aLists,
                           nsLineBox*              aLine)
 {
-  NS_ASSERTION(mLeft.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP ||
-               mRight.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP,
+  NS_ASSERTION(mIStart.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP ||
+               mIEnd.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP,
                "TextOverflow with 'clip' for both sides");
-  mLeft.Reset();
-  mLeft.mActive = mLeft.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP;
-  mRight.Reset();
-  mRight.mActive = mRight.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP;
+  mIStart.Reset();
+  mIStart.mActive = mIStart.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP;
+  mIEnd.Reset();
+  mIEnd.mActive = mIEnd.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP;
 
   FrameHashtable framesToHide(64);
   AlignmentEdges alignmentEdges;
   ExamineLineFrames(aLine, &framesToHide, &alignmentEdges);
-  bool needLeft = mLeft.IsNeeded();
-  bool needRight = mRight.IsNeeded();
-  if (!needLeft && !needRight) {
+  bool needIStart = mIStart.IsNeeded();
+  bool needIEnd = mIEnd.IsNeeded();
+  if (!needIStart && !needIEnd) {
     return;
   }
-  NS_ASSERTION(mLeft.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP ||
-               !needLeft, "left marker for 'clip'");
-  NS_ASSERTION(mRight.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP ||
-               !needRight, "right marker for 'clip'");
+  NS_ASSERTION(mIStart.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP ||
+               !needIStart, "left marker for 'clip'");
+  NS_ASSERTION(mIEnd.mStyle->mType != NS_STYLE_TEXT_OVERFLOW_CLIP ||
+               !needIEnd, "right marker for 'clip'");
 
   // If there is insufficient space for both markers then keep the one on the
   // end side per the block's 'direction'.
-  if (needLeft && needRight &&
-      mLeft.mWidth + mRight.mWidth > mContentArea.width) {
-    if (mBlockIsRTL) {
-      needRight = false;
-    } else {
-      needLeft = false;
-    }
-  }
-  nsRect insideMarkersArea = mContentArea;
-  if (needLeft) {
-    InflateLeft(&insideMarkersArea, -mLeft.mWidth);
-  }
-  if (needRight) {
-    InflateRight(&insideMarkersArea, -mRight.mWidth);
-  }
-  if (!mCanHaveHorizontalScrollbar && alignmentEdges.mAssigned) {
-    nsRect alignmentRect = nsRect(alignmentEdges.x, insideMarkersArea.y,
-                                  alignmentEdges.Width(), 1);
+  if (needIStart && needIEnd &&
+      mIStart.mISize + mIEnd.mISize > mContentArea.ISize(mBlockWM)) {
+    needIStart = false;
+  }
+  LogicalRect insideMarkersArea = mContentArea;
+  if (needIStart) {
+    InflateIStart(mBlockWM, &insideMarkersArea, -mIStart.mISize);
+  }
+  if (needIEnd) {
+    InflateIEnd(mBlockWM, &insideMarkersArea, -mIEnd.mISize);
+  }
+  if (!mCanHaveInlineAxisScrollbar && alignmentEdges.mAssigned) {
+    LogicalRect alignmentRect(mBlockWM, alignmentEdges.mIStart,
+                              insideMarkersArea.BStart(mBlockWM),
+                              alignmentEdges.ISize(), 1);
     insideMarkersArea.IntersectRect(insideMarkersArea, alignmentRect);
   }
 
@@ -618,13 +653,13 @@
   for (uint32_t i = 0; i < ArrayLength(lists); ++i) {
     PruneDisplayListContents(lists[i], framesToHide, insideMarkersArea);
   }
-  CreateMarkers(aLine, needLeft, needRight, insideMarkersArea);
+  CreateMarkers(aLine, needIStart, needIEnd, insideMarkersArea);
 }
 
 void
-TextOverflow::PruneDisplayListContents(nsDisplayList*        aList,
+TextOverflow::PruneDisplayListContents(nsDisplayList* aList,
                                        const FrameHashtable& aFramesToHide,
-                                       const nsRect&         aInsideMarkersArea)
+                                       const LogicalRect& aInsideMarkersArea)
 {
   nsDisplayList saved;
   nsDisplayItem* item;
@@ -645,23 +680,22 @@
     nsCharClipDisplayItem* charClip = itemFrame ? 
       nsCharClipDisplayItem::CheckCast(item) : nullptr;
     if (charClip && GetSelfOrNearestBlock(itemFrame) == mBlock) {
-      nsRect rect = itemFrame->GetScrollableOverflowRect() +
-                    itemFrame->GetOffsetTo(mBlock);
-      if (mLeft.IsNeeded() && rect.x < aInsideMarkersArea.x) {
-        nscoord left = aInsideMarkersArea.x - rect.x;
-        if (MOZ_UNLIKELY(left < 0)) {
-          item->~nsDisplayItem();
-          continue;
+      LogicalRect rect =
+        GetLogicalScrollableOverflowRectRelativeToBlock(itemFrame);
+      if (mIStart.IsNeeded()) {
+        nscoord istart =
+          aInsideMarkersArea.IStart(mBlockWM) - rect.IStart(mBlockWM);
+        if (istart > 0) {
+          (mBlockWM.IsBidiLTR() ?
+           charClip->mLeftEdge : charClip->mRightEdge) = istart;
         }
-        charClip->mLeftEdge = left;
       }
-      if (mRight.IsNeeded() && rect.XMost() > aInsideMarkersArea.XMost()) {
-        nscoord right = rect.XMost() - aInsideMarkersArea.XMost();
-        if (MOZ_UNLIKELY(right < 0)) {
-          item->~nsDisplayItem();
-          continue;
+      if (mIEnd.IsNeeded()) {
+        nscoord iend = rect.IEnd(mBlockWM) - aInsideMarkersArea.IEnd(mBlockWM);
+        if (iend > 0) {
+          (mBlockWM.IsBidiLTR() ?
+           charClip->mRightEdge : charClip->mLeftEdge) = iend;
         }
-        charClip->mRightEdge = right;
       }
     }
 
@@ -682,10 +716,10 @@
 TextOverflow::CanHaveTextOverflow(nsDisplayListBuilder* aBuilder,
                                   nsIFrame*             aBlockFrame)
 {
-  // Nothing to do for text-overflow:clip or if 'overflow-x:visible' or if
+  // Nothing to do for text-overflow:clip or if 'overflow-x/y:visible' or if
   // we're just building items for event processing or image visibility.
   if (HasClippedOverflow(aBlockFrame) ||
-      IsHorizontalOverflowVisible(aBlockFrame) ||
+      IsInlineAxisOverflowVisible(aBlockFrame) ||
       aBuilder->IsForEventDelivery() || aBuilder->IsForImageVisibility()) {
     return false;
   }
@@ -715,38 +749,40 @@
 
 void
 TextOverflow::CreateMarkers(const nsLineBox* aLine,
-                            bool             aCreateLeft,
-                            bool             aCreateRight,
-                            const nsRect&    aInsideMarkersArea)
+                            bool aCreateIStart, bool aCreateIEnd,
+                            const mozilla::LogicalRect& aInsideMarkersArea)
 {
-  if (aCreateLeft) {
+  if (aCreateIStart) {
     DisplayListClipState::AutoSaveRestore clipState(mBuilder);
 
-    //XXX Needs vertical text love
-    nsRect markerRect = nsRect(aInsideMarkersArea.x - mLeft.mIntrinsicISize,
-                               aLine->BStart(),
-                               mLeft.mIntrinsicISize, aLine->BSize());
-    markerRect += mBuilder->ToReferenceFrame(mBlock);
-    ClipMarker(mContentArea + mBuilder->ToReferenceFrame(mBlock),
+    LogicalRect markerLogicalRect(
+      mBlockWM, aInsideMarkersArea.IStart(mBlockWM) - mIStart.mIntrinsicISize,
+      aLine->BStart(), mIStart.mIntrinsicISize, aLine->BSize());
+    nsPoint offset = mBuilder->ToReferenceFrame(mBlock);
+    nsRect markerRect =
+      markerLogicalRect.GetPhysicalRect(mBlockWM, mBlockWidth) + offset;
+    ClipMarker(mContentArea.GetPhysicalRect(mBlockWM, mBlockWidth) + offset,
                markerRect, clipState);
     nsDisplayItem* marker = new (mBuilder)
       nsDisplayTextOverflowMarker(mBuilder, mBlock, markerRect,
-                                  aLine->GetLogicalAscent(), mLeft.mStyle, 0);
+                                  aLine->GetLogicalAscent(), mIStart.mStyle, 0);
     mMarkerList.AppendNewToTop(marker);
   }
 
-  if (aCreateRight) {
+  if (aCreateIEnd) {
     DisplayListClipState::AutoSaveRestore clipState(mBuilder);
 
-    nsRect markerRect = nsRect(aInsideMarkersArea.XMost(),
-                               aLine->BStart(),
-                               mRight.mIntrinsicISize, aLine->BSize());
-    markerRect += mBuilder->ToReferenceFrame(mBlock);
-    ClipMarker(mContentArea + mBuilder->ToReferenceFrame(mBlock),
+    LogicalRect markerLogicalRect(
+      mBlockWM, aInsideMarkersArea.IEnd(mBlockWM), aLine->BStart(),
+      mIEnd.mIntrinsicISize, aLine->BSize());
+    nsPoint offset = mBuilder->ToReferenceFrame(mBlock);
+    nsRect markerRect =
+      markerLogicalRect.GetPhysicalRect(mBlockWM, mBlockWidth) + offset;
+    ClipMarker(mContentArea.GetPhysicalRect(mBlockWM, mBlockWidth) + offset,
                markerRect, clipState);
     nsDisplayItem* marker = new (mBuilder)
       nsDisplayTextOverflowMarker(mBuilder, mBlock, markerRect,
-                                  aLine->GetLogicalAscent(), mRight.mStyle, 1);
+                                  aLine->GetLogicalAscent(), mIEnd.mStyle, 1);
     mMarkerList.AppendNewToTop(marker);
   }
 }
@@ -761,9 +797,9 @@
   if (mStyle->mType == NS_STYLE_TEXT_OVERFLOW_ELLIPSIS) {
     gfxTextRun* textRun = GetEllipsisTextRun(aFrame);
     if (textRun) {
-      mWidth = textRun->GetAdvanceWidth(0, textRun->GetLength(), nullptr);
+      mISize = textRun->GetAdvanceWidth(0, textRun->GetLength(), nullptr);
     } else {
-      mWidth = 0;
+      mISize = 0;
     }
   } else {
     nsRenderingContext rc(
@@ -771,10 +807,10 @@
     nsRefPtr<nsFontMetrics> fm;
     nsLayoutUtils::GetFontMetricsForFrame(aFrame, getter_AddRefs(fm),
       nsLayoutUtils::FontSizeInflationFor(aFrame));
-    mWidth = nsLayoutUtils::AppUnitWidthOfStringBidi(mStyle->mString, aFrame,
+    mISize = nsLayoutUtils::AppUnitWidthOfStringBidi(mStyle->mString, aFrame,
                                                      *fm, rc);
   }
-  mIntrinsicISize = mWidth;
+  mIntrinsicISize = mISize;
   mInitialized = true;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/TextOverflow.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/TextOverflow.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/TextOverflow.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/TextOverflow.h	2015-04-24 19:31:14.000000000 +0000
@@ -9,11 +9,12 @@
 
 #include "nsDisplayList.h"
 #include "nsTHashtable.h"
+#include "nsAutoPtr.h"
 #include "mozilla/Likely.h"
+#include "mozilla/WritingModes.h"
 #include <algorithm>
 
 class nsIScrollableFrame;
-class gfxTextRun;
 class nsLineBox;
 
 namespace mozilla {
@@ -59,52 +60,66 @@
   typedef nsTHashtable<nsPtrHashKey<nsIFrame> > FrameHashtable;
 
  protected:
-  TextOverflow() {}
-  void Init(nsDisplayListBuilder*   aBuilder,
-            nsIFrame*               aBlockFrame);
+  TextOverflow(nsDisplayListBuilder* aBuilder,
+               nsIFrame* aBlockFrame);
+
+  typedef mozilla::WritingMode WritingMode;
+  typedef mozilla::LogicalRect LogicalRect;
 
   struct AlignmentEdges {
     AlignmentEdges() : mAssigned(false) {}
-    void Accumulate(const nsRect& aRect) {
+    void Accumulate(WritingMode aWM, const LogicalRect& aRect)
+    {
       if (MOZ_LIKELY(mAssigned)) {
-        x = std::min(x, aRect.X());
-        xmost = std::max(xmost, aRect.XMost());
+        mIStart = std::min(mIStart, aRect.IStart(aWM));
+        mIEnd = std::max(mIEnd, aRect.IEnd(aWM));
       } else {
-        x = aRect.X();
-        xmost = aRect.XMost();
+        mIStart = aRect.IStart(aWM);
+        mIEnd = aRect.IEnd(aWM);
         mAssigned = true;
       }
     }
-    nscoord Width() { return xmost - x; }
-    nscoord x;
-    nscoord xmost;
+    nscoord ISize() { return mIEnd - mIStart; }
+    nscoord mIStart;
+    nscoord mIEnd;
     bool mAssigned;
   };
 
   struct InnerClipEdges {
-    InnerClipEdges() : mAssignedLeft(false), mAssignedRight(false) {}
-    void AccumulateLeft(const nsRect& aRect) {
-      if (MOZ_LIKELY(mAssignedLeft)) {
-        mLeft = std::max(mLeft, aRect.X());
+    InnerClipEdges() : mAssignedIStart(false), mAssignedIEnd(false) {}
+    void AccumulateIStart(WritingMode aWM, const LogicalRect& aRect)
+    {
+      if (MOZ_LIKELY(mAssignedIStart)) {
+        mIStart = std::max(mIStart, aRect.IStart(aWM));
       } else {
-        mLeft = aRect.X();
-        mAssignedLeft = true;
+        mIStart = aRect.IStart(aWM);
+        mAssignedIStart = true;
       }
     }
-    void AccumulateRight(const nsRect& aRect) {
-      if (MOZ_LIKELY(mAssignedRight)) {
-        mRight = std::min(mRight, aRect.XMost());
+    void AccumulateIEnd(WritingMode aWM, const LogicalRect& aRect)
+    {
+      if (MOZ_LIKELY(mAssignedIEnd)) {
+        mIEnd = std::min(mIEnd, aRect.IEnd(aWM));
       } else {
-        mRight = aRect.XMost();
-        mAssignedRight = true;
+        mIEnd = aRect.IEnd(aWM);
+        mAssignedIEnd = true;
       }
     }
-    nscoord mLeft;
-    nscoord mRight;
-    bool mAssignedLeft;
-    bool mAssignedRight;
+    nscoord mIStart;
+    nscoord mIEnd;
+    bool mAssignedIStart;
+    bool mAssignedIEnd;
   };
 
+  LogicalRect
+    GetLogicalScrollableOverflowRectRelativeToBlock(nsIFrame* aFrame) const
+  {
+    return LogicalRect(mBlockWM,
+                       aFrame->GetScrollableOverflowRect() +
+                         aFrame->GetOffsetTo(mBlock),
+                       mBlockWidth);
+  }
+
   /**
    * Examines frames on the line to determine whether we should draw a left
    * and/or right marker, and if so, which frames should be completely hidden
@@ -133,8 +148,8 @@
    *   inline-level frames that are clipped by the current marker width
    */
   void ExamineFrameSubtree(nsIFrame*       aFrame,
-                           const nsRect&   aContentArea,
-                           const nsRect&   aInsideMarkersArea,
+                           const LogicalRect& aContentArea,
+                           const LogicalRect& aInsideMarkersArea,
                            FrameHashtable* aFramesToHide,
                            AlignmentEdges* aAlignmentEdges,
                            bool*           aFoundVisibleTextOrAtomic,
@@ -161,7 +176,7 @@
    */
   void AnalyzeMarkerEdges(nsIFrame*       aFrame,
                           const nsIAtom*  aFrameType,
-                          const nsRect&   aInsideMarkersArea,
+                          const LogicalRect& aInsideMarkersArea,
                           FrameHashtable* aFramesToHide,
                           AlignmentEdges* aAlignmentEdges,
                           bool*           aFoundVisibleTextOrAtomic,
@@ -174,37 +189,37 @@
    * @param aFramesToHide remove display items for these frames
    * @param aInsideMarkersArea is the area inside the markers
    */
-  void PruneDisplayListContents(nsDisplayList*        aList,
+  void PruneDisplayListContents(nsDisplayList* aList,
                                 const FrameHashtable& aFramesToHide,
-                                const nsRect&         aInsideMarkersArea);
+                                const LogicalRect& aInsideMarkersArea);
 
   /**
    * ProcessLine calls this to create display items for the markers and insert
    * them into mMarkerList.
    * @param aLine the line we're processing
-   * @param aCreateLeft if true, create a marker on the left side
-   * @param aCreateRight if true, create a marker on the right side
+   * @param aCreateIStart if true, create a marker on the inline start side
+   * @param aCreateIEnd if true, create a marker on the inline end side
    * @param aInsideMarkersArea is the area inside the markers
    */
   void CreateMarkers(const nsLineBox* aLine,
-                     bool             aCreateLeft,
-                     bool             aCreateRight,
-                     const nsRect&    aInsideMarkersArea);
+                     bool aCreateIStart, bool aCreateIEnd,
+                     const LogicalRect& aInsideMarkersArea);
 
-  nsRect                 mContentArea;
+  LogicalRect            mContentArea;
   nsDisplayListBuilder*  mBuilder;
   nsIFrame*              mBlock;
   nsIScrollableFrame*    mScrollableFrame;
   nsDisplayList          mMarkerList;
-  bool                   mBlockIsRTL;
-  bool                   mCanHaveHorizontalScrollbar;
+  nscoord                mBlockWidth;
+  WritingMode            mBlockWM;
+  bool                   mCanHaveInlineAxisScrollbar;
   bool                   mAdjustForPixelSnapping;
 
   class Marker {
   public:
     void Init(const nsStyleTextOverflowSide& aStyle) {
       mInitialized = false;
-      mWidth = 0;
+      mISize = 0;
       mStyle = &aStyle;
     }
 
@@ -221,7 +236,7 @@
     }
 
     // The current width of the marker, the range is [0 .. mIntrinsicISize].
-    nscoord                        mWidth;
+    nscoord                        mISize;
     // The intrinsic width of the marker.
     nscoord                        mIntrinsicISize;
     // The style for this side.
@@ -235,8 +250,8 @@
     bool                           mActive;
   };
 
-  Marker mLeft;  // the horizontal left marker
-  Marker mRight; // the horizontal right marker
+  Marker mIStart; // the inline start marker
+  Marker mIEnd; // the inline end marker
 };
 
 } // namespace css
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/WritingModes.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/WritingModes.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/generic/WritingModes.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/generic/WritingModes.h	2015-04-24 19:31:14.000000000 +0000
@@ -1731,6 +1731,17 @@
                           aContainerWidth);
   }
 
+  /**
+   * Set *this to be the rectangle containing the intersection of aRect1
+   * and aRect2, return whether the intersection is non-empty.
+   */
+  bool IntersectRect(const LogicalRect& aRect1, const LogicalRect& aRect2)
+  {
+    CHECK_WRITING_MODE(aRect1.mWritingMode);
+    CHECK_WRITING_MODE(aRect2.mWritingMode);
+    return mRect.IntersectRect(aRect1.mRect, aRect2.mRect);
+  }
+
 private:
   LogicalRect() = delete;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/inspector/inLayoutUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/inspector/inLayoutUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/inspector/inLayoutUtils.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/inspector/inLayoutUtils.h	2015-04-24 19:31:15.000000000 +0000
@@ -10,10 +10,6 @@
 class nsIDOMDocument;
 class nsIDOMElement;
 class nsIDOMNode;
-class nsIDOMWindow;
-class nsIFrame;
-class nsIPresShell;
-class nsISupports;
 
 namespace mozilla {
 class EventStateManager;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/inspector/nsFontFace.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/inspector/nsFontFace.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/inspector/nsFontFace.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/inspector/nsFontFace.h	2015-04-24 19:31:15.000000000 +0000
@@ -10,7 +10,6 @@
 
 class gfxFontEntry;
 class gfxFontGroup;
-class nsCSSFontFaceRule;
 
 class nsFontFace : public nsIDOMFontFace
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/printing/nsPrintEngine.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/printing/nsPrintEngine.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/printing/nsPrintEngine.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/printing/nsPrintEngine.h	2015-04-24 19:31:15.000000000 +0000
@@ -25,13 +25,11 @@
 // Classes
 class nsPagePrintTimer;
 class nsIDocShell;
-class nsDeviceContext;
 class nsIDocument;
 class nsIDocumentViewerPrint;
 class nsPrintObject;
 class nsIDocShell;
 class nsIPageSequenceFrame;
-class nsIWeakReference;
 
 //------------------------------------------------------------------------
 // nsPrintEngine Class
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/abs-pos/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/abs-pos/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/abs-pos/reftest.list	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/abs-pos/reftest.list	2015-04-24 19:31:15.000000000 +0000
@@ -49,11 +49,11 @@
 == continuation-positioned-inline-1.html continuation-positioned-inline-ref.html
 == continuation-positioned-inline-2.html continuation-positioned-inline-ref.html
 == scrollframe-1.html scrollframe-1-ref.html
-skip-if(B2G||Mulet) fuzzy-if(Android,9,185) skip-if(asyncPanZoom&&winWidget) == scrollframe-2.html scrollframe-2-ref.html #bug 756530 # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if(B2G||Mulet) fuzzy-if(Android,9,185) == scrollframe-2.html scrollframe-2-ref.html #bug 756530 # Initial mulet triage: parity with B2G/B2G Desktop
 fuzzy-if(gtk2Widget,1,8) == select-1.html select-1-ref.html
 fuzzy-if(gtk2Widget,1,8) == select-1-dynamic.html select-1-ref.html
 == select-2.html select-2-ref.html
-fuzzy-if(gtk2Widget,1,19) fuzzy-if(Android||B2G,17,726) skip-if(asyncPanZoom&&winWidget) == select-3.html select-3-ref.html
+fuzzy-if(gtk2Widget,1,19) fuzzy-if(Android||B2G,17,726) == select-3.html select-3-ref.html
 == multi-column-1.html multi-column-1-ref.html
 == button-1.html button-1-ref.html
 == button-2.html button-2-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/border-image/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/border-image/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/border-image/reftest.list	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/border-image/reftest.list	2015-04-24 19:31:16.000000000 +0000
@@ -36,7 +36,7 @@
 == border-image-outset-1c.html border-image-outset-1-ref.html
 == border-image-nofill-1.html border-image-nofill-1-ref.html
 == border-image-outset-resize-1.html border-image-outset-resize-1-ref.html
-skip-if(asyncPanZoom&&winWidget) == border-image-outset-move-1.html border-image-outset-move-1-ref.html
+== border-image-outset-move-1.html border-image-outset-move-1-ref.html
 == border-image-style-none.html border-image-style-none-ref.html
 == border-image-style-none-length.html border-image-style-none-length-ref.html
 == border-image-style-none-auto.html border-image-style-none-auto-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/border-radius/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/border-radius/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/border-radius/reftest.list	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/border-radius/reftest.list	2015-04-24 19:31:16.000000000 +0000
@@ -71,7 +71,7 @@
 fuzzy-if(azureQuartz,1,3) skip-if(B2G||Mulet) == invalidate-1b.html invalidate-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 
 # test that border-radius is reduced for scrollbars
-skip-if(B2G||Mulet) fails-if(Android) skip-if(asyncPanZoom&&winWidget) == scrollbar-clamping-1.html scrollbar-clamping-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if(B2G||Mulet) fails-if(Android) == scrollbar-clamping-1.html scrollbar-clamping-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) fails-if(Android) == scrollbar-clamping-2.html scrollbar-clamping-2-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 
 # Test for bad corner joins.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/bugs/593243-1.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/bugs/593243-1.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/bugs/593243-1.html	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/bugs/593243-1.html	2015-04-24 19:31:18.000000000 +0000
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html class="reftest-wait"
       reftest-viewport-w="600" reftest-viewport-h="400"
+      reftest-scrollport-w="800" reftest-scrollport-h="1000"
       reftest-displayport-w="800" reftest-displayport-h="1000"
       reftest-no-sync-layers>
 <head>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/bugs/593243-2.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/bugs/593243-2.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/bugs/593243-2.html	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/bugs/593243-2.html	2015-04-24 19:31:18.000000000 +0000
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html class="reftest-wait"
       reftest-viewport-w="600" reftest-viewport-h="400"
+      reftest-scrollport-w="800" reftest-scrollport-h="1000"
       reftest-displayport-w="800" reftest-displayport-h="1000"
       reftest-no-sync-layers>
 <head>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/bugs/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/bugs/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/bugs/reftest.list	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/bugs/reftest.list	2015-04-24 19:30:50.000000000 +0000
@@ -88,7 +88,7 @@
 != 82711-1-ref.html 82711-2-ref.html
 != 82711-1-ref.html 82711-3-ref.html
 != 82711-2-ref.html 82711-3-ref.html
-skip-if(asyncPanZoom&&winWidget) == 84400-1.html 84400-1-ref.html
+== 84400-1.html 84400-1-ref.html
 == 84400-2.html 84400-2-ref.html
 == 97777-1.html 97777-1-ref.html
 == 97777-2.html 97777-2-ref.html
@@ -1404,7 +1404,7 @@
 needs-focus fails == 503531-1.html 503531-1-ref.html
 == 504032-1.html 504032-1-ref.html
 == 505743-1.html about:blank
-skip-if(B2G||Mulet) skip-if(asyncPanZoom&&winWidget) fuzzy-if(Android,5,2800) == 506481-1.html 506481-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if(B2G||Mulet) fuzzy-if(Android,5,2800) == 506481-1.html 506481-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 == 507187-1.html 507187-1-ref.html
 == 507487-1.html 507487-1-ref.html
 == 507487-2.xhtml 507487-2-ref.xhtml
@@ -1417,7 +1417,7 @@
 skip-if((B2G&&browserIsRemote)||Mulet) == 508908-1.xul 508908-1-ref.xul # bug 974780 # Initial mulet triage: parity with B2G/B2G Desktop
 == 508919-1.xhtml 508919-1-ref.xhtml
 == 509155-1.xhtml 509155-1-ref.xhtml
-skip-if(B2G||Mulet) skip-if(asyncPanZoom&&winWidget) fuzzy-if(Android,5,1656) == 512410.html 512410-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if(B2G||Mulet) fuzzy-if(Android,5,1656) == 512410.html 512410-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 == 512631-1.html 512631-1-ref.html
 == 513153-1a.html 513153-1-ref.html
 == 513153-1b.html 513153-1-ref.html
@@ -1491,7 +1491,7 @@
 == 550325-2.html 550325-1-ref.html
 == 550325-3.html 550325-1-ref.html
 == 550716-1.html 550716-1-ref.html
-skip-if(B2G||Mulet) skip-if(asyncPanZoom&&winWidget) fuzzy-if(Android&&AndroidVersion>=15,12,300) == 551463-1.html 551463-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if(B2G||Mulet) fuzzy-if(Android&&AndroidVersion>=15,12,300) == 551463-1.html 551463-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 == 551699-1.html 551699-1-ref.html
 == 552334-1.html 552334-1-ref.html
 # Bug 553571 was specific to MS Indic shaping behavior and Win7 font support;
@@ -1575,7 +1575,7 @@
 skip-if(!haveTestPlugin) skip-if(B2G||Mulet) fails-if(Android) == 579808-1.html 579808-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) fails-if(Android) random-if(layersGPUAccelerated) == 579985-1.html 579985-1-ref.html # bug 623452 for WinXP; this bug was only for a regression in BasicLayers anyway # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) skip-if(Android) == 580160-1.html 580160-1-ref.html # bug 920927 for Android; issues without the test-plugin # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(asyncPanZoom&&winWidget) HTTP(..) == 580863-1.html 580863-1-ref.html
+HTTP(..) == 580863-1.html 580863-1-ref.html
 skip-if(B2G||Mulet) fails-if(Android) random-if(layersGPUAccelerated) == 581317-1.html 581317-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 == 581579-1.html 581579-1-ref.html
 == 582037-1a.html 582037-1-ref.html
@@ -1593,8 +1593,8 @@
 == 589615-1b.html 589615-1-ref.html
 == 589672-1.html 589672-1-ref.html
 != 589682-1.html 589682-1-notref.html
-skip-if(!asyncPanZoom) == 593243-1.html 593243-1-ref.html # bug 593168
-skip-if(!asyncPanZoom) == 593243-2.html 593243-2-ref.html # bug 593168
+skip-if(Android) == 593243-1.html 593243-1-ref.html # bug 593168
+skip-if(Android) == 593243-2.html 593243-2-ref.html # bug 593168
 == 593544-1.html 593544-1-ref.html
 random-if(Android) == 594333-1.html 594333-1-ref.html
 fuzzy-if(B2G,1,40000) == 594624-1.html 594624-1-ref.html
@@ -1667,11 +1667,11 @@
 fuzzy-if(Android&&AndroidVersion>=15,8,500) == 637852-1.html 637852-1-ref.html
 fuzzy-if(Android&&AndroidVersion>=15,8,500) == 637852-2.html 637852-2-ref.html
 fuzzy-if(Android&&AndroidVersion>=15,8,500) == 637852-3.html 637852-3-ref.html
-skip-if(B2G||Mulet) skip-if(asyncPanZoom&&winWidget) == 641770-1.html 641770-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if(B2G||Mulet) == 641770-1.html 641770-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 == 641856-1.html 641856-1-ref.html
 == 645491-1.html 645491-1-ref.html
 == 645768-1.html 645768-1-ref.html
-fails-if(layersGPUAccelerated&&cocoaWidget) fails-if(Android&&AndroidVersion<15&&AndroidVersion!=10) skip-if(asyncPanZoom&&winWidget) == 650228-1.html 650228-1-ref.html # Quartz alpha blending doesn't match GL alpha blending
+fails-if(layersGPUAccelerated&&cocoaWidget) fails-if(Android&&AndroidVersion<15&&AndroidVersion!=10) == 650228-1.html 650228-1-ref.html # Quartz alpha blending doesn't match GL alpha blending
 needs-focus == 652301-1a.html 652301-1-ref.html
 needs-focus == 652301-1b.html 652301-1-ref.html
 == 652775-1.html 652775-1-ref.html
@@ -1756,7 +1756,7 @@
 == 816948-1.html 816948-1-ref.html
 == 817019-1.html about:blank
 skip-if(B2G||Mulet) == 818276-1.html 818276-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(asyncPanZoom&&!winWidget,190,27) skip-if(asyncPanZoom&&winWidget) == 825999.html 825999-ref.html
+fuzzy-if(asyncPanZoom,190,27) == 825999.html 825999-ref.html
 == 827577-1a.html 827577-1-ref.html
 == 827577-1b.html 827577-1-ref.html
 == 827799-1.html about:blank
@@ -1806,7 +1806,7 @@
 == 961887-1.html 961887-1-ref.html
 == 961887-2.html 961887-2-ref.html
 == 961887-3.html 961887-3-ref.html
-pref(layout.css.overflow-clip-box.enabled,true) fuzzy(50,145) skip-if(asyncPanZoom&&winWidget) == 966992-1.html 966992-1-ref.html
+pref(layout.css.overflow-clip-box.enabled,true) fuzzy(50,145) == 966992-1.html 966992-1-ref.html
 skip-if(Android) == 966510-1.html 966510-1-ref.html # scrollable elements other than the root probably won't work well on android until bug 776030 is fixed
 skip-if(Android) == 966510-2.html 966510-2-ref.html # same as above
 == 978911-1.svg 978911-1-ref.svg
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/canvas/1151821-1.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/canvas/1151821-1.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/canvas/1151821-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/canvas/1151821-1.html	2015-04-24 19:30:50.000000000 +0000
@@ -0,0 +1,26 @@
+<!docytpe html>
+<html>
+<head>
+<meta charset="UTF-8" />
+<script>
+window.onload=function(){
+
+var c=document.getElementById("myCanvas").getContext("2d");
+
+c.fillStyle = "green";
+
+c.fillRect(0, 0,100,100);
+
+c.fillStyle = "red";
+c.globalCompositeOperation = "destination-over";
+c.rect(0, 0, 100, 100);
+c.clip();
+c.fillRect(0, 0, 100, 100);
+
+}
+</script>
+</head>
+<body>
+<canvas id="myCanvas" height=50 width=100></canvas>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/canvas/1151821-1-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/canvas/1151821-1-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/canvas/1151821-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/canvas/1151821-1-ref.html	2015-04-24 19:30:50.000000000 +0000
@@ -0,0 +1,20 @@
+<!docytpe html>
+<html>
+<head>
+<meta charset="UTF-8" />
+<script>
+window.onload=function(){
+
+var c=document.getElementById("myCanvas").getContext("2d");
+
+c.fillStyle="green";
+
+c.fillRect(0, 0,100,100);
+
+}
+</script>
+</head>
+<body>
+<canvas id="myCanvas" height=50 width=100></canvas>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/canvas/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/canvas/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/canvas/reftest.list	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/canvas/reftest.list	2015-04-24 19:30:50.000000000 +0000
@@ -103,3 +103,5 @@
 fuzzy-if(azureQuartz,2,128) fuzzy-if(d2d,12,21) == 784573-1.html 784573-1-ref.html
 
 == 802658-1.html 802658-1-ref.html
+
+== 1151821-1.html 1151821-1-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/css-ui-invalid/select/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/css-ui-invalid/select/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/css-ui-invalid/select/reftest.list	2015-04-22 13:05:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/css-ui-invalid/select/reftest.list	2015-04-24 19:30:52.000000000 +0000
@@ -10,7 +10,7 @@
 needs-focus == select-required-invalid-changed-2.html select-required-ref.html
 needs-focus == select-required-valid.html select-required-ref.html
 needs-focus == select-required-multiple-invalid.html select-required-multiple-ref.html
-skip-if(asyncPanZoom&&winWidget) needs-focus == select-required-multiple-invalid-changed.html select-required-multiple-ref.html
+needs-focus == select-required-multiple-invalid-changed.html select-required-multiple-ref.html
 needs-focus == select-required-multiple-valid.html select-required-multiple-ref.html
 skip-if(B2G||Mulet) fails-if(Android) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) fails-if(Android) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/css-ui-valid/select/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/css-ui-valid/select/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/css-ui-valid/select/reftest.list	2015-04-22 13:05:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/css-ui-valid/select/reftest.list	2015-04-24 19:30:52.000000000 +0000
@@ -11,7 +11,7 @@
 needs-focus == select-required-valid-changed-2.html select-required-ref.html
 needs-focus == select-required-multiple-invalid.html select-required-multiple-ref.html
 needs-focus == select-required-multiple-valid.html select-required-multiple-ref.html
-fuzzy(64,4) skip-if(asyncPanZoom&&winWidget) needs-focus == select-required-multiple-valid-changed.html select-required-multiple-ref.html
+fuzzy(64,4) needs-focus == select-required-multiple-valid-changed.html select-required-multiple-ref.html
 fails-if(Android||B2G||Mulet) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 fails-if(Android||B2G||Mulet) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 needs-focus == select-fieldset-legend.html select-fieldset-legend-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/font-inflation/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/font-inflation/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/font-inflation/reftest.list	2015-04-22 13:05:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/font-inflation/reftest.list	2015-04-24 19:30:53.000000000 +0000
@@ -37,7 +37,7 @@
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == textarea-3.html textarea-3-ref.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == css-transform-1.html css-transform-1-ref.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == css-transform-2.html css-transform-2-ref.html
-skip-if(B2G||Mulet) skip-if(asyncPanZoom&&winWidget) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == container-with-clamping.html container-with-clamping-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if(B2G||Mulet) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == container-with-clamping.html container-with-clamping-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) load video-1.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) HTTP(..) == intrinsic-min-1.html intrinsic-min-1-ref.html
 skip-if(B2G||Mulet) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) HTTP(..) == intrinsic-max-1.html intrinsic-max-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/fieldset/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/fieldset/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/fieldset/reftest.list	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/fieldset/reftest.list	2015-04-24 19:30:53.000000000 +0000
@@ -5,7 +5,7 @@
 == fieldset-scroll-1.html fieldset-scroll-1-ref.html
 == fieldset-scrolled-1.html fieldset-scrolled-1-ref.html
 random-if(B2G||Mulet) == fieldset-overflow-auto-1.html fieldset-overflow-auto-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(winWidget&&!layersGPUAccelerated,102,205) skip-if(asyncPanZoom&&winWidget) == positioned-container-1.html positioned-container-1-ref.html
+fuzzy-if(winWidget&&!layersGPUAccelerated,102,205) == positioned-container-1.html positioned-container-1-ref.html
 == relpos-legend-1.html relpos-legend-1-ref.html
 == relpos-legend-2.html relpos-legend-2-ref.html
 test-pref(layout.css.sticky.enabled,true) skip-if((B2G&&browserIsRemote)||Mulet) == sticky-legend-1.html sticky-legend-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/input/color/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/input/color/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/input/color/reftest.list	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/input/color/reftest.list	2015-04-24 19:30:53.000000000 +0000
@@ -1,6 +1,5 @@
 # Simple test. Should fail on platforms where input type color isn't activated
-# yet. Missing platforms are B2G (bug 875751), Android (bug 875750) and Metro
-# (bug 895464).
+# yet. Missing platforms are B2G (bug 875751), Android (bug 875750).
 fails-if(B2G||Mulet||Android) == input-color-1.html input-color-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 
 default-preferences pref(dom.forms.color,true)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/input/text/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/input/text/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/input/text/reftest.list	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/input/text/reftest.list	2015-04-24 19:30:54.000000000 +0000
@@ -1,5 +1,5 @@
 == bounds-1.html bounds-1-ref.html
-skip-if(asyncPanZoom&&winWidget) == size-1.html size-1-ref.html
+== size-1.html size-1-ref.html
 skip-if(B2G||Mulet) == size-2.html size-2-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 HTTP(..) == baseline-1.html baseline-1-ref.html
 skip-if((B2G&&browserIsRemote)||Mulet) HTTP(..) == centering-1.xul centering-1-ref.xul # bug 974780 # Initial mulet triage: parity with B2G/B2G Desktop
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-block.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-block.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-block.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-block.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="-moz-orient:block" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-horizontal.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-horizontal.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-horizontal.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-horizontal.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="-moz-orient:horizontal" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-horizontal-rtl.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-horizontal-rtl.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-horizontal-rtl.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-horizontal-rtl.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="-moz-orient:horizontal" max=100 value=70 dir=rtl>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-inline.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-inline.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-inline.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-inline.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="-moz-orient:inline" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-vertical.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-vertical.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-vertical.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-vertical.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="-moz-orient:vertical" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-vertical-rtl.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-vertical-rtl.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-orient-vertical-rtl.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-orient-vertical-rtl.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="-moz-orient:vertical" max=100 value=70 dir=rtl>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vlr.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vlr.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vlr.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vlr.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="writing-mode:vertical-lr" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vlr-orient-block.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vlr-orient-block.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vlr-orient-block.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vlr-orient-block.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="writing-mode:vertical-lr;-moz-orient:block" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vlr-orient-horizontal.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vlr-orient-horizontal.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vlr-orient-horizontal.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vlr-orient-horizontal.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="writing-mode:vertical-lr;-moz-orient:horizontal" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vlr-orient-inline.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vlr-orient-inline.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vlr-orient-inline.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vlr-orient-inline.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="writing-mode:vertical-lr;-moz-orient:inline" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vlr-orient-vertical.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vlr-orient-vertical.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vlr-orient-vertical.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vlr-orient-vertical.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="writing-mode:vertical-lr;-moz-orient:vertical" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vrl.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vrl.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vrl.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vrl.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="writing-mode:vertical-rl" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vrl-orient-block.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vrl-orient-block.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vrl-orient-block.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vrl-orient-block.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="writing-mode:vertical-rl;-moz-orient:block" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vrl-orient-horizontal.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vrl-orient-horizontal.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vrl-orient-horizontal.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vrl-orient-horizontal.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="writing-mode:vertical-rl;-moz-orient:horizontal" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vrl-orient-inline.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vrl-orient-inline.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vrl-orient-inline.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vrl-orient-inline.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="writing-mode:vertical-rl;-moz-orient:inline" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vrl-orient-vertical.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vrl-orient-vertical.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/meter-vrl-orient-vertical.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/meter-vrl-orient-vertical.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<meter style="writing-mode:vertical-rl;-moz-orient:vertical" max=100 value=70>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/meter/reftest.list	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/meter/reftest.list	2015-04-24 19:30:54.000000000 +0000
@@ -25,3 +25,22 @@
 == block-invalidate.html block-invalidate-ref.html
 == in-cells.html in-cells-ref.html
 == max-height.html max-height-ref.html
+
+# Tests for block and inline orientation in combination with writing-mode
+# XXX Remove default-preferences setting here after bug 1138384 makes
+#     it the default for all channels
+default-preferences pref(layout.css.vertical-text.enabled,true)
+!= meter-orient-vertical.html meter-orient-horizontal.html
+!= meter-orient-horizontal.html meter-orient-horizontal-rtl.html
+== meter-orient-block.html meter-orient-vertical.html
+== meter-orient-inline.html meter-orient-horizontal.html
+== meter-vlr.html meter-orient-vertical.html
+== meter-vlr-orient-block.html meter-orient-horizontal.html
+== meter-vlr-orient-inline.html meter-orient-vertical.html
+== meter-vlr-orient-horizontal.html meter-orient-horizontal.html
+== meter-vlr-orient-vertical.html meter-orient-vertical.html
+== meter-vrl.html meter-orient-vertical-rtl.html
+== meter-vrl-orient-block.html meter-orient-horizontal-rtl.html
+== meter-vrl-orient-inline.html meter-orient-vertical-rtl.html
+== meter-vrl-orient-horizontal.html meter-orient-horizontal-rtl.html
+== meter-vrl-orient-vertical.html meter-orient-vertical-rtl.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/placeholder/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/placeholder/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/placeholder/reftest.list	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/placeholder/reftest.list	2015-04-24 19:30:54.000000000 +0000
@@ -16,8 +16,8 @@
 == placeholder-3.html placeholder-overridden-ref.html
 == placeholder-4.html placeholder-overridden-ref.html
 == placeholder-5.html placeholder-visible-ref.html
-skip-if(asyncPanZoom&&winWidget) == placeholder-6.html placeholder-overflow-ref.html
-skip-if(B2G||Mulet) skip-if(asyncPanZoom&&winWidget) == placeholder-6-textarea.html placeholder-overflow-textarea-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+fuzzy-if(winWidget,160,7) == placeholder-6.html placeholder-overflow-ref.html
+skip-if(B2G||Mulet) == placeholder-6-textarea.html placeholder-overflow-textarea-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 # needs-focus == placeholder-7.html placeholder-focus-ref.html
 # needs-focus == placeholder-8.html placeholder-focus-ref.html
 # needs-focus == placeholder-9.html placeholder-focus-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-block.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-block.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-block.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-block.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="-moz-orient:block" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-horizontal.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-horizontal.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-horizontal.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-horizontal.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="-moz-orient:horizontal" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-horizontal-rtl.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-horizontal-rtl.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-horizontal-rtl.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-horizontal-rtl.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="-moz-orient:horizontal" max=100 value=0 dir=rtl>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-inline.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-inline.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-inline.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-inline.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="-moz-orient:inline" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-vertical.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-vertical.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-vertical.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-vertical.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="-moz-orient:vertical" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-vertical-rtl.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-vertical-rtl.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-orient-vertical-rtl.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-orient-vertical-rtl.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="-moz-orient:vertical" max=100 value=0 dir=rtl>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vlr.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vlr.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vlr.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vlr.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="writing-mode:vertical-lr" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vlr-orient-block.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vlr-orient-block.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vlr-orient-block.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vlr-orient-block.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="writing-mode:vertical-lr;-moz-orient:block" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vlr-orient-horizontal.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vlr-orient-horizontal.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vlr-orient-horizontal.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vlr-orient-horizontal.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="writing-mode:vertical-lr;-moz-orient:horizontal" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vlr-orient-inline.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vlr-orient-inline.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vlr-orient-inline.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vlr-orient-inline.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="writing-mode:vertical-lr;-moz-orient:inline" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vlr-orient-vertical.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vlr-orient-vertical.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vlr-orient-vertical.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vlr-orient-vertical.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="writing-mode:vertical-lr;-moz-orient:vertical" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vrl.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vrl.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vrl.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vrl.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="writing-mode:vertical-rl" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vrl-orient-block.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vrl-orient-block.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vrl-orient-block.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vrl-orient-block.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="writing-mode:vertical-rl;-moz-orient:block" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vrl-orient-horizontal.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vrl-orient-horizontal.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vrl-orient-horizontal.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vrl-orient-horizontal.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="writing-mode:vertical-rl;-moz-orient:horizontal" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vrl-orient-inline.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vrl-orient-inline.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vrl-orient-inline.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vrl-orient-inline.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="writing-mode:vertical-rl;-moz-orient:inline" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vrl-orient-vertical.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vrl-orient-vertical.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/progress-vrl-orient-vertical.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/progress-vrl-orient-vertical.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html>
+<progress style="writing-mode:vertical-rl;-moz-orient:vertical" max=100 value=0>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/progress/reftest.list	2015-04-22 13:05:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/progress/reftest.list	2015-04-24 19:30:54.000000000 +0000
@@ -24,3 +24,22 @@
 == block-invalidate.html block-invalidate-ref.html
 == in-cells.html in-cells-ref.html
 == max-height.html max-height-ref.html
+
+# Tests for block and inline orientation in combination with writing-mode
+# XXX Remove default-preferences setting here after bug 1138384 makes
+#     it the default for all channels
+default-preferences pref(layout.css.vertical-text.enabled,true)
+!= progress-orient-horizontal.html progress-orient-vertical.html
+fails-if(!cocoaWidget||OSX==1010) != progress-orient-vertical.html progress-orient-vertical-rtl.html # only OS X currently has direction-dependent rendering here
+== progress-orient-block.html progress-orient-vertical.html
+== progress-orient-inline.html progress-orient-horizontal.html
+== progress-vlr.html progress-orient-vertical.html
+== progress-vlr-orient-block.html progress-orient-horizontal.html
+== progress-vlr-orient-inline.html progress-orient-vertical.html
+== progress-vlr-orient-horizontal.html progress-orient-horizontal.html
+== progress-vlr-orient-vertical.html progress-orient-vertical.html
+== progress-vrl.html progress-orient-vertical-rtl.html
+== progress-vrl-orient-block.html progress-orient-horizontal-rtl.html
+== progress-vrl-orient-inline.html progress-orient-vertical-rtl.html
+== progress-vrl-orient-horizontal.html progress-orient-horizontal-rtl.html
+== progress-vrl-orient-vertical.html progress-orient-vertical-rtl.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/textarea/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/textarea/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/forms/textarea/reftest.list	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/forms/textarea/reftest.list	2015-04-24 19:30:54.000000000 +0000
@@ -10,5 +10,5 @@
 == rtl.html rtl-dynamic-style.html
 == rtl.html in-dynamic-rtl-doc.html
 == setvalue-framereconstruction-1.html setvalue-framereconstruction-ref.html
-skip-if(asyncPanZoom&&winWidget) == padding-scrollbar-placement.html padding-scrollbar-placement-ref.html
+== padding-scrollbar-placement.html padding-scrollbar-placement-ref.html
 == various-cols.html various-cols-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/image/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/image/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/image/reftest.list	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/image/reftest.list	2015-04-24 19:30:54.000000000 +0000
@@ -73,7 +73,7 @@
 fuzzy(1,1) == image-orientation-background.html?from-image   image-orientation-ref.html?0
 fuzzy(1,1) == image-orientation-background.html?90&flip      image-orientation-ref.html?0
 == image-orientation-border-image.html?from-image            image-orientation-border-image.html?0
-skip-if(asyncPanZoom&&winWidget) == image-orientation-border-image.html?90&flip               image-orientation-border-image.html?0
+== image-orientation-border-image.html?90&flip               image-orientation-border-image.html?0
 == image-orientation-list-style-image.html?from-image        image-orientation-list-style-image.html?0
 == image-orientation-list-style-image.html?90&flip           image-orientation-list-style-image.html?0
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html class="reftest-wait" reftest-zoom="0.3">
+<head>
+  <style type="text/css">
+    #container {
+      height: 100px;
+      overflow: auto;
+    }
+    #container-background {
+      background: url(one-pixel-wide-background.png);
+    }
+    #container-background > div {
+      line-height: 20px;
+    }
+  </style>
+</head>
+<body>
+  <div id="container">
+    <div id="container-background">
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+    </div>
+  </div>
+</body>
+<script>
+  var container = document.getElementById('container');
+
+  // Start scrolled all the way to the bottom.
+  container.scrollTop = container.scrollHeight;
+
+  // When we get MozReftestInvalidate, scroll to the top. This puts us at the
+  // same scroll position as the reference.
+  function doTest() {
+    container.scrollTop = 0;
+    document.documentElement.removeAttribute('class');
+  }
+
+  document.addEventListener("MozReftestInvalidate", doTest, false);
+</script>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1-notref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1-notref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1-notref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1-notref.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.3">
+<head>
+  <style type="text/css">
+    #container {
+      height: 100px;
+      overflow: auto;
+    }
+    #container-background {
+      background-color: white;
+    }
+    #container-background > div {
+      line-height: 20px;
+    }
+  </style>
+</head>
+<body>
+  <div id="container">
+    <div id="container-background">
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+    </div>
+  </div>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/invalidation/image-scrolling-zoom-1-ref.html	2015-04-24 19:30:54.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html reftest-zoom="0.3">
+<head>
+  <style type="text/css">
+    #container {
+      height: 100px;
+      overflow: auto;
+    }
+    #container-background {
+      background: url(one-pixel-wide-background.png);
+    }
+    #container-background > div {
+      line-height: 20px;
+    }
+  </style>
+</head>
+<body>
+  <div id="container">
+    <div id="container-background">
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+      <div>Item</div>
+    </div>
+  </div>
+</body>
+</html>
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/invalidation/one-pixel-wide-background.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/invalidation/one-pixel-wide-background.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/invalidation/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/invalidation/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/invalidation/reftest.list	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/invalidation/reftest.list	2015-04-24 19:30:54.000000000 +0000
@@ -6,8 +6,8 @@
 skip-if((B2G&&browserIsRemote)||Mulet) == 543681-1.html 543681-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 == test-image-layers.html test-image-layers-ref.html
 random-if(B2G||Mulet) == test-image-layers-multiple-displayitem.html test-image-layers-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-pref(layout.animated-image-layers.enabled,true) random-if(Android||gtk2Widget) == test-animated-image-layers.html test-animated-image-layers-ref.html
-pref(layout.animated-image-layers.enabled,true) random-if(Android||gtk2Widget) == test-animated-image-layers-background.html test-animated-image-layers-ref.html
+pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtk2Widget) == test-animated-image-layers.html test-animated-image-layers-ref.html
+pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtk2Widget) == test-animated-image-layers-background.html test-animated-image-layers-ref.html
 == box-shadow-border-radius.html box-shadow-border-radius-ref.html
 == filter-userspace-offset.svg?offsetContainer=rect filter-userspace-offset.svg
 == filter-userspace-offset.svg?offsetContainer=use filter-userspace-offset.svg
@@ -61,6 +61,8 @@
 != layer-splitting-2.html about:blank
 != layer-splitting-3.html about:blank
 != layer-splitting-4.html about:blank
-skip-if(asyncPanZoom&&winWidget) != layer-splitting-5.html about:blank
-skip-if(asyncPanZoom&&winWidget) != layer-splitting-6.html about:blank
+!= layer-splitting-5.html about:blank
+!= layer-splitting-6.html about:blank
 != layer-splitting-7.html about:blank
+fuzzy-if(gtk2Widget,2,4) == image-scrolling-zoom-1.html image-scrolling-zoom-1-ref.html
+!= image-scrolling-zoom-1-ref.html image-scrolling-zoom-1-notref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/layers/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/layers/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/layers/reftest.list	2015-04-22 13:05:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/layers/reftest.list	2015-04-24 19:30:54.000000000 +0000
@@ -1,20 +1,20 @@
 == move-to-background-1.html move-to-background-1-ref.html
 fuzzy-if(cocoaWidget,2,6) random-if(Android&&!browserIsRemote) == component-alpha-exit-1.html component-alpha-exit-1-ref.html # bug 760275
-skip-if(asyncPanZoom) != pull-background-1.html about:blank
-skip-if(asyncPanZoom) != pull-background-2.html about:blank
-skip-if(asyncPanZoom) != pull-background-3.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
-skip-if(asyncPanZoom) != pull-background-4.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
+!= pull-background-1.html about:blank
+!= pull-background-2.html about:blank
+!= pull-background-3.html about:blank 
+!= pull-background-4.html about:blank 
 skip-if(asyncPanZoom) != pull-background-5.html about:blank # Fails with event regions, bug 1150941
-skip-if(asyncPanZoom) != pull-background-6.html about:blank
+!= pull-background-6.html about:blank
 # The animated-position tests are disabled for intermittent failures / passes, bug 1150941
 skip != pull-background-animated-position-1.html about:blank # Fails with event regions
 skip != pull-background-animated-position-2.html about:blank
 skip != pull-background-animated-position-3.html about:blank # Fails because PaintedLayer item assignment doesn't recognize overflow:hidden clips
 skip != pull-background-animated-position-4.html about:blank # Fails because PaintedLayer item assignment and background pulling don't recognize overflow:hidden clips
 skip != pull-background-animated-position-5.html about:blank # Fails because ownLayer bounds don't anticipate changes of animated contents, but doesn't fail with event regions
-skip-if(!asyncPanZoom) skip-if(asyncPanZoom) != pull-background-displayport-1.html about:blank
-skip-if(!asyncPanZoom) skip-if(asyncPanZoom) != pull-background-displayport-2.html about:blank
-skip-if(!asyncPanZoom) skip-if(asyncPanZoom) != pull-background-displayport-3.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
-skip-if(!asyncPanZoom) skip-if(asyncPanZoom) != pull-background-displayport-4.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
+skip-if(!asyncPanZoom) != pull-background-displayport-1.html about:blank
+skip-if(!asyncPanZoom) != pull-background-displayport-2.html about:blank
+skip-if(!asyncPanZoom) != pull-background-displayport-3.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
+skip-if(!asyncPanZoom) != pull-background-displayport-4.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
 fails skip-if(!asyncPanZoom) != pull-background-displayport-5.html about:blank # bug 1147673
-skip-if(!asyncPanZoom) skip-if(asyncPanZoom) != pull-background-displayport-6.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
+skip-if(!asyncPanZoom) != pull-background-displayport-6.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/pixel-rounding/green-circle-with-blue-border.png and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/pixel-rounding/green-circle-with-blue-border.png differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/pixel-rounding/image-high-quality-scaling-1.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/pixel-rounding/image-high-quality-scaling-1.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/pixel-rounding/image-high-quality-scaling-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/pixel-rounding/image-high-quality-scaling-1.html	2015-04-24 19:30:55.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html class="reftest-wait">
+<head>
+  <script>
+    // We add an artificial delay before the reftest snapshot to increase the
+    // chance that we're snapshotting the high-quality downscaled version of
+    // the image. This is necessary because high-quality downscaling is
+    // currently an async process. Bug 1045926 will eliminate the need for this
+    // delay.
+    function snapshot() {
+      document.documentElement.removeAttribute('class');
+    }
+  </script>
+</head>
+<body onload="setTimeout(snapshot, 250)">
+<div style="padding: 1em 3em; font-size: 80%; width: 300px; text-align: center;">
+  <img src="green-circle-with-blue-border.png" height="220">
+</div>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/pixel-rounding/image-high-quality-scaling-1-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/pixel-rounding/image-high-quality-scaling-1-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/pixel-rounding/image-high-quality-scaling-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/pixel-rounding/image-high-quality-scaling-1-ref.html	2015-04-24 19:30:55.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html class="reftest-wait">
+<head>
+  <script>
+    // We add an artificial delay before the reftest snapshot to increase the
+    // chance that we're snapshotting the high-quality downscaled version of
+    // the image. This is necessary because high-quality downscaling is
+    // currently an async process. Bug 1045926 will eliminate the need for this
+    // delay.
+    function snapshot() {
+      document.documentElement.removeAttribute('class');
+    }
+  </script>
+</head>
+<body onload="setTimeout(snapshot, 250)">
+<div style="padding: 1em 3em; font-size: 80%; width: 300px; text-align: center;">
+  <img src="green-circle-with-blue-border.png" width="179" height="220">
+</div>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/pixel-rounding/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/pixel-rounding/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/pixel-rounding/reftest.list	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/pixel-rounding/reftest.list	2015-04-24 19:30:55.000000000 +0000
@@ -123,6 +123,10 @@
 == image-width-left-5.html image-width-5.html
 == image-width-left-6.html image-width-6.html
 
+
+skip pref(image.high_quality_downscaling.enabled,true) == image-high-quality-scaling-1.html image-high-quality-scaling-1-ref.html
+
+
 != offscreen-0-ref.html offscreen-10-ref.html
 == offscreen-background-color-pos-4.html offscreen-0-ref.html
 == offscreen-background-color-pos-5.html offscreen-10-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/position-dynamic-changes/relative/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/position-dynamic-changes/relative/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/position-dynamic-changes/relative/reftest.list	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/position-dynamic-changes/relative/reftest.list	2015-04-24 19:30:55.000000000 +0000
@@ -1,5 +1,5 @@
-skip-if(asyncPanZoom&&winWidget) fuzzy-if(cocoaWidget,1,2) fuzzy-if(d2d,47,26) == move-right-bottom.html move-right-bottom-ref.html
-skip-if(asyncPanZoom&&winWidget) fuzzy-if(cocoaWidget,1,2) == move-top-left.html move-top-left-ref.html # Bug 688545
-skip-if(asyncPanZoom&&winWidget) fuzzy-if(cocoaWidget,1,3) == move-right-bottom-table.html move-right-bottom-table-ref.html
-skip-if(asyncPanZoom&&winWidget) fuzzy-if(cocoaWidget,1,3) == move-top-left-table.html move-top-left-table-ref.html # Bug 688545
+fuzzy-if(cocoaWidget,1,2) fuzzy-if(d2d,47,26) == move-right-bottom.html move-right-bottom-ref.html
+fuzzy-if(cocoaWidget,1,2) == move-top-left.html move-top-left-ref.html # Bug 688545
+fuzzy-if(cocoaWidget,1,3) == move-right-bottom-table.html move-right-bottom-table-ref.html
+fuzzy-if(cocoaWidget,1,3) == move-top-left-table.html move-top-left-table-ref.html # Bug 688545
 == percent.html percent-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/reftest.list	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/reftest.list	2015-04-24 19:30:55.000000000 +0000
@@ -19,7 +19,7 @@
 include abs-pos/reftest.list
 include position-relative/reftest.list
 
-skip-if(asyncPanZoom&&winWidget) include async-scrolling/reftest.list
+include async-scrolling/reftest.list
 
 # backgrounds/
 include backgrounds/reftest.list
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/scrolling/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/scrolling/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/scrolling/reftest.list	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/scrolling/reftest.list	2015-04-24 19:30:55.000000000 +0000
@@ -15,7 +15,7 @@
 skip-if(Mulet) skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-3.html scroll-behavior-3.html?ref # see bug 1041833 # MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
 skip-if(Mulet) skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-4.html scroll-behavior-4.html?ref # see bug 1041833 # MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
 skip-if(Mulet) skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-5.html scroll-behavior-5.html?ref # see bug 1041833 # MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip-if(Android) skip-if(asyncPanZoom&&winWidget) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-6.html scroll-behavior-6.html?ref # see bug 1041833
+skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-6.html scroll-behavior-6.html?ref # see bug 1041833
 skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-7.html scroll-behavior-7.html?ref # see bug 1041833
 skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-8.html scroll-behavior-8.html?ref # see bug 1041833
 skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-9.html scroll-behavior-9.html?ref # see bug 1041833
@@ -27,11 +27,11 @@
 HTTP == transformed-1.html?up transformed-1.html?ref
 fuzzy-if(Android,5,20000) == uncovering-1.html uncovering-1-ref.html
 fuzzy-if(Android,5,20000) == uncovering-2.html uncovering-2-ref.html
-skip-if(B2G||Mulet) skip-if(asyncPanZoom&&winWidget) == less-than-scrollbar-height.html less-than-scrollbar-height-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if(B2G||Mulet) == less-than-scrollbar-height.html less-than-scrollbar-height-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) == huge-horizontal-overflow.html huge-horizontal-overflow-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) == huge-vertical-overflow.html huge-vertical-overflow-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 == iframe-scrolling-attr-1.html iframe-scrolling-attr-ref.html
 skip-if((B2G&&browserIsRemote)||Mulet) == iframe-scrolling-attr-2.html iframe-scrolling-attr-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(asyncPanZoom&&winWidget) == frame-scrolling-attr-1.html frame-scrolling-attr-ref.html
-skip-if(asyncPanZoom&&winWidget) == frame-scrolling-attr-2.html frame-scrolling-attr-ref.html
+== frame-scrolling-attr-1.html frame-scrolling-attr-ref.html
+== frame-scrolling-attr-2.html frame-scrolling-attr-ref.html
 == move-item.html move-item-ref.html # bug 1125750
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/text-overflow/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/text-overflow/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/text-overflow/reftest.list	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/text-overflow/reftest.list	2015-04-24 19:30:57.000000000 +0000
@@ -22,5 +22,5 @@
 skip-if(Mulet) HTTP(..) == two-value-syntax.html two-value-syntax-ref.html # MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
 skip-if(B2G||Mulet) HTTP(..) == single-value.html single-value-ref.html  # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) HTTP(..) == atomic-under-marker.html atomic-under-marker-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy(1,702) skip-if(Android||B2G||Mulet) skip-if(asyncPanZoom&&winWidget) HTTP(..) == xulscroll.html xulscroll-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+fuzzy(1,702) skip-if(Android||B2G||Mulet) HTTP(..) == xulscroll.html xulscroll-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 HTTP(..) == combobox-zoom.html combobox-zoom-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-degrees.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-degrees.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-degrees.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-degrees.html	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<html>
+<title>Reftest, bug 1156456</title>
+<style>
+
+html, body {
+  height: 100%;
+}
+
+body {
+  background: white;
+  perspective: 1000px;
+}
+
+div, div::before, div::after {
+  width: 200px; height: 200px;
+}
+
+@keyframes HoldTransform {
+  from, to {
+    transform: rotateY(-120deg) rotateX(60deg);
+  }
+}
+
+div {
+  position: absolute;
+  top: 0; right: 0; bottom: 0; left: 0;
+  margin: auto;
+  transform-origin: 50% 50% 100px;
+  background: #006;
+  transform-style: preserve-3d;
+  animation: 10s HoldTransform infinite;
+}
+
+div::before, div::after {
+  position: absolute;
+  top: 0; left: 0;
+  content: "";
+}
+
+div::before {
+  background: #00f;
+  transform: translate3D(100px, 0, 100px) rotateY(90deg);
+}
+
+div::after {
+  background: #00c;
+  transform: translate3D(0, -100px, 100px) rotateX(90deg);
+}
+
+</style>
+<div></div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-degrees-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-degrees-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-degrees-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-degrees-ref.html	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<html>
+<title>Reftest, bug 1156456</title>
+<style>
+
+html, body {
+  height: 100%;
+}
+
+body {
+  background: white;
+  perspective: 1000px;
+}
+
+div, div::before, div::after {
+  width: 200px; height: 200px;
+}
+
+div {
+  position: absolute;
+  top: 0; right: 0; bottom: 0; left: 0;
+  margin: auto;
+  transform-origin: 50% 50% 100px;
+  background: #006;
+  transform: rotateY(-120deg) rotateX(60deg);
+  transform-style: preserve-3d;
+}
+
+div::before, div::after {
+  position: absolute;
+  top: 0; left: 0;
+  content: "";
+}
+
+div::before {
+  background: #00f;
+  transform: translate3D(100px, 0, 100px) rotateY(90deg);
+}
+
+div::after {
+  background: #00c;
+  transform: translate3D(0, -100px, 100px) rotateX(90deg);
+}
+
+</style>
+<div></div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-degrees-zoom.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-degrees-zoom.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-degrees-zoom.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-degrees-zoom.html	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<html reftest-zoom="1.5">
+<title>Reftest, bug 1156456</title>
+<style>
+
+html, body {
+  height: 100%;
+}
+
+body {
+  background: white;
+  perspective: 1000px;
+}
+
+div, div::before, div::after {
+  width: 200px; height: 200px;
+}
+
+@keyframes HoldTransform {
+  from, to {
+    transform: rotateY(-120deg) rotateX(60deg);
+  }
+}
+
+div {
+  position: absolute;
+  top: 0; right: 0; bottom: 0; left: 0;
+  margin: auto;
+  transform-origin: 50% 50% 100px;
+  background: #006;
+  transform-style: preserve-3d;
+  animation: 10s HoldTransform infinite;
+}
+
+div::before, div::after {
+  position: absolute;
+  top: 0; left: 0;
+  content: "";
+}
+
+div::before {
+  background: #00f;
+  transform: translate3D(100px, 0, 100px) rotateY(90deg);
+}
+
+div::after {
+  background: #00c;
+  transform: translate3D(0, -100px, 100px) rotateX(90deg);
+}
+
+</style>
+<div></div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-degrees-zoom-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-degrees-zoom-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-degrees-zoom-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-degrees-zoom-ref.html	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<html reftest-zoom="1.5">
+<title>Reftest, bug 1156456</title>
+<style>
+
+html, body {
+  height: 100%;
+}
+
+body {
+  background: white;
+  perspective: 1000px;
+}
+
+div, div::before, div::after {
+  width: 200px; height: 200px;
+}
+
+div {
+  position: absolute;
+  top: 0; right: 0; bottom: 0; left: 0;
+  margin: auto;
+  transform-origin: 50% 50% 100px;
+  background: #006;
+  transform: rotateY(-120deg) rotateX(60deg);
+  transform-style: preserve-3d;
+}
+
+div::before, div::after {
+  position: absolute;
+  top: 0; left: 0;
+  content: "";
+}
+
+div::before {
+  background: #00f;
+  transform: translate3D(100px, 0, 100px) rotateY(90deg);
+}
+
+div::after {
+  background: #00c;
+  transform: translate3D(0, -100px, 100px) rotateX(90deg);
+}
+
+</style>
+<div></div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-radians.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-radians.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-radians.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-radians.html	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<html>
+<title>Reftest, bug 1156456</title>
+<style>
+
+html, body {
+  height: 100%;
+}
+
+body {
+  background: white;
+  perspective: 1000px;
+}
+
+div, div::before, div::after {
+  width: 200px; height: 200px;
+}
+
+@keyframes HoldTransform {
+  from, to {
+    /* approximately rotateY(-120deg) rotateX(60deg); */
+    transform: rotateY(-2.0944rad) rotateX(1.0472rad);
+  }
+}
+
+div {
+  position: absolute;
+  top: 0; right: 0; bottom: 0; left: 0;
+  margin: auto;
+  transform-origin: 50% 50% 100px;
+  background: #006;
+  transform-style: preserve-3d;
+  animation: 10s HoldTransform infinite;
+}
+
+div::before, div::after {
+  position: absolute;
+  top: 0; left: 0;
+  content: "";
+}
+
+div::before {
+  background: #00f;
+  transform: translate3D(100px, 0, 100px) rotateY(90deg);
+}
+
+div::after {
+  background: #00c;
+  transform: translate3D(0, -100px, 100px) rotateX(90deg);
+}
+
+</style>
+<div></div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-radians-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-radians-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-radians-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-radians-ref.html	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<html>
+<title>Reftest, bug 1156456</title>
+<style>
+
+html, body {
+  height: 100%;
+}
+
+body {
+  background: white;
+  perspective: 1000px;
+}
+
+div, div::before, div::after {
+  width: 200px; height: 200px;
+}
+
+div {
+  position: absolute;
+  top: 0; right: 0; bottom: 0; left: 0;
+  margin: auto;
+  transform-origin: 50% 50% 100px;
+  background: #006;
+  /* approximately rotateY(-120deg) rotateX(60deg); */
+  transform: rotateY(-2.0944rad) rotateX(1.0472rad);
+  transform-style: preserve-3d;
+}
+
+div::before, div::after {
+  position: absolute;
+  top: 0; left: 0;
+  content: "";
+}
+
+div::before {
+  background: #00f;
+  transform: translate3D(100px, 0, 100px) rotateY(90deg);
+}
+
+div::after {
+  background: #00c;
+  transform: translate3D(0, -100px, 100px) rotateX(90deg);
+}
+
+</style>
+<div></div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-radians-zoom.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-radians-zoom.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-radians-zoom.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-radians-zoom.html	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<html reftest-zoom="1.5">
+<title>Reftest, bug 1156456</title>
+<style>
+
+html, body {
+  height: 100%;
+}
+
+body {
+  background: white;
+  perspective: 1000px;
+}
+
+div, div::before, div::after {
+  width: 200px; height: 200px;
+}
+
+@keyframes HoldTransform {
+  from, to {
+    /* approximately rotateY(-120deg) rotateX(60deg); */
+    transform: rotateY(-2.0944rad) rotateX(1.0472rad);
+  }
+}
+
+div {
+  position: absolute;
+  top: 0; right: 0; bottom: 0; left: 0;
+  margin: auto;
+  transform-origin: 50% 50% 100px;
+  background: #006;
+  transform-style: preserve-3d;
+  animation: 10s HoldTransform infinite;
+}
+
+div::before, div::after {
+  position: absolute;
+  top: 0; left: 0;
+  content: "";
+}
+
+div::before {
+  background: #00f;
+  transform: translate3D(100px, 0, 100px) rotateY(90deg);
+}
+
+div::after {
+  background: #00c;
+  transform: translate3D(0, -100px, 100px) rotateX(90deg);
+}
+
+</style>
+<div></div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-radians-zoom-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-radians-zoom-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/animate-cube-radians-zoom-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/animate-cube-radians-zoom-ref.html	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<html reftest-zoom="1.5">
+<title>Reftest, bug 1156456</title>
+<style>
+
+html, body {
+  height: 100%;
+}
+
+body {
+  background: white;
+  perspective: 1000px;
+}
+
+div, div::before, div::after {
+  width: 200px; height: 200px;
+}
+
+div {
+  position: absolute;
+  top: 0; right: 0; bottom: 0; left: 0;
+  margin: auto;
+  transform-origin: 50% 50% 100px;
+  background: #006;
+  /* approximately rotateY(-120deg) rotateX(60deg); */
+  transform: rotateY(-2.0944rad) rotateX(1.0472rad);
+  transform-style: preserve-3d;
+}
+
+div::before, div::after {
+  position: absolute;
+  top: 0; left: 0;
+  content: "";
+}
+
+div::before {
+  background: #00f;
+  transform: translate3D(100px, 0, 100px) rotateY(90deg);
+}
+
+div::after {
+  background: #00c;
+  transform: translate3D(0, -100px, 100px) rotateX(90deg);
+}
+
+</style>
+<div></div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/transform-3d/reftest.list	2015-04-22 13:05:32.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/transform-3d/reftest.list	2015-04-24 19:30:57.000000000 +0000
@@ -57,3 +57,9 @@
 fuzzy-if(winWidget&&!layersGPUAccelerated,1,606) == scroll-perspective-1.html scroll-perspective-1-ref.html
 # Bugs
 fails-if(!layersGPUAccelerated) == 1035611-1.html 1035611-1-ref.html # Bug 1072898 for !layersGPUAccelerated failures
+== animate-cube-radians.html animate-cube-radians-ref.html
+fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated,16,6) fuzzy-if(Mulet,16,9) == animate-cube-radians-zoom.html animate-cube-radians-zoom-ref.html
+!= animate-cube-radians-ref.html animate-cube-radians-zoom-ref.html
+== animate-cube-degrees.html animate-cube-degrees-ref.html
+== animate-cube-degrees-zoom.html animate-cube-degrees-zoom-ref.html
+!= animate-cube-degrees-ref.html animate-cube-degrees-zoom-ref.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/w3c-css/submitted/fonts3/font-size-zero-2-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/w3c-css/submitted/fonts3/font-size-zero-2-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/w3c-css/submitted/fonts3/font-size-zero-2-ref.html	2015-04-22 13:05:33.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/w3c-css/submitted/fonts3/font-size-zero-2-ref.html	2015-04-24 19:30:58.000000000 +0000
@@ -2,8 +2,6 @@
 <title>CSS Test Reference</title>
 <link rel="author" title="L. David Baron" href="http://dbaron.org/">
 <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-<link rel="help" href="http://www.w3.org/TR/css3-fonts/#font-size-prop">
-<link rel="help" href="http://www.w3.org/TR/CSS21/box.html#collapsing-margins">
 <meta name="flags" content="">
 <style>
 /* spec ambiguous whether font-size-adjust influences line-height: normal */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/writing-mode/1117227-1-text-overflow.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/writing-mode/1117227-1-text-overflow.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/writing-mode/1117227-1-text-overflow.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/writing-mode/1117227-1-text-overflow.html	2015-04-24 19:30:58.000000000 +0000
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Bug 1117227 - text-overflow on vertical text</title>
+  <style>
+    @font-face {
+      font-family: DejaVuSansMono;
+      src: url(../fonts/DejaVuSansMono.woff);
+    }
+    body {
+      font: 16px DejaVuSansMono;
+      text-orientation: sideways-right;
+    }
+    .c {
+      block-size: 3em; inline-size: 4em;
+      overflow: hidden;
+    }
+    .e { text-overflow: ellipsis; }
+    .ee { text-overflow: ellipsis ellipsis; }
+    .ec { text-overflow: ellipsis clip; }
+    .s { text-overflow: '$'; }
+    .ss { text-overflow: '^' '$'; }
+    .se { text-overflow: '^' ellipsis; }
+    .vlr { writing-mode: vertical-lr; }
+    .vrl { writing-mode: vertical-rl; }
+    .t { margin-inline-start: -1em; }
+
+    #tests { position: relative; }
+    #tests > div { position: absolute; }
+    .r1 { top: 0em; }
+    .r2 { top: 4.5em; }
+    .c1 { left: 0em; }
+    .c2 { left: 4em; }
+    .c3 { left: 8em; }
+    .c4 { left: 12em; }
+    .c5 { left: 16em; }
+    .c6 { left: 20em; }
+  </style>
+</head>
+<body>
+  <p style="font-family: sans-serif">Test for text-overflow in vertical mode:</p>
+
+  <div id="tests">
+    <div class="r1 c1"><div class="c e vrl"><span class="t">0123456789</span></div></div>
+    <div class="r1 c2"><div class="c e vlr"><span class="t">0123456789</span></div></div>
+    <div class="r1 c3"><div class="c ee vrl"><span class="t">0123456789</span></div></div>
+    <div class="r1 c4"><div class="c ee vlr"><span class="t">0123456789</span></div></div>
+    <div class="r1 c5"><div class="c ec vrl"><span class="t">0123456789</span></div></div>
+    <div class="r1 c6"><div class="c ec vlr"><span class="t">0123456789</span></div></div>
+
+    <div class="r2 c1"><div class="c s vrl"><span class="t">0123456789</span></div></div>
+    <div class="r2 c2"><div class="c s vlr"><span class="t">0123456789</span></div></div>
+    <div class="r2 c3"><div class="c ss vrl"><span class="t">0123456789</span></div></div>
+    <div class="r2 c4"><div class="c ss vlr"><span class="t">0123456789</span></div></div>
+    <div class="r2 c5"><div class="c se vrl"><span class="t">0123456789</span></div></div>
+    <div class="r2 c6"><div class="c se vlr"><span class="t">0123456789</span></div></div>
+  </div>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/writing-mode/1117227-1-text-overflow-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/writing-mode/1117227-1-text-overflow-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/writing-mode/1117227-1-text-overflow-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/writing-mode/1117227-1-text-overflow-ref.html	2015-04-24 19:30:58.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Bug 1117227 - text-overflow on vertical text</title>
+  <style>
+    @font-face {
+      font-family: DejaVuSansMono;
+      src: url(../fonts/DejaVuSansMono.woff);
+    }
+    body {
+      font: 16px DejaVuSansMono;
+      text-orientation: sideways-right;
+      white-space: nowrap;
+    }
+    .c {
+      block-size: 3em; inline-size: 4em;
+      overflow: hidden;
+    }
+    .vlr { writing-mode: vertical-lr; }
+    .vrl { writing-mode: vertical-rl; }
+    .t { margin-inline-start: -1em; }
+    m { display: inline-block; }
+
+    #tests { position: relative; }
+    #tests > div { position: absolute; }
+    .r1 { top: 0em; }
+    .r2 { top: 4.5em; }
+    .c1 { left: 0em; }
+    .c2 { left: 4em; }
+    .c3 { left: 8em; }
+    .c4 { left: 12em; }
+    .c5 { left: 16em; }
+    .c6 { left: 20em; }
+  </style>
+</head>
+<body>
+  <p style="font-family: sans-serif">Test for text-overflow in vertical mode:</p>
+
+  <div id="tests">
+    <div class="r1 c1"><div class="c vrl"><span class="t">&nbsp;123456<m>&hellip;</m></span></div></div>
+    <div class="r1 c2"><div class="c vlr"><span class="t">&nbsp;123456<m>&hellip;</m></span></div></div>
+    <div class="r1 c3"><div class="c vrl"><span class="t">&nbsp;&nbsp;<m>&hellip;</m>3456<m>&hellip;</m></span></div></div>
+    <div class="r1 c4"><div class="c vlr"><span class="t">&nbsp;&nbsp;<m>&hellip;</m>3456<m>&hellip;</m></span></div></div>
+    <div class="r1 c5"><div class="c vrl"><span class="t">&nbsp;&nbsp;<m>&hellip;</m>345678&nbsp;</span></div></div>
+    <div class="r1 c6"><div class="c vlr"><span class="t">&nbsp;&nbsp;<m>&hellip;</m>345678&nbsp;</span></div></div>
+
+    <div class="r2 c1"><div class="c vrl"><span class="t">&nbsp;123456<m>$</m></span></div></div>
+    <div class="r2 c2"><div class="c vlr"><span class="t">&nbsp;123456<m>$</m></span></div></div>
+    <div class="r2 c3"><div class="c vrl"><span class="t">&nbsp;&nbsp;<m>^</m>3456<m>$</m></span></div></div>
+    <div class="r2 c4"><div class="c vlr"><span class="t">&nbsp;&nbsp;<m>^</m>3456<m>$</m></span></div></div>
+    <div class="r2 c5"><div class="c vrl"><span class="t">&nbsp;&nbsp;<m>^</m>3456<m>&hellip;</m></span></div></div>
+    <div class="r2 c6"><div class="c vlr"><span class="t">&nbsp;&nbsp;<m>^</m>3456<m>&hellip;</m></span></div></div>
+  </div>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/writing-mode/reftest.list thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/writing-mode/reftest.list
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/writing-mode/reftest.list	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/writing-mode/reftest.list	2015-04-24 19:30:58.000000000 +0000
@@ -36,6 +36,7 @@
 == 1111944-1-list-marker.html 1111944-1-list-marker-ref.html
 fuzzy(116,64) HTTP(..) == 1115916-1-vertical-metrics.html 1115916-1-vertical-metrics-ref.html
 == 1117210-1-vertical-baseline-snap.html 1117210-1-vertical-baseline-snap-ref.html
+== 1117227-1-text-overflow.html 1117227-1-text-overflow-ref.html
 == 1122366-1-margin-collapse.html 1122366-1-margin-collapse-ref.html
 == 1124636-1-fieldset-max-height.html 1124636-1-fieldset-max-height-ref.html
 == 1124636-2-fieldset-min-height.html 1124636-2-fieldset-min-height-ref.html
@@ -59,7 +60,6 @@
 == ua-style-sheet-border-3.html ua-style-sheet-border-3-ref.html
 == ua-style-sheet-border-4.html ua-style-sheet-border-4-ref.html
 == ua-style-sheet-border-5.html ua-style-sheet-border-5-ref.html
-== ua-style-sheet-border-6.html ua-style-sheet-border-6-ref.html
 == ua-style-sheet-size-1.html ua-style-sheet-size-1-ref.html
 == ua-style-sheet-size-2.html ua-style-sheet-size-2-ref.html
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/writing-mode/ua-style-sheet-border-6.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/writing-mode/ua-style-sheet-border-6.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/writing-mode/ua-style-sheet-border-6.html	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/writing-mode/ua-style-sheet-border-6.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Test for logical borders on abbr elements in the UA style sheet</title>
-<style>
-.v-rl { writing-mode: vertical-rl; }
-.ltr, .rtl, .v-rl { border: 1px solid blue; padding: 16px; }
-</style>
-<div class=ltr>
-  <abbr title=Title>Abbrev.</abbr>
-</div>
-<div class=rtl dir=rtl>
-  <abbr title=Title>Abbrev.</abbr>
-</div>
-<div class=v-rl>
-  <abbr title=Title>Abbrev.</abbr>
-</div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/writing-mode/ua-style-sheet-border-6-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/writing-mode/ua-style-sheet-border-6-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/reftests/writing-mode/ua-style-sheet-border-6-ref.html	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/reftests/writing-mode/ua-style-sheet-border-6-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Test for logical margins on abbr elements in the UA style sheet</title>
-<style>
-.v-rl { writing-mode: vertical-rl; }
-.ltr, .rtl, .v-rl { border: 1px solid blue; padding: 16px; }
-abbr { border: none; }
-.ltr abbr { border-bottom: 1px dotted; }
-.rtl abbr { border-bottom: 1px dotted; }
-.v-rl abbr { border-left: 1px dotted; }
-</style>
-<div class=ltr>
-  <abbr title=Title>Abbrev.</abbr>
-</div>
-<div class=rtl dir=rtl>
-  <abbr title=Title>Abbrev.</abbr>
-</div>
-<div class=v-rl>
-  <abbr title=Title>Abbrev.</abbr>
-</div>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/AnimationCommon.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/AnimationCommon.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/AnimationCommon.h	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/AnimationCommon.h	2015-04-24 19:30:59.000000000 +0000
@@ -28,7 +28,6 @@
 
 class nsIFrame;
 class nsPresContext;
-class nsStyleChangeList;
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/CounterStyleManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/CounterStyleManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/CounterStyleManager.h	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/CounterStyleManager.h	2015-04-24 19:30:59.000000000 +0000
@@ -17,7 +17,6 @@
 #include "nsCSSValue.h"
 
 class nsPresContext;
-class nsCSSCounterStyleRule;
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/CSSStyleSheet.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/CSSStyleSheet.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/CSSStyleSheet.h	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/CSSStyleSheet.h	2015-04-24 19:30:59.000000000 +0000
@@ -29,7 +29,6 @@
 
 class CSSRuleListImpl;
 class nsCSSRuleProcessor;
-class nsICSSRuleList;
 class nsIPrincipal;
 class nsIURI;
 class nsMediaList;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/CSSValue.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/CSSValue.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/CSSValue.h	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/CSSValue.h	2015-04-24 19:30:59.000000000 +0000
@@ -12,7 +12,6 @@
 #include "nsWrapperCache.h"
 #include "nsStringFwd.h"
 
-class nsIDOMCSSValue;
 class nsROCSSPrimitiveValue;
 namespace mozilla {
 class ErrorResult;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/FontFaceSet.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/FontFaceSet.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/FontFaceSet.cpp	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/FontFaceSet.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -511,7 +511,9 @@
   } else {
     nsRefPtr<nsCORSListenerProxy> listener =
       new nsCORSListenerProxy(streamLoader, aUserFontEntry->GetPrincipal(), false);
-    rv = listener->Init(channel);
+    // Doesn't matter what data: URI handling we use here, since we
+    // don't even use a CORS listener proxy for the data: case.
+    rv = listener->Init(channel, DataURIHandling::Disallow);
     if (NS_SUCCEEDED(rv)) {
       rv = channel->AsyncOpen(listener, nullptr);
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/html.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/html.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/html.css	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/html.css	2015-04-24 19:30:59.000000000 +0000
@@ -560,7 +560,7 @@
 
 /* titles */
 abbr[title], acronym[title] {
-  border-block-end: dotted 1px;
+  text-decoration: dotted underline;
 }
 
 /* lists */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/Loader.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/Loader.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/Loader.cpp	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/Loader.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -1670,7 +1670,7 @@
     nsRefPtr<nsCORSListenerProxy> corsListener =
       new nsCORSListenerProxy(streamLoader, aLoadData->mLoaderPrincipal,
 			      withCredentials);
-    rv = corsListener->Init(channel);
+    rv = corsListener->Init(channel, DataURIHandling::Allow);
     if (NS_FAILED(rv)) {
 #ifdef DEBUG
       mSyncCallback = false;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/Loader.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/Loader.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/Loader.h	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/Loader.h	2015-04-24 19:30:59.000000000 +0000
@@ -23,14 +23,11 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/net/ReferrerPolicy.h"
 
-class nsIAtom;
 class nsICSSLoaderObserver;
 class nsIContent;
 class nsIDocument;
-class nsCSSParser;
 class nsMediaList;
 class nsIStyleSheetLinkingElement;
-class nsCycleCollectionTraversalCallback;
 
 namespace mozilla {
 class CSSStyleSheet;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsAnimationManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsAnimationManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsAnimationManager.h	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsAnimationManager.h	2015-04-24 19:30:59.000000000 +0000
@@ -13,7 +13,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TimeStamp.h"
 
-class nsCSSKeyframesRule;
 class nsStyleContext;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsComputedDOMStyle.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsComputedDOMStyle.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsComputedDOMStyle.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsComputedDOMStyle.h	2015-04-24 19:30:59.000000000 +0000
@@ -34,33 +34,12 @@
 struct nsMargin;
 class nsROCSSPrimitiveValue;
 struct nsStyleBackground;
-struct nsStyleBorder;
-struct nsStyleContent;
-struct nsStyleColumn;
-struct nsStyleColor;
 class nsStyleCoord;
 class nsStyleCorners;
-struct nsStyleDisplay;
 struct nsStyleFilter;
-struct nsStyleFont;
 class nsStyleGradient;
 struct nsStyleImage;
-struct nsStyleList;
-struct nsStyleMargin;
-struct nsStyleOutline;
-struct nsStylePadding;
-struct nsStylePosition;
-struct nsStyleQuotes;
 class nsStyleSides;
-struct nsStyleSVG;
-struct nsStyleSVGReset;
-struct nsStyleTable;
-struct nsStyleText;
-struct nsStyleTextReset;
-class nsStyleTimingFunction;
-struct nsStyleUIReset;
-struct nsStyleVisibility;
-struct nsStyleXUL;
 struct nsTimingFunction;
 class gfx3DMatrix;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsCSSProps.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsCSSProps.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsCSSProps.cpp	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsCSSProps.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -1498,9 +1498,10 @@
 };
 
 const KTableValue nsCSSProps::kOrientKTable[] = {
+  eCSSKeyword_inline,     NS_STYLE_ORIENT_INLINE,
+  eCSSKeyword_block,      NS_STYLE_ORIENT_BLOCK,
   eCSSKeyword_horizontal, NS_STYLE_ORIENT_HORIZONTAL,
   eCSSKeyword_vertical,   NS_STYLE_ORIENT_VERTICAL,
-  eCSSKeyword_auto,       NS_STYLE_ORIENT_AUTO,
   eCSSKeyword_UNKNOWN,    -1
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsCSSRuleProcessor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsCSSRuleProcessor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsCSSRuleProcessor.h	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsCSSRuleProcessor.h	2015-04-24 19:30:59.000000000 +0000
@@ -22,8 +22,10 @@
 #include "mozilla/UniquePtr.h"
 
 struct CascadeEnumData;
+struct ElementDependentRuleProcessorData;
 struct nsCSSSelector;
 struct nsCSSSelectorList;
+struct nsFontFaceRuleContainer;
 struct RuleCascadeData;
 struct TreeMatchContext;
 class nsCSSKeyframesRule;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsFontFaceLoader.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsFontFaceLoader.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsFontFaceLoader.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsFontFaceLoader.h	2015-04-24 19:30:59.000000000 +0000
@@ -18,7 +18,6 @@
 #include "nsTHashtable.h"
 #include "nsCSSRules.h"
 
-class nsPresContext;
 class nsIPrincipal;
 
 class nsFontFaceLoader : public nsIStreamLoaderObserver
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsICSSPseudoComparator.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsICSSPseudoComparator.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsICSSPseudoComparator.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsICSSPseudoComparator.h	2015-04-24 19:30:59.000000000 +0000
@@ -8,7 +8,6 @@
 #ifndef nsICSSPseudoComparator_h___
 #define nsICSSPseudoComparator_h___
 
-class nsIAtom;
 struct nsCSSSelector;
 
 class nsICSSPseudoComparator
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsIStyleRuleProcessor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsIStyleRuleProcessor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsIStyleRuleProcessor.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsIStyleRuleProcessor.h	2015-04-24 19:30:59.000000000 +0000
@@ -17,7 +17,6 @@
 #include "nsChangeHint.h"
 
 struct RuleProcessorData;
-struct ElementDependentRuleProcessorData;
 struct ElementRuleProcessorData;
 struct PseudoElementRuleProcessorData;
 struct AnonBoxRuleProcessorData;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsRuleNode.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsRuleNode.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsRuleNode.cpp	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsRuleNode.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -5883,7 +5883,7 @@
               display->mOrient, canStoreInRuleTree,
               SETDSC_ENUMERATED | SETDSC_UNSET_INITIAL,
               parentDisplay->mOrient,
-              NS_STYLE_ORIENT_AUTO, 0, 0, 0, 0);
+              NS_STYLE_ORIENT_INLINE, 0, 0, 0, 0);
 
   COMPUTE_END_RESET(Display, display)
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsRuleNode.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsRuleNode.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsRuleNode.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsRuleNode.h	2015-04-24 19:30:59.000000000 +0000
@@ -20,7 +20,6 @@
 struct nsCSSValueList;
 class nsCSSPropertySet;
 class nsCSSValue;
-struct nsCSSRect;
 
 class nsStyleCoord;
 struct nsCSSValuePairList;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsRuleProcessorData.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsRuleProcessorData.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsRuleProcessorData.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsRuleProcessorData.h	2015-04-24 19:30:59.000000000 +0000
@@ -23,11 +23,9 @@
 #include "mozilla/EventStates.h"
 #include "mozilla/GuardObjects.h"
 
-class nsAttrValue;
 class nsIAtom;
 class nsIContent;
 class nsICSSPseudoComparator;
-class nsIStyleSheet;
 struct TreeMatchContext;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleConsts.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleConsts.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleConsts.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleConsts.h	2015-04-24 19:30:59.000000000 +0000
@@ -147,9 +147,10 @@
 #define NS_STYLE_BOX_ORIENT_VERTICAL   1
 
 // orient
-#define NS_STYLE_ORIENT_HORIZONTAL 0
-#define NS_STYLE_ORIENT_VERTICAL   1
-#define NS_STYLE_ORIENT_AUTO       2
+#define NS_STYLE_ORIENT_INLINE     0
+#define NS_STYLE_ORIENT_BLOCK      1
+#define NS_STYLE_ORIENT_HORIZONTAL 2
+#define NS_STYLE_ORIENT_VERTICAL   3
 
 #define NS_RADIUS_FARTHEST_SIDE 0
 #define NS_RADIUS_CLOSEST_SIDE  1
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleContext.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleContext.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleContext.cpp	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleContext.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -548,6 +548,21 @@
   // the level containers themselves are breakable. We have to check
   // the container display type against all ruby display type here
   // because any of the ruby boxes could be anonymous.
+  // Note that, when certain HTML tags, e.g. form controls, have ruby
+  // level container display type, they could also escape from this flag
+  // while they shouldn't. However, it is generally fine since they
+  // won't usually break the assertion that there is no line break
+  // inside ruby, because:
+  // 1. their display types, the ruby level container types, are inline-
+  //    outside, which means they won't cause any forced line break; and
+  // 2. they never start an inline span, which means their children, if
+  //    any, won't be able to break the line its ruby ancestor lays; and
+  // 3. their parent frame is always a ruby content frame (due to
+  //    anonymous ruby box generation), which makes line layout suppress
+  //    any optional line break around this frame.
+  // However, there is one special case which is BR tag, because it
+  // directly affects the line layout. This case is handled by the BR
+  // frame which checks the flag of its parent frame instead of itself.
   if ((aContainerDisplay->IsRubyDisplayType() &&
        aStyleDisplay->mDisplay != NS_STYLE_DISPLAY_RUBY_BASE_CONTAINER &&
        aStyleDisplay->mDisplay != NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER) ||
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleContext.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleContext.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleContext.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleContext.h	2015-04-24 19:30:59.000000000 +0000
@@ -161,7 +161,7 @@
   // true, the line should not be broken inside, which means inlines act
   // as if nowrap is set, <br> is suppressed, and blocks are inlinized.
   // This bit is propogated to all children of line partitipants. It is
-  // currenlty used by ruby to make its content frames unbreakable.
+  // currently used by ruby to make its content frames unbreakable.
   bool ShouldSuppressLineBreak() const
     { return !!(mBits & NS_STYLE_SUPPRESS_LINEBREAK); }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleSet.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleSet.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleSet.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleSet.h	2015-04-24 19:30:59.000000000 +0000
@@ -26,13 +26,14 @@
 #include "nsCSSPseudoElements.h"
 
 class gfxFontFeatureValueSet;
-class nsCSSFontFaceRule;
 class nsCSSKeyframesRule;
 class nsCSSFontFeatureValuesRule;
 class nsCSSPageRule;
 class nsCSSCounterStyleRule;
+class nsICSSPseudoComparator;
 class nsRuleWalker;
 struct ElementDependentRuleProcessorData;
+struct nsFontFaceRuleContainer;
 struct TreeMatchContext;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleStruct.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleStruct.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleStruct.cpp	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleStruct.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -2602,7 +2602,7 @@
   mChildPerspective.SetNoneValue();
   mBackfaceVisibility = NS_STYLE_BACKFACE_VISIBILITY_VISIBLE;
   mTransformStyle = NS_STYLE_TRANSFORM_STYLE_FLAT;
-  mOrient = NS_STYLE_ORIENT_AUTO;
+  mOrient = NS_STYLE_ORIENT_INLINE;
   mMixBlendMode = NS_STYLE_BLEND_NORMAL;
   mIsolation = NS_STYLE_ISOLATION_AUTO;
   mTouchAction = NS_STYLE_TOUCH_ACTION_AUTO;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleUtil.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleUtil.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsStyleUtil.cpp	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsStyleUtil.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -63,7 +63,7 @@
   for (; in != end; in++) {
     if (*in < 0x20 || (*in >= 0x7F && *in < 0xA0)) {
       // Escape U+0000 through U+001F and U+007F through U+009F numerically.
-      aReturn.AppendPrintf("\\%hX ", *in);
+      aReturn.AppendPrintf("\\%hx ", *in);
     } else {
       if (*in == '"' || *in == '\'' || *in == '\\') {
         // Escape backslash and quote characters symbolically.
@@ -117,7 +117,7 @@
   // numerically.  If we didn't escape it numerically, it would get
   // interpreted as a numeric escape for the wrong character.
   if (in != end && ('0' <= *in && *in <= '9')) {
-    aReturn.AppendPrintf("\\%hX ", *in);
+    aReturn.AppendPrintf("\\%hx ", *in);
     ++in;
   }
 
@@ -128,7 +128,7 @@
     }
     if (ch < 0x20 || (0x7F <= ch && ch < 0xA0)) {
       // Escape U+0000 through U+001F and U+007F through U+009F numerically.
-      aReturn.AppendPrintf("\\%hX ", *in);
+      aReturn.AppendPrintf("\\%hx ", *in);
     } else {
       // Escape ASCII non-identifier printables as a backslash plus
       // the character.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsTransitionManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsTransitionManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/nsTransitionManager.h	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/nsTransitionManager.h	2015-04-24 19:30:59.000000000 +0000
@@ -18,7 +18,6 @@
 class nsStyleContext;
 class nsPresContext;
 class nsCSSPropertySet;
-struct ElementDependentRuleProcessorData;
 
 namespace mozilla {
 struct StyleTransition;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/Rule.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/Rule.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/Rule.h	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/Rule.h	2015-04-24 19:30:59.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsIStyleRule.h"
 #include "nsIDOMCSSRule.h"
 
-class nsIStyleSheet;
 class nsIDocument;
 struct nsRuleData;
 template<class T> struct already_AddRefed;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/StyleAnimationValue.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/StyleAnimationValue.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/StyleAnimationValue.cpp	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/StyleAnimationValue.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -1041,9 +1041,16 @@
                  double aCoeff2, const nsCSSValue &aValue2,
                  nsCSSValue &aResult)
 {
-  aResult.SetFloatValue(aCoeff1 * aValue1.GetAngleValueInRadians() +
-                        aCoeff2 * aValue2.GetAngleValueInRadians(),
-                        eCSSUnit_Radian);
+  if (aValue1.GetUnit() == aValue2.GetUnit()) {
+    // To avoid floating point error, if the units match, maintain the unit.
+    aResult.SetFloatValue(aCoeff1 * aValue1.GetFloatValue() +
+                          aCoeff2 * aValue2.GetFloatValue(),
+                          aValue1.GetUnit());
+  } else {
+    aResult.SetFloatValue(aCoeff1 * aValue1.GetAngleValueInRadians() +
+                          aCoeff2 * aValue2.GetAngleValueInRadians(),
+                          eCSSUnit_Radian);
+  }
 }
 
 static bool
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/StyleRule.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/StyleRule.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/StyleRule.h	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/StyleRule.h	2015-04-24 19:30:59.000000000 +0000
@@ -22,7 +22,6 @@
 
 class nsIAtom;
 struct nsCSSSelectorList;
-class nsCSSCompressedDataBlock;
 
 namespace mozilla {
 class CSSStyleSheet;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/SVGAttrAnimationRuleProcessor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/SVGAttrAnimationRuleProcessor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/SVGAttrAnimationRuleProcessor.h	2015-04-22 13:05:36.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/SVGAttrAnimationRuleProcessor.h	2015-04-24 19:30:59.000000000 +0000
@@ -14,7 +14,6 @@
 
 #include "nsIStyleRuleProcessor.h"
 
-class nsIDocument;
 class nsRuleWalker;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/ListCSSProperties.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/ListCSSProperties.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/ListCSSProperties.cpp	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/ListCSSProperties.cpp	2015-04-24 19:30:59.000000000 +0000
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "mozilla/ArrayUtils.h"
 
 struct PropertyInfo {
     const char *propName;
@@ -97,9 +98,6 @@
 
 };
 
-
-#define ARRAY_LENGTH(a_) (sizeof(a_)/sizeof((a_)[0]))
-
 const char *gInaccessibleProperties[] = {
     // Don't print the properties that aren't accepted by the parser, per
     // CSSParserImpl::ParseProperty
@@ -119,7 +117,7 @@
 inline int
 is_inaccessible(const char* aPropName)
 {
-    for (unsigned j = 0; j < ARRAY_LENGTH(gInaccessibleProperties); ++j) {
+    for (unsigned j = 0; j < MOZ_ARRAY_LENGTH(gInaccessibleProperties); ++j) {
         if (strcmp(aPropName, gInaccessibleProperties[j]) == 0)
             return 1;
     }
@@ -180,13 +178,13 @@
 {
     print_array("gLonghandProperties",
                 gLonghandProperties,
-                ARRAY_LENGTH(gLonghandProperties),
+                MOZ_ARRAY_LENGTH(gLonghandProperties),
                 gLonghandPropertiesWithDOMProp,
-                ARRAY_LENGTH(gLonghandPropertiesWithDOMProp));
+                MOZ_ARRAY_LENGTH(gLonghandPropertiesWithDOMProp));
     print_array("gShorthandProperties",
                 gShorthandProperties,
-                ARRAY_LENGTH(gShorthandProperties),
+                MOZ_ARRAY_LENGTH(gShorthandProperties),
                 gShorthandPropertiesWithDOMProp,
-                ARRAY_LENGTH(gShorthandPropertiesWithDOMProp));
+                MOZ_ARRAY_LENGTH(gShorthandPropertiesWithDOMProp));
     return 0;
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/mochitest.ini	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/mochitest.ini	2015-04-24 19:30:59.000000000 +0000
@@ -270,3 +270,4 @@
 support-files = ../../reftests/fonts/Ahem.ttf
 [test_setPropertyWithNull.html]
 [test_attribute_selector_eof_behavior.html]
+[test_css_loader_crossorigin_data_url.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/property_database.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/property_database.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/property_database.js	2015-04-22 13:05:37.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/property_database.js	2015-04-24 19:30:59.000000000 +0000
@@ -3021,8 +3021,8 @@
     domProp: "MozOrient",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
-    initial_values: [ "auto" ],
-    other_values: [ "horizontal", "vertical" ],
+    initial_values: [ "inline" ],
+    other_values: [ "horizontal", "vertical", "block" ],
     invalid_values: [ "none" ]
   },
   "orphans": {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/test_css_escape_api.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/test_css_escape_api.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/test_css_escape_api.html	2015-04-22 13:05:38.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/test_css_escape_api.html	2015-04-24 19:30:59.000000000 +0000
@@ -31,7 +31,7 @@
 is(CSS.escape(null), 'null', "escapingFailed Character : null");
 is(CSS.escape(''), '', "escapingFailed Character : '' ");
 
-is(CSS.escape('\x01\x02\x1E\x1F'), '\\1 \\2 \\1E \\1F ',"escapingFailed Char: \\x01\\x02\\x1E\\x1F");
+is(CSS.escape('\x01\x02\x1E\x1F'), '\\1 \\2 \\1e \\1f ',"escapingFailed Char: \\x01\\x02\\x1E\\x1F");
 
 is(CSS.escape('0a'), '\\30 a', "escapingFailed Char: 0a");
 is(CSS.escape('1a'), '\\31 a', "escapingFailed Char: 1a");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/test_css_loader_crossorigin_data_url.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/test_css_loader_crossorigin_data_url.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/test_css_loader_crossorigin_data_url.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/test_css_loader_crossorigin_data_url.html	2015-04-24 19:30:59.000000000 +0000
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test for handling of 'crossorigin' attribute on CSS link with data: URL</title>
+<link id="testlink" crossorigin rel="stylesheet" href="data:text/css,%23someuniqueidhere{display:none}">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<div id="someuniqueidhere"></div>
+<script>
+  var t = async_test("link@crossorigin with data: href");
+  window.addEventListener("load", t.step_func_done(function() {
+    assert_equals(getComputedStyle(document.getElementById("someuniqueidhere")).display,
+                  "none", "sheet should be applied");
+    assert_equals(document.getElementById("testlink").sheet.cssRules[0].style.display,
+                  "none", "should be able to read data from the sheet");
+  }));
+</script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/test_parser_diagnostics_unprintables.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/test_parser_diagnostics_unprintables.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/test_parser_diagnostics_unprintables.html	2015-04-22 13:05:38.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/test_parser_diagnostics_unprintables.html	2015-04-24 19:30:59.000000000 +0000
@@ -105,36 +105,36 @@
                                          s: "�\\1 \\2 \\3 " },
   { t: "\\\x04\\\x05\\\x06\\\x07",       i: "\\4 \\5 \\6 \\7 ",
                                          s: "\\4 \\5 \\6 \\7 " },
-  { t: "\\\x08\\\x09\\000A\\\x0B",       i: "\\8 \\9 \\A \\B ",
-                                         s: "\\8 \\9 \\A \\B " },
-  { t: "\\000C\\000D\\\x0E\\\x0F",       i: "\\C \\D \\E \\F ",
-                                         s: "\\C \\D \\E \\F " },
+  { t: "\\\x08\\\x09\\000A\\\x0B",       i: "\\8 \\9 \\a \\b ",
+                                         s: "\\8 \\9 \\a \\b " },
+  { t: "\\000C\\000D\\\x0E\\\x0F",       i: "\\c \\d \\e \\f ",
+                                         s: "\\c \\d \\e \\f " },
   { t: "\\\x10\\\x11\\\x12\\\x13",       i: "\\10 \\11 \\12 \\13 ",
                                          s: "\\10 \\11 \\12 \\13 " },
   { t: "\\\x14\\\x15\\\x16\\\x17",       i: "\\14 \\15 \\16 \\17 ",
                                          s: "\\14 \\15 \\16 \\17 " },
-  { t: "\\\x18\\\x19\\\x1A\\\x1B",       i: "\\18 \\19 \\1A \\1B ",
-                                         s: "\\18 \\19 \\1A \\1B " },
-  { t: "\\\x1C\\\x1D\\\x1E\\\x1F\\ ",    i: "\\1C \\1D \\1E \\1F \\ ",
-                                         s: "\\1C \\1D \\1E \\1F  " },
+  { t: "\\\x18\\\x19\\\x1A\\\x1B",       i: "\\18 \\19 \\1a \\1b ",
+                                         s: "\\18 \\19 \\1a \\1b " },
+  { t: "\\\x1C\\\x1D\\\x1E\\\x1F\\ ",    i: "\\1c \\1d \\1e \\1f \\ ",
+                                         s: "\\1c \\1d \\1e \\1f  " },
 
   // U+007F (DELETE) and U+0080 - U+009F (C1 controls)
-  { t: "\\\x7f\\\x80\\\x81\\\x82",       i: "\\7F \\80 \\81 \\82 ",
-                                         s: "\\7F \\80 \\81 \\82 " },
+  { t: "\\\x7f\\\x80\\\x81\\\x82",       i: "\\7f \\80 \\81 \\82 ",
+                                         s: "\\7f \\80 \\81 \\82 " },
   { t: "\\\x83\\\x84\\\x85\\\x86",       i: "\\83 \\84 \\85 \\86 ",
                                          s: "\\83 \\84 \\85 \\86 " },
-  { t: "\\\x87\\\x88\\\x89\\\x8A",       i: "\\87 \\88 \\89 \\8A ",
-                                         s: "\\87 \\88 \\89 \\8A " },
-  { t: "\\\x8B\\\x8C\\\x8D\\\x8E",       i: "\\8B \\8C \\8D \\8E ",
-                                         s: "\\8B \\8C \\8D \\8E " },
-  { t: "\\\x8F\\\x90\\\x91\\\x92",       i: "\\8F \\90 \\91 \\92 ",
-                                         s: "\\8F \\90 \\91 \\92 " },
+  { t: "\\\x87\\\x88\\\x89\\\x8A",       i: "\\87 \\88 \\89 \\8a ",
+                                         s: "\\87 \\88 \\89 \\8a " },
+  { t: "\\\x8B\\\x8C\\\x8D\\\x8E",       i: "\\8b \\8c \\8d \\8e ",
+                                         s: "\\8b \\8c \\8d \\8e " },
+  { t: "\\\x8F\\\x90\\\x91\\\x92",       i: "\\8f \\90 \\91 \\92 ",
+                                         s: "\\8f \\90 \\91 \\92 " },
   { t: "\\\x93\\\x94\\\x95\\\x96",       i: "\\93 \\94 \\95 \\96 ",
                                          s: "\\93 \\94 \\95 \\96 " },
-  { t: "\\\x97\\\x98\\\x99\\\x9A",       i: "\\97 \\98 \\99 \\9A ",
-                                         s: "\\97 \\98 \\99 \\9A " },
-  { t: "\\\x9B\\\x9C\\\x9D\\\x9E\\\x9F", i: "\\9B \\9C \\9D \\9E \\9F ",
-                                         s: "\\9B \\9C \\9D \\9E \\9F " },
+  { t: "\\\x97\\\x98\\\x99\\\x9A",       i: "\\97 \\98 \\99 \\9a ",
+                                         s: "\\97 \\98 \\99 \\9a " },
+  { t: "\\\x9B\\\x9C\\\x9D\\\x9E\\\x9F", i: "\\9b \\9c \\9d \\9e \\9f ",
+                                         s: "\\9b \\9c \\9d \\9e \\9f " },
 
   // CSS doesn't bother with the full Unicode rules for identifiers,
   // instead declaring that any code point greater than or equal to
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/test_parse_url.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/test_parse_url.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/test_parse_url.html	2015-04-22 13:05:38.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/test_parse_url.html	2015-04-24 19:30:59.000000000 +0000
@@ -166,15 +166,15 @@
 is(div.style.listStyleImage, 'url("\u00ff")', "U+A0-U+FF allowed in unquoted URL");
 
 div.style.listStyleImage = 'url(\\f good)';
-is(div.style.listStyleImage, 'url("\\F good")', "URL allowed");
+is(div.style.listStyleImage, 'url("\\f good")', "URL allowed");
 div.style.listStyleImage = 'url( \\f good)';
-is(div.style.listStyleImage, 'url("\\F good")', "URL allowed");
+is(div.style.listStyleImage, 'url("\\f good")', "URL allowed");
 div.style.listStyleImage = 'url(f\\f good)';
-is(div.style.listStyleImage, 'url("f\\F good")', "URL allowed");
+is(div.style.listStyleImage, 'url("f\\f good")', "URL allowed");
 div.style.listStyleImage = 'url(go\\od)';
 is(div.style.listStyleImage, 'url("good")', "URL allowed");
 div.style.listStyleImage = 'url(goo\\d)';
-is(div.style.listStyleImage, 'url("goo\\D ")', "URL allowed");
+is(div.style.listStyleImage, 'url("goo\\d ")', "URL allowed");
 div.style.listStyleImage = 'url(go\\o)';
 is(div.style.listStyleImage, 'url("goo")', "URL allowed");
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/test_transitions_per_property.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/test_transitions_per_property.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/style/test/test_transitions_per_property.html	2015-04-22 13:05:38.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/style/test/test_transitions_per_property.html	2015-04-24 19:30:59.000000000 +0000
@@ -643,21 +643,21 @@
     expected: ["contrast", 0.375] },
   // hue-rotate with different angle values
   { start: "hue-rotate(0deg)", end: "hue-rotate(720deg)",
-    expected: ["hue-rotate", Math.PI.toFixed(5)] },
+    expected: ["hue-rotate", "180deg"] },
   { start: "hue-rotate(0rad)", end: "hue-rotate("+4*Math.PI+"rad)",
-    expected: ["hue-rotate", Math.PI.toFixed(5)] },
+    expected: ["hue-rotate", Math.PI.toFixed(5)+"rad"] },
   { start: "hue-rotate(0grad)", end: "hue-rotate(800grad)",
-    expected: ["hue-rotate", Math.PI.toFixed(5)] },
+    expected: ["hue-rotate", "200grad"] },
   { start: "hue-rotate(0turn)", end: "hue-rotate(2turn)",
-    expected: ["hue-rotate", Math.PI.toFixed(5)] },
+    expected: ["hue-rotate", "0.5turn"] },
   { start: "hue-rotate(0deg)", end: "hue-rotate("+4*Math.PI+"rad)",
-    expected: ["hue-rotate", Math.PI.toFixed(5)] },
+    expected: ["hue-rotate", Math.PI.toFixed(5)+"rad"] },
   { start: "hue-rotate(0turn)", end: "hue-rotate(800grad)",
-    expected: ["hue-rotate", Math.PI.toFixed(5)] },
+    expected: ["hue-rotate", Math.PI.toFixed(5)+"rad"] },
   { start: "hue-rotate(0grad)", end: "hue-rotate("+4*Math.PI+"rad)",
-    expected: ["hue-rotate", Math.PI.toFixed(5)] },
+    expected: ["hue-rotate", Math.PI.toFixed(5)+"rad"] },
   { start: "hue-rotate(0grad)", end: "hue-rotate(0turn)",
-    expected: ["hue-rotate", 0] },
+    expected: ["hue-rotate", "0rad"] },
   // multiple matching functions, same length
   { start: "contrast(25%) brightness(0.25) blur(25px) sepia(75%)",
     end: "contrast(75%) brightness(0.75) blur(75px) sepia(25%)",
@@ -1215,12 +1215,8 @@
       }
       functionValue = functionValue.substring(0, functionValue.length - 2);
     } else if (functionName == "hue-rotate") {
-      // Last two characters must be "rad".
-      if (functionValue.search("rad") != functionValue.length - 3) {
-        return false;
-      }
-      tolerance = 0.001;
-      functionValue = functionValue.substring(0, functionValue.length - 3);
+      // Just check for string equality.
+      return functionValue == expected;
     } else if (functionName == "drop-shadow" || functionName == "url") {
       if (functionValue != expected) {
         return false;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsCSSFilterInstance.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsCSSFilterInstance.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsCSSFilterInstance.h	2015-04-22 13:05:38.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsCSSFilterInstance.h	2015-04-24 19:31:00.000000000 +0000
@@ -13,7 +13,6 @@
 #include "mozilla/gfx/Types.h"
 #include "nsColor.h"
 
-class nsIFrame;
 struct nsStyleFilter;
 template<class T> class nsTArray;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsISVGChildFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsISVGChildFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsISVGChildFrame.h	2015-04-22 13:05:38.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsISVGChildFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -14,7 +14,6 @@
 class nsIFrame;
 class SVGBBox;
 
-struct nsPoint;
 struct nsRect;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGContainerFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGContainerFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGContainerFrame.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGContainerFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -21,7 +21,6 @@
 class nsIPresShell;
 class nsStyleContext;
 
-struct nsPoint;
 struct nsRect;
 
 typedef nsContainerFrame nsSVGContainerFrameBase;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGFilterFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGFilterFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGFilterFrame.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGFilterFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -17,7 +17,6 @@
 class nsIFrame;
 class nsIPresShell;
 class nsStyleContext;
-class nsSVGIntegerPair;
 class nsSVGLength2;
 
 struct nsRect;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGFilterInstance.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGFilterInstance.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGFilterInstance.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGFilterInstance.h	2015-04-24 19:31:00.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsSVGNumberPair.h"
 #include "nsTArray.h"
 
-class nsIFrame;
 class nsSVGFilterFrame;
 struct nsStyleFilter;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGForeignObjectFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGForeignObjectFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGForeignObjectFrame.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGForeignObjectFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsSVGUtils.h"
 
 class gfxContext;
-class nsSVGOuterSVGFrame;
 
 typedef nsContainerFrame nsSVGForeignObjectFrameBase;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGPathGeometryFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGPathGeometryFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGPathGeometryFrame.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGPathGeometryFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -30,7 +30,6 @@
 class nsSVGMarkerFrame;
 class nsSVGMarkerProperty;
 
-struct nsPoint;
 struct nsRect;
 
 typedef nsFrame nsSVGPathGeometryFrameBase;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGPatternFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGPatternFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGPatternFrame.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGPatternFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -12,10 +12,7 @@
 #include "mozilla/RefPtr.h"
 #include "nsSVGPaintServerFrame.h"
 
-class gfxASurface;
-class gfxContext;
 class nsIFrame;
-class nsSVGElement;
 class nsSVGLength2;
 class nsSVGPathGeometryFrame;
 class nsSVGViewBox;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/svg/nsSVGUtils.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/svg/nsSVGUtils.h	2015-04-24 19:31:00.000000000 +0000
@@ -28,15 +28,12 @@
 #include <algorithm>
 
 class gfxContext;
-class gfxPattern;
 class nsFrameList;
 class nsIContent;
 class nsIDocument;
 class nsIFrame;
 class nsPresContext;
 class nsStyleContext;
-class nsStyleCoord;
-class nsSVGClipPathFrame;
 class nsSVGDisplayContainerFrame;
 class nsSVGElement;
 class nsSVGEnum;
@@ -49,11 +46,8 @@
 struct nsStyleSVG;
 struct nsStyleSVGPaint;
 struct nsRect;
-struct nsPoint;
 
 namespace mozilla {
-class SVGAnimatedPreserveAspectRatio;
-class SVGPreserveAspectRatio;
 namespace dom {
 class Element;
 class UserSpaceMetrics;
@@ -61,7 +55,6 @@
 namespace gfx {
 class DrawTarget;
 class GeneralPattern;
-class SourceSurface;
 }
 } // namespace mozilla
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tables/nsCellMap.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tables/nsCellMap.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tables/nsCellMap.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tables/nsCellMap.h	2015-04-24 19:31:00.000000000 +0000
@@ -17,7 +17,6 @@
 
 #undef DEBUG_TABLE_CELLMAP
 
-class nsTableColFrame;
 class nsTableCellFrame;
 class nsTableRowFrame;
 class nsTableRowGroupFrame;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tables/nsTableColFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tables/nsTableColFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tables/nsTableColFrame.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tables/nsTableColFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -11,8 +11,6 @@
 #include "nsContainerFrame.h"
 #include "nsTArray.h"
 
-class nsTableCellFrame;
-
 enum nsTableColType {
   eColContent            = 0, // there is real col content associated
   eColAnonymousCol       = 1, // the result of a span on a col
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tables/nsTableFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tables/nsTableFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tables/nsTableFrame.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tables/nsTableFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -21,7 +21,6 @@
 class nsTableCellFrame;
 class nsTableCellMap;
 class nsTableColFrame;
-class nsColGroupFrame;
 class nsTableRowGroupFrame;
 class nsTableRowFrame;
 class nsTableColGroupFrame;
@@ -29,7 +28,6 @@
 class nsStyleContext;
 
 struct nsTableReflowState;
-struct nsStylePosition;
 struct BCPropertyData;
 
 static inline bool IS_TABLE_CELL(nsIAtom* frameType) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tables/nsTableRowGroupFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tables/nsTableRowGroupFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tables/nsTableRowGroupFrame.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tables/nsTableRowGroupFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -15,7 +15,6 @@
 
 class nsTableFrame;
 class nsTableRowFrame;
-class nsTableCellFrame;
 
 struct nsRowGroupReflowState {
   const nsHTMLReflowState& reflowState;  // Our reflow state
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tables/SpanningCellSorter.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tables/SpanningCellSorter.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tables/SpanningCellSorter.h	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tables/SpanningCellSorter.h	2015-04-24 19:31:00.000000000 +0000
@@ -15,8 +15,6 @@
 #include "nsDebug.h"
 #include "StackArena.h"
 
-class nsIPresShell;
-
 /**
  * The SpanningCellSorter is responsible for accumulating lists of cells
  * with colspans so that those cells can later be enumerated, sorted
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tools/reftest/README.txt thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tools/reftest/README.txt
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tools/reftest/README.txt	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tools/reftest/README.txt	2015-04-24 19:31:00.000000000 +0000
@@ -509,6 +509,14 @@
 the root element are non-zero, sets the CSS viewport to the given size in
 CSS pixels. This does not affect the size of the snapshot that is taken.
 
+Setting Scrollport Size: reftest-scrollport-w/h="<int>"
+=======================================================
+
+If either of the "reftest-scrollport-w" and "reftest-scrollport-h" attributes on
+the root element are non-zero, sets the scroll-position-clamping scroll-port
+size to the given size in CSS pixels. This does not affect the size of the
+snapshot that is taken.
+
 Setting Async Scroll Mode: reftest-async-scroll attribute
 =========================================================
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tools/reftest/reftest-analyzer.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tools/reftest/reftest-analyzer.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tools/reftest/reftest-analyzer.xhtml	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tools/reftest/reftest-analyzer.xhtml	2015-04-24 19:31:00.000000000 +0000
@@ -246,7 +246,7 @@
         });
       continue;
     }
-    match = line.match(/^(?:  |)IMAGE ([^:]*): (data:.*)$/);
+    match = line.match(/^(?:  |)IMAGE([^:]*): (data:.*)$/);
     if (match) {
       var item = gTestItems[gTestItems.length - 1];
       item.images.push(match[2]);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tools/reftest/reftest-content.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tools/reftest/reftest-content.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/tools/reftest/reftest-content.js	2015-04-22 13:05:39.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/tools/reftest/reftest-content.js	2015-04-24 19:31:00.000000000 +0000
@@ -202,6 +202,13 @@
         windowUtils().setCSSViewport(vw, vh);
     }
 
+    var sw = attrOrDefault(contentRootElement, "reftest-scrollport-w", 0);
+    var sh = attrOrDefault(contentRootElement, "reftest-scrollport-h", 0);
+    if (sw !== 0 || sh !== 0) {
+        LogInfo("Setting scrollport to <w=" + sw + ", h=" + sh + ">");
+        windowUtils().setScrollPositionClampingScrollPortSize(sw, sh);
+    }
+
     // XXX support resolution when needed
 
     // XXX support viewconfig when needed
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/BoxObject.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/BoxObject.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/BoxObject.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/BoxObject.h	2015-04-24 19:31:00.000000000 +0000
@@ -20,7 +20,6 @@
 #include "nsRect.h"
 
 class nsIFrame;
-class nsIDocShell;
 class nsIPresShell;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/grid/nsGrid.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/grid/nsGrid.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/grid/nsGrid.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/grid/nsGrid.h	2015-04-24 19:31:00.000000000 +0000
@@ -11,8 +11,6 @@
 #include "nsIGridPart.h"
 #include "nsCOMPtr.h"
 
-class nsGridRowGroupLayout;
-class nsGridRowLayout;
 class nsBoxLayoutState;
 class nsGridCell;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/grid/nsGridLayout2.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/grid/nsGridLayout2.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/grid/nsGridLayout2.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/grid/nsGridLayout2.h	2015-04-24 19:31:00.000000000 +0000
@@ -13,12 +13,10 @@
 #include "nsCoord.h"
 #include "nsGrid.h"
 
-class nsIPresContext;
 class nsGridRowGroupLayout;
 class nsGridRowLayout;
 class nsGridRow;
 class nsBoxLayoutState;
-class nsGridCell;
 
 /**
  * The nsBoxLayout implementation for a grid.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/grid/nsGridRow.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/grid/nsGridRow.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/grid/nsGridRow.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/grid/nsGridRow.h	2015-04-24 19:31:00.000000000 +0000
@@ -15,8 +15,6 @@
 
 #include "nsCoord.h"
 
-class nsGridLayout2;
-class nsBoxLayoutState;
 class nsIFrame;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsBoxFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsBoxFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsBoxFrame.cpp	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsBoxFrame.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -1310,25 +1310,11 @@
                              const nsDisplayListSet& aLists)
 {
   bool forceLayer = false;
-  uint32_t flags = 0;
-  mozilla::layers::FrameMetrics::ViewID scrollTargetId =
-    mozilla::layers::FrameMetrics::NULL_SCROLL_ID;
-  float scrollbarThumbRatio = 0.0f;
 
   if (GetContent()->IsXULElement()) {
     // forcelayer is only supported on XUL elements with box layout
     if (GetContent()->HasAttr(kNameSpaceID_None, nsGkAtoms::layer)) {
       forceLayer = true;
-    } else {
-      nsIFrame* parent = GetParentBox(this);
-      if (parent && parent->GetType() == nsGkAtoms::sliderFrame) {
-        aBuilder->GetScrollbarInfo(&scrollTargetId, &flags);
-        forceLayer = (scrollTargetId != layers::FrameMetrics::NULL_SCROLL_ID);
-        nsLayoutUtils::SetScrollbarThumbLayerization(this, forceLayer);
-
-        nsSliderFrame* slider = do_QueryFrame(parent);
-        scrollbarThumbRatio = slider->GetThumbRatio();
-      }
     }
     // Check for frames that are marked as a part of the region used
     // in calculating glass margins on Windows.
@@ -1374,8 +1360,7 @@
 
     // Wrap the list to make it its own layer
     aLists.Content()->AppendNewToTop(new (aBuilder)
-      nsDisplayOwnLayer(aBuilder, this, &masterList, flags, scrollTargetId,
-                        scrollbarThumbRatio));
+      nsDisplayOwnLayer(aBuilder, this, &masterList));
   }
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsBoxLayoutState.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsBoxLayoutState.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsBoxLayoutState.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsBoxLayoutState.h	2015-04-24 19:31:00.000000000 +0000
@@ -18,11 +18,7 @@
 #include "nsIPresShell.h"
 
 class nsRenderingContext;
-class nsCalculatedBoxInfo;
-class nsHTMLReflowMetrics;
 struct nsHTMLReflowState;
-class nsString;
-class nsHTMLReflowCommand;
 
 class MOZ_STACK_CLASS nsBoxLayoutState
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsIScrollbarMediator.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsIScrollbarMediator.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsIScrollbarMediator.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsIScrollbarMediator.h	2015-04-24 19:31:00.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsCoord.h"
 
 class nsScrollbarFrame;
-class nsIDOMEventTarget;
 class nsIFrame;
 
 class nsIScrollbarMediator : public nsQueryFrame
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsLeafBoxFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsLeafBoxFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsLeafBoxFrame.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsLeafBoxFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -9,8 +9,6 @@
 #include "nsLeafFrame.h"
 #include "nsBox.h"
 
-class nsAccessKeyInfo;
-
 class nsLeafBoxFrame : public nsLeafFrame
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsMenuFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsMenuFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsMenuFrame.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsMenuFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -25,7 +25,6 @@
 nsIFrame* NS_NewMenuItemFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 
 class nsIContent;
-class nsMenuBarFrame;
 
 #define NS_STATE_ACCELTEXT_IS_DERIVED  NS_STATE_BOX_CHILD_RESERVED
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsMenuPopupFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsMenuPopupFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsMenuPopupFrame.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsMenuPopupFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -125,7 +125,6 @@
 
 nsIFrame* NS_NewMenuPopupFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 
-class nsViewManager;
 class nsView;
 class nsMenuPopupFrame;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsResizerFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsResizerFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsResizerFrame.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsResizerFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsTitleBarFrame.h"
 
 class nsIBaseWindow;
-class nsMenuPopupFrame;
 
 class nsResizerFrame : public nsTitleBarFrame 
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsScrollbarButtonFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsScrollbarButtonFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsScrollbarButtonFrame.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsScrollbarButtonFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -18,8 +18,6 @@
 #include "nsITimer.h"
 #include "nsRepeatService.h"
 
-class nsSliderFrame;
-
 class nsScrollbarButtonFrame : public nsButtonBoxFrame
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsScrollbarFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsScrollbarFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsScrollbarFrame.cpp	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsScrollbarFrame.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -167,11 +167,8 @@
 }
 
 nsresult
-nsScrollbarFrame::GetScrollbarMargin(
-  nsMargin& aMargin,
-  mozilla::ScrollFrameHelper::eScrollbarSide aSide)
+nsScrollbarFrame::GetMargin(nsMargin& aMargin)
 {
-  nsresult rv = NS_ERROR_FAILURE;
   aMargin.SizeTo(0,0,0,0);
 
   if (LookAndFeel::GetInt(LookAndFeel::eIntID_UseOverlayScrollbars) != 0) {
@@ -186,21 +183,18 @@
         aMargin.top = -presContext->DevPixelsToAppUnits(size.height);
       }
       else {
-        aMargin.left = -presContext->DevPixelsToAppUnits(size.width);
+        if (StyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL) {
+          aMargin.right = -presContext->DevPixelsToAppUnits(size.width);
+        }
+        else {
+          aMargin.left = -presContext->DevPixelsToAppUnits(size.width);
+        }
       }
-      rv = NS_OK;
+      return NS_OK;
     }
   }
 
-  if (NS_FAILED(rv)) {
-    rv = nsBox::GetMargin(aMargin);
-  }
-
-  if (NS_SUCCEEDED(rv) && aSide == ScrollFrameHelper::eScrollbarOnLeft) {
-    Swap(aMargin.left, aMargin.right);
-  }
-
-  return rv;
+  return nsBox::GetMargin(aMargin);
 }
 
 void
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsScrollbarFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsScrollbarFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsScrollbarFrame.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsScrollbarFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -12,7 +12,6 @@
 
 #include "mozilla/Attributes.h"
 #include "nsBoxFrame.h"
-#include "nsGfxScrollFrame.h"
 
 class nsIScrollbarMediator;
 
@@ -82,8 +81,7 @@
    */
   virtual bool DoesClipChildren() override { return true; }
 
-  nsresult GetScrollbarMargin(nsMargin& aMargin,
-                              mozilla::ScrollFrameHelper::eScrollbarSide aSide);
+  virtual nsresult GetMargin(nsMargin& aMargin) override;
 
   /**
    * The following three methods set the value of mIncrement when a
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsSliderFrame.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsSliderFrame.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsSliderFrame.cpp	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsSliderFrame.cpp	2015-04-24 19:31:00.000000000 +0000
@@ -322,6 +322,43 @@
 
     if (crect.width < thumbRect.width || crect.height < thumbRect.height)
       return;
+
+    // If this scrollbar is the scrollbar of an actively scrolled scroll frame,
+    // layerize the scrollbar thumb, wrap it in its own ContainerLayer and
+    // attach scrolling information to it.
+    // We do this here and not in the thumb's nsBoxFrame::BuildDisplayList so
+    // that the event region that gets created for the thumb is included in
+    // the nsDisplayOwnLayer contents.
+
+    uint32_t flags = 0;
+    mozilla::layers::FrameMetrics::ViewID scrollTargetId =
+      mozilla::layers::FrameMetrics::NULL_SCROLL_ID;
+    float scrollbarThumbRatio = 0.0f;
+    aBuilder->GetScrollbarInfo(&scrollTargetId, &flags);
+    bool thumbGetsLayer = (scrollTargetId != layers::FrameMetrics::NULL_SCROLL_ID);
+    nsLayoutUtils::SetScrollbarThumbLayerization(thumb, thumbGetsLayer);
+
+    if (thumbGetsLayer) {
+      nsDisplayListCollection tempLists;
+      nsBoxFrame::BuildDisplayListForChildren(aBuilder, aDirtyRect, tempLists);
+
+      // This is a bit of a hack. Collect up all descendant display items
+      // and merge them into a single Content() list.
+      nsDisplayList masterList;
+      masterList.AppendToTop(tempLists.BorderBackground());
+      masterList.AppendToTop(tempLists.BlockBorderBackgrounds());
+      masterList.AppendToTop(tempLists.Floats());
+      masterList.AppendToTop(tempLists.Content());
+      masterList.AppendToTop(tempLists.PositionedDescendants());
+      masterList.AppendToTop(tempLists.Outlines());
+
+      // Wrap the list to make it its own layer.
+      aLists.Content()->AppendNewToTop(new (aBuilder)
+        nsDisplayOwnLayer(aBuilder, this, &masterList, flags, scrollTargetId,
+                          scrollbarThumbRatio));
+
+      return;
+    }
   }
   
   nsBoxFrame::BuildDisplayListForChildren(aBuilder, aDirtyRect, aLists);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsSliderFrame.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsSliderFrame.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/nsSliderFrame.h	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/nsSliderFrame.h	2015-04-24 19:31:00.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsITimer.h"
 #include "nsIDOMEventListener.h"
 
-class nsString;
 class nsITimer;
 class nsSliderFrame;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/test/browser_bug685470.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/test/browser_bug685470.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/test/browser_bug685470.js	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/test/browser_bug685470.js	2015-04-24 19:31:00.000000000 +0000
@@ -1,9 +1,10 @@
-function test() {
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-
-  SpecialPowers.setIntPref("ui.tooltipDelay", 0);
+add_task(function* () {
+  const html = "<p id=\"p1\" title=\"tooltip is here\">This paragraph has a tooltip.</p>";
+  yield BrowserTestUtils.openNewForegroundTab(gBrowser, "data:text/html," + html);
+
+  yield new Promise(resolve => {
+    SpecialPowers.pushPrefEnv({"set": [["ui.tooltipDelay", 0]]}, resolve);
+  });
 
   var popup = false;
   var doc;
@@ -13,39 +14,20 @@
   let onPopupShown = function(aEvent) {
     popup = true;
   }
+  document.addEventListener("popupshown", onPopupShown, true);
 
-  // test that a mouse click prior to the tooltip appearing blocks it
-  let runTest = function() {
-    EventUtils.synthesizeMouseAtCenter(p1, { type: "mousemove" }, win);
-    EventUtils.sendMouseEvent({type:'mousedown'}, p1, win);
-    EventUtils.sendMouseEvent({type:'mouseup'}, p1, win);
+  // Send a mousemove at a known position to start the test.
+  BrowserTestUtils.synthesizeMouseAtCenter("#p1", { type: "mousemove" },
+                                           gBrowser.selectedBrowser);
+  BrowserTestUtils.synthesizeMouseAtCenter("#p1", { }, gBrowser.selectedBrowser);
 
+  yield new Promise(resolve => {
     setTimeout(function() {
       is(popup, false, "shouldn't get tooltip after click");
-
-      document.removeEventListener("popupshown", onPopupShown, true);
-      SpecialPowers.clearUserPref("ui.tooltipDelay");
-
-      gBrowser.removeCurrentTab();
-      finish();
+      resolve();
     }, 200);
-  }
-
-  let onLoad = function (aEvent) {
-    doc = gBrowser.contentDocument;
-    win = gBrowser.contentWindow;
-    p1 = doc.getElementById("p1");
-
-    document.addEventListener("popupshown", onPopupShown, true);
-
-    runTest();
-  }
+  });
 
-  gBrowser.selectedBrowser.addEventListener("load", function loadListener() {
-    gBrowser.selectedBrowser.removeEventListener("load", loadListener, true);
-    setTimeout(onLoad, 0);
-  }, true);
-
-  content.location = "data:text/html," +
-    "<p id=\"p1\" title=\"tooltip is here\">This paragraph has a tooltip.</p>";
-}
+  document.removeEventListener("popupshown", onPopupShown, true);
+  gBrowser.removeCurrentTab();
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/test/browser_bug703210.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/test/browser_bug703210.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/test/browser_bug703210.js	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/test/browser_bug703210.js	2015-04-24 19:31:00.000000000 +0000
@@ -1,72 +1,33 @@
-function test() {
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-
-  SpecialPowers.setIntPref("ui.tooltipDelay", 0);
-
-  let doStopPropagation = function (aEvent)
-  {
-    aEvent.stopPropagation();
-  }
-
-  let onPopupShown = function (aEvent)
-  {
-    is(aEvent.originalTarget.localName, "tooltip", "tooltip is showing");
-
-    let doc = gBrowser.contentDocument;
-    let win = gBrowser.contentWindow;
-    let p2 = doc.getElementById("p2");
-    setTimeout(function () {
-      EventUtils.synthesizeMouseAtCenter(p2, { type: "mousemove" }, win); }, 0);
-  }
-
-  let onPopupHiding = function (aEvent)
-  {
-    is(aEvent.originalTarget.localName, "tooltip", "tooltip is hiding");
-
-    let doc = gBrowser.contentDocument;
-
-    doc.removeEventListener("mousemove", doStopPropagation, true);
-    doc.removeEventListener("mouseenter", doStopPropagation, true);
-    doc.removeEventListener("mouseleave", doStopPropagation, true);
-    doc.removeEventListener("mouseover", doStopPropagation, true);
-    doc.removeEventListener("mouseout", doStopPropagation, true);
-    document.removeEventListener("popupshown", onPopupShown, true);
-    document.removeEventListener("popuphiding", onPopupHiding, true);
-
-    SpecialPowers.clearUserPref("ui.tooltipDelay");
-
-    gBrowser.removeCurrentTab();
-    finish();
-  }
-
-  let onLoad = function (aEvent)
-  {
-    let doc = gBrowser.contentDocument;
-    let win = gBrowser.contentWindow;
-    let p1 = doc.getElementById("p1");
-    let p2 = doc.getElementById("p2");
-
-    EventUtils.synthesizeMouseAtCenter(p2, { type: "mousemove" }, win);
-
-    doc.addEventListener("mousemove", doStopPropagation, true);
-    doc.addEventListener("mouseenter", doStopPropagation, true);
-    doc.addEventListener("mouseleave", doStopPropagation, true);
-    doc.addEventListener("mouseover", doStopPropagation, true);
-    doc.addEventListener("mouseout", doStopPropagation, true);
-    document.addEventListener("popupshown", onPopupShown, true);
-    document.addEventListener("popuphiding", onPopupHiding, true);
+add_task(function* () {
+  const url = "data:text/html," +
+    "<html onmousemove='event.stopPropagation()'" +
+    " onmouseenter='event.stopPropagation()' onmouseleave='event.stopPropagation()'" +
+    " onmouseover='event.stopPropagation()' onmouseout='event.stopPropagation()'>" +
+    "<p id=\"p1\" title=\"tooltip is here\">This paragraph has a tooltip.</p>" +
+    "<p id=\"p2\">This paragraph doesn't have tooltip.</p></html>";
 
-    EventUtils.synthesizeMouseAtCenter(p1, { type: "mousemove" }, win);
-  }
+  let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, url);
+  let browser = gBrowser.selectedBrowser;
 
-  gBrowser.selectedBrowser.addEventListener("load", function loadListener() {
-    gBrowser.selectedBrowser.removeEventListener("load", loadListener, true);
-    setTimeout(onLoad, 0);
-  }, true);
+  yield new Promise(resolve => {
+    SpecialPowers.pushPrefEnv({"set": [["ui.tooltipDelay", 0]]}, resolve);
+  });
+
+  // Send a mousemove at a known position to start the test.
+  yield BrowserTestUtils.synthesizeMouseAtCenter("#p2", { type: "mousemove" }, browser);
+  let popupShownPromise = BrowserTestUtils.waitForEvent(document, "popupshown", event => {
+    is(event.originalTarget.localName, "tooltip", "tooltip is showing");
+    return true;
+  });
+  yield BrowserTestUtils.synthesizeMouseAtCenter("#p1", { type: "mousemove" }, browser);
+  yield popupShownPromise;
+
+  let popupHiddenPromise = BrowserTestUtils.waitForEvent(document, "popuphidden", event => {
+    is(event.originalTarget.localName, "tooltip", "tooltip is hidden");
+    return true;
+  });
+  yield BrowserTestUtils.synthesizeMouseAtCenter("#p2", { type: "mousemove" }, browser);
+  yield popupHiddenPromise;
 
-  content.location = "data:text/html," +
-    "<p id=\"p1\" title=\"tooltip is here\">This paragraph has a tooltip.</p>" +
-    "<p id=\"p2\">This paragraph doesn't have tooltip.</p>";
-}
+  gBrowser.removeCurrentTab();
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/test/browser_bug706743.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/test/browser_bug706743.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/test/browser_bug706743.js	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/test/browser_bug706743.js	2015-04-24 19:31:00.000000000 +0000
@@ -1,154 +1,84 @@
-function test() {
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-
-  SpecialPowers.setIntPref("ui.tooltipDelay", 0);
-
-  let target;
-  let doc;
-  let win;
-  let callbackOnPopupShown;
-  let callbackOnPopupHidden;
-  let dragService = Components.classes["@mozilla.org/widget/dragservice;1"].
-                      getService(Components.interfaces.nsIDragService);
+add_task(function* () {
+  const url = "data:text/html,<html><head></head><body>" +
+    "<a id=\"target\" href=\"about:blank\" title=\"This is tooltip text\" " +
+            "style=\"display:block;height:20px;margin:10px;\" " +
+            "onclick=\"return false;\">here is an anchor element</a></body></html>";
 
-  let onPopupHidden = function (aEvent)
-  {
-    if (aEvent.originalTarget.localName != "tooltip") {
-      return;
-    }
-    if (callbackOnPopupHidden) {
-      setTimeout(callbackOnPopupHidden, 0);
-    }
-  }
+  let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, url);
+  let browser = gBrowser.selectedBrowser;
 
-  let onPopupShown = function (aEvent)
-  {
-    if (aEvent.originalTarget.localName != "tooltip") {
-      return;
-    }
-    if (callbackOnPopupShown) {
-      setTimeout(callbackOnPopupShown, 0);
-    }
-  }
+  yield new Promise(resolve => {
+    SpecialPowers.pushPrefEnv({"set": [["ui.tooltipDelay", 0]]}, resolve);
+  });
 
-  let finishTest = function ()
-  {
-    document.removeEventListener("popupshown", onPopupShown, true);
-    document.removeEventListener("popuphidden", onPopupHidden, true);
+  // Send a mousemove at a known position to start the test.
+  yield BrowserTestUtils.synthesizeMouse("#target", -5, -5, { type: "mousemove" }, browser);
 
-    SpecialPowers.clearUserPref("ui.tooltipDelay");
+  // show tooltip by mousemove into target.
+  let popupShownPromise = BrowserTestUtils.waitForEvent(document, "popupshown");
+  yield BrowserTestUtils.synthesizeMouse("#target", 5, 15, { type: "mousemove" }, browser);
+  yield popupShownPromise;
 
-    gBrowser.removeCurrentTab();
-    finish();
-  }
+  // hide tooltip by mousemove to outside.
+  let popupHiddenPromise = BrowserTestUtils.waitForEvent(document, "popuphidden");
+  yield BrowserTestUtils.synthesizeMouse("#target", -5, 15, { type: "mousemove" }, browser);
+  yield popupHiddenPromise;
 
-  let testHideTooltipByMouseDown = function ()
-  {
-    callbackOnPopupShown = function () {
-      callbackOnPopupShown = null;
-      ok(true, "tooltip is shown before testing mousedown");
-
-      // hide tooltip by mousemove to outside.
-      callbackOnPopupHidden = function () {
-        callbackOnPopupHidden = null;
-        ok(true, "The tooltip is hidden by mousedown");
-
-        EventUtils.synthesizeMouse(target, 5, 15, { type: "mouseup" }, win);
-        EventUtils.synthesizeMouse(target, -5, 15, { type: "mousemove" }, win);
-
-        setTimeout(finishTest, 0);
-      }
-      EventUtils.synthesizeMouse(target, 5, 15, { type: "mousedown" }, win);
-    }
-    EventUtils.synthesizeMouse(target, 5, 15, { type: "mousemove" }, win);
-  }
+  // mousemove into the target and start drag by emulation via nsIDragService.
+  // Note that on some platforms, we cannot actually start the drag by
+  // synthesized events.  E.g., Windows waits an actual mousemove event after
+  // dragstart.
+
+  // Emulate a buggy mousemove event.  widget might dispatch mousemove event
+  // during drag.
 
-  let testShowTooltipAgain = function ()
+  function tooltipNotExpected()
   {
-    // If tooltip listener used a flag for managing D&D state, we would need
-    // to test if the tooltip is shown after drag.
-    callbackOnPopupShown = function () {
-      callbackOnPopupShown = null;
-      ok(true, "tooltip is shown after drag");
-
-      // hide tooltip by mousemove to outside.
-      callbackOnPopupHidden = function () {
-        callbackOnPopupHidden = null;
-        ok(true, "The tooltip is hidden again");
-
-        setTimeout(testHideTooltipByMouseDown, 0);
-      }
-      EventUtils.synthesizeMouse(target, -5, 15, { type: "mousemove" }, win);
-    }
-    EventUtils.synthesizeMouse(target, 5, 15, { type: "mousemove" }, win);
+    ok(false, "tooltip is shown during drag");
   }
+  addEventListener("popupshown", tooltipNotExpected, true);
 
-  let testDuringDnD = function ()
-  {
-    // mousemove into the target and start drag by emulation via nsIDragService.
-    // Note that on some platforms, we cannot actually start the drag by
-    // synthesized events.  E.g., Windows waits an actual mousemove event after
-    // dragstart.
-    callbackOnPopupShown = function () {
-      callbackOnPopupShown = null;
-      ok(false, "tooltip is shown during drag");
-    }
-    dragService.startDragSession();
-    // Emulate a buggy mousemove event.  widget might dispatch mousemove event
-    // during drag.
-    EventUtils.synthesizeMouse(target, 5, 15, { type: "mousemove" }, win);
-    setTimeout(function () {
-      callbackOnPopupShown = null;
-      ok(true, "tooltip isn't shown during drag");
-      dragService.endDragSession(true);
-      EventUtils.synthesizeMouse(target, -5, -5, { type: "mousemove" }, win);
+  let dragService = Components.classes["@mozilla.org/widget/dragservice;1"].
+                      getService(Components.interfaces.nsIDragService);
+  dragService.startDragSession();
+  yield BrowserTestUtils.synthesizeMouse("#target", 5, 15, { type: "mousemove" }, browser);
 
-      setTimeout(testShowTooltipAgain, 0);
-    }, 100);
-  }
+  yield new Promise(resolve => setTimeout(resolve, 100));
+  removeEventListener("popupshown", tooltipNotExpected, true);
+  dragService.endDragSession(true);
 
-  let onLoad = function (aEvent)
-  {
-    doc = gBrowser.contentDocument;
-    win = gBrowser.contentWindow;
-    target = doc.getElementById("target");
-
-    document.addEventListener("popupshown", onPopupShown, true);
-    document.addEventListener("popuphidden", onPopupHidden, true);
-
-    EventUtils.synthesizeMouse(target, -5, -5, { type: "mousemove" }, win);
-
-    // show tooltip by mousemove into target.
-    callbackOnPopupShown = function ()
-    {
-      callbackOnPopupShown = null;
-      ok(true, "The tooltip is shown");
-
-      // hide tooltip by mousemove to outside.
-      callbackOnPopupHidden = function () {
-        callbackOnPopupHidden = null;
-        ok(true, "The tooltip is hidden");
-
-        setTimeout(testDuringDnD, 0);
-      }
-      EventUtils.synthesizeMouse(target, -5, 15, { type: "mousemove" }, win);
-    }
-    EventUtils.synthesizeMouse(target, 5, 15, { type: "mousemove" }, win);
-  }
+  yield BrowserTestUtils.synthesizeMouse("#target", -5, -5, { type: "mousemove" }, browser);
 
-  gBrowser.selectedBrowser.addEventListener("load",
-    function () {
-      gBrowser.selectedBrowser.
-        removeEventListener("load", arguments.callee, true);
-      setTimeout(onLoad, 0);
-   }, true);
+  // If tooltip listener used a flag for managing D&D state, we would need
+  // to test if the tooltip is shown after drag.
+
+  // show tooltip by mousemove into target.
+  popupShownPromise = BrowserTestUtils.waitForEvent(document, "popupshown");
+  yield BrowserTestUtils.synthesizeMouse("#target", 5, 15, { type: "mousemove" }, browser);
+  yield popupShownPromise;
+
+  // hide tooltip by mousemove to outside.
+  popupHiddenPromise = BrowserTestUtils.waitForEvent(document, "popuphidden");
+  yield BrowserTestUtils.synthesizeMouse("#target", -5, 15, { type: "mousemove" }, browser);
+  yield popupHiddenPromise;
+
+  // Show tooltip after mousedown
+  popupShownPromise = BrowserTestUtils.waitForEvent(document, "popupshown");
+  yield BrowserTestUtils.synthesizeMouse("#target", 5, 15, { type: "mousemove" }, browser);
+  yield popupShownPromise;
+
+  popupHiddenPromise = BrowserTestUtils.waitForEvent(document, "popuphidden");
+  yield BrowserTestUtils.synthesizeMouse("#target", 5, 15, { type: "mousedown" }, browser);
+  yield popupHiddenPromise;
+
+  yield BrowserTestUtils.synthesizeMouse("#target", 5, 15, { type: "mouseup" }, browser);
+  yield BrowserTestUtils.synthesizeMouse("#target", -5, 15, { type: "mousemove" }, browser);
+
+  ok(true, "tooltips appear properly");
+
+  gBrowser.removeCurrentTab();
+});
 
-  content.location = "data:text/html,<html><head></head><body>" +
-    "<a id=\"target\" href=\"about:blank\" title=\"This is tooltip text\" " +
-       "style=\"display:block;height:20px;margin:10px;\" " +
-       "onclick=\"return false;\">here is an anchor element</a></body></html>";
-}
 
 
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/test/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/test/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/layout/xul/test/browser.ini	2015-04-22 13:05:40.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/layout/xul/test/browser.ini	2015-04-24 19:31:00.000000000 +0000
@@ -1,8 +1,5 @@
 [DEFAULT]
 
 [browser_bug685470.js]
-skip-if = e10s # Bug ?????? - test touches content (TypeError: doc.documentElement is null)
 [browser_bug703210.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_bug706743.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/libstagefright/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/libstagefright/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/libstagefright/moz.build	2015-04-22 13:05:42.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/libstagefright/moz.build	2015-04-24 19:31:01.000000000 +0000
@@ -1,4 +1,4 @@
-# /*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- Mode: python; c-basic-offset: 4; 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
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/mtransport/test/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/mtransport/test/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/mtransport/test/moz.build	2015-04-22 13:05:45.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/mtransport/test/moz.build	2015-04-24 19:31:02.000000000 +0000
@@ -41,7 +41,7 @@
         '/media/mtransport/third_party/nrappkit/src/port/linux/include',
     ]
     USE_LIBS += [
-        'static:/nsprpub/lib/libc/src/plc4',
+        'nspr',
     ]
     OS_LIBS += [
         '-lrt',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp	2015-04-22 13:05:46.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp	2015-04-24 19:31:03.000000000 +0000
@@ -24,6 +24,7 @@
 #include "signaling/src/sdp/Sdp.h"
 #include "signaling/src/sdp/SipccSdp.h"
 #include "signaling/src/sdp/SipccSdpParser.h"
+#include "mozilla/net/DataChannelProtocol.h"
 
 namespace mozilla {
 
@@ -2432,7 +2433,7 @@
   mCodecs.values.push_back(new JsepApplicationCodecDescription(
       "5000",
       "webrtc-datachannel",
-      16
+      WEBRTC_DATACHANNEL_STREAMS_DEFAULT
       ));
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp	2015-04-22 13:05:46.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp	2015-04-24 19:31:03.000000000 +0000
@@ -688,6 +688,8 @@
   }
   domstream_ = domstream; // Detach clears it
   stream_ = domstream->GetStream();
+  // Unsets the track id after RemoveListener() takes effect.
+  listener_->UnsetTrackId(stream_->GraphImpl());
   track_id_ = track_id;
   AttachToTrack(track_id);
   return NS_OK;
@@ -853,6 +855,24 @@
                                out_len);
 }
 
+void MediaPipelineTransmit::PipelineListener::
+UnsetTrackId(MediaStreamGraphImpl* graph) {
+#ifndef USE_FAKE_MEDIA_STREAMS
+  class Message : public ControlMessage {
+  public:
+    explicit Message(PipelineListener* listener) :
+      ControlMessage(nullptr), listener_(listener) {}
+    virtual void Run() override
+    {
+      listener_->UnsetTrackIdImpl();
+    }
+    nsRefPtr<PipelineListener> listener_;
+  };
+  graph->AppendMessage(new Message(this));
+#else
+  UnsetTrackIdImpl();
+#endif
+}
 // Called if we're attached with AddDirectListener()
 void MediaPipelineTransmit::PipelineListener::
 NotifyRealtimeData(MediaStreamGraph* graph, TrackID tid,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h	2015-04-22 13:05:46.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h	2015-04-24 19:31:03.000000000 +0000
@@ -466,6 +466,12 @@
       }
     }
 
+    // Dispatches setting the internal TrackID to TRACK_INVALID to the media
+    // graph thread to keep it in sync with other MediaStreamGraph operations
+    // like RemoveListener() and AddListener(). The TrackID will be updated on
+    // the next NewData() callback.
+    void UnsetTrackId(MediaStreamGraphImpl* graph);
+
     void SetActive(bool active) { active_ = active; }
     void SetEnabled(bool enabled) { enabled_ = enabled; }
     TrackID trackid() {
@@ -487,6 +493,11 @@
                                     const MediaSegment& media) override;
 
    private:
+    void UnsetTrackIdImpl() {
+      MutexAutoLock lock(mMutex);
+      track_id_ = track_id_external_ = TRACK_INVALID;
+    }
+
     void NewData(MediaStreamGraph* graph, TrackID tid,
                  StreamTime offset,
                  uint32_t events,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h	2015-04-22 13:05:46.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h	2015-04-24 19:31:03.000000000 +0000
@@ -30,6 +30,7 @@
 
 namespace mozilla {
    class MediaStreamGraph;
+   class MediaStreamGraphImpl;
    class MediaSegment;
 };
 
@@ -103,6 +104,7 @@
 
   virtual Fake_SourceMediaStream *AsSourceStream() { return nullptr; }
 
+  virtual mozilla::MediaStreamGraphImpl *GraphImpl() { return nullptr; }
   virtual nsresult Start() { return NS_OK; }
   virtual nsresult Stop() { return NS_OK; }
   virtual void StopStream() {}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/webrtc/signaling/test/standalone/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/webrtc/signaling/test/standalone/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/media/webrtc/signaling/test/standalone/moz.build	2015-04-22 13:05:47.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/media/webrtc/signaling/test/standalone/moz.build	2015-04-24 19:31:03.000000000 +0000
@@ -25,7 +25,7 @@
 
 if CONFIG['OS_TARGET'] == 'Linux':
     USE_LIBS += [
-        'static:/nsprpub/lib/libc/src/plc4',
+        'nspr',
     ]
     OS_LIBS += [
         '-lrt',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/memory/replace/dmd/DMD.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/memory/replace/dmd/DMD.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/memory/replace/dmd/DMD.cpp	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/memory/replace/dmd/DMD.cpp	2015-04-24 19:31:08.000000000 +0000
@@ -82,13 +82,13 @@
   virtual DMDFuncs* GetDMDFuncs() override;
 };
 
-static DMDBridge sDMDBridge;
-static DMDFuncs sDMDFuncs;
+static DMDBridge* gDMDBridge;
+static DMDFuncs gDMDFuncs;
 
 DMDFuncs*
 DMDBridge::GetDMDFuncs()
 {
-  return &sDMDFuncs;
+  return &gDMDFuncs;
 }
 
 inline void
@@ -96,7 +96,7 @@
 {
   va_list ap;
   va_start(ap, aFmt);
-  sDMDFuncs.StatusMsg(aFmt, ap);
+  gDMDFuncs.StatusMsg(aFmt, ap);
   va_end(ap);
 }
 
@@ -1211,7 +1211,7 @@
 ReplaceMallocBridge*
 replace_get_bridge()
 {
-  return &mozilla::dmd::sDMDBridge;
+  return mozilla::dmd::gDMDBridge;
 }
 
 void*
@@ -1518,6 +1518,7 @@
 Init(const malloc_table_t* aMallocTable)
 {
   gMallocTable = aMallocTable;
+  gDMDBridge = InfallibleAllocPolicy::new_<DMDBridge>();
 
   // DMD is controlled by the |DMD| environment variable.
   const char* e = getenv("DMD");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/memory/replace/logalloc/replay/Replay.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/memory/replace/logalloc/replay/Replay.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/memory/replace/logalloc/replay/Replay.cpp	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/memory/replace/logalloc/replay/Replay.cpp	2015-04-24 19:31:08.000000000 +0000
@@ -176,7 +176,7 @@
   }
 
   /* Returns whether the buffer is empty. */
-  operator bool() { return mLength; }
+  explicit operator bool() { return mLength; }
 
   /* Returns the memory location of the buffer. */
   const char* get() { return mBuf; }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mfbt/ArrayUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mfbt/ArrayUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mfbt/ArrayUtils.h	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mfbt/ArrayUtils.h	2015-04-24 19:31:08.000000000 +0000
@@ -92,22 +92,23 @@
 
 namespace detail {
 
-template<typename AlignType, typename Pointee>
+template<typename AlignType, typename Pointee,
+         typename = EnableIf<!IsVoid<AlignType>::value>>
 struct AlignedChecker
 {
   static void
-  test(Pointee* aPtr)
+  test(const Pointee* aPtr)
   {
     MOZ_ASSERT((uintptr_t(aPtr) % MOZ_ALIGNOF(AlignType)) == 0,
                "performing a range-check with a misaligned pointer");
   }
 };
 
-template<typename Pointee>
-struct AlignedChecker<void, Pointee>
+template<typename AlignType, typename Pointee>
+struct AlignedChecker<AlignType, Pointee>
 {
   static void
-  test(Pointee* aPtr)
+  test(const Pointee* aPtr)
   {
   }
 };
@@ -132,13 +133,14 @@
                          IsBaseOf<T, U>::value ||
                          IsVoid<T>::value,
                          bool>::Type
-IsInRange(T* aPtr, U* aBegin, U* aEnd)
+IsInRange(const T* aPtr, const U* aBegin, const U* aEnd)
 {
   MOZ_ASSERT(aBegin <= aEnd);
   detail::AlignedChecker<U, T>::test(aPtr);
   detail::AlignedChecker<U, U>::test(aBegin);
   detail::AlignedChecker<U, U>::test(aEnd);
-  return aBegin <= static_cast<U*>(aPtr) && static_cast<U*>(aPtr) < aEnd;
+  return aBegin <= reinterpret_cast<const U*>(aPtr) &&
+         reinterpret_cast<const U*>(aPtr) < aEnd;
 }
 
 /**
@@ -148,10 +150,11 @@
  */
 template<typename T>
 inline bool
-IsInRange(T* aPtr, uintptr_t aBegin, uintptr_t aEnd)
+IsInRange(const T* aPtr, uintptr_t aBegin, uintptr_t aEnd)
 {
   return IsInRange(aPtr,
-                   reinterpret_cast<T*>(aBegin), reinterpret_cast<T*>(aEnd));
+                   reinterpret_cast<const T*>(aBegin),
+                   reinterpret_cast<const T*>(aEnd));
 }
 
 namespace detail {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mfbt/Atomics.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mfbt/Atomics.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mfbt/Atomics.h	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mfbt/Atomics.h	2015-04-24 19:31:08.000000000 +0000
@@ -742,7 +742,7 @@
   explicit MOZ_CONSTEXPR Atomic(bool aInit) : Base(aInit) {}
 
   // We provide boolean wrappers for the underlying AtomicBase methods.
-  operator bool() const
+  MOZ_IMPLICIT operator bool() const
   {
     return Base::Intrinsics::load(Base::mValue);
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mfbt/UniquePtr.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mfbt/UniquePtr.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mfbt/UniquePtr.h	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mfbt/UniquePtr.h	2015-04-24 19:31:08.000000000 +0000
@@ -635,10 +635,6 @@
  * ably serves this function.)
  */
 
-// We don't have variadic template support everywhere, so just hard-code arities
-// 0-8 for now.  If you need more arguments, feel free to add the extra
-// overloads (and deletions for the T = E[N] case).
-
 template<typename T, typename... Args>
 typename detail::UniqueSelector<T>::SingleObject
 MakeUnique(Args&&... aArgs)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/app/mobile.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/app/mobile.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/app/mobile.js	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/app/mobile.js	2015-04-24 19:31:08.000000000 +0000
@@ -863,11 +863,6 @@
 // Whether or not to display buttons related to reading list in reader view.
 pref("browser.readinglist.enabled", true);
 
-// Use software vsync to schedule rendering
-pref("gfx.vsync.hw-vsync.enabled", true);
-pref("gfx.vsync.compositor", true);
-pref("gfx.vsync.refreshdriver", true);
-
 // Selection carets never fall-back to internal LongTap detector.
 pref("selectioncaret.detects.longtap", false);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/adjust/AdjustHelperInterface.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/adjust/AdjustHelperInterface.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/adjust/AdjustHelperInterface.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/adjust/AdjustHelperInterface.java	2015-04-24 19:31:08.000000000 +0000
@@ -0,0 +1,18 @@
+/* -*- 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.adjust;
+
+import android.content.Context;
+import android.content.Intent;
+
+public interface AdjustHelperInterface {
+    /**
+     * Register the Application with the Adjust SDK.
+     * @param appToken the (secret!) Adjust SDK per-application token to register with; may be null.
+     */
+    void onCreate(final Context context, final String appToken);
+    void onReceive(final Context context, final Intent intent);
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/adjust/AdjustHelper.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/adjust/AdjustHelper.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/adjust/AdjustHelper.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/adjust/AdjustHelper.java	2015-04-24 19:31:08.000000000 +0000
@@ -0,0 +1,35 @@
+/* -*- 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.adjust;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.adjust.sdk.Adjust;
+import com.adjust.sdk.AdjustConfig;
+import com.adjust.sdk.AdjustReferrerReceiver;
+import com.adjust.sdk.LogLevel;
+
+public class AdjustHelper implements AdjustHelperInterface {
+    public void onCreate(final Context context, final String maybeAppToken) {
+        final String environment;
+        final String appToken;
+        if (maybeAppToken != null) {
+            environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
+            appToken = maybeAppToken;
+        } else {
+            environment = AdjustConfig.ENVIRONMENT_SANDBOX;
+            appToken = "ABCDEFGHIJKL";
+        }
+        AdjustConfig config = new AdjustConfig(context, appToken, environment);
+        config.setLogLevel(LogLevel.VERBOSE);
+        Adjust.onCreate(config);
+    }
+
+    public void onReceive(final Context context, final Intent intent) {
+        new AdjustReferrerReceiver().onReceive(context, intent);
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/adjust/adjust.rst thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/adjust/adjust.rst
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/adjust/adjust.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/adjust/adjust.rst	2015-04-24 19:31:08.000000000 +0000
@@ -0,0 +1,19 @@
+Adjust SDK integration
+======================
+
+The *Adjust install tracking SDK* is a pure-Java library that is conditionally
+compiled into Fennec.  It's not trivial to integrate such conditional feature
+libraries into Fennec without pre-processing.  To minimize such pre-processing,
+we define a trivial ``AdjustHelperInterface`` and define two implementations:
+the real ``AdjustHelper``, which requires the Adjust SDK, and a no-op
+``StubAdjustHelper``, which has no additional requirements.  We use the existing
+pre-processed ``AppConstants.java.in`` to switch, at build-time, between the two
+implementations.
+
+An alternative approach would be to build three jars -- one interface jar and
+two implementation jars -- and include one of the implementation jars at
+build-time.  The implementation jars could either define a common symbol, or the
+appropriate symbol could be determined at build-time.  That's a rather heavier
+approach than the one chosen.  If the helper class were to grow to multiple
+classes, with a non-trivial exposed API, this approach could be better.  It
+would also be easier to integrate into the parallel Gradle build system.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/adjust/StubAdjustHelper.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/adjust/StubAdjustHelper.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/adjust/StubAdjustHelper.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/adjust/StubAdjustHelper.java	2015-04-24 19:31:08.000000000 +0000
@@ -0,0 +1,19 @@
+/* -*- 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.adjust;
+
+import android.content.Context;
+import android.content.Intent;
+
+public class StubAdjustHelper implements AdjustHelperInterface {
+    public void onCreate(final Context context, final String appToken) {
+        // Do nothing.
+    }
+
+    public void onReceive(final Context context, final Intent intent) {
+        // Do nothing.
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/AppConstants.java.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/AppConstants.java.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/AppConstants.java.in	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/AppConstants.java.in	2015-04-24 19:31:08.000000000 +0000
@@ -8,6 +8,13 @@
 
 import android.os.Build;
 
+import org.mozilla.gecko.adjust.AdjustHelperInterface;
+//#ifdef MOZ_INSTALL_TRACKING
+import org.mozilla.gecko.adjust.AdjustHelper;
+//#else
+import org.mozilla.gecko.adjust.StubAdjustHelper;
+//#endif
+
 /**
  * A collection of constants that pertain to the build and runtime state of the
  * application. Typically these are sourced from build-time definitions (see
@@ -298,4 +305,25 @@
 
     public static final boolean MOZ_DRAGGABLE_URLBAR = false;
 
+    public static final boolean MOZ_INSTALL_TRACKING =
+//#ifdef MOZ_INSTALL_TRACKING
+    true;
+//#else
+    false;
+//#endif
+
+    public static final String MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN =
+//#ifdef MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN
+    "@MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN@";
+//#else
+    null;
+//#endif
+
+    public static AdjustHelperInterface getAdjustHelper() {
+//#ifdef MOZ_INSTALL_TRACKING
+        return new AdjustHelper();
+//#else
+        return new StubAdjustHelper();
+//#endif
+    }
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/BrowserApp.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/BrowserApp.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/BrowserApp.java	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/BrowserApp.java	2015-04-24 19:31:08.000000000 +0000
@@ -2577,7 +2577,7 @@
         mBrowserSearchContainer.setVisibility(View.VISIBLE);
 
         // Prevent overdraw by hiding the underlying HomePager View.
-        mHomePager.setVisibility(View.INVISIBLE);
+        mHomePagerContainer.setVisibility(View.INVISIBLE);
 
         final FragmentManager fm = getSupportFragmentManager();
 
@@ -2599,7 +2599,7 @@
 
         // To prevent overdraw, the HomePager is hidden when BrowserSearch is displayed:
         // reverse that.
-        mHomePager.setVisibility(View.VISIBLE);
+        mHomePagerContainer.setVisibility(View.VISIBLE);
 
         mBrowserSearchContainer.setVisibility(View.INVISIBLE);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/distribution/ReferrerReceiver.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/distribution/ReferrerReceiver.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/distribution/ReferrerReceiver.java	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/distribution/ReferrerReceiver.java	2015-04-24 19:31:09.000000000 +0000
@@ -5,12 +5,14 @@
 
 package org.mozilla.gecko.distribution;
 
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.mozglue.RobocopTarget;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -49,6 +51,14 @@
         ReferrerDescriptor referrer = new ReferrerDescriptor(intent.getStringExtra("referrer"));
 
         if (!TextUtils.equals(referrer.source, MOZILLA_UTM_SOURCE)) {
+            if (AppConstants.MOZ_INSTALL_TRACKING) {
+                // Allow the Adjust handler to process the intent.
+                try {
+                    AppConstants.getAdjustHelper().onReceive(context, intent);
+                } catch (Exception e) {
+                    Log.e(LOGTAG, "Got exception in Adjust's onReceive; ignoring referrer intent.", e);
+                }
+            }
             return;
         }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/GeckoApp.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/GeckoApp.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/GeckoApp.java	2015-04-22 13:06:01.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/GeckoApp.java	2015-04-24 19:31:08.000000000 +0000
@@ -1197,7 +1197,7 @@
             return;
         }
 
-        if (GeckoThread.isCreated()) {
+        if (GeckoThread.isLaunched()) {
             // This happens when the GeckoApp activity is destroyed by Android
             // without killing the entire application (see Bug 769269).
             mIsRestoringActivity = true;
@@ -1206,28 +1206,49 @@
         } else {
             final String uri = getURIFromIntent(intent);
 
-            GeckoThread.setArgs(args);
-            GeckoThread.setAction(action);
-            GeckoThread.setUri(TextUtils.isEmpty(uri) ? null : uri);
-        }
-
-        if (!ACTION_DEBUG.equals(action) &&
-                GeckoThread.checkAndSetLaunchState(GeckoThread.LaunchState.Launching,
-                                                   GeckoThread.LaunchState.Launched)) {
-            GeckoThread.createAndStart();
-
-        } else if (ACTION_DEBUG.equals(action) &&
-                GeckoThread.checkAndSetLaunchState(GeckoThread.LaunchState.Launching,
-                                                   GeckoThread.LaunchState.WaitForDebugger)) {
-            ThreadUtils.getUiHandler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    GeckoThread.setLaunchState(GeckoThread.LaunchState.Launched);
-                    GeckoThread.createAndStart();
-                }
-            }, 1000 * 5 /* 5 seconds */);
+            GeckoThread.ensureInit(args, action,
+                    TextUtils.isEmpty(uri) ? null : uri,
+                    /* debugging */ ACTION_DEBUG.equals(action));
+        }
+
+        // GeckoThread has to register for "Gecko:Ready" first, so GeckoApp registers
+        // for events after initializing GeckoThread but before launching it.
+
+        EventDispatcher.getInstance().registerGeckoThreadListener((GeckoEventListener)this,
+            "Gecko:Ready",
+            "Gecko:DelayedStartup",
+            "Gecko:Exited",
+            "Accessibility:Event",
+            "NativeApp:IsDebuggable");
+
+        EventDispatcher.getInstance().registerGeckoThreadListener((NativeEventListener)this,
+            "Accessibility:Ready",
+            "Bookmark:Insert",
+            "Contact:Add",
+            "DOMFullScreen:Start",
+            "DOMFullScreen:Stop",
+            "Image:SetAs",
+            "Locale:Set",
+            "Permissions:Data",
+            "PrivateBrowsing:Data",
+            "Session:StatePurged",
+            "Share:Text",
+            "SystemUI:Visibility",
+            "Toast:Show",
+            "ToggleChrome:Focus",
+            "ToggleChrome:Hide",
+            "ToggleChrome:Show",
+            "Update:Check",
+            "Update:Download",
+            "Update:Install");
+
+        if (mWebappEventListener == null) {
+            mWebappEventListener = new EventListener();
+            mWebappEventListener.registerEvents();
         }
 
+        GeckoThread.launch();
+
         Bundle stateBundle = ContextUtils.getBundleExtra(getIntent(), EXTRA_STATE_BUNDLE);
         if (stateBundle != null) {
             // Use the state bundle if it was given as an intent extra. This is
@@ -1516,40 +1537,6 @@
         //app state callbacks
         mAppStateListeners = new LinkedList<GeckoAppShell.AppStateListener>();
 
-        //register for events
-        EventDispatcher.getInstance().registerGeckoThreadListener((GeckoEventListener)this,
-            "Gecko:Ready",
-            "Gecko:DelayedStartup",
-            "Gecko:Exited",
-            "Accessibility:Event",
-            "NativeApp:IsDebuggable");
-
-        EventDispatcher.getInstance().registerGeckoThreadListener((NativeEventListener)this,
-            "Accessibility:Ready",
-            "Bookmark:Insert",
-            "Contact:Add",
-            "DOMFullScreen:Start",
-            "DOMFullScreen:Stop",
-            "Image:SetAs",
-            "Locale:Set",
-            "Permissions:Data",
-            "PrivateBrowsing:Data",
-            "Session:StatePurged",
-            "Share:Text",
-            "SystemUI:Visibility",
-            "Toast:Show",
-            "ToggleChrome:Focus",
-            "ToggleChrome:Hide",
-            "ToggleChrome:Show",
-            "Update:Check",
-            "Update:Download",
-            "Update:Install");
-
-        if (mWebappEventListener == null) {
-            mWebappEventListener = new EventListener();
-            mWebappEventListener.registerEvents();
-        }
-
         if (SmsManager.isEnabled()) {
             SmsManager.getInstance().start();
         }
@@ -1588,12 +1575,16 @@
         }, 50);
 
         if (mIsRestoringActivity) {
-            GeckoThread.setLaunchState(GeckoThread.LaunchState.GeckoRunning);
             Tab selectedTab = Tabs.getInstance().getSelectedTab();
-            if (selectedTab != null)
+            if (selectedTab != null) {
                 Tabs.getInstance().notifyListeners(selectedTab, Tabs.TabEvents.SELECTED);
-            geckoConnected();
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Viewport:Flush", null));
+            }
+
+            if (GeckoThread.checkLaunchState(GeckoThread.LaunchState.GeckoRunning)) {
+                geckoConnected();
+                GeckoAppShell.sendEventToGecko(
+                        GeckoEvent.createBroadcastEvent("Viewport:Flush", null));
+            }
         }
 
         if (ACTION_ALERT_CALLBACK.equals(action)) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/GeckoApplication.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/GeckoApplication.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/GeckoApplication.java	2015-04-22 13:06:01.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/GeckoApplication.java	2015-04-24 19:31:08.000000000 +0000
@@ -4,6 +4,7 @@
 
 package org.mozilla.gecko;
 
+import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.db.LocalBrowserDB;
@@ -152,6 +153,10 @@
         });
 
         super.onCreate();
+
+        if (AppConstants.MOZ_INSTALL_TRACKING) {
+            AppConstants.getAdjustHelper().onCreate(this, AppConstants.MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN);
+        }
     }
 
     public boolean isApplicationInBackground() {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/GeckoAppShell.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/GeckoAppShell.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/GeckoAppShell.java	2015-04-22 13:06:01.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/GeckoAppShell.java	2015-04-24 19:31:08.000000000 +0000
@@ -24,11 +24,9 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.Queue;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.mozilla.gecko.AppConstants.Versions;
 import org.mozilla.gecko.db.BrowserDB;
@@ -195,7 +193,6 @@
         return CRASH_HANDLER;
     }
 
-    private static final Queue<GeckoEvent> PENDING_EVENTS = new ConcurrentLinkedQueue<GeckoEvent>();
     private static final Map<String, String> ALERT_COOKIES = new ConcurrentHashMap<String, String>();
 
     private static volatile boolean locationHighAccuracyEnabled;
@@ -388,15 +385,6 @@
         Looper.myQueue().removeIdleHandler(idleHandler);
     }
 
-    static void sendPendingEventsToGecko() {
-        try {
-            while (!PENDING_EVENTS.isEmpty()) {
-                final GeckoEvent e = PENDING_EVENTS.poll();
-                notifyGeckoOfEvent(e);
-            }
-        } catch (NoSuchElementException e) {}
-    }
-
     /**
      * If the Gecko thread is running, immediately dispatches the event to
      * Gecko.
@@ -420,13 +408,13 @@
 
         if (GeckoThread.checkLaunchState(GeckoThread.LaunchState.GeckoRunning)) {
             notifyGeckoOfEvent(e);
-            // Gecko will copy the event data into a normal C++ object. We can recycle the event now.
+            // Gecko will copy the event data into a normal C++ object.
+            // We can recycle the event now.
             e.recycle();
             return;
         }
 
-        // Throws if unable to add the event due to capacity restrictions.
-        PENDING_EVENTS.add(e);
+        GeckoThread.addPendingEvent(e);
     }
 
     /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/GeckoThread.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/GeckoThread.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/GeckoThread.java	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/GeckoThread.java	2015-04-24 19:31:08.000000000 +0000
@@ -23,6 +23,8 @@
 
 import java.io.IOException;
 import java.util.Locale;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class GeckoThread extends Thread implements GeckoEventListener {
@@ -31,7 +33,6 @@
     @RobocopTarget
     public enum LaunchState {
         Launching,
-        WaitForDebugger,
         Launched,
         GeckoRunning,
         GeckoExiting,
@@ -40,52 +41,49 @@
 
     private static final AtomicReference<LaunchState> sLaunchState =
                                             new AtomicReference<LaunchState>(LaunchState.Launching);
+    private static final Queue<GeckoEvent> PENDING_EVENTS = new ConcurrentLinkedQueue<GeckoEvent>();
 
     private static GeckoThread sGeckoThread;
 
     private final String mArgs;
     private final String mAction;
     private final String mUri;
+    private final boolean mDebugging;
 
-    public static boolean ensureInit() {
-        ThreadUtils.assertOnUiThread();
-        if (isCreated())
-            return false;
-        sGeckoThread = new GeckoThread(sArgs, sAction, sUri);
-        return true;
-    }
-
-    public static String sArgs;
-    public static String sAction;
-    public static String sUri;
-
-    public static void setArgs(String args) {
-        sArgs = args;
-    }
-
-    public static void setAction(String action) {
-        sAction = action;
-    }
-
-    public static void setUri(String uri) {
-        sUri = uri;
-    }
-
-    GeckoThread(String args, String action, String uri) {
+    GeckoThread(String args, String action, String uri, boolean debugging) {
         mArgs = args;
         mAction = action;
         mUri = uri;
+        mDebugging = debugging;
+
         setName("Gecko");
         EventDispatcher.getInstance().registerGeckoThreadListener(this, "Gecko:Ready");
     }
 
-    public static boolean isCreated() {
-        return sGeckoThread != null;
+    public static boolean ensureInit(String args, String action, String uri) {
+        return ensureInit(args, action, uri, /* debugging */ false);
+    }
+
+    public static boolean ensureInit(String args, String action, String uri, boolean debugging) {
+        ThreadUtils.assertOnUiThread();
+        if (checkLaunchState(LaunchState.Launching) && sGeckoThread == null) {
+            sGeckoThread = new GeckoThread(args, action, uri, debugging);
+            return true;
+        }
+        return false;
     }
 
-    public static void createAndStart() {
-        if (ensureInit())
+    public static boolean launch() {
+        ThreadUtils.assertOnUiThread();
+        if (checkAndSetLaunchState(LaunchState.Launching, LaunchState.Launched)) {
             sGeckoThread.start();
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean isLaunched() {
+        return !checkLaunchState(LaunchState.Launching);
     }
 
     private String initGeckoEnvironment() {
@@ -160,6 +158,13 @@
         ThreadUtils.sGeckoHandler = new Handler();
         ThreadUtils.sGeckoQueue = Looper.myQueue();
 
+        if (mDebugging) {
+            try {
+                Thread.sleep(5 * 1000 /* 5 seconds */);
+            } catch (final InterruptedException e) {
+            }
+        }
+
         String path = initGeckoEnvironment();
 
         // This can only happen after the call to initGeckoEnvironment
@@ -193,12 +198,34 @@
         }
     }
 
+    public static void addPendingEvent(final GeckoEvent e) {
+        synchronized (PENDING_EVENTS) {
+            if (checkLaunchState(GeckoThread.LaunchState.GeckoRunning)) {
+                // We may just have switched to running state.
+                GeckoAppShell.notifyGeckoOfEvent(e);
+                e.recycle();
+            } else {
+                // Throws if unable to add the event due to capacity restrictions.
+                PENDING_EVENTS.add(e);
+            }
+        }
+    }
+
     @Override
     public void handleMessage(String event, JSONObject message) {
         if ("Gecko:Ready".equals(event)) {
             EventDispatcher.getInstance().unregisterGeckoThreadListener(this, event);
-            setLaunchState(LaunchState.GeckoRunning);
-            GeckoAppShell.sendPendingEventsToGecko();
+
+            // Synchronize with addPendingEvent, so that all pending events are sent,
+            // in order, before we switch to running state.
+            synchronized (PENDING_EVENTS) {
+                GeckoEvent e;
+                while ((e = PENDING_EVENTS.poll()) != null) {
+                    GeckoAppShell.notifyGeckoOfEvent(e);
+                    e.recycle();
+                }
+                setLaunchState(LaunchState.GeckoRunning);
+            }
         }
     }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/GeckoView.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/GeckoView.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/GeckoView.java	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/GeckoView.java	2015-04-24 19:31:08.000000000 +0000
@@ -154,10 +154,12 @@
          }
 
         if (url != null) {
-            GeckoThread.setUri(url);
-            GeckoThread.setAction(Intent.ACTION_VIEW);
+            GeckoThread.ensureInit(null, Intent.ACTION_VIEW, url);
             GeckoAppShell.sendEventToGecko(GeckoEvent.createURILoadEvent(url));
+        } else {
+            GeckoThread.ensureInit(null, null, null);
         }
+
         GeckoAppShell.setContextGetter(this);
         if (context instanceof Activity) {
             Tabs tabs = Tabs.getInstance();
@@ -181,14 +183,13 @@
 
         initializeView(EventDispatcher.getInstance());
 
-        if (GeckoThread.checkAndSetLaunchState(GeckoThread.LaunchState.Launching, GeckoThread.LaunchState.Launched)) {
+        if (GeckoThread.launch()) {
             // This is the first launch, so finish initialization and go.
             GeckoProfile profile = GeckoProfile.get(context).forceCreate();
-
             GeckoAppShell.sendEventToGecko(GeckoEvent.createObjectEvent(
                 GeckoEvent.ACTION_OBJECT_LAYER_CLIENT, getLayerClientObject()));
-            GeckoThread.createAndStart();
-        } else if(GeckoThread.checkLaunchState(GeckoThread.LaunchState.GeckoRunning)) {
+
+        } else if (GeckoThread.checkLaunchState(GeckoThread.LaunchState.GeckoRunning)) {
             // If Gecko is already running, that means the Activity was
             // destroyed, so we need to re-attach Gecko to this GeckoView.
             connectToGecko();
@@ -264,12 +265,14 @@
     }
 
     private void connectToGecko() {
-        GeckoThread.setLaunchState(GeckoThread.LaunchState.GeckoRunning);
         Tab selectedTab = Tabs.getInstance().getSelectedTab();
-        if (selectedTab != null)
+        if (selectedTab != null) {
             Tabs.getInstance().notifyListeners(selectedTab, Tabs.TabEvents.SELECTED);
+        }
+
         geckoConnected();
-        GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Viewport:Flush", null));
+        GeckoAppShell.sendEventToGecko(
+                GeckoEvent.createBroadcastEvent("Viewport:Flush", null));
     }
 
     private void handleReady(final JSONObject message) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/locales/en-US/android_strings.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/locales/en-US/android_strings.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/locales/en-US/android_strings.dtd	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/locales/en-US/android_strings.dtd	2015-04-24 19:31:09.000000000 +0000
@@ -198,20 +198,15 @@
 <!ENTITY tab_queue_prompt_tip_text "you can change this later in Settings">
 <!ENTITY tab_queue_prompt_positive_action_button "Enable">
 <!ENTITY tab_queue_prompt_negative_action_button "Not now">
-<!-- Localization note (tab_queue_notification_text_plural) : The
+<!ENTITY tab_queue_notification_title "&brandShortName;">
+<!-- Localization note (tab_queue_notification_text_plural2) : The
      formatD is replaced with the number of tabs queued.  The
      number of tabs queued is always more than one.  We can't use
      Android plural forms, sadly. See Bug #753859. -->
-<!ENTITY tab_queue_notification_text_plural "&formatD; tabs queued">
-<!-- Localization note (tab_queue_notification_title_plural) : This is the
-     title of a notification; we expect more than one tab queued. -->
-<!ENTITY tab_queue_notification_title_plural "Tabs Queued">
-<!-- Localization note (tab_queue_notification_title_singular) : This is the
-     title of a notification; we expect only one tab queued. -->
-<!ENTITY tab_queue_notification_title_singular "Tab Queued">
-<!-- Localization note (tab_queue_notification_text_singular) : This is the
+<!ENTITY tab_queue_notification_text_plural2 "&formatD; tabs waiting">
+<!-- Localization note (tab_queue_notification_text_singular2) : This is the
      text of a notification; we expect only one tab queued. -->
-<!ENTITY tab_queue_notification_text_singular "1 tab queued">
+<!ENTITY tab_queue_notification_text_singular2 "1 tab waiting">
 
 <!ENTITY pref_char_encoding "Character encoding">
 <!ENTITY pref_char_encoding_on "Show menu">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/Makefile.in	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/Makefile.in	2015-04-24 19:31:08.000000000 +0000
@@ -119,6 +119,10 @@
 generated/org/mozilla/mozstumbler/R.java: .aapt.deps ;
 endif
 
+ifdef MOZ_INSTALL_TRACKING
+ALL_JARS += gecko-thirdparty-adjust_sdk.jar
+endif
+
 # The list of jars in Java classpath notation (colon-separated).
 all_jars_classpath := $(subst $(NULL) ,:,$(strip $(ALL_JARS)))
 
@@ -252,6 +256,25 @@
 preprocessed_KEEP_PATH := 1
 preprocessed_FLAGS := --marker='//\\\#'
 
+ifdef MOZ_INSTALL_TRACKING
+ifdef MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN
+# The value of MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN is sensitive: we don't
+# want to expose it in build logs.  Following the model set by
+# toolkit/components/urlformatter/Makefile.in, we expose it to AppConstants.java
+# quietly here.  Be aware that the included line's marker needs to agree with
+# --marker above.
+
+adjust_sdk_app_token:
+	@echo '//#define MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN $(MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN)' > $@
+
+export:: adjust_sdk_app_token
+
+preprocessed_FLAGS += -I adjust_sdk_app_token
+endif # MOZ_INSTALL_TRACKING
+endif # MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN
+
+GARBAGE += adjust_sdk_app_token
+
 PP_TARGETS += preprocessed
 
 include $(topsrcdir)/config/rules.mk
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/moz.build	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/moz.build	2015-04-24 19:31:09.000000000 +0000
@@ -13,12 +13,25 @@
 
 constants_jar = add_java_jar('constants')
 constants_jar.sources = [
+    'adjust/AdjustHelperInterface.java',
     'SysInfo.java',
 ]
 constants_jar.generated_sources = [
     'preprocessed/org/mozilla/gecko/AppConstants.java',
 ]
 
+if CONFIG['MOZ_INSTALL_TRACKING']:
+    constants_jar.sources += [
+        'adjust/AdjustHelper.java',
+    ]
+    constants_jar.extra_jars = [
+        'gecko-thirdparty-adjust_sdk.jar',
+    ]
+else:
+    constants_jar.sources += [
+        'adjust/StubAdjustHelper.java',
+    ]
+
 resjar = add_java_jar('gecko-R')
 resjar.sources = []
 resjar.generated_sources += [
@@ -674,6 +687,42 @@
         'org/lucasr/dspec/RawResource.java'
     ] ]
 
+if CONFIG['MOZ_INSTALL_TRACKING']:
+    adjustjar = add_java_jar('gecko-thirdparty-adjust_sdk')
+    adjustjar.sources += [ thirdparty_source_dir + f for f in [
+        'com/adjust/sdk/ActivityHandler.java',
+        'com/adjust/sdk/ActivityKind.java',
+        'com/adjust/sdk/ActivityPackage.java',
+        'com/adjust/sdk/ActivityState.java',
+        'com/adjust/sdk/Adjust.java',
+        'com/adjust/sdk/AdjustAttribution.java',
+        'com/adjust/sdk/AdjustConfig.java',
+        'com/adjust/sdk/AdjustEvent.java',
+        'com/adjust/sdk/AdjustFactory.java',
+        'com/adjust/sdk/AdjustInstance.java',
+        'com/adjust/sdk/AdjustReferrerReceiver.java',
+        'com/adjust/sdk/AttributionHandler.java',
+        'com/adjust/sdk/Constants.java',
+        'com/adjust/sdk/DeviceInfo.java',
+        'com/adjust/sdk/IActivityHandler.java',
+        'com/adjust/sdk/IAttributionHandler.java',
+        'com/adjust/sdk/ILogger.java',
+        'com/adjust/sdk/IPackageHandler.java',
+        'com/adjust/sdk/IRequestHandler.java',
+        'com/adjust/sdk/Logger.java',
+        'com/adjust/sdk/LogLevel.java',
+        'com/adjust/sdk/OnAttributionChangedListener.java',
+        'com/adjust/sdk/PackageBuilder.java',
+        'com/adjust/sdk/PackageHandler.java',
+        'com/adjust/sdk/plugin/AndroidIdUtil.java',
+        'com/adjust/sdk/plugin/MacAddressUtil.java',
+        'com/adjust/sdk/plugin/Plugin.java',
+        'com/adjust/sdk/Reflection.java',
+        'com/adjust/sdk/RequestHandler.java',
+        'com/adjust/sdk/UnitTestActivity.java',
+        'com/adjust/sdk/Util.java'
+    ] ]
+
 # Putting branding earlier allows branders to override default resources.
 ANDROID_RES_DIRS += [
     TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
@@ -686,9 +735,12 @@
     'res/values/strings.xml',
 ]
 
+# We do not expose MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN here because that
+# would leak the value to build logs.  Instead we expose the token quietly where
+# appropriate in Makefile.in.
 for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
-            'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
+            'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION', 'MOZ_INSTALL_TRACKING',
             'MOZ_ANDROID_TAB_QUEUE'):
     if CONFIG[var]:
         DEFINES[var] = 1
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/OuterLayout.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/OuterLayout.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/OuterLayout.java	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/OuterLayout.java	2015-04-24 19:31:08.000000000 +0000
@@ -161,11 +161,11 @@
             if (mDragHelper.shouldInterceptTouchEvent(event)) {
                 return true;
             }
-        }
 
-        // Because while open the target layout is translated and draghelper does not catch it.
-        if (mIsOpen && mDragCallback.canInterceptEventWhileOpen(event)) {
-            return true;
+            // Because while open the target layout is translated and draghelper does not catch it.
+            if (mIsOpen && mDragCallback.canInterceptEventWhileOpen(event)) {
+                return true;
+            }
         }
         return false;
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/preferences/GeckoPreferences.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/preferences/GeckoPreferences.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/preferences/GeckoPreferences.java	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/preferences/GeckoPreferences.java	2015-04-24 19:31:09.000000000 +0000
@@ -137,6 +137,8 @@
     public static final String PREFS_SUGGESTED_SITES = NON_PREF_PREFIX + "home_suggested_sites";
     public static final String PREFS_TAB_QUEUE = NON_PREF_PREFIX + "tab_queue";
     public static final String PREFS_CUSTOMIZE_SCREEN = NON_PREF_PREFIX + "customize_screen";
+    public static final String PREFS_TAB_QUEUE_LAST_SITE = NON_PREF_PREFIX + "last_site";
+    public static final String PREFS_TAB_QUEUE_LAST_TIME = NON_PREF_PREFIX + "last_time";
 
     // These values are chosen to be distinct from other Activity constants.
     private static final int REQUEST_CODE_PREF_SCREEN = 5;
@@ -343,6 +345,7 @@
         }
 
         super.onCreate(savedInstanceState);
+        initActionBar();
 
         // Use setResourceToOpen to specify these extras.
         Bundle intentExtras = getIntent().getExtras();
@@ -412,6 +415,27 @@
         }
     }
 
+    /**
+     * Initializes the action bar configuration in code.
+     *
+     * Declaring these attributes in XML does not work on some devices for an unknown reason
+     * (e.g. the back button stops working or the logo disappears; see bug 1152314) so we
+     * duplicate those attributes in code here. Note: the order of these calls matters.
+     *
+     * We keep the XML attributes because not all of these methods are available on pre-v14.
+     */
+    private void initActionBar() {
+        if (Versions.feature14Plus) {
+            final ActionBar actionBar = getActionBar();
+            if (actionBar != null) {
+                actionBar.setHomeButtonEnabled(true);
+                actionBar.setDisplayHomeAsUpEnabled(true);
+                actionBar.setLogo(R.drawable.logo);
+                actionBar.setDisplayUseLogoEnabled(true);
+            }
+        }
+    }
+
     /**
      * Set intent to display top-level settings fragment,
      * and show the correct title.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/resources/layout/tab_queue_toast.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/resources/layout/tab_queue_toast.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/resources/layout/tab_queue_toast.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/resources/layout/tab_queue_toast.xml	2015-04-24 19:31:09.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/toast"
+        style="@style/Toast">
+
+        <TextView
+            android:id="@+id/toast_message"
+            style="@style/ToastMessage"
+
+            tools:text="Tab queued in firefox" />
+
+        <View
+            android:id="@+id/toast_divider"
+            style="@style/ToastDivider" />
+
+        <Button
+            android:id="@+id/toast_button"
+            style="@style/ToastButton"
+            android:drawableLeft="@drawable/switch_button_icon"
+
+            tools:text="Open" />
+
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/resources/values-v11/styles.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/resources/values-v11/styles.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/resources/values-v11/styles.xml	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/resources/values-v11/styles.xml	2015-04-24 19:31:09.000000000 +0000
@@ -48,6 +48,7 @@
  
     <!-- GeckoPreferences ActionBar -->
     <style name="ActionBar.GeckoPreferences">
+         <!-- Partially duplicated in GeckoPreferences.initActionBar - look there for more details. -->
          <item name="android:displayOptions">showHome|homeAsUp|showTitle|useLogo</item>
     </style>
  
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/resources/values-w400dp/styles.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/resources/values-w400dp/styles.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/resources/values-w400dp/styles.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/resources/values-w400dp/styles.xml	2015-04-24 19:31:10.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <style name="Toast" parent="ToastBase">
+        <item name="android:layout_width">400dp</item>
+    </style>
+
+</resources>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/strings.xml.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/strings.xml.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/strings.xml.in	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/strings.xml.in	2015-04-24 19:31:10.000000000 +0000
@@ -247,10 +247,9 @@
   <string name="tab_queue_prompt_negative_action_button">&tab_queue_prompt_negative_action_button;</string>
   <string name="tab_queue_toast_message">&tab_queue_toast_message2;</string>
   <string name="tab_queue_toast_action">&tab_queue_toast_action;</string>
-  <string name="tab_queue_notification_text_singular">&tab_queue_notification_text_singular;</string>
-  <string name="tab_queue_notification_text_plural">&tab_queue_notification_text_plural;</string>
-  <string name="tab_queue_notification_title_singular">&tab_queue_notification_title_singular;</string>
-  <string name="tab_queue_notification_title_plural">&tab_queue_notification_title_plural;</string>
+  <string name="tab_queue_notification_text_singular">&tab_queue_notification_text_singular2;</string>
+  <string name="tab_queue_notification_text_plural">&tab_queue_notification_text_plural2;</string>
+  <string name="tab_queue_notification_title">&tab_queue_notification_title;</string>
 
   <string name="pref_about_firefox">&pref_about_firefox;</string>
   <string name="pref_vendor_faqs">&pref_vendor_faqs;</string>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/tabqueue/TabQueueDispatcher.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/tabqueue/TabQueueDispatcher.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/tabqueue/TabQueueDispatcher.java	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/tabqueue/TabQueueDispatcher.java	2015-04-24 19:31:10.000000000 +0000
@@ -40,7 +40,7 @@
         // the tab queue build flag.
         if (!AppConstants.MOZ_ANDROID_TAB_QUEUE) {
             loadNormally(intent.getUnsafe());
-            finish();
+            return;
         }
 
         // The URL is usually hiding somewhere in the extra text. Extract it.
@@ -49,13 +49,6 @@
             abortDueToNoURL(dataString);
             return;
         }
-
-        // TODO: This code is shared with ShareDialog - we should extract this to a helper class.
-        final String pageUrl = new WebURLFinder(dataString).bestWebURL();
-        if (TextUtils.isEmpty(pageUrl)) {
-            abortDueToNoURL(dataString);
-            return;
-        }
 
         boolean shouldShowOpenInBackgroundToast = GeckoSharedPrefs.forApp(this).getBoolean(GeckoPreferences.PREFS_TAB_QUEUE, false);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/tabqueue/TabQueueHelper.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/tabqueue/TabQueueHelper.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/tabqueue/TabQueueHelper.java	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/tabqueue/TabQueueHelper.java	2015-04-24 19:31:10.000000000 +0000
@@ -21,6 +21,7 @@
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.support.v4.app.NotificationCompat;
+import android.text.TextUtils;
 import android.util.Log;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -105,6 +106,45 @@
     }
 
     /**
+     * Remove a url from the file, if it exists.
+     * If the url exists multiple times, all instances of it will be removed.
+     * This should not be run on the UI thread.
+     *
+     * @param context
+     * @param urlToRemove URL to remove
+     * @param filename    filename to remove URL from
+     * @return the number of queued urls
+     */
+    public static int removeURLFromFile(final Context context, final String urlToRemove, final String filename) {
+        ThreadUtils.assertNotOnUiThread();
+
+        final GeckoProfile profile = GeckoProfile.get(context);
+
+        JSONArray jsonArray = profile.readJSONArrayFromFile(filename);
+        JSONArray newArray = new JSONArray();
+        String url;
+
+        // Since JSONArray.remove was only added in API 19, we have to use two arrays in order to remove.
+        for (int i = 0; i < jsonArray.length(); i++) {
+            try {
+                url = jsonArray.getString(i);
+            } catch (JSONException e) {
+                url = "";
+            }
+            if(!TextUtils.isEmpty(url) && !urlToRemove.equals(url)) {
+                newArray.put(url);
+            }
+        }
+
+        profile.writeFile(filename, newArray.toString());
+
+        final SharedPreferences prefs = GeckoSharedPrefs.forApp(context);
+        prefs.edit().putInt(PREF_TAB_QUEUE_COUNT, newArray.length()).apply();
+
+        return newArray.length();
+    }
+
+    /**
      * Displays a notification showing the total number of tabs queue.  If there is already a notification displayed, it
      * will be replaced.
      *
@@ -119,19 +159,17 @@
 
         PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent.FLAG_CANCEL_CURRENT);
 
-        String title, text;
+        final String text;
         final Resources resources = context.getResources();
         if (tabsQueued == 1) {
-            title = resources.getString(R.string.tab_queue_notification_title_singular);
             text = resources.getString(R.string.tab_queue_notification_text_singular);
         } else {
-            title = resources.getString(R.string.tab_queue_notification_title_plural);
             text = resources.getString(R.string.tab_queue_notification_text_plural, tabsQueued);
         }
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
                                                      .setSmallIcon(R.drawable.ic_status_logo)
-                                                     .setContentTitle(title)
+                                                     .setContentTitle(resources.getString(R.string.tab_queue_notification_title))
                                                      .setContentText(text)
                                                      .setContentIntent(pendingIntent);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/tabqueue/TabQueueService.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/tabqueue/TabQueueService.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/base/tabqueue/TabQueueService.java	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/base/tabqueue/TabQueueService.java	2015-04-24 19:31:10.000000000 +0000
@@ -5,6 +5,13 @@
 
 package org.mozilla.gecko.tabqueue;
 
+import org.mozilla.gecko.BrowserApp;
+import org.mozilla.gecko.GeckoProfile;
+import org.mozilla.gecko.GeckoSharedPrefs;
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.mozglue.ContextUtils;
+import org.mozilla.gecko.preferences.GeckoPreferences;
+
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -14,6 +21,7 @@
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -21,12 +29,6 @@
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.TextView;
-import org.mozilla.gecko.BrowserApp;
-import org.mozilla.gecko.GeckoProfile;
-import org.mozilla.gecko.GeckoSharedPrefs;
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.mozglue.ContextUtils;
-
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -56,6 +58,7 @@
     private static final String LOGTAG = "Gecko" + TabQueueService.class.getSimpleName();
 
     private static final long TOAST_TIMEOUT = 3000;
+    private static final long TOAST_DOUBLE_TAP_TIMEOUT_MILLIS = 6000;
 
     private WindowManager windowManager;
     private View toastLayout;
@@ -84,7 +87,7 @@
         windowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
 
         LayoutInflater layoutInflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
-        toastLayout = layoutInflater.inflate(R.layout.button_toast, null);
+        toastLayout = layoutInflater.inflate(R.layout.tab_queue_toast, null);
 
         final Resources resources = getResources();
 
@@ -95,7 +98,7 @@
         openNowButton.setText(resources.getText(R.string.tab_queue_toast_action));
 
         toastLayoutParams = new WindowManager.LayoutParams(
-                WindowManager.LayoutParams.WRAP_CONTENT,
+                WindowManager.LayoutParams.MATCH_PARENT,
                 WindowManager.LayoutParams.WRAP_CONTENT,
                 WindowManager.LayoutParams.TYPE_PHONE,
                 WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL |
@@ -108,6 +111,50 @@
 
     @Override
     public int onStartCommand(final Intent intent, final int flags, final int startId) {
+        // If this is a redelivery then lets bypass the entire double tap to open now code as that's a big can of worms,
+        // we also don't expect redeliveries because of the short time window associated with this feature.
+        if (flags != START_FLAG_REDELIVERY) {
+            final Context applicationContext = getApplicationContext();
+            final SharedPreferences sharedPreferences = GeckoSharedPrefs.forApp(applicationContext);
+
+            final String lastUrl = sharedPreferences.getString(GeckoPreferences.PREFS_TAB_QUEUE_LAST_SITE, "");
+
+            final ContextUtils.SafeIntent safeIntent = new ContextUtils.SafeIntent(intent);
+            final String intentUrl = safeIntent.getDataString();
+
+            final long lastRunTime = sharedPreferences.getLong(GeckoPreferences.PREFS_TAB_QUEUE_LAST_TIME, 0);
+            final boolean isWithinDoubleTapTimeLimit = System.currentTimeMillis() - lastRunTime < TOAST_DOUBLE_TAP_TIMEOUT_MILLIS;
+
+            if (!TextUtils.isEmpty(lastUrl) && lastUrl.equals(intentUrl) && isWithinDoubleTapTimeLimit) {
+                // Background thread because we could do some file IO if we have to remove a url from the list.
+                tabQueueHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        // If there is a runnable around, that means that the previous process hasn't yet completed, so
+                        // we will need to prevent it from running and remove the view from the window manager.
+                        // If there is no runnable around then the url has already been added to the list, so we'll
+                        // need to remove it before proceeding or that url will open multiple times.
+                        if (stopServiceRunnable != null) {
+                            tabQueueHandler.removeCallbacks(stopServiceRunnable);
+                            stopSelfResult(stopServiceRunnable.getStartId());
+                            stopServiceRunnable = null;
+                            removeView();
+                        } else {
+                            TabQueueHelper.removeURLFromFile(applicationContext, intentUrl, TabQueueHelper.FILE_NAME);
+                        }
+                        openNow(safeIntent.getUnsafe());
+                        stopSelfResult(startId);
+                    }
+                });
+
+                return START_REDELIVER_INTENT;
+            }
+
+            sharedPreferences.edit().putString(GeckoPreferences.PREFS_TAB_QUEUE_LAST_SITE, intentUrl)
+                                    .putLong(GeckoPreferences.PREFS_TAB_QUEUE_LAST_TIME, System.currentTimeMillis())
+                                    .apply();
+        }
+
         if (stopServiceRunnable != null) {
             // If we're already displaying a toast, keep displaying it but store the previous url.
             // The open button will refer to the most recently opened link.
@@ -130,14 +177,8 @@
             public void onClick(final View view) {
                 tabQueueHandler.removeCallbacks(stopServiceRunnable);
                 stopServiceRunnable = null;
-
-
-                Intent forwardIntent = new Intent(intent);
-                forwardIntent.setClass(getApplicationContext(), BrowserApp.class);
-                forwardIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(forwardIntent);
-
                 removeView();
+                openNow(intent);
                 stopSelfResult(startId);
             }
         });
@@ -147,6 +188,17 @@
         return START_REDELIVER_INTENT;
     }
 
+    private void openNow(Intent intent) {
+        Intent forwardIntent = new Intent(intent);
+        forwardIntent.setClass(getApplicationContext(), BrowserApp.class);
+        forwardIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(forwardIntent);
+
+        GeckoSharedPrefs.forApp(getApplicationContext()).edit().remove(GeckoPreferences.PREFS_TAB_QUEUE_LAST_SITE)
+                                                               .remove(GeckoPreferences.PREFS_TAB_QUEUE_LAST_TIME)
+                                                               .apply();
+    }
+
     private void removeView() {
         windowManager.removeView(toastLayout);
     }
@@ -198,18 +250,22 @@
             this.startId = startId;
         }
 
-        public void run(final boolean shouldStopService) {
+        public void run() {
+            run(true);
+        }
+
+        public void run(final boolean shouldRemoveView) {
             onRun();
 
-            if (shouldStopService) {
+            if (shouldRemoveView) {
                 removeView();
             }
 
             stopSelfResult(startId);
         }
 
-        public void run() {
-            run(true);
+        public int getStartId() {
+            return startId;
         }
 
         public abstract void onRun();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/chrome/content/blockedSite.xhtml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/chrome/content/blockedSite.xhtml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/chrome/content/blockedSite.xhtml	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/chrome/content/blockedSite.xhtml	2015-04-24 19:31:11.000000000 +0000
@@ -80,6 +80,9 @@
           case "phishingBlocked" :
             initPage_phishing();
             break;
+          case "unwantedBlocked" :
+            initPage_unwanted();
+            break;
         }
       }        
       
@@ -88,15 +91,21 @@
        */
       function initPage_malware()
       {
-        // Remove phishing strings
+        // Remove phishing/unwanted strings
         var el = document.getElementById("errorTitleText_phishing");
         el.parentNode.removeChild(el);
+        el = document.getElementById("errorTitleText_unwanted");
+        el.parentNode.removeChild(el);
 
         el = document.getElementById("errorShortDescText_phishing");
         el.parentNode.removeChild(el);
+        el = document.getElementById("errorShortDescText_unwanted");
+        el.parentNode.removeChild(el);
 
         el = document.getElementById("errorLongDescText_phishing");
         el.parentNode.removeChild(el);
+        el = document.getElementById("errorLongDescText_unwanted");
+        el.parentNode.removeChild(el);
 
         // Set sitename
         document.getElementById("malware_sitename").textContent = getHostString();
@@ -109,19 +118,53 @@
        */
       function initPage_phishing()
       {
-        // Remove malware strings
+        // Remove malware/unwanted strings
         var el = document.getElementById("errorTitleText_malware");
         el.parentNode.removeChild(el);
+        el = document.getElementById("errorTitleText_unwanted");
+        el.parentNode.removeChild(el);
 
         el = document.getElementById("errorShortDescText_malware");
         el.parentNode.removeChild(el);
+        el = document.getElementById("errorShortDescText_unwanted");
+        el.parentNode.removeChild(el);
 
         el = document.getElementById("errorLongDescText_malware");
         el.parentNode.removeChild(el);
+        el = document.getElementById("errorLongDescText_unwanted");
+        el.parentNode.removeChild(el);
 
         document.title = document.getElementById("errorTitleText_phishing")
                                  .innerHTML;
       }
+
+      /**
+       * Initialize custom strings and functionality for blocked unwanted
+       * software case
+       */
+      function initPage_unwanted()
+      {
+        // Remove malware/phishing strings
+        var el = document.getElementById("errorTitleText_malware");
+        el.parentNode.removeChild(el);
+        el = document.getElementById("errorTitleText_phishing");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorShortDescText_malware");
+        el.parentNode.removeChild(el);
+        el = document.getElementById("errorShortDescText_phishing");
+        el.parentNode.removeChild(el);
+
+        el = document.getElementById("errorLongDescText_malware");
+        el.parentNode.removeChild(el);
+        el = document.getElementById("errorLongDescText_phishing");
+        el.parentNode.removeChild(el);
+
+        // Set sitename
+        document.getElementById("unwanted_sitename").textContent = getHostString();
+        document.title = document.getElementById("errorTitleText_unwanted")
+                                 .innerHTML;
+      }
     ]]></script>
   </head>
 
@@ -133,6 +176,7 @@
       <div id="errorTitle">
         <h1 id="errorTitleText_phishing" class="errorTitleText">&safeb.blocked.phishingPage.title2;</h1>
         <h1 id="errorTitleText_malware" class="errorTitleText">&safeb.blocked.malwarePage.title;</h1>
+        <h1 id="errorTitleText_unwanted" class="errorTitleText">&safeb.blocked.unwantedPage.title;</h1>
       </div>
 
       <div id="errorLongContent">
@@ -141,12 +185,14 @@
         <div id="errorShortDesc">
           <p id="errorShortDescText_phishing">&safeb.blocked.phishingPage.shortDesc2;</p>
           <p id="errorShortDescText_malware">&safeb.blocked.malwarePage.shortDesc;</p>
+          <p id="errorShortDescText_unwanted">&safeb.blocked.unwantedPage.shortDesc;</p>
         </div>
 
         <!-- Long Description -->
         <div id="errorLongDesc">
           <p id="errorLongDescText_phishing">&safeb.blocked.phishingPage.longDesc2;</p>
           <p id="errorLongDescText_malware">&safeb.blocked.malwarePage.longDesc;</p>
+          <p id="errorLongDescText_unwanted">&safeb.blocked.unwantedPage.longDesc;</p>
         </div>
         
         <!-- Action buttons -->
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/chrome/content/browser.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/chrome/content/browser.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/chrome/content/browser.js	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/chrome/content/browser.js	2015-04-24 19:31:11.000000000 +0000
@@ -5547,10 +5547,14 @@
           }
         } else if (errorDoc.documentURI.startsWith("about:blocked")) {
           // The event came from a button on a malware/phishing block page
-          // First check whether it's malware or phishing, so that we can
-          // use the right strings/links
-          let isMalware = errorDoc.documentURI.contains("e=malwareBlocked");
-          let bucketName = isMalware ? "WARNING_MALWARE_PAGE_" : "WARNING_PHISHING_PAGE_";
+          // First check whether it's malware, phishing or unwanted, so that we
+          // can use the right strings/links
+          let bucketName = "WARNING_PHISHING_PAGE_";
+          if (errorDoc.documentURI.contains("e=malwareBlocked")) {
+            bucketName = "WARNING_MALWARE_PAGE_";
+          } else if (errorDoc.documentURI.contains("e=unwantedBlocked")) {
+            bucketName = "WARNING_UNWANTED_PAGE_";
+          }
           let nsISecTel = Ci.nsISecurityUITelemetry;
           let isIframe = (errorDoc.defaultView.parent === errorDoc.defaultView);
           bucketName += isIframe ? "TOP_" : "FRAME_";
@@ -5565,23 +5569,10 @@
             // the measurement is for how many users clicked the WHY BLOCKED button
             Telemetry.addData("SECURITY_UI", nsISecTel[bucketName + "WHY_BLOCKED"]);
 
-            // This is the "Why is this site blocked" button.  For malware,
-            // we can fetch a site-specific report, for phishing, we redirect
-            // to the generic page describing phishing protection.
-            if (isMalware) {
-              // Get the stop badware "why is this blocked" report url, append the current url, and go there.
-              try {
-                let reportURL = formatter.formatURLPref("browser.safebrowsing.malware.reportURL");
-                reportURL += errorDoc.location.href;
-                BrowserApp.selectedBrowser.loadURI(reportURL);
-              } catch (e) {
-                Cu.reportError("Couldn't get malware report URL: " + e);
-              }
-            } else {
-              // It's a phishing site, just link to the generic information page
-              let url = Services.urlFormatter.formatURLPref("app.support.baseURL");
-              BrowserApp.selectedBrowser.loadURI(url + "phishing-malware");
-            }
+            // This is the "Why is this site blocked" button. We redirect
+            // to the generic page describing phishing/malware protection.
+            let url = Services.urlFormatter.formatURLPref("app.support.baseURL");
+            BrowserApp.selectedBrowser.loadURI(url + "phishing-malware");
           } else if (target == errorDoc.getElementById("ignoreWarningButton")) {
             Telemetry.addData("SECURITY_UI", nsISecTel[bucketName + "IGNORE_WARNING"]);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/config/proguard/adjust-keeps.cfg thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/config/proguard/adjust-keeps.cfg
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/config/proguard/adjust-keeps.cfg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/config/proguard/adjust-keeps.cfg	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,8 @@
+# Rules to make the Adjust install tracking library work.
+
+# Needed to keep some constants in the install tracking library.
+-keep class com.adjust.sdk.** { *; }
+
+# Needed to keep some constants required for the install tracking library.
+-keep class com.google.android.gms.common.** { *; }
+-keep class com.google.android.gms.ads.identifier.** { *; }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/config/proguard/proguard.cfg thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/config/proguard/proguard.cfg
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/config/proguard/proguard.cfg	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/config/proguard/proguard.cfg	2015-04-24 19:31:11.000000000 +0000
@@ -218,3 +218,5 @@
 # Don't print spurious warnings from the support library.
 # See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-icucompatics-cant-find-dynamically-referenced-cl
 -dontnote android.support.**
+
+-include "adjust-keeps.cfg"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/confvars.sh thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/confvars.sh
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/confvars.sh	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/confvars.sh	2015-04-24 19:31:11.000000000 +0000
@@ -67,6 +67,14 @@
   MOZ_NATIVE_DEVICES=1
 fi
 
+# Enable install tracking SDK if we have Google Play support; MOZ_NATIVE_DEVICES
+# is a proxy flag for that support.
+if test "$RELEASE_BUILD"; then
+if test "$MOZ_NATIVE_DEVICES"; then
+  MOZ_INSTALL_TRACKING=1
+fi
+fi
+
 # Mark as WebGL conformant
 MOZ_WEBGL_CONFORMANT=1
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/base/build.gradle thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/base/build.gradle
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/base/build.gradle	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/base/build.gradle	2015-04-24 19:31:11.000000000 +0000
@@ -37,6 +37,8 @@
                 if (!mozconfig.substs.MOZ_CRASHREPORTER) {
                     exclude 'org/mozilla/gecko/CrashReporter.java'
                 }
+                // Adjust helpers are included in the preprocessed_code project.
+                exclude 'org/mozilla/gecko/adjust/**'
             }
 
             res {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/preprocessed_code/build.gradle thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/preprocessed_code/build.gradle
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/preprocessed_code/build.gradle	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/preprocessed_code/build.gradle	2015-04-24 19:31:11.000000000 +0000
@@ -21,8 +21,28 @@
     lintOptions {
         abortOnError false
     }
+
+    sourceSets {
+        main {
+            java {
+                srcDir "${topsrcdir}/mobile/android/base/adjust"
+                if (mozconfig.substs.MOZ_INSTALL_TRACKING) {
+                    exclude 'StubAdjustHelper.java'
+                } else {
+                    exclude 'AdjustHelper.java'
+                }
+            }
+        }
+    }
 }
 
 android.libraryVariants.all { variant ->
     variant.checkManifest.dependsOn generateCodeAndResources
 }
+
+
+dependencies {
+    if (mozconfig.substs.MOZ_INSTALL_TRACKING) {
+        compile project(':thirdparty_adjust_sdk')
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/settings.gradle thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/settings.gradle
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/settings.gradle	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/settings.gradle	2015-04-24 19:31:11.000000000 +0000
@@ -40,6 +40,11 @@
 project(':preprocessed_resources').projectDir = new File(gradleRoot, 'preprocessed_resources')
 project(':thirdparty').projectDir = new File(gradleRoot, 'thirdparty')
 
+if (json.substs.MOZ_INSTALL_TRACKING) {
+    include ':thirdparty_adjust_sdk'
+    project(':thirdparty_adjust_sdk').projectDir = new File(gradleRoot, 'thirdparty_adjust_sdk')
+}
+
 // The Gradle instance is shared between settings.gradle and all the
 // other build.gradle files (see
 // http://forums.gradle.org/gradle/topics/define_extension_properties_from_settings_xml).
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/thirdparty/build.gradle thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/thirdparty/build.gradle
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/thirdparty/build.gradle	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/thirdparty/build.gradle	2015-04-24 19:31:11.000000000 +0000
@@ -21,6 +21,15 @@
     lintOptions {
         abortOnError false
     }
+
+    sourceSets {
+        main {
+            java {
+                // Thirdparty Adjust SDK code is included in the thirdparty_adjust_sdk project.
+                exclude 'com/adjust/**'
+            }
+        }
+    }
 }
 
 dependencies {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/thirdparty_adjust_sdk/AndroidManifest.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/thirdparty_adjust_sdk/AndroidManifest.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/thirdparty_adjust_sdk/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/thirdparty_adjust_sdk/AndroidManifest.xml	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.adjust.sdk">
+
+</manifest>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/thirdparty_adjust_sdk/build.gradle thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/thirdparty_adjust_sdk/build.gradle
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/gradle/thirdparty_adjust_sdk/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/gradle/thirdparty_adjust_sdk/build.gradle	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,37 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
+
+    defaultConfig {
+        targetSdkVersion 21
+        minSdkVersion 9
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    dexOptions {
+        incremental true
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    sourceSets {
+        main {
+            java {
+                srcDir "${topsrcdir}/mobile/android/thirdparty/com/adjust"
+            }
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:support-v4:21.+'
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/locales/en-US/chrome/phishing.dtd thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/locales/en-US/chrome/phishing.dtd
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/locales/en-US/chrome/phishing.dtd	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/locales/en-US/chrome/phishing.dtd	2015-04-24 19:31:11.000000000 +0000
@@ -15,3 +15,8 @@
 <!ENTITY safeb.blocked.phishingPage.title2 "Suspected Web Forgery!">
 <!ENTITY safeb.blocked.phishingPage.shortDesc2 "Entering any personal information on this page may result in identity theft or other fraud.">
 <!ENTITY safeb.blocked.phishingPage.longDesc2 "<p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>">
+
+<!ENTITY safeb.blocked.unwantedPage.title "Reported Unwanted Software Site!">
+<!-- Localization note (safeb.blocked.unwanted.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.unwantedPage.shortDesc "This web page at <span id='unwanted_sitename'/> has been reported to contain unwanted software and has been blocked based on your security preferences.">
+<!ENTITY safeb.blocked.unwantedPage.longDesc "Unwanted software pages try to install software that can be deceptive and affect your system in unexpected ways.">
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/mach_commands.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/mach_commands.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/mach_commands.py	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/mach_commands.py	2015-04-24 19:31:11.000000000 +0000
@@ -103,6 +103,9 @@
         srcdir('thirdparty/src/main/AndroidManifest.xml', 'mobile/android/gradle/thirdparty/AndroidManifest.xml')
         srcdir('thirdparty/src/main/java', 'mobile/android/thirdparty')
 
+        srcdir('thirdparty_adjust_sdk/build.gradle', 'mobile/android/gradle/thirdparty_adjust_sdk/build.gradle')
+        srcdir('thirdparty_adjust_sdk/src/main/AndroidManifest.xml', 'mobile/android/gradle/thirdparty_adjust_sdk/AndroidManifest.xml')
+
         srcdir('omnijar/build.gradle', 'mobile/android/gradle/omnijar/build.gradle')
         srcdir('omnijar/src/main/java/locales', 'mobile/android/locales')
         srcdir('omnijar/src/main/java/chrome', 'mobile/android/chrome')
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/themes/core/aboutReader.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/themes/core/aboutReader.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/themes/core/aboutReader.css	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/themes/core/aboutReader.css	2015-04-24 19:31:11.000000000 +0000
@@ -620,6 +620,10 @@
     height: 56px;
   }
 
+  .toolbar {
+    bottom: -57px;
+  }
+
   .toolbar > * {
     width: 56px;
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/themes/core/content.css thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/themes/core/content.css
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/themes/core/content.css	2015-04-22 13:06:10.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/themes/core/content.css	2015-04-24 19:31:11.000000000 +0000
@@ -33,6 +33,11 @@
   border: 0px solid transparent !important;
 }
 
+xul|window xul|scrollbar[orient="vertical"]:-moz-locale-dir(rtl) {
+  margin-left: 2px;
+  margin-right: -10px;
+}
+
 xul|window xul|scrollbar[orient="vertical"] xul|thumb {
   max-width: 6px !important;
   min-width: 6px !important;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityHandler.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityHandler.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityHandler.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityHandler.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,759 @@
+//
+//  ActivityHandler.java
+//  Adjust
+//
+//  Created by Christian Wellenbrock on 2013-06-25.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+
+import org.json.JSONObject;
+
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import static com.adjust.sdk.Constants.ACTIVITY_STATE_FILENAME;
+import static com.adjust.sdk.Constants.ATTRIBUTION_FILENAME;
+import static com.adjust.sdk.Constants.LOGTAG;
+
+public class ActivityHandler extends HandlerThread implements IActivityHandler {
+
+    private static long TIMER_INTERVAL;
+    private static long TIMER_START;
+    private static long SESSION_INTERVAL;
+    private static long SUBSESSION_INTERVAL;
+    private static final String TIME_TRAVEL = "Time travel!";
+    private static final String ADJUST_PREFIX = "adjust_";
+    private static final String ACTIVITY_STATE_NAME = "Activity state";
+    private static final String ATTRIBUTION_NAME = "Attribution";
+
+    private SessionHandler sessionHandler;
+    private IPackageHandler packageHandler;
+    private ActivityState activityState;
+    private ILogger logger;
+    private static ScheduledExecutorService timer;
+    private boolean enabled;
+    private boolean offline;
+
+    private DeviceInfo deviceInfo;
+    private AdjustConfig adjustConfig; // always valid after construction
+    private AdjustAttribution attribution;
+    private IAttributionHandler attributionHandler;
+
+    private ActivityHandler(AdjustConfig adjustConfig) {
+        super(LOGTAG, MIN_PRIORITY);
+        setDaemon(true);
+        start();
+
+        logger = AdjustFactory.getLogger();
+        sessionHandler = new SessionHandler(getLooper(), this);
+        enabled = true;
+        init(adjustConfig);
+
+        Message message = Message.obtain();
+        message.arg1 = SessionHandler.INIT;
+        sessionHandler.sendMessage(message);
+    }
+
+    @Override
+    public void init(AdjustConfig adjustConfig) {
+        this.adjustConfig = adjustConfig;
+    }
+
+    public static ActivityHandler getInstance(AdjustConfig adjustConfig) {
+        if (adjustConfig == null) {
+            AdjustFactory.getLogger().error("AdjustConfig missing");
+            return null;
+        }
+
+        if (!adjustConfig.isValid()) {
+            AdjustFactory.getLogger().error("AdjustConfig not initialized correctly");
+            return null;
+        }
+
+        ActivityHandler activityHandler = new ActivityHandler(adjustConfig);
+        return activityHandler;
+    }
+
+    @Override
+    public void trackSubsessionStart() {
+        Message message = Message.obtain();
+        message.arg1 = SessionHandler.START;
+        sessionHandler.sendMessage(message);
+    }
+
+    @Override
+    public void trackSubsessionEnd() {
+        Message message = Message.obtain();
+        message.arg1 = SessionHandler.END;
+        sessionHandler.sendMessage(message);
+    }
+
+    @Override
+    public void trackEvent(AdjustEvent event) {
+        Message message = Message.obtain();
+        message.arg1 = SessionHandler.EVENT;
+        message.obj = event;
+        sessionHandler.sendMessage(message);
+    }
+
+    @Override
+    public void finishedTrackingActivity(JSONObject jsonResponse) {
+        if (jsonResponse == null) {
+            return;
+        }
+
+        Message message = Message.obtain();
+        message.arg1 = SessionHandler.FINISH_TRACKING;
+        message.obj = jsonResponse;
+        sessionHandler.sendMessage(message);
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        if (enabled == this.enabled) {
+            if (enabled) {
+                logger.debug("Adjust already enabled");
+            } else {
+                logger.debug("Adjust already disabled");
+            }
+            return;
+        }
+        this.enabled = enabled;
+        if (activityState != null) {
+            activityState.enabled = enabled;
+        }
+        if (enabled) {
+            if (toPause()) {
+                logger.info("Package and attribution handler remain paused due to the SDK is offline");
+            } else {
+                logger.info("Resuming package handler and attribution handler to enabled the SDK");
+            }
+            trackSubsessionStart();
+        } else {
+            logger.info("Pausing package handler and attribution handler to disable the SDK");
+            trackSubsessionEnd();
+        }
+    }
+
+    @Override
+    public void setOfflineMode(boolean offline) {
+        if (offline == this.offline) {
+            if (offline) {
+                logger.debug("Adjust already in offline mode");
+            } else {
+                logger.debug("Adjust already in online mode");
+            }
+            return;
+        }
+        this.offline = offline;
+        if (offline) {
+            logger.info("Pausing package and attribution handler to put in offline mode");
+        } else {
+            if (toPause()) {
+                logger.info("Package and attribution handler remain paused because the SDK is disabled");
+            } else {
+                logger.info("Resuming package handler and attribution handler to put in online mode");
+            }
+        }
+        updateStatus();
+    }
+
+    @Override
+    public boolean isEnabled() {
+        if (activityState != null) {
+            return activityState.enabled;
+        } else {
+            return enabled;
+        }
+    }
+
+    @Override
+    public void readOpenUrl(Uri url, long clickTime) {
+        Message message = Message.obtain();
+        message.arg1 = SessionHandler.DEEP_LINK;
+        UrlClickTime urlClickTime = new UrlClickTime(url, clickTime);
+        message.obj = urlClickTime;
+        sessionHandler.sendMessage(message);
+    }
+
+    @Override
+    public boolean tryUpdateAttribution(AdjustAttribution attribution) {
+        if (attribution == null) return false;
+
+        if (attribution.equals(this.attribution)) {
+            return false;
+        }
+
+        saveAttribution(attribution);
+        launchAttributionListener();
+        return true;
+    }
+
+    private void saveAttribution(AdjustAttribution attribution) {
+        this.attribution = attribution;
+        writeAttribution();
+    }
+
+    private void launchAttributionListener() {
+        if (adjustConfig.onAttributionChangedListener == null) {
+            return;
+        }
+        Handler handler = new Handler(adjustConfig.context.getMainLooper());
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                adjustConfig.onAttributionChangedListener.onAttributionChanged(attribution);
+            }
+        };
+        handler.post(runnable);
+    }
+
+    @Override
+    public void setAskingAttribution(boolean askingAttribution) {
+        activityState.askingAttribution = askingAttribution;
+        writeActivityState();
+    }
+
+    @Override
+    public ActivityPackage getAttributionPackage() {
+        long now = System.currentTimeMillis();
+        PackageBuilder attributionBuilder = new PackageBuilder(adjustConfig,
+                deviceInfo,
+                activityState,
+                now);
+        return attributionBuilder.buildAttributionPackage();
+    }
+
+    @Override
+    public void sendReferrer(String referrer, long clickTime) {
+        Message message = Message.obtain();
+        message.arg1 = SessionHandler.SEND_REFERRER;
+        ReferrerClickTime referrerClickTime = new ReferrerClickTime(referrer, clickTime);
+        message.obj = referrerClickTime;
+        sessionHandler.sendMessage(message);
+    }
+
+    private class UrlClickTime {
+        Uri url;
+        long clickTime;
+
+        UrlClickTime(Uri url, long clickTime) {
+            this.url = url;
+            this.clickTime = clickTime;
+        }
+    }
+
+    private class ReferrerClickTime {
+        String referrer;
+        long clickTime;
+
+        ReferrerClickTime(String referrer, long clickTime) {
+            this.referrer = referrer;
+            this.clickTime = clickTime;
+        }
+    }
+
+    private void updateStatus() {
+        Message message = Message.obtain();
+        message.arg1 = SessionHandler.UPDATE_STATUS;
+        sessionHandler.sendMessage(message);
+    }
+
+    private static final class SessionHandler extends Handler {
+        private static final int BASE_ADDRESS = 72630;
+        private static final int INIT = BASE_ADDRESS + 1;
+        private static final int START = BASE_ADDRESS + 2;
+        private static final int END = BASE_ADDRESS + 3;
+        private static final int EVENT = BASE_ADDRESS + 4;
+        private static final int FINISH_TRACKING = BASE_ADDRESS + 5;
+        private static final int DEEP_LINK = BASE_ADDRESS + 6;
+        private static final int SEND_REFERRER = BASE_ADDRESS + 7;
+        private static final int UPDATE_STATUS = BASE_ADDRESS + 8;
+
+        private final WeakReference<ActivityHandler> sessionHandlerReference;
+
+        protected SessionHandler(Looper looper, ActivityHandler sessionHandler) {
+            super(looper);
+            this.sessionHandlerReference = new WeakReference<ActivityHandler>(sessionHandler);
+        }
+
+        @Override
+        public void handleMessage(Message message) {
+            super.handleMessage(message);
+
+            ActivityHandler sessionHandler = sessionHandlerReference.get();
+            if (sessionHandler == null) {
+                return;
+            }
+
+            switch (message.arg1) {
+                case INIT:
+                    sessionHandler.initInternal();
+                    break;
+                case START:
+                    sessionHandler.startInternal();
+                    break;
+                case END:
+                    sessionHandler.endInternal();
+                    break;
+                case EVENT:
+                    AdjustEvent event = (AdjustEvent) message.obj;
+                    sessionHandler.trackEventInternal(event);
+                    break;
+                case FINISH_TRACKING:
+                    JSONObject jsonResponse = (JSONObject) message.obj;
+                    sessionHandler.finishedTrackingActivityInternal(jsonResponse);
+                    break;
+                case DEEP_LINK:
+                    UrlClickTime urlClickTime = (UrlClickTime) message.obj;
+                    sessionHandler.readOpenUrlInternal(urlClickTime.url, urlClickTime.clickTime);
+                    break;
+                case SEND_REFERRER:
+                    ReferrerClickTime referrerClickTime = (ReferrerClickTime) message.obj;
+                    sessionHandler.sendReferrerInternal(referrerClickTime.referrer, referrerClickTime.clickTime);
+                    break;
+                case UPDATE_STATUS:
+                    sessionHandler.updateStatusInternal();
+                    break;
+            }
+        }
+    }
+
+    private void initInternal() {
+        TIMER_INTERVAL = AdjustFactory.getTimerInterval();
+        TIMER_START = AdjustFactory.getTimerStart();
+        SESSION_INTERVAL = AdjustFactory.getSessionInterval();
+        SUBSESSION_INTERVAL = AdjustFactory.getSubsessionInterval();
+
+        deviceInfo = new DeviceInfo(adjustConfig.context, adjustConfig.sdkPrefix);
+
+        if (adjustConfig.environment == AdjustConfig.ENVIRONMENT_PRODUCTION) {
+            logger.setLogLevel(LogLevel.ASSERT);
+        } else {
+            logger.setLogLevel(adjustConfig.logLevel);
+        }
+
+        if (adjustConfig.eventBufferingEnabled) {
+            logger.info("Event buffering is enabled");
+        }
+
+        String playAdId = Util.getPlayAdId(adjustConfig.context);
+        if (playAdId == null) {
+            logger.info("Unable to get Google Play Services Advertising ID at start time");
+        }
+
+        if (adjustConfig.defaultTracker != null) {
+            logger.info("Default tracker: '%s'", adjustConfig.defaultTracker);
+        }
+
+        if (adjustConfig.referrer != null) {
+            sendReferrer(adjustConfig.referrer, adjustConfig.referrerClickTime); // send to background queue to make sure that activityState is valid
+        }
+
+        readAttribution();
+        readActivityState();
+
+        packageHandler = AdjustFactory.getPackageHandler(this, adjustConfig.context, toPause());
+
+        startInternal();
+    }
+
+    private void startInternal() {
+        // it shouldn't start if it was disabled after a first session
+        if (activityState != null
+                && !activityState.enabled) {
+            return;
+        }
+
+        updateStatusInternal();
+
+        processSession();
+
+        checkAttributionState();
+
+        startTimer();
+    }
+
+    private void processSession() {
+        long now = System.currentTimeMillis();
+
+        // very first session
+        if (activityState == null) {
+            activityState = new ActivityState();
+            activityState.sessionCount = 1; // this is the first session
+
+            transferSessionPackage(now);
+            activityState.resetSessionAttributes(now);
+            activityState.enabled = this.enabled;
+            writeActivityState();
+            return;
+        }
+
+        long lastInterval = now - activityState.lastActivity;
+
+        if (lastInterval < 0) {
+            logger.error(TIME_TRAVEL);
+            activityState.lastActivity = now;
+            writeActivityState();
+            return;
+        }
+
+        // new session
+        if (lastInterval > SESSION_INTERVAL) {
+            activityState.sessionCount++;
+            activityState.lastInterval = lastInterval;
+
+            transferSessionPackage(now);
+            activityState.resetSessionAttributes(now);
+            writeActivityState();
+            return;
+        }
+
+        // new subsession
+        if (lastInterval > SUBSESSION_INTERVAL) {
+            activityState.subsessionCount++;
+            activityState.sessionLength += lastInterval;
+            activityState.lastActivity = now;
+            writeActivityState();
+            logger.info("Started subsession %d of session %d",
+                    activityState.subsessionCount,
+                    activityState.sessionCount);
+        }
+    }
+
+    private void checkAttributionState() {
+        // if there is no attribution saved, or there is one being asked
+        if (attribution == null || activityState.askingAttribution) {
+            getAttributionHandler().getAttribution();
+        }
+    }
+
+    private void endInternal() {
+        packageHandler.pauseSending();
+        getAttributionHandler().pauseSending();
+        stopTimer();
+        if (updateActivityState(System.currentTimeMillis())) {
+            writeActivityState();
+        }
+    }
+
+    private void trackEventInternal(AdjustEvent event) {
+        if (!checkEvent(event)) return;
+        if (!activityState.enabled) return;
+
+        long now = System.currentTimeMillis();
+
+        activityState.eventCount++;
+        updateActivityState(now);
+
+        PackageBuilder eventBuilder = new PackageBuilder(adjustConfig, deviceInfo, activityState, now);
+        ActivityPackage eventPackage = eventBuilder.buildEventPackage(event);
+        packageHandler.addPackage(eventPackage);
+
+        if (adjustConfig.eventBufferingEnabled) {
+            logger.info("Buffered event %s", eventPackage.getSuffix());
+        } else {
+            packageHandler.sendFirstPackage();
+        }
+
+        writeActivityState();
+    }
+
+    private void finishedTrackingActivityInternal(JSONObject jsonResponse) {
+        if (jsonResponse == null) {
+            return;
+        }
+
+        String deeplink = jsonResponse.optString("deeplink", null);
+        launchDeeplinkMain(deeplink);
+        getAttributionHandler().checkAttribution(jsonResponse);
+    }
+
+    private void sendReferrerInternal(String referrer, long clickTime) {
+        ActivityPackage clickPackage = buildQueryStringClickPackage(referrer,
+                "reftag",
+                clickTime);
+        if (clickPackage == null) {
+            return;
+        }
+
+        getAttributionHandler().getAttribution();
+
+        packageHandler.sendClickPackage(clickPackage);
+    }
+
+    private void readOpenUrlInternal(Uri url, long clickTime) {
+        if (url == null) {
+            return;
+        }
+
+        String queryString = url.getQuery();
+
+        ActivityPackage clickPackage = buildQueryStringClickPackage(queryString, "deeplink", clickTime);
+        if (clickPackage == null) {
+            return;
+        }
+
+        getAttributionHandler().getAttribution();
+
+        packageHandler.sendClickPackage(clickPackage);
+    }
+
+    private ActivityPackage buildQueryStringClickPackage(String queryString, String source, long clickTime) {
+        if (queryString == null) {
+            return null;
+        }
+
+        long now = System.currentTimeMillis();
+        Map<String, String> queryStringParameters = new HashMap<String, String>();
+        AdjustAttribution queryStringAttribution = new AdjustAttribution();
+        boolean hasAdjustTags = false;
+
+        String[] queryPairs = queryString.split("&");
+        for (String pair : queryPairs) {
+            if (readQueryString(pair, queryStringParameters, queryStringAttribution)) {
+                hasAdjustTags = true;
+            }
+        }
+
+        if (!hasAdjustTags) {
+            return null;
+        }
+
+        String reftag = queryStringParameters.remove("reftag");
+
+        PackageBuilder builder = new PackageBuilder(adjustConfig, deviceInfo, activityState, now);
+        builder.extraParameters = queryStringParameters;
+        builder.attribution = queryStringAttribution;
+        builder.reftag = reftag;
+        ActivityPackage clickPackage = builder.buildClickPackage(source, clickTime);
+        return clickPackage;
+    }
+
+    private boolean readQueryString(String queryString,
+                                    Map<String, String> extraParameters,
+                                    AdjustAttribution queryStringAttribution) {
+        String[] pairComponents = queryString.split("=");
+        if (pairComponents.length != 2) return false;
+
+        String key = pairComponents[0];
+        if (!key.startsWith(ADJUST_PREFIX)) return false;
+
+        String value = pairComponents[1];
+        if (value.length() == 0) return false;
+
+        String keyWOutPrefix = key.substring(ADJUST_PREFIX.length());
+        if (keyWOutPrefix.length() == 0) return false;
+
+        if (!trySetAttribution(queryStringAttribution, keyWOutPrefix, value)) {
+            extraParameters.put(keyWOutPrefix, value);
+        }
+
+        return true;
+    }
+
+    private boolean trySetAttribution(AdjustAttribution queryStringAttribution,
+                                      String key,
+                                      String value) {
+        if (key.equals("tracker")) {
+            queryStringAttribution.trackerName = value;
+            return true;
+        }
+
+        if (key.equals("campaign")) {
+            queryStringAttribution.campaign = value;
+            return true;
+        }
+
+        if (key.equals("adgroup")) {
+            queryStringAttribution.adgroup = value;
+            return true;
+        }
+
+        if (key.equals("creative")) {
+            queryStringAttribution.creative = value;
+            return true;
+        }
+
+        return false;
+    }
+
+    private void updateStatusInternal() {
+        updateAttributionHandlerStatus();
+        updatePackageHandlerStatus();
+    }
+
+    private void updateAttributionHandlerStatus() {
+        if (attributionHandler == null) {
+            return;
+        }
+        if (toPause()) {
+            attributionHandler.pauseSending();
+        } else {
+            attributionHandler.resumeSending();
+        }
+    }
+
+    private void updatePackageHandlerStatus() {
+        if (packageHandler == null) {
+            return;
+        }
+        if (toPause()) {
+            packageHandler.pauseSending();
+        } else {
+            packageHandler.resumeSending();
+        }
+    }
+
+    private void launchDeeplinkMain(String deeplink) {
+        if (deeplink == null) return;
+
+        Uri location = Uri.parse(deeplink);
+        Intent mapIntent = new Intent(Intent.ACTION_VIEW, location);
+        mapIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        // Verify it resolves
+        PackageManager packageManager = adjustConfig.context.getPackageManager();
+        List<ResolveInfo> activities = packageManager.queryIntentActivities(mapIntent, 0);
+        boolean isIntentSafe = activities.size() > 0;
+
+        // Start an activity if it's safe
+        if (!isIntentSafe) {
+            logger.error("Unable to open deep link (%s)", deeplink);
+            return;
+        }
+
+        logger.info("Open deep link (%s)", deeplink);
+        adjustConfig.context.startActivity(mapIntent);
+    }
+
+    private boolean updateActivityState(long now) {
+        long lastInterval = now - activityState.lastActivity;
+        // ignore late updates
+        if (lastInterval > SESSION_INTERVAL) {
+            return false;
+        }
+        activityState.lastActivity = now;
+
+        if (lastInterval < 0) {
+            logger.error(TIME_TRAVEL);
+        } else {
+            activityState.sessionLength += lastInterval;
+            activityState.timeSpent += lastInterval;
+        }
+        return true;
+    }
+
+    public static boolean deleteActivityState(Context context) {
+        return context.deleteFile(ACTIVITY_STATE_FILENAME);
+    }
+
+    public static boolean deleteAttribution(Context context) {
+        return context.deleteFile(ATTRIBUTION_FILENAME);
+    }
+
+    private void transferSessionPackage(long now) {
+        PackageBuilder builder = new PackageBuilder(adjustConfig, deviceInfo, activityState, now);
+        ActivityPackage sessionPackage = builder.buildSessionPackage();
+        packageHandler.addPackage(sessionPackage);
+        packageHandler.sendFirstPackage();
+    }
+
+    private void startTimer() {
+        stopTimer();
+
+        if (!activityState.enabled) {
+            return;
+        }
+        timer = Executors.newSingleThreadScheduledExecutor();
+        timer.scheduleWithFixedDelay(new Runnable() {
+            @Override
+            public void run() {
+                timerFired();
+            }
+        }, TIMER_START, TIMER_INTERVAL, TimeUnit.MILLISECONDS);
+    }
+
+    private void stopTimer() {
+        if (timer != null) {
+            timer.shutdown();
+            timer = null;
+        }
+    }
+
+    private void timerFired() {
+        if (!activityState.enabled) {
+            stopTimer();
+            return;
+        }
+
+        packageHandler.sendFirstPackage();
+
+        if (updateActivityState(System.currentTimeMillis())) {
+            writeActivityState();
+        }
+    }
+
+    private void readActivityState() {
+        activityState = Util.readObject(adjustConfig.context, ACTIVITY_STATE_FILENAME, ACTIVITY_STATE_NAME);
+    }
+
+    private void readAttribution() {
+        attribution = Util.readObject(adjustConfig.context, ATTRIBUTION_FILENAME, ATTRIBUTION_NAME);
+    }
+
+    private void writeActivityState() {
+        Util.writeObject(activityState, adjustConfig.context, ACTIVITY_STATE_FILENAME, ACTIVITY_STATE_NAME);
+    }
+
+    private void writeAttribution() {
+        Util.writeObject(attribution, adjustConfig.context, ATTRIBUTION_FILENAME, ATTRIBUTION_NAME);
+    }
+
+    private boolean checkEvent(AdjustEvent event) {
+        if (event == null) {
+            logger.error("Event missing");
+            return false;
+        }
+
+        if (!event.isValid()) {
+            logger.error("Event not initialized correctly");
+            return false;
+        }
+
+        return true;
+    }
+
+    // lazy initialization to prevent null activity state before first session
+    private IAttributionHandler getAttributionHandler() {
+        if (attributionHandler == null) {
+            ActivityPackage attributionPackage = getAttributionPackage();
+            attributionHandler = AdjustFactory.getAttributionHandler(this,
+                    attributionPackage,
+                    toPause());
+        }
+        return attributionHandler;
+    }
+
+    private boolean toPause() {
+        return offline || !isEnabled();
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityKind.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityKind.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityKind.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityKind.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,35 @@
+package com.adjust.sdk;
+
+public enum ActivityKind {
+    UNKNOWN, SESSION, EVENT, CLICK, ATTRIBUTION;
+
+    public static ActivityKind fromString(String string) {
+        if ("session".equals(string)) {
+            return SESSION;
+        } else if ("event".equals(string)) {
+            return EVENT;
+        } else if ("click".equals(string)) {
+            return CLICK;
+        } else if ("attribution".equals(string)) {
+            return ATTRIBUTION;
+        } else {
+            return UNKNOWN;
+        }
+    }
+
+    @Override
+    public String toString() {
+        switch (this) {
+            case SESSION:
+                return "session";
+            case EVENT:
+                return "event";
+            case CLICK:
+                return "click";
+            case ATTRIBUTION:
+                return "attribution";
+            default:
+                return "unknown";
+        }
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityPackage.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityPackage.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityPackage.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityPackage.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,100 @@
+//
+//  ActivityPackage.java
+//  Adjust
+//
+//  Created by Christian Wellenbrock on 2013-06-25.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+import java.io.Serializable;
+import java.util.Map;
+
+public class ActivityPackage implements Serializable {
+    private static final long serialVersionUID = -35935556512024097L;
+
+    // data
+    private String path;
+    private String clientSdk;
+    private Map<String, String> parameters;
+
+    // logs
+    private ActivityKind activityKind;
+    private String suffix;
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getClientSdk() {
+        return clientSdk;
+    }
+
+    public void setClientSdk(String clientSdk) {
+        this.clientSdk = clientSdk;
+    }
+
+    public Map<String, String> getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(Map<String, String> parameters) {
+        this.parameters = parameters;
+    }
+
+    public ActivityKind getActivityKind() {
+        return activityKind;
+    }
+
+    public void setActivityKind(ActivityKind activityKind) {
+        this.activityKind = activityKind;
+    }
+
+    public String getSuffix() {
+        return suffix;
+    }
+
+    public void setSuffix(String suffix) {
+        this.suffix = suffix;
+    }
+
+    public String toString() {
+        return String.format("%s%s", activityKind.toString(), suffix);
+    }
+
+    public String getExtendedString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append(String.format("Path:      %s\n", path));
+        builder.append(String.format("ClientSdk: %s\n", clientSdk));
+
+        if (parameters != null) {
+            builder.append("Parameters:");
+            for (Map.Entry<String, String> entry : parameters.entrySet()) {
+                builder.append(String.format("\n\t%-16s %s", entry.getKey(), entry.getValue()));
+            }
+        }
+        return builder.toString();
+    }
+
+    protected String getSuccessMessage() {
+        try {
+            return String.format("Tracked %s%s", activityKind.toString(), suffix);
+        } catch (NullPointerException e) {
+            return "Tracked ???";
+        }
+    }
+
+    protected String getFailureMessage() {
+        try {
+            return String.format("Failed to track %s%s", activityKind.toString(), suffix);
+        } catch (NullPointerException e) {
+            return "Failed to track ???";
+        }
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityState.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityState.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityState.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/ActivityState.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,151 @@
+//
+//  ActivityState.java
+//  Adjust
+//
+//  Created by Christian Wellenbrock on 2013-06-25.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectInputStream.GetField;
+import java.io.Serializable;
+import java.util.Calendar;
+import java.util.Locale;
+
+public class ActivityState implements Serializable, Cloneable {
+    private static final long serialVersionUID = 9039439291143138148L;
+    private transient String readErrorMessage = "Unable to read '%s' field in migration device with message (%s)";
+    private transient ILogger logger;
+
+    // persistent data
+    protected String uuid;
+    protected boolean enabled;
+    protected boolean askingAttribution;
+
+    // global counters
+    protected int eventCount;
+    protected int sessionCount;
+
+    // session attributes
+    protected int subsessionCount;
+    protected long sessionLength;   // all durations in milliseconds
+    protected long timeSpent;
+    protected long lastActivity;    // all times in milliseconds since 1970
+
+    protected long lastInterval;
+
+    protected ActivityState() {
+        logger = AdjustFactory.getLogger();
+        // create UUID for new devices
+        uuid = Util.createUuid();
+        enabled = true;
+        askingAttribution = false;
+
+        eventCount = 0; // no events yet
+        sessionCount = 0; // the first session just started
+        subsessionCount = -1; // we don't know how many subsessions this first  session will have
+        sessionLength = -1; // same for session length and time spent
+        timeSpent = -1; // this information will be collected and attached to the next session
+        lastActivity = -1;
+        lastInterval = -1;
+    }
+
+    protected void resetSessionAttributes(long now) {
+        subsessionCount = 1; // first subsession
+        sessionLength = 0; // no session length yet
+        timeSpent = 0; // no time spent yet
+        lastActivity = now;
+        lastInterval = -1;
+    }
+
+    @Override
+    public String toString() {
+        return String.format(Locale.US,
+                "ec:%d sc:%d ssc:%d sl:%.1f ts:%.1f la:%s uuid:%s",
+                eventCount, sessionCount, subsessionCount,
+                sessionLength / 1000.0, timeSpent / 1000.0,
+                stamp(lastActivity), uuid);
+    }
+
+    @Override
+    public ActivityState clone() {
+        try {
+            return (ActivityState) super.clone();
+        } catch (CloneNotSupportedException e) {
+            return null;
+        }
+    }
+
+
+    private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
+        GetField fields = stream.readFields();
+
+        eventCount = readIntField(fields, "eventCount", 0);
+        sessionCount = readIntField(fields, "sessionCount", 0);
+        subsessionCount = readIntField(fields, "subsessionCount", -1);
+        sessionLength = readLongField(fields, "sessionLength", -1l);
+        timeSpent = readLongField(fields, "timeSpent", -1l);
+        lastActivity = readLongField(fields, "lastActivity", -1l);
+        lastInterval = readLongField(fields, "lastInterval", -1l);
+
+        // new fields
+        uuid = readStringField(fields, "uuid", null);
+        enabled = readBooleanField(fields, "enabled", true);
+        askingAttribution = readBooleanField(fields, "askingAttribution", false);
+
+        // create UUID for migrating devices
+        if (uuid == null) {
+            uuid = Util.createUuid();
+        }
+    }
+
+    private String readStringField(GetField fields, String name, String defaultValue) {
+        try {
+            return (String) fields.get(name, defaultValue);
+        } catch (Exception e) {
+            logger.debug(readErrorMessage, name, e.getMessage());
+            return defaultValue;
+        }
+    }
+
+    private boolean readBooleanField(GetField fields, String name, boolean defaultValue) {
+        try {
+            return fields.get(name, defaultValue);
+        } catch (Exception e) {
+            logger.debug(readErrorMessage, name, e.getMessage());
+            return defaultValue;
+        }
+    }
+
+    private int readIntField(GetField fields, String name, int defaultValue) {
+        try {
+            return fields.get(name, defaultValue);
+        } catch (Exception e) {
+            logger.debug(readErrorMessage, name, e.getMessage());
+            return defaultValue;
+        }
+    }
+
+    private long readLongField(GetField fields, String name, long defaultValue) {
+        try {
+            return fields.get(name, defaultValue);
+        } catch (Exception e) {
+            logger.debug(readErrorMessage, name, e.getMessage());
+            return defaultValue;
+        }
+    }
+
+    private static String stamp(long dateMillis) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(dateMillis);
+        return String.format(Locale.US,
+                "%02d:%02d:%02d",
+                calendar.HOUR_OF_DAY,
+                calendar.MINUTE,
+                calendar.SECOND);
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustAttribution.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustAttribution.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustAttribution.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustAttribution.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,62 @@
+package com.adjust.sdk;
+
+import org.json.JSONObject;
+
+import java.io.Serializable;
+
+/**
+ * Created by pfms on 07/11/14.
+ */
+public class AdjustAttribution implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    public String trackerToken;
+    public String trackerName;
+    public String network;
+    public String campaign;
+    public String adgroup;
+    public String creative;
+
+    public static AdjustAttribution fromJson(JSONObject jsonObject) {
+        if (jsonObject == null) return null;
+
+        AdjustAttribution attribution = new AdjustAttribution();
+
+        attribution.trackerToken = jsonObject.optString("tracker_token", null);
+        attribution.trackerName = jsonObject.optString("tracker_name", null);
+        attribution.network = jsonObject.optString("network", null);
+        attribution.campaign = jsonObject.optString("campaign", null);
+        attribution.adgroup = jsonObject.optString("adgroup", null);
+        attribution.creative = jsonObject.optString("creative", null);
+
+        return attribution;
+    }
+
+    public boolean equals(Object other) {
+        if (other == this) return true;
+        if (other == null) return false;
+        if (getClass() != other.getClass()) return false;
+        AdjustAttribution otherAttribution = (AdjustAttribution) other;
+
+        if (!equalString(trackerToken,  otherAttribution.trackerToken)) return false;
+        if (!equalString(trackerName,   otherAttribution.trackerName)) return false;
+        if (!equalString(network,       otherAttribution.network)) return false;
+        if (!equalString(campaign,      otherAttribution.campaign)) return false;
+        if (!equalString(adgroup,       otherAttribution.adgroup)) return false;
+        if (!equalString(creative,      otherAttribution.creative)) return false;
+        return true;
+    }
+
+    private boolean equalString(String first, String second) {
+        if (first == null || second == null) {
+            return first == null && second == null;
+        }
+        return first.equals(second);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("tt:%s tn:%s net:%s cam:%s adg:%s cre:%s",
+                trackerToken, trackerName, network, campaign, adgroup, creative);
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustConfig.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustConfig.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustConfig.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustConfig.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,128 @@
+package com.adjust.sdk;
+
+import android.content.Context;
+
+/**
+ * Created by pfms on 06/11/14.
+ */
+public class AdjustConfig {
+    Context context;
+    String appToken;
+    String environment;
+    LogLevel logLevel;
+    String sdkPrefix;
+    Boolean eventBufferingEnabled;
+    String defaultTracker;
+    OnAttributionChangedListener onAttributionChangedListener;
+    String referrer;
+    long referrerClickTime;
+    Boolean knownDevice;
+
+    public static final String ENVIRONMENT_SANDBOX = "sandbox";
+    public static final String ENVIRONMENT_PRODUCTION = "production";
+
+    public AdjustConfig(Context context, String appToken, String environment) {
+        if (!isValid(context, appToken, environment)) {
+            return;
+        }
+
+        this.context = context.getApplicationContext();
+        this.appToken = appToken;
+        this.environment = environment;
+
+        // default values
+        this.logLevel = LogLevel.INFO;
+        this.eventBufferingEnabled = false;
+    }
+
+    public void setEventBufferingEnabled(Boolean eventBufferingEnabled) {
+        this.eventBufferingEnabled = eventBufferingEnabled;
+    }
+
+    public void setLogLevel(LogLevel logLevel) {
+        this.logLevel = logLevel;
+    }
+
+    public void setSdkPrefix(String sdkPrefix) {
+        this.sdkPrefix = sdkPrefix;
+    }
+
+    public void setDefaultTracker(String defaultTracker) {
+        this.defaultTracker = defaultTracker;
+    }
+
+    public void setOnAttributionChangedListener(OnAttributionChangedListener onAttributionChangedListener) {
+        this.onAttributionChangedListener = onAttributionChangedListener;
+    }
+
+    public boolean hasListener() {
+        return onAttributionChangedListener != null;
+    }
+
+    public boolean isValid() {
+        return appToken != null;
+    }
+
+    private boolean isValid(Context context, String appToken, String environment) {
+        if (!checkAppToken(appToken)) return false;
+        if (!checkEnvironment(environment)) return false;
+        if (!checkContext(context)) return false;
+
+        return true;
+    }
+
+    private static boolean checkContext(Context context) {
+        ILogger logger = AdjustFactory.getLogger();
+        if (context == null) {
+            logger.error("Missing context");
+            return false;
+        }
+
+        if (!Util.checkPermission(context, android.Manifest.permission.INTERNET)) {
+            logger.error("Missing permission: INTERNET");
+            return false;
+        }
+
+        return true;
+    }
+
+    private static boolean checkAppToken(String appToken) {
+        ILogger logger = AdjustFactory.getLogger();
+        if (appToken == null) {
+            logger.error("Missing App Token.");
+            return false;
+        }
+
+        if (appToken.length() != 12) {
+            logger.error("Malformed App Token '%s'", appToken);
+            return false;
+        }
+
+        return true;
+    }
+
+    private static boolean checkEnvironment(String environment) {
+        ILogger logger = AdjustFactory.getLogger();
+        if (environment == null) {
+            logger.error("Missing environment");
+            return false;
+        }
+
+        if (environment == AdjustConfig.ENVIRONMENT_SANDBOX) {
+            logger.Assert("SANDBOX: Adjust is running in Sandbox mode. " +
+                    "Use this setting for testing. " +
+                    "Don't forget to set the environment to `production` before publishing!");
+            return true;
+        }
+        if (environment == AdjustConfig.ENVIRONMENT_PRODUCTION) {
+            logger.Assert(
+                    "PRODUCTION: Adjust is running in Production mode. " +
+                            "Use this setting only for the build that you want to publish. " +
+                            "Set the environment to `sandbox` if you want to test your app!");
+            return true;
+        }
+
+        logger.error("Unknown environment '%s'", environment);
+        return false;
+    }
+}
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustEvent.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustEvent.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustEvent.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustEvent.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,112 @@
+package com.adjust.sdk;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by pfms on 05/11/14.
+ */
+public class AdjustEvent {
+    String eventToken;
+    Double revenue;
+    String currency;
+    Map<String, String> callbackParameters;
+    Map<String, String> partnerParameters;
+
+    private static ILogger logger = AdjustFactory.getLogger();
+
+    public AdjustEvent(String eventToken) {
+        if (!checkEventToken(eventToken, logger)) return;
+
+        this.eventToken = eventToken;
+    }
+
+    public void setRevenue(double revenue, String currency) {
+        if (!checkRevenue(revenue, currency)) return;
+
+        this.revenue = revenue;
+        this.currency = currency;
+    }
+
+    public void addCallbackParameter(String key, String value) {
+        if (!isValidParameter(key, "key", "Callback")) return;
+        if (!isValidParameter(value, "value", "Callback")) return;
+
+        if (callbackParameters == null) {
+            callbackParameters = new HashMap<String, String>();
+        }
+
+        String previousValue = callbackParameters.put(key, value);
+
+        if (previousValue != null) {
+            logger.warn("key %s was overwritten", key);
+        }
+    }
+
+    public void addPartnerParameter(String key, String value) {
+        if (!isValidParameter(key, "key", "Partner")) return;
+        if (!isValidParameter(value, "value", "Partner")) return;
+
+        if (partnerParameters == null) {
+            partnerParameters = new HashMap<String, String>();
+        }
+
+        String previousValue = partnerParameters.put(key, value);
+
+        if (previousValue != null) {
+            logger.warn("key %s was overwritten", key);
+        }
+    }
+
+    public boolean isValid() {
+        return eventToken != null;
+    }
+
+    private static boolean checkEventToken(String eventToken, ILogger logger) {
+        if (eventToken == null) {
+            logger.error("Missing Event Token");
+            return false;
+        }
+        if (eventToken.length() != 6) {
+            logger.error("Malformed Event Token '%s'", eventToken);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean checkRevenue(Double revenue, String currency) {
+        if (revenue != null) {
+            if (revenue < 0.0) {
+                logger.error("Invalid amount %.4f", revenue);
+                return false;
+            }
+
+            if (currency == null) {
+                logger.error("Currency must be set with revenue");
+                return false;
+            }
+            if (currency == "") {
+                logger.error("Currency is empty");
+                return false;
+            }
+
+        } else if (currency != null) {
+            logger.error("Revenue must be set with currency");
+            return false;
+        }
+        return true;
+    }
+
+    private boolean isValidParameter(String attribute, String attributeType, String parameterName) {
+        if (attribute == null) {
+            logger.error("%s parameter %s is missing", parameterName, attributeType);
+            return false;
+        }
+        if (attribute == "") {
+            logger.error("%s parameter %s is empty", parameterName, attributeType);
+            return false;
+        }
+
+        return true;
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustFactory.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustFactory.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustFactory.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustFactory.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,141 @@
+package com.adjust.sdk;
+
+import android.content.Context;
+
+import org.apache.http.client.HttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.HttpParams;
+
+public class AdjustFactory {
+    private static IPackageHandler packageHandler = null;
+    private static IRequestHandler requestHandler = null;
+    private static IAttributionHandler attributionHandler = null;
+    private static IActivityHandler activityHandler = null;
+    private static ILogger logger = null;
+    private static HttpClient httpClient = null;
+
+    private static long timerInterval = -1;
+    private static long timerStart = -1;
+    private static long sessionInterval = -1;
+    private static long subsessionInterval = -1;
+
+    public static IPackageHandler getPackageHandler(ActivityHandler activityHandler,
+                                                    Context context,
+                                                    boolean startPaused) {
+        if (packageHandler == null) {
+            return new PackageHandler(activityHandler, context, startPaused);
+        }
+        packageHandler.init(activityHandler, context, startPaused);
+        return packageHandler;
+    }
+
+    public static IRequestHandler getRequestHandler(IPackageHandler packageHandler) {
+        if (requestHandler == null) {
+            return new RequestHandler(packageHandler);
+        }
+        requestHandler.init(packageHandler);
+        return requestHandler;
+    }
+
+    public static ILogger getLogger() {
+        if (logger == null) {
+            // Logger needs to be "static" to retain the configuration throughout the app
+            logger = new Logger();
+        }
+        return logger;
+    }
+
+    public static HttpClient getHttpClient(HttpParams params) {
+        if (httpClient == null) {
+            return new DefaultHttpClient(params);
+        }
+        return httpClient;
+    }
+
+    public static long getTimerInterval() {
+        if (timerInterval == -1) {
+            return Constants.ONE_MINUTE;
+        }
+        return timerInterval;
+    }
+
+    public static long getTimerStart() {
+        if (timerStart == -1) {
+            return 0;
+        }
+        return timerStart;
+    }
+
+    public static long getSessionInterval() {
+        if (sessionInterval == -1) {
+            return Constants.THIRTY_MINUTES;
+        }
+        return sessionInterval;
+    }
+
+    public static long getSubsessionInterval() {
+        if (subsessionInterval == -1) {
+            return Constants.ONE_SECOND;
+        }
+        return subsessionInterval;
+    }
+
+    public static IActivityHandler getActivityHandler(AdjustConfig config) {
+        if (activityHandler == null) {
+            return ActivityHandler.getInstance(config);
+        }
+        activityHandler.init(config);
+        return activityHandler;
+    }
+
+    public static IAttributionHandler getAttributionHandler(IActivityHandler activityHandler,
+                                                            ActivityPackage attributionPackage,
+                                                            boolean startPaused) {
+        if (attributionHandler == null) {
+            return new AttributionHandler(activityHandler, attributionPackage, startPaused);
+        }
+        attributionHandler.init(activityHandler, attributionPackage, startPaused);
+        return attributionHandler;
+    }
+
+    public static void setPackageHandler(IPackageHandler packageHandler) {
+        AdjustFactory.packageHandler = packageHandler;
+    }
+
+    public static void setRequestHandler(IRequestHandler requestHandler) {
+        AdjustFactory.requestHandler = requestHandler;
+    }
+
+    public static void setLogger(ILogger logger) {
+        AdjustFactory.logger = logger;
+    }
+
+    public static void setHttpClient(HttpClient httpClient) {
+        AdjustFactory.httpClient = httpClient;
+    }
+
+    public static void setTimerInterval(long timerInterval) {
+        AdjustFactory.timerInterval = timerInterval;
+    }
+
+    public static void setTimerStart(long timerStart) {
+        AdjustFactory.timerStart = timerStart;
+    }
+
+    public static void setSessionInterval(long sessionInterval) {
+        AdjustFactory.sessionInterval = sessionInterval;
+    }
+
+    public static void setSubsessionInterval(long subsessionInterval) {
+        AdjustFactory.subsessionInterval = subsessionInterval;
+    }
+
+    public static void setActivityHandler(IActivityHandler activityHandler) {
+        AdjustFactory.activityHandler = activityHandler;
+    }
+
+    public static void setAttributionHandler(IAttributionHandler attributionHandler) {
+        AdjustFactory.attributionHandler = attributionHandler;
+    }
+
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustInstance.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustInstance.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustInstance.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustInstance.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,86 @@
+package com.adjust.sdk;
+
+import android.net.Uri;
+
+/**
+ * Created by pfms on 04/12/14.
+ */
+public class AdjustInstance {
+
+    private String referrer;
+    private long referrerClickTime;
+    private ActivityHandler activityHandler;
+
+    private static ILogger getLogger() {
+        return AdjustFactory.getLogger();
+    }
+
+    public void onCreate(AdjustConfig adjustConfig) {
+        if (activityHandler != null) {
+            getLogger().error("Adjust already initialized");
+            return;
+        }
+
+        adjustConfig.referrer = this.referrer;
+        adjustConfig.referrerClickTime = this.referrerClickTime;
+
+        activityHandler = ActivityHandler.getInstance(adjustConfig);
+    }
+
+    public void trackEvent(AdjustEvent event) {
+        if (!checkActivityHandler()) return;
+        activityHandler.trackEvent(event);
+    }
+
+    public void onResume() {
+        if (!checkActivityHandler()) return;
+        activityHandler.trackSubsessionStart();
+    }
+
+    public void onPause() {
+        if (!checkActivityHandler()) return;
+        activityHandler.trackSubsessionEnd();
+    }
+
+    public void setEnabled(boolean enabled) {
+        if (!checkActivityHandler()) return;
+        activityHandler.setEnabled(enabled);
+    }
+
+    public boolean isEnabled() {
+        if (!checkActivityHandler()) return false;
+        return activityHandler.isEnabled();
+    }
+
+    public void appWillOpenUrl(Uri url) {
+        if (!checkActivityHandler()) return;
+        long clickTime = System.currentTimeMillis();
+        activityHandler.readOpenUrl(url, clickTime);
+    }
+
+    public void sendReferrer(String referrer) {
+        long clickTime = System.currentTimeMillis();
+        // sendReferrer might be triggered before Adjust
+        if (activityHandler == null) {
+            // save it to inject in the config before launch
+            this.referrer = referrer;
+            this.referrerClickTime = clickTime;
+        } else {
+            activityHandler.sendReferrer(referrer, clickTime);
+        }
+    }
+
+    public void setOfflineMode(boolean enabled) {
+        if (!checkActivityHandler()) return;
+        activityHandler.setOfflineMode(enabled);
+    }
+
+    private boolean checkActivityHandler() {
+        if (activityHandler == null) {
+            getLogger().error("Please initialize Adjust by calling 'onCreate' before");
+            return false;
+        } else {
+            return true;
+        }
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/Adjust.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/Adjust.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/Adjust.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/Adjust.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,79 @@
+//
+//  Adjust.java
+//  Adjust
+//
+//  Created by Christian Wellenbrock on 2012-10-11.
+//  Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+import android.net.Uri;
+
+/**
+ * The main interface to Adjust.
+ * Use the methods of this class to tell Adjust about the usage of your app.
+ * See the README for details.
+ */
+public class Adjust {
+
+    private static AdjustInstance defaultInstance;
+
+    private Adjust() {
+    }
+
+    public static synchronized AdjustInstance getDefaultInstance() {
+        if (defaultInstance == null) {
+            defaultInstance = new AdjustInstance();
+        }
+        return defaultInstance;
+    }
+
+    public static void onCreate(AdjustConfig adjustConfig) {
+        AdjustInstance adjustInstance = Adjust.getDefaultInstance();
+        adjustInstance.onCreate(adjustConfig);
+    }
+
+    public static void trackEvent(AdjustEvent event) {
+        AdjustInstance adjustInstance = Adjust.getDefaultInstance();
+        adjustInstance.trackEvent(event);
+    }
+
+    public static void onResume() {
+        AdjustInstance adjustInstance = Adjust.getDefaultInstance();
+        adjustInstance.onResume();
+    }
+
+    public static void onPause() {
+        AdjustInstance adjustInstance = Adjust.getDefaultInstance();
+        adjustInstance.onPause();
+    }
+
+    public static void setEnabled(boolean enabled) {
+        AdjustInstance adjustInstance = Adjust.getDefaultInstance();
+        adjustInstance.setEnabled(enabled);
+    }
+
+    public static boolean isEnabled() {
+        AdjustInstance adjustInstance = Adjust.getDefaultInstance();
+        return adjustInstance.isEnabled();
+    }
+
+    public static void appWillOpenUrl(Uri url) {
+        AdjustInstance adjustInstance = Adjust.getDefaultInstance();
+        adjustInstance.appWillOpenUrl(url);
+    }
+
+    public static void setReferrer(String referrer) {
+        AdjustInstance adjustInstance = Adjust.getDefaultInstance();
+        adjustInstance.sendReferrer(referrer);
+    }
+
+    public static void setOfflineMode(boolean enabled) {
+        AdjustInstance adjustInstance = Adjust.getDefaultInstance();
+        adjustInstance.setOfflineMode(enabled);
+    }
+}
+
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustReferrerReceiver.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustReferrerReceiver.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustReferrerReceiver.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AdjustReferrerReceiver.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,35 @@
+package com.adjust.sdk;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+import static com.adjust.sdk.Constants.ENCODING;
+import static com.adjust.sdk.Constants.MALFORMED;
+import static com.adjust.sdk.Constants.REFERRER;
+
+// support multiple BroadcastReceivers for the INSTALL_REFERRER:
+// http://blog.appington.com/2012/08/01/giving-credit-for-android-app-installs
+
+public class AdjustReferrerReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String rawReferrer = intent.getStringExtra(REFERRER);
+        if (null == rawReferrer) {
+            return;
+        }
+
+        String referrer;
+        try {
+            referrer = URLDecoder.decode(rawReferrer, ENCODING);
+        } catch (UnsupportedEncodingException e) {
+            referrer = MALFORMED;
+        }
+
+        AdjustInstance adjust = Adjust.getDefaultInstance();
+        adjust.sendReferrer(referrer);
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AttributionHandler.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AttributionHandler.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/AttributionHandler.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/AttributionHandler.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,155 @@
+package com.adjust.sdk;
+
+import android.net.Uri;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.json.JSONObject;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by pfms on 07/11/14.
+ */
+public class AttributionHandler implements IAttributionHandler {
+    private ScheduledExecutorService scheduler;
+    private IActivityHandler activityHandler;
+    private ILogger logger;
+    private ActivityPackage attributionPackage;
+    private ScheduledFuture waitingTask;
+    private HttpClient httpClient;
+    private boolean paused;
+
+    public AttributionHandler(IActivityHandler activityHandler,
+                              ActivityPackage attributionPackage,
+                              boolean startPaused) {
+        scheduler = Executors.newSingleThreadScheduledExecutor();
+        logger = AdjustFactory.getLogger();
+        httpClient = Util.getHttpClient();
+        init(activityHandler, attributionPackage, startPaused);
+    }
+
+    @Override
+    public void init(IActivityHandler activityHandler,
+                     ActivityPackage attributionPackage,
+                     boolean startPaused) {
+        this.activityHandler = activityHandler;
+        this.attributionPackage = attributionPackage;
+        this.paused = startPaused;
+    }
+
+    @Override
+    public void getAttribution() {
+        getAttribution(0);
+    }
+
+    @Override
+    public void checkAttribution(final JSONObject jsonResponse) {
+        scheduler.submit(new Runnable() {
+            @Override
+            public void run() {
+                checkAttributionInternal(jsonResponse);
+            }
+        });
+    }
+
+    @Override
+    public void pauseSending() {
+        paused = true;
+    }
+
+    @Override
+    public void resumeSending() {
+        paused = false;
+    }
+
+    private void getAttribution(int delayInMilliseconds) {
+        if (waitingTask != null) {
+            waitingTask.cancel(false);
+        }
+
+        if (delayInMilliseconds != 0) {
+            logger.debug("Waiting to query attribution in %d milliseconds", delayInMilliseconds);
+        }
+
+        waitingTask = scheduler.schedule(new Runnable() {
+            @Override
+            public void run() {
+                getAttributionInternal();
+            }
+        }, delayInMilliseconds, TimeUnit.MILLISECONDS);
+    }
+
+    private void checkAttributionInternal(JSONObject jsonResponse) {
+        if (jsonResponse == null) return;
+
+        JSONObject attributionJson = jsonResponse.optJSONObject("attribution");
+        AdjustAttribution attribution = AdjustAttribution.fromJson(attributionJson);
+
+        int timerMilliseconds = jsonResponse.optInt("ask_in", -1);
+
+        // without ask_in attribute
+        if (timerMilliseconds < 0) {
+            activityHandler.tryUpdateAttribution(attribution);
+
+            activityHandler.setAskingAttribution(false);
+
+            return;
+        }
+
+        activityHandler.setAskingAttribution(true);
+
+        getAttribution(timerMilliseconds);
+    }
+
+    private void getAttributionInternal() {
+        if (paused) {
+            logger.debug("Attribution Handler is paused");
+            return;
+        }
+        logger.verbose("%s", attributionPackage.getExtendedString());
+        HttpResponse httpResponse = null;
+        try {
+            HttpGet request = getRequest(attributionPackage);
+            httpResponse = httpClient.execute(request);
+        } catch (Exception e) {
+            logger.error("Failed to get attribution (%s)", e.getMessage());
+            return;
+        }
+
+        JSONObject jsonResponse = Util.parseJsonResponse(httpResponse, logger);
+
+        checkAttributionInternal(jsonResponse);
+    }
+
+    private Uri buildUri(ActivityPackage attributionPackage) {
+        Uri.Builder uriBuilder = new Uri.Builder();
+
+        uriBuilder.scheme(Constants.SCHEME);
+        uriBuilder.authority(Constants.AUTHORITY);
+        uriBuilder.appendPath(attributionPackage.getPath());
+
+        for (Map.Entry<String, String> entry : attributionPackage.getParameters().entrySet()) {
+            uriBuilder.appendQueryParameter(entry.getKey(), entry.getValue());
+        }
+
+        return uriBuilder.build();
+    }
+
+    private HttpGet getRequest(ActivityPackage attributionPackage) throws URISyntaxException {
+        HttpGet request = new HttpGet();
+        Uri uri = buildUri(attributionPackage);
+        request.setURI(new URI(uri.toString()));
+
+        request.addHeader("Client-SDK", attributionPackage.getClientSdk());
+
+        return request;
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/Constants.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/Constants.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/Constants.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/Constants.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,53 @@
+//
+//  Constants.java
+//  Adjust
+//
+//  Created by keyboardsurfer on 2013-11-08.
+//  Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author keyboardsurfer
+ * @since 8.11.13
+ */
+public interface Constants {
+    int ONE_SECOND = 1000;
+    int ONE_MINUTE = 60 * ONE_SECOND;
+    int THIRTY_MINUTES = 30 * ONE_MINUTE;
+
+    int CONNECTION_TIMEOUT = Constants.ONE_MINUTE;
+    int SOCKET_TIMEOUT = Constants.ONE_MINUTE;
+
+    String BASE_URL = "https://app.adjust.com";
+    String SCHEME = "https";
+    String AUTHORITY = "app.adjust.com";
+    String CLIENT_SDK = "android4.0.0";
+    String LOGTAG = "Adjust";
+
+    String ACTIVITY_STATE_FILENAME = "AdjustIoActivityState";
+    String ATTRIBUTION_FILENAME = "AdjustAttribution";
+
+    String MALFORMED = "malformed";
+    String SMALL = "small";
+    String NORMAL = "normal";
+    String LONG = "long";
+    String LARGE = "large";
+    String XLARGE = "xlarge";
+    String LOW = "low";
+    String MEDIUM = "medium";
+    String HIGH = "high";
+    String REFERRER = "referrer";
+
+    String ENCODING = "UTF-8";
+    String MD5 = "MD5";
+    String SHA1 = "SHA-1";
+
+    // List of known plugins, possibly not active
+    List<String> PLUGINS = Arrays.asList();
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/DeviceInfo.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/DeviceInfo.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/DeviceInfo.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/DeviceInfo.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,290 @@
+package com.adjust.sdk;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.util.DisplayMetrics;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.util.Locale;
+import java.util.Map;
+
+import static com.adjust.sdk.Constants.ENCODING;
+import static com.adjust.sdk.Constants.HIGH;
+import static com.adjust.sdk.Constants.LARGE;
+import static com.adjust.sdk.Constants.LONG;
+import static com.adjust.sdk.Constants.LOW;
+import static com.adjust.sdk.Constants.MD5;
+import static com.adjust.sdk.Constants.MEDIUM;
+import static com.adjust.sdk.Constants.NORMAL;
+import static com.adjust.sdk.Constants.SHA1;
+import static com.adjust.sdk.Constants.SMALL;
+import static com.adjust.sdk.Constants.XLARGE;
+
+/**
+ * Created by pfms on 06/11/14.
+ */
+class DeviceInfo {
+    String macSha1;
+    String macShortMd5;
+    String androidId;
+    String fbAttributionId;
+    String clientSdk;
+    String packageName;
+    String appVersion;
+    String deviceType;
+    String deviceName;
+    String deviceManufacturer;
+    String osName;
+    String osVersion;
+    String language;
+    String country;
+    String screenSize;
+    String screenFormat;
+    String screenDensity;
+    String displayWidth;
+    String displayHeight;
+    Map<String, String> pluginKeys;
+
+    DeviceInfo(Context context, String sdkPrefix) {
+        Resources resources = context.getResources();
+        DisplayMetrics displayMetrics = resources.getDisplayMetrics();
+        Configuration configuration = resources.getConfiguration();
+        Locale locale = configuration.locale;
+        int screenLayout = configuration.screenLayout;
+        boolean isGooglePlayServicesAvailable = Reflection.isGooglePlayServicesAvailable(context);
+        String macAddress = getMacAddress(context, isGooglePlayServicesAvailable);
+
+        packageName = getPackageName(context);
+        appVersion = getAppVersion(context);
+        deviceType = getDeviceType(screenLayout);
+        deviceName = getDeviceName();
+        deviceManufacturer = getDeviceManufacturer();
+        osName = getOsName();
+        osVersion = getOsVersion();
+        language = getLanguage(locale);
+        country = getCountry(locale);
+        screenSize = getScreenSize(screenLayout);
+        screenFormat = getScreenFormat(screenLayout);
+        screenDensity = getScreenDensity(displayMetrics);
+        displayWidth = getDisplayWidth(displayMetrics);
+        displayHeight = getDisplayHeight(displayMetrics);
+        clientSdk = getClientSdk(sdkPrefix);
+        androidId = getAndroidId(context, isGooglePlayServicesAvailable);
+        fbAttributionId = getFacebookAttributionId(context);
+        pluginKeys = Reflection.getPluginKeys(context);
+        macSha1 = getMacSha1(macAddress);
+        macShortMd5 = getMacShortMd5(macAddress);
+    }
+
+    private String getMacAddress(Context context, boolean isGooglePlayServicesAvailable) {
+        if (!isGooglePlayServicesAvailable) {
+            if (!!Util.checkPermission(context, android.Manifest.permission.ACCESS_WIFI_STATE)) {
+                AdjustFactory.getLogger().warn("Missing permission: ACCESS_WIFI_STATE");
+            }
+            return Reflection.getMacAddress(context);
+        } else {
+            return null;
+        }
+    }
+
+    private String getPackageName(Context context) {
+        return context.getPackageName();
+    }
+
+    private String getAppVersion(Context context) {
+        try {
+            PackageManager packageManager = context.getPackageManager();
+            String name = context.getPackageName();
+            PackageInfo info = packageManager.getPackageInfo(name, 0);
+            return info.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            return null;
+        }
+    }
+
+    private String getDeviceType(int screenLayout) {
+        int screenSize = screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
+
+        switch (screenSize) {
+            case Configuration.SCREENLAYOUT_SIZE_SMALL:
+            case Configuration.SCREENLAYOUT_SIZE_NORMAL:
+                return "phone";
+            case Configuration.SCREENLAYOUT_SIZE_LARGE:
+            case 4:
+                return "tablet";
+            default:
+                return null;
+        }
+    }
+
+    private String getDeviceName() {
+        return Build.MODEL;
+    }
+
+    private String getDeviceManufacturer() {
+        return Build.MANUFACTURER;
+    }
+
+    private String getOsName() {
+        return "android";
+    }
+
+    private String getOsVersion() {
+        return osVersion = "" + Build.VERSION.SDK_INT;
+    }
+
+    private String getLanguage(Locale locale) {
+        return locale.getLanguage();
+    }
+
+    private String getCountry(Locale locale) {
+        return locale.getCountry();
+    }
+
+    private String getScreenSize(int screenLayout) {
+        int screenSize = screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
+
+        switch (screenSize) {
+            case Configuration.SCREENLAYOUT_SIZE_SMALL:
+                return SMALL;
+            case Configuration.SCREENLAYOUT_SIZE_NORMAL:
+                return NORMAL;
+            case Configuration.SCREENLAYOUT_SIZE_LARGE:
+                return LARGE;
+            case 4:
+                return XLARGE;
+            default:
+                return null;
+        }
+    }
+
+    private String getScreenFormat(int screenLayout) {
+        int screenFormat = screenLayout & Configuration.SCREENLAYOUT_LONG_MASK;
+
+        switch (screenFormat) {
+            case Configuration.SCREENLAYOUT_LONG_YES:
+                return LONG;
+            case Configuration.SCREENLAYOUT_LONG_NO:
+                return NORMAL;
+            default:
+                return null;
+        }
+    }
+
+    private String getScreenDensity(DisplayMetrics displayMetrics) {
+        int density = displayMetrics.densityDpi;
+        int low = (DisplayMetrics.DENSITY_MEDIUM + DisplayMetrics.DENSITY_LOW) / 2;
+        int high = (DisplayMetrics.DENSITY_MEDIUM + DisplayMetrics.DENSITY_HIGH) / 2;
+
+        if (0 == density) {
+            return null;
+        } else if (density < low) {
+            return LOW;
+        } else if (density > high) {
+            return HIGH;
+        }
+        return MEDIUM;
+    }
+
+    private String getDisplayWidth(DisplayMetrics displayMetrics) {
+        return String.valueOf(displayMetrics.widthPixels);
+    }
+
+    private String getDisplayHeight(DisplayMetrics displayMetrics) {
+        return String.valueOf(displayMetrics.heightPixels);
+    }
+
+    private String getClientSdk(String sdkPrefix) {
+        if (sdkPrefix == null) {
+            return Constants.CLIENT_SDK;
+        } else {
+            return String.format("%s@%s", sdkPrefix, Constants.CLIENT_SDK);
+        }
+    }
+
+    private String getMacSha1(String macAddress) {
+        if (macAddress == null) {
+            return null;
+        }
+        String macSha1 = sha1(macAddress);
+
+        return macSha1;
+    }
+
+    private String getMacShortMd5(String macAddress) {
+        if (macAddress == null) {
+            return null;
+        }
+        String macShort = macAddress.replaceAll(":", "");
+        String macShortMd5 = md5(macShort);
+
+        return macShortMd5;
+    }
+
+    private String getAndroidId(Context context, boolean isGooglePlayServicesAvailable) {
+        if (!isGooglePlayServicesAvailable) {
+            return Reflection.getAndroidId(context);
+        } else {
+            return null;
+        }
+    }
+
+    private String sha1(final String text) {
+        return hash(text, SHA1);
+    }
+
+    private String md5(final String text) {
+        return hash(text, MD5);
+    }
+
+    private String hash(final String text, final String method) {
+        String hashString = null;
+        try {
+            final byte[] bytes = text.getBytes(ENCODING);
+            final MessageDigest mesd = MessageDigest.getInstance(method);
+            mesd.update(bytes, 0, bytes.length);
+            final byte[] hash = mesd.digest();
+            hashString = convertToHex(hash);
+        } catch (Exception e) {
+        }
+        return hashString;
+    }
+
+    private static String convertToHex(final byte[] bytes) {
+        final BigInteger bigInt = new BigInteger(1, bytes);
+        final String formatString = "%0" + (bytes.length << 1) + "x";
+        return String.format(formatString, bigInt);
+    }
+
+    private String getFacebookAttributionId(final Context context) {
+        try {
+            final ContentResolver contentResolver = context.getContentResolver();
+            final Uri uri = Uri.parse("content://com.facebook.katana.provider.AttributionIdProvider");
+            final String columnName = "aid";
+            final String[] projection = {columnName};
+            final Cursor cursor = contentResolver.query(uri, projection, null, null, null);
+
+            if (null == cursor) {
+                return null;
+            }
+            if (!cursor.moveToFirst()) {
+                cursor.close();
+                return null;
+            }
+
+            final String attributionId = cursor.getString(cursor.getColumnIndex(columnName));
+            cursor.close();
+            return attributionId;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/IActivityHandler.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/IActivityHandler.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/IActivityHandler.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/IActivityHandler.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,36 @@
+package com.adjust.sdk;
+
+import android.net.Uri;
+
+import org.json.JSONObject;
+
+/**
+ * Created by pfms on 15/12/14.
+ */
+public interface IActivityHandler {
+    public void init(AdjustConfig config);
+
+    public void trackSubsessionStart();
+
+    public void trackSubsessionEnd();
+
+    public void trackEvent(AdjustEvent event);
+
+    public void finishedTrackingActivity(JSONObject jsonResponse);
+
+    public void setEnabled(boolean enabled);
+
+    public boolean isEnabled();
+
+    public void readOpenUrl(Uri url, long clickTime);
+
+    public boolean tryUpdateAttribution(AdjustAttribution attribution);
+
+    public void sendReferrer(String referrer, long clickTime);
+
+    public void setOfflineMode(boolean enabled);
+
+    public void setAskingAttribution(boolean askingAttribution);
+
+    public ActivityPackage getAttributionPackage();
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/IAttributionHandler.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/IAttributionHandler.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/IAttributionHandler.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/IAttributionHandler.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,20 @@
+package com.adjust.sdk;
+
+import org.json.JSONObject;
+
+/**
+ * Created by pfms on 15/12/14.
+ */
+public interface IAttributionHandler {
+    public void init(IActivityHandler activityHandler,
+                     ActivityPackage attributionPackage,
+                     boolean startPaused);
+
+    public void getAttribution();
+
+    public void checkAttribution(JSONObject jsonResponse);
+
+    public void pauseSending();
+
+    public void resumeSending();
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/ILogger.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/ILogger.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/ILogger.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/ILogger.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,20 @@
+package com.adjust.sdk;
+
+public interface ILogger {
+    public void setLogLevel(LogLevel logLevel);
+
+    public void setLogLevelString(String logLevelString);
+
+    public void verbose(String message, Object... parameters);
+
+    public void debug(String message, Object... parameters);
+
+    public void info(String message, Object... parameters);
+
+    public void warn(String message, Object... parameters);
+
+    public void error(String message, Object... parameters);
+
+    public void Assert(String message, Object... parameters);
+
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/IPackageHandler.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/IPackageHandler.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/IPackageHandler.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/IPackageHandler.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,27 @@
+package com.adjust.sdk;
+
+import android.content.Context;
+
+import org.json.JSONObject;
+
+public interface IPackageHandler {
+    public void init(IActivityHandler activityHandler, Context context, boolean startPaused);
+
+    public void addPackage(ActivityPackage pack);
+
+    public void sendFirstPackage();
+
+    public void sendNextPackage();
+
+    public void closeFirstPackage();
+
+    public void pauseSending();
+
+    public void resumeSending();
+
+    public String getFailureMessage();
+
+    public void finishedTrackingActivity(JSONObject jsonResponse);
+
+    public void sendClickPackage(ActivityPackage clickPackage);
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/IRequestHandler.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/IRequestHandler.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/IRequestHandler.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/IRequestHandler.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,9 @@
+package com.adjust.sdk;
+
+public interface IRequestHandler {
+    public void init(IPackageHandler packageHandler);
+
+    public void sendPackage(ActivityPackage pack);
+
+    public void sendClickPackage(ActivityPackage clickPackage);
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/Logger.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/Logger.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/Logger.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/Logger.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,107 @@
+//
+//  Logger.java
+//  Adjust
+//
+//  Created by Christian Wellenbrock on 2013-04-18.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+import android.util.Log;
+
+import java.util.Arrays;
+import java.util.Locale;
+
+import static com.adjust.sdk.Constants.LOGTAG;
+
+public class Logger implements ILogger {
+
+    private LogLevel logLevel;
+    private static String formatErrorMessage = "Error formating log message: %s, with params: %s";
+
+    public Logger() {
+        setLogLevel(LogLevel.INFO);
+    }
+
+    @Override
+    public void setLogLevel(LogLevel logLevel) {
+        this.logLevel = logLevel;
+    }
+
+    @Override
+    public void setLogLevelString(String logLevelString) {
+        if (null != logLevelString) {
+            try {
+                setLogLevel(LogLevel.valueOf(logLevelString.toUpperCase(Locale.US)));
+            } catch (IllegalArgumentException iae) {
+                error("Malformed logLevel '%s', falling back to 'info'", logLevelString);
+            }
+        }
+    }
+
+    @Override
+    public void verbose(String message, Object... parameters) {
+        if (logLevel.androidLogLevel <= Log.VERBOSE) {
+            try {
+                Log.v(LOGTAG, String.format(message, parameters));
+            } catch (Exception e) {
+                Log.e(LOGTAG, String.format(formatErrorMessage, message, Arrays.toString(parameters)));
+            }
+        }
+    }
+
+    @Override
+    public void debug(String message, Object... parameters) {
+        if (logLevel.androidLogLevel <= Log.DEBUG) {
+            try {
+                Log.d(LOGTAG, String.format(message, parameters));
+            } catch (Exception e) {
+                Log.e(LOGTAG, String.format(formatErrorMessage, message, Arrays.toString(parameters)));
+            }
+        }
+    }
+
+    @Override
+    public void info(String message, Object... parameters) {
+        if (logLevel.androidLogLevel <= Log.INFO) {
+            try {
+                Log.i(LOGTAG, String.format(message, parameters));
+            } catch (Exception e) {
+                Log.e(LOGTAG, String.format(formatErrorMessage, message, Arrays.toString(parameters)));
+            }
+        }
+    }
+
+    @Override
+    public void warn(String message, Object... parameters) {
+        if (logLevel.androidLogLevel <= Log.WARN) {
+            try {
+                Log.w(LOGTAG, String.format(message, parameters));
+            } catch (Exception e) {
+                Log.e(LOGTAG, String.format(formatErrorMessage, message, Arrays.toString(parameters)));
+            }
+        }
+    }
+
+    @Override
+    public void error(String message, Object... parameters) {
+        if (logLevel.androidLogLevel <= Log.ERROR) {
+            try {
+                Log.e(LOGTAG, String.format(message, parameters));
+            } catch (Exception e) {
+                Log.e(LOGTAG, String.format(formatErrorMessage, message, Arrays.toString(parameters)));
+            }
+        }
+    }
+
+    @Override
+    public void Assert(String message, Object... parameters) {
+        try {
+            Log.println(Log.ASSERT, LOGTAG, String.format(message, parameters));
+        } catch (Exception e) {
+            Log.e(LOGTAG, String.format(formatErrorMessage, message, Arrays.toString(parameters)));
+        }
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/LogLevel.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/LogLevel.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/LogLevel.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/LogLevel.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,19 @@
+package com.adjust.sdk;
+
+import android.util.Log;
+
+/**
+ * Created by pfms on 11/03/15.
+ */
+public enum LogLevel {
+    VERBOSE(Log.VERBOSE), DEBUG(Log.DEBUG), INFO(Log.INFO), WARN(Log.WARN), ERROR(Log.ERROR), ASSERT(Log.ASSERT);
+    final int androidLogLevel;
+
+    LogLevel(final int androidLogLevel) {
+        this.androidLogLevel = androidLogLevel;
+    }
+
+    public int getAndroidLogLevel() {
+        return androidLogLevel;
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/OnAttributionChangedListener.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/OnAttributionChangedListener.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/OnAttributionChangedListener.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/OnAttributionChangedListener.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,5 @@
+package com.adjust.sdk;
+
+public interface OnAttributionChangedListener {
+    public void onAttributionChanged(AdjustAttribution attribution);
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/PackageBuilder.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/PackageBuilder.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/PackageBuilder.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/PackageBuilder.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,291 @@
+//
+//  PackageBuilder.java
+//  Adjust
+//
+//  Created by Christian Wellenbrock on 2013-06-25.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+import android.text.TextUtils;
+
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+class PackageBuilder {
+    private AdjustConfig adjustConfig;
+    private DeviceInfo deviceInfo;
+    private ActivityState activityState;
+    private long createdAt;
+
+    // reattributions
+    Map<String, String> extraParameters;
+    AdjustAttribution attribution;
+    String reftag;
+
+    private static ILogger logger = AdjustFactory.getLogger();
+
+    public PackageBuilder(AdjustConfig adjustConfig,
+                          DeviceInfo deviceInfo,
+                          ActivityState activityState,
+                          long createdAt) {
+        this.adjustConfig = adjustConfig;
+        this.deviceInfo = deviceInfo;
+        this.activityState = activityState.clone();
+        this.createdAt = createdAt;
+    }
+
+    public ActivityPackage buildSessionPackage() {
+        Map<String, String> parameters = getDefaultParameters();
+        addDuration(parameters, "last_interval", activityState.lastInterval);
+        addString(parameters, "default_tracker", adjustConfig.defaultTracker);
+
+        ActivityPackage sessionPackage = getDefaultActivityPackage();
+        sessionPackage.setPath("/session");
+        sessionPackage.setActivityKind(ActivityKind.SESSION);
+        sessionPackage.setSuffix("");
+        sessionPackage.setParameters(parameters);
+
+        return sessionPackage;
+    }
+
+    public ActivityPackage buildEventPackage(AdjustEvent event) {
+        Map<String, String> parameters = getDefaultParameters();
+        addInt(parameters, "event_count", activityState.eventCount);
+        addString(parameters, "event_token", event.eventToken);
+        addDouble(parameters, "revenue", event.revenue);
+        addString(parameters, "currency", event.currency);
+        addMapJson(parameters, "callback_params", event.callbackParameters);
+        addMapJson(parameters, "partner_params", event.partnerParameters);
+
+        ActivityPackage eventPackage = getDefaultActivityPackage();
+        eventPackage.setPath("/event");
+        eventPackage.setActivityKind(ActivityKind.EVENT);
+        eventPackage.setSuffix(getEventSuffix(event));
+        eventPackage.setParameters(parameters);
+
+        return eventPackage;
+    }
+
+    public ActivityPackage buildClickPackage(String source, long clickTime) {
+        Map<String, String> parameters = getDefaultParameters();
+
+        addString(parameters, "source", source);
+        addDate(parameters, "click_time", clickTime);
+        addString(parameters, "reftag", reftag);
+        addMapJson(parameters, "params", extraParameters);
+        injectAttribution(parameters);
+
+        ActivityPackage clickPackage = getDefaultActivityPackage();
+        clickPackage.setPath("/sdk_click");
+        clickPackage.setActivityKind(ActivityKind.CLICK);
+        clickPackage.setSuffix("");
+        clickPackage.setParameters(parameters);
+
+        return clickPackage;
+    }
+
+    public ActivityPackage buildAttributionPackage() {
+        Map<String, String> parameters = getIdsParameters();
+
+        ActivityPackage attributionPackage = getDefaultActivityPackage();
+        attributionPackage.setPath("attribution"); // does not contain '/' because of Uri.Builder.appendPath
+        attributionPackage.setActivityKind(ActivityKind.ATTRIBUTION);
+        attributionPackage.setSuffix("");
+        attributionPackage.setParameters(parameters);
+
+        return attributionPackage;
+    }
+
+    private ActivityPackage getDefaultActivityPackage() {
+        ActivityPackage activityPackage = new ActivityPackage();
+        activityPackage.setClientSdk(deviceInfo.clientSdk);
+        return activityPackage;
+    }
+
+    private Map<String, String> getDefaultParameters() {
+        Map<String, String> parameters = new HashMap<String, String>();
+
+        injectDeviceInfo(parameters);
+        injectConfig(parameters);
+        injectActivityState(parameters);
+        addDate(parameters, "created_at", createdAt);
+
+        // general
+        checkDeviceIds(parameters);
+
+        return parameters;
+    }
+
+    private Map<String, String> getIdsParameters() {
+        Map<String, String> parameters = new HashMap<String, String>();
+
+        injectDeviceInfoIds(parameters);
+        injectConfig(parameters);
+        injectActivityStateIds(parameters);
+
+        checkDeviceIds(parameters);
+
+        return parameters;
+    }
+
+    private void injectDeviceInfo(Map<String, String> parameters) {
+        injectDeviceInfoIds(parameters);
+        addString(parameters, "fb_id", deviceInfo.fbAttributionId);
+        addString(parameters, "package_name", deviceInfo.packageName);
+        addString(parameters, "app_version", deviceInfo.appVersion);
+        addString(parameters, "device_type", deviceInfo.deviceType);
+        addString(parameters, "device_name", deviceInfo.deviceName);
+        addString(parameters, "device_manufacturer", deviceInfo.deviceManufacturer);
+        addString(parameters, "os_name", deviceInfo.osName);
+        addString(parameters, "os_version", deviceInfo.osVersion);
+        addString(parameters, "language", deviceInfo.language);
+        addString(parameters, "country", deviceInfo.country);
+        addString(parameters, "screen_size", deviceInfo.screenSize);
+        addString(parameters, "screen_format", deviceInfo.screenFormat);
+        addString(parameters, "screen_density", deviceInfo.screenDensity);
+        addString(parameters, "display_width", deviceInfo.displayWidth);
+        addString(parameters, "display_height", deviceInfo.displayHeight);
+        fillPluginKeys(parameters);
+    }
+
+    private void injectDeviceInfoIds(Map<String, String> parameters) {
+        addString(parameters, "mac_sha1", deviceInfo.macSha1);
+        addString(parameters, "mac_md5", deviceInfo.macShortMd5);
+        addString(parameters, "android_id", deviceInfo.androidId);
+    }
+
+    private void injectConfig(Map<String, String> parameters) {
+        addString(parameters, "app_token", adjustConfig.appToken);
+        addString(parameters, "environment", adjustConfig.environment);
+        addBoolean(parameters, "device_known", adjustConfig.knownDevice);
+        addBoolean(parameters, "needs_attribution_data", adjustConfig.hasListener());
+
+        String playAdId = Util.getPlayAdId(adjustConfig.context);
+        addString(parameters, "gps_adid", playAdId);
+        Boolean isTrackingEnabled = Util.isPlayTrackingEnabled(adjustConfig.context);
+        addBoolean(parameters, "tracking_enabled", isTrackingEnabled);
+    }
+
+    private void injectActivityState(Map<String, String> parameters) {
+        injectActivityStateIds(parameters);
+        addInt(parameters, "session_count", activityState.sessionCount);
+        addInt(parameters, "subsession_count", activityState.subsessionCount);
+        addDuration(parameters, "session_length", activityState.sessionLength);
+        addDuration(parameters, "time_spent", activityState.timeSpent);
+    }
+
+    private void injectActivityStateIds(Map<String, String> parameters) {
+        addString(parameters, "android_uuid", activityState.uuid);
+    }
+
+    private void injectAttribution(Map<String, String> parameters) {
+        if (attribution == null) {
+            return;
+        }
+        addString(parameters, "tracker", attribution.trackerName);
+        addString(parameters, "campaign", attribution.campaign);
+        addString(parameters, "adgroup", attribution.adgroup);
+        addString(parameters, "creative", attribution.creative);
+    }
+
+    private void checkDeviceIds(Map<String, String> parameters) {
+        if (!parameters.containsKey("mac_sha1")
+                && !parameters.containsKey("mac_md5")
+                && !parameters.containsKey("android_id")
+                && !parameters.containsKey("gps_adid")) {
+            logger.error("Missing device id's. Please check if Proguard is correctly set with Adjust SDK");
+        }
+    }
+
+    private void fillPluginKeys(Map<String, String> parameters) {
+        if (deviceInfo.pluginKeys == null) {
+            return;
+        }
+
+        for (Map.Entry<String, String> entry : deviceInfo.pluginKeys.entrySet()) {
+            addString(parameters, entry.getKey(), entry.getValue());
+        }
+    }
+
+    private String getEventSuffix(AdjustEvent event) {
+        if (event.revenue == null) {
+            return String.format(" '%s'", event.eventToken);
+        } else {
+            return String.format(Locale.US, " (%.4f %s, '%s')", event.revenue, event.currency, event.eventToken);
+        }
+    }
+
+    private void addString(Map<String, String> parameters, String key, String value) {
+        if (TextUtils.isEmpty(value)) {
+            return;
+        }
+
+        parameters.put(key, value);
+    }
+
+    private void addInt(Map<String, String> parameters, String key, long value) {
+        if (value < 0) {
+            return;
+        }
+
+        String valueString = Long.toString(value);
+        addString(parameters, key, valueString);
+    }
+
+    private void addDate(Map<String, String> parameters, String key, long value) {
+        if (value < 0) {
+            return;
+        }
+
+        String dateString = Util.dateFormat(value);
+        addString(parameters, key, dateString);
+    }
+
+    private void addDuration(Map<String, String> parameters, String key, long durationInMilliSeconds) {
+        if (durationInMilliSeconds < 0) {
+            return;
+        }
+
+        long durationInSeconds = (durationInMilliSeconds + 500) / 1000;
+        addInt(parameters, key, durationInSeconds);
+    }
+
+    private void addMapJson(Map<String, String> parameters, String key, Map<String, String> map) {
+        if (map == null) {
+            return;
+        }
+
+        if (map.size() == 0) {
+            return;
+        }
+
+        JSONObject jsonObject = new JSONObject(map);
+        String jsonString = jsonObject.toString();
+
+        addString(parameters, key, jsonString);
+    }
+
+    private void addBoolean(Map<String, String> parameters, String key, Boolean value) {
+        if (value == null) {
+            return;
+        }
+
+        int intValue = value ? 1 : 0;
+
+        addInt(parameters, key, intValue);
+    }
+
+    private void addDouble(Map<String, String> parameters, String key, Double value) {
+        if (value == null) return;
+
+        String doubleString = String.format("%.5f", value);
+
+        addString(parameters, key, doubleString);
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/PackageHandler.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/PackageHandler.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/PackageHandler.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/PackageHandler.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,274 @@
+//
+//  PackageHandler.java
+//  Adjust
+//
+//  Created by Christian Wellenbrock on 2013-06-25.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+
+import org.json.JSONObject;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OptionalDataException;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+// persistent
+public class PackageHandler extends HandlerThread implements IPackageHandler {
+    private static final String PACKAGE_QUEUE_FILENAME = "AdjustIoPackageQueue";
+
+    private final InternalHandler internalHandler;
+    private IRequestHandler requestHandler;
+    private IActivityHandler activityHandler;
+    private List<ActivityPackage> packageQueue;
+    private AtomicBoolean isSending;
+    private boolean paused;
+    private Context context;
+    private ILogger logger;
+
+    public PackageHandler(IActivityHandler activityHandler,
+                          Context context,
+                          boolean startPaused) {
+        super(Constants.LOGTAG, MIN_PRIORITY);
+        setDaemon(true);
+        start();
+        this.internalHandler = new InternalHandler(getLooper(), this);
+        this.logger = AdjustFactory.getLogger();
+
+        init(activityHandler, context, startPaused);
+
+        Message message = Message.obtain();
+        message.arg1 = InternalHandler.INIT;
+        internalHandler.sendMessage(message);
+    }
+
+    @Override
+    public void init(IActivityHandler activityHandler, Context context, boolean startPaused) {
+        this.activityHandler = activityHandler;
+        this.context = context;
+        this.paused = startPaused;
+    }
+
+    // add a package to the queue
+    @Override
+    public void addPackage(ActivityPackage pack) {
+        Message message = Message.obtain();
+        message.arg1 = InternalHandler.ADD;
+        message.obj = pack;
+        internalHandler.sendMessage(message);
+    }
+
+    // try to send the oldest package
+    @Override
+    public void sendFirstPackage() {
+        Message message = Message.obtain();
+        message.arg1 = InternalHandler.SEND_FIRST;
+        internalHandler.sendMessage(message);
+    }
+
+    // remove oldest package and try to send the next one
+    // (after success or possibly permanent failure)
+    @Override
+    public void sendNextPackage() {
+        Message message = Message.obtain();
+        message.arg1 = InternalHandler.SEND_NEXT;
+        internalHandler.sendMessage(message);
+    }
+
+    // close the package to retry in the future (after temporary failure)
+    @Override
+    public void closeFirstPackage() {
+        isSending.set(false);
+    }
+
+    // interrupt the sending loop after the current request has finished
+    @Override
+    public void pauseSending() {
+        paused = true;
+    }
+
+    // allow sending requests again
+    @Override
+    public void resumeSending() {
+        paused = false;
+    }
+
+    // short info about how failing packages are handled
+    @Override
+    public String getFailureMessage() {
+        return "Will retry later.";
+    }
+
+    @Override
+    public void finishedTrackingActivity(JSONObject jsonResponse) {
+        activityHandler.finishedTrackingActivity(jsonResponse);
+    }
+
+    @Override
+    public void sendClickPackage(ActivityPackage clickPackage) {
+        logger.debug("Sending click package (%s)", clickPackage);
+        logger.verbose("%s", clickPackage.getExtendedString());
+        requestHandler.sendClickPackage(clickPackage);
+    }
+
+    private static final class InternalHandler extends Handler {
+        private static final int INIT = 1;
+        private static final int ADD = 2;
+        private static final int SEND_NEXT = 3;
+        private static final int SEND_FIRST = 4;
+
+        private final WeakReference<PackageHandler> packageHandlerReference;
+
+        protected InternalHandler(Looper looper, PackageHandler packageHandler) {
+            super(looper);
+            this.packageHandlerReference = new WeakReference<PackageHandler>(packageHandler);
+        }
+
+        @Override
+        public void handleMessage(Message message) {
+            super.handleMessage(message);
+
+            PackageHandler packageHandler = packageHandlerReference.get();
+            if (null == packageHandler) {
+                return;
+            }
+
+            switch (message.arg1) {
+                case INIT:
+                    packageHandler.initInternal();
+                    break;
+                case ADD:
+                    ActivityPackage activityPackage = (ActivityPackage) message.obj;
+                    packageHandler.addInternal(activityPackage);
+                    break;
+                case SEND_FIRST:
+                    packageHandler.sendFirstInternal();
+                    break;
+                case SEND_NEXT:
+                    packageHandler.sendNextInternal();
+                    break;
+            }
+        }
+    }
+
+    // internal methods run in dedicated queue thread
+
+    private void initInternal() {
+        requestHandler = AdjustFactory.getRequestHandler(this);
+
+        isSending = new AtomicBoolean();
+
+        readPackageQueue();
+    }
+
+    private void addInternal(ActivityPackage newPackage) {
+        packageQueue.add(newPackage);
+        logger.debug("Added package %d (%s)", packageQueue.size(), newPackage);
+        logger.verbose("%s", newPackage.getExtendedString());
+
+        writePackageQueue();
+    }
+
+    private void sendFirstInternal() {
+        if (packageQueue.isEmpty()) {
+            return;
+        }
+
+        if (paused) {
+            logger.debug("Package handler is paused");
+            return;
+        }
+        if (isSending.getAndSet(true)) {
+            logger.verbose("Package handler is already sending");
+            return;
+        }
+
+        ActivityPackage firstPackage = packageQueue.get(0);
+        requestHandler.sendPackage(firstPackage);
+    }
+
+    private void sendNextInternal() {
+        packageQueue.remove(0);
+        writePackageQueue();
+        isSending.set(false);
+        sendFirstInternal();
+    }
+
+    private void readPackageQueue() {
+        try {
+            FileInputStream inputStream = context.openFileInput(PACKAGE_QUEUE_FILENAME);
+            BufferedInputStream bufferedStream = new BufferedInputStream(inputStream);
+            ObjectInputStream objectStream = new ObjectInputStream(bufferedStream);
+
+            try {
+                Object object = objectStream.readObject();
+                @SuppressWarnings("unchecked")
+                List<ActivityPackage> packageQueue = (List<ActivityPackage>) object;
+                logger.debug("Package handler read %d packages", packageQueue.size());
+                this.packageQueue = packageQueue;
+                return;
+            } catch (ClassNotFoundException e) {
+                logger.error("Failed to find package queue class");
+            } catch (OptionalDataException e) {
+                /* no-op */
+            } catch (IOException e) {
+                logger.error("Failed to read package queue object");
+            } catch (ClassCastException e) {
+                logger.error("Failed to cast package queue object");
+            } finally {
+                objectStream.close();
+            }
+        } catch (FileNotFoundException e) {
+            logger.verbose("Package queue file not found");
+        } catch (Exception e) {
+            logger.error("Failed to read package queue file");
+        }
+
+        // start with a fresh package queue in case of any exception
+        packageQueue = new ArrayList<ActivityPackage>();
+    }
+
+    public static Boolean deletePackageQueue(Context context) {
+        return context.deleteFile(PACKAGE_QUEUE_FILENAME);
+    }
+
+
+    private void writePackageQueue() {
+        try {
+            FileOutputStream outputStream = context.openFileOutput(PACKAGE_QUEUE_FILENAME, Context.MODE_PRIVATE);
+            BufferedOutputStream bufferedStream = new BufferedOutputStream(outputStream);
+            ObjectOutputStream objectStream = new ObjectOutputStream(bufferedStream);
+
+            try {
+                objectStream.writeObject(packageQueue);
+                logger.debug("Package handler wrote %d packages", packageQueue.size());
+            } catch (NotSerializableException e) {
+                logger.error("Failed to serialize packages");
+            } finally {
+                objectStream.close();
+            }
+        } catch (Exception e) {
+            logger.error("Failed to write packages (%s)", e.getLocalizedMessage());
+            e.printStackTrace();
+        }
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/AndroidIdUtil.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/AndroidIdUtil.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/AndroidIdUtil.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/AndroidIdUtil.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,10 @@
+package com.adjust.sdk.plugin;
+
+import android.content.Context;
+import android.provider.Settings.Secure;
+
+public class AndroidIdUtil {
+    public static String getAndroidId(final Context context) {
+        return Secure.getString(context.getContentResolver(), Secure.ANDROID_ID);
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/MacAddressUtil.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/MacAddressUtil.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/MacAddressUtil.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/MacAddressUtil.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,82 @@
+package com.adjust.sdk.plugin;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.text.TextUtils;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Locale;
+
+public class MacAddressUtil {
+    public static String getMacAddress(Context context) {
+        final String rawAddress = getRawMacAddress(context);
+        if (rawAddress == null) {
+            return null;
+        }
+        final String upperAddress = rawAddress.toUpperCase(Locale.US);
+        return removeSpaceString(upperAddress);
+    }
+
+    private static String getRawMacAddress(Context context) {
+        // android devices should have a wlan address
+        final String wlanAddress = loadAddress("wlan0");
+        if (wlanAddress != null) {
+            return wlanAddress;
+        }
+
+        // emulators should have an ethernet address
+        final String ethAddress = loadAddress("eth0");
+        if (ethAddress != null) {
+            return ethAddress;
+        }
+
+        // query the wifi manager (requires the ACCESS_WIFI_STATE permission)
+        try {
+            final WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+            final String wifiAddress = wifiManager.getConnectionInfo().getMacAddress();
+            if (wifiAddress != null) {
+                return wifiAddress;
+            }
+        } catch (Exception e) {
+            /* no-op */
+        }
+
+        return null;
+    }
+
+    private static String loadAddress(final String interfaceName) {
+        try {
+            final String filePath = "/sys/class/net/" + interfaceName + "/address";
+            final StringBuilder fileData = new StringBuilder(1000);
+            final BufferedReader reader = new BufferedReader(new FileReader(filePath), 1024);
+            final char[] buf = new char[1024];
+            int numRead;
+
+            String readData;
+            while ((numRead = reader.read(buf)) != -1) {
+                readData = String.valueOf(buf, 0, numRead);
+                fileData.append(readData);
+            }
+
+            reader.close();
+            return fileData.toString();
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
+    private static String removeSpaceString(final String inputString) {
+        if (inputString == null) {
+            return null;
+        }
+
+        String outputString = inputString.replaceAll("\\s", "");
+        if (TextUtils.isEmpty(outputString)) {
+            return null;
+        }
+
+        return outputString;
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/Plugin.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/Plugin.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/Plugin.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/plugin/Plugin.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,12 @@
+package com.adjust.sdk.plugin;
+
+import android.content.Context;
+
+import java.util.Map;
+
+/**
+ * Created by pfms on 18/09/14.
+ */
+public interface Plugin {
+    Map.Entry<String, String> getParameter(Context context);
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/Reflection.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/Reflection.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/Reflection.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/Reflection.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,210 @@
+package com.adjust.sdk;
+
+import android.content.Context;
+
+import com.adjust.sdk.plugin.Plugin;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.adjust.sdk.Constants.PLUGINS;
+
+public class Reflection {
+
+    public static String getPlayAdId(Context context) {
+        try {
+            Object AdvertisingInfoObject = getAdvertisingInfoObject(context);
+
+            String playAdid = (String) invokeInstanceMethod(AdvertisingInfoObject, "getId", null);
+
+            return playAdid;
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
+    public static Boolean isPlayTrackingEnabled(Context context) {
+        try {
+            Object AdvertisingInfoObject = getAdvertisingInfoObject(context);
+
+            Boolean isLimitedTrackingEnabled = (Boolean) invokeInstanceMethod(AdvertisingInfoObject, "isLimitAdTrackingEnabled", null);
+
+            return !isLimitedTrackingEnabled;
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
+    public static boolean isGooglePlayServicesAvailable(Context context) {
+        try {
+            Integer isGooglePlayServicesAvailableStatusCode = (Integer) invokeStaticMethod(
+                    "com.google.android.gms.common.GooglePlayServicesUtil",
+                    "isGooglePlayServicesAvailable",
+                    new Class[]{Context.class}, context
+            );
+
+            boolean isGooglePlayServicesAvailable = (Boolean) isConnectionResultSuccess(isGooglePlayServicesAvailableStatusCode);
+
+            return isGooglePlayServicesAvailable;
+        } catch (Throwable t) {
+            return false;
+        }
+    }
+
+    public static String getMacAddress(Context context) {
+        try {
+            String macSha1 = (String) invokeStaticMethod(
+                    "com.adjust.sdk.plugin.MacAddressUtil",
+                    "getMacAddress",
+                    new Class[]{Context.class}, context
+            );
+
+            return macSha1;
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
+    public static String getAndroidId(Context context) {
+        try {
+            String androidId = (String) invokeStaticMethod("com.adjust.sdk.plugin.AndroidIdUtil", "getAndroidId"
+                    , new Class[]{Context.class}, context);
+
+            return androidId;
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
+    public static String getSha1EmailAddress(Context context, String key) {
+        try {
+            String sha1EmailAddress = (String) invokeStaticMethod("com.adjust.sdk.plugin.EmailUtil", "getSha1EmailAddress"
+                    , new Class[]{Context.class, String.class}, context, key);
+
+            return sha1EmailAddress;
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
+    private static Object getAdvertisingInfoObject(Context context)
+            throws Exception {
+        return invokeStaticMethod("com.google.android.gms.ads.identifier.AdvertisingIdClient",
+                "getAdvertisingIdInfo",
+                new Class[]{Context.class}, context
+        );
+    }
+
+    private static boolean isConnectionResultSuccess(Integer statusCode) {
+        if (statusCode == null) {
+            return false;
+        }
+
+        try {
+            Class ConnectionResultClass = Class.forName("com.google.android.gms.common.ConnectionResult");
+
+            Field SuccessField = ConnectionResultClass.getField("SUCCESS");
+
+            int successStatusCode = SuccessField.getInt(null);
+
+            return successStatusCode == statusCode;
+        } catch (Throwable t) {
+            return false;
+        }
+    }
+
+    public static Class forName(String className) {
+        try {
+            Class classObject = Class.forName(className);
+            return classObject;
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
+    public static Object createDefaultInstance(String className) {
+        Class classObject = forName(className);
+        Object instance = createDefaultInstance(classObject);
+        return instance;
+    }
+
+    public static Object createDefaultInstance(Class classObject) {
+        try {
+            Object instance = classObject.newInstance();
+            return instance;
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
+    public static Object createInstance(String className, Class[] cArgs, Object... args) {
+        try {
+            Class classObject = Class.forName(className);
+            @SuppressWarnings("unchecked")
+            Constructor constructor = classObject.getConstructor(cArgs);
+            Object instance = constructor.newInstance(args);
+            return instance;
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
+    public static Object invokeStaticMethod(String className, String methodName, Class[] cArgs, Object... args)
+            throws Exception {
+        Class classObject = Class.forName(className);
+
+        return invokeMethod(classObject, methodName, null, cArgs, args);
+    }
+
+    public static Object invokeInstanceMethod(Object instance, String methodName, Class[] cArgs, Object... args)
+            throws Exception {
+        Class classObject = instance.getClass();
+
+        return invokeMethod(classObject, methodName, instance, cArgs, args);
+    }
+
+    public static Object invokeMethod(Class classObject, String methodName, Object instance, Class[] cArgs, Object... args)
+            throws Exception {
+        @SuppressWarnings("unchecked")
+        Method methodObject = classObject.getMethod(methodName, cArgs);
+
+        Object resultObject = methodObject.invoke(instance, args);
+
+        return resultObject;
+    }
+
+    public static Map<String, String> getPluginKeys(Context context) {
+        Map<String, String> pluginKeys = new HashMap<String, String>();
+
+        for (Plugin plugin : getPlugins()) {
+            Map.Entry<String, String> pluginEntry = plugin.getParameter(context);
+            if (pluginEntry != null) {
+                pluginKeys.put(pluginEntry.getKey(), pluginEntry.getValue());
+            }
+        }
+
+        if (pluginKeys.size() == 0) {
+            return null;
+        } else {
+            return pluginKeys;
+        }
+    }
+
+    private static List<Plugin> getPlugins() {
+        List<Plugin> plugins = new ArrayList<Plugin>(PLUGINS.size());
+
+        for (String pluginName : PLUGINS) {
+            Object pluginObject = Reflection.createDefaultInstance(pluginName);
+            if (pluginObject != null && pluginObject instanceof Plugin) {
+                plugins.add((Plugin) pluginObject);
+            }
+        }
+
+        return plugins;
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/RequestHandler.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/RequestHandler.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/RequestHandler.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/RequestHandler.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,210 @@
+//
+//  RequestHandler.java
+//  Adjust
+//
+//  Created by Christian Wellenbrock on 2013-06-25.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.http.message.BasicNameValuePair;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.lang.ref.WeakReference;
+import java.net.SocketTimeoutException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+public class RequestHandler extends HandlerThread implements IRequestHandler {
+    private InternalHandler internalHandler;
+    private IPackageHandler packageHandler;
+    private HttpClient httpClient;
+    private ILogger logger;
+
+    public RequestHandler(IPackageHandler packageHandler) {
+        super(Constants.LOGTAG, MIN_PRIORITY);
+        setDaemon(true);
+        start();
+
+        this.logger = AdjustFactory.getLogger();
+        this.internalHandler = new InternalHandler(getLooper(), this);
+        init(packageHandler);
+
+        Message message = Message.obtain();
+        message.arg1 = InternalHandler.INIT;
+        internalHandler.sendMessage(message);
+    }
+
+    @Override
+    public void init(IPackageHandler packageHandler) {
+        this.packageHandler = packageHandler;
+    }
+
+    @Override
+    public void sendPackage(ActivityPackage pack) {
+        Message message = Message.obtain();
+        message.arg1 = InternalHandler.SEND;
+        message.obj = pack;
+        internalHandler.sendMessage(message);
+    }
+
+    @Override
+    public void sendClickPackage(ActivityPackage clickPackage) {
+        Message message = Message.obtain();
+        message.arg1 = InternalHandler.SEND_CLICK;
+        message.obj = clickPackage;
+        internalHandler.sendMessage(message);
+
+    }
+
+    private static final class InternalHandler extends Handler {
+        private static final int INIT = 72401;
+        private static final int SEND = 72400;
+        private static final int SEND_CLICK = 72402;
+
+        private final WeakReference<RequestHandler> requestHandlerReference;
+
+        protected InternalHandler(Looper looper, RequestHandler requestHandler) {
+            super(looper);
+            this.requestHandlerReference = new WeakReference<RequestHandler>(requestHandler);
+        }
+
+        @Override
+        public void handleMessage(Message message) {
+            super.handleMessage(message);
+
+            RequestHandler requestHandler = requestHandlerReference.get();
+            if (null == requestHandler) {
+                return;
+            }
+
+            switch (message.arg1) {
+                case INIT:
+                    requestHandler.initInternal();
+                    break;
+                case SEND:
+                    ActivityPackage activityPackage = (ActivityPackage) message.obj;
+                    requestHandler.sendInternal(activityPackage, true);
+                    break;
+                case SEND_CLICK:
+                    ActivityPackage clickPackage = (ActivityPackage) message.obj;
+                    requestHandler.sendInternal(clickPackage, false);
+                    break;
+            }
+        }
+    }
+
+    private void initInternal() {
+        httpClient = Util.getHttpClient();
+    }
+
+    private void sendInternal(ActivityPackage activityPackage, boolean sendToPackageHandler) {
+        try {
+            HttpUriRequest request = getRequest(activityPackage);
+            HttpResponse response = httpClient.execute(request);
+            requestFinished(response, sendToPackageHandler);
+        } catch (UnsupportedEncodingException e) {
+            sendNextPackage(activityPackage, "Failed to encode parameters", e, sendToPackageHandler);
+        } catch (ClientProtocolException e) {
+            closePackage(activityPackage, "Client protocol error", e, sendToPackageHandler);
+        } catch (SocketTimeoutException e) {
+            closePackage(activityPackage, "Request timed out", e, sendToPackageHandler);
+        } catch (IOException e) {
+            closePackage(activityPackage, "Request failed", e, sendToPackageHandler);
+        } catch (Throwable e) {
+            sendNextPackage(activityPackage, "Runtime exception", e, sendToPackageHandler);
+        }
+    }
+
+    private void requestFinished(HttpResponse response, boolean sendToPackageHandler) {
+        JSONObject jsonResponse = Util.parseJsonResponse(response, logger);
+
+        if (jsonResponse == null) {
+            if (sendToPackageHandler) {
+                packageHandler.closeFirstPackage();
+            }
+            return;
+        }
+
+        packageHandler.finishedTrackingActivity(jsonResponse);
+        if (sendToPackageHandler) {
+            packageHandler.sendNextPackage();
+        }
+    }
+
+    // close current package because it failed
+    private void closePackage(ActivityPackage activityPackage, String message, Throwable throwable, boolean sendToPackageHandler) {
+        final String packageMessage = activityPackage.getFailureMessage();
+        final String handlerMessage = packageHandler.getFailureMessage();
+        final String reasonString = getReasonString(message, throwable);
+        logger.error("%s. (%s) %s", packageMessage, reasonString, handlerMessage);
+
+        if (sendToPackageHandler) {
+            packageHandler.closeFirstPackage();
+        }
+    }
+
+    // send next package because the current package failed
+    private void sendNextPackage(ActivityPackage activityPackage, String message, Throwable throwable, boolean sendToPackageHandler) {
+        final String failureMessage = activityPackage.getFailureMessage();
+        final String reasonString = getReasonString(message, throwable);
+        logger.error("%s. (%s)", failureMessage, reasonString);
+
+        if (sendToPackageHandler) {
+            packageHandler.sendNextPackage();
+        }
+    }
+
+    private String getReasonString(String message, Throwable throwable) {
+        if (throwable != null) {
+            return String.format("%s: %s", message, throwable);
+        } else {
+            return String.format("%s", message);
+        }
+    }
+
+    private HttpUriRequest getRequest(ActivityPackage activityPackage) throws UnsupportedEncodingException {
+        String url = Constants.BASE_URL + activityPackage.getPath();
+        HttpPost request = new HttpPost(url);
+
+        String language = Locale.getDefault().getLanguage();
+        request.addHeader("Client-SDK", activityPackage.getClientSdk());
+        request.addHeader("Accept-Language", language);
+
+        List<NameValuePair> pairs = new ArrayList<NameValuePair>();
+        for (Map.Entry<String, String> entry : activityPackage.getParameters().entrySet()) {
+            NameValuePair pair = new BasicNameValuePair(entry.getKey(), entry.getValue());
+            pairs.add(pair);
+        }
+
+        long now = System.currentTimeMillis();
+        String dateString = Util.dateFormat(now);
+        NameValuePair sentAtPair = new BasicNameValuePair("sent_at", dateString);
+        pairs.add(sentAtPair);
+
+        UrlEncodedFormEntity entity = new UrlEncodedFormEntity(pairs);
+        entity.setContentType(URLEncodedUtils.CONTENT_TYPE);
+        request.setEntity(entity);
+
+        return request;
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/UnitTestActivity.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/UnitTestActivity.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/UnitTestActivity.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/UnitTestActivity.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,38 @@
+package com.adjust.sdk;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class UnitTestActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //setContentView(com.adjust.sdk.test.R.layout.activity_unit_test);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        //getMenuInflater().inflate(com.adjust.sdk.test.R.menu.menu_unit_test, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+/*        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == com.adjust.sdk.test.R.id.action_settings) {
+            return true;
+        }
+*/
+        return super.onOptionsItemSelected(item);
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/Util.java thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/Util.java
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/android/thirdparty/com/adjust/sdk/Util.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/android/thirdparty/com/adjust/sdk/Util.java	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,202 @@
+//
+//  Util.java
+//  Adjust
+//
+//  Created by Christian Wellenbrock on 2012-10-11.
+//  Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
+//  See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OptionalDataException;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Collects utility functions used by Adjust.
+ */
+public class Util {
+
+    private static SimpleDateFormat dateFormat;
+    private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z";
+
+    protected static String createUuid() {
+        return UUID.randomUUID().toString();
+    }
+
+    public static String quote(String string) {
+        if (string == null) {
+            return null;
+        }
+
+        Pattern pattern = Pattern.compile("\\s");
+        Matcher matcher = pattern.matcher(string);
+        if (!matcher.find()) {
+            return string;
+        }
+
+        return String.format("'%s'", string);
+    }
+
+    public static String dateFormat(long date) {
+        if (null == dateFormat) {
+            dateFormat = new SimpleDateFormat(DATE_FORMAT, Locale.US);
+        }
+        return dateFormat.format(date);
+    }
+
+    public static String getPlayAdId(Context context) {
+        return Reflection.getPlayAdId(context);
+    }
+
+    public static Boolean isPlayTrackingEnabled(Context context) {
+        return Reflection.isPlayTrackingEnabled(context);
+    }
+
+    public static <T> T readObject(Context context, String filename, String objectName) {
+        ILogger logger = AdjustFactory.getLogger();
+        try {
+            FileInputStream inputStream = context.openFileInput(filename);
+            BufferedInputStream bufferedStream = new BufferedInputStream(inputStream);
+            ObjectInputStream objectStream = new ObjectInputStream(bufferedStream);
+
+            try {
+                @SuppressWarnings("unchecked")
+                T t = (T) objectStream.readObject();
+                logger.debug("Read %s: %s", objectName, t);
+                return t;
+            } catch (ClassNotFoundException e) {
+                logger.error("Failed to find %s class", objectName);
+            } catch (OptionalDataException e) {
+                /* no-op */
+            } catch (IOException e) {
+                logger.error("Failed to read %s object", objectName);
+            } catch (ClassCastException e) {
+                logger.error("Failed to cast %s object", objectName);
+            } finally {
+                objectStream.close();
+            }
+
+        } catch (FileNotFoundException e) {
+            logger.verbose("%s file not found", objectName);
+        } catch (Exception e) {
+            logger.error("Failed to open %s file for reading (%s)", objectName, e);
+        }
+
+        return null;
+    }
+
+    public static <T> void writeObject(T object, Context context, String filename, String objectName) {
+        ILogger logger = AdjustFactory.getLogger();
+        try {
+            FileOutputStream outputStream = context.openFileOutput(filename, Context.MODE_PRIVATE);
+            BufferedOutputStream bufferedStream = new BufferedOutputStream(outputStream);
+            ObjectOutputStream objectStream = new ObjectOutputStream(bufferedStream);
+
+            try {
+                objectStream.writeObject(object);
+                logger.debug("Wrote %s: %s", objectName, object);
+            } catch (NotSerializableException e) {
+                logger.error("Failed to serialize %s", objectName);
+            } finally {
+                objectStream.close();
+            }
+
+        } catch (Exception e) {
+            logger.error("Failed to open %s for writing (%s)", objectName, e);
+        }
+    }
+
+    public static String parseResponse(HttpResponse httpResponse, ILogger logger) {
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            httpResponse.getEntity().writeTo(out);
+            out.close();
+            String response = out.toString().trim();
+            logger.verbose("Response: %s", response);
+            return response;
+        } catch (Exception e) {
+            logger.error("Failed to parse response (%s)", e);
+            return null;
+        }
+    }
+
+    public static JSONObject parseJsonResponse(HttpResponse httpResponse, ILogger logger) {
+        if (httpResponse == null) {
+            return null;
+        }
+        String stringResponse = null;
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            httpResponse.getEntity().writeTo(out);
+            out.close();
+            stringResponse = out.toString().trim();
+        } catch (Exception e) {
+            logger.error("Failed to parse response (%s)", e.getMessage());
+        }
+
+        logger.verbose("Response: %s", stringResponse);
+        if (stringResponse == null) return null;
+
+        JSONObject jsonResponse = null;
+        try {
+            jsonResponse = new JSONObject(stringResponse);
+        } catch (JSONException e) {
+            logger.error("Failed to parse json response: %s (%s)", stringResponse, e.getMessage());
+        }
+
+        if (jsonResponse == null) return null;
+
+        String message = jsonResponse.optString("message", null);
+
+        if (message == null) {
+            message = "No message found";
+        }
+
+        if (httpResponse.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+            logger.info("%s", message);
+        } else {
+            logger.error("%s", message);
+        }
+
+        return jsonResponse;
+    }
+
+    public static HttpClient getHttpClient() {
+        HttpParams httpParams = new BasicHttpParams();
+        HttpConnectionParams.setConnectionTimeout(httpParams, Constants.CONNECTION_TIMEOUT);
+        HttpConnectionParams.setSoTimeout(httpParams, Constants.SOCKET_TIMEOUT);
+        return AdjustFactory.getHttpClient(httpParams);
+    }
+
+    public static boolean checkPermission(Context context, String permission) {
+        int result = context.checkCallingOrSelfPermission(permission);
+        return result == PackageManager.PERMISSION_GRANTED;
+    }
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/locales/en-US/overrides/appstrings.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/locales/en-US/overrides/appstrings.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/mobile/locales/en-US/overrides/appstrings.properties	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/mobile/locales/en-US/overrides/appstrings.properties	2015-04-24 19:31:12.000000000 +0000
@@ -31,6 +31,7 @@
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
+unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
 remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/modules/libjar/nsJAR.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/modules/libjar/nsJAR.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/modules/libjar/nsJAR.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/modules/libjar/nsJAR.h	2015-04-24 19:31:13.000000000 +0000
@@ -30,7 +30,6 @@
 #include "mozilla/Attributes.h"
 
 class nsIX509Cert;
-class nsIInputStream;
 class nsJARManifestItem;
 class nsZipReaderCache;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/modules/libpref/init/all.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/modules/libpref/init/all.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/modules/libpref/init/all.js	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/modules/libpref/init/all.js	2015-04-24 19:31:13.000000000 +0000
@@ -478,17 +478,10 @@
 pref("media.audio_data.enabled", false);
 
 // Whether to use async panning and zooming
-#ifdef XP_WIN
-pref("layers.async-pan-zoom.enabled", true);
-
-// Workaround a bug where inactive scrollframes test this pref directly.
-pref("layout.event-regions.enabled", true);
-#else
 pref("layers.async-pan-zoom.enabled", false);
 
 // Whether to enable event region building during painting
 pref("layout.event-regions.enabled", false);
-#endif
 
 // APZ preferences. For documentation/details on what these prefs do, check
 // gfx/layers/apz/src/AsyncPanZoomController.cpp.
@@ -780,8 +773,6 @@
 // Determines whether full SQL strings are returned when they might contain sensitive info
 // i.e. dynamically constructed SQL strings or SQL executed by addons against addon DBs
 pref("toolkit.telemetry.debugSlowSql", false);
-// Determines if Telemetry pings can be archived locally.
-pref("toolkit.telemetry.archive.enabled", true);
 
 // Identity module
 pref("toolkit.identity.enabled", false);
@@ -4182,7 +4173,18 @@
 pref("dom.mozAlarms.enabled", false);
 
 // Push
+
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+// Desktop prefs
+#ifdef RELEASE_BUILD
 pref("dom.push.enabled", false);
+#else
+pref("dom.push.enabled", true);
+#endif
+#else
+// Mobile prefs
+pref("dom.push.enabled", false);
+#endif
 
 pref("dom.push.debug", false);
 pref("dom.push.serverURL", "wss://push.services.mozilla.com/");
@@ -4477,11 +4479,11 @@
 pref("dom.mapped_arraybuffer.enabled", false);
 
 // The tables used for Safebrowsing phishing and malware checks.
-pref("urlclassifier.malwareTable", "goog-malware-shavar,test-malware-simple");
+pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple");
 pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple");
 pref("urlclassifier.downloadBlockTable", "");
 pref("urlclassifier.downloadAllowTable", "");
-pref("urlclassifier.disallow_completions", "test-malware-simple,test-phish-simple,goog-downloadwhite-digest256,mozpub-track-digest256");
+pref("urlclassifier.disallow_completions", "test-malware-simple,test-phish-simple,test-unwanted-simple,goog-downloadwhite-digest256,mozpub-track-digest256");
 
 // The table and update/gethash URLs for Safebrowsing phishing and malware
 // checks.
@@ -4695,11 +4697,9 @@
 // Use vsync aligned rendering. b2g prefs are in b2g.js.
 // Hardware vsync supported on windows, os x, and b2g.
 // Linux and fennec will use software vsync.
-#if defined(XP_MACOSX) || defined(XP_WIN) || defined(XP_LINUX)
 pref("gfx.vsync.hw-vsync.enabled", true);
 pref("gfx.vsync.compositor", true);
 pref("gfx.vsync.refreshdriver", true);
-#endif
 
 // Secure Element API
 #ifdef MOZ_SECUREELEMENT
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/modules/libpref/nsPrefBranch.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/modules/libpref/nsPrefBranch.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/modules/libpref/nsPrefBranch.cpp	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/modules/libpref/nsPrefBranch.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -378,7 +378,7 @@
   }
   nsAutoCString message(nsPrintfCString("Warning: attempting to write %d bytes to preference %s. This is bad for general performance and memory usage. Such an amount of data should rather be written to an external file.",
                                         aLength,
-                                        aPrefName));
+                                        getPrefName(aPrefName)));
   rv = console->LogStringMessage(NS_ConvertUTF8toUTF16(message).get());
   if (NS_FAILED(rv)) {
     return rv;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/modules/libpref/Preferences.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/modules/libpref/Preferences.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/modules/libpref/Preferences.cpp	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/modules/libpref/Preferences.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -802,17 +802,8 @@
 nsresult
 Preferences::UseDefaultPrefFile()
 {
-  nsresult rv;
   nsCOMPtr<nsIFile> aFile;
-
-#if defined(XP_WIN) && defined(MOZ_METRO)
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    rv = NS_GetSpecialDirectory(NS_METRO_APP_PREFS_50_FILE, getter_AddRefs(aFile));
-  } else
-#endif
-  {
-    rv = NS_GetSpecialDirectory(NS_APP_PREFS_50_FILE, getter_AddRefs(aFile));
-  }
+  nsresult rv = NS_GetSpecialDirectory(NS_APP_PREFS_50_FILE, getter_AddRefs(aFile));
 
   if (NS_SUCCEEDED(rv)) {
     rv = ReadAndOwnUserPrefFile(aFile);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/modules/libpref/Preferences.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/modules/libpref/Preferences.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/modules/libpref/Preferences.h	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/modules/libpref/Preferences.h	2015-04-24 19:31:13.000000000 +0000
@@ -20,8 +20,6 @@
 #include "mozilla/MemoryReporting.h"
 
 class nsIFile;
-class nsCString;
-class nsString;
 class nsAdoptingString;
 class nsAdoptingCString;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/AutoClose.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/AutoClose.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/AutoClose.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/AutoClose.h	2015-04-24 19:31:13.000000000 +0000
@@ -23,7 +23,7 @@
     Close();
   }
 
-  operator bool() const
+  explicit operator bool() const
   {
     return mPtr;
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/ChannelDiverterChild.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/ChannelDiverterChild.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/ChannelDiverterChild.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/ChannelDiverterChild.h	2015-04-24 19:31:13.000000000 +0000
@@ -9,13 +9,9 @@
 
 #include "mozilla/net/PChannelDiverterChild.h"
 
-class nsIDivertableChannel;
-
 namespace mozilla {
 namespace net {
 
-class ChannelDiverterArgs;
-
 class ChannelDiverterChild :
   public PChannelDiverterChild
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/Dashboard.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/Dashboard.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/Dashboard.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/Dashboard.h	2015-04-24 19:31:13.000000000 +0000
@@ -15,8 +15,6 @@
 #include "nsITransport.h"
 
 class nsIDNSService;
-class nsISocketTransport;
-class nsIThread;
 
 namespace mozilla {
 namespace net {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/nsNativeConnectionHelper.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/nsNativeConnectionHelper.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/nsNativeConnectionHelper.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/nsNativeConnectionHelper.h	2015-04-24 19:31:14.000000000 +0000
@@ -7,8 +7,6 @@
 
 #include "nscore.h"
 
-class nsISocketTransport;
-
 class nsNativeConnectionHelper
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/nsURLHelper.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/nsURLHelper.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/nsURLHelper.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/nsURLHelper.h	2015-04-24 19:31:14.000000000 +0000
@@ -229,7 +229,7 @@
 
 
 /**
- * Returns the max length of a URL. The default is 2083.
+ * Returns the max length of a URL. The default is 1048576 (1 MB).
  * Can be changed by pref "network.standard-url.max-length"
  */
 int32_t net_GetURLMaxLength();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/Predictor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/Predictor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/Predictor.h	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/Predictor.h	2015-04-24 19:31:13.000000000 +0000
@@ -26,7 +26,6 @@
 class nsIDNSService;
 class nsIIOService;
 class nsINetworkPredictorVerifier;
-class nsIThread;
 class nsITimer;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/ProxyAutoConfig.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/ProxyAutoConfig.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/base/ProxyAutoConfig.cpp	2015-04-22 13:06:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/base/ProxyAutoConfig.cpp	2015-04-24 19:31:13.000000000 +0000
@@ -669,7 +669,7 @@
   "PACResolutionThreadGlobal",
   JSCLASS_GLOBAL_FLAGS,
   nullptr, nullptr, nullptr, nullptr,
-  nullptr, nullptr, nullptr,
+  nullptr, nullptr, nullptr, nullptr,
   nullptr, nullptr, nullptr, nullptr,
   JS_GlobalObjectTraceHook
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cache/nsDiskCacheStreams.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cache/nsDiskCacheStreams.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cache/nsDiskCacheStreams.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cache/nsDiskCacheStreams.h	2015-04-24 19:31:14.000000000 +0000
@@ -18,7 +18,6 @@
 
 #include "mozilla/Atomics.h"
 
-class nsDiskCacheInputStream;
 class nsDiskCacheDevice;
 
 class nsDiskCacheStreamIO : public nsIOutputStream {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cache2/CacheEntry.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cache2/CacheEntry.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cache2/CacheEntry.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cache2/CacheEntry.h	2015-04-24 19:31:14.000000000 +0000
@@ -33,7 +33,6 @@
 
 #define NowInSeconds() PRTimeToSeconds(PR_Now())
 
-class nsIStorageStream;
 class nsIOutputStream;
 class nsIURI;
 class nsIThread;
@@ -43,7 +42,6 @@
 
 class CacheStorageService;
 class CacheStorage;
-class CacheFileOutputStream;
 class CacheOutputCloseListener;
 class CacheEntryHandle;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cache2/CacheFileIOManager.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cache2/CacheFileIOManager.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cache2/CacheFileIOManager.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cache2/CacheFileIOManager.h	2015-04-24 19:31:14.000000000 +0000
@@ -23,7 +23,6 @@
 class nsITimer;
 class nsIDirectoryEnumerator;
 class nsILoadContextInfo;
-class nsICacheStorageVisitor;
 
 namespace mozilla {
 namespace net {
@@ -174,7 +173,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 class OpenFileEvent;
-class CloseFileEvent;
 class ReadEvent;
 class WriteEvent;
 class MetadataWriteScheduleEvent;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cache2/CacheStorageService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cache2/CacheStorageService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cache2/CacheStorageService.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cache2/CacheStorageService.h	2015-04-24 19:31:14.000000000 +0000
@@ -20,7 +20,6 @@
 #include "nsTArray.h"
 
 class nsIURI;
-class nsICacheEntryOpenCallback;
 class nsICacheEntryDoomCallback;
 class nsICacheStorageVisitor;
 class nsIRunnable;
@@ -34,7 +33,6 @@
 class CacheStorage;
 class CacheEntry;
 class CacheEntryHandle;
-class CacheEntryTable;
 
 class CacheMemoryConsumer
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cookie/CookieServiceParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cookie/CookieServiceParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cookie/CookieServiceParent.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cookie/CookieServiceParent.h	2015-04-24 19:31:14.000000000 +0000
@@ -10,7 +10,6 @@
 #include "SerializedLoadContext.h"
 
 class nsCookieService;
-class nsIIOService;
 
 namespace mozilla {
 namespace net {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cookie/nsCookieService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cookie/nsCookieService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/cookie/nsCookieService.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/cookie/nsCookieService.h	2015-04-24 19:31:14.000000000 +0000
@@ -42,7 +42,6 @@
 
 struct nsCookieAttributes;
 struct nsListIter;
-struct nsEnumerationData;
 
 namespace mozilla {
 namespace net {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/ipc/ChannelEventQueue.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/ipc/ChannelEventQueue.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/ipc/ChannelEventQueue.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/ipc/ChannelEventQueue.h	2015-04-24 19:31:14.000000000 +0000
@@ -13,7 +13,6 @@
 
 class nsISupports;
 class nsIEventTarget;
-class nsIThread;
 
 namespace mozilla {
 namespace net {
@@ -33,8 +32,6 @@
 // instance) to be dispatched and called before mListener->OnStartRequest has
 // completed.
 
-class AutoEventEnqueuerBase;
-
 class ChannelEventQueue final
 {
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ChannelEventQueue)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/ftp/FTPChannelParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/ftp/FTPChannelParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/ftp/FTPChannelParent.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/ftp/FTPChannelParent.h	2015-04-24 19:31:14.000000000 +0000
@@ -15,7 +15,6 @@
 #include "nsIInterfaceRequestor.h"
 #include "OfflineObserver.h"
 
-class nsFtpChannel;
 class nsILoadContext;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/ASpdySession.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/ASpdySession.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/ASpdySession.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/ASpdySession.h	2015-04-24 19:31:14.000000000 +0000
@@ -15,8 +15,6 @@
 
 namespace mozilla { namespace net {
 
-class nsHttpConnectionInfo;
-
 class ASpdySession : public nsAHttpTransaction
 {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/Http2Session.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/Http2Session.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/Http2Session.cpp	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/Http2Session.cpp	2015-04-24 19:31:14.000000000 +0000
@@ -19,6 +19,7 @@
 #include "Http2Stream.h"
 #include "Http2Push.h"
 
+#include "mozilla/Endian.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Preferences.h"
 #include "nsHttp.h"
@@ -137,30 +138,6 @@
   mNegotiatedToken.AssignLiteral(HTTP2_DRAFT_LATEST_TOKEN);
 }
 
-// Copy the 32 bit number into the destination, using network byte order
-// in the destination.
-template<typename charType> static void
-CopyAsNetwork32(charType dest,   // where to store it
-                uint32_t number) // the 32 bit number in native format
-{
-  number = PR_htonl(number);
-  memcpy(dest, &number, sizeof(number));
-}
-
-template void CopyAsNetwork32(char *dest, uint32_t number);
-template void CopyAsNetwork32(uint8_t *dest, uint32_t number);
-
-template<typename charType> static void
-CopyAsNetwork16(charType dest, // where to store it
-                uint16_t number) // the 16 bit number in native format
-{
-  number = PR_htons(number);
-  memcpy(dest, &number, sizeof(number));
-}
-
-template void CopyAsNetwork16(char *dest, uint16_t number);
-template void CopyAsNetwork16(uint8_t *dest, uint16_t number);
-
 PLDHashOperator
 Http2Session::ShutdownEnumerator(nsAHttpTransaction *key,
                                  nsAutoPtr<Http2Stream> &stream,
@@ -679,10 +656,10 @@
   MOZ_ASSERT(!(streamID & 0x80000000));
 
   dest[0] = 0x00;
-  CopyAsNetwork16(dest + 1, frameLength);
+  NetworkEndian::writeUint16(dest + 1, frameLength);
   dest[3] = frameType;
   dest[4] = frameFlags;
-  CopyAsNetwork32(dest + 5, streamID);
+  NetworkEndian::writeUint32(dest + 5, streamID);
 }
 
 char *
@@ -789,7 +766,7 @@
   mOutputQueueUsed += frameSize;
 
   CreateFrameHeader(packet, 5, FRAME_TYPE_PRIORITY, 0, aID);
-  CopyAsNetwork32(packet + kFrameHeaderBytes, 0);
+  NetworkEndian::writeUint32(packet + kFrameHeaderBytes, 0);
   memcpy(packet + frameSize - 1, &aPriorityWeight, 1);
   LogIO(this, nullptr, "Generate Priority", packet, frameSize);
   FlushOutputQueue();
@@ -816,7 +793,7 @@
   mOutputQueueUsed += frameSize;
   CreateFrameHeader(packet, 4, FRAME_TYPE_RST_STREAM, 0, aID);
 
-  CopyAsNetwork32(packet + kFrameHeaderBytes, aStatusCode);
+  NetworkEndian::writeUint32(packet + kFrameHeaderBytes, aStatusCode);
 
   LogIO(this, nullptr, "Generate Reset", packet, frameSize);
   FlushOutputQueue();
@@ -835,10 +812,10 @@
   CreateFrameHeader(packet, 8, FRAME_TYPE_GOAWAY, 0, 0);
 
   // last-good-stream-id are bytes 9-12 reflecting pushes
-  CopyAsNetwork32(packet + kFrameHeaderBytes, mOutgoingGoAwayID);
+  NetworkEndian::writeUint32(packet + kFrameHeaderBytes, mOutgoingGoAwayID);
 
   // bytes 13-16 are the status code.
-  CopyAsNetwork32(packet + frameSize - 4, aStatusCode);
+  NetworkEndian::writeUint32(packet + frameSize - 4, aStatusCode);
 
   LogIO(this, nullptr, "Generate GoAway", packet, frameSize);
   FlushOutputQueue();
@@ -884,11 +861,11 @@
   if (!gHttpHandler->AllowPush()) {
     // If we don't support push then set MAX_CONCURRENT to 0 and also
     // set ENABLE_PUSH to 0
-    CopyAsNetwork16(packet + kFrameHeaderBytes + (6 * numberOfEntries), SETTINGS_TYPE_ENABLE_PUSH);
+    NetworkEndian::writeUint16(packet + kFrameHeaderBytes + (6 * numberOfEntries), SETTINGS_TYPE_ENABLE_PUSH);
     // The value portion of the setting pair is already initialized to 0
     numberOfEntries++;
 
-    CopyAsNetwork16(packet + kFrameHeaderBytes + (6 * numberOfEntries), SETTINGS_TYPE_MAX_CONCURRENT);
+    NetworkEndian::writeUint16(packet + kFrameHeaderBytes + (6 * numberOfEntries), SETTINGS_TYPE_MAX_CONCURRENT);
     // The value portion of the setting pair is already initialized to 0
     numberOfEntries++;
 
@@ -897,14 +874,14 @@
 
   // Advertise the Push RWIN for the session, and on each new pull stream
   // send a window update
-  CopyAsNetwork16(packet + kFrameHeaderBytes + (6 * numberOfEntries), SETTINGS_TYPE_INITIAL_WINDOW);
-  CopyAsNetwork32(packet + kFrameHeaderBytes + (6 * numberOfEntries) + 2, mPushAllowance);
+  NetworkEndian::writeUint16(packet + kFrameHeaderBytes + (6 * numberOfEntries), SETTINGS_TYPE_INITIAL_WINDOW);
+  NetworkEndian::writeUint32(packet + kFrameHeaderBytes + (6 * numberOfEntries) + 2, mPushAllowance);
   numberOfEntries++;
 
   // Make sure the other endpoint knows that we're sticking to the default max
   // frame size
-  CopyAsNetwork16(packet + kFrameHeaderBytes + (6 * numberOfEntries), SETTINGS_TYPE_MAX_FRAME_SIZE);
-  CopyAsNetwork32(packet + kFrameHeaderBytes + (6 * numberOfEntries) + 2, kMaxFrameData);
+  NetworkEndian::writeUint16(packet + kFrameHeaderBytes + (6 * numberOfEntries), SETTINGS_TYPE_MAX_FRAME_SIZE);
+  NetworkEndian::writeUint32(packet + kFrameHeaderBytes + (6 * numberOfEntries) + 2, kMaxFrameData);
   numberOfEntries++;
 
   MOZ_ASSERT(numberOfEntries <= maxSettings);
@@ -923,7 +900,7 @@
     packet = mOutputQueueBuffer.get() + mOutputQueueUsed;
     CreateFrameHeader(packet, 4, FRAME_TYPE_WINDOW_UPDATE, 0, 0);
     mOutputQueueUsed += kFrameHeaderBytes + 4;
-    CopyAsNetwork32(packet + kFrameHeaderBytes, sessionWindowBump);
+    NetworkEndian::writeUint32(packet + kFrameHeaderBytes, sessionWindowBump);
 
     LOG3(("Session Window increase at start of session %p %u\n",
           this, sessionWindowBump));
@@ -963,7 +940,7 @@
   char *packet = mOutputQueueBuffer.get() + mOutputQueueUsed;
   CreateFrameHeader(packet, 5, FRAME_TYPE_PRIORITY, 0, streamID);
   mOutputQueueUsed += kFrameHeaderBytes + 5;
-  CopyAsNetwork32(packet + kFrameHeaderBytes, dependsOn); // depends on
+  NetworkEndian::writeUint32(packet + kFrameHeaderBytes, dependsOn); // depends on
   packet[kFrameHeaderBytes + 4] = weight; // weight
 
   LOG3(("Http2Session %p generate Priority Frame 0x%X depends on 0x%X "
@@ -1392,8 +1369,8 @@
   if (NS_FAILED(rv))
     return rv;
 
-  uint32_t newPriorityDependency =
-    PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
+  uint32_t newPriorityDependency = NetworkEndian::readUint32(
+      self->mInputFrameBuffer.get() + kFrameHeaderBytes);
   bool exclusive = !!(newPriorityDependency & 0x80000000);
   newPriorityDependency &= 0x7fffffff;
   uint8_t newPriorityWeight = *(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4);
@@ -1423,8 +1400,8 @@
     RETURN_SESSION_ERROR(self, PROTOCOL_ERROR);
   }
 
-  self->mDownstreamRstReason =
-    PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
+  self->mDownstreamRstReason = NetworkEndian::readUint32(
+      self->mInputFrameBuffer.get() + kFrameHeaderBytes);
 
   LOG3(("Http2Session::RecvRstStream %p RST_STREAM Reason Code %u ID %x\n",
         self, self->mDownstreamRstReason, self->mInputFrameID));
@@ -1485,8 +1462,8 @@
     uint8_t *setting = reinterpret_cast<uint8_t *>
       (self->mInputFrameBuffer.get()) + kFrameHeaderBytes + index * 6;
 
-    uint16_t id = PR_ntohs(*reinterpret_cast<uint16_t *>(setting));
-    uint32_t value = PR_ntohl(*reinterpret_cast<uint32_t *>(setting + 2));
+    uint16_t id = NetworkEndian::readUint16(setting);
+    uint32_t value = NetworkEndian::readUint32(setting + 2);
     LOG3(("Settings ID %u, Value %u", id, value));
 
     switch (id)
@@ -1572,8 +1549,8 @@
       return rv;
     }
     promiseLen = 4;
-    promisedID =
-      PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes + paddingControlBytes));
+    promisedID = NetworkEndian::readUint32(
+        self->mInputFrameBuffer.get() + kFrameHeaderBytes + paddingControlBytes);
     promisedID &= 0x7fffffff;
   }
 
@@ -1835,12 +1812,12 @@
   }
 
   self->mShouldGoAway = true;
-  self->mGoAwayID =
-    PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
+  self->mGoAwayID = NetworkEndian::readUint32(
+      self->mInputFrameBuffer.get() + kFrameHeaderBytes);
   self->mGoAwayID &= 0x7fffffff;
   self->mCleanShutdown = true;
-  uint32_t statusCode =
-    PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4));
+  uint32_t statusCode = NetworkEndian::readUint32(
+      self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4);
 
   // Find streams greater than the last-good ID and mark them for deletion
   // in the mGoAwayStreamsToRestart queue with the GoAwayEnumerator. The
@@ -1913,8 +1890,8 @@
     RETURN_SESSION_ERROR(self, PROTOCOL_ERROR);
   }
 
-  uint32_t delta =
-    PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
+  uint32_t delta = NetworkEndian::readUint32(
+      self->mInputFrameBuffer.get() + kFrameHeaderBytes);
   delta &= 0x7fffffff;
 
   LOG3(("Http2Session::RecvWindowUpdate %p len=%d Stream 0x%X.\n",
@@ -2089,8 +2066,8 @@
     return NS_OK;
   }
 
-  uint16_t originLen =
-    PR_ntohs(*reinterpret_cast<uint16_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
+  uint16_t originLen = NetworkEndian::readUint16(
+      self->mInputFrameBuffer.get() + kFrameHeaderBytes);
   if (originLen + 2U > self->mInputFrameDataSize) {
     LOG3(("Http2Session::RecvAltSvc %p origin len too big for frame", self));
     self->ResetDownstreamState();
@@ -2551,15 +2528,16 @@
 
     // 3 bytes of length, 1 type byte, 1 flag byte, 1 unused bit, 31 bits of ID
     uint8_t totallyWastedByte = mInputFrameBuffer.get()[0];
-    mInputFrameDataSize = PR_ntohs(*reinterpret_cast<uint16_t *>(mInputFrameBuffer.get() + 1));
+    mInputFrameDataSize = NetworkEndian::readUint16(
+        mInputFrameBuffer.get() + 1);
     if (totallyWastedByte || (mInputFrameDataSize > kMaxFrameData)) {
       LOG3(("Got frame too large 0x%02X%04X", totallyWastedByte, mInputFrameDataSize));
       RETURN_SESSION_ERROR(this, PROTOCOL_ERROR);
     }
     mInputFrameType = *reinterpret_cast<uint8_t *>(mInputFrameBuffer.get() + kFrameLengthBytes);
     mInputFrameFlags = *reinterpret_cast<uint8_t *>(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes);
-    mInputFrameID =
-      PR_ntohl(*reinterpret_cast<uint32_t *>(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes + kFrameFlagBytes));
+    mInputFrameID = NetworkEndian::readUint32(
+        mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes + kFrameFlagBytes);
     mInputFrameID &= 0x7fffffff;
     mInputFrameDataRead = 0;
 
@@ -2906,7 +2884,7 @@
   MOZ_ASSERT(mOutputQueueUsed <= mOutputQueueSize);
 
   CreateFrameHeader(packet, 4, FRAME_TYPE_WINDOW_UPDATE, 0, stream->StreamID());
-  CopyAsNetwork32(packet + kFrameHeaderBytes, toack);
+  NetworkEndian::writeUint32(packet + kFrameHeaderBytes, toack);
 
   LogIO(this, stream, "Stream Window Update", packet, kFrameHeaderBytes + 4);
   // dont flush here, this write can commonly be coalesced with a
@@ -2949,7 +2927,7 @@
   MOZ_ASSERT(mOutputQueueUsed <= mOutputQueueSize);
 
   CreateFrameHeader(packet, 4, FRAME_TYPE_WINDOW_UPDATE, 0, 0);
-  CopyAsNetwork32(packet + kFrameHeaderBytes, toack);
+  NetworkEndian::writeUint32(packet + kFrameHeaderBytes, toack);
 
   LogIO(this, nullptr, "Session Window Update", packet, kFrameHeaderBytes + 4);
   // dont flush here, this write can commonly be coalesced with others
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/HttpChannelParentListener.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/HttpChannelParentListener.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/HttpChannelParentListener.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/HttpChannelParentListener.h	2015-04-24 19:31:14.000000000 +0000
@@ -12,8 +12,6 @@
 #include "nsIChannelEventSink.h"
 #include "nsIRedirectResultListener.h"
 
-class nsIParentChannel;
-
 namespace mozilla {
 namespace net {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/InterceptedChannel.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/InterceptedChannel.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/InterceptedChannel.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/InterceptedChannel.h	2015-04-24 19:31:14.000000000 +0000
@@ -13,7 +13,6 @@
 
 class nsICacheEntry;
 class nsInputStreamPump;
-class nsIStorageStream;
 class nsIStreamListener;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/nsAHttpTransaction.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/nsAHttpTransaction.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/nsAHttpTransaction.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/nsAHttpTransaction.h	2015-04-24 19:31:14.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsWeakReference.h"
 
 class nsIInterfaceRequestor;
-class nsIEventTarget;
 class nsITransport;
 class nsILoadGroupConnectionInfo;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/nsHttpChannel.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/nsHttpChannel.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/nsHttpChannel.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/nsHttpChannel.h	2015-04-24 19:31:14.000000000 +0000
@@ -23,7 +23,6 @@
 #include "TimingStruct.h"
 #include "AutoClose.h"
 
-class nsIPrincipal;
 class nsDNSPrefetch;
 class nsICancelable;
 class nsIHttpChannelAuthProvider;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/TunnelUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/TunnelUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/http/TunnelUtils.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/http/TunnelUtils.h	2015-04-24 19:31:14.000000000 +0000
@@ -174,7 +174,6 @@
 class InputStreamShim;
 class OutputStreamShim;
 class nsHttpConnection;
-class ASpdySession;
 
 class SpdyConnectTransaction final : public NullHttpTransaction
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/rtsp/controller/RtspControllerParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/rtsp/controller/RtspControllerParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/protocol/rtsp/controller/RtspControllerParent.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/protocol/rtsp/controller/RtspControllerParent.h	2015-04-24 19:31:15.000000000 +0000
@@ -15,8 +15,6 @@
 #include "nsCOMPtr.h"
 #include "nsString.h"
 
-class nsIAuthPromptProvider;
-
 namespace mozilla {
 namespace net {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/sctp/datachannel/DataChannel.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/sctp/datachannel/DataChannel.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/sctp/datachannel/DataChannel.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/sctp/datachannel/DataChannel.h	2015-04-24 19:31:15.000000000 +0000
@@ -48,7 +48,6 @@
 
 namespace mozilla {
 
-class DTLSConnection;
 class DataChannelConnection;
 class DataChannel;
 class DataChannelOnMessageAvailable;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/socket/nsSOCKSIOLayer.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/socket/nsSOCKSIOLayer.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/socket/nsSOCKSIOLayer.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/socket/nsSOCKSIOLayer.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -242,7 +242,7 @@
       return mLength;
   }
 
-  operator bool() { return !!mBuf; }
+  explicit operator bool() { return !!mBuf; }
 private:
   template <size_t Size2>
   friend class Buffer;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -40,8 +40,7 @@
 {
     if (NS_IsMainThread()) {
         mFailUncleanStops =
-            (Preferences::GetBool("network.http.enforce-framing.soft", false) ||
-             Preferences::GetBool("network.http.enforce-framing.http", false));
+            Preferences::GetBool("network.http.enforce-framing.http", false);
     } else {
         mFailUncleanStops = false;
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/test/unit/test_content_length_underrun.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/test/unit/test_content_length_underrun.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/netwerk/test/unit/test_content_length_underrun.js	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/netwerk/test/unit/test_content_length_underrun.js	2015-04-24 19:31:15.000000000 +0000
@@ -218,6 +218,8 @@
 function completeTest4(request, data, ctx)
 {
   do_check_eq(request.status, Components.results.NS_OK);
+
+  prefs.setBoolPref("network.http.enforce-framing.http1", true);
   run_gzip_test(99);
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/html/nsHtml5TreeBuilderCppSupplement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/html/nsHtml5TreeBuilderCppSupplement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/html/nsHtml5TreeBuilderCppSupplement.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/html/nsHtml5TreeBuilderCppSupplement.h	2015-04-24 19:31:16.000000000 +0000
@@ -10,8 +10,6 @@
 #include "nsIFrame.h"
 #include "mozilla/Likely.h"
 
-class nsPresContext;
-
 nsHtml5TreeBuilder::nsHtml5TreeBuilder(nsHtml5OplessBuilder* aBuilder)
   : scriptingEnabled(false)
   , fragment(false)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/html/nsHtml5TreeOperation.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/html/nsHtml5TreeOperation.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/html/nsHtml5TreeOperation.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/html/nsHtml5TreeOperation.h	2015-04-24 19:31:16.000000000 +0000
@@ -12,7 +12,6 @@
 
 class nsIContent;
 class nsHtml5TreeOpExecutor;
-class nsHtml5StateSnapshot;
 class nsHtml5DocumentBuilder;
 
 enum eHtml5TreeOperation {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/html/nsHtml5TreeOpExecutor.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/html/nsHtml5TreeOpExecutor.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/html/nsHtml5TreeOpExecutor.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/html/nsHtml5TreeOpExecutor.h	2015-04-24 19:31:16.000000000 +0000
@@ -25,8 +25,6 @@
 #include "mozilla/net/ReferrerPolicy.h"
 
 class nsHtml5Parser;
-class nsHtml5TreeBuilder;
-class nsHtml5Tokenizer;
 class nsHtml5StreamParser;
 class nsIContent;
 class nsIDocument;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/htmlparser/CNavDTD.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/htmlparser/CNavDTD.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/htmlparser/CNavDTD.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/htmlparser/CNavDTD.h	2015-04-24 19:31:16.000000000 +0000
@@ -11,9 +11,6 @@
 #include "nsISupports.h"
 #include "nsCOMPtr.h"
 
-// This class is no longer useful.
-class nsIHTMLContentSink;
-
 #ifdef _MSC_VER
 #pragma warning( disable : 4275 )
 #endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/htmlparser/nsIDTD.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/htmlparser/nsIDTD.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/htmlparser/nsIDTD.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/htmlparser/nsIDTD.h	2015-04-24 19:31:16.000000000 +0000
@@ -46,8 +46,6 @@
 };
 
 
-class nsIParser;
-class nsIURI;
 class nsIContentSink;
 class CParserContext;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/htmlparser/nsParser.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/htmlparser/nsParser.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/htmlparser/nsParser.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/htmlparser/nsParser.h	2015-04-24 19:31:16.000000000 +0000
@@ -54,7 +54,6 @@
 #include "nsWeakReference.h"
 
 class nsIDTD;
-class nsScanner;
 class nsIRunnable;
 
 #ifdef _MSC_VER
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/htmlparser/nsScanner.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/htmlparser/nsScanner.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/parser/htmlparser/nsScanner.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/parser/htmlparser/nsScanner.h	2015-04-24 19:31:16.000000000 +0000
@@ -25,8 +25,6 @@
 #include "nsIUnicodeDecoder.h"
 #include "nsScannerString.h"
 
-class nsParser;
-
 class nsReadEndCondition {
 public:
   const char16_t *mChars;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/profile/dirserviceprovider/nsProfileDirServiceProvider.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/profile/dirserviceprovider/nsProfileDirServiceProvider.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/profile/dirserviceprovider/nsProfileDirServiceProvider.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/profile/dirserviceprovider/nsProfileDirServiceProvider.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -16,7 +16,6 @@
 // File Name Defines
 
 #define PREFS_FILE_50_NAME           NS_LITERAL_CSTRING("prefs.js")
-#define PREFS_FILE_METRO_50_NAME     NS_LITERAL_CSTRING("metro-prefs.js")
 #define USER_CHROME_DIR_50_NAME      NS_LITERAL_CSTRING("chrome")
 #define LOCAL_STORE_FILE_50_NAME     NS_LITERAL_CSTRING("localstore.rdf")
 #define PANELS_FILE_50_NAME          NS_LITERAL_CSTRING("panels.rdf")
@@ -170,11 +169,6 @@
     if (NS_SUCCEEDED(rv))
       rv = localFile->AppendNative(PREFS_FILE_50_NAME);
   }
-  else if (strcmp(prop, NS_METRO_APP_PREFS_50_FILE) == 0) {
-    rv = domainDir->Clone(getter_AddRefs(localFile));
-    if (NS_SUCCEEDED(rv))
-      rv = localFile->AppendNative(PREFS_FILE_METRO_50_NAME);
-  }
   else if (strcmp(prop, NS_APP_USER_PROFILE_50_DIR) == 0) {
     rv = domainDir->Clone(getter_AddRefs(localFile));
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/bin/bootstrap.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/bin/bootstrap.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/bin/bootstrap.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/bin/bootstrap.py	2015-04-24 19:31:16.000000000 +0000
@@ -49,6 +49,7 @@
 
 TEMPDIR = None
 
+
 def setup_proxy():
     # Some Linux environments define ALL_PROXY, which is a SOCKS proxy
     # intended for all protocols. Python doesn't currently automatically
@@ -58,6 +59,7 @@
     if 'ALL_PROXY' in os.environ and 'http_proxy' not in os.environ:
         os.environ['http_proxy'] = os.environ['ALL_PROXY']
 
+
 def fetch_files(repo_url, repo_type):
     setup_proxy()
     repo_url = repo_url.rstrip('/')
@@ -75,6 +77,7 @@
 
     return files
 
+
 def ensure_environment(repo_url=None, repo_type=None):
     """Ensure we can load the Python modules necessary to perform bootstrap."""
 
@@ -118,17 +121,23 @@
             from mozboot.bootstrap import Bootstrapper
             return Bootstrapper
 
+
 def main(args):
     parser = OptionParser()
     parser.add_option('-r', '--repo-url', dest='repo_url',
-        default='https://hg.mozilla.org/mozilla-central/',
-        help='Base URL of source control repository where bootstrap files can '
-             'be downloaded.')
-
+                      default='https://hg.mozilla.org/mozilla-central/',
+                      help='Base URL of source control repository where bootstrap files can '
+                      'be downloaded.')
     parser.add_option('--repo-type', dest='repo_type',
-        default='hgweb',
-        help='The type of the repository. This defines how we fetch file '
-             'content. Like --repo, you should not need to set this.')
+                      default='hgweb',
+                      help='The type of the repository. This defines how we fetch file '
+                      'content. Like --repo, you should not need to set this.')
+
+    parser.add_option('--application-choice', dest='application_choice',
+                      help='Pass in an application choice (desktop/android) instead of using the '
+                      'default interactive prompt.')
+    parser.add_option('--no-interactive', dest='no_interactive', action='store_true',
+                      help='Answer yes to any (Y/n) interactive prompts.')
 
     options, leftover = parser.parse_args(args)
 
@@ -141,8 +150,7 @@
             print('\n')
             print(e)
             return 1
-
-        dasboot = cls()
+        dasboot = cls(choice=options.application_choice, no_interactive=options.no_interactive)
         dasboot.bootstrap()
 
         return 0
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/archlinux.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/archlinux.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/archlinux.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/archlinux.py	2015-04-24 19:31:16.000000000 +0000
@@ -62,9 +62,9 @@
         'https://aur.archlinux.org/packages/uu/uuid/uuid.tar.gz',
     ]
 
-    def __init__(self, version, dist_id):
+    def __init__(self, version, dist_id, **kwargs):
         print 'Using an experimental bootstrapper for Archlinux.'
-        BaseBootstrapper.__init__(self)
+        BaseBootstrapper.__init__(self, **kwargs)
 
     def install_system_packages(self):
         self.pacman_install(*self.SYSTEM_PACKAGES)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/base.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/base.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/base.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/base.py	2015-04-24 19:31:16.000000000 +0000
@@ -83,8 +83,9 @@
 class BaseBootstrapper(object):
     """Base class for system bootstrappers."""
 
-    def __init__(self):
+    def __init__(self, no_interactive=False):
         self.package_manager_updated = False
+        self.no_interactive = no_interactive
 
     def install_system_packages(self):
         '''
@@ -159,6 +160,8 @@
 
     def yum_install(self, *packages):
         command = ['yum', 'install']
+        if self.no_interactive:
+            command.append('-y')
         command.extend(packages)
 
         self.run_as_root(command)
@@ -171,18 +174,24 @@
 
     def yum_update(self, *packages):
         command = ['yum', 'update']
+        if self.no_interactive:
+            command.append('-y')
         command.extend(packages)
 
         self.run_as_root(command)
 
     def apt_install(self, *packages):
         command = ['apt-get', 'install']
+        if self.no_interactive:
+            command.append('-y')
         command.extend(packages)
 
         self.run_as_root(command)
 
     def apt_update(self):
         command = ['apt-get', 'update']
+        if self.no_interactive:
+            command.append('-y')
 
         self.run_as_root(command)
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/bootstrap.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/bootstrap.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/bootstrap.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/bootstrap.py	2015-04-24 19:31:16.000000000 +0000
@@ -27,11 +27,18 @@
 Your choice:
 '''
 
-APPLICATIONS = [
+APPLICATIONS_LIST=[
     ('Firefox for Desktop', 'browser'),
-    ('Firefox for Android', 'mobile_android'),
+    ('Firefox for Android', 'mobile_android')
 ]
 
+# This is a workaround for the fact that we must support python2.6 (which has
+# no OrderedDict)
+APPLICATIONS = dict(
+    desktop=APPLICATIONS_LIST[0],
+    android=APPLICATIONS_LIST[1],
+)
+
 FINISHED = '''
 Your system should be ready to build %s! If you have not already,
 obtain a copy of the source code by running:
@@ -47,11 +54,12 @@
 class Bootstrapper(object):
     """Main class that performs system bootstrap."""
 
-    def __init__(self, finished=FINISHED):
+    def __init__(self, finished=FINISHED, choice=None, no_interactive=False):
         self.instance = None
         self.finished = finished
+        self.choice = choice
         cls = None
-        args = {}
+        args = {'no_interactive': no_interactive}
 
         if sys.platform.startswith('linux'):
             distro, version, dist_id = platform.linux_distribution()
@@ -109,11 +117,16 @@
         self.instance = cls(**args)
 
     def bootstrap(self):
-        # Like ['1. Firefox for Desktop', '2. Firefox for Android'].
-        labels = ['%s. %s' % (i + 1, name) for (i, (name, _)) in enumerate(APPLICATIONS)]
-        prompt = APPLICATION_CHOICE % '\n'.join(labels)
-        choice = self.instance.prompt_int(prompt=prompt, low=1, high=len(APPLICATIONS))
-        name, application = APPLICATIONS[choice-1]
+        if self.choice is None:
+            # Like ['1. Firefox for Desktop', '2. Firefox for Android'].
+            labels = ['%s. %s' % (i + 1, name) for (i, (name, _)) in enumerate(APPLICATIONS_LIST)]
+            prompt = APPLICATION_CHOICE % '\n'.join(labels)
+            prompt_choice = self.instance.prompt_int(prompt=prompt, low=1, high=len(APPLICATIONS))
+            name, application = APPLICATIONS_LIST[prompt_choice-1]
+        elif self.choice not in APPLICATIONS.keys():
+            raise Exception('Please pick a valid application choice: (%s)' % '/'.join(APPLICATIONS.keys()))
+        else:
+            name, application = APPLICATIONS[self.choice]
 
         self.instance.install_system_packages()
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/centos.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/centos.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/centos.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/centos.py	2015-04-24 19:31:16.000000000 +0000
@@ -9,8 +9,8 @@
 
 
 class CentOSBootstrapper(BaseBootstrapper):
-    def __init__(self, version, dist_id):
-        BaseBootstrapper.__init__(self)
+    def __init__(self, version, dist_id, **kwargs):
+        BaseBootstrapper.__init__(self, **kwargs)
 
         self.version = version
         self.dist_id = dist_id
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/debian.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/debian.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/debian.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/debian.py	2015-04-24 19:31:16.000000000 +0000
@@ -65,8 +65,8 @@
     # Subclasses can add packages to this variable to have them installed.
     MOBILE_ANDROID_DISTRO_PACKAGES = []
 
-    def __init__(self, version, dist_id):
-        BaseBootstrapper.__init__(self)
+    def __init__(self, version, dist_id, **kwargs):
+        BaseBootstrapper.__init__(self, **kwargs)
 
         self.version = version
         self.dist_id = dist_id
@@ -75,6 +75,7 @@
         self.browser_packages = self.BROWSER_COMMON_PACKAGES + self.BROWSER_DISTRO_PACKAGES
         self.mobile_android_packages = self.MOBILE_ANDROID_COMMON_PACKAGES + self.MOBILE_ANDROID_DISTRO_PACKAGES
 
+
     def install_system_packages(self):
         self.apt_install(*self.packages)
 
@@ -96,7 +97,7 @@
         # http://developer.android.com/sdk/installing/index.html?pkg=tools.
         self.run_as_root(['dpkg', '--add-architecture', 'i386'])
         # After adding a new arch, the list of packages has to be updated
-        self.run_as_root(['apt-get', 'update'])
+        self.apt_update()
         self.apt_install(*self.mobile_android_packages)
 
         # 2. The user may have an external Android SDK (in which case we save
@@ -129,4 +130,4 @@
                                   ndk_path=self.ndk_path)
 
     def _update_package_manager(self):
-        self.run_as_root(['apt-get', 'update'])
+        self.apt_update()
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/fedora.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/fedora.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/fedora.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/fedora.py	2015-04-24 19:31:16.000000000 +0000
@@ -6,8 +6,8 @@
 
 
 class FedoraBootstrapper(BaseBootstrapper):
-    def __init__(self, version, dist_id):
-        BaseBootstrapper.__init__(self)
+    def __init__(self, version, dist_id, **kwargs):
+        BaseBootstrapper.__init__(self, **kwargs)
 
         self.version = version
         self.dist_id = dist_id
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/freebsd.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/freebsd.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/freebsd.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/freebsd.py	2015-04-24 19:31:16.000000000 +0000
@@ -6,8 +6,8 @@
 
 
 class FreeBSDBootstrapper(BaseBootstrapper):
-    def __init__(self, version, flavor):
-        BaseBootstrapper.__init__(self)
+    def __init__(self, version, flavor, **kwargs):
+        BaseBootstrapper.__init__(self, **kwargs)
         self.version = int(version.split('.')[0])
         self.flavor = flavor.lower()
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/gentoo.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/gentoo.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/gentoo.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/gentoo.py	2015-04-24 19:31:16.000000000 +0000
@@ -6,8 +6,8 @@
 
 
 class GentooBootstrapper(BaseBootstrapper):
-    def __init__(self, version, dist_id):
-        BaseBootstrapper.__init__(self)
+    def __init__(self, version, dist_id, **kwargs):
+        BaseBootstrapper.__init__(self, **kwargs)
 
         self.version = version
         self.dist_id = dist_id
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/openbsd.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/openbsd.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/openbsd.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/openbsd.py	2015-04-24 19:31:16.000000000 +0000
@@ -6,8 +6,8 @@
 
 
 class OpenBSDBootstrapper(BaseBootstrapper):
-    def __init__(self, version):
-        BaseBootstrapper.__init__(self)
+    def __init__(self, version, **kwargs):
+        BaseBootstrapper.__init__(self, **kwargs)
 
         self.packages = [
             'mercurial',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/osx.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/osx.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozboot/mozboot/osx.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozboot/mozboot/osx.py	2015-04-24 19:31:16.000000000 +0000
@@ -168,8 +168,8 @@
 
 
 class OSXBootstrapper(BaseBootstrapper):
-    def __init__(self, version):
-        BaseBootstrapper.__init__(self)
+    def __init__(self, version, **kwargs):
+        BaseBootstrapper.__init__(self, **kwargs)
 
         self.os_version = StrictVersion(version)
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozbuild/mozbuild/backend/recursivemake.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozbuild/mozbuild/backend/recursivemake.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/python/mozbuild/mozbuild/backend/recursivemake.py	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/python/mozbuild/mozbuild/backend/recursivemake.py	2015-04-24 19:31:16.000000000 +0000
@@ -702,6 +702,10 @@
             rule.add_dependencies(['$(CURDIR)/%: %'])
 
     def _check_blacklisted_variables(self, makefile_in, makefile_content):
+        if b'EXTERNALLY_MANAGED_MAKE_FILE' in makefile_content:
+            # Bypass the variable restrictions for externally managed makefiles.
+            return
+
         for x in MOZBUILD_VARIABLES:
             if re.search(r'^[^#]*\b%s\s*[:?+]?=' % x, makefile_content, re.M):
                 raise Exception('Variable %s is defined in %s. It should '
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/rdf/base/nsRDFXMLSerializer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/rdf/base/nsRDFXMLSerializer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/rdf/base/nsRDFXMLSerializer.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/rdf/base/nsRDFXMLSerializer.h	2015-04-24 19:31:17.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsDataHashtable.h"
 #include "rdfITripleVisitor.h"
 
-class nsString;
 class nsIOutputStream;
 class nsIRDFContainerUtils;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/rdf/base/rdfutil.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/rdf/base/rdfutil.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/rdf/base/rdfutil.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/rdf/base/rdfutil.h	2015-04-24 19:31:17.000000000 +0000
@@ -25,8 +25,6 @@
 
 class nsACString;
 class nsCString;
-class nsString;
-class nsIURI;
 
 nsresult
 rdf_MakeRelativeRef(const nsCSubstring& aBaseURI, nsCString& aURI);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/certverifier/CNNICHashWhitelist.inc thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/certverifier/CNNICHashWhitelist.inc
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/certverifier/CNNICHashWhitelist.inc	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/certverifier/CNNICHashWhitelist.inc	2015-04-24 19:30:50.000000000 +0000
@@ -7,7 +7,7 @@
 // need to be manually edited.
 //***************************************************************************
 
-// This file may be removed after Mon Dec 07 2020 03:59:05 GMT-0800 (PST)
+// This file may be removed after Sun Feb 02 2020 21:45:13 GMT-0800 (PST)
 
 #define CNNIC_WHITELIST_HASH_LEN 32
 
@@ -61,14 +61,6 @@
       0xEF, 0x25, 0x25, 0x98, 0x71, 0xE4, 0x77, 0x42, 0xD4, 0x71, 0xE2, 0x6F, 0xF0, 0x75, 0xE9, 0xE9 },
   },
   {
-    { 0x01, 0xE6, 0x51, 0x3B, 0x55, 0x9C, 0x2D, 0xED, 0x46, 0xF1, 0x42, 0x83, 0x64, 0x54, 0x65, 0x9C,
-      0x98, 0x26, 0x09, 0xA2, 0x2C, 0x22, 0x7D, 0x8F, 0x7C, 0xA4, 0xDB, 0x9B, 0xC6, 0xE0, 0x16, 0x5B },
-  },
-  {
-    { 0x01, 0xE8, 0x7A, 0xF0, 0xC5, 0xB7, 0x40, 0xC8, 0xB1, 0xCC, 0xCA, 0x07, 0x19, 0x2A, 0x42, 0x84,
-      0x92, 0x3B, 0x3F, 0x27, 0x67, 0x2F, 0x6E, 0x1A, 0x64, 0xD7, 0xA6, 0x1D, 0xAC, 0x50, 0x36, 0x27 },
-  },
-  {
     { 0x01, 0xF1, 0x14, 0x28, 0x67, 0x99, 0xEA, 0x8B, 0x24, 0x08, 0xE3, 0xDA, 0xBE, 0x90, 0xF3, 0xAD,
       0xEA, 0x20, 0x46, 0x32, 0xAA, 0x3B, 0x82, 0xD2, 0xE5, 0x5A, 0x8D, 0xCF, 0x5B, 0x7E, 0xD7, 0xAD },
   },
@@ -189,10 +181,6 @@
       0xA6, 0xA0, 0x67, 0x70, 0x90, 0xCB, 0x02, 0x39, 0x9F, 0xFD, 0x88, 0x75, 0xB9, 0x05, 0xB1, 0x1F },
   },
   {
-    { 0x06, 0xBD, 0x40, 0xEC, 0xB1, 0x0D, 0xE1, 0x7D, 0x02, 0x2C, 0xDB, 0x42, 0x1F, 0xE9, 0x5A, 0x98,
-      0x19, 0x8C, 0x7D, 0x7E, 0xEF, 0x35, 0xA7, 0x5F, 0x0A, 0x70, 0x5F, 0xE1, 0x75, 0xFC, 0xD7, 0xD1 },
-  },
-  {
     { 0x06, 0xD4, 0x08, 0xFF, 0xA9, 0x93, 0xAF, 0x04, 0x45, 0x9C, 0x45, 0x67, 0x1A, 0xAB, 0xD8, 0x7E,
       0xF9, 0x2B, 0x85, 0x6B, 0x1B, 0x42, 0xC6, 0x7E, 0x00, 0x5E, 0xB4, 0xD2, 0x71, 0x58, 0xA8, 0x42 },
   },
@@ -217,10 +205,6 @@
       0x26, 0xE3, 0x4E, 0x51, 0x67, 0xEC, 0xF2, 0x11, 0x78, 0xF3, 0xEF, 0xBF, 0xB3, 0xA2, 0xBB, 0x72 },
   },
   {
-    { 0x07, 0xBD, 0x89, 0x6B, 0x04, 0xE1, 0xCE, 0xF0, 0x74, 0x05, 0x8F, 0xAD, 0xDF, 0x83, 0x29, 0xDF,
-      0x32, 0x77, 0x3F, 0xCC, 0x54, 0x37, 0x0A, 0xC8, 0xDA, 0x43, 0x13, 0x8F, 0x67, 0x7D, 0xCF, 0xD3 },
-  },
-  {
     { 0x07, 0xE9, 0x60, 0x9E, 0x05, 0xDC, 0x0A, 0x1E, 0x52, 0x15, 0x06, 0x49, 0xEB, 0xF4, 0x1F, 0x6D,
       0xE3, 0x86, 0x7C, 0x9C, 0x25, 0xFE, 0x17, 0x7B, 0xAB, 0xCF, 0xD9, 0xB3, 0x70, 0x46, 0x13, 0x8B },
   },
@@ -257,10 +241,6 @@
       0x25, 0xF6, 0x25, 0xF7, 0x1F, 0xF8, 0x9D, 0xB3, 0x9B, 0x32, 0x2A, 0xCB, 0x0C, 0x84, 0x57, 0x4F },
   },
   {
-    { 0x09, 0xA4, 0xF3, 0x29, 0xC2, 0x85, 0x4E, 0xBC, 0xFD, 0x80, 0x7B, 0xA5, 0x1E, 0x5D, 0x3E, 0xC5,
-      0xD5, 0x07, 0x23, 0x0C, 0x9B, 0x75, 0x8E, 0xDE, 0x05, 0x65, 0xD9, 0x3A, 0xAD, 0xF6, 0x6F, 0xA7 },
-  },
-  {
     { 0x09, 0xA5, 0x9E, 0x8B, 0x56, 0xFD, 0x2B, 0xA0, 0xAC, 0x68, 0x5C, 0xB6, 0xF7, 0x51, 0xA0, 0x2F,
       0x83, 0x5C, 0x68, 0x50, 0x81, 0xA2, 0xD5, 0xDC, 0x02, 0xB0, 0x4E, 0x9B, 0x3B, 0xC7, 0xC8, 0xBC },
   },
@@ -397,10 +377,6 @@
       0x29, 0xCA, 0x46, 0x5B, 0x19, 0x3F, 0xC2, 0xA6, 0xE1, 0x93, 0x28, 0x3A, 0xD8, 0xD7, 0xA5, 0x50 },
   },
   {
-    { 0x0F, 0x15, 0x1E, 0xAA, 0x90, 0x66, 0xED, 0xF0, 0x52, 0x12, 0x9D, 0x4B, 0x92, 0x64, 0xE5, 0x41,
-      0x6A, 0xFB, 0xB6, 0xA8, 0xB1, 0xE1, 0xB8, 0x04, 0xDA, 0x36, 0xA0, 0xE3, 0xF7, 0xA8, 0xFD, 0x72 },
-  },
-  {
     { 0x0F, 0x2C, 0x25, 0x7A, 0xFB, 0xE8, 0x25, 0x5D, 0x2D, 0x6F, 0x4D, 0x52, 0xC4, 0xE5, 0x31, 0x59,
       0xB7, 0xBA, 0x96, 0xF9, 0xBA, 0x07, 0xFA, 0x6D, 0x8C, 0xE1, 0xD0, 0xAC, 0x03, 0x3C, 0x17, 0xF7 },
   },
@@ -489,10 +465,6 @@
       0x94, 0xE5, 0xEE, 0x58, 0x59, 0xD8, 0xFD, 0x45, 0xE9, 0xE9, 0xC5, 0xA6, 0xC5, 0xC0, 0xA4, 0x13 },
   },
   {
-    { 0x13, 0x95, 0xC9, 0xBC, 0x47, 0x6C, 0x5F, 0x46, 0xB4, 0xE8, 0x88, 0x7C, 0xDC, 0x10, 0x29, 0x59,
-      0x42, 0xA7, 0x7A, 0x7F, 0x4C, 0x30, 0xD4, 0xEC, 0x2B, 0x9C, 0xA0, 0xFC, 0xAE, 0xE4, 0x4B, 0xB8 },
-  },
-  {
     { 0x13, 0xBD, 0x07, 0x7B, 0x8A, 0x9F, 0x46, 0xFF, 0x8F, 0x2F, 0xFD, 0x23, 0x6E, 0x53, 0xA7, 0x2C,
       0x3B, 0x87, 0xF3, 0x4C, 0xC9, 0xDB, 0xB5, 0x81, 0x7E, 0x4D, 0xBA, 0x1B, 0xD3, 0xBC, 0x9E, 0x5F },
   },
@@ -517,10 +489,6 @@
       0xD6, 0x31, 0xD7, 0x60, 0xE4, 0x51, 0xEF, 0x28, 0x29, 0xAF, 0xFB, 0xEE, 0x74, 0x80, 0xAD, 0x17 },
   },
   {
-    { 0x14, 0x4D, 0x0F, 0x73, 0x49, 0x66, 0xE5, 0x59, 0x64, 0x15, 0x7C, 0x3F, 0xC0, 0x82, 0x2B, 0x0B,
-      0xA9, 0xBE, 0xAF, 0x47, 0xAE, 0x07, 0x73, 0xE3, 0x5B, 0x7E, 0xB2, 0xE2, 0xAC, 0x2A, 0x1C, 0xC1 },
-  },
-  {
     { 0x14, 0x60, 0x80, 0x7B, 0x0D, 0x93, 0xDD, 0x79, 0xF4, 0xA3, 0xB9, 0x07, 0x45, 0xE9, 0xA7, 0x15,
       0x29, 0xF1, 0xEC, 0x26, 0x63, 0x30, 0x41, 0x57, 0x4A, 0x81, 0x80, 0xE0, 0xCE, 0x42, 0x81, 0xDF },
   },
@@ -605,10 +573,6 @@
       0xF0, 0x4D, 0xD3, 0x20, 0x35, 0xE4, 0xF1, 0x24, 0x28, 0xEC, 0x9E, 0x51, 0xED, 0xF6, 0xB0, 0x6C },
   },
   {
-    { 0x17, 0xAA, 0x88, 0x57, 0x00, 0x67, 0x47, 0x5D, 0x50, 0xBE, 0xED, 0x20, 0x78, 0x97, 0x85, 0x68,
-      0x38, 0x7C, 0xA2, 0x9C, 0xE3, 0x67, 0xC1, 0x5F, 0xEB, 0xC4, 0x5D, 0xE6, 0xA6, 0x62, 0x3E, 0xD7 },
-  },
-  {
     { 0x17, 0xD1, 0xF6, 0xE5, 0x1C, 0xB3, 0xAF, 0x91, 0x23, 0xD4, 0xFC, 0xB3, 0x84, 0x18, 0x39, 0x4D,
       0xE3, 0xE6, 0xC3, 0x33, 0x3F, 0x80, 0x20, 0xD5, 0x13, 0x48, 0xDE, 0xBA, 0xCC, 0x74, 0x70, 0x14 },
   },
@@ -637,10 +601,6 @@
       0x9C, 0x5C, 0x1F, 0x68, 0x0F, 0xF8, 0xF4, 0xEC, 0x0D, 0xF2, 0x3D, 0x84, 0x41, 0x92, 0xFB, 0x3B },
   },
   {
-    { 0x1A, 0x7E, 0xFE, 0xF2, 0xEC, 0xCF, 0xD9, 0x32, 0x9D, 0xA1, 0xCE, 0x7D, 0x9A, 0x35, 0xC0, 0x84,
-      0xC6, 0x23, 0xD9, 0x38, 0x52, 0x70, 0xB7, 0x35, 0x47, 0x3D, 0xF5, 0x77, 0x4F, 0x61, 0x6C, 0x1A },
-  },
-  {
     { 0x1A, 0x9E, 0xC6, 0x8C, 0xED, 0xB6, 0xBD, 0x94, 0x0C, 0x95, 0x34, 0xE6, 0x84, 0xBB, 0x04, 0x9F,
       0xF1, 0xE2, 0x3B, 0x66, 0xA1, 0x33, 0x01, 0x2F, 0xC3, 0x99, 0xEB, 0x4F, 0xB5, 0xD3, 0xAA, 0x35 },
   },
@@ -653,10 +613,6 @@
       0x6B, 0xEB, 0x00, 0x03, 0xFA, 0xC4, 0x9B, 0xCA, 0x74, 0xA1, 0xCC, 0x52, 0x09, 0xB7, 0x04, 0x39 },
   },
   {
-    { 0x1B, 0x31, 0xD6, 0x96, 0xC3, 0x97, 0x89, 0x58, 0x19, 0x50, 0xA8, 0xA4, 0xF8, 0x43, 0x3F, 0x49,
-      0x4A, 0xCD, 0x8F, 0x3E, 0xE3, 0xF4, 0xD9, 0x32, 0xBD, 0x89, 0xE3, 0x72, 0x95, 0x18, 0xC6, 0xC7 },
-  },
-  {
     { 0x1B, 0x56, 0xBA, 0x1E, 0xFF, 0xAC, 0x97, 0x36, 0x60, 0x74, 0xCE, 0x07, 0x24, 0xE7, 0x04, 0x59,
       0xDF, 0x99, 0x82, 0x1C, 0x3F, 0xAF, 0x20, 0xDE, 0x5C, 0x05, 0x30, 0x52, 0x52, 0xBE, 0x64, 0x3A },
   },
@@ -717,10 +673,6 @@
       0xDB, 0xD7, 0xA9, 0x0B, 0x2A, 0x71, 0xC8, 0x0A, 0x1D, 0xB1, 0x94, 0x6B, 0x89, 0x89, 0x1C, 0x46 },
   },
   {
-    { 0x1E, 0x63, 0xAB, 0x25, 0x1F, 0x3C, 0x17, 0x98, 0x21, 0x38, 0x0F, 0x5F, 0x76, 0xFD, 0x4D, 0x5E,
-      0xE9, 0xFC, 0x63, 0xBC, 0x28, 0x6A, 0x27, 0x32, 0x21, 0x89, 0x95, 0x4F, 0xF9, 0x29, 0x7A, 0x69 },
-  },
-  {
     { 0x1E, 0x78, 0xF8, 0x08, 0x84, 0xE3, 0x2A, 0x2E, 0xA5, 0xAD, 0x1E, 0xE8, 0x35, 0x88, 0xAC, 0xDB,
       0x18, 0x4A, 0x4A, 0x6E, 0x87, 0x56, 0x5B, 0xF5, 0x03, 0xB5, 0x69, 0x7A, 0xBF, 0xAE, 0x64, 0xA4 },
   },
@@ -821,14 +773,6 @@
       0x93, 0x07, 0xA4, 0x06, 0x2E, 0xDA, 0x97, 0xD4, 0xF6, 0xC4, 0x48, 0x1B, 0xB6, 0xEC, 0xA9, 0xE4 },
   },
   {
-    { 0x22, 0xAC, 0x75, 0x09, 0x72, 0x98, 0x12, 0xFF, 0xEC, 0x10, 0xC4, 0x0C, 0x73, 0xAB, 0x49, 0x0C,
-      0x02, 0x05, 0xDD, 0xFA, 0x3E, 0x23, 0x65, 0xBF, 0x89, 0xAE, 0xD7, 0x44, 0x8C, 0xB2, 0x3D, 0x14 },
-  },
-  {
-    { 0x22, 0xF6, 0xE5, 0x37, 0xDE, 0x06, 0x50, 0x56, 0xB3, 0x47, 0x65, 0xD9, 0x7E, 0xAE, 0x83, 0x6C,
-      0xB4, 0xED, 0x10, 0xBF, 0x1A, 0x11, 0x21, 0xC5, 0x5F, 0xE9, 0x63, 0xC8, 0x03, 0x61, 0x10, 0xE5 },
-  },
-  {
     { 0x23, 0x19, 0xCB, 0x3D, 0x58, 0xC6, 0xD5, 0x53, 0x62, 0x5D, 0xE5, 0xF4, 0x25, 0x2B, 0xF0, 0x29,
       0xAB, 0x83, 0x05, 0xEB, 0xF2, 0x2F, 0xA2, 0x3E, 0x99, 0x73, 0x04, 0x66, 0xDE, 0x24, 0xD6, 0xC3 },
   },
@@ -933,18 +877,10 @@
       0x11, 0x05, 0x8B, 0xA9, 0x67, 0xEE, 0xBD, 0x8D, 0x42, 0xEC, 0xB9, 0x27, 0xBF, 0x09, 0xF4, 0x40 },
   },
   {
-    { 0x28, 0x6C, 0x82, 0x73, 0x0B, 0xE9, 0xA2, 0xD8, 0x73, 0x9C, 0x3B, 0x9C, 0x60, 0x88, 0xC5, 0x0A,
-      0x53, 0x9C, 0x35, 0x3D, 0x7D, 0x2A, 0x26, 0x7A, 0x57, 0xC5, 0x6A, 0xF1, 0xF5, 0xA6, 0x38, 0x63 },
-  },
-  {
     { 0x28, 0x76, 0x00, 0xE8, 0x45, 0x25, 0xA9, 0xE2, 0xEF, 0xB3, 0xC3, 0x30, 0xD8, 0x0E, 0xC6, 0x0C,
       0x3F, 0x7D, 0x7B, 0xB2, 0x07, 0x89, 0x4E, 0xB6, 0xCD, 0x7B, 0x85, 0xEE, 0x74, 0xFF, 0x9A, 0x46 },
   },
   {
-    { 0x28, 0xAC, 0x35, 0x94, 0x44, 0x9F, 0x04, 0xFA, 0xCC, 0x45, 0x4C, 0x24, 0x56, 0x1F, 0x1A, 0x91,
-      0x22, 0x0E, 0x1E, 0xF7, 0x8E, 0x91, 0xEA, 0x84, 0x87, 0x06, 0xD2, 0xA0, 0xE1, 0x4D, 0x37, 0x13 },
-  },
-  {
     { 0x28, 0xC2, 0x4D, 0x7A, 0xEF, 0xCB, 0xA0, 0x50, 0x94, 0x94, 0xEF, 0x21, 0x06, 0x48, 0x17, 0xFB,
       0xAA, 0x89, 0x1F, 0xB3, 0xC5, 0x2F, 0xC7, 0x17, 0x81, 0xDD, 0x5E, 0xAC, 0x18, 0xD7, 0x4D, 0x7A },
   },
@@ -1113,14 +1049,6 @@
       0xB8, 0x6F, 0x5E, 0x27, 0x5D, 0x67, 0x94, 0xA6, 0xDB, 0xBA, 0xA3, 0x21, 0x32, 0x3E, 0xD8, 0xB7 },
   },
   {
-    { 0x30, 0x6E, 0x9B, 0x31, 0x27, 0x81, 0xAA, 0x1A, 0xAD, 0xBD, 0x47, 0x38, 0x0C, 0xFB, 0x7D, 0x12,
-      0x79, 0x86, 0x16, 0xF0, 0xE8, 0x9B, 0xF3, 0xFC, 0xD2, 0xA1, 0xD0, 0x60, 0xFD, 0x17, 0xD9, 0xBF },
-  },
-  {
-    { 0x30, 0x70, 0x26, 0x42, 0x91, 0xE2, 0x0D, 0x0A, 0x2A, 0x83, 0x99, 0x6D, 0xAB, 0xC5, 0x40, 0x93,
-      0x8D, 0x96, 0xB2, 0xC6, 0x28, 0x2A, 0x61, 0xAC, 0x4F, 0xAB, 0xC0, 0x2E, 0x55, 0x17, 0xD3, 0x17 },
-  },
-  {
     { 0x30, 0x7B, 0x09, 0x34, 0xEF, 0x97, 0x85, 0xE7, 0x08, 0xED, 0x48, 0x1A, 0x99, 0x7A, 0x8A, 0x88,
       0xB7, 0xBF, 0x22, 0xDD, 0x26, 0xAA, 0x17, 0x17, 0x31, 0xB8, 0xF7, 0xE0, 0xD5, 0x97, 0xB7, 0x08 },
   },
@@ -1177,14 +1105,6 @@
       0x01, 0xF9, 0xE5, 0x2E, 0x4C, 0x24, 0x7A, 0x5E, 0x49, 0xA1, 0xF1, 0x44, 0x59, 0x9A, 0x5A, 0x79 },
   },
   {
-    { 0x33, 0x67, 0xE1, 0x1C, 0xF4, 0xD5, 0xA9, 0x20, 0x65, 0x3F, 0x8C, 0x14, 0xF8, 0xBB, 0x69, 0xD7,
-      0x2D, 0xC9, 0x49, 0xB5, 0x33, 0x65, 0xC8, 0x0E, 0xD3, 0xF8, 0xFC, 0x2E, 0x39, 0x75, 0x5C, 0xBF },
-  },
-  {
-    { 0x33, 0xC7, 0x0C, 0x8E, 0x31, 0xF2, 0x13, 0xF7, 0xCB, 0x15, 0xEF, 0x82, 0xD2, 0x2A, 0x61, 0xEB,
-      0xBB, 0xB1, 0x93, 0x8C, 0xA8, 0xEE, 0x15, 0x93, 0x74, 0xEE, 0x2C, 0x70, 0xD6, 0x51, 0xE6, 0xD7 },
-  },
-  {
     { 0x33, 0xC9, 0x15, 0x03, 0xBC, 0x7E, 0xBE, 0x5A, 0x5D, 0xD0, 0xCF, 0xBB, 0x37, 0x52, 0x64, 0xDD,
       0x5A, 0x31, 0x1E, 0x48, 0xF4, 0x26, 0x6B, 0x32, 0x50, 0x8A, 0x02, 0x5D, 0x04, 0xFA, 0xDF, 0x38 },
   },
@@ -1221,10 +1141,6 @@
       0x7C, 0x6B, 0x5C, 0x6B, 0x40, 0xCF, 0xFC, 0x7B, 0x67, 0x80, 0x92, 0x65, 0x1F, 0x06, 0x87, 0xC1 },
   },
   {
-    { 0x35, 0x72, 0x49, 0x21, 0x62, 0x72, 0x7D, 0x81, 0x1A, 0xFA, 0xEE, 0xC1, 0x3B, 0xC4, 0x59, 0xBE,
-      0x04, 0xDB, 0xE7, 0xC0, 0xF4, 0x84, 0xE2, 0x74, 0x8E, 0x45, 0xF9, 0xEB, 0x78, 0x70, 0xFD, 0x94 },
-  },
-  {
     { 0x35, 0x98, 0x10, 0xFF, 0xFE, 0xD1, 0x3A, 0x2C, 0x25, 0xCD, 0x91, 0xFC, 0xF0, 0x85, 0x59, 0x33,
       0xC9, 0x94, 0xA9, 0xDF, 0xC9, 0x39, 0x2D, 0x97, 0x07, 0xC3, 0xC0, 0xE7, 0x30, 0x0F, 0x90, 0x8D },
   },
@@ -1237,10 +1153,6 @@
       0x55, 0xB7, 0x30, 0xAE, 0xF8, 0xEF, 0x9C, 0x71, 0x5D, 0x7D, 0x9F, 0xB4, 0x7F, 0xDF, 0x33, 0xAD },
   },
   {
-    { 0x36, 0x7D, 0xAB, 0xAD, 0x69, 0x08, 0xE1, 0x02, 0xDE, 0x00, 0x71, 0xAD, 0xF6, 0x72, 0x42, 0x10,
-      0xA3, 0x20, 0x4C, 0x0E, 0x65, 0xEB, 0xB1, 0x3C, 0xBE, 0x02, 0x87, 0x89, 0x0D, 0xDE, 0x6B, 0x66 },
-  },
-  {
     { 0x36, 0xB4, 0xFE, 0x74, 0x3B, 0x6D, 0xF4, 0x4A, 0x71, 0x3E, 0x91, 0x4C, 0xAB, 0xFB, 0xF2, 0xBE,
       0x60, 0x24, 0x9B, 0x46, 0x43, 0x4D, 0x04, 0x43, 0x59, 0x12, 0x5A, 0x10, 0x6A, 0x37, 0xEB, 0x1C },
   },
@@ -1253,10 +1165,6 @@
       0x5E, 0xD3, 0xB2, 0xFE, 0xC7, 0xAC, 0x0A, 0x09, 0x7B, 0x74, 0xC5, 0x72, 0xBB, 0xCD, 0xA8, 0xD7 },
   },
   {
-    { 0x37, 0x29, 0x7E, 0xC6, 0x8C, 0xE3, 0x6A, 0x8F, 0xFD, 0x31, 0x26, 0x71, 0xA3, 0x7E, 0xFA, 0x52,
-      0x87, 0x43, 0xB0, 0x9D, 0x7F, 0xE2, 0x6B, 0xD4, 0x69, 0x38, 0x30, 0xA4, 0x39, 0x53, 0x81, 0x76 },
-  },
-  {
     { 0x37, 0x87, 0x37, 0xCD, 0x85, 0x19, 0xBA, 0xC5, 0x32, 0x2F, 0xDB, 0x28, 0xF4, 0x4A, 0x43, 0xC5,
       0x09, 0xA5, 0x44, 0x7A, 0xD2, 0x68, 0x3B, 0xA1, 0x90, 0x05, 0xE3, 0x1B, 0x0D, 0x54, 0x8C, 0x6D },
   },
@@ -1337,10 +1245,6 @@
       0xDF, 0x41, 0xD8, 0x5D, 0x56, 0xEB, 0xC9, 0x8C, 0x3C, 0xAA, 0xDD, 0x4B, 0xAA, 0x3D, 0x57, 0xF9 },
   },
   {
-    { 0x3A, 0x3C, 0x9B, 0xB0, 0xF4, 0xED, 0x43, 0x47, 0x17, 0xE9, 0xEB, 0x16, 0x46, 0x31, 0xBB, 0x5B,
-      0x04, 0x7D, 0x44, 0xAC, 0xE9, 0x4C, 0x63, 0x1E, 0x87, 0xC1, 0xDB, 0xBF, 0xA7, 0x22, 0x85, 0x24 },
-  },
-  {
     { 0x3A, 0xB9, 0x0F, 0xFD, 0x22, 0x10, 0xEB, 0x89, 0x9C, 0x6F, 0xB7, 0xFD, 0x26, 0x8D, 0xE0, 0x0B,
       0x00, 0x9F, 0x50, 0xE8, 0x18, 0x70, 0xA2, 0x20, 0xFF, 0xAE, 0xA2, 0x4E, 0x41, 0x76, 0xDE, 0x45 },
   },
@@ -1389,10 +1293,6 @@
       0x5C, 0xA1, 0x85, 0x0C, 0x82, 0x02, 0x69, 0xD7, 0xB2, 0xC8, 0xEC, 0xD0, 0x54, 0x3A, 0x61, 0x65 },
   },
   {
-    { 0x3D, 0x6C, 0xBB, 0x38, 0xEE, 0x3F, 0x39, 0x10, 0x10, 0x23, 0x42, 0x24, 0x53, 0xC1, 0x81, 0x5F,
-      0xD0, 0xAA, 0x9F, 0xE5, 0xD8, 0x4F, 0xDE, 0x3C, 0x9E, 0x7F, 0x08, 0x24, 0xE7, 0x09, 0x90, 0xF5 },
-  },
-  {
     { 0x3D, 0x77, 0xB1, 0xCC, 0x1C, 0x46, 0xF8, 0x58, 0x03, 0x50, 0x53, 0x33, 0xCA, 0x8D, 0xE4, 0x77,
       0x71, 0xDD, 0xE8, 0x94, 0x4A, 0x51, 0x4E, 0xF4, 0x47, 0x08, 0xBF, 0x0E, 0xA6, 0x27, 0x58, 0x50 },
   },
@@ -1481,10 +1381,6 @@
       0xC9, 0x11, 0xFD, 0x8E, 0xD5, 0x41, 0x90, 0x0F, 0x9E, 0x20, 0x36, 0x08, 0xEE, 0xA3, 0x59, 0x2D },
   },
   {
-    { 0x41, 0x54, 0x1F, 0xCA, 0x59, 0x7F, 0x1A, 0xCA, 0xD6, 0x05, 0xA0, 0x2F, 0xAA, 0x4A, 0x72, 0x53,
-      0x71, 0xCC, 0xD7, 0xDE, 0xA4, 0x5D, 0x3F, 0x87, 0x24, 0x38, 0x50, 0x5F, 0x60, 0xB4, 0xB0, 0xE3 },
-  },
-  {
     { 0x41, 0x88, 0x71, 0x80, 0x7E, 0xDC, 0xED, 0xA8, 0x57, 0xD7, 0xE8, 0x48, 0x31, 0x71, 0x81, 0xE1,
       0xE8, 0x33, 0xF5, 0x4C, 0x89, 0xA6, 0x11, 0xA2, 0x30, 0xAD, 0x99, 0x06, 0x5D, 0x45, 0x86, 0x95 },
   },
@@ -1601,10 +1497,6 @@
       0x98, 0xFD, 0x0E, 0xDC, 0x7F, 0x97, 0xA0, 0x31, 0x3A, 0x3B, 0x13, 0x86, 0x27, 0x8D, 0xDB, 0x08 },
   },
   {
-    { 0x45, 0xE0, 0xDE, 0x5C, 0xF8, 0x94, 0xBE, 0x8B, 0xEB, 0xBB, 0xD9, 0x2E, 0xC8, 0x8E, 0x9A, 0x4A,
-      0x33, 0x9E, 0x43, 0x2C, 0x65, 0x73, 0x0B, 0x5E, 0xEB, 0x47, 0xA3, 0x71, 0xEB, 0xEA, 0xF2, 0x72 },
-  },
-  {
     { 0x45, 0xE9, 0xCF, 0x0A, 0xF0, 0x43, 0xA3, 0xC2, 0xBB, 0x74, 0xD4, 0x63, 0x66, 0x93, 0x1C, 0x3D,
       0xFC, 0xA5, 0x3D, 0x36, 0x26, 0x64, 0x37, 0xD2, 0xA9, 0x46, 0x84, 0xFE, 0xE9, 0x4E, 0x0C, 0x0D },
   },
@@ -1681,10 +1573,6 @@
       0x3E, 0xB1, 0x26, 0x27, 0x0E, 0x00, 0xD3, 0x22, 0xF0, 0x95, 0xEC, 0xBA, 0x13, 0x06, 0x88, 0x8C },
   },
   {
-    { 0x49, 0x78, 0xE7, 0xA2, 0x60, 0x52, 0x6F, 0x9B, 0x71, 0xBE, 0x02, 0x0A, 0x6C, 0xD4, 0x8B, 0x4E,
-      0x7B, 0xB9, 0x4E, 0x52, 0x37, 0xE4, 0x0A, 0xD3, 0xC6, 0xD7, 0x27, 0x4F, 0x4A, 0x10, 0x4E, 0x9D },
-  },
-  {
     { 0x49, 0xDC, 0xF8, 0xFA, 0x68, 0xE9, 0x2B, 0x5C, 0x21, 0xFE, 0xF9, 0x3D, 0x26, 0x0C, 0x24, 0x8C,
       0xE3, 0xBE, 0x98, 0x62, 0x68, 0x68, 0xE7, 0x5A, 0x3F, 0x63, 0x34, 0xBB, 0x7D, 0xC1, 0x81, 0xEC },
   },
@@ -1721,10 +1609,6 @@
       0x9E, 0xFC, 0xBF, 0xFD, 0x4B, 0xF4, 0xB7, 0x24, 0x83, 0xFA, 0xA7, 0xC7, 0x45, 0x1D, 0xFD, 0x42 },
   },
   {
-    { 0x4A, 0xCF, 0xEC, 0x1E, 0x40, 0xB0, 0x94, 0x5D, 0x09, 0xF1, 0x12, 0x1B, 0x37, 0x93, 0x29, 0x85,
-      0xB5, 0x9D, 0xBF, 0xD9, 0xDA, 0x38, 0x23, 0xC0, 0x08, 0x2F, 0x97, 0x90, 0xC6, 0x45, 0x29, 0xC4 },
-  },
-  {
     { 0x4A, 0xD2, 0x17, 0xA9, 0x6E, 0x15, 0x30, 0xCB, 0xC5, 0xDE, 0xB8, 0x6A, 0xFF, 0x27, 0x63, 0x55,
       0x23, 0x59, 0xDA, 0x5B, 0x59, 0x82, 0xE5, 0x38, 0xBA, 0xB7, 0xC9, 0x2A, 0x15, 0x9C, 0xB8, 0x3C },
   },
@@ -1845,14 +1729,6 @@
       0x7E, 0x97, 0xDD, 0xA8, 0x9E, 0xF9, 0xA4, 0xB0, 0x61, 0x17, 0xB4, 0xE9, 0x75, 0xE1, 0xC5, 0x50 },
   },
   {
-    { 0x4E, 0x8D, 0x48, 0x1B, 0x04, 0x40, 0x68, 0xF3, 0xBA, 0xB5, 0x73, 0xE3, 0x69, 0x8F, 0xB1, 0xCD,
-      0x61, 0xC1, 0xB5, 0x3B, 0x5F, 0xC3, 0x64, 0xE2, 0xF7, 0xD0, 0x7D, 0xEF, 0xF5, 0xE4, 0x92, 0xFB },
-  },
-  {
-    { 0x4E, 0xCB, 0xC0, 0xD8, 0xC7, 0x5A, 0x3C, 0xA8, 0xB3, 0xF6, 0x83, 0x0A, 0x66, 0xC1, 0x2E, 0x4A,
-      0x45, 0xA9, 0x88, 0xD7, 0x49, 0x27, 0xD5, 0xAF, 0xD8, 0xAA, 0x25, 0xC8, 0xEB, 0xCD, 0xBA, 0xF8 },
-  },
-  {
     { 0x4E, 0xF1, 0x31, 0x9C, 0x31, 0x26, 0xF0, 0x22, 0xAD, 0x27, 0xE5, 0xC4, 0x1A, 0x6C, 0x03, 0xFE,
       0x93, 0x05, 0x70, 0x7B, 0xF2, 0x02, 0x9A, 0xF3, 0x7F, 0x9F, 0x89, 0xE0, 0xF2, 0x5A, 0x93, 0x1C },
   },
@@ -1893,10 +1769,6 @@
       0x49, 0xCD, 0x9F, 0xF3, 0x60, 0x49, 0xF3, 0xD8, 0xA0, 0xB2, 0xD2, 0x92, 0x23, 0xF7, 0x91, 0x38 },
   },
   {
-    { 0x50, 0x2E, 0xCD, 0x60, 0xA8, 0xE1, 0xA9, 0x43, 0xA8, 0x10, 0xDB, 0x1E, 0x99, 0xDE, 0x3A, 0x1E,
-      0x8C, 0x63, 0xB6, 0x14, 0x93, 0x65, 0x4B, 0x4F, 0x93, 0x80, 0xC5, 0x05, 0x65, 0xF3, 0xB9, 0xD7 },
-  },
-  {
     { 0x50, 0x30, 0x55, 0x80, 0x8F, 0x4C, 0x49, 0xCF, 0xFC, 0xDE, 0x02, 0x27, 0x3C, 0x13, 0x16, 0x38,
       0xF4, 0x3D, 0x38, 0x56, 0x13, 0xE0, 0x73, 0x3D, 0xB4, 0x5F, 0xBD, 0x2A, 0x29, 0x11, 0xD6, 0xE4 },
   },
@@ -1909,10 +1781,6 @@
       0x20, 0xE0, 0x24, 0xE0, 0x87, 0xAE, 0x5E, 0xB0, 0xCC, 0x8A, 0xA2, 0x6F, 0xBE, 0xD9, 0xD9, 0x85 },
   },
   {
-    { 0x50, 0xB4, 0x50, 0x0B, 0x2D, 0x34, 0xBB, 0xCC, 0x28, 0x61, 0x22, 0x70, 0x73, 0x31, 0xE2, 0x51,
-      0xE2, 0x4D, 0x4F, 0xE5, 0xF5, 0xAA, 0xD8, 0xE5, 0xF2, 0xDF, 0xF4, 0xF0, 0x11, 0x3C, 0xA4, 0x1D },
-  },
-  {
     { 0x50, 0xF4, 0x78, 0x1E, 0xB1, 0xC1, 0x46, 0x70, 0xD9, 0xA5, 0x52, 0xC3, 0x49, 0x5F, 0xB9, 0xF6,
       0xAE, 0x86, 0x8A, 0xB1, 0xC9, 0xD9, 0x83, 0xE0, 0x82, 0x68, 0x65, 0xA1, 0x02, 0xEC, 0xA6, 0xD3 },
   },
@@ -1933,10 +1801,6 @@
       0xFB, 0xD8, 0x44, 0x5A, 0xA7, 0xBB, 0xD2, 0x29, 0xDF, 0xC7, 0x1A, 0x90, 0x4F, 0x55, 0xAE, 0xB4 },
   },
   {
-    { 0x51, 0xB9, 0x8E, 0x9A, 0x7E, 0x9C, 0xCC, 0xB9, 0x61, 0x97, 0x83, 0x37, 0xA3, 0xFA, 0x55, 0x78,
-      0x7A, 0xED, 0xA7, 0x0B, 0xDD, 0x92, 0x75, 0xBC, 0x4F, 0xAA, 0xB9, 0xDC, 0x77, 0x6D, 0xFA, 0x1D },
-  },
-  {
     { 0x51, 0xC5, 0x2A, 0x80, 0xBC, 0x2E, 0x24, 0xFB, 0x47, 0x1F, 0xE4, 0x5E, 0x78, 0xCF, 0x01, 0x84,
       0xE0, 0xC4, 0x67, 0x0E, 0x20, 0xE6, 0xCA, 0xDA, 0x20, 0xBD, 0xF9, 0x6E, 0x2D, 0x71, 0x20, 0xF7 },
   },
@@ -2013,10 +1877,6 @@
       0xF4, 0x26, 0x2A, 0xB5, 0x3F, 0x7B, 0xC9, 0xF1, 0x8B, 0xB6, 0xD7, 0xEB, 0x3E, 0x16, 0x28, 0xDE },
   },
   {
-    { 0x55, 0x8B, 0xEB, 0x1A, 0x5F, 0x0F, 0xD9, 0xFA, 0x2C, 0xA4, 0xB8, 0xCF, 0x1B, 0x35, 0x6A, 0x2C,
-      0x42, 0xF4, 0x90, 0x91, 0x8C, 0xF6, 0xD1, 0x8E, 0xF9, 0xD0, 0x66, 0xFA, 0x39, 0x86, 0x39, 0x7E },
-  },
-  {
     { 0x55, 0xB2, 0x84, 0x5F, 0x48, 0x44, 0xA7, 0x72, 0x46, 0x36, 0x41, 0x78, 0xA1, 0x71, 0xC2, 0x26,
       0xFC, 0xFD, 0x75, 0xC7, 0x63, 0xBA, 0xD0, 0x87, 0xF6, 0x02, 0xE7, 0xB4, 0xAC, 0xD9, 0xEC, 0xB3 },
   },
@@ -2025,18 +1885,6 @@
       0xC2, 0x1D, 0x39, 0xD6, 0xE1, 0xF5, 0xE8, 0xED, 0x37, 0xB9, 0x3F, 0xA6, 0x1D, 0x88, 0x35, 0x16 },
   },
   {
-    { 0x55, 0xDF, 0xA5, 0x99, 0xAE, 0xA8, 0x6D, 0x0C, 0x2B, 0x85, 0xF8, 0x3C, 0x54, 0xB2, 0xCF, 0xFD,
-      0x77, 0xD2, 0xA7, 0xC6, 0x87, 0xD4, 0xC1, 0xCC, 0xAE, 0xFD, 0xFC, 0x38, 0x66, 0x2A, 0x27, 0x02 },
-  },
-  {
-    { 0x55, 0xE8, 0xD6, 0xC4, 0x1B, 0x9D, 0x45, 0x60, 0x90, 0x7B, 0xB7, 0x67, 0xB6, 0x7E, 0x8B, 0x0A,
-      0x82, 0xA4, 0xD5, 0x33, 0x40, 0x40, 0xB3, 0x03, 0xDD, 0xCD, 0xB3, 0xA3, 0x85, 0xD3, 0x11, 0x0E },
-  },
-  {
-    { 0x56, 0x12, 0xF4, 0x54, 0x4B, 0xCB, 0x7F, 0xB5, 0x5E, 0xBD, 0xF2, 0xB0, 0xDB, 0x04, 0x13, 0xC3,
-      0xD7, 0x12, 0xC8, 0x94, 0xB4, 0xCD, 0xD1, 0x3F, 0x2D, 0x7B, 0x4B, 0x3C, 0xC6, 0xCE, 0x8F, 0xB1 },
-  },
-  {
     { 0x56, 0x65, 0xC2, 0xE5, 0x64, 0x33, 0x29, 0x85, 0xB8, 0xD2, 0xC4, 0xFB, 0x61, 0x14, 0x57, 0xD8,
       0xD5, 0x65, 0x9A, 0xE0, 0x05, 0x87, 0x4C, 0x6F, 0x30, 0x34, 0xD2, 0x9F, 0x2A, 0x9A, 0x78, 0x32 },
   },
@@ -2077,10 +1925,6 @@
       0x36, 0x86, 0xB2, 0xD8, 0x0E, 0x73, 0x21, 0x9F, 0x07, 0x96, 0xEB, 0x8F, 0x0F, 0x79, 0x59, 0x09 },
   },
   {
-    { 0x59, 0x14, 0x29, 0x28, 0x02, 0x25, 0x0C, 0x8C, 0x2C, 0x26, 0xF7, 0x22, 0xD8, 0x50, 0xD1, 0x4D,
-      0x8D, 0xDC, 0x6C, 0xCF, 0x8A, 0xF0, 0x1E, 0x0A, 0x93, 0x29, 0x57, 0xB8, 0xB5, 0xDA, 0x85, 0xA6 },
-  },
-  {
     { 0x59, 0x3F, 0x23, 0x88, 0x0B, 0x59, 0xED, 0x5A, 0xA4, 0x8A, 0x2D, 0xB5, 0x01, 0x44, 0xFC, 0x8E,
       0xAB, 0xB7, 0xB5, 0x35, 0xA6, 0x2A, 0x61, 0x7B, 0x28, 0x82, 0xB8, 0x5D, 0xCF, 0x50, 0xB8, 0x02 },
   },
@@ -2089,10 +1933,6 @@
       0x91, 0xBC, 0x6C, 0x00, 0xC2, 0xE5, 0x0C, 0x35, 0xF0, 0x5F, 0xCF, 0xF5, 0x27, 0x68, 0xC7, 0x37 },
   },
   {
-    { 0x59, 0x9D, 0x4C, 0x70, 0x65, 0x4C, 0x7D, 0xEE, 0x9C, 0xB1, 0xBC, 0xF5, 0xE0, 0xE5, 0x1D, 0xBF,
-      0x19, 0xAB, 0xEA, 0x12, 0x9B, 0x96, 0x6B, 0xFE, 0xE4, 0xF1, 0xDF, 0x71, 0x53, 0xA7, 0xDB, 0x48 },
-  },
-  {
     { 0x59, 0xC9, 0xE8, 0xDF, 0x03, 0x0B, 0x1C, 0xD5, 0x89, 0xA8, 0xB3, 0x4F, 0xE7, 0x42, 0x51, 0xEA,
       0xD5, 0xA5, 0xFB, 0xE9, 0xE6, 0x13, 0x67, 0xCA, 0x76, 0xAF, 0xD9, 0xDD, 0xD9, 0xC6, 0xF1, 0x6F },
   },
@@ -2169,10 +2009,6 @@
       0x63, 0xE3, 0x37, 0xD1, 0x4D, 0xF0, 0x64, 0xC5, 0x7A, 0x23, 0x52, 0x83, 0x42, 0x16, 0x1C, 0x68 },
   },
   {
-    { 0x5B, 0x76, 0x2B, 0xD5, 0x17, 0x6D, 0x76, 0x1A, 0x84, 0xAB, 0x1B, 0x74, 0x61, 0xA2, 0x77, 0x9D,
-      0x40, 0x3B, 0xA4, 0x4C, 0x0A, 0xC1, 0xF2, 0xC0, 0x1E, 0x3A, 0x7A, 0x2B, 0x0B, 0x7F, 0x2F, 0xAB },
-  },
-  {
     { 0x5C, 0x06, 0x2F, 0x0D, 0x7E, 0x21, 0x91, 0xDF, 0xC1, 0x60, 0xE4, 0xC0, 0x59, 0xAE, 0xD4, 0xD1,
       0x83, 0xBD, 0x2D, 0x0F, 0x40, 0x98, 0x3D, 0x03, 0xB4, 0xE8, 0xDA, 0xA1, 0x1F, 0xF5, 0xE8, 0x95 },
   },
@@ -2185,10 +2021,6 @@
       0xAA, 0xFB, 0x43, 0x56, 0xC5, 0x60, 0xC9, 0x9E, 0xDF, 0xF0, 0x74, 0xDA, 0x04, 0xAF, 0x65, 0x7C },
   },
   {
-    { 0x5C, 0xA9, 0x15, 0xB4, 0xF4, 0xA7, 0x47, 0x1A, 0xB6, 0xCE, 0x13, 0x32, 0x36, 0x63, 0xC3, 0xD2,
-      0x00, 0x3A, 0x1D, 0x39, 0x06, 0x32, 0x35, 0xA8, 0x41, 0x6B, 0xA7, 0x17, 0xDF, 0xEC, 0xE1, 0xD3 },
-  },
-  {
     { 0x5C, 0xD2, 0x44, 0x6A, 0x8E, 0x4A, 0x0F, 0xA7, 0xE3, 0xCD, 0xF8, 0x00, 0x5D, 0xED, 0xCE, 0xBA,
       0xE9, 0xE6, 0x81, 0x9A, 0x8A, 0x69, 0x87, 0x31, 0x55, 0x5B, 0x7D, 0xC9, 0xD0, 0xA2, 0x3F, 0xC0 },
   },
@@ -2197,10 +2029,6 @@
       0x69, 0x6E, 0xCE, 0x16, 0x7F, 0xE6, 0xC6, 0x0A, 0x05, 0x16, 0x8B, 0xE4, 0x39, 0x19, 0xC8, 0x0F },
   },
   {
-    { 0x5C, 0xED, 0xE9, 0x0B, 0xC0, 0x72, 0x74, 0xEF, 0x95, 0x0B, 0x5F, 0x39, 0x6B, 0x5E, 0xC3, 0x37,
-      0x6F, 0x87, 0x57, 0xBB, 0x29, 0x21, 0x50, 0x51, 0xD1, 0x1E, 0xB9, 0x32, 0x44, 0x09, 0x7B, 0xFB },
-  },
-  {
     { 0x5D, 0x01, 0x5E, 0x1F, 0xF4, 0x40, 0xD8, 0x3E, 0x1E, 0x1C, 0xE0, 0x99, 0x9C, 0x42, 0x6C, 0xED,
       0xD8, 0x75, 0xEE, 0x22, 0x6F, 0x79, 0xA6, 0xD6, 0xB8, 0xFB, 0xBF, 0x14, 0x6A, 0x43, 0xF4, 0x2D },
   },
@@ -2273,10 +2101,6 @@
       0x54, 0x71, 0xAE, 0xE8, 0x7C, 0xA1, 0x58, 0x03, 0x5D, 0x66, 0x79, 0x47, 0x83, 0x5E, 0xA8, 0xBF },
   },
   {
-    { 0x61, 0x43, 0x0E, 0xCC, 0x50, 0xB2, 0x22, 0xA2, 0x83, 0x1C, 0x91, 0x7F, 0x7C, 0x4D, 0x12, 0x2A,
-      0xA0, 0x9C, 0xDD, 0x98, 0xDF, 0x3B, 0x27, 0x45, 0x7A, 0x5E, 0x39, 0x51, 0x05, 0x9D, 0x13, 0x5D },
-  },
-  {
     { 0x61, 0x65, 0xFD, 0x7A, 0x3D, 0xCB, 0x29, 0xAD, 0x23, 0xCC, 0x44, 0x64, 0x4F, 0xC2, 0x23, 0x25,
       0x94, 0x5D, 0xDF, 0xED, 0x0C, 0x18, 0xB3, 0x5B, 0x17, 0x43, 0xAD, 0x96, 0x28, 0x43, 0x69, 0xBE },
   },
@@ -2289,14 +2113,6 @@
       0xEA, 0xCA, 0x4D, 0x82, 0x8A, 0x53, 0xD9, 0x23, 0xE7, 0x0B, 0xFB, 0xC7, 0x25, 0x4A, 0xC7, 0x70 },
   },
   {
-    { 0x61, 0xB7, 0x05, 0x54, 0x6F, 0xCD, 0xDE, 0xAB, 0xEF, 0x73, 0x85, 0xC8, 0x6C, 0xFA, 0x4C, 0x05,
-      0x80, 0x97, 0x4A, 0x22, 0x35, 0x3D, 0xAC, 0x6C, 0x72, 0x31, 0xC3, 0x4F, 0xA7, 0x93, 0x05, 0xFC },
-  },
-  {
-    { 0x61, 0xB7, 0x4E, 0x51, 0x36, 0x2F, 0x33, 0x4E, 0x57, 0x14, 0xC8, 0x2C, 0x3B, 0x4C, 0x3F, 0x82,
-      0x1D, 0x9C, 0x07, 0x90, 0x5E, 0x69, 0x89, 0xB2, 0x0F, 0xD3, 0x86, 0xAE, 0x2A, 0xDD, 0x54, 0xE1 },
-  },
-  {
     { 0x61, 0xC8, 0xF2, 0xE2, 0x97, 0xD0, 0x51, 0x91, 0x32, 0x07, 0xEF, 0x02, 0x93, 0x63, 0xB8, 0xE7,
       0x33, 0x7A, 0x39, 0x6E, 0x09, 0x9C, 0xA9, 0xDC, 0xF8, 0x07, 0x33, 0x97, 0x32, 0x66, 0x4B, 0x74 },
   },
@@ -2349,10 +2165,6 @@
       0x60, 0xC6, 0x61, 0x7C, 0x60, 0x3B, 0x7D, 0x96, 0x72, 0xA6, 0x2C, 0xA1, 0x40, 0xA6, 0xDA, 0x6A },
   },
   {
-    { 0x65, 0x41, 0x6D, 0x52, 0xB7, 0x81, 0xE2, 0xA5, 0x2D, 0xF6, 0x5C, 0x32, 0x7C, 0x0E, 0xCF, 0x64,
-      0x5C, 0xA3, 0x58, 0x35, 0x13, 0x31, 0xC6, 0x04, 0x47, 0xB2, 0x65, 0xE4, 0xC7, 0xD0, 0x46, 0xA7 },
-  },
-  {
     { 0x65, 0x66, 0x00, 0xA4, 0x5E, 0x45, 0x6A, 0xBA, 0x5B, 0x00, 0x8D, 0x87, 0x91, 0x54, 0xB7, 0x69,
       0x0D, 0x7F, 0x27, 0x31, 0x02, 0x09, 0x7D, 0x8F, 0xD8, 0xC3, 0xDE, 0xAB, 0x30, 0xD8, 0x4A, 0xB2 },
   },
@@ -2413,10 +2225,6 @@
       0x93, 0x27, 0x3D, 0x35, 0x69, 0x88, 0x80, 0x84, 0x26, 0xF5, 0xDD, 0x2E, 0xD4, 0x8B, 0xBF, 0x49 },
   },
   {
-    { 0x68, 0x5B, 0xE8, 0x7D, 0x49, 0xCF, 0xC9, 0xF7, 0x3B, 0xB4, 0x81, 0x26, 0xFE, 0x9C, 0xB5, 0x7C,
-      0x22, 0x54, 0xD2, 0xB6, 0x7F, 0x9C, 0x6C, 0x20, 0x9E, 0x1C, 0x50, 0xA3, 0x11, 0xD0, 0xDB, 0x13 },
-  },
-  {
     { 0x68, 0x6E, 0xA9, 0xA7, 0x73, 0x2C, 0x5A, 0x6E, 0xDC, 0xA8, 0x44, 0xA6, 0x1F, 0x9D, 0xFD, 0x05,
       0xAC, 0x2F, 0x80, 0xF6, 0xC7, 0xED, 0x5E, 0xDF, 0x19, 0x9B, 0x8B, 0xD2, 0x78, 0x5D, 0x92, 0xFC },
   },
@@ -2449,10 +2257,6 @@
       0x55, 0xF6, 0x9D, 0x46, 0x26, 0x39, 0xD3, 0xD9, 0x23, 0xFF, 0x93, 0x91, 0x90, 0x1B, 0x6C, 0x92 },
   },
   {
-    { 0x69, 0x5D, 0xBC, 0x95, 0x9C, 0x38, 0x8D, 0x6F, 0x30, 0xDD, 0x9A, 0xD5, 0x2E, 0x54, 0x02, 0x94,
-      0x7D, 0x34, 0x5D, 0x19, 0x40, 0x8B, 0xD1, 0xD3, 0xDE, 0x1C, 0xF5, 0x9A, 0x6F, 0x97, 0x1F, 0xA9 },
-  },
-  {
     { 0x69, 0x75, 0x67, 0xBB, 0xAC, 0x94, 0xEE, 0xC3, 0xE6, 0xFA, 0x4A, 0x4E, 0x46, 0xFA, 0x51, 0x74,
       0x05, 0xF3, 0x77, 0xC0, 0xDE, 0xE3, 0xD4, 0x29, 0x91, 0x4E, 0x6B, 0x7E, 0xA0, 0x8C, 0xB1, 0xA6 },
   },
@@ -2469,10 +2273,6 @@
       0x36, 0x0D, 0xC7, 0xC9, 0xF1, 0x40, 0x44, 0x17, 0xA3, 0x36, 0x91, 0x94, 0x4E, 0x76, 0x31, 0x36 },
   },
   {
-    { 0x6A, 0xB9, 0xA2, 0x3D, 0x98, 0xE5, 0xA9, 0xC7, 0x21, 0xC7, 0x77, 0x9E, 0x0B, 0x1A, 0xEB, 0x16,
-      0x03, 0x63, 0x2E, 0xDE, 0x6C, 0x85, 0x6E, 0x37, 0x06, 0xC4, 0x11, 0x7C, 0x05, 0x08, 0xBE, 0xDE },
-  },
-  {
     { 0x6A, 0xC3, 0x2D, 0xA9, 0x16, 0x8F, 0x70, 0xD0, 0x9F, 0xE9, 0xF7, 0x55, 0x3E, 0x67, 0x0F, 0xA4,
       0xAA, 0xAC, 0xE8, 0x7B, 0x5A, 0x0B, 0x9A, 0x3F, 0x22, 0x2D, 0x7A, 0x8B, 0xBA, 0x76, 0xD2, 0xF2 },
   },
@@ -2493,10 +2293,6 @@
       0x10, 0x15, 0x13, 0xDF, 0xD1, 0xDB, 0x0B, 0x0A, 0x97, 0xCC, 0x3F, 0xDD, 0x9A, 0x39, 0xC6, 0xE7 },
   },
   {
-    { 0x6B, 0xB2, 0x9C, 0x81, 0x4A, 0xE7, 0x6C, 0xF5, 0x2C, 0x3C, 0x92, 0xAF, 0x39, 0xB0, 0x46, 0x47,
-      0xEE, 0x3C, 0xD8, 0xB0, 0x80, 0xE5, 0xA6, 0x70, 0x42, 0xDE, 0x62, 0x78, 0xF4, 0x91, 0xC0, 0x33 },
-  },
-  {
     { 0x6C, 0x07, 0x12, 0x67, 0x53, 0x03, 0x6A, 0x21, 0xBD, 0x20, 0xFC, 0x64, 0xEC, 0x6B, 0xA6, 0xE7,
       0x32, 0x59, 0x19, 0x1C, 0xBB, 0xBB, 0xFF, 0x21, 0x03, 0x74, 0xC8, 0x9E, 0x64, 0xF4, 0xD8, 0xD6 },
   },
@@ -2545,10 +2341,6 @@
       0xF2, 0x4B, 0xBA, 0x93, 0x5E, 0x05, 0x0D, 0x11, 0x26, 0xD7, 0x78, 0x22, 0xB5, 0x90, 0x26, 0x83 },
   },
   {
-    { 0x6D, 0x8C, 0x72, 0xCA, 0xF3, 0x6F, 0x5E, 0xEE, 0xBB, 0xC9, 0x45, 0xFA, 0x9D, 0x30, 0xB9, 0x26,
-      0x33, 0x31, 0x41, 0x41, 0x13, 0xED, 0x13, 0x17, 0xF3, 0x30, 0x04, 0x47, 0x61, 0xE2, 0x96, 0x79 },
-  },
-  {
     { 0x6D, 0xC9, 0x87, 0x5C, 0xD3, 0x46, 0xA2, 0x2B, 0x47, 0xB2, 0x80, 0xB1, 0xB1, 0x45, 0x0D, 0x87,
       0x8E, 0x09, 0x8B, 0xB2, 0xE2, 0xA9, 0xE3, 0xC2, 0x5C, 0xC7, 0x6A, 0xFF, 0x93, 0xC0, 0xBE, 0xAB },
   },
@@ -2569,10 +2361,6 @@
       0xD9, 0xFA, 0x71, 0x3F, 0x26, 0x95, 0xEE, 0x5E, 0xE8, 0x59, 0x84, 0x83, 0xE3, 0x02, 0x8F, 0x0B },
   },
   {
-    { 0x6E, 0x24, 0xF1, 0xC2, 0x95, 0x57, 0x2D, 0x5F, 0xF4, 0xD9, 0xE2, 0x27, 0x4C, 0x9B, 0x3B, 0x70,
-      0xA9, 0x66, 0x59, 0xD9, 0x28, 0x95, 0x30, 0xCA, 0xE8, 0xC3, 0xAD, 0x68, 0xCD, 0xA0, 0xDD, 0xA7 },
-  },
-  {
     { 0x6E, 0x8D, 0x55, 0xEE, 0x2F, 0x72, 0x5A, 0x0B, 0xA5, 0xDF, 0x43, 0x43, 0xA0, 0x6F, 0xD3, 0x71,
       0x54, 0x25, 0x6B, 0xCF, 0xF7, 0xCE, 0xE0, 0xB7, 0x00, 0xAC, 0xDD, 0x91, 0x56, 0x49, 0x79, 0x99 },
   },
@@ -2633,18 +2421,10 @@
       0xA2, 0x68, 0xB8, 0x72, 0xAD, 0xDC, 0x3E, 0xE8, 0x37, 0x2B, 0x91, 0x6D, 0x60, 0x65, 0xCF, 0xA8 },
   },
   {
-    { 0x71, 0x79, 0xE0, 0x51, 0x25, 0x9C, 0x18, 0x52, 0x31, 0xA4, 0xC0, 0x25, 0x98, 0xEF, 0x7E, 0x82,
-      0x6D, 0x8F, 0x9C, 0xC0, 0x04, 0x98, 0x1D, 0x09, 0xE4, 0xD6, 0x54, 0x59, 0xD9, 0x3C, 0x9C, 0xD2 },
-  },
-  {
     { 0x71, 0xCF, 0x8D, 0x5C, 0x16, 0xF0, 0xDF, 0x67, 0xD2, 0x3F, 0x67, 0x06, 0xAE, 0xB9, 0x7C, 0x8E,
       0xAE, 0x2C, 0xAF, 0xC6, 0xBE, 0xC9, 0x4A, 0x4D, 0xB2, 0x40, 0x5A, 0x37, 0xFF, 0x30, 0x92, 0x5F },
   },
   {
-    { 0x71, 0xFF, 0xC5, 0xCF, 0x48, 0x5C, 0x50, 0x74, 0xD0, 0x7A, 0xBC, 0xE5, 0x4B, 0x68, 0xE3, 0x53,
-      0xBE, 0xC7, 0x69, 0xAE, 0xC5, 0x04, 0x95, 0x41, 0x1D, 0xF3, 0x36, 0x4C, 0x90, 0x3A, 0x43, 0xE8 },
-  },
-  {
     { 0x72, 0x1B, 0x1F, 0x92, 0x9D, 0xA7, 0xEA, 0xF8, 0x96, 0x24, 0x64, 0x7B, 0xA3, 0xCC, 0x4E, 0x1E,
       0xD1, 0x57, 0x54, 0xAB, 0x83, 0x6E, 0x33, 0x58, 0xB0, 0x35, 0xA1, 0xF2, 0x27, 0x4A, 0x43, 0xBE },
   },
@@ -2689,14 +2469,6 @@
       0xF9, 0x09, 0xF9, 0x6F, 0x16, 0x8E, 0x8D, 0xD1, 0xBD, 0x1A, 0xDB, 0xC7, 0x15, 0x99, 0xEC, 0xAA },
   },
   {
-    { 0x73, 0xCC, 0x67, 0x4F, 0x41, 0x6E, 0x6C, 0xC4, 0xE3, 0xEB, 0x2B, 0x7A, 0xEA, 0x03, 0x93, 0x45,
-      0xFA, 0xAF, 0x96, 0x75, 0xBB, 0x6A, 0xA0, 0x58, 0x77, 0xD8, 0x69, 0x5E, 0x33, 0x6B, 0xAE, 0xF4 },
-  },
-  {
-    { 0x74, 0x1F, 0x31, 0xAA, 0xE2, 0xC4, 0x16, 0x55, 0x0D, 0xDB, 0x93, 0x5D, 0x30, 0x30, 0x8F, 0xC4,
-      0x03, 0x26, 0x47, 0x69, 0x51, 0x6D, 0xCA, 0xFC, 0x24, 0xAB, 0x08, 0x1C, 0x39, 0x05, 0x95, 0x65 },
-  },
-  {
     { 0x74, 0x2F, 0xCF, 0x73, 0x56, 0x51, 0xCE, 0xB1, 0x84, 0x3C, 0xE3, 0xD6, 0x56, 0x72, 0x34, 0x68,
       0xAB, 0x22, 0x85, 0x6C, 0x6A, 0x80, 0x56, 0xB9, 0x1C, 0x75, 0xC5, 0x8A, 0x67, 0xEC, 0xA8, 0xBE },
   },
@@ -2713,14 +2485,6 @@
       0x74, 0xA2, 0x0C, 0xB8, 0x96, 0xBA, 0xB5, 0x64, 0x8C, 0x2A, 0xB0, 0xF9, 0xDB, 0xDA, 0x3D, 0xA6 },
   },
   {
-    { 0x75, 0x06, 0x55, 0xBF, 0xBC, 0xFE, 0x4E, 0xF7, 0xEF, 0x75, 0xD3, 0x65, 0x03, 0x82, 0xE2, 0xE6,
-      0x2C, 0x44, 0xE9, 0x7D, 0xBA, 0xC6, 0x53, 0xBF, 0x8A, 0x84, 0xB9, 0x96, 0x9C, 0x17, 0xE7, 0x39 },
-  },
-  {
-    { 0x75, 0x26, 0x79, 0xF2, 0x54, 0xBA, 0xE8, 0x4B, 0x9B, 0x94, 0x20, 0x8E, 0x2B, 0xAD, 0x20, 0xD4,
-      0x32, 0x54, 0x0F, 0xB3, 0x9B, 0x6C, 0x51, 0xD2, 0x18, 0x46, 0x65, 0x36, 0x8B, 0xAE, 0x0D, 0x31 },
-  },
-  {
     { 0x75, 0x83, 0x10, 0x84, 0x6A, 0xD5, 0x74, 0x05, 0x71, 0x1A, 0xDC, 0x4A, 0x1A, 0xF0, 0xEC, 0x51,
       0x8F, 0x82, 0x2D, 0x1A, 0x6C, 0xA9, 0x1E, 0xC2, 0x51, 0xF1, 0x22, 0xD4, 0x10, 0x6F, 0x99, 0xD9 },
   },
@@ -2773,10 +2537,6 @@
       0x84, 0x81, 0x3A, 0x53, 0x87, 0x1A, 0x58, 0x6A, 0x69, 0x8B, 0x18, 0x79, 0x89, 0x13, 0xD3, 0xB8 },
   },
   {
-    { 0x77, 0xA3, 0xF4, 0x86, 0x78, 0xCF, 0x75, 0xFA, 0xFC, 0x70, 0x49, 0x26, 0x57, 0x8D, 0x01, 0xB1,
-      0x74, 0xE6, 0xA8, 0xF3, 0xA3, 0x3F, 0xED, 0xC9, 0xEF, 0x3D, 0x37, 0xDD, 0xB7, 0x65, 0x4E, 0xCD },
-  },
-  {
     { 0x77, 0xAC, 0x72, 0x54, 0x6A, 0x39, 0xCA, 0x2F, 0x24, 0xE2, 0xD1, 0x3C, 0x0D, 0x74, 0x91, 0x5F,
       0x67, 0xBC, 0xD4, 0x37, 0x09, 0xA9, 0xE5, 0xDB, 0x8B, 0x33, 0x1A, 0x55, 0x77, 0xFD, 0x50, 0x88 },
   },
@@ -2909,10 +2669,6 @@
       0x87, 0xC1, 0xC8, 0xC9, 0xEA, 0xF5, 0x1F, 0x66, 0x65, 0x5E, 0xB8, 0x36, 0xB5, 0x05, 0xA6, 0xDA },
   },
   {
-    { 0x7D, 0xDB, 0xA6, 0x98, 0xBF, 0xC8, 0xE1, 0x9B, 0x0B, 0x16, 0xDB, 0x61, 0xCC, 0x77, 0x35, 0x13,
-      0xC4, 0x93, 0x62, 0x9F, 0xE5, 0x0C, 0x6C, 0xD5, 0xEB, 0x81, 0x5B, 0x1A, 0xA3, 0x77, 0x02, 0x09 },
-  },
-  {
     { 0x7D, 0xF7, 0x1C, 0x35, 0x19, 0x78, 0x05, 0x7A, 0x4D, 0x30, 0x0E, 0x15, 0xAD, 0xB7, 0xCF, 0x28,
       0xF1, 0xA5, 0xBB, 0x76, 0x92, 0x9C, 0x58, 0xA2, 0x50, 0x25, 0x3C, 0x30, 0x48, 0xF2, 0x88, 0xDB },
   },
@@ -2921,26 +2677,14 @@
       0xAC, 0x0B, 0x55, 0x3A, 0x4B, 0xF5, 0xFB, 0x08, 0xC2, 0x46, 0xEC, 0xF9, 0xC8, 0x49, 0xDB, 0x28 },
   },
   {
-    { 0x7E, 0x56, 0x1A, 0xF9, 0x96, 0xEA, 0x0B, 0x0F, 0xF2, 0x21, 0x4E, 0x24, 0x18, 0x27, 0xB5, 0x5C,
-      0xA3, 0x2A, 0x1B, 0xBE, 0x43, 0xF3, 0x39, 0x7E, 0xC9, 0x6E, 0x9E, 0x4C, 0x76, 0x81, 0x15, 0x68 },
-  },
-  {
     { 0x7E, 0x70, 0x13, 0x07, 0x36, 0xAE, 0xD9, 0xBC, 0xD2, 0x18, 0x44, 0x96, 0x6D, 0x0D, 0x1E, 0x2F,
       0xBA, 0x58, 0xE7, 0xC3, 0x9E, 0xA1, 0x47, 0x76, 0x13, 0xF7, 0x9E, 0x0F, 0x60, 0x40, 0xB5, 0x44 },
   },
   {
-    { 0x7E, 0x7B, 0x2C, 0xA2, 0xBB, 0x22, 0x7A, 0x16, 0x08, 0x21, 0xD7, 0x89, 0x69, 0xB6, 0xF1, 0xD6,
-      0x23, 0x7A, 0x4B, 0xEE, 0x1A, 0xD5, 0x14, 0xC2, 0xC2, 0x11, 0x3B, 0xBF, 0x8B, 0xA1, 0x2D, 0x45 },
-  },
-  {
     { 0x7E, 0x8A, 0x44, 0x80, 0xAB, 0x99, 0xAB, 0x10, 0x36, 0x89, 0xF4, 0x6F, 0xC9, 0xB7, 0x9F, 0xA0,
       0xD9, 0xFD, 0xA4, 0x64, 0xAF, 0x96, 0xEC, 0x20, 0xCC, 0xE6, 0xA2, 0x5B, 0x9C, 0xF7, 0xDC, 0xD3 },
   },
   {
-    { 0x7E, 0xCD, 0x77, 0x9B, 0x04, 0x7C, 0xDB, 0x67, 0xBC, 0x20, 0x4A, 0x11, 0xEE, 0x29, 0xD9, 0x75,
-      0x2D, 0x5F, 0x8E, 0x03, 0x5E, 0xBB, 0xAC, 0x52, 0xD7, 0x68, 0xA8, 0x83, 0xA0, 0x4F, 0x0C, 0x6E },
-  },
-  {
     { 0x7F, 0x41, 0xA6, 0x10, 0x7E, 0x34, 0x2B, 0x5D, 0x73, 0x80, 0x8D, 0xB0, 0x2A, 0x86, 0x8B, 0xB0,
       0xA8, 0xCB, 0xDE, 0xA3, 0x6A, 0x70, 0x54, 0x54, 0xAA, 0x8D, 0x86, 0xC8, 0xDE, 0x5C, 0x40, 0x55 },
   },
@@ -3017,10 +2761,6 @@
       0xED, 0xDC, 0xD9, 0x89, 0x44, 0xAC, 0x01, 0x98, 0x40, 0xE9, 0xE3, 0x32, 0x2E, 0x35, 0x8D, 0xD2 },
   },
   {
-    { 0x81, 0x63, 0x78, 0x4D, 0x6A, 0xAB, 0xE4, 0xC3, 0x7E, 0x40, 0x08, 0x2F, 0xC1, 0x98, 0x1E, 0x47,
-      0x05, 0x8E, 0xCE, 0x3C, 0x2A, 0x81, 0x30, 0xBC, 0x9D, 0x40, 0x24, 0x62, 0xA5, 0xA0, 0x35, 0x76 },
-  },
-  {
     { 0x81, 0xA0, 0xF1, 0xD0, 0x29, 0x46, 0x8E, 0xE8, 0x66, 0x36, 0x4A, 0x19, 0x8A, 0x26, 0x08, 0x58,
       0x30, 0xC2, 0xA4, 0x16, 0xE4, 0x9E, 0x22, 0x4C, 0xE8, 0x09, 0x66, 0xFC, 0xC4, 0x99, 0xD6, 0x36 },
   },
@@ -3029,10 +2769,6 @@
       0xDB, 0xED, 0x81, 0xE9, 0x07, 0x54, 0xD1, 0xE8, 0x25, 0xF0, 0xBF, 0xC9, 0x13, 0x7C, 0x8B, 0xBF },
   },
   {
-    { 0x81, 0xBF, 0x9F, 0xAA, 0x62, 0xAD, 0x78, 0xCD, 0x4D, 0x36, 0x56, 0x59, 0x98, 0x74, 0xB3, 0x09,
-      0x42, 0xB9, 0x83, 0xEE, 0x5E, 0x39, 0x64, 0xE5, 0xAF, 0xAE, 0xF8, 0x0A, 0xCC, 0x7B, 0x88, 0xCF },
-  },
-  {
     { 0x81, 0xD4, 0xB0, 0x8A, 0xCD, 0x90, 0xF2, 0xDE, 0xE1, 0x8A, 0xC4, 0x20, 0xF5, 0x1D, 0xA9, 0x91,
       0x05, 0x35, 0x82, 0x47, 0xBB, 0x03, 0x87, 0xCF, 0xA9, 0x4D, 0xD9, 0x67, 0xA9, 0xCC, 0x18, 0x68 },
   },
@@ -3301,10 +3037,6 @@
       0x79, 0x23, 0xB9, 0x36, 0x5A, 0x6B, 0x4B, 0x97, 0xC4, 0xEC, 0xAC, 0x4A, 0x4B, 0x37, 0x03, 0x4B },
   },
   {
-    { 0x8C, 0xC7, 0x80, 0x61, 0x1F, 0x6E, 0xF6, 0x28, 0x50, 0x26, 0xFE, 0x1C, 0xC0, 0x4C, 0x57, 0x68,
-      0xF6, 0x06, 0xB6, 0x09, 0x39, 0xE1, 0xA5, 0xCC, 0xF7, 0xFB, 0xC6, 0x0E, 0x48, 0xD6, 0x39, 0x4C },
-  },
-  {
     { 0x8C, 0xCD, 0x79, 0x41, 0x63, 0x00, 0xCA, 0x61, 0xEE, 0x56, 0xA6, 0x0D, 0xA1, 0xC8, 0x09, 0x35,
       0xB8, 0x6E, 0x27, 0x91, 0x93, 0xAD, 0x3D, 0x05, 0x65, 0x72, 0x9D, 0x69, 0xE0, 0x8C, 0x86, 0x96 },
   },
@@ -3361,10 +3093,6 @@
       0xF4, 0x1E, 0x35, 0x2A, 0xE1, 0xDA, 0x79, 0x29, 0xD6, 0x08, 0xCB, 0xBC, 0x81, 0xA9, 0xE0, 0xC3 },
   },
   {
-    { 0x8E, 0xC2, 0xBF, 0xBB, 0x62, 0x68, 0xDF, 0xBB, 0x4B, 0x94, 0xF6, 0x67, 0x6A, 0x80, 0x47, 0x37,
-      0x7D, 0x90, 0xD1, 0xF2, 0xD2, 0x91, 0x82, 0xB9, 0x15, 0xF2, 0x89, 0x74, 0xE2, 0xC7, 0xCF, 0x25 },
-  },
-  {
     { 0x8F, 0x01, 0xE1, 0x2E, 0xF4, 0x24, 0x16, 0x9D, 0x2D, 0x5C, 0x2D, 0x25, 0x73, 0xD4, 0x97, 0x36,
       0xE6, 0x9B, 0x05, 0x74, 0x1D, 0x31, 0xB1, 0x62, 0x61, 0xB5, 0xBD, 0xB3, 0xB4, 0x48, 0x77, 0xE2 },
   },
@@ -3401,10 +3129,6 @@
       0x75, 0xD6, 0x74, 0x5B, 0x30, 0x48, 0xFB, 0x1D, 0x9D, 0x3B, 0xC4, 0x9F, 0x9F, 0xC8, 0x78, 0xBA },
   },
   {
-    { 0x90, 0x7B, 0x22, 0x09, 0xE9, 0x2D, 0xE7, 0xF4, 0x3E, 0xF9, 0x4F, 0x31, 0xF9, 0x00, 0x27, 0xA2,
-      0x1C, 0x7B, 0x6C, 0xA3, 0x34, 0x4C, 0x2E, 0x6D, 0x8F, 0x7A, 0x09, 0xA8, 0x98, 0x5B, 0xD6, 0xC1 },
-  },
-  {
     { 0x90, 0xB3, 0xA1, 0x85, 0x36, 0x86, 0xAF, 0xEB, 0x15, 0x4A, 0xEF, 0x7E, 0x84, 0x0D, 0x38, 0x04,
       0x4E, 0x7D, 0x7F, 0x6D, 0xC4, 0xCE, 0x82, 0x8C, 0xE3, 0x97, 0x55, 0xAC, 0x88, 0xE4, 0x2E, 0x07 },
   },
@@ -3441,10 +3165,6 @@
       0xA2, 0x89, 0x0A, 0x48, 0x40, 0x18, 0x63, 0x72, 0x6E, 0x23, 0x3A, 0x82, 0xBF, 0x9A, 0x0B, 0xCF },
   },
   {
-    { 0x91, 0xF1, 0x5A, 0x5A, 0xEB, 0x98, 0xCF, 0xB4, 0x60, 0x05, 0xD8, 0x40, 0x53, 0xA4, 0x87, 0xEE,
-      0xE1, 0xBA, 0x4C, 0x00, 0x77, 0x63, 0xDB, 0xA3, 0x5D, 0xB5, 0x66, 0x84, 0xDA, 0x0E, 0x6F, 0x31 },
-  },
-  {
     { 0x92, 0x3F, 0x0F, 0x8C, 0x40, 0x5A, 0x02, 0xE6, 0x82, 0xC4, 0xB4, 0x66, 0x5A, 0x7E, 0xE7, 0x16,
       0xAA, 0x57, 0xE0, 0xA5, 0x86, 0xC2, 0x4A, 0x16, 0x5A, 0xAD, 0x7E, 0x5B, 0xDA, 0x22, 0x78, 0x24 },
   },
@@ -3465,10 +3185,6 @@
       0x23, 0x3F, 0x61, 0x17, 0x93, 0x79, 0xCE, 0xBC, 0x8D, 0x7C, 0x62, 0x01, 0x09, 0x9F, 0xFD, 0xE2 },
   },
   {
-    { 0x93, 0x2A, 0xE8, 0x0C, 0x40, 0xB6, 0xAE, 0xD9, 0xF7, 0x0A, 0x43, 0xE9, 0x43, 0x6D, 0xD2, 0xC2,
-      0x02, 0xB4, 0xD0, 0x67, 0xC6, 0x11, 0x16, 0x73, 0xCD, 0x04, 0xE3, 0x1F, 0xD2, 0x99, 0xAF, 0x80 },
-  },
-  {
     { 0x93, 0x8A, 0xE3, 0xE7, 0x15, 0x48, 0xA9, 0xC3, 0x14, 0x27, 0xCB, 0xA7, 0x40, 0xBE, 0x2E, 0xB9,
       0x26, 0x88, 0x68, 0xBD, 0xAC, 0xC1, 0xDA, 0xA8, 0x67, 0x02, 0xFA, 0xB7, 0x93, 0x70, 0xB8, 0xF9 },
   },
@@ -3497,18 +3213,10 @@
       0xD2, 0xCA, 0xED, 0xBD, 0x1F, 0x0E, 0x6C, 0x79, 0x75, 0x5E, 0xEE, 0x61, 0xE9, 0xE6, 0x24, 0xF4 },
   },
   {
-    { 0x94, 0xD4, 0x24, 0x71, 0x35, 0x46, 0x31, 0x26, 0x5B, 0xAD, 0x76, 0x75, 0x88, 0x6C, 0xBA, 0x80,
-      0xB0, 0xBE, 0x3C, 0x5B, 0x1D, 0x96, 0x3A, 0x1C, 0xBC, 0x53, 0x50, 0x9D, 0xF0, 0x0B, 0xDA, 0x1A },
-  },
-  {
     { 0x94, 0xDC, 0x80, 0x07, 0x49, 0x1D, 0xA8, 0xBF, 0xB7, 0x39, 0x14, 0xAD, 0xCE, 0xF7, 0x1A, 0x12,
       0x41, 0x58, 0xBA, 0xD1, 0x7B, 0xA8, 0x8F, 0xA9, 0x46, 0x57, 0x9B, 0xBC, 0x2D, 0x64, 0x97, 0x8D },
   },
   {
-    { 0x95, 0x13, 0x10, 0xEF, 0x9C, 0x27, 0xC1, 0x66, 0xE3, 0x14, 0x08, 0x25, 0x1D, 0x0B, 0xE7, 0x84,
-      0x3B, 0x28, 0xC3, 0xF8, 0xEB, 0x7C, 0x85, 0x53, 0xB5, 0x0C, 0x54, 0xE4, 0x82, 0xCB, 0x06, 0xA3 },
-  },
-  {
     { 0x95, 0x68, 0x33, 0xAE, 0xE6, 0x61, 0x19, 0x26, 0xE9, 0x52, 0x72, 0xA1, 0xF5, 0x88, 0xF9, 0x2A,
       0xF5, 0x2C, 0xAE, 0x70, 0x7A, 0xCD, 0xCC, 0x82, 0x63, 0x99, 0x7B, 0xFA, 0x8C, 0x71, 0x9C, 0xA8 },
   },
@@ -3521,10 +3229,6 @@
       0x73, 0x5D, 0xF7, 0x17, 0x92, 0x6C, 0x06, 0x1E, 0xA7, 0x0C, 0x40, 0x85, 0x64, 0x8F, 0xF3, 0x12 },
   },
   {
-    { 0x95, 0xC3, 0xCC, 0x87, 0x37, 0xE5, 0xD6, 0xD5, 0x06, 0xE6, 0x71, 0xEA, 0xAA, 0xA3, 0x3E, 0x1B,
-      0x07, 0xDC, 0x56, 0x54, 0xBA, 0x1F, 0x69, 0xE3, 0xF7, 0x87, 0x51, 0x9D, 0x14, 0xDB, 0x0B, 0xE9 },
-  },
-  {
     { 0x95, 0xF4, 0x59, 0xAC, 0xF2, 0x57, 0x64, 0x4C, 0x90, 0x9A, 0xDC, 0xAE, 0xAD, 0xD8, 0x8A, 0x3C,
       0x57, 0x76, 0x2E, 0xCB, 0x09, 0x2C, 0x50, 0xB4, 0x51, 0xC1, 0x58, 0x6B, 0x21, 0x8E, 0x6B, 0x26 },
   },
@@ -3537,10 +3241,6 @@
       0x58, 0x77, 0x26, 0xCA, 0xA0, 0x12, 0xE8, 0xFB, 0x8E, 0x8E, 0x21, 0x89, 0x77, 0xBF, 0x1D, 0xF6 },
   },
   {
-    { 0x96, 0xED, 0x34, 0xC9, 0x16, 0xFB, 0x7C, 0xBE, 0xF2, 0x33, 0x4B, 0x74, 0x9A, 0x59, 0x85, 0x24,
-      0x8B, 0x92, 0x30, 0x86, 0x0F, 0x2C, 0x50, 0xCF, 0xBE, 0x57, 0x8B, 0x1E, 0xD6, 0xB2, 0x6B, 0x88 },
-  },
-  {
     { 0x97, 0x4F, 0x51, 0xA6, 0x04, 0x68, 0x48, 0xFA, 0xA7, 0xB3, 0x3F, 0xD2, 0x39, 0x13, 0x86, 0x42,
       0x8B, 0xD5, 0x24, 0xEA, 0xEB, 0xA8, 0x01, 0x4E, 0x6D, 0x1F, 0xE2, 0x54, 0x38, 0x3F, 0x41, 0x79 },
   },
@@ -3605,10 +3305,6 @@
       0xC1, 0x9E, 0xDD, 0x6D, 0xCE, 0xB1, 0x6D, 0x52, 0x88, 0x63, 0x63, 0xA7, 0xCD, 0xC8, 0x69, 0x5F },
   },
   {
-    { 0x99, 0x78, 0x9D, 0x5A, 0x38, 0xA6, 0x33, 0x81, 0x47, 0x73, 0x72, 0xF5, 0xF5, 0x87, 0x5C, 0xCB,
-      0xB9, 0xA2, 0xAE, 0x03, 0x39, 0x7D, 0xD9, 0xB0, 0xC5, 0x3F, 0xEA, 0x80, 0xA3, 0xB3, 0x46, 0xCE },
-  },
-  {
     { 0x99, 0xA5, 0x5F, 0x76, 0xCB, 0xEA, 0x0F, 0x3E, 0x60, 0x71, 0xD3, 0x82, 0x18, 0x1A, 0xF6, 0xCB,
       0x25, 0xBD, 0xC5, 0x87, 0x5E, 0x29, 0xF0, 0xF4, 0xD7, 0x19, 0xA9, 0xD3, 0x5B, 0x5B, 0xD6, 0xBF },
   },
@@ -3681,10 +3377,6 @@
       0x5C, 0x66, 0x91, 0xF0, 0xB3, 0xD7, 0x24, 0x54, 0xD3, 0x84, 0x12, 0x01, 0xF3, 0x9F, 0xCD, 0x1E },
   },
   {
-    { 0x9B, 0xE5, 0x93, 0xD5, 0x0F, 0xD0, 0x68, 0xF0, 0xE1, 0xB5, 0x26, 0xB7, 0xAA, 0x2A, 0xF5, 0x1F,
-      0xDC, 0xFB, 0xB5, 0x81, 0x2A, 0x9D, 0x89, 0x6B, 0x7B, 0xEF, 0x79, 0x05, 0x4F, 0xBD, 0xC3, 0x4E },
-  },
-  {
     { 0x9C, 0x70, 0x8D, 0x5B, 0xAB, 0x37, 0xF5, 0xB6, 0xBC, 0x8A, 0x77, 0x53, 0x12, 0x57, 0x2A, 0xB2,
       0x79, 0x21, 0x6D, 0x55, 0x6D, 0xA7, 0x4A, 0xC2, 0xA7, 0xC0, 0x41, 0xE8, 0xCE, 0xB0, 0xBE, 0x0A },
   },
@@ -3781,10 +3473,6 @@
       0xC4, 0xAB, 0x73, 0x29, 0xAE, 0x29, 0x5F, 0x01, 0x5F, 0x74, 0x7D, 0xA1, 0x82, 0xA9, 0xC3, 0x9C },
   },
   {
-    { 0xA0, 0xAA, 0xDB, 0x3F, 0xDB, 0xF8, 0xCE, 0xB9, 0x9E, 0x5D, 0xFF, 0xAF, 0x49, 0x26, 0xF0, 0x09,
-      0xB4, 0x7E, 0xD2, 0xC7, 0xE8, 0x6E, 0xEA, 0x6D, 0xC8, 0x80, 0xF2, 0xBE, 0x6C, 0x8C, 0xB5, 0x34 },
-  },
-  {
     { 0xA0, 0xAB, 0x9F, 0x42, 0xD0, 0x9D, 0x06, 0x44, 0x23, 0x8C, 0x63, 0xF2, 0x19, 0x26, 0x52, 0x8F,
       0xA5, 0x3E, 0x56, 0x6D, 0x83, 0x3E, 0xF1, 0xB0, 0x8D, 0x9E, 0xE7, 0xF3, 0x4D, 0x2B, 0x6D, 0x8E },
   },
@@ -3853,10 +3541,6 @@
       0xCF, 0xB2, 0x61, 0x00, 0x84, 0x07, 0xF3, 0xC6, 0x7B, 0x10, 0xD7, 0xCF, 0x48, 0x9D, 0xB8, 0x83 },
   },
   {
-    { 0xA4, 0x97, 0x54, 0x23, 0xE0, 0x7E, 0x64, 0xE0, 0x16, 0xB6, 0xF2, 0xE1, 0x35, 0x27, 0x47, 0xBC,
-      0xA8, 0x13, 0xD3, 0x1B, 0xFC, 0x8F, 0xD4, 0x4F, 0x83, 0xF8, 0xB7, 0x2A, 0x39, 0x8D, 0x95, 0x07 },
-  },
-  {
     { 0xA4, 0xB4, 0xE2, 0xA5, 0x14, 0x66, 0xB8, 0x81, 0x06, 0xD3, 0xA0, 0xCB, 0x4C, 0x75, 0x26, 0xF1,
       0x0D, 0x21, 0x80, 0x90, 0x30, 0x82, 0x80, 0x98, 0xF4, 0x87, 0x78, 0x5E, 0x98, 0x78, 0xE6, 0x9C },
   },
@@ -3865,10 +3549,6 @@
       0x2D, 0x00, 0xA5, 0x03, 0x1B, 0x70, 0x28, 0x9A, 0xE6, 0x06, 0xC9, 0xA5, 0x8B, 0xFB, 0xDB, 0xD7 },
   },
   {
-    { 0xA5, 0x31, 0xC9, 0x68, 0x69, 0x94, 0x05, 0xE3, 0x4A, 0x7F, 0x06, 0x74, 0xF8, 0x72, 0x7C, 0xB7,
-      0xB0, 0x2E, 0xA6, 0xA6, 0x1C, 0xA3, 0x87, 0x5D, 0xE0, 0xDE, 0xDA, 0x8D, 0x8E, 0x42, 0x2C, 0x5D },
-  },
-  {
     { 0xA5, 0x58, 0xCC, 0x2E, 0x2F, 0xE1, 0x06, 0x81, 0x12, 0x0B, 0xD2, 0x57, 0x94, 0xF8, 0xCA, 0x20,
       0xB0, 0x94, 0x3F, 0xBD, 0x13, 0x6E, 0x4B, 0x36, 0x77, 0x30, 0xF0, 0x5E, 0x71, 0x21, 0xF8, 0x97 },
   },
@@ -3933,10 +3613,6 @@
       0x0E, 0x30, 0xEF, 0xE4, 0x0F, 0x95, 0xD5, 0x20, 0xAF, 0xC8, 0x65, 0x31, 0xE8, 0xC8, 0xF8, 0x41 },
   },
   {
-    { 0xA6, 0xD5, 0x87, 0xAA, 0xFA, 0x35, 0xA6, 0xAE, 0x56, 0x0A, 0xFB, 0xF1, 0x59, 0x61, 0x57, 0x6F,
-      0xA7, 0xF2, 0x7D, 0x0C, 0x3D, 0x6B, 0x96, 0x82, 0x0C, 0x0F, 0x27, 0xE7, 0xCD, 0x33, 0xAB, 0xF7 },
-  },
-  {
     { 0xA6, 0xDE, 0x6C, 0x3B, 0x8C, 0x14, 0x05, 0xCB, 0xE1, 0x2D, 0xB4, 0x09, 0x97, 0x61, 0x71, 0xAC,
       0xB5, 0x1F, 0xB3, 0xDC, 0xFB, 0xB7, 0x6E, 0xE3, 0x84, 0x95, 0x39, 0xCD, 0x8A, 0xB0, 0x66, 0xDF },
   },
@@ -4005,10 +3681,6 @@
       0x0D, 0x4D, 0xA0, 0x5D, 0x73, 0x7A, 0xD2, 0xA3, 0x1E, 0x0B, 0xAD, 0x90, 0x82, 0xA5, 0x77, 0xB1 },
   },
   {
-    { 0xA9, 0x5B, 0x97, 0x2B, 0x0C, 0xA0, 0xC4, 0x23, 0xFD, 0xC6, 0x44, 0x20, 0x0F, 0x9C, 0x9F, 0x74,
-      0x21, 0xB9, 0x34, 0xDA, 0x20, 0x5D, 0x42, 0x90, 0x4F, 0x91, 0xFF, 0xAE, 0xBB, 0x67, 0x78, 0xBE },
-  },
-  {
     { 0xA9, 0x5C, 0x06, 0x3E, 0x9E, 0x35, 0x84, 0xE5, 0x99, 0x88, 0xF0, 0x73, 0x86, 0x4C, 0x18, 0x76,
       0xB5, 0xDF, 0x9B, 0x44, 0xC6, 0x1B, 0x4A, 0x8B, 0xE4, 0x83, 0xBE, 0x05, 0xCF, 0xD1, 0xA1, 0xA6 },
   },
@@ -4073,10 +3745,6 @@
       0x6E, 0x72, 0xA8, 0x20, 0x22, 0x44, 0xEF, 0x3D, 0x7C, 0xA9, 0x34, 0xDF, 0xCC, 0x24, 0xFC, 0xA7 },
   },
   {
-    { 0xAC, 0x4A, 0xF3, 0xFD, 0x3A, 0xA1, 0x14, 0xB3, 0x08, 0x78, 0x1F, 0x9F, 0xFE, 0xC1, 0x81, 0x07,
-      0x85, 0xE2, 0xB9, 0x14, 0x85, 0x99, 0xDB, 0xAF, 0x67, 0x42, 0xD4, 0x18, 0xF6, 0xA4, 0xEE, 0x26 },
-  },
-  {
     { 0xAC, 0x7C, 0x14, 0xB9, 0x56, 0x8F, 0x92, 0x07, 0x5A, 0xD4, 0xA3, 0xBA, 0x3D, 0x4B, 0x01, 0x84,
       0x91, 0xF3, 0x66, 0x1A, 0x37, 0x9B, 0x3D, 0xFE, 0xDD, 0x6F, 0xD3, 0xC3, 0x2E, 0xFA, 0x84, 0x7D },
   },
@@ -4093,10 +3761,6 @@
       0x93, 0x38, 0x8C, 0x6A, 0xE1, 0xCA, 0x37, 0xA2, 0x4D, 0x48, 0x92, 0x70, 0x2A, 0xC7, 0xCD, 0x0C },
   },
   {
-    { 0xAC, 0x96, 0x99, 0xB4, 0x12, 0x8A, 0xA9, 0xDA, 0xA1, 0x0D, 0x5F, 0xFA, 0x7E, 0x3E, 0x7E, 0xC8,
-      0xC8, 0xFA, 0x09, 0x21, 0x10, 0xA6, 0x6C, 0x2F, 0xDB, 0x3F, 0x5E, 0xDA, 0x1D, 0x3E, 0xD1, 0x69 },
-  },
-  {
     { 0xAD, 0x4B, 0x2F, 0x8E, 0xF2, 0xDE, 0xFB, 0x01, 0x92, 0x3C, 0x9C, 0x0F, 0xE2, 0x5A, 0x9A, 0xCE,
       0x41, 0xFA, 0x9E, 0x69, 0x75, 0x85, 0xFC, 0x3D, 0xDF, 0x8D, 0x34, 0xE7, 0x45, 0xFF, 0x0F, 0x12 },
   },
@@ -4337,10 +4001,6 @@
       0x9C, 0xA8, 0x80, 0xF5, 0x3D, 0x4F, 0x5A, 0x7A, 0x24, 0x96, 0xE4, 0xA9, 0xAE, 0x29, 0x53, 0x80 },
   },
   {
-    { 0xB6, 0xF6, 0x53, 0xF7, 0xF2, 0x95, 0x21, 0xAB, 0x5D, 0x11, 0xD6, 0x04, 0xD7, 0x09, 0x22, 0x3C,
-      0x43, 0xDD, 0x4F, 0x0F, 0xD3, 0xC4, 0x25, 0xF4, 0x12, 0xC2, 0x18, 0x89, 0x1F, 0x49, 0x16, 0xB2 },
-  },
-  {
     { 0xB7, 0x02, 0x1A, 0x28, 0x5D, 0x89, 0xA7, 0xE9, 0xDE, 0x1A, 0xFC, 0xFA, 0x8F, 0x66, 0x6A, 0x55,
       0x92, 0xBB, 0xA6, 0xD2, 0xAC, 0x28, 0xDD, 0x62, 0x74, 0x7E, 0xC1, 0x86, 0x19, 0x1C, 0x57, 0xF7 },
   },
@@ -4501,10 +4161,6 @@
       0xD1, 0xC9, 0x40, 0xB1, 0xB2, 0x7C, 0xF5, 0x29, 0xEE, 0x87, 0xA1, 0x40, 0x3B, 0xB0, 0x16, 0xF4 },
   },
   {
-    { 0xBE, 0x58, 0x5D, 0xA2, 0x61, 0xFB, 0x36, 0xD3, 0x63, 0x15, 0xDE, 0xDA, 0x9A, 0xCD, 0x52, 0x2F,
-      0x36, 0x26, 0xA3, 0xCB, 0x9B, 0x26, 0xC3, 0x29, 0x0B, 0x41, 0xD5, 0x01, 0xD6, 0x5C, 0xDF, 0x4D },
-  },
-  {
     { 0xBE, 0x5C, 0x3C, 0xD0, 0x6E, 0x3C, 0x58, 0x1A, 0x4E, 0x67, 0xAB, 0x8F, 0x77, 0x85, 0x51, 0xBB,
       0x0F, 0x41, 0x24, 0x4C, 0x6B, 0xBB, 0x41, 0x1D, 0x9B, 0xF1, 0x27, 0x19, 0x0F, 0x60, 0x99, 0x9D },
   },
@@ -4565,10 +4221,6 @@
       0x13, 0xE8, 0xCC, 0xC4, 0x7B, 0x02, 0xBF, 0x3B, 0x51, 0xC6, 0xE1, 0x18, 0x05, 0xAE, 0xEC, 0xEB },
   },
   {
-    { 0xC0, 0x12, 0x5E, 0x8D, 0xDF, 0x25, 0x61, 0xFE, 0xC1, 0xC1, 0x76, 0xBE, 0x59, 0xA3, 0xAA, 0x1C,
-      0x28, 0x77, 0xD7, 0xB6, 0x69, 0x3F, 0x4B, 0x54, 0x0F, 0x5D, 0x49, 0x3C, 0xBA, 0x8A, 0x6E, 0xA6 },
-  },
-  {
     { 0xC0, 0x52, 0xE0, 0x98, 0xDD, 0x04, 0x2B, 0x3D, 0x44, 0x0F, 0x8F, 0xFB, 0xEE, 0x31, 0x91, 0x67,
       0x1F, 0x5F, 0x78, 0x4B, 0x94, 0x9C, 0x2D, 0x23, 0x3D, 0x60, 0xDA, 0x66, 0xC5, 0xC3, 0x6C, 0xFD },
   },
@@ -4757,10 +4409,6 @@
       0x43, 0xDB, 0x00, 0x2D, 0xBD, 0xB5, 0xED, 0x95, 0xFB, 0xBE, 0x52, 0xC5, 0xC9, 0xB8, 0xF2, 0x01 },
   },
   {
-    { 0xC7, 0xC1, 0xE6, 0x63, 0x6E, 0x6D, 0x0F, 0x41, 0x67, 0x00, 0xB0, 0xE3, 0x7B, 0xD7, 0xB7, 0x2E,
-      0xFF, 0x50, 0xE1, 0x8F, 0x20, 0x60, 0x82, 0xBA, 0xFA, 0xD0, 0x85, 0xE9, 0xE4, 0x23, 0x73, 0x0B },
-  },
-  {
     { 0xC7, 0xF8, 0x85, 0xE4, 0x1A, 0xA5, 0x3B, 0x8C, 0xB8, 0xE4, 0xE5, 0x59, 0xC4, 0x04, 0x3A, 0x87,
       0xDA, 0xFB, 0x78, 0x7A, 0x0D, 0x2B, 0x2E, 0xF1, 0xBC, 0xC0, 0x55, 0x71, 0xB7, 0x5D, 0x4E, 0x29 },
   },
@@ -4877,10 +4525,6 @@
       0x71, 0x08, 0x3E, 0xC5, 0x18, 0xF9, 0xB6, 0x6F, 0xF5, 0x47, 0xF2, 0x82, 0x2D, 0x11, 0x93, 0x6D },
   },
   {
-    { 0xCC, 0x32, 0x0E, 0x14, 0x9C, 0xFB, 0xCE, 0x63, 0xF6, 0x42, 0x41, 0x77, 0x9D, 0x95, 0x5B, 0xEF,
-      0x07, 0x50, 0xDE, 0x7D, 0x8F, 0x06, 0x9C, 0x32, 0xD4, 0xE1, 0xC3, 0xBF, 0x26, 0x54, 0xD6, 0xC0 },
-  },
-  {
     { 0xCC, 0x4E, 0x09, 0x63, 0x13, 0xDF, 0xA0, 0xCC, 0x24, 0x77, 0xA3, 0xA5, 0xB7, 0x9A, 0xEF, 0x0A,
       0x45, 0x54, 0x58, 0x69, 0xA7, 0xF8, 0x8A, 0x29, 0x14, 0x96, 0x06, 0x4B, 0x69, 0x76, 0xE1, 0x4D },
   },
@@ -4957,10 +4601,6 @@
       0xFC, 0x77, 0x93, 0xD9, 0x49, 0x42, 0xF8, 0x8A, 0x1C, 0x72, 0xBB, 0x7B, 0x61, 0x14, 0x51, 0xD5 },
   },
   {
-    { 0xCE, 0xA2, 0x14, 0x77, 0x31, 0x30, 0x85, 0x95, 0x9E, 0xF8, 0xE7, 0x33, 0x6C, 0xA3, 0x61, 0x12,
-      0x9C, 0x0A, 0x59, 0x41, 0x43, 0xE7, 0x2B, 0x98, 0x8C, 0x77, 0xF2, 0xD9, 0xF0, 0x13, 0x4B, 0x2F },
-  },
-  {
     { 0xCF, 0x03, 0x40, 0x17, 0x5B, 0x25, 0x03, 0xC8, 0xFA, 0x5D, 0x52, 0xED, 0x42, 0x5B, 0xF3, 0x7E,
       0x69, 0xC1, 0x80, 0xE5, 0x75, 0xAD, 0xC1, 0xA2, 0x6A, 0x47, 0x81, 0x97, 0x71, 0xB6, 0x8F, 0x7D },
   },
@@ -5137,10 +4777,6 @@
       0x32, 0xDC, 0x3B, 0x85, 0xAA, 0x05, 0x4A, 0x6C, 0x9E, 0xCC, 0x19, 0x01, 0x0E, 0xBA, 0x39, 0x3A },
   },
   {
-    { 0xD7, 0x2D, 0x23, 0x86, 0xBC, 0xB8, 0x0C, 0xCD, 0xA6, 0x43, 0xF2, 0x5A, 0xF2, 0xE8, 0x2A, 0x11,
-      0xF6, 0xC8, 0x93, 0x6F, 0xE1, 0x72, 0x7B, 0x0E, 0xB4, 0x24, 0x08, 0xC3, 0xA2, 0x8F, 0x6E, 0xCB },
-  },
-  {
     { 0xD7, 0x32, 0x49, 0x74, 0xB5, 0x60, 0x09, 0x62, 0x17, 0x61, 0xF7, 0xC0, 0xFF, 0x68, 0x9D, 0xDE,
       0x47, 0x74, 0x99, 0x85, 0xE1, 0xEE, 0x8B, 0x5C, 0x89, 0x61, 0xDD, 0x8F, 0x6A, 0x78, 0xBB, 0xF5 },
   },
@@ -5205,10 +4841,6 @@
       0x7D, 0x93, 0xAA, 0x82, 0xA8, 0x35, 0x96, 0x49, 0x24, 0xC5, 0x8F, 0x32, 0x09, 0xFB, 0x56, 0x9E },
   },
   {
-    { 0xD9, 0xB0, 0xB7, 0x59, 0x07, 0x86, 0xFA, 0xCF, 0x11, 0x46, 0x5F, 0x4C, 0x35, 0xC0, 0x04, 0x3B,
-      0x80, 0xAB, 0x88, 0x39, 0xC9, 0xFC, 0x2C, 0xCF, 0x78, 0xE1, 0x64, 0x46, 0x86, 0xD4, 0x2E, 0xFA },
-  },
-  {
     { 0xD9, 0xD0, 0xD9, 0x6E, 0xB3, 0x28, 0xE0, 0xC1, 0x77, 0x8B, 0x56, 0xA9, 0x2F, 0x71, 0x24, 0x3B,
       0x6C, 0x0D, 0xB4, 0x5C, 0x62, 0x51, 0x32, 0xDD, 0x82, 0xCA, 0x11, 0xA0, 0x97, 0xE7, 0x91, 0xC6 },
   },
@@ -5401,10 +5033,6 @@
       0x80, 0x9E, 0x75, 0xA5, 0x5C, 0x6B, 0x05, 0x48, 0x16, 0xE0, 0x19, 0x89, 0x9A, 0x3A, 0x02, 0xFF },
   },
   {
-    { 0xE3, 0x02, 0xBA, 0x2D, 0xDD, 0x40, 0xFA, 0x6D, 0x1F, 0xFB, 0x4E, 0x9A, 0xDA, 0x3D, 0xE7, 0xA7,
-      0x1B, 0x62, 0x54, 0xDF, 0xCC, 0x8D, 0xDE, 0xB0, 0x4F, 0xFD, 0x99, 0x72, 0xC6, 0xE5, 0x8C, 0x06 },
-  },
-  {
     { 0xE3, 0x1F, 0xA0, 0xBD, 0xE8, 0x58, 0x9E, 0xDD, 0xDA, 0x1C, 0x5D, 0x1A, 0xA9, 0xC5, 0x81, 0x86,
       0xC3, 0x14, 0x36, 0x85, 0x67, 0xBD, 0xF9, 0xDC, 0xD5, 0x37, 0xAA, 0xE3, 0xCF, 0xF8, 0x77, 0x52 },
   },
@@ -5565,10 +5193,6 @@
       0x1C, 0x93, 0xFD, 0x9B, 0xE0, 0xFA, 0xB1, 0x0B, 0x76, 0xDC, 0x96, 0x86, 0xF6, 0x54, 0xC6, 0xE5 },
   },
   {
-    { 0xEB, 0x87, 0x3E, 0x11, 0xE8, 0x86, 0xB4, 0xE8, 0x77, 0xD6, 0x44, 0xE5, 0x7B, 0x66, 0x25, 0x4F,
-      0xDB, 0x78, 0xFC, 0x17, 0xEF, 0x3B, 0xC3, 0x8C, 0x47, 0x9D, 0xB4, 0x9D, 0xB1, 0x07, 0x0C, 0x24 },
-  },
-  {
     { 0xEB, 0x89, 0x84, 0xD1, 0xA9, 0xFE, 0x26, 0x7C, 0x07, 0x9A, 0xE2, 0xF2, 0xF1, 0x6F, 0x01, 0xE6,
       0x0C, 0x4C, 0xEA, 0x94, 0x34, 0xC5, 0x29, 0x7A, 0x71, 0x88, 0xAA, 0x09, 0x25, 0x1D, 0x03, 0xE0 },
   },
@@ -5601,10 +5225,6 @@
       0x69, 0x47, 0x25, 0x98, 0x94, 0x59, 0x09, 0xCB, 0x25, 0x55, 0x7A, 0xA8, 0x47, 0x74, 0x2D, 0xDF },
   },
   {
-    { 0xEC, 0xF3, 0x81, 0x9A, 0x56, 0x75, 0xDA, 0x95, 0x8E, 0x8E, 0xD9, 0x29, 0x5C, 0x56, 0x67, 0x3E,
-      0x0B, 0x17, 0x37, 0x61, 0x49, 0xC9, 0x9F, 0x0E, 0x8E, 0xD1, 0xDC, 0x17, 0x55, 0x11, 0x75, 0x6F },
-  },
-  {
     { 0xED, 0x2B, 0x81, 0xA0, 0xF8, 0xF1, 0x46, 0x5E, 0xA2, 0xF4, 0x17, 0xA4, 0xE8, 0x34, 0xC2, 0x2A,
       0x22, 0xEE, 0x7A, 0x9D, 0xDF, 0x59, 0xA8, 0x3B, 0x89, 0x82, 0xB0, 0xE1, 0x07, 0x19, 0x64, 0x42 },
   },
@@ -5769,10 +5389,6 @@
       0x4E, 0x45, 0x7B, 0x0C, 0x65, 0xC8, 0xE1, 0x4B, 0xCE, 0xDC, 0x7D, 0x4C, 0xC5, 0x1E, 0x81, 0xD0 },
   },
   {
-    { 0xF3, 0x92, 0xE5, 0xA3, 0xD3, 0xD4, 0xB9, 0xD9, 0x54, 0xD2, 0x79, 0x42, 0x19, 0x2B, 0x45, 0x60,
-      0xFC, 0x7B, 0xAE, 0x66, 0xE3, 0xE0, 0xE0, 0x90, 0x77, 0x1E, 0x99, 0x52, 0x32, 0xCB, 0x04, 0x4A },
-  },
-  {
     { 0xF3, 0xCB, 0x8E, 0xA4, 0xE8, 0xF2, 0xA7, 0x00, 0x9C, 0x23, 0x3A, 0x64, 0x88, 0x71, 0xDB, 0x46,
       0x04, 0xD5, 0x45, 0x4B, 0xC5, 0x55, 0x9E, 0x9B, 0xF1, 0xBB, 0x2E, 0xB0, 0x00, 0x99, 0x3B, 0xDF },
   },
@@ -5785,10 +5401,6 @@
       0xDB, 0xF5, 0xB6, 0xEE, 0x89, 0x4F, 0x02, 0x5B, 0x9A, 0xDE, 0x25, 0x88, 0xA9, 0xB5, 0x5D, 0x9B },
   },
   {
-    { 0xF4, 0x6A, 0x61, 0x8B, 0x01, 0x72, 0xCF, 0xC1, 0x50, 0xBE, 0xDC, 0x17, 0xDF, 0x7D, 0xE7, 0x0A,
-      0xB2, 0x24, 0xF5, 0x22, 0x61, 0x39, 0x9F, 0x9E, 0x9F, 0xCD, 0x78, 0x4E, 0x87, 0x88, 0xDF, 0xC0 },
-  },
-  {
     { 0xF4, 0x83, 0x3E, 0x73, 0x82, 0x42, 0x02, 0x18, 0xFF, 0xA7, 0x8D, 0xFA, 0x23, 0x50, 0x0E, 0x7D,
       0x34, 0x8F, 0x80, 0xFB, 0x87, 0xE9, 0x82, 0x48, 0x61, 0x3B, 0x59, 0x24, 0x2D, 0x99, 0x1A, 0x78 },
   },
@@ -5809,10 +5421,6 @@
       0xE7, 0x4B, 0x4C, 0x3E, 0xFA, 0xB5, 0xE0, 0xF6, 0xDD, 0xA9, 0x20, 0xD2, 0x3D, 0xB7, 0xCC, 0x73 },
   },
   {
-    { 0xF5, 0x57, 0xEF, 0x9B, 0x25, 0xA1, 0x6D, 0x84, 0xC6, 0x41, 0xFF, 0x1C, 0x59, 0xBC, 0x55, 0x46,
-      0x21, 0xB5, 0xA0, 0xF3, 0x3E, 0xD7, 0x2F, 0xF0, 0x97, 0x1A, 0x80, 0xD2, 0xF5, 0x30, 0x5B, 0x29 },
-  },
-  {
     { 0xF5, 0x82, 0xF1, 0x66, 0xB8, 0x2B, 0xED, 0x47, 0xEF, 0xE3, 0x66, 0x1A, 0xA8, 0x02, 0x32, 0xFA,
       0x81, 0x67, 0xD2, 0xE8, 0x97, 0x96, 0xA3, 0x66, 0xEA, 0x35, 0xAD, 0x40, 0xA1, 0xBA, 0x2F, 0x66 },
   },
@@ -5905,10 +5513,6 @@
       0x79, 0x2A, 0xF0, 0xBE, 0x06, 0x5D, 0xDD, 0x59, 0xCA, 0x2C, 0x28, 0x61, 0xFB, 0x32, 0xC3, 0x2A },
   },
   {
-    { 0xF8, 0x45, 0x45, 0x10, 0xBD, 0x64, 0x09, 0x41, 0x61, 0xA9, 0xBA, 0xFE, 0x9B, 0xE3, 0x46, 0xE4,
-      0x2E, 0xAA, 0xAD, 0xB7, 0x2F, 0x89, 0x95, 0xCB, 0xD5, 0x2D, 0xD8, 0xF3, 0x76, 0x2E, 0x7A, 0xDF },
-  },
-  {
     { 0xF8, 0x64, 0x44, 0x3E, 0x2F, 0x63, 0x9E, 0x7C, 0xFF, 0xD2, 0x42, 0x21, 0xF6, 0x1B, 0xBF, 0xF0,
       0x7C, 0xCE, 0x5C, 0x61, 0xDD, 0xB1, 0x68, 0xB3, 0xB4, 0x04, 0xD7, 0xC8, 0xCD, 0xCA, 0x18, 0xB2 },
   },
@@ -5937,10 +5541,6 @@
       0x00, 0x7E, 0xE3, 0x7A, 0x39, 0x3C, 0x32, 0xE0, 0xFB, 0x34, 0xFC, 0xF1, 0x05, 0x5D, 0x51, 0x8F },
   },
   {
-    { 0xF9, 0x34, 0x26, 0x2E, 0x54, 0xE9, 0x11, 0x63, 0x7F, 0x69, 0xF6, 0xD2, 0x41, 0x2A, 0xB8, 0xED,
-      0x6E, 0xBA, 0x6D, 0xBC, 0xE6, 0x03, 0x30, 0xE5, 0x98, 0x9E, 0x21, 0x6F, 0x38, 0xA4, 0x72, 0xF5 },
-  },
-  {
     { 0xF9, 0x8B, 0x43, 0x93, 0xF7, 0xC3, 0x1D, 0x37, 0x03, 0x49, 0x81, 0x63, 0xE7, 0x77, 0x9F, 0x75,
       0xDE, 0xF6, 0xAF, 0x44, 0x10, 0x44, 0x6A, 0x03, 0x4D, 0x52, 0x8C, 0xB7, 0x14, 0x3A, 0xA0, 0x13 },
   },
@@ -5961,10 +5561,6 @@
       0x36, 0x62, 0x6B, 0x1E, 0x53, 0x6E, 0xCF, 0xAE, 0x7B, 0xB7, 0x34, 0xC2, 0xE6, 0xD0, 0xE9, 0xDE },
   },
   {
-    { 0xFA, 0x13, 0xD2, 0x6B, 0x64, 0xB9, 0xF9, 0x28, 0x83, 0xD8, 0xE9, 0x39, 0xFA, 0x1B, 0x54, 0x48,
-      0xEF, 0xBE, 0xDE, 0x98, 0x65, 0x1F, 0xE4, 0xCB, 0x66, 0xF3, 0xC2, 0x3C, 0xBB, 0x4B, 0x3C, 0x42 },
-  },
-  {
     { 0xFA, 0x2A, 0x2F, 0x77, 0x8C, 0xBE, 0xF9, 0xF1, 0xB4, 0xA8, 0xFC, 0x57, 0xBF, 0x79, 0x5F, 0x1F,
       0x8C, 0xF6, 0x23, 0xDB, 0x15, 0xBE, 0x65, 0x81, 0xEB, 0xA3, 0x6B, 0x2A, 0x86, 0x49, 0xD2, 0x1E },
   },
@@ -5985,10 +5581,6 @@
       0x87, 0xB7, 0xE2, 0x24, 0x6B, 0xE6, 0x0F, 0xBC, 0x26, 0x2A, 0x53, 0x52, 0xAD, 0xAC, 0x18, 0x01 },
   },
   {
-    { 0xFB, 0x40, 0x65, 0xD1, 0x67, 0x6A, 0x13, 0x9F, 0x31, 0xA4, 0xCB, 0x44, 0x1D, 0xDD, 0xFF, 0x01,
-      0xF4, 0x1E, 0x71, 0x13, 0x22, 0xD8, 0x18, 0x69, 0xA0, 0xF9, 0x2B, 0x98, 0x36, 0x96, 0xB0, 0x31 },
-  },
-  {
     { 0xFB, 0x44, 0x15, 0x70, 0x4C, 0x1D, 0x61, 0x55, 0x10, 0x6D, 0x88, 0xF3, 0xB2, 0x0F, 0xEC, 0x9F,
       0x6E, 0x82, 0x0C, 0x82, 0x24, 0xFE, 0xE3, 0x5E, 0x45, 0x22, 0x85, 0x19, 0x05, 0xF3, 0x28, 0xD7 },
   },
@@ -6061,10 +5653,6 @@
       0xFA, 0x60, 0xEB, 0xFD, 0x0A, 0x06, 0x0A, 0x49, 0x93, 0x89, 0x98, 0x8A, 0x2C, 0x2C, 0x05, 0xCE },
   },
   {
-    { 0xFD, 0x06, 0x03, 0x90, 0xD6, 0xAA, 0xDA, 0x5C, 0xF9, 0x5A, 0xB2, 0x09, 0x56, 0x06, 0xB3, 0xA7,
-      0xC5, 0x91, 0x07, 0xE8, 0x2C, 0x5A, 0x96, 0xB8, 0x52, 0xC9, 0x1D, 0xF4, 0xCB, 0xB0, 0xC9, 0x8E },
-  },
-  {
     { 0xFD, 0x44, 0x89, 0xF0, 0x27, 0x27, 0xDB, 0x36, 0xC1, 0x84, 0x35, 0xE5, 0xC4, 0xA9, 0xF8, 0x63,
       0xAC, 0xD8, 0x04, 0xAE, 0x1B, 0x39, 0x7F, 0xBB, 0x83, 0xD4, 0x27, 0x5A, 0xF5, 0x6D, 0xF8, 0x9F },
   },
@@ -6105,10 +5693,6 @@
       0x42, 0xEB, 0xF4, 0x31, 0xE3, 0xBA, 0x75, 0x4A, 0xA2, 0xD9, 0x47, 0x5E, 0x98, 0x0B, 0x6E, 0x3A },
   },
   {
-    { 0xFE, 0xBD, 0xF9, 0xBE, 0x24, 0x40, 0x7F, 0x39, 0x99, 0x66, 0x92, 0xB1, 0xDC, 0xA0, 0xFD, 0x28,
-      0x17, 0xE8, 0xC3, 0xD0, 0x25, 0x4A, 0x41, 0xCE, 0x83, 0xFB, 0xF1, 0x88, 0x95, 0xE9, 0x64, 0x57 },
-  },
-  {
     { 0xFE, 0xC5, 0xFF, 0x1D, 0x4E, 0x56, 0x49, 0xB0, 0x1F, 0xBA, 0xAB, 0xD9, 0x02, 0x2D, 0xBF, 0x86,
       0xA7, 0x60, 0x2D, 0x89, 0x04, 0x45, 0x1B, 0xF4, 0x93, 0xC4, 0xAF, 0xE1, 0x1C, 0x99, 0xAE, 0x07 },
   },
@@ -6129,10 +5713,6 @@
       0x1E, 0x9F, 0x0C, 0xDF, 0xCC, 0xB4, 0x9D, 0x43, 0xBA, 0x30, 0x49, 0xBF, 0xDD, 0x2C, 0x41, 0xB1 },
   },
   {
-    { 0xFF, 0xAC, 0x95, 0x37, 0x95, 0xBF, 0x22, 0x6D, 0xD1, 0xAA, 0x3E, 0xBE, 0x85, 0x64, 0xDB, 0x87,
-      0x93, 0xB5, 0x03, 0xF8, 0xC2, 0x38, 0x16, 0x0B, 0xA0, 0x65, 0x7D, 0xF7, 0xFD, 0xAD, 0xBE, 0x88 },
-  },
-  {
     { 0xFF, 0xC9, 0x74, 0x1A, 0x5E, 0x6A, 0x5A, 0x7C, 0xC3, 0xBB, 0x10, 0xCA, 0x31, 0x3F, 0x97, 0x7A,
       0xA9, 0xCC, 0xC1, 0x92, 0x28, 0xDB, 0xE1, 0x39, 0xB0, 0xC2, 0xD9, 0xF1, 0xF4, 0x1D, 0x83, 0x1B },
   },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp	2015-04-24 19:30:50.000000000 +0000
@@ -11,6 +11,7 @@
 #include "ExtendedValidation.h"
 #include "OCSPRequestor.h"
 #include "certdb.h"
+#include "cert.h"
 #include "mozilla/UniquePtr.h"
 #include "nsNSSCertificate.h"
 #include "nss.h"
@@ -63,39 +64,6 @@
 {
 }
 
-// E=igca@sgdn.pm.gouv.fr,CN=IGC/A,OU=DCSSI,O=PM/SGDN,L=Paris,ST=France,C=FR
-static const uint8_t ANSSI_SUBJECT_DATA[] =
-                       "\x30\x81\x85\x31\x0B\x30\x09\x06\x03\x55\x04"
-                       "\x06\x13\x02\x46\x52\x31\x0F\x30\x0D\x06\x03"
-                       "\x55\x04\x08\x13\x06\x46\x72\x61\x6E\x63\x65"
-                       "\x31\x0E\x30\x0C\x06\x03\x55\x04\x07\x13\x05"
-                       "\x50\x61\x72\x69\x73\x31\x10\x30\x0E\x06\x03"
-                       "\x55\x04\x0A\x13\x07\x50\x4D\x2F\x53\x47\x44"
-                       "\x4E\x31\x0E\x30\x0C\x06\x03\x55\x04\x0B\x13"
-                       "\x05\x44\x43\x53\x53\x49\x31\x0E\x30\x0C\x06"
-                       "\x03\x55\x04\x03\x13\x05\x49\x47\x43\x2F\x41"
-                       "\x31\x23\x30\x21\x06\x09\x2A\x86\x48\x86\xF7"
-                       "\x0D\x01\x09\x01\x16\x14\x69\x67\x63\x61\x40"
-                       "\x73\x67\x64\x6E\x2E\x70\x6D\x2E\x67\x6F\x75"
-                       "\x76\x2E\x66\x72";
-
-static const uint8_t PERMIT_FRANCE_GOV_NAME_CONSTRAINTS_DATA[] =
-                       "\x30\x5D" // SEQUENCE (length=93)
-                       "\xA0\x5B" // permittedSubtrees (length=91)
-                       "\x30\x05\x82\x03" ".fr"
-                       "\x30\x05\x82\x03" ".gp"
-                       "\x30\x05\x82\x03" ".gf"
-                       "\x30\x05\x82\x03" ".mq"
-                       "\x30\x05\x82\x03" ".re"
-                       "\x30\x05\x82\x03" ".yt"
-                       "\x30\x05\x82\x03" ".pm"
-                       "\x30\x05\x82\x03" ".bl"
-                       "\x30\x05\x82\x03" ".mf"
-                       "\x30\x05\x82\x03" ".wf"
-                       "\x30\x05\x82\x03" ".pf"
-                       "\x30\x05\x82\x03" ".nc"
-                       "\x30\x05\x82\x03" ".tf";
-
 // If useRoots is true, we only use root certificates in the candidate list.
 // If useRoots is false, we only use non-root certificates in the list.
 static Result
@@ -116,23 +84,30 @@
       continue; // probably too big
     }
 
-    Input anssiSubject;
-    rv = anssiSubject.Init(ANSSI_SUBJECT_DATA, sizeof(ANSSI_SUBJECT_DATA) - 1);
-    if (rv != Success) {
-      return Result::FATAL_ERROR_LIBRARY_FAILURE;
-    }
-    // TODO: Use CERT_CompareName or equivalent
-    if (InputsAreEqual(encodedIssuerName, anssiSubject)) {
-      Input anssiNameConstraints;
-      if (anssiNameConstraints.Init(
-              PERMIT_FRANCE_GOV_NAME_CONSTRAINTS_DATA,
-              sizeof(PERMIT_FRANCE_GOV_NAME_CONSTRAINTS_DATA) - 1)
-            != Success) {
+    const SECItem encodedIssuerNameItem = {
+      siBuffer,
+      const_cast<unsigned char*>(encodedIssuerName.UnsafeGetData()),
+      encodedIssuerName.GetLength()
+    };
+    ScopedSECItem nameConstraints(::SECITEM_AllocItem(nullptr, nullptr, 0));
+    SECStatus srv = CERT_GetImposedNameConstraints(&encodedIssuerNameItem,
+                                                   nameConstraints.get());
+    if (srv != SECSuccess) {
+      if (PR_GetError() != SEC_ERROR_EXTENSION_NOT_FOUND) {
         return Result::FATAL_ERROR_LIBRARY_FAILURE;
       }
-      rv = checker.Check(certDER, &anssiNameConstraints, keepGoing);
-    } else {
+
+      // If no imposed name constraints were found, continue without them
       rv = checker.Check(certDER, nullptr, keepGoing);
+    } else {
+      // Otherwise apply the constraints
+      Input nameConstraintsInput;
+      if (nameConstraintsInput.Init(
+              nameConstraints->data,
+              nameConstraints->len) != Success) {
+        return Result::FATAL_ERROR_LIBRARY_FAILURE;
+      }
+      rv = checker.Check(certDER, &nameConstraintsInput, keepGoing);
     }
     if (rv != Success) {
       return rv;
@@ -151,10 +126,10 @@
 {
   // TODO: NSS seems to be ambiguous between "no potential issuers found" and
   // "there was an error trying to retrieve the potential issuers."
-  SECItem encodedIssuerNameSECItem = UnsafeMapInputToSECItem(encodedIssuerName);
+  SECItem encodedIssuerNameItem = UnsafeMapInputToSECItem(encodedIssuerName);
   ScopedCERTCertList
     candidates(CERT_CreateSubjectCertList(nullptr, CERT_GetDefaultCertDB(),
-                                          &encodedIssuerNameSECItem, 0,
+                                          &encodedIssuerNameItem, 0,
                                           false));
   if (candidates) {
     // First, try all the root certs; then try all the non-root certs.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/boot/public/nsISecurityUITelemetry.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/boot/public/nsISecurityUITelemetry.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/boot/public/nsISecurityUITelemetry.idl	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/boot/public/nsISecurityUITelemetry.idl	2015-04-24 19:30:50.000000000 +0000
@@ -6,7 +6,7 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(f7259bf4-1f2b-4e9e-8983-1978cc076fa1)]
+[scriptable, uuid(56e190a0-2802-4fc4-b09f-bcda357035c3)]
 
 interface nsISecurityUITelemetry : nsISupports {
 
@@ -141,6 +141,17 @@
 const uint32_t WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_FLAG_UNTRUSTED = 1;
 const uint32_t WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_FLAG_DOMAIN = 2;
 const uint32_t WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_FLAG_TIME = 4;
-// This uses up buckets till 91 (including)
+
+// Another Safe Browsing list (like malware & phishing above)
+const uint32_t WARNING_UNWANTED_PAGE_TOP = 92;
+const uint32_t WARNING_UNWANTED_PAGE_TOP_WHY_BLOCKED = 93;
+const uint32_t WARNING_UNWANTED_PAGE_TOP_GET_ME_OUT_OF_HERE = 94;
+const uint32_t WARNING_UNWANTED_PAGE_TOP_IGNORE_WARNING = 95;
+const uint32_t WARNING_UNWANTED_PAGE_FRAME = 96;
+const uint32_t WARNING_UNWANTED_PAGE_FRAME_WHY_BLOCKED = 97;
+const uint32_t WARNING_UNWANTED_PAGE_FRAME_GET_ME_OUT_OF_HERE = 98;
+const uint32_t WARNING_UNWANTED_PAGE_FRAME_IGNORE_WARNING = 99;
+
+// This uses up buckets till 99 (including)
 // We only have buckets up to 100.
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/pki/src/nsNSSDialogHelper.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/pki/src/nsNSSDialogHelper.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/pki/src/nsNSSDialogHelper.cpp	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/pki/src/nsNSSDialogHelper.cpp	2015-04-24 19:30:51.000000000 +0000
@@ -23,6 +23,12 @@
     nsISupports *params,
     bool modal)
 {
+#ifdef MOZ_WIDGET_GONK
+  // On b2g devices, we need to proxy the dialog creation & management
+  // to Gaia.
+  return NS_ERROR_NOT_IMPLEMENTED;
+#endif
+
   nsresult rv;
   nsCOMPtr<nsIWindowWatcher> windowWatcher = 
            do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/src/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/src/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/src/moz.build	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/src/moz.build	2015-04-24 19:30:51.000000000 +0000
@@ -23,6 +23,10 @@
     'PublicSSL.h',
 ]
 
+EXPORTS.mozilla.psm += [
+    'PSMContentListener.h',
+]
+
 UNIFIED_SOURCES += [
     'CryptoTask.cpp',
     'nsCertOverrideService.cpp',
@@ -74,6 +78,10 @@
     'nsNSSCertificateDB.cpp',
 ]
 
+IPDL_SOURCES += [
+    'PPSMContentDownloader.ipdl',
+]
+
 LOCAL_INCLUDES += [
     '/security/manager/boot/src',
 ]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/src/nsNSSModule.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/src/nsNSSModule.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/src/nsNSSModule.cpp	2015-04-22 13:05:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/src/nsNSSModule.cpp	2015-04-24 19:30:51.000000000 +0000
@@ -135,14 +135,20 @@
 {                                                                             \
     nsresult rv;                                                              \
                                                                               \
-    *aResult = nullptr;                                                          \
-    if (nullptr != aOuter) {                                                     \
+    *aResult = nullptr;                                                       \
+    if (nullptr != aOuter) {                                                  \
         rv = NS_ERROR_NO_AGGREGATION;                                         \
         return rv;                                                            \
     }                                                                         \
                                                                               \
-    if (!EnsureNSSInitialized(ensureOperator))                                \
+    if (!NS_IS_PROCESS_DEFAULT &&                                             \
+        ensureOperator == nssEnsureChromeOrContent) {                         \
+        if (!EnsureNSSInitializedChromeOrContent()) {                         \
+            return NS_ERROR_FAILURE;                                          \
+        }                                                                     \
+    } else if (!EnsureNSSInitialized(ensureOperator)) {                       \
         return NS_ERROR_FAILURE;                                              \
+    }                                                                         \
                                                                               \
     if (NS_IS_PROCESS_DEFAULT)                                                \
         NS_NSS_INSTANTIATE_INIT(ensureOperator,                               \
@@ -182,7 +188,7 @@
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsSecretDecoderRing)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsPK11TokenDB)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsPKCS11ModuleDB)
-NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nssEnsure, PSMContentListener, init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(PSMContentListener, init)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_BYPROCESS(nssEnsureOnChromeOnly,
                                              nsNSSCertificate,
                                              nsNSSCertificateFakeTransport)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/src/PPSMContentDownloader.ipdl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/src/PPSMContentDownloader.ipdl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/src/PPSMContentDownloader.ipdl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/src/PPSMContentDownloader.ipdl	2015-04-24 19:30:51.000000000 +0000
@@ -0,0 +1,28 @@
+/* vim: set sw=2 sts=2 ts=2 et tw=80 ft=cpp: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 protocol PContent;
+include protocol PChannelDiverter;
+
+namespace mozilla {
+namespace psm {
+
+protocol PPSMContentDownloader
+{
+  manager PContent;
+
+parent:
+  OnStartRequest(uint32_t contentLength);
+  OnDataAvailable(nsCString data, uint64_t offset, uint32_t count);
+  OnStopRequest(nsresult code);
+
+  DivertToParentUsing(PChannelDiverter diverter);
+
+child:
+  __delete__();
+};
+
+} // namespace psm
+} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/src/PSMContentListener.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/src/PSMContentListener.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/src/PSMContentListener.cpp	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/src/PSMContentListener.cpp	2015-04-24 19:30:51.000000000 +0000
@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set sw=2 sts=2 ts=2 et 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
@@ -6,16 +7,22 @@
 
 #include "PSMContentListener.h"
 
+#include "nsIDivertableChannel.h"
 #include "nsIStreamListener.h"
 #include "nsIX509CertDB.h"
+#include "nsIXULAppInfo.h"
 
 #include "mozilla/Casting.h"
 #include "mozilla/Services.h"
+#include "mozilla/unused.h"
+
+#include "mozilla/dom/ContentChild.h"
+#include "mozilla/net/ChannelDiverterParent.h"
+#include "mozilla/net/ChannelDiverterChild.h"
 
 #include "nsCRT.h"
 #include "nsNetUtil.h"
 #include "nsNSSHelper.h"
-#include "nsNSSShutDown.h"
 
 #include "prlog.h"
 
@@ -27,139 +34,140 @@
 
 namespace {
 
-class PSMContentDownloader : public nsIStreamListener
-{
-public:
-  PSMContentDownloader() {NS_ASSERTION(false, "don't use this constructor."); }
-  explicit PSMContentDownloader(uint32_t type);
-  void setSilentDownload(bool flag);
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIREQUESTOBSERVER
-  NS_DECL_NSISTREAMLISTENER
-
-  enum {UNKNOWN_TYPE = 0};
-  enum {X509_CA_CERT  = 1};
-  enum {X509_USER_CERT  = 2};
-  enum {X509_EMAIL_CERT  = 3};
-  enum {X509_SERVER_CERT  = 4};
-
-protected:
-  virtual ~PSMContentDownloader();
-
-  char* mByteData;
-  int32_t mBufferOffset;
-  int32_t mBufferSize;
-  uint32_t mType;
-  nsCOMPtr<nsIURI> mURI;
+const int32_t kDefaultCertAllocLength = 2048;
+
+enum {
+  UNKNOWN_TYPE = 0,
+  X509_CA_CERT = 1,
+  X509_USER_CERT = 2,
+  X509_EMAIL_CERT = 3,
+  X509_SERVER_CERT = 4
 };
 
-PSMContentDownloader::PSMContentDownloader(uint32_t type)
-  : mByteData(nullptr),
-    mType(type)
+/* other mime types that we should handle sometime:
+
+   application/x-pkcs7-mime
+   application/pkcs7-signature
+   application/pre-encrypted
+
+*/
+
+uint32_t
+getPSMContentType(const char* aContentType)
 {
+  // Don't forget to update the registration of content listeners in nsNSSModule.cpp
+  // for every supported content type.
+
+  if (!nsCRT::strcasecmp(aContentType, "application/x-x509-ca-cert"))
+    return X509_CA_CERT;
+  if (!nsCRT::strcasecmp(aContentType, "application/x-x509-server-cert"))
+    return X509_SERVER_CERT;
+  if (!nsCRT::strcasecmp(aContentType, "application/x-x509-user-cert"))
+    return X509_USER_CERT;
+  if (!nsCRT::strcasecmp(aContentType, "application/x-x509-email-cert"))
+    return X509_EMAIL_CERT;
+
+  return UNKNOWN_TYPE;
 }
 
-PSMContentDownloader::~PSMContentDownloader()
+int64_t
+ComputeContentLength(nsIRequest* request)
 {
-  if (mByteData)
-    free(mByteData);
+  nsCOMPtr<nsIChannel> channel(do_QueryInterface(request));
+  if (!channel) {
+    return -1;
+  }
+
+  int64_t contentLength;
+  nsresult rv = channel->GetContentLength(&contentLength);
+  if (NS_FAILED(rv) || contentLength <= 0) {
+    return kDefaultCertAllocLength;
+  }
+
+  if (contentLength > INT32_MAX) {
+    return -1;
+  }
+
+  return contentLength;
 }
 
-NS_IMPL_ISUPPORTS(PSMContentDownloader, nsIStreamListener, nsIRequestObserver)
+} // unnamed namespace
 
-const int32_t kDefaultCertAllocLength = 2048;
+/* ------------------------
+ * PSMContentStreamListener
+ * ------------------------ */
+
+PSMContentStreamListener::PSMContentStreamListener(uint32_t type)
+  : mType(type)
+{
+}
+
+PSMContentStreamListener::~PSMContentStreamListener()
+{
+}
+
+NS_IMPL_ISUPPORTS(PSMContentStreamListener, nsIStreamListener, nsIRequestObserver)
 
 NS_IMETHODIMP
-PSMContentDownloader::OnStartRequest(nsIRequest* request, nsISupports* context)
+PSMContentStreamListener::OnStartRequest(nsIRequest* request, nsISupports* context)
 {
-  nsresult rv;
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CertDownloader::OnStartRequest\n"));
-  nsCOMPtr<nsIChannel> channel(do_QueryInterface(request));
-  if (!channel) return NS_ERROR_FAILURE;
 
-  // Get the URI //
-  channel->GetURI(getter_AddRefs(mURI));
+  int64_t contentLength = ComputeContentLength(request);
+  if (contentLength < 0) {
+    return NS_ERROR_FAILURE;
+  }
 
-  int64_t contentLength;
-  rv = channel->GetContentLength(&contentLength);
-  if (NS_FAILED(rv) || contentLength <= 0)
-    contentLength = kDefaultCertAllocLength;
-  if (contentLength > INT32_MAX)
-    return NS_ERROR_OUT_OF_MEMORY;
-  
-  mBufferOffset = 0;
-  mBufferSize = 0;
-  mByteData = (char*)moz_xmalloc(AssertedCast<size_t>(contentLength));
-  if (!mByteData)
-    return NS_ERROR_OUT_OF_MEMORY;
-  
-  mBufferSize = int32_t(contentLength);
+  mByteData.SetCapacity(contentLength);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-PSMContentDownloader::OnDataAvailable(nsIRequest* request,
-                                nsISupports* context,
-                                nsIInputStream *aIStream,
-                                uint64_t aSourceOffset,
-                                uint32_t aLength)
-{
-  if (!mByteData)
-    return NS_ERROR_OUT_OF_MEMORY;
-  
-  uint32_t amt;
-  nsresult err;
-  //Do a check to see if we need to allocate more memory.
-  if ((mBufferOffset + (int32_t)aLength) > mBufferSize) {
-      size_t newSize = (mBufferOffset + aLength) *2; // grow some more than needed
-      char *newBuffer;
-      newBuffer = (char*)moz_xrealloc(mByteData, newSize);
-      if (!newBuffer) {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-      mByteData = newBuffer;
-      mBufferSize = newSize;
-  }
-  
+PSMContentStreamListener::OnDataAvailable(nsIRequest* request,
+                                          nsISupports* context,
+                                          nsIInputStream* aIStream,
+                                          uint64_t aSourceOffset,
+                                          uint32_t aLength)
+{
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CertDownloader::OnDataAvailable\n"));
-  do {
-    err = aIStream->Read(mByteData+mBufferOffset,
-                         aLength, &amt);
-    if (NS_FAILED(err)) return err;
-    if (amt == 0) break;
-    
-    aLength -= amt;
-    mBufferOffset += amt;
-    
-  } while (aLength > 0);
-  
+
+  nsCString chunk;
+  nsresult rv = NS_ReadInputStreamToString(aIStream, chunk, aLength);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  mByteData.Append(chunk);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-PSMContentDownloader::OnStopRequest(nsIRequest* request,
-                              nsISupports* context,
-                              nsresult aStatus)
-{
-  nsNSSShutDownPreventionLock locker;
-  //Check if the download succeeded - it might have failed due to
-  //network issues, etc.
-  if (NS_FAILED(aStatus)){
-    return aStatus;
-  }
-
+PSMContentStreamListener::OnStopRequest(nsIRequest* request,
+                                        nsISupports* context,
+                                        nsresult aStatus)
+{
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CertDownloader::OnStopRequest\n"));
 
+  // Because importing the cert can spin the event loop (via alerts), we can't
+  // do it here. Do it off the event loop instead.
+  nsCOMPtr<nsIRunnable> r =
+    NS_NewRunnableMethod(this, &PSMContentStreamListener::ImportCertificate);
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(r)));
+
+  return NS_OK;
+}
+
+void
+PSMContentStreamListener::ImportCertificate()
+{
   nsCOMPtr<nsIX509CertDB> certdb;
 
-  nsresult rv;
   nsCOMPtr<nsIInterfaceRequestor> ctx = new PipUIContext();
 
   switch (mType) {
-  case PSMContentDownloader::X509_CA_CERT:
-  case PSMContentDownloader::X509_USER_CERT:
-  case PSMContentDownloader::X509_EMAIL_CERT:
+  case X509_CA_CERT:
+  case X509_USER_CERT:
+  case X509_EMAIL_CERT:
     certdb = do_GetService(NS_X509CERTDB_CONTRACTID);
     break;
 
@@ -167,48 +175,172 @@
     break;
   }
 
+  if (!certdb) {
+    return;
+  }
+
   switch (mType) {
-  case PSMContentDownloader::X509_CA_CERT:
-    return certdb->ImportCertificates((uint8_t*)mByteData, mBufferOffset, mType, ctx); 
-  case PSMContentDownloader::X509_USER_CERT:
-    return certdb->ImportUserCertificate((uint8_t*)mByteData, mBufferOffset, ctx);
-  case PSMContentDownloader::X509_EMAIL_CERT:
-    return certdb->ImportEmailCertificate((uint8_t*)mByteData, mBufferOffset, ctx); 
+  case X509_CA_CERT:
+    certdb->ImportCertificates(reinterpret_cast<uint8_t*>(mByteData.BeginWriting()),
+                               mByteData.Length(), mType, ctx);
+    break;
+
+  case X509_USER_CERT:
+    certdb->ImportUserCertificate(reinterpret_cast<uint8_t*>(mByteData.BeginWriting()),
+                                  mByteData.Length(), ctx);
+    break;
+
+  case X509_EMAIL_CERT:
+    certdb->ImportEmailCertificate(reinterpret_cast<uint8_t*>(mByteData.BeginWriting()),
+                                   mByteData.Length(), ctx);
+    break;
+
   default:
-    rv = NS_ERROR_FAILURE;
     break;
   }
-  
+}
+
+/* ------------------------
+ * PSMContentDownloaderParent
+ * ------------------------ */
+
+PSMContentDownloaderParent::PSMContentDownloaderParent(uint32_t type)
+  : PSMContentStreamListener(type)
+  , mIPCOpen(true)
+{
+}
+
+PSMContentDownloaderParent::~PSMContentDownloaderParent()
+{
+}
+
+bool
+PSMContentDownloaderParent::RecvOnStartRequest(const uint32_t& contentLength)
+{
+  mByteData.SetCapacity(contentLength);
+  return true;
+}
+
+bool
+PSMContentDownloaderParent::RecvOnDataAvailable(const nsCString& data,
+                                                const uint64_t& offset,
+                                                const uint32_t& count)
+{
+  mByteData.Append(data);
+  return true;
+}
+
+bool
+PSMContentDownloaderParent::RecvOnStopRequest(const nsresult& code)
+{
+  if (NS_SUCCEEDED(code)) {
+    // See also PSMContentStreamListener::OnStopRequest. In this case, we don't
+    // have to dispatch ImportCertificate off of an event because we don't have
+    // to worry about Necko sending "clean up" events and destroying us if
+    // ImportCertificate spins the event loop.
+    ImportCertificate();
+  }
+
+  if (mIPCOpen) {
+    mozilla::unused << Send__delete__(this);
+  }
+  return true;
+}
+
+NS_IMETHODIMP
+PSMContentDownloaderParent::OnStopRequest(nsIRequest* request, nsISupports* context, nsresult code)
+{
+  nsresult rv = PSMContentStreamListener::OnStopRequest(request, context, code);
+
+  if (mIPCOpen) {
+    mozilla::unused << Send__delete__(this);
+  }
   return rv;
 }
 
-/* other mime types that we should handle sometime:
-   
-   application/x-pkcs7-mime
-   application/pkcs7-signature
-   application/pre-encrypted
-   
-*/
+bool
+PSMContentDownloaderParent::RecvDivertToParentUsing(mozilla::net::PChannelDiverterParent* diverter)
+{
+  MOZ_ASSERT(diverter);
+  auto p = static_cast<mozilla::net::ChannelDiverterParent*>(diverter);
+  p->DivertTo(this);
+  mozilla::unused << p->Send__delete__(p);
+  return true;
+}
 
-uint32_t
-getPSMContentType(const char * aContentType)
-{ 
-  // Don't forget to update the registration of content listeners in nsNSSModule.cpp 
-  // for every supported content type.
-  
-  if (!nsCRT::strcasecmp(aContentType, "application/x-x509-ca-cert"))
-    return PSMContentDownloader::X509_CA_CERT;
-  else if (!nsCRT::strcasecmp(aContentType, "application/x-x509-server-cert"))
-    return PSMContentDownloader::X509_SERVER_CERT;
-  else if (!nsCRT::strcasecmp(aContentType, "application/x-x509-user-cert"))
-    return PSMContentDownloader::X509_USER_CERT;
-  else if (!nsCRT::strcasecmp(aContentType, "application/x-x509-email-cert"))
-    return PSMContentDownloader::X509_EMAIL_CERT;
+void
+PSMContentDownloaderParent::ActorDestroy(ActorDestroyReason why)
+{
+  mIPCOpen = false;
+}
+
+/* ------------------------
+ * PSMContentDownloaderChild
+ * ------------------------ */
+
+NS_IMPL_ISUPPORTS(PSMContentDownloaderChild, nsIStreamListener)
 
-  return PSMContentDownloader::UNKNOWN_TYPE;
+PSMContentDownloaderChild::PSMContentDownloaderChild()
+{
 }
 
-} // unnamed namespace
+PSMContentDownloaderChild::~PSMContentDownloaderChild()
+{
+}
+
+NS_IMETHODIMP
+PSMContentDownloaderChild::OnStartRequest(nsIRequest* request, nsISupports* context)
+{
+  nsCOMPtr<nsIDivertableChannel> divertable = do_QueryInterface(request);
+  if (divertable) {
+    mozilla::net::ChannelDiverterChild* diverter = nullptr;
+    nsresult rv = divertable->DivertToParent(&diverter);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    MOZ_ASSERT(diverter);
+
+    return SendDivertToParentUsing(diverter) ? NS_OK : NS_ERROR_FAILURE;
+  }
+
+  int64_t contentLength = ComputeContentLength(request);
+  if (contentLength < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mozilla::unused << SendOnStartRequest(contentLength);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+PSMContentDownloaderChild::OnDataAvailable(nsIRequest* request,
+                                           nsISupports* context,
+                                           nsIInputStream* aIStream,
+                                           uint64_t aSourceOffset,
+                                           uint32_t aLength)
+{
+  nsCString chunk;
+  nsresult rv = NS_ReadInputStreamToString(aIStream, chunk, aLength);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  mozilla::unused << SendOnDataAvailable(chunk, aSourceOffset, aLength);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+PSMContentDownloaderChild::OnStopRequest(nsIRequest* request,
+                                         nsISupports* context,
+                                         nsresult aStatus)
+{
+  mozilla::unused << SendOnStopRequest(aStatus);
+  return NS_OK;
+}
+
+/* ------------------------
+ * PSMContentListener
+ * ------------------------ */
 
 NS_IMPL_ISUPPORTS(PSMContentListener,
                   nsIURIContentListener,
@@ -231,7 +363,7 @@
 }
 
 NS_IMETHODIMP
-PSMContentListener::OnStartURIOpen(nsIURI *aURI, bool *aAbortOpen)
+PSMContentListener::OnStartURIOpen(nsIURI* aURI, bool* aAbortOpen)
 {
   //if we don't want to handle the URI, return true in
   //*aAbortOpen
@@ -239,73 +371,79 @@
 }
 
 NS_IMETHODIMP
-PSMContentListener::IsPreferred(const char * aContentType,
-                                 char ** aDesiredContentType,
-                                 bool * aCanHandleContent)
+PSMContentListener::IsPreferred(const char* aContentType,
+                                 char** aDesiredContentType,
+                                 bool* aCanHandleContent)
 {
   return CanHandleContent(aContentType, true,
                           aDesiredContentType, aCanHandleContent);
 }
 
 NS_IMETHODIMP
-PSMContentListener::CanHandleContent(const char * aContentType,
+PSMContentListener::CanHandleContent(const char* aContentType,
                                       bool aIsContentPreferred,
-                                      char ** aDesiredContentType,
-                                      bool * aCanHandleContent)
+                                      char** aDesiredContentType,
+                                      bool* aCanHandleContent)
 {
-  uint32_t type;
-  type = getPSMContentType(aContentType);
-  if (type == PSMContentDownloader::UNKNOWN_TYPE) {
-    *aCanHandleContent = false;
-  } else {
-    *aCanHandleContent = true;
-  }
+  uint32_t type = getPSMContentType(aContentType);
+  *aCanHandleContent = (type != UNKNOWN_TYPE);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-PSMContentListener::DoContent(const nsACString & aContentType,
+PSMContentListener::DoContent(const nsACString& aContentType,
                                bool aIsContentPreferred,
-                               nsIRequest * aRequest,
-                               nsIStreamListener ** aContentHandler,
-                               bool * aAbortProcess)
+                               nsIRequest* aRequest,
+                               nsIStreamListener** aContentHandler,
+                               bool* aAbortProcess)
 {
   uint32_t type;
   type = getPSMContentType(PromiseFlatCString(aContentType).get());
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("PSMContentListener::DoContent\n"));
-  if (type != PSMContentDownloader::UNKNOWN_TYPE) {
-    nsRefPtr<PSMContentDownloader> downLoader = new PSMContentDownloader(type);
-    downLoader.forget(aContentHandler);
+#ifdef PR_LOGGING
+  if (gPIPNSSLog) {
+    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("PSMContentListener::DoContent\n"));
+  }
+#endif
+  if (type != UNKNOWN_TYPE) {
+    nsCOMPtr<nsIStreamListener> downloader;
+    if (XRE_GetProcessType() == GeckoProcessType_Default) {
+      downloader = new PSMContentStreamListener(type);
+    } else {
+      downloader = static_cast<PSMContentDownloaderChild*>(
+          dom::ContentChild::GetSingleton()->SendPPSMContentDownloaderConstructor(type));
+    }
+
+    downloader.forget(aContentHandler);
     return NS_OK;
   }
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-PSMContentListener::GetLoadCookie(nsISupports * *aLoadCookie)
+PSMContentListener::GetLoadCookie(nsISupports** aLoadCookie)
 {
-  *aLoadCookie = mLoadCookie;
-  NS_IF_ADDREF(*aLoadCookie);
+  nsCOMPtr<nsISupports> loadCookie(mLoadCookie);
+  loadCookie.forget(aLoadCookie);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-PSMContentListener::SetLoadCookie(nsISupports * aLoadCookie)
+PSMContentListener::SetLoadCookie(nsISupports* aLoadCookie)
 {
   mLoadCookie = aLoadCookie;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-PSMContentListener::GetParentContentListener(nsIURIContentListener ** aContentListener)
+PSMContentListener::GetParentContentListener(nsIURIContentListener** aContentListener)
 {
-  *aContentListener = mParentContentListener;
-  NS_IF_ADDREF(*aContentListener);
+  nsCOMPtr<nsIURIContentListener> listener(mParentContentListener);
+  listener.forget(aContentListener);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-PSMContentListener::SetParentContentListener(nsIURIContentListener * aContentListener)
+PSMContentListener::SetParentContentListener(nsIURIContentListener* aContentListener)
 {
   mParentContentListener = aContentListener;
   return NS_OK;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/src/PSMContentListener.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/src/PSMContentListener.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/src/PSMContentListener.h	2015-04-22 13:05:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/src/PSMContentListener.h	2015-04-24 19:30:51.000000000 +0000
@@ -10,12 +10,84 @@
 #include "nsCOMPtr.h"
 #include "nsIURIContentListener.h"
 #include "nsWeakReference.h"
+#include "mozilla/psm/PPSMContentDownloaderChild.h"
+#include "mozilla/psm/PPSMContentDownloaderParent.h"
 
 #define NS_PSMCONTENTLISTEN_CID {0xc94f4a30, 0x64d7, 0x11d4, {0x99, 0x60, 0x00, 0xb0, 0xd0, 0x23, 0x54, 0xa0}}
 #define NS_PSMCONTENTLISTEN_CONTRACTID "@mozilla.org/security/psmdownload;1"
 
+namespace mozilla {
+namespace net {
+
+class PChannelDiverterParent;
+
+}
+}
+
 namespace mozilla { namespace psm {
 
+// PSMContentStreamListener for parent-process downloading.
+class PSMContentStreamListener : public nsIStreamListener
+{
+public:
+  explicit PSMContentStreamListener(uint32_t type);
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIREQUESTOBSERVER
+  NS_DECL_NSISTREAMLISTENER
+
+  void ImportCertificate();
+
+protected:
+  virtual ~PSMContentStreamListener();
+
+  nsCString mByteData;
+  uint32_t mType;
+};
+
+// Parent actor for importing a remote cert when the load was started by the
+// child.
+class PSMContentDownloaderParent : public PPSMContentDownloaderParent
+                                 , public PSMContentStreamListener
+{
+public:
+  explicit PSMContentDownloaderParent(uint32_t type);
+
+  virtual bool RecvOnStartRequest(const uint32_t &contentLength) override;
+  virtual bool RecvOnDataAvailable(const nsCString &data,
+                                   const uint64_t &offset,
+                                   const uint32_t &count) override;
+  virtual bool RecvOnStopRequest(const nsresult &code) override;
+
+  // We inherit most of nsIStreamListener from PSMContentStreamListener, but
+  // we have to override OnStopRequest to know when we're done with our IPC
+  // ref.
+  NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *aContext, nsresult code) override;
+
+  virtual bool RecvDivertToParentUsing(mozilla::net::PChannelDiverterParent *diverter) override;
+
+protected:
+  virtual ~PSMContentDownloaderParent();
+
+  virtual void ActorDestroy(ActorDestroyReason why) override;
+  bool mIPCOpen;
+};
+
+// Child actor for importing a cert.
+class PSMContentDownloaderChild : public nsIStreamListener
+                                , public PPSMContentDownloaderChild
+{
+public:
+  PSMContentDownloaderChild();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIREQUESTOBSERVER
+  NS_DECL_NSISTREAMLISTENER
+
+private:
+  ~PSMContentDownloaderChild();
+};
+
+
 class PSMContentListener : public nsIURIContentListener,
                            public nsSupportsWeakReference
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/tests/unit/xpcshell.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/tests/unit/xpcshell.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/ssl/tests/unit/xpcshell.ini	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/ssl/tests/unit/xpcshell.ini	2015-04-24 19:30:53.000000000 +0000
@@ -97,6 +97,9 @@
 
 [test_pinning.js]
 run-sequentially = hardcoded ports
+# This test can take longer than 300 seconds on B2G emulator debug builds, so
+# give it enough time to finish. See bug 1081128.
+requesttimeoutfactor = 2
 [test_ocsp_url.js]
 # OCSP requests in this test time out on slow B2G Emulator debug builds.
 # See Bug 1147725.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/tools/makeCNNICHashes.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/tools/makeCNNICHashes.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/manager/tools/makeCNNICHashes.js	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/manager/tools/makeCNNICHashes.js	2015-04-24 19:30:53.000000000 +0000
@@ -19,6 +19,7 @@
                 .getService(Ci.nsIX509CertDB);
 
 let { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
+let { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
 
 const HEADER = "// 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" +
@@ -105,8 +106,11 @@
 
 function loadCertificates(certFile) {
   let nowInMilliseconds = (new Date()).getTime();
+  // months are 0-indexed, so April is month 3 :(
+  let april1InMilliseconds = (new Date(2015, 3, 1)).getTime();
   let latestNotAfter = nowInMilliseconds;
   let certs = [];
+  let certMap = {};
   let invalidCerts = [];
   let paths = readFileContents(certFile).split("\n");
   for (let path of paths) {
@@ -121,13 +125,33 @@
     if (!cert) {
       cert = gCertDB.constructX509(certData, certData.length);
     }
+    // Don't add multiple copies of any particular certificate.
+    if (cert.sha256Fingerprint in certMap) {
+      continue;
+    }
+    certMap[cert.sha256Fingerprint] = true;
+    // If we can't verify the certificate, don't include it. Unfortunately, if
+    // a CNNIC-issued certificate wasn't previously on the whitelist but it
+    // otherwise verifies successfully, verifyCertNow will return
+    // SEC_ERROR_REVOKED_CERTIFICATE, so we count that as verifying
+    // successfully. If the certificate is later revoked by CNNIC, the user
+    // will see that when they attempt to connect to a site using it and we do
+    // normal revocation checking.
+    let errorCode = gCertDB.verifyCertNow(cert, 2 /* SSL Server */,
+                                          Ci.nsIX509CertDB.LOCAL_ONLY, {}, {});
+    if (errorCode != 0 &&
+        errorCode != -8180 /* SEC_ERROR_REVOKED_CERTIFICATE */) {
+      continue;
+    }
     let durationMilliseconds = (cert.validity.notAfter - cert.validity.notBefore) / 1000;
+    let notBeforeMilliseconds = cert.validity.notBefore / 1000;
     let notAfterMilliseconds = cert.validity.notAfter / 1000;
-    // Only consider certificates that haven't expired and have a validity
-    // period shorter than 6 years (there is a delegated OCSP responder
-    // certificate with a validity period of 6 years that should be on the
-    // whitelist).
-    if (notAfterMilliseconds > nowInMilliseconds &&
+    // Only consider certificates that were issued before 1 April 2015, haven't
+    // expired, and have a validity period shorter than 6 years (there is a
+    // delegated OCSP responder certificate with a validity period of 6 years
+    // that should be on the whitelist).
+    if (notBeforeMilliseconds < april1InMilliseconds &&
+        notAfterMilliseconds > nowInMilliseconds &&
         durationMilliseconds < sixYearsInMilliseconds) {
       certs.push(cert);
       if (notAfterMilliseconds > latestNotAfter) {
@@ -183,15 +207,37 @@
   return output;
 }
 
+function loadIntermediates(intermediatesFile) {
+  let pem = readFileContents(intermediatesFile);
+  let intermediates = [];
+  let currentPEM = "";
+  for (let line of pem.split("\r\n")) {
+    if (line == "-----END CERTIFICATE-----") {
+      if (currentPEM) {
+        intermediates.push(gCertDB.constructX509FromBase64(currentPEM));
+      }
+      currentPEM = "";
+      continue;
+    }
+    if (line != "-----BEGIN CERTIFICATE-----") {
+      currentPEM += line;
+    }
+  }
+  return intermediates;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-if (arguments.length != 1) {
-  throw "Usage: makeCNNICHashes.js <path to list of certificates>";
+if (arguments.length != 2) {
+  throw "Usage: makeCNNICHashes.js <intermediates file> <path to list of certificates>";
 }
 
-let certFile = pathToFile(arguments[0]);
+Services.prefs.setIntPref("security.OCSP.enabled", 0);
+let intermediatesFile = pathToFile(arguments[0]);
+let intermediates = loadIntermediates(intermediatesFile);
+let certFile = pathToFile(arguments[1]);
 let { certs, lastValidTime, invalidCerts } = loadCertificates(certFile);
 
 dump("The following certificates were not included due to overlong validity periods:\n");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/nss/coreconf/coreconf.dep thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/nss/coreconf/coreconf.dep
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/nss/coreconf/coreconf.dep	2015-04-22 13:05:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/nss/coreconf/coreconf.dep	2015-04-24 19:30:53.000000000 +0000
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/nss/lib/ssl/ssl3ext.c thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/nss/lib/ssl/ssl3ext.c
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/nss/lib/ssl/ssl3ext.c	2015-04-22 13:05:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/nss/lib/ssl/ssl3ext.c	2015-04-24 19:30:55.000000000 +0000
@@ -2375,10 +2375,12 @@
          * https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1 */
         tls_hash_sha256, tls_sig_rsa,
         tls_hash_sha384, tls_sig_rsa,
+        tls_hash_sha512, tls_sig_rsa,
         tls_hash_sha1,   tls_sig_rsa,
 #ifndef NSS_DISABLE_ECC
         tls_hash_sha256, tls_sig_ecdsa,
         tls_hash_sha384, tls_sig_ecdsa,
+        tls_hash_sha512, tls_sig_ecdsa,
         tls_hash_sha1,   tls_sig_ecdsa,
 #endif
         tls_hash_sha256, tls_sig_dsa,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/nss/TAG-INFO thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/nss/TAG-INFO
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/nss/TAG-INFO	2015-04-22 13:05:16.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/nss/TAG-INFO	2015-04-24 19:30:53.000000000 +0000
@@ -1 +1 @@
-NSS_3_19_BETA4
+NSS_3_19_BETA5
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/sandbox/linux/LinuxCapabilities.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/sandbox/linux/LinuxCapabilities.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/sandbox/linux/LinuxCapabilities.h	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/sandbox/linux/LinuxCapabilities.h	2015-04-24 19:30:55.000000000 +0000
@@ -43,7 +43,7 @@
     BitRef(__u32& aWord, uint32_t aMask) : mWord(aWord), mMask(aMask) { }
     BitRef(const BitRef& aBit) : mWord(aBit.mWord), mMask(aBit.mMask) { }
   public:
-    operator bool() const {
+    MOZ_IMPLICIT operator bool() const {
       return mWord & mMask;
     }
     BitRef& operator=(bool aSetTo) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/sandbox/mac/Sandbox.mm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/sandbox/mac/Sandbox.mm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/security/sandbox/mac/Sandbox.mm	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/security/sandbox/mac/Sandbox.mm	2015-04-24 19:30:55.000000000 +0000
@@ -392,6 +392,11 @@
   "        (appleevent-destination \"com.apple.preview\")\n"
   "        (appleevent-destination \"com.apple.imagecaptureextension2\"))\n"
   "\n"
+  "; bug 1153809\n"
+  "    (allow iokit-open\n"
+  "        (iokit-user-client-class \"NVDVDContextTesla\")\n"
+  "        (iokit-user-client-class \"Gen6DVDContext\"))\n"
+  "\n"
   "; accelerated graphics\n"
   "    (allow-shared-preferences-read \"com.apple.opengl\")\n"
   "    (allow-shared-preferences-read \"com.nvidia.OpenGL\")\n"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/common/modules-testing/logging.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/common/modules-testing/logging.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/common/modules-testing/logging.js	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/common/modules-testing/logging.js	2015-04-24 19:30:56.000000000 +0000
@@ -23,11 +23,11 @@
         this.errorsLogged += 1;
       }
 
-      return message.loggerName + "\t" + message.levelDesc + "\t" +
-        message.message + "\n";
+      return message.time + "\t" + message.loggerName + "\t" + message.levelDesc + "\t" +
+        this.formatText(message) + "\n";
     }
   };
-  LogStats.prototype.__proto__ = new Log.Formatter();
+  LogStats.prototype.__proto__ = new Log.BasicFormatter();
 
   let log = Log.repository.rootLogger;
   let logStats = new LogStats();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/datareporting/DataReporting.manifest thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/datareporting/DataReporting.manifest
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/datareporting/DataReporting.manifest	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/datareporting/DataReporting.manifest	2015-04-24 19:30:56.000000000 +0000
@@ -3,7 +3,6 @@
 #   mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110}
 #   mobile/xul:     {a23983c0-fd0e-11dc-95ff-0800200c9a66}
 #   suite (comm):   {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-#   metro browser:  {99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
 
 # The Data Reporting Service drives collection and submission of metrics
 # and other useful data to Mozilla. It drives the display of the data
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/fxaccounts/FxAccounts.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/fxaccounts/FxAccounts.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/fxaccounts/FxAccounts.jsm	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/fxaccounts/FxAccounts.jsm	2015-04-24 19:30:56.000000000 +0000
@@ -45,6 +45,7 @@
   "now",
   "promiseAccountsForceSigninURI",
   "promiseAccountsChangeProfileURI",
+  "promiseAccountsManageURI",
   "removeCachedOAuthToken",
   "resendVerificationEmail",
   "setSignedInUser",
@@ -1216,6 +1217,28 @@
       return url + newQueryPortion;
     }).then(result => currentState.resolve(result));
   },
+
+  // Returns a promise that resolves with the URL to use to manage the current
+  // user's FxA acct.
+  promiseAccountsManageURI: function() {
+    let url = Services.urlFormatter.formatURLPref("identity.fxaccounts.settings.uri");
+    if (this._requireHttps() && !/^https:/.test(url)) { // Comment to un-break emacs js-mode highlighting
+      throw new Error("Firefox Accounts server must use HTTPS");
+    }
+    let currentState = this.currentAccountState;
+    // but we need to append the uid and email address onto a query string
+    // (if the server has no matching uid it will offer to sign in with the
+    // email address)
+    return this.getSignedInUser().then(accountData => {
+      if (!accountData) {
+        return null;
+      }
+      let newQueryPortion = url.indexOf("?") == -1 ? "?" : "&";
+      newQueryPortion += "uid=" + encodeURIComponent(accountData.uid) +
+                         "&email=" + encodeURIComponent(accountData.email);
+      return url + newQueryPortion;
+    }).then(result => currentState.resolve(result));
+  },
 
   /**
    * Get an OAuth token for the user
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/fxaccounts/FxAccountsOAuthClient.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/fxaccounts/FxAccountsOAuthClient.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/fxaccounts/FxAccountsOAuthClient.jsm	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/fxaccounts/FxAccountsOAuthClient.jsm	2015-04-24 19:30:56.000000000 +0000
@@ -163,14 +163,15 @@
      *        Command webChannelId
      * @param message {Object}
      *        Command message
-     * @param target {EventTarget}
-     *        Channel message event target
+     * @param sendingContext {Object}
+     *        Channel message event sendingContext
      * @private
      */
-    let listener = function (webChannelId, message, target) {
+    let listener = function (webChannelId, message, sendingContext) {
       if (message) {
         let command = message.command;
         let data = message.data;
+        let target = sendingContext && sendingContext.browser;
 
         switch (command) {
           case "oauth_complete":
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/sync/modules/policies.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/sync/modules/policies.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/sync/modules/policies.js	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/sync/modules/policies.js	2015-04-24 19:30:56.000000000 +0000
@@ -766,8 +766,12 @@
       return false;
     }
 
-    return ([Status.login, Status.sync].indexOf(SERVER_MAINTENANCE) == -1 &&
-            [Status.login, Status.sync].indexOf(LOGIN_FAILED_NETWORK_ERROR) == -1);
+
+    let result = ([Status.login, Status.sync].indexOf(SERVER_MAINTENANCE) == -1 &&
+                  [Status.login, Status.sync].indexOf(LOGIN_FAILED_NETWORK_ERROR) == -1);
+    this._log.trace("shouldReportError: ${result} due to login=${login}, sync=${sync}",
+                    {result, login: Status.login, sync: Status.sync});
+    return result;
   },
 
   get currentAlertMode() {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/sync/SyncComponents.manifest thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/sync/SyncComponents.manifest
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/sync/SyncComponents.manifest	2015-04-22 13:05:24.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/sync/SyncComponents.manifest	2015-04-24 19:30:56.000000000 +0000
@@ -8,7 +8,6 @@
 #   mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110}
 #   mobile/xul:     {a23983c0-fd0e-11dc-95ff-0800200c9a66}
 #   suite (comm):   {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-#   metro browser:  {99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
 #
 # In theory we should do this for all these instructions, but in practice it is
 # sufficient to do it for the app-startup one, and the file is simpler that way.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/sync/tps/extensions/mozmill/resource/driver/controller.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/sync/tps/extensions/mozmill/resource/driver/controller.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/sync/tps/extensions/mozmill/resource/driver/controller.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/sync/tps/extensions/mozmill/resource/driver/controller.js	2015-04-24 19:30:56.000000000 +0000
@@ -286,7 +286,6 @@
 MozMillController.prototype.open = function (url) {
   switch (this.mozmillModule.Application) {
     case "Firefox":
-    case "MetroFirefox":
       // Stop a running page load to not overlap requests
       if (this.browserObject.selectedBrowser) {
         this.browserObject.selectedBrowser.stop();
@@ -937,27 +936,12 @@
 
 Tabs.prototype.__defineGetter__("activeTabIndex", function () {
   var browser = this.controller.browserObject;
-
-  switch(this.controller.mozmillModule.Application) {
-    case "MetroFirefox":
-      return browser.tabs.indexOf(browser.selectedTab);
-    case "Firefox":
-    default:
-      return browser.tabContainer.selectedIndex;
-  }
+  return browser.tabContainer.selectedIndex;
 });
 
 Tabs.prototype.selectTabIndex = function (aIndex) {
   var browser = this.controller.browserObject;
-
-  switch(this.controller.mozmillModule.Application) {
-    case "MetroFirefox":
-      browser.selectedTab = browser.tabs[aIndex];
-      break;
-    case "Firefox":
-    default:
-      browser.selectTabAtIndex(aIndex);
-  }
+  browser.selectTabAtIndex(aIndex);
 }
 
 function browserAdditions (controller) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/sync/tps/extensions/mozmill/resource/stdlib/utils.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/sync/tps/extensions/mozmill/resource/stdlib/utils.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/services/sync/tps/extensions/mozmill/resource/stdlib/utils.js	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/services/sync/tps/extensions/mozmill/resource/stdlib/utils.js	2015-04-24 19:30:56.000000000 +0000
@@ -19,8 +19,7 @@
 Cu.import("resource://gre/modules/Services.jsm");
 
 const applicationIdMap = {
-  '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'Firefox',
-  '{99bceaaa-e3c6-48c1-b981-ef9b46b67d60}': 'MetroFirefox'
+  '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'Firefox'
 }
 const applicationName = applicationIdMap[Services.appinfo.ID] || Services.appinfo.name;
 
@@ -49,13 +48,7 @@
  * @returns {Object} The browser element
  */
 function getBrowserObject(aWindow) {
-  switch(applicationName) {
-    case "MetroFirefox":
-      return aWindow.Browser;
-    case "Firefox":
-    default:
-      return aWindow.gBrowser;
-  }
+  return aWindow.gBrowser;
 }
 
 function getChromeWindow(aWindow) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/startupcache/StartupCache.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/startupcache/StartupCache.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/startupcache/StartupCache.cpp	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/startupcache/StartupCache.cpp	2015-04-24 19:30:56.000000000 +0000
@@ -82,9 +82,6 @@
 }
 
 static const char sStartupCacheName[] = "startupCache." SC_WORDSIZE "." SC_ENDIAN;
-#if defined(XP_WIN) && defined(MOZ_METRO)
-static const char sMetroStartupCacheName[] = "metroStartupCache." SC_WORDSIZE "." SC_ENDIAN;
-#endif
 
 StartupCache*
 StartupCache::GetSingleton()
@@ -199,14 +196,7 @@
     if (NS_FAILED(rv) && rv != NS_ERROR_FILE_ALREADY_EXISTS)
       return rv;
 
-#if defined(XP_WIN) && defined(MOZ_METRO)
-    if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-      rv = file->AppendNative(NS_LITERAL_CSTRING(sMetroStartupCacheName));
-    } else
-#endif
-    {
-      rv = file->AppendNative(NS_LITERAL_CSTRING(sStartupCacheName));
-    }
+    rv = file->AppendNative(NS_LITERAL_CSTRING(sStartupCacheName));
 
     NS_ENSURE_SUCCESS(rv, rv);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/storage/src/mozStorageAsyncStatement.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/storage/src/mozStorageAsyncStatement.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/storage/src/mozStorageAsyncStatement.h	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/storage/src/mozStorageAsyncStatement.h	2015-04-24 19:30:56.000000000 +0000
@@ -19,7 +19,6 @@
 #include "mozilla/Attributes.h"
 
 class nsIXPConnectJSObjectHolder;
-struct sqlite3_stmt;
 
 namespace mozilla {
 namespace storage {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/storage/src/mozStorageAsyncStatementParams.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/storage/src/mozStorageAsyncStatementParams.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/storage/src/mozStorageAsyncStatementParams.h	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/storage/src/mozStorageAsyncStatementParams.h	2015-04-24 19:30:56.000000000 +0000
@@ -11,8 +11,6 @@
 #include "nsIXPCScriptable.h"
 #include "mozilla/Attributes.h"
 
-class mozIStorageAsyncStatement;
-
 namespace mozilla {
 namespace storage {
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/storage/src/mozStorageConnection.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/storage/src/mozStorageConnection.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/storage/src/mozStorageConnection.h	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/storage/src/mozStorageConnection.h	2015-04-24 19:30:56.000000000 +0000
@@ -27,7 +27,6 @@
 
 #include "sqlite3.h"
 
-struct PRLock;
 class nsIFile;
 class nsIFileURL;
 class nsIEventTarget;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/storage/src/mozStoragePrivateHelpers.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/storage/src/mozStoragePrivateHelpers.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/storage/src/mozStoragePrivateHelpers.h	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/storage/src/mozStoragePrivateHelpers.h	2015-04-24 19:30:56.000000000 +0000
@@ -19,8 +19,6 @@
 #include "Variant.h"
 
 class mozIStorageCompletionCallback;
-class mozIStorageBaseStatement;
-class mozIStorageBindingParams;
 class nsIRunnable;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/storage/src/StorageBaseStatementInternal.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/storage/src/StorageBaseStatementInternal.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/storage/src/StorageBaseStatementInternal.h	2015-04-22 13:05:25.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/storage/src/StorageBaseStatementInternal.h	2015-04-24 19:30:56.000000000 +0000
@@ -13,7 +13,6 @@
 
 struct sqlite3;
 struct sqlite3_stmt;
-class mozIStorageError;
 class mozIStorageBindingParamsArray;
 class mozIStorageBindingParams;
 class mozIStorageStatementCallback;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/gtest/gtest/include/gtest/gtest.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/gtest/gtest/include/gtest/gtest.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/gtest/gtest/include/gtest/gtest.h	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/gtest/gtest/include/gtest/gtest.h	2015-04-24 19:30:57.000000000 +0000
@@ -151,7 +151,6 @@
 class DefaultGlobalTestPartResultReporter;
 class ExecDeathTest;
 class NoExecDeathTest;
-class FinalSuccessChecker;
 class GTestFlagSaver;
 class TestResultAccessor;
 class TestEventListenersAccessor;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/client/requirements.txt thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/client/requirements.txt
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/client/requirements.txt	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/client/requirements.txt	2015-04-24 19:30:57.000000000 +0000
@@ -1,7 +1,7 @@
 marionette-transport >= 0.4
 marionette-driver >= 0.4
 manifestparser >= 1.1
-mozhttpd >= 0.5
+mozhttpd >= 0.7
 mozinfo >= 0.7
 mozprocess >= 0.9
 mozrunner >= 6.2
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/command.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/command.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/command.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/command.js	2015-04-24 19:30:57.000000000 +0000
@@ -56,7 +56,7 @@
 
   this.data = new Map([
     ["sessionId", msg.sessionId ? msg.sessionId : null],
-    ["status", msg.status ? msg.status : 0 /* success */],
+    ["status", msg.status ? msg.status : "success"],
     ["value", msg.value ? msg.value : undefined],
   ]);
 };
@@ -93,10 +93,10 @@
 /**
  * @param {(Error|Object)} err
  *     The error to send, either an instance of the Error prototype,
- *     or an object with the properties "message", "code", and "stack".
+ *     or an object with the properties "message", "status", and "stack".
  */
 Response.prototype.sendError = function(err) {
-  this.status = "code" in err ? err.code : new UnknownError().code;
+  this.status = "status" in err ? err.status : new UnknownError().status;
   this.value = error.toJSON(err);
   this.send();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/dispatcher.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/dispatcher.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/dispatcher.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/dispatcher.js	2015-04-24 19:30:57.000000000 +0000
@@ -124,7 +124,7 @@
   if (this.driver.appName != "Firefox") {
     this.sendError({
       "message": "In app initiated quit only supported on Firefox",
-      "status": 500
+      "status": "webdriver error",
     }, id);
     return;
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/driver/marionette_driver/marionette.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/driver/marionette_driver/marionette.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/driver/marionette_driver/marionette.py	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/driver/marionette_driver/marionette.py	2015-04-24 19:30:57.000000000 +0000
@@ -123,12 +123,11 @@
 
     @property
     def size(self):
-        '''
-        A dictionary with the size of the element.
-        '''
+        """A dictionary with the size of the element."""
         warnings.warn("The size property has been deprecated and will be removed in a future version. \
             Please use HTMLElement#rect", DeprecationWarning)
-        return self.marionette._send_message('getElementSize', 'value', id=self.id)
+        rect = self.rect
+        return {"width": rect["width"], "height": rect["height"]}
 
     @property
     def tag_name(self):
@@ -150,18 +149,20 @@
         """
         warnings.warn("The location property has been deprecated and will be removed in a future version. \
             Please use HTMLElement#rect", DeprecationWarning)
-        return self.marionette._send_message("getElementLocation", "value", id=self.id)
+        rect = self.rect
+        return {"x": rect["x"], "y": rect["y"]}
 
     @property
     def rect(self):
+        """Gets the element's bounding rectangle.
+        
+        This will return a dictionary with the following:
+
+          * x and y represent the top left coordinates of the ``HTMLElement``
+            relative to top left corner of the document.
+          * height and the width will contain the height and the width
+            of the DOMRect of the ``HTMLElement``.
         """
-            this will return a dictionary with the following:
-
-            * x and y represent the top left coordinates of the WebElement relative to top left corner of the document.
-            * height and the width will contain the height and the width of the DOMRect of the WebElement.
-
-        """
-
         return self.marionette._send_message("getElementRect", "value", id=self.id)
 
     def value_of_css_property(self, property_name):
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/elements.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/elements.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/elements.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/elements.js	2015-04-24 19:30:57.000000000 +0000
@@ -440,7 +440,7 @@
     let startNode = (values.element != undefined) ?
                     this.getKnownElement(values.element, win) : win.document;
     if (this.elementStrategies.indexOf(values.using) < 0) {
-      throw new InvalidSelectorError(`No such strategy: ${values.using}`);
+      throw new InvalidSelectorError("No such strategy: " + values.using);
     }
     let found = all ? this.findElements(values.using, values.value, win.document, startNode) :
                       this.findElement(values.using, values.value, win.document, startNode);
@@ -591,7 +591,7 @@
         element = rootNode.getAnonymousElementByAttribute(startNode, attr, value[attr]);
         break;
       default:
-        throw new WebDriverError("No such strategy");
+        throw new InvalidSelectorError("No such strategy: " + using);
     }
     return element;
   },
@@ -658,7 +658,7 @@
         }
         break;
       default:
-        throw new WebDriverError("No such strategy");
+        throw new InvalidSelectorError("No such strategy: " + using);
     }
     return elements;
   },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/error.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/error.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/error.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/error.js	2015-04-24 19:30:57.000000000 +0000
@@ -24,6 +24,7 @@
   "SessionNotCreatedError",
   "StaleElementReferenceError",
   "TimeoutError",
+  "UnableToSetCookieError",
   "UnknownCommandError",
   "UnknownError",
   "UnsupportedOperationError",
@@ -58,26 +59,14 @@
   return {
     message: err.message,
     stacktrace: err.stack || null,
-    status: err.code
+    status: err.status
   };
 };
 
 /**
- * Determines if the given status code is successful.
+ * Determines if the given status is successful.
  */
-error.isSuccess = code => code === 0;
-
-/**
- * Old-style errors are objects that has all of the properties
- * "message", "code", and "stack".
- *
- * When listener.js starts forwarding real errors by CPOW
- * we can remove this.
- */
-let isOldStyleError = function(obj) {
-  return typeof obj == "object" &&
-    ["message", "code", "stack"].every(c => obj.hasOwnProperty(c));
-}
+error.isSuccess = status => status === "success";
 
 /**
  * Checks if obj is an instance of the Error prototype in a safe manner.
@@ -96,7 +85,7 @@
   } else if ("result" in val && val.result in XPCOM_EXCEPTIONS) {
     return true;
   } else {
-    return Object.getPrototypeOf(val) == "Error" || isOldStyleError(val);
+    return Object.getPrototypeOf(val) == "Error";
   }
 };
 
@@ -105,8 +94,7 @@
  */
 error.isWebDriverError = function(obj) {
   return error.isError(obj) &&
-    (("name" in obj && errors.indexOf(obj.name) > 0) ||
-      isOldStyleError(obj));
+      ("name" in obj && errors.indexOf(obj.name) > 0);
 };
 
 /**
@@ -146,7 +134,6 @@
   this.name = "WebDriverError";
   this.message = msg;
   this.status = "webdriver error";
-  this.code = 500;  // overridden
 };
 WebDriverError.prototype = Object.create(Error.prototype);
 
@@ -154,7 +141,6 @@
   WebDriverError.call(this, msg);
   this.name = "ElementNotAccessibleError";
   this.status = "element not accessible";
-  this.code = 56;
 };
 ElementNotAccessibleError.prototype = Object.create(WebDriverError.prototype);
 
@@ -162,7 +148,6 @@
   WebDriverError.call(this, msg);
   this.name = "ElementNotVisibleError";
   this.status = "element not visible";
-  this.code = 11;
 };
 ElementNotVisibleError.prototype = Object.create(WebDriverError.prototype);
 
@@ -171,7 +156,6 @@
   WebDriverError.call(this, this.message);
   this.name = "FrameSendFailureError";
   this.status = "frame send failure error";
-  this.code = 55;
   this.frame = frame;
   this.errMsg = `${this.message} ${this.frame}; frame not responding.`;
 };
@@ -182,7 +166,6 @@
   WebDriverError.call(this, this.message);
   this.name = "FrameSendNotInitializedError";
   this.status = "frame send not initialized error";
-  this.code = 54;
   this.frame = frame;
   this.errMsg = `${this.message} ${this.frame}; frame has closed.`;
 };
@@ -192,7 +175,6 @@
   WebDriverError.call(this, msg);
   this.name = "IllegalArgumentError";
   this.status = "illegal argument";
-  this.code = 13;  // unknown error
 };
 IllegalArgumentError.prototype = Object.create(WebDriverError.prototype);
 
@@ -200,7 +182,6 @@
   WebDriverError.call(this, msg);
   this.name = "InvalidElementStateError";
   this.status = "invalid element state";
-  this.code = 12;
 };
 InvalidElementStateError.prototype = Object.create(WebDriverError.prototype);
 
@@ -208,7 +189,6 @@
   WebDriverError.call(this, msg);
   this.name = "InvalidSelectorError";
   this.status = "invalid selector";
-  this.code = 32;
 };
 InvalidSelectorError.prototype = Object.create(WebDriverError.prototype);
 
@@ -263,7 +243,6 @@
   WebDriverError.call(this, msg);
   this.name = "JavaScriptError";
   this.status = "javascript error";
-  this.code = 17;
   this.stack = trace;
 };
 JavaScriptError.prototype = Object.create(WebDriverError.prototype);
@@ -272,7 +251,6 @@
   WebDriverError.call(this, msg);
   this.name = "NoAlertOpenError";
   this.status = "no such alert";
-  this.code = 27;
 }
 NoAlertOpenError.prototype = Object.create(WebDriverError.prototype);
 
@@ -280,7 +258,6 @@
   WebDriverError.call(this, msg);
   this.name = "NoSuchElementError";
   this.status = "no such element";
-  this.code = 7;
 };
 NoSuchElementError.prototype = Object.create(WebDriverError.prototype);
 
@@ -288,7 +265,6 @@
   WebDriverError.call(this, msg);
   this.name = "NoSuchFrameError";
   this.status = "no such frame";
-  this.code = 8;
 };
 NoSuchFrameError.prototype = Object.create(WebDriverError.prototype);
 
@@ -296,7 +272,6 @@
   WebDriverError.call(this, msg);
   this.name = "NoSuchWindowError";
   this.status = "no such window";
-  this.code = 23;
 };
 NoSuchWindowError.prototype = Object.create(WebDriverError.prototype);
 
@@ -304,7 +279,6 @@
   WebDriverError.call(this, msg);
   this.name = "ScriptTimeoutError";
   this.status = "script timeout";
-  this.code = 28;
 };
 ScriptTimeoutError.prototype = Object.create(WebDriverError.prototype);
 
@@ -312,8 +286,6 @@
   WebDriverError.call(this, msg);
   this.name = "SessionNotCreatedError";
   this.status = "session not created";
-  // should be 33 to match Selenium
-  this.code = 71;
 };
 SessionNotCreatedError.prototype = Object.create(WebDriverError.prototype);
 
@@ -321,7 +293,6 @@
   WebDriverError.call(this, msg);
   this.name = "StaleElementReferenceError";
   this.status = "stale element reference";
-  this.code = 10;
 };
 StaleElementReferenceError.prototype = Object.create(WebDriverError.prototype);
 
@@ -329,15 +300,21 @@
   WebDriverError.call(this, msg);
   this.name = "TimeoutError";
   this.status = "timeout";
-  this.code = 21;
 };
 TimeoutError.prototype = Object.create(WebDriverError.prototype);
 
+this.UnableToSetCookieError = function(msg) {
+  WebDriverError.call(this, msg);
+  this.name = "UnableToSetCookieError";
+  this.status = "unable to set cookie";
+  this.code = 25;
+};
+UnableToSetCookieError.prototype = Object.create(WebDriverError.prototype);
+
 this.UnknownCommandError = function(msg) {
   WebDriverError.call(this, msg);
   this.name = "UnknownCommandError";
   this.status = "unknown command";
-  this.code = 9;
 };
 UnknownCommandError.prototype = Object.create(WebDriverError.prototype);
 
@@ -345,7 +322,6 @@
   WebDriverError.call(this, msg);
   this.name = "UnknownError";
   this.status = "unknown error";
-  this.code = 13;
 };
 UnknownError.prototype = Object.create(WebDriverError.prototype);
 
@@ -353,6 +329,5 @@
   WebDriverError.call(this, msg);
   this.name = "UnsupportedOperationError";
   this.status = "unsupported operation";
-  this.code = 405;
 };
 UnsupportedOperationError.prototype = Object.create(WebDriverError.prototype);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/listener.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/listener.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/marionette/listener.js	2015-04-22 13:05:26.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/marionette/listener.js	2015-04-24 19:30:57.000000000 +0000
@@ -437,7 +437,7 @@
     if (wasInterrupted()) {
       if (previousFrame) {
         //if previousFrame is set, then we're in a single process environment
-        cuFrame = actions.frame = previousFrame;
+        curFrame = actions.frame = previousFrame;
         previousFrame = null;
         sandbox = null;
       }
@@ -522,7 +522,8 @@
       inactivityTimeoutId = null;
     }
   };
-  sandbox.finish = function sandbox_finish() {
+
+  sandbox.finish = function() {
     if (asyncTestRunning) {
       sandbox.asyncComplete(marionette.generate_results(), sandbox.asyncTestCommandId);
     } else {
@@ -699,11 +700,6 @@
   }
   sandbox.tag = script;
 
-  // Error code 28 is scriptTimeout, but spec says execute_async should return 21 (Timeout),
-  // see http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/execute_async.
-  // However Selenium code returns 28, see
-  // http://code.google.com/p/selenium/source/browse/trunk/javascript/firefox-driver/js/evaluate.js.
-  // We'll stay compatible with the Selenium code.
   asyncTestTimeoutId = curFrame.setTimeout(function() {
     sandbox.asyncComplete(new ScriptTimeoutError("timed out"), asyncTestCommandId);
   }, msg.json.timeout);
@@ -1445,7 +1441,7 @@
  *               the element that will be checked
  *               'propertyName' is the CSS rule that is being requested
  */
-function getElementValueOfCssProperty(msg){
+function getElementValueOfCssProperty(msg) {
   let command_id = msg.json.command_id;
   let propertyName = msg.json.propertyName;
   try {
@@ -1617,6 +1613,11 @@
     }
     sendOk(command_id);
   } catch (e) {
+    // Bug 964738: Newer atoms contain status codes which makes wrapping
+    // this in an error prototype that has a status property unnecessary
+    if (e.name == "InvalidElementStateError") {
+      e = new InvalidElementStateError(e.message);
+    }
     sendError(e, command_id);
   }
 }
@@ -1798,7 +1799,7 @@
 
   let added = sendSyncMessage("Marionette:addCookie", {value: cookie});
   if (added[0] !== true) {
-    sendError(new UnknownError("Error setting cookie"), msg.json.command_id);
+    sendError(new UnableToSetCookieError(), msg.json.command_id);
     return;
   }
   sendOk(msg.json.command_id);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/browser-harness.xul thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/browser-harness.xul
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/browser-harness.xul	2015-04-22 13:05:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/browser-harness.xul	2015-04-24 19:30:57.000000000 +0000
@@ -240,7 +240,6 @@
       var windowMediator = Cc['@mozilla.org/appshell/window-mediator;1'].
                              getService(Ci.nsIWindowMediator);
       var winType = gConfig.testRoot == "browser" ? "navigator:browser" :
-                    gConfig.testRoot == "metro" ? "navigator:browser" :
                     gConfig.testRoot == "webapprtChrome" ? "webapprt:webapp" :
                     null;
       if (!winType) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/browser-test.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/browser-test.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/browser-test.js	2015-04-22 13:05:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/browser-test.js	2015-04-24 19:30:57.000000000 +0000
@@ -88,7 +88,6 @@
 function testInit() {
   gConfig = readConfig();
   if (gConfig.testRoot == "browser" ||
-      gConfig.testRoot == "metro" ||
       gConfig.testRoot == "webapprtChrome") {
     // Make sure to launch the test harness for the first opened window only
     var prefs = Services.prefs;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/Makefile.in	2015-04-22 13:05:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/Makefile.in	2015-04-24 19:30:57.000000000 +0000
@@ -56,9 +56,6 @@
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 TEST_HARNESS_BINS += screenshot$(BIN_SUFFIX)
-ifdef MOZ_METRO
-TEST_HARNESS_BINS += metrotestharness$(BIN_SUFFIX)
-endif
 endif
 
 ifdef MOZ_DMD
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/tests/browser/browser_browserLoaded_content_loaded.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/tests/browser/browser_browserLoaded_content_loaded.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/tests/browser/browser_browserLoaded_content_loaded.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/tests/browser/browser_browserLoaded_content_loaded.js	2015-04-24 19:30:57.000000000 +0000
@@ -0,0 +1,42 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+'use strict';
+
+// Check if the browser has loaded by checking ready state of the DOM.
+function isDOMLoaded(aBrowser) {
+  return aBrowser.contentWindowAsCPOW.document.readyState === 'complete';
+}
+
+// It checks if calling BrowserTestUtils.browserLoaded() yields
+// browser object.
+add_task(function*() {
+  let tab = gBrowser.addTab('http://example.com');
+  let browser = tab.linkedBrowser;
+  yield BrowserTestUtils.browserLoaded(browser);
+  Assert.ok(isDOMLoaded(browser), 'browser', 'Expect browser to have loaded.');
+  gBrowser.removeTab(tab);
+});
+
+// It checks that BrowserTestUtils.browserLoaded() works well with
+// promise.all().
+add_task(function*() {
+  let tabURLs = [
+    `http://example.org`,
+    `http://mochi.test:8888`,
+    `http://test:80`,
+  ];
+  //Add tabs, get the respective browsers
+  let browsers = [
+    for (u of tabURLs) gBrowser.addTab(u).linkedBrowser
+  ];
+  //wait for promises to settle
+  yield Promise.all((
+    for (b of browsers) BrowserTestUtils.browserLoaded(b)
+  ));
+  let expected = 'Expected all promised browsers to have loaded.';
+  Assert.ok(browsers.every(isDOMLoaded), expected);
+  //cleanup
+  browsers
+    .map(browser => gBrowser.getTabForBrowser(browser))
+    .forEach(tab => gBrowser.removeTab(tab));
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/tests/browser/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/tests/browser/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/tests/browser/browser.ini	2015-04-22 13:05:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/tests/browser/browser.ini	2015-04-24 19:30:57.000000000 +0000
@@ -2,6 +2,7 @@
 support-files =
   head.js
 
+[browser_browserLoaded_content_loaded.js]
 [browser_add_task.js]
 [browser_async.js]
 [browser_BrowserTestUtils.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/tests/SimpleTest/SimpleTest.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/tests/SimpleTest/SimpleTest.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mochitest/tests/SimpleTest/SimpleTest.js	2015-04-22 13:05:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mochitest/tests/SimpleTest/SimpleTest.js	2015-04-24 19:30:57.000000000 +0000
@@ -1109,9 +1109,11 @@
   }
 
   var counter = 0;
+  var assertionLabel = msgs.toSource();
   function listener(msg) {
     if (msg.message === "SENTINEL" && !msg.isScriptError) {
-      is(counter, msgs.length, "monitorConsole | number of messages");
+      is(counter, msgs.length,
+         "monitorConsole | number of messages " + assertionLabel);
       SimpleTest.executeSoon(continuation);
       return;
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/docs/mozdevice.rst thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/docs/mozdevice.rst
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/docs/mozdevice.rst	2015-04-22 13:05:27.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/docs/mozdevice.rst	2015-04-24 19:30:57.000000000 +0000
@@ -169,8 +169,8 @@
 
 Informational methods
 +++++++++++++++++++++
-.. automethod:: ADBDevice.clear_logcat(self, timeout=None)
-.. automethod:: ADBDevice.get_logcat(self, filterSpecs=["dalvikvm:I", "ConnectivityService:S", "WifiMonitor:S", "WifiStateTracker:S", "wpa_supplicant:S", "NetworkStateTracker:S"], format="time", filter_out_regexps=[], timeout=None)
+.. automethod:: ADBDevice.clear_logcat
+.. automethod:: ADBDevice.get_logcat
 .. automethod:: ADBDevice.get_prop(self, prop, timeout=None)
 .. automethod:: ADBDevice.get_state(self, timeout=None)
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozdevice/mozdevice/adb.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozdevice/mozdevice/adb.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozdevice/mozdevice/adb.py	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozdevice/mozdevice/adb.py	2015-04-24 19:30:57.000000000 +0000
@@ -1104,7 +1104,18 @@
 
     # Informational methods
 
-    def clear_logcat(self, timeout=None):
+    def _get_logcat_buffer_args(self, buffers):
+        valid_buffers = set(['radio', 'main', 'events'])
+        invalid_buffers = set(buffers).difference(valid_buffers)
+        if invalid_buffers:
+            raise ADBError('Invalid logcat buffers %s not in %s ' % (
+                list(invalid_buffers), list(valid_buffers)))
+        args = []
+        for b in buffers:
+            args.extend(['-b', b])
+        return args
+
+    def clear_logcat(self, timeout=None, buffers=["main"]):
         """Clears logcat via adb logcat -c.
 
         :param timeout: optional integer specifying the maximum time in
@@ -1113,23 +1124,28 @@
             adb call. The total time spent may exceed this
             value. If it is not specified, the value set
             in the ADBDevice constructor is used.
+        :param buffers: list of log buffers to clear. Valid buffers are
+            "radio", "events", and "main". Defaults to "main".
         :raises: * ADBTimeoutError
                  * ADBError
 
         """
-        self.command_output(["logcat", "-c"], timeout=timeout)
+        buffers = self._get_logcat_buffer_args(buffers)
+        cmds = ["logcat", "-c"] + buffers
+        self.command_output(cmds, timeout=timeout)
 
     def get_logcat(self,
-                  filter_specs=[
-                      "dalvikvm:I",
-                      "ConnectivityService:S",
-                      "WifiMonitor:S",
-                      "WifiStateTracker:S",
-                      "wpa_supplicant:S",
-                      "NetworkStateTracker:S"],
-                  format="time",
-                  filter_out_regexps=[],
-                  timeout=None):
+                   filter_specs=[
+                       "dalvikvm:I",
+                       "ConnectivityService:S",
+                       "WifiMonitor:S",
+                       "WifiStateTracker:S",
+                       "wpa_supplicant:S",
+                       "NetworkStateTracker:S"],
+                   format="time",
+                   filter_out_regexps=[],
+                   timeout=None,
+                   buffers=["main"]):
         """Returns the contents of the logcat file as a list of strings.
 
         :param filter_specs: optional list containing logcat messages to
@@ -1143,12 +1159,15 @@
             This timeout is per adb call. The total time spent
             may exceed this value. If it is not specified, the value
             set in the ADBDevice constructor is used.
+        :param buffers: list of log buffers to retrieve. Valid buffers are
+            "radio", "events", and "main". Defaults to "main".
         :returns: list of lines logcat output.
         :raises: * ADBTimeoutError
                  * ADBError
 
         """
-        cmds = ["logcat", "-v", format, "-d"] + filter_specs
+        buffers = self._get_logcat_buffer_args(buffers)
+        cmds = ["logcat", "-v", format, "-d"] + buffers + filter_specs
         lines = self.command_output(cmds, timeout=timeout).split('\r')
 
         for regex in filter_out_regexps:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozinstall/mozinstall/mozinstall.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozinstall/mozinstall/mozinstall.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozinstall/mozinstall/mozinstall.py	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozinstall/mozinstall/mozinstall.py	2015-04-24 19:30:57.000000000 +0000
@@ -280,10 +280,11 @@
 
     # possibly gets around UAC in vista (still need to run as administrator)
     os.environ['__compat_layer'] = 'RunAsInvoker'
-    cmd = [src, '/S', '/D=%s' % os.path.realpath(dest)]
+    cmd = '"%s" /extractdir=%s' % (src, os.path.realpath(dest))
 
     # As long as we support Python 2.4 check_call will not be available.
     result = subprocess.call(cmd)
+
     if result is not 0:
         raise Exception('Execution of installer failed.')
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozinstall/setup.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozinstall/setup.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozinstall/setup.py	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozinstall/setup.py	2015-04-24 19:30:57.000000000 +0000
@@ -11,7 +11,7 @@
 except IOError:
     description = None
 
-PACKAGE_VERSION = '1.12.dev0'
+PACKAGE_VERSION = '1.12'
 
 deps = ['mozinfo >= 0.7',
         'mozfile >= 1.0',
Binary files /tmp/EK0tlyvOnW/thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozinstall/tests/Installer-Stubs/firefox.exe and /tmp/7DFveHARkB/thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozinstall/tests/Installer-Stubs/firefox.exe differ
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozinstall/tests/test.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozinstall/tests/test.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozinstall/tests/test.py	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozinstall/tests/test.py	2015-04-24 19:30:57.000000000 +0000
@@ -20,6 +20,8 @@
     def setUpClass(cls):
         """ Setting up stub installers """
         cls.dmg = os.path.join(here, 'Installer-Stubs', 'firefox.dmg')
+        # XXX: We have removed firefox.exe since it is not valid for mozinstall 1.12 and higher
+        # Bug 1157352 - We should grab a firefox.exe from the build process or download it
         cls.exe = os.path.join(here, 'Installer-Stubs', 'firefox.exe')
         cls.zipfile = os.path.join(here, 'Installer-Stubs', 'firefox.zip')
         cls.bz2 = os.path.join(here, 'Installer-Stubs', 'firefox.tar.bz2')
@@ -30,6 +32,7 @@
     def tearDown(self):
         mozfile.rmtree(self.tempdir)
 
+    @unittest.skipIf(mozinfo.isWin, "Bug 1157352 - We need a new firefox.exe for mozinstall 1.12 and higher.")
     def test_get_binary(self):
         """ Test mozinstall's get_binary method """
 
@@ -41,8 +44,7 @@
         elif mozinfo.isWin:
             installdir_exe = mozinstall.install(self.exe,
                                                 os.path.join(self.tempdir, 'exe'))
-            binary_exe = os.path.join(installdir_exe, 'firefox', 'firefox',
-                                      'firefox.exe')
+            binary_exe = os.path.join(installdir_exe, 'core', 'firefox.exe')
             self.assertEqual(binary_exe, mozinstall.get_binary(installdir_exe,
                              'firefox'))
 
@@ -65,6 +67,7 @@
                           tempdir_empty, 'firefox')
         mozfile.rmtree(tempdir_empty)
 
+    @unittest.skipIf(mozinfo.isWin, "Bug 1157352 - We need a new firefox.exe for mozinstall 1.12 and higher.")
     def test_is_installer(self):
         """ Test we can identify a correct installer """
 
@@ -103,8 +106,9 @@
 
         elif mozinfo.isMac:
             self.assertRaises(mozinstall.InvalidSource, mozinstall.install,
-                              self.exe, 'firefox')
+                              self.bz2, 'firefox')
 
+    @unittest.skipIf(mozinfo.isWin, "Bug 1157352 - We need a new firefox.exe for mozinstall 1.12 and higher.")
     def test_install(self):
         """ Test mozinstall's install capability """
 
@@ -128,6 +132,7 @@
             self.assertEqual(os.path.join(os.path.realpath(self.tempdir),
                                           'FirefoxStub.app'), installdir)
 
+    @unittest.skipIf(mozinfo.isWin, "Bug 1157352 - We need a new firefox.exe for mozinstall 1.12 and higher.")
     def test_uninstall(self):
         """ Test mozinstall's uninstall capabilites """
         # Uninstall after installing
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozrunner/mozrunner/runners.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozrunner/mozrunner/runners.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/mozrunner/mozrunner/runners.py	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/mozrunner/mozrunner/runners.py	2015-04-24 19:30:57.000000000 +0000
@@ -65,24 +65,6 @@
     return GeckoRuntimeRunner(*args, **kwargs)
 
 
-def MetroRunner(*args, **kwargs):
-    """
-    Create a Windows metro Firefox runner.
-
-    :param binary: Path to metro Firefox binary.
-    :param cmdargs: Arguments to pass into binary.
-    :param profile: Profile object to use.
-    :param env: Environment variables to pass into the gecko process.
-    :param clean_profile: If True, restores profile back to original state.
-    :param process_class: Class used to launch the binary.
-    :param process_args: Arguments to pass into process_class.
-    :param symbols_path: Path to symbol files used for crash analysis.
-    :returns: A GeckoRuntimeRunner for metro Firefox.
-    """
-    kwargs['app_ctx'] = get_app_context('metro')()
-    return GeckoRuntimeRunner(*args, **kwargs)
-
-
 def B2GDesktopRunner(*args, **kwargs):
     """
     Create a B2G desktop runner.
@@ -177,7 +159,6 @@
  'b2g_emulator': B2GEmulatorRunner,
  'b2g_device': B2GDeviceRunner,
  'firefox': FirefoxRunner,
- 'metro': MetroRunner,
  'thunderbird': ThunderbirdRunner,
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/versioninfo.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/versioninfo.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/mozbase/versioninfo.py	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/mozbase/versioninfo.py	2015-04-24 19:30:57.000000000 +0000
@@ -43,9 +43,15 @@
             plus_version = None
             for line in diff.splitlines():
                 if line.startswith('-PACKAGE_VERSION'):
-                    minus_version = StrictVersion(line.split()[-1].strip('"\''))
+                    try:
+                        minus_version = StrictVersion(line.split()[-1].strip('"\''))
+                    except ValueError:
+                        pass
                 elif line.startswith('+PACKAGE_VERSION'):
-                    plus_version = StrictVersion(line.split()[-1].strip('"\''))
+                    try:
+                        plus_version = StrictVersion(line.split()[-1].strip('"\''))
+                    except ValueError:
+                        break
 
                     # make sure the change isn't a backout
                     if not minus_version or plus_version > minus_version:
@@ -54,6 +60,7 @@
 
                         if StrictVersion(v) == plus_version:
                             return rev
+
         print("Could not find %s revision for version %s." % (args.module, v or 'latest'))
         sys.exit(1)
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/profiles/prefs_general.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/profiles/prefs_general.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/profiles/prefs_general.js	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/profiles/prefs_general.js	2015-04-24 19:30:57.000000000 +0000
@@ -197,10 +197,6 @@
 // which test runs first and happens to open about:newtab
 user_pref("browser.newtabpage.introShown", true);
 
-// prefs for firefox metro.
-// Disable first-tun tab
-user_pref("browser.firstrun.count", 0);
-
 // Tell the PBackground infrastructure to run a test at startup.
 user_pref("pbackground.testing", true);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/talos/talos.json thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/talos/talos.json
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/talos/talos.json	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/talos/talos.json	2015-04-24 19:30:57.000000000 +0000
@@ -5,7 +5,7 @@
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "3dc0c42bd761"
+        "talos_revision": "85d4f8ef4810"
     },
     "extra_options": {
         "android": [ "--apkPath=%(apk_path)s" ]
@@ -84,6 +84,12 @@
             "tests": ["glterrain"],
             "talos_options": ["--e10s"]
         },
+        "g2": {
+            "tests": ["damp"],
+            "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
+            "pagesets_parent_dir_path": "talos/page_load_test/",
+            "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
+        },
         "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
         },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/taskcluster/scripts/phone-builder/build-dolphin.sh thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/taskcluster/scripts/phone-builder/build-dolphin.sh
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/taskcluster/scripts/phone-builder/build-dolphin.sh	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/taskcluster/scripts/phone-builder/build-dolphin.sh	2015-04-24 19:30:57.000000000 +0000
@@ -1,39 +1,6 @@
 #! /bin/bash -vex
 
-# Ensure all the scripts in this dir are on the path....
-DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-PATH=$DIRNAME:$PATH
-
-WORKSPACE=$1
-
-### Check that require variables are defined
-test -d $WORKSPACE
-test $GECKO_HEAD_REPOSITORY # Should be an hg repository url to pull from
-test $GECKO_BASE_REPOSITORY # Should be an hg repository url to clone from
-test $GECKO_HEAD_REV # Should be an hg revision to pull down
-test $MOZHARNESS_REPOSITORY # mozharness repository
-test $MOZHARNESS_REV # mozharness revision
-test $TARGET
-test $VARIANT
-
-. ../builder/setup-ccache.sh
-
-# First check if the mozharness directory is available. This is intended to be
-# used locally in development to test mozharness changes:
-#
-#   $ docker -v your_mozharness:/home/worker/mozharness ...
-#
-if [ ! -d mozharness ]; then
-  tc-vcs checkout mozharness $MOZHARNESS_REPOSITORY $MOZHARNESS_REPOSITORY $MOZHARNESS_REV
-fi
-
-# Figure out where the remote manifest is so we can use caches for it.
-MANIFEST=$(repository-url.py $GECKO_HEAD_REPOSITORY $GECKO_HEAD_REV b2g/config/$TARGET/sources.xml)
-tc-vcs repo-checkout $WORKSPACE/B2G https://git.mozilla.org/b2g/B2G.git $MANIFEST
-
-# Ensure symlink has been created to gecko...
-rm -f $WORKSPACE/B2G/gecko
-ln -s $WORKSPACE/gecko $WORKSPACE/B2G/gecko
+. pre-build.sh
 
 debug_flag=""
 if [ 0$B2G_DEBUG -ne 0 ]; then
@@ -54,6 +21,9 @@
   --base-repo=$GECKO_BASE_REPOSITORY \
   --repo=$GECKO_HEAD_REPOSITORY
 
+# Don't cache backups
+rm -rf $WORKSPACE/B2G/backup-*
+
 # Move files into artifact locations!
 mkdir -p $HOME/artifacts
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml	2015-04-24 19:30:57.000000000 +0000
@@ -16,7 +16,7 @@
 
   payload:
     cache:
-      build-dolphin-512-eng: /home/worker/object-folder
+      build-dolphin-512-eng: /home/worker/workspace
     env:
       TARGET: 'dolphin-512'
       VARIANT: eng
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml	2015-04-24 19:30:57.000000000 +0000
@@ -15,6 +15,6 @@
 
   payload:
     cache:
-      build-dolphin-512-opt: /home/worker/object-folder
+      build-dolphin-512-opt: /home/worker/workspace
     env:
       TARGET: 'dolphin-512'
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml	2015-04-24 19:30:57.000000000 +0000
@@ -16,7 +16,7 @@
 
   payload:
     cache:
-      build-dolphin-eng: /home/worker/object-folder
+      build-dolphin-eng: /home/worker/workspace
     env:
       TARGET: 'dolphin'
       VARIANT: eng
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml	2015-04-22 13:05:28.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml	2015-04-24 19:30:57.000000000 +0000
@@ -15,7 +15,7 @@
 
   payload:
     cache:
-      build-dolphin-opt: /home/worker/object-folder
+      build-dolphin-opt: /home/worker/workspace
     env:
       TARGET: 'dolphin'
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/harness/wptrunner/browsers/servo.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/harness/wptrunner/browsers/servo.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/harness/wptrunner/browsers/servo.py	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/harness/wptrunner/browsers/servo.py	2015-04-24 19:30:57.000000000 +0000
@@ -26,8 +26,7 @@
 
 def browser_kwargs(**kwargs):
     return {"binary": kwargs["binary"],
-            "debug_info": kwargs["debug_info"],
-            "interactive": kwargs["interactive"]}
+            "debug_info": kwargs["debug_info"]}
 
 
 def executor_kwargs(test_type, server_config, cache_manager, **kwargs):
@@ -44,13 +43,11 @@
 
 
 class ServoBrowser(NullBrowser):
-    def __init__(self, logger, binary, debug_info=None, interactive=False):
+    def __init__(self, logger, binary, debug_info=None):
         NullBrowser.__init__(self, logger)
         self.binary = binary
         self.debug_info = debug_info
-        self.interactive = interactive
 
     def executor_browser(self):
         return ExecutorBrowser, {"binary": self.binary,
-                                 "debug_info": self.debug_info,
-                                 "interactive": self.interactive}
+                                 "debug_info": self.debug_info}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/harness/wptrunner/executors/executorservo.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/harness/wptrunner/executors/executorservo.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/harness/wptrunner/executors/executorservo.py	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/harness/wptrunner/executors/executorservo.py	2015-04-24 19:30:57.000000000 +0000
@@ -21,7 +21,7 @@
                    testharness_result_converter,
                    reftest_result_converter)
 from .process import ProcessTestExecutor
-from ..executors.base import browser_command
+from ..browsers.base import browser_command
 
 hosts_text = """127.0.0.1 web-platform.test
 127.0.0.1 www.web-platform.test
@@ -75,29 +75,35 @@
         env = os.environ.copy()
         env["HOST_FILE"] = self.hosts_path
 
-        self.proc = ProcessHandler(self.command,
-                                   processOutputLine=[self.on_output],
-                                   onFinish=self.on_finish,
-                                   env=env)
 
-        try:
+
+        if not self.interactive:
+            self.proc = ProcessHandler(self.command,
+                                       processOutputLine=[self.on_output],
+                                       onFinish=self.on_finish,
+                                       env=env,
+                                       storeOutput=False)
             self.proc.run()
+        else:
+            self.proc = subprocess.Popen(self.command, env=env)
 
+        try:
             timeout = test.timeout * self.timeout_multiplier
 
             # Now wait to get the output we expect, or until we reach the timeout
-            if self.debug_info is None and not self.pause_after_test:
+            if not self.interactive and not self.pause_after_test:
                 wait_timeout = timeout + 5
+                self.result_flag.wait(wait_timeout)
             else:
                 wait_timeout = None
-            self.result_flag.wait(wait_timeout)
+                self.proc.wait()
 
             proc_is_running = True
             if self.result_flag.is_set() and self.result_data is not None:
                 self.result_data["test"] = test.url
                 result = self.convert_result(test, self.result_data)
             else:
-                if self.proc.proc.poll() is not None:
+                if self.proc.poll() is not None:
                     result = (test.result_cls("CRASH", None), [])
                     proc_is_running = False
                 else:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/harness/wptrunner/executors/process.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/harness/wptrunner/executors/process.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/harness/wptrunner/executors/process.py	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/harness/wptrunner/executors/process.py	2015-04-24 19:30:57.000000000 +0000
@@ -9,7 +9,8 @@
     def __init__(self, *args, **kwargs):
         TestExecutor.__init__(self, *args, **kwargs)
         self.binary = self.browser.binary
-        self.interactive = self.browser.interactive
+        self.interactive = (False if self.debug_info is None
+                            else self.debug_info.interactive)
 
     def setup(self, runner):
         self.runner = runner
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/harness/wptrunner/manifestinclude.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/harness/wptrunner/manifestinclude.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/harness/wptrunner/manifestinclude.py	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/harness/wptrunner/manifestinclude.py	2015-04-24 19:30:57.000000000 +0000
@@ -95,7 +95,7 @@
             for manifest, data in test_manifests.iteritems():
                 rel_path = os.path.relpath(maybe_path, data["tests_path"])
                 if ".." not in rel_path.split(os.sep):
-                    url = "/" + rel_path.replace(os.path.sep, "/") + variant
+                    url = data["url_base"] + rel_path.replace(os.path.sep, "/") + variant
                     break
 
         assert direction in ("include", "exclude")
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/harness/wptrunner/wptcommandline.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/harness/wptrunner/wptcommandline.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/harness/wptrunner/wptcommandline.py	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/harness/wptrunner/wptcommandline.py	2015-04-24 19:30:57.000000000 +0000
@@ -276,7 +276,8 @@
         debug_info = mozdebug.get_debugger_info(kwargs["debugger"],
                                                 kwargs["debugger_args"])
         if debug_info.interactive:
-            require_arg(kwargs, "processes", lambda x: x == 1)
+            if kwargs["processes"] != 1:
+                kwargs["processes"] = 1
             kwargs["no_capture_stdio"] = True
         kwargs["debug_info"] = debug_info
     else:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini	2015-04-22 13:05:30.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini	2015-04-24 19:30:58.000000000 +0000
@@ -2277,402 +2277,48 @@
   [Window interface: window must inherit property "self" with the proper type (1)]
     expected: FAIL
 
-  [Window interface: window must inherit property "name" with the proper type (3)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "history" with the proper type (5)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "locationbar" with the proper type (6)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "menubar" with the proper type (7)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "personalbar" with the proper type (8)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "scrollbars" with the proper type (9)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "statusbar" with the proper type (10)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "toolbar" with the proper type (11)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "status" with the proper type (12)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "close" with the proper type (13)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "closed" with the proper type (14)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "stop" with the proper type (15)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "focus" with the proper type (16)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "blur" with the proper type (17)]
-    expected: FAIL
-
   [Window interface: window must inherit property "frames" with the proper type (18)]
     expected: FAIL
 
-  [Window interface: window must inherit property "length" with the proper type (19)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "opener" with the proper type (21)]
-    expected: FAIL
-
   [Window interface: window must inherit property "parent" with the proper type (22)]
     expected: FAIL
 
-  [Window interface: window must inherit property "frameElement" with the proper type (23)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "open" with the proper type (24)]
-    expected: FAIL
-
-  [Window interface: calling open(DOMString,DOMString,DOMString,boolean) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "navigator" with the proper type (27)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "external" with the proper type (28)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "applicationCache" with the proper type (29)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "alert" with the proper type (30)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "confirm" with the proper type (31)]
-    expected: FAIL
-
-  [Window interface: calling confirm(DOMString) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "prompt" with the proper type (32)]
-    expected: FAIL
-
-  [Window interface: calling prompt(DOMString,DOMString) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "print" with the proper type (33)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "showModalDialog" with the proper type (34)]
-    expected: FAIL
-
-  [Window interface: calling showModalDialog(DOMString,any) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "postMessage" with the proper type (35)]
-    expected: FAIL
-
-  [Window interface: calling postMessage(any,DOMString,[object Object\]) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "captureEvents" with the proper type (36)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "releaseEvents" with the proper type (37)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onabort" with the proper type (38)]
-    expected: FAIL
-
   [Window interface: window must inherit property "onautocomplete" with the proper type (39)]
     expected: FAIL
 
   [Window interface: window must inherit property "onautocompleteerror" with the proper type (40)]
     expected: FAIL
 
-  [Window interface: window must inherit property "onblur" with the proper type (41)]
-    expected: FAIL
-
   [Window interface: window must inherit property "oncancel" with the proper type (42)]
     expected: FAIL
 
-  [Window interface: window must inherit property "oncanplay" with the proper type (43)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "oncanplaythrough" with the proper type (44)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onchange" with the proper type (45)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onclick" with the proper type (46)]
-    expected: FAIL
-
   [Window interface: window must inherit property "onclose" with the proper type (47)]
     expected: FAIL
 
-  [Window interface: window must inherit property "oncontextmenu" with the proper type (48)]
-    expected: FAIL
-
   [Window interface: window must inherit property "oncuechange" with the proper type (49)]
     expected: FAIL
 
-  [Window interface: window must inherit property "ondblclick" with the proper type (50)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "ondrag" with the proper type (51)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "ondragend" with the proper type (52)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "ondragenter" with the proper type (53)]
-    expected: FAIL
-
   [Window interface: window must inherit property "ondragexit" with the proper type (54)]
     expected: FAIL
 
-  [Window interface: window must inherit property "ondragleave" with the proper type (55)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "ondragover" with the proper type (56)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "ondragstart" with the proper type (57)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "ondrop" with the proper type (58)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "ondurationchange" with the proper type (59)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onemptied" with the proper type (60)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onended" with the proper type (61)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onerror" with the proper type (62)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onfocus" with the proper type (63)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "oninput" with the proper type (64)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "oninvalid" with the proper type (65)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onkeydown" with the proper type (66)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onkeypress" with the proper type (67)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onkeyup" with the proper type (68)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onload" with the proper type (69)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onloadeddata" with the proper type (70)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onloadedmetadata" with the proper type (71)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onloadstart" with the proper type (72)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onmousedown" with the proper type (73)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onmouseenter" with the proper type (74)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onmouseleave" with the proper type (75)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onmousemove" with the proper type (76)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onmouseout" with the proper type (77)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onmouseover" with the proper type (78)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onmouseup" with the proper type (79)]
-    expected: FAIL
-
   [Window interface: window must inherit property "onmousewheel" with the proper type (80)]
     expected: FAIL
 
-  [Window interface: window must inherit property "onpause" with the proper type (81)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onplay" with the proper type (82)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onplaying" with the proper type (83)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onprogress" with the proper type (84)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onratechange" with the proper type (85)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onreset" with the proper type (86)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onresize" with the proper type (87)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onscroll" with the proper type (88)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onseeked" with the proper type (89)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onseeking" with the proper type (90)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onselect" with the proper type (91)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onshow" with the proper type (92)]
-    expected: FAIL
-
   [Window interface: window must inherit property "onsort" with the proper type (93)]
     expected: FAIL
 
-  [Window interface: window must inherit property "onstalled" with the proper type (94)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onsubmit" with the proper type (95)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onsuspend" with the proper type (96)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "ontimeupdate" with the proper type (97)]
-    expected: FAIL
-
   [Window interface: window must inherit property "ontoggle" with the proper type (98)]
     expected: FAIL
 
-  [Window interface: window must inherit property "onvolumechange" with the proper type (99)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onwaiting" with the proper type (100)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onafterprint" with the proper type (101)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onbeforeprint" with the proper type (102)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onbeforeunload" with the proper type (103)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onhashchange" with the proper type (104)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onlanguagechange" with the proper type (105)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onmessage" with the proper type (106)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onoffline" with the proper type (107)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "ononline" with the proper type (108)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onpagehide" with the proper type (109)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onpageshow" with the proper type (110)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onpopstate" with the proper type (111)]
-    expected: FAIL
-
   [Window interface: window must inherit property "onstorage" with the proper type (112)]
     expected: FAIL
 
-  [Window interface: window must inherit property "onunload" with the proper type (113)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "btoa" with the proper type (114)]
-    expected: FAIL
-
-  [Window interface: calling btoa(DOMString) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "atob" with the proper type (115)]
-    expected: FAIL
-
-  [Window interface: calling atob(DOMString) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "setTimeout" with the proper type (116)]
-    expected: FAIL
-
-  [Window interface: calling setTimeout(Function,long,any) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "setTimeout" with the proper type (117)]
-    expected: FAIL
-
-  [Window interface: calling setTimeout(DOMString,long,any) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "clearTimeout" with the proper type (118)]
-    expected: FAIL
-
-  [Window interface: calling clearTimeout(long) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "setInterval" with the proper type (119)]
-    expected: FAIL
-
-  [Window interface: calling setInterval(Function,long,any) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "setInterval" with the proper type (120)]
-    expected: FAIL
-
-  [Window interface: calling setInterval(DOMString,long,any) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Window interface: window must inherit property "clearInterval" with the proper type (121)]
-    expected: FAIL
-
-  [Window interface: calling clearInterval(long) on window with too few arguments must throw TypeError]
-    expected: FAIL
-
   [Window interface: window must inherit property "createImageBitmap" with the proper type (122)]
     expected: FAIL
 
   [Window interface: calling createImageBitmap(ImageBitmapSource,long,long,long,long) on window with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Window interface: window must inherit property "sessionStorage" with the proper type (123)]
-    expected: FAIL
-
-  [Window interface: window must inherit property "localStorage" with the proper type (124)]
-    expected: FAIL
-
   [Location interface: operation assign(DOMString)]
     expected: FAIL
 
@@ -2685,15 +2331,9 @@
   [Location interface: window.location must inherit property "assign" with the proper type (0)]
     expected: FAIL
 
-  [Location interface: calling assign(DOMString) on window.location with too few arguments must throw TypeError]
-    expected: FAIL
-
   [Location interface: window.location must inherit property "replace" with the proper type (1)]
     expected: FAIL
 
-  [Location interface: calling replace(DOMString) on window.location with too few arguments must throw TypeError]
-    expected: FAIL
-
   [Location interface: window.location must inherit property "reload" with the proper type (2)]
     expected: FAIL
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini	2015-04-22 13:05:30.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini	2015-04-24 19:30:58.000000000 +0000
@@ -1,49 +1,50 @@
 [relevant-mutations.html]
   type: testharness
+  expected: TIMEOUT
   [src removed]
-    expected: FAIL
+    expected: TIMEOUT
 
   [srcset removed]
-    expected: FAIL
+    expected: TIMEOUT
 
   [sizes set]
-    expected: FAIL
+    expected: TIMEOUT
 
   [sizes changed]
-    expected: FAIL
+    expected: TIMEOUT
 
   [sizes removed]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin absent to empty]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin absent to anonymous]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin absent to use-credentials]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin empty to absent]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin empty to use-credentials]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin anonymous to absent]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin anonymous to use-credentials]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin use-credentials to absent]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin use-credentials to empty]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin use-credentials to anonymous]
-    expected: FAIL
+    expected: TIMEOUT
 
   [crossorigin state not changed: empty to anonymous]
     expected: FAIL
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/MANIFEST.json thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/MANIFEST.json
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/MANIFEST.json	2015-04-22 13:05:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/MANIFEST.json	2015-04-24 19:30:57.000000000 +0000
@@ -1768,6 +1768,46 @@
         "url": "/html/rendering/bindings/the-select-element-0/option-label.html"
       },
       {
+        "path": "html/rendering/bindings/the-textarea-element-0/cols-default.html",
+        "references": [
+          [
+            "/html/rendering/bindings/the-textarea-element-0/textarea-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/bindings/the-textarea-element-0/cols-default.html"
+      },
+      {
+        "path": "html/rendering/bindings/the-textarea-element-0/cols-zero.html",
+        "references": [
+          [
+            "/html/rendering/bindings/the-textarea-element-0/textarea-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/bindings/the-textarea-element-0/cols-zero.html"
+      },
+      {
+        "path": "html/rendering/bindings/the-textarea-element-0/rows-default.html",
+        "references": [
+          [
+            "/html/rendering/bindings/the-textarea-element-0/textarea-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/bindings/the-textarea-element-0/rows-default.html"
+      },
+      {
+        "path": "html/rendering/bindings/the-textarea-element-0/rows-zero.html",
+        "references": [
+          [
+            "/html/rendering/bindings/the-textarea-element-0/textarea-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/bindings/the-textarea-element-0/rows-zero.html"
+      },
+      {
         "path": "html/rendering/non-replaced-elements/flow-content-0/figure.html",
         "references": [
           [
@@ -10912,6 +10952,10 @@
         "url": "/encoding/api-basics.html"
       },
       {
+        "path": "encoding/api-invalid-label.html",
+        "url": "/encoding/api-invalid-label.html"
+      },
+      {
         "path": "encoding/api-replacement-encodings.html",
         "url": "/encoding/api-replacement-encodings.html"
       },
@@ -21008,6 +21052,54 @@
         "url": "/html/rendering/bindings/the-select-element-0/option-label.html"
       }
     ],
+    "html/rendering/bindings/the-textarea-element-0/cols-default.html": [
+      {
+        "path": "html/rendering/bindings/the-textarea-element-0/cols-default.html",
+        "references": [
+          [
+            "/html/rendering/bindings/the-textarea-element-0/textarea-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/bindings/the-textarea-element-0/cols-default.html"
+      }
+    ],
+    "html/rendering/bindings/the-textarea-element-0/cols-zero.html": [
+      {
+        "path": "html/rendering/bindings/the-textarea-element-0/cols-zero.html",
+        "references": [
+          [
+            "/html/rendering/bindings/the-textarea-element-0/textarea-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/bindings/the-textarea-element-0/cols-zero.html"
+      }
+    ],
+    "html/rendering/bindings/the-textarea-element-0/rows-default.html": [
+      {
+        "path": "html/rendering/bindings/the-textarea-element-0/rows-default.html",
+        "references": [
+          [
+            "/html/rendering/bindings/the-textarea-element-0/textarea-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/bindings/the-textarea-element-0/rows-default.html"
+      }
+    ],
+    "html/rendering/bindings/the-textarea-element-0/rows-zero.html": [
+      {
+        "path": "html/rendering/bindings/the-textarea-element-0/rows-zero.html",
+        "references": [
+          [
+            "/html/rendering/bindings/the-textarea-element-0/textarea-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/bindings/the-textarea-element-0/rows-zero.html"
+      }
+    ],
     "html/rendering/non-replaced-elements/flow-content-0/figure.html": [
       {
         "path": "html/rendering/non-replaced-elements/flow-content-0/figure.html",
@@ -24729,7 +24821,7 @@
       }
     ]
   },
-  "rev": "89b6e2bc460316c7f273712d22f0b2d3a3d0c5be",
+  "rev": "20aef05e164be1ccbbd8f66192f01e778b5e5c18",
   "url_base": "/",
   "version": 2
 }
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/mozilla-sync thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/mozilla-sync
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/mozilla-sync	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/mozilla-sync	2015-04-24 19:30:58.000000000 +0000
@@ -1 +1 @@
-ec9e346b36e59c9a4fc6fc1cc5a3687417769191
\ No newline at end of file
+821cd0c3a55889f05c04ed9b6c12c810cd1a6c0f
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/url/a-element.html.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/url/a-element.html.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/url/a-element.html.ini	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/url/a-element.html.ini	2015-04-24 19:30:58.000000000 +0000
@@ -345,10 +345,10 @@
   [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
     expected: FAIL
 
-  [Parsing: <#\xce\xb2> against <http://example.org/foo/bar>]
+  [Parsing: <#β> against <http://example.org/foo/bar>]
     expected: FAIL
 
-  [Parsing: <http://www.google.com/foo?bar=baz# \xc2\xbb> against <about:blank>]
+  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
     expected: FAIL
 
   [Parsing: <#β> against <http://example.org/foo/bar>]
@@ -356,3 +356,4 @@
 
   [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
     expected: FAIL
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/url/a-element.xhtml.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/url/a-element.xhtml.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/url/a-element.xhtml.ini	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/url/a-element.xhtml.ini	2015-04-24 19:30:58.000000000 +0000
@@ -364,10 +364,10 @@
   [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
     expected: FAIL
 
-  [Parsing: <#\xce\xb2> against <http://example.org/foo/bar>]
+  [Parsing: <#β> against <http://example.org/foo/bar>]
     expected: FAIL
 
-  [Parsing: <http://www.google.com/foo?bar=baz# \xc2\xbb> against <about:blank>]
+  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
     expected: FAIL
 
   [Parsing: <#β> against <http://example.org/foo/bar>]
@@ -375,3 +375,4 @@
 
   [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
     expected: FAIL
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/readyState/003.html.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/readyState/003.html.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/readyState/003.html.ini	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/readyState/003.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[003.html]
-  type: testharness
-  [WebSockets: delete readyState]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js.ini	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[EventTarget.worker]
-  type: testharness
-  expected: ERROR
-  [removeEventListener]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html.ini	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[exception-in-onerror.html]
-  type: testharness
-  [onerror, "not handled" with an error in the onerror function]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html.ini	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[not-handled.html]
-  type: testharness
-  [onerror, "not handled"]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html.ini	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[propagate-to-window-onerror.html]
-  type: testharness
-  [onerror, "not handled" with only window.onerror defined]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/interfaces.worker.js.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/interfaces.worker.js.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/interfaces.worker.js.ini	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/interfaces.worker.js.ini	2015-04-24 19:30:58.000000000 +0000
@@ -19,15 +19,6 @@
   [WorkerGlobalScope interface: operation setInterval(DOMString,long,any)]
     expected: FAIL
 
-  [DedicatedWorkerGlobalScope interface: self must inherit property "postMessage" with the proper type (0)]
-    expected: FAIL
-
-  [DedicatedWorkerGlobalScope interface: calling postMessage(any,[object Object\]) on self with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [DedicatedWorkerGlobalScope interface: self must inherit property "onmessage" with the proper type (1)]
-    expected: FAIL
-
   [WorkerGlobalScope interface: self must inherit property "onlanguagechange" with the proper type (4)]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1154779
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/WorkerLocation_hash_encoding.htm.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/WorkerLocation_hash_encoding.htm.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/meta/workers/WorkerLocation_hash_encoding.htm.ini	2015-04-22 13:05:31.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/meta/workers/WorkerLocation_hash_encoding.htm.ini	2015-04-24 19:30:58.000000000 +0000
@@ -2,3 +2,4 @@
   type: testharness
   [ WorkerLocation.hash with url encoding string ]
     expected: FAIL
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/encoding/api-invalid-label.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/encoding/api-invalid-label.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/encoding/api-invalid-label.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/encoding/api-invalid-label.html	2015-04-24 19:31:03.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>Encoding API: invalid label</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+var invalidLabel = "invalid-invalidLabel"
+
+test(function() {
+    assert_throws(new RangeError(), function() { new TextEncoder(invalidLabel); });
+    assert_throws(new RangeError(), function() { new TextDecoder(invalidLabel); });
+}, 'Invalid label "' + invalidLabel + '" should be rejected by API.');
+
+</script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/encoding/api-replacement-encodings.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/encoding/api-replacement-encodings.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/encoding/api-replacement-encodings.html	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/encoding/api-replacement-encodings.html	2015-04-24 19:31:03.000000000 +0000
@@ -6,8 +6,8 @@
 <script>
 
 test(function() {
-    assert_throws({name: 'RangeError'}, function() { new TextEncoder('replacement'); });
-    assert_throws({name: 'RangeError'}, function() { new TextDecoder('replacement'); });
+    assert_throws(new RangeError(), function() { new TextEncoder('replacement'); });
+    assert_throws(new RangeError(), function() { new TextDecoder('replacement'); });
 }, 'The "replacement" label should not be a known encoding.');
 
 encodings_table.forEach(function(section) {
@@ -16,8 +16,8 @@
     }).forEach(function(encoding) {
         encoding.labels.forEach(function(label) {
             test(function() {
-                assert_throws({name: 'RangeError'}, function() { new TextEncoder(label); });
-                assert_throws({name: 'RangeError'}, function() { new TextDecoder(label); });
+                assert_throws(new RangeError(), function() { new TextEncoder(label); });
+                assert_throws(new RangeError(), function() { new TextDecoder(label); });
             }, 'Label for "replacement" should be rejected by API: ' + label);
         });
     });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/encoding/textencoder-constructor-non-utf.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/encoding/textencoder-constructor-non-utf.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/encoding/textencoder-constructor-non-utf.html	2015-04-22 13:05:44.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/encoding/textencoder-constructor-non-utf.html	2015-04-24 19:31:03.000000000 +0000
@@ -17,7 +17,7 @@
         } else {
             test(function() {
                 assert_equals(new TextDecoder(encoding.name).encoding, encoding.name);
-                assert_throws({name: 'RangeError'}, function() { new TextEncoder(encoding.name); });
+                assert_throws(new RangeError(), function() { new TextEncoder(encoding.name); });
             }, 'Non-UTF encodings supported only for decode, not encode: ' + encoding.name);
         }
     });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/cols-default.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/cols-default.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/cols-default.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/cols-default.html	2015-04-24 19:31:05.000000000 +0000
@@ -0,0 +1,5 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Textarea cols</title>
+<link rel=match href=textarea-ref.html>
+<textarea cols=20></textarea>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/cols-zero.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/cols-zero.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/cols-zero.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/cols-zero.html	2015-04-24 19:31:05.000000000 +0000
@@ -0,0 +1,5 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Textarea cols</title>
+<link rel=match href=textarea-ref.html>
+<textarea cols=0></textarea>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/rows-default.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/rows-default.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/rows-default.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/rows-default.html	2015-04-24 19:31:05.000000000 +0000
@@ -0,0 +1,5 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Textarea rows</title>
+<link rel=match href=textarea-ref.html>
+<textarea rows=2></textarea>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/rows-zero.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/rows-zero.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/rows-zero.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/rows-zero.html	2015-04-24 19:31:05.000000000 +0000
@@ -0,0 +1,5 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Textarea rows</title>
+<link rel=match href=textarea-ref.html>
+<textarea rows=0></textarea>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/textarea-ref.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/textarea-ref.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/textarea-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/rendering/bindings/the-textarea-element-0/textarea-ref.html	2015-04-24 19:31:05.000000000 +0000
@@ -0,0 +1,4 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Default textarea</title>
+<textarea></textarea>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html	2015-04-22 13:05:49.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html	2015-04-24 19:31:05.000000000 +0000
@@ -107,10 +107,9 @@
     var img = document.querySelector('[data-desc="' + desc + '"]');
     img.onload = img.onerror = this.unreached_func('update the image data was run');
     if (expect == 'timeout') {
-      setTimeout(this.step_func_done(), 250);
+      setTimeout(this.step_func_done(), 1000);
     } else {
       img['on' + expect] = this.step_func_done(function() {});
-      setTimeout(this.unreached_func('update the image data was not run'), 250)
     }
     func.call(this, img);
   }, desc);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/NavigatorID.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/NavigatorID.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/NavigatorID.js	2015-04-22 13:05:51.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/NavigatorID.js	2015-04-24 19:31:06.000000000 +0000
@@ -23,6 +23,23 @@
   }, "product");
 
   test(function() {
+    // See https://www.w3.org/Bugs/Public/show_bug.cgi?id=22555
+    if ("window" in self) {
+      // If you identify as WebKit, taintEnabled should not exist.
+      if (navigator.userAgent.indexOf("WebKit") != -1) {
+        assert_false("taintEnabled" in navigator);
+      }
+      // Otherwise it should exist and return false.
+      else {
+        assert_false(navigator.taintEnabled());
+      }
+    } else {
+      // taintEnabled should not exist in workers.
+      assert_false("taintEnabled" in navigator);
+    }
+  }, "taintEnabled");
+
+  test(function() {
     assert_equals(typeof navigator.userAgent, "string",
                   "navigator.userAgent should be a string");
   }, "userAgent type");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/lint.whitelist thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/lint.whitelist
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/lint.whitelist	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/lint.whitelist	2015-04-24 19:31:06.000000000 +0000
@@ -0,0 +1,104 @@
+# File containing whiteslist for lint errors
+# Format is:
+# ERROR TYPE:file/name/pattern[:line number]
+# e.g.
+# TRAILING WHITESPACE:example/file.html:128
+# to allow trailing whitespace on example/file.html line 128
+
+## Whitespace rules that we can't enforce yet ##
+
+INDENT TABS: .gitmodules
+INDENT TABS: app-uri/*
+INDENT TABS: conformance-checkers/*
+INDENT TABS: content-security-policy/*
+INDENT TABS: custom-elements/*
+INDENT TABS: DOMEvents/*
+INDENT TABS: eventsource/*
+INDENT TABS: html/editing/dnd/*
+INDENT TABS: html/semantics/*
+INDENT TABS: html/syntax/*
+INDENT TABS: html/webappapis/*
+INDENT TABS: media-source/*
+INDENT TABS: old-tests/*
+INDENT TABS: pointerlock/*
+INDENT TABS: shadow-dom/*
+INDENT TABS: tools/*
+INDENT TABS: touch-events/*
+INDENT TABS: web-animations/*
+INDENT TABS: webaudio/*
+INDENT TABS: webdriver/*
+INDENT TABS: webvtt/*
+INDENT TABS: XMLHttpRequest/*
+
+TRAILING WHITESPACE: app-uri/*
+TRAILING WHITESPACE: battery-status/*
+TRAILING WHITESPACE: conformance-checkers/*
+TRAILING WHITESPACE: content-security-policy/*
+TRAILING WHITESPACE: custom-elements/*
+TRAILING WHITESPACE: DOMEvents/*
+TRAILING WHITESPACE: html-longdesc/*
+TRAILING WHITESPACE: media-source/*
+TRAILING WHITESPACE: microdata/*
+TRAILING WHITESPACE: old-tests/*
+TRAILING WHITESPACE: pointerevents/*
+TRAILING WHITESPACE: progress-events/*
+TRAILING WHITESPACE: shadow-dom/*
+TRAILING WHITESPACE: tools/*
+TRAILING WHITESPACE: webaudio/*
+TRAILING WHITESPACE: webdriver/*
+TRAILING WHITESPACE: WebIDL/*
+TRAILING WHITESPACE: webvtt/*
+TRAILING WHITESPACE: XMLHttpRequest/*
+
+## File types that should never be checked ##
+
+*:*.pdf
+*:*.jpg
+*:*.png
+*:*.gif
+*:*.pdf
+*:*.wav
+*:*.mp3
+*:*.m4a
+*:*.oga
+*:*.ogv
+*:*.webm
+*:*.mp4
+*:*.m4v
+*:*.ttf
+*:*.woff
+*:*.eot
+*:*.sfd
+*:*.swf
+
+## Documentation ##
+
+W3C-TEST.ORG:README.md
+W3C-TEST.ORG:*/README.md
+W3C-TEST.ORG:docs/*
+
+## Helper scripts ##
+
+W3C-TEST.ORG:tools/*
+PRINT STATEMENT:tools/*
+W3C-TEST.ORG:*/tools/*
+PRINT STATEMENT:*/tools/*
+
+### Test exclusions ##
+
+CR AT EOL:WebIDL/valid/idl/documentation-dos.widl
+CR AT EOL:cors/resources/cors-headers.asis
+CR AT EOL:html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
+CR AT EOL:webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/newlines.vtt
+PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/empty.svg
+PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/empty.xhtml
+PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/minimal_html.svg
+PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/minimal_html.xhtml
+
+# These have undefined entities; should probably find a way to define them
+PARSE-FAILED:ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-1.xhtml
+PARSE-FAILED:ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-2.xhtml
+PARSE-FAILED:ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-3.xhtml
+
+# Test generation files containing print statements
+PRINT STATEMENT:dom/nodes/Document-createElement-namespace-tests/generate.py
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/resources/idlharness.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/resources/idlharness.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/resources/idlharness.js	2015-04-22 13:05:53.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/resources/idlharness.js	2015-04-24 19:31:06.000000000 +0000
@@ -553,6 +553,11 @@
 
     /** An array of IdlInterfaceMembers. */
     this.members = obj.members.map(function(m){return new IdlInterfaceMember(m); });
+    if (this.has_extended_attribute("Unforgeable")) {
+        this.members
+            .filter(m => !m["static"] && (m.type == "attribute" || m.type == "operation"))
+            .forEach(m => m.isUnforgeable = true);
+    }
 
     /**
      * The name (as a string) of the type we inherit from, or null if there is
@@ -1003,7 +1008,26 @@
             assert_false(member.name in self[this.name].prototype,
                 "The prototype object must not have a property " +
                 format_value(member.name));
-            do_interface_attribute_asserts(self, member);
+
+            // Try/catch around the get here, since it can legitimately throw.
+            // If it does, we obviously can't check for equality with direct
+            // invocation of the getter.
+            var gotValue;
+            var propVal;
+            try {
+                propVal = self[member.name];
+                gotValue = true;
+            } catch (e) {
+                gotValue = false;
+            }
+            if (gotValue) {
+                var getter = Object.getOwnPropertyDescriptor(self, member.name).get;
+                assert_equals(typeof(getter), "function",
+                              format_value(member.name) + " must have a getter");
+                assert_equals(propVal, getter.call(undefined),
+                              "Gets on a global should not require an explicit this");
+            }
+            this.do_interface_attribute_asserts(self, member);
         } else {
             assert_true(member.name in self[this.name].prototype,
                 "The prototype object must have a property " +
@@ -1017,7 +1041,7 @@
                 assert_equals(self[this.name].prototype[member.name], undefined,
                               "getting property on prototype object must return undefined");
             }
-            do_interface_attribute_asserts(self[this.name].prototype, member);
+            this.do_interface_attribute_asserts(self[this.name].prototype, member);
         }
     }.bind(this), this.name + " interface: attribute " + member.name);
 };
@@ -1055,7 +1079,7 @@
         var memberHolderObject;
         if (member["static"]) {
             assert_own_property(self[this.name], member.name,
-                    "interface prototype object missing static operation");
+                    "interface object missing static operation");
             memberHolderObject = self[this.name];
         } else if (this.is_global()) {
             assert_own_property(self, member.name,
@@ -1067,46 +1091,66 @@
             memberHolderObject = self[this.name].prototype;
         }
 
-        var desc = Object.getOwnPropertyDescriptor(memberHolderObject, member.name);
-        // "The property has attributes { [[Writable]]: true,
-        // [[Enumerable]]: true, [[Configurable]]: true }."
-        assert_false("get" in desc, "property has getter");
-        assert_false("set" in desc, "property has setter");
-        assert_true(desc.writable, "property is not writable");
-        assert_true(desc.enumerable, "property is not enumerable");
-        assert_true(desc.configurable, "property is not configurable");
-        // "The value of the property is a Function object whose
-        // behavior is as follows . . ."
-        assert_equals(typeof memberHolderObject[member.name], "function",
-                      "property must be a function");
-        // "The value of the Function object’s “length” property is
-        // a Number determined as follows:
-        // ". . .
-        // "Return the length of the shortest argument list of the
-        // entries in S."
-        //
-        // TODO: Doesn't handle overloading or variadic arguments.
-        assert_equals(memberHolderObject[member.name].length,
-            member.arguments.filter(function(arg) {
-                return !arg.optional;
-            }).length,
-            "property has wrong .length");
+        this.do_member_operation_asserts(memberHolderObject, member);
+    }.bind(this), this.name + " interface: operation " + member.name +
+    "(" + member.arguments.map(function(m) { return m.idlType.idlType; }) +
+    ")");
+};
 
-        // Make some suitable arguments
-        var args = member.arguments.map(function(arg) {
-            return create_suitable_object(arg.idlType);
-        });
+//@}
+IdlInterface.prototype.do_member_operation_asserts = function(memberHolderObject, member)
+//@{
+{
+    var operationUnforgeable = member.isUnforgeable;
+    var desc = Object.getOwnPropertyDescriptor(memberHolderObject, member.name);
+    // "The property has attributes { [[Writable]]: B,
+    // [[Enumerable]]: true, [[Configurable]]: B }, where B is false if the
+    // operation is unforgeable on the interface, and true otherwise".
+    assert_false("get" in desc, "property has getter");
+    assert_false("set" in desc, "property has setter");
+    assert_equals(desc.writable, !operationUnforgeable,
+                  "property should be writable if and only if not unforgeable");
+    assert_true(desc.enumerable, "property is not enumerable");
+    assert_equals(desc.configurable, !operationUnforgeable,
+                  "property should be configurable if and only if not unforgeable");
+    // "The value of the property is a Function object whose
+    // behavior is as follows . . ."
+    assert_equals(typeof memberHolderObject[member.name], "function",
+                  "property must be a function");
+    // "The value of the Function object’s “length” property is
+    // a Number determined as follows:
+    // ". . .
+    // "Return the length of the shortest argument list of the
+    // entries in S."
+    //
+    // TODO: Doesn't handle overloading or variadic arguments.
+    assert_equals(memberHolderObject[member.name].length,
+        member.arguments.filter(function(arg) {
+            return !arg.optional;
+        }).length,
+        "property has wrong .length");
+
+    // Make some suitable arguments
+    var args = member.arguments.map(function(arg) {
+        return create_suitable_object(arg.idlType);
+    });
 
-        // "Let O be a value determined as follows:
-        // ". . .
-        // "Otherwise, throw a TypeError."
-        // This should be hit if the operation is not static, there is
-        // no [ImplicitThis] attribute, and the this value is null.
-        //
-        // TODO: We currently ignore the [ImplicitThis] case.
-        if (!member["static"]) {
+    // "Let O be a value determined as follows:
+    // ". . .
+    // "Otherwise, throw a TypeError."
+    // This should be hit if the operation is not static, there is
+    // no [ImplicitThis] attribute, and the this value is null.
+    //
+    // TODO: We currently ignore the [ImplicitThis] case.  Except we manually
+    // check for globals, since otherwise we'll invoke window.close().  And we
+    // have to skip this test for anything that on the proto chain of "self",
+    // since that does in fact have implicit-this behavior.
+    if (!member["static"]) {
+        if (!this.is_global() &&
+            memberHolderObject[member.name] != self[member.name])
+        {
             assert_throws(new TypeError(), function() {
-                self[this.name].prototype[member.name].apply(null, args);
+                memberHolderObject[member.name].apply(null, args);
             }, "calling operation with this = null didn't throw TypeError");
         }
 
@@ -1116,12 +1160,10 @@
         // TODO: Test a platform object that implements some other
         // interface.  (Have to be sure to get inheritance right.)
         assert_throws(new TypeError(), function() {
-            self[this.name].prototype[member.name].apply({}, args);
+            memberHolderObject[member.name].apply({}, args);
         }, "calling operation with this = {} didn't throw TypeError");
-    }.bind(this), this.name + " interface: operation " + member.name +
-    "(" + member.arguments.map(function(m) { return m.idlType.idlType; }) +
-    ")");
-};
+    }
+}
 
 //@}
 IdlInterface.prototype.test_member_stringifier = function(member)
@@ -1150,15 +1192,18 @@
         assert_own_property(self[this.name].prototype, "toString",
                 "interface prototype object missing non-static operation");
 
+        var stringifierUnforgeable = member.isUnforgeable;
         var desc = Object.getOwnPropertyDescriptor(interfacePrototypeObject, "toString");
         // "The property has attributes { [[Writable]]: B,
         // [[Enumerable]]: true, [[Configurable]]: B }, where B is false if the
         // stringifier is unforgeable on the interface, and true otherwise."
         assert_false("get" in desc, "property has getter");
         assert_false("set" in desc, "property has setter");
-        assert_true(desc.writable, "property is not writable");
+        assert_equals(desc.writable, !stringifierUnforgeable,
+                      "property should be writable if and only if not unforgeable");
         assert_true(desc.enumerable, "property is not enumerable");
-        assert_true(desc.configurable, "property is not configurable");
+        assert_equals(desc.configurable, !stringifierUnforgeable,
+                      "property should be configurable if and only if not unforgeable");
         // "The value of the property is a Function object, which behaves as
         // follows . . ."
         assert_equals(typeof interfacePrototypeObject.toString, "function",
@@ -1203,7 +1248,8 @@
         case "attribute":
             // For unforgeable attributes, we do the checks in
             // test_interface_of instead.
-            if (!member.has_extended_attribute("Unforgeable")) {
+            if (!member.isUnforgeable)
+            {
                 this.test_member_attribute(member);
             }
             break;
@@ -1211,8 +1257,13 @@
         case "operation":
             // TODO: Need to correctly handle multiple operations with the same
             // identifier.
+            // For unforgeable operations, we do the checks in
+            // test_interface_of instead.
             if (member.name) {
-                this.test_member_operation(member);
+                if (!member.isUnforgeable)
+                {
+                    this.test_member_operation(member);
+                }
             } else if (member.stringifier) {
                 this.test_member_stringifier(member);
             }
@@ -1321,13 +1372,26 @@
     for (var i = 0; i < this.members.length; i++)
     {
         var member = this.members[i];
-        if (member.has_extended_attribute("Unforgeable"))
+        if (member.type == "attribute" && member.isUnforgeable)
         {
             test(function()
             {
                 assert_equals(exception, null, "Unexpected exception when evaluating object");
                 assert_equals(typeof obj, expected_typeof, "wrong typeof object");
-                do_interface_attribute_asserts(obj, member);
+                this.do_interface_attribute_asserts(obj, member);
+            }.bind(this), this.name + " interface: " + desc + ' must have own property "' + member.name + '"');
+        }
+        else if (member.type == "operation" &&
+                 member.name &&
+                 member.isUnforgeable)
+        {
+            test(function()
+            {
+                assert_equals(exception, null, "Unexpected exception when evaluating object");
+                assert_equals(typeof obj, expected_typeof, "wrong typeof object");
+                assert_own_property(obj, member.name,
+                                    "Doesn't have the unforgeable operation property");
+                this.do_member_operation_asserts(obj, member);
             }.bind(this), this.name + " interface: " + desc + ' must have own property "' + member.name + '"');
         }
         else if ((member.type == "const"
@@ -1340,7 +1404,12 @@
                 assert_equals(exception, null, "Unexpected exception when evaluating object");
                 assert_equals(typeof obj, expected_typeof, "wrong typeof object");
                 if (!member["static"]) {
-                    assert_inherits(obj, member.name);
+                    if (!this.is_global()) {
+                        assert_inherits(obj, member.name);
+                    } else {
+                        assert_own_property(obj, member.name);
+                    }
+
                     if (member.type == "const")
                     {
                         assert_equals(obj[member.name], constValue(member.value));
@@ -1381,7 +1450,11 @@
                 assert_equals(exception, null, "Unexpected exception when evaluating object");
                 assert_equals(typeof obj, expected_typeof, "wrong typeof object");
                 if (!member["static"]) {
-                    assert_inherits(obj, member.name);
+                    if (!this.is_global() && !member.isUnforgeable) {
+                        assert_inherits(obj, member.name);
+                    } else {
+                        assert_own_property(obj, member.name);
+                    }
                 }
                 else
                 {
@@ -1423,7 +1496,7 @@
 };
 
 //@}
-function do_interface_attribute_asserts(obj, member)
+IdlInterface.prototype.do_interface_attribute_asserts = function(obj, member)
 //@{
 {
     // This function tests WebIDL as of 2015-01-27.
@@ -1451,7 +1524,7 @@
     assert_false("value" in desc, 'property descriptor has value but is supposed to be accessor');
     assert_false("writable" in desc, 'property descriptor has "writable" field but is supposed to be accessor');
     assert_true(desc.enumerable, "property is not enumerable");
-    if (member.has_extended_attribute("Unforgeable"))
+    if (member.isUnforgeable)
     {
         assert_false(desc.configurable, "[Unforgeable] property must not be configurable");
     }
@@ -1545,6 +1618,8 @@
     {
         this.extAttrs = [];
     }
+
+    this.isUnforgeable = this.has_extended_attribute("Unforgeable");
 }
 
 //@}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/resources/testharness.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/resources/testharness.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/resources/testharness.js	2015-04-22 13:05:53.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/resources/testharness.js	2015-04-24 19:31:06.000000000 +0000
@@ -71,13 +71,22 @@
 
     WindowTestEnvironment.prototype._dispatch = function(selector, callback_args, message_arg) {
         this._forEach_windows(
-                function(w, is_same_origin) {
-                    if (is_same_origin && selector in w) {
+                function(w, same_origin) {
+                    if (same_origin) {
                         try {
-                            w[selector].apply(undefined, callback_args);
-                        } catch (e) {
-                            if (debug) {
-                                throw e;
+                            var has_selector = selector in w;
+                        } catch(e) {
+                            // If document.domain was set at some point same_origin can be
+                            // wrong and the above will fail.
+                            has_selector = false;
+                        }
+                        if (has_selector) {
+                            try {
+                                w[selector].apply(undefined, callback_args);
+                            } catch (e) {
+                                if (debug) {
+                                    throw e;
+                                }
                             }
                         }
                     }
@@ -1504,7 +1513,7 @@
             status: {
                 status: tests.status.ERROR,
                 message: "Error in worker" + filename + ": " + message,
-                stack: e.stack
+                stack: error.stack
             }
         });
         error.preventDefault();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/tools/lint/lint.py thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/tools/lint/lint.py
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/tools/lint/lint.py	2015-04-22 13:05:55.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/tools/lint/lint.py	2015-04-24 19:31:07.000000000 +0000
@@ -76,7 +76,7 @@
     global _whitelist_fn
 
     if _whitelist_fn is None:
-        _whitelist_fn = parse_whitelist_file(os.path.join(here, "lint.whitelist"))
+        _whitelist_fn = parse_whitelist_file(os.path.join(repo_root, "lint.whitelist"))
     return _whitelist_fn(path, errors)
 
 class Regexp(object):
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/tools/lint/lint.whitelist thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/tools/lint/lint.whitelist
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/tools/lint/lint.whitelist	2015-04-22 13:05:55.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/tools/lint/lint.whitelist	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-# File containing whiteslist for lint errors
-# Format is:
-# ERROR TYPE:file/name/pattern[:line number]
-# e.g.
-# TRAILING WHITESPACE:example/file.html:128
-# to allow trailing whitespace on example/file.html line 128
-
-## Whitespace rules that we can't enforce yet ##
-
-INDENT TABS: .gitmodules
-INDENT TABS: app-uri/*
-INDENT TABS: conformance-checkers/*
-INDENT TABS: content-security-policy/*
-INDENT TABS: custom-elements/*
-INDENT TABS: DOMEvents/*
-INDENT TABS: eventsource/*
-INDENT TABS: html/editing/dnd/*
-INDENT TABS: html/semantics/*
-INDENT TABS: html/syntax/*
-INDENT TABS: html/webappapis/*
-INDENT TABS: media-source/*
-INDENT TABS: old-tests/*
-INDENT TABS: pointerlock/*
-INDENT TABS: shadow-dom/*
-INDENT TABS: tools/*
-INDENT TABS: touch-events/*
-INDENT TABS: web-animations/*
-INDENT TABS: webaudio/*
-INDENT TABS: webdriver/*
-INDENT TABS: webvtt/*
-INDENT TABS: XMLHttpRequest/*
-
-TRAILING WHITESPACE: app-uri/*
-TRAILING WHITESPACE: battery-status/*
-TRAILING WHITESPACE: conformance-checkers/*
-TRAILING WHITESPACE: content-security-policy/*
-TRAILING WHITESPACE: custom-elements/*
-TRAILING WHITESPACE: DOMEvents/*
-TRAILING WHITESPACE: html-longdesc/*
-TRAILING WHITESPACE: media-source/*
-TRAILING WHITESPACE: microdata/*
-TRAILING WHITESPACE: old-tests/*
-TRAILING WHITESPACE: pointerevents/*
-TRAILING WHITESPACE: progress-events/*
-TRAILING WHITESPACE: shadow-dom/*
-TRAILING WHITESPACE: tools/*
-TRAILING WHITESPACE: webaudio/*
-TRAILING WHITESPACE: webdriver/*
-TRAILING WHITESPACE: WebIDL/*
-TRAILING WHITESPACE: webvtt/*
-TRAILING WHITESPACE: XMLHttpRequest/*
-
-## File types that should never be checked ##
-
-*:*.pdf
-*:*.jpg
-*:*.png
-*:*.gif
-*:*.pdf
-*:*.wav
-*:*.mp3
-*:*.m4a
-*:*.oga
-*:*.ogv
-*:*.webm
-*:*.mp4
-*:*.m4v
-*:*.ttf
-*:*.woff
-*:*.eot
-*:*.sfd
-*:*.swf
-
-## Documentation ##
-
-W3C-TEST.ORG:README.md
-W3C-TEST.ORG:*/README.md
-W3C-TEST.ORG:docs/*
-
-## Helper scripts ##
-
-W3C-TEST.ORG:tools/*
-PRINT STATEMENT:tools/*
-W3C-TEST.ORG:*/tools/*
-PRINT STATEMENT:*/tools/*
-
-### Test exclusions ##
-
-CR AT EOL:WebIDL/valid/idl/documentation-dos.widl
-CR AT EOL:cors/resources/cors-headers.asis
-CR AT EOL:html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
-CR AT EOL:webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/newlines.vtt
-PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/empty.svg
-PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/empty.xhtml
-PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/minimal_html.svg
-PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/minimal_html.xhtml
-
-# These have undefined entities; should probably find a way to define them
-PARSE-FAILED:ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-1.xhtml
-PARSE-FAILED:ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-2.xhtml
-PARSE-FAILED:ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-3.xhtml
-
-# Test generation files containing print statements
-PRINT STATEMENT:dom/nodes/Document-createElement-namespace-tests/generate.py
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-basic.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-basic.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-basic.html	2015-04-22 13:05:57.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-basic.html	2015-04-24 19:31:07.000000000 +0000
@@ -14,6 +14,8 @@
     assert_equals(e.wasClean, false, 'e.wasClean = true');
     delete e.wasClean;
     assert_equals(e.wasClean, false, 'delete e.wasClean');
+    delete CloseEvent.prototype.wasClean;
+    assert_equals(e.wasClean, undefined, 'delete CloseEvent.prototype.wasClean');
     t.done();
   });
   ws.close();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/003.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/003.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/003.html	2015-04-22 13:05:57.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/readyState/003.html	2015-04-24 19:31:08.000000000 +0000
@@ -6,10 +6,11 @@
 <div id=log></div>
 <script>
 test(function(t) {
-  delete WebSocket.prototype.readyState;
   var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/');
   ws.close();
   delete ws.readyState;
-  assert_equals(ws.readyState, ws.CLOSING);
+  assert_equals(ws.readyState, ws.CLOSING, 'delete ws.readyState');
+  delete WebSocket.prototype.readyState;
+  assert_equals(ws.readyState, undefined, 'delete WebSocket.prototype.readyState');
 });
 </script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/url/003.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/url/003.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/url/003.html	2015-04-22 13:05:57.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/websockets/interfaces/WebSocket/url/003.html	2015-04-24 19:31:08.000000000 +0000
@@ -8,6 +8,8 @@
 test(function() {
   var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/');
   delete ws.url;
-  assert_equals(ws.url, SCHEME_DOMAIN_PORT+'/');
+  assert_equals(ws.url, SCHEME_DOMAIN_PORT+'/', 'delete ws.url');
+  delete WebSocket.prototype.url;
+  assert_equals(ws.url, undefined, 'delete WebSocket.prototype.url');
 });
 </script>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js	2015-04-24 19:31:08.000000000 +0000
@@ -1,9 +1,9 @@
 importScripts("/resources/testharness.js");
 
-test(function() {
+test(function(t) {
     var i = 0;
     addEventListener("message", function listener(evt) {
-        this.step(function() {
+        t.step(function() {
             ++i;
             removeEventListener("message", listener, true);
         });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html	2015-04-24 19:31:08.000000000 +0000
@@ -21,7 +21,7 @@
     assert_equals(typeof e.message, 'string', 'typeof e.message');
     assert_equals(e.filename, document.URL+'#', 'e.filename');
     assert_equals(typeof e.lineno, 'number', 'typeof e.lineno');
-    assert_equals(typeof e.column, 'number', 'typeof e.column');
+    assert_equals(typeof e.colno, 'number', 'typeof e.column');
     e.preventDefault(); // "handled"
     this.done();
   });
@@ -29,4 +29,4 @@
 </script>
 <!--
 */
-//-->
\ No newline at end of file
+//-->
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html	2015-04-24 19:31:08.000000000 +0000
@@ -21,7 +21,7 @@
     assert_equals(typeof e.message, 'string', 'typeof e.message');
     assert_equals(e.filename, document.URL+'#', 'e.filename');
     assert_equals(typeof e.lineno, 'number', 'typeof e.lineno');
-    assert_equals(typeof e.column, 'number', 'typeof e.column');
+    assert_equals(typeof e.colno, 'number', 'typeof e.column');
     e.preventDefault(); // "handled"
     this.done();
   });
@@ -29,4 +29,4 @@
 </script>
 <!--
 */
-//-->
\ No newline at end of file
+//-->
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html	2015-04-24 19:31:08.000000000 +0000
@@ -16,15 +16,11 @@
 });
 async_test(function() {
   var worker = new Worker('#');
-  var timeout = setTimeout(this.step_func(function() {
-    assert_unreached();
-  }, 500));
   window.onerror = this.step_func(function(a, b, c, d) {
-    assert_true(typeof a, 'string', 'first argument');
+    assert_equals(typeof a, 'string', 'first argument');
     assert_equals(b, document.URL+'#', 'second argument');
     assert_equals(typeof c, 'number', 'third argument');
     assert_equals(typeof d, 'number', 'fourth argument');
-    clearTimeout(timeout);
     this.done();
     return true; // "handled"
   });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/XMLHttpRequest/send-usp.worker.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/XMLHttpRequest/send-usp.worker.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/testing/web-platform/tests/XMLHttpRequest/send-usp.worker.js	2015-04-22 13:05:35.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/testing/web-platform/tests/XMLHttpRequest/send-usp.worker.js	2015-04-24 19:31:00.000000000 +0000
@@ -2,3 +2,4 @@
 importScripts("/resources/testharnessreport.js");
 importScripts("send-usp.js");
 run_test();
+done();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/crashmonitor/CrashMonitor.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/crashmonitor/CrashMonitor.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/crashmonitor/CrashMonitor.jsm	2015-04-22 13:05:59.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/crashmonitor/CrashMonitor.jsm	2015-04-24 19:31:09.000000000 +0000
@@ -84,13 +84,9 @@
    * Path to checkpoint file.
    *
    * Each time a new notification is received, this file is written to
-   * disc to reflect the information in |checkpoints|. Although Firefox for
-   * Desktop and Metro share the same profile, they need to keep record of
-   * crashes separately.
+   * disc to reflect the information in |checkpoints|.
    */
-  path: (Services.metro && Services.metro.immersive) ?
-    OS.Path.join(OS.Constants.Path.profileDir, "metro", "sessionCheckpoints.json"):
-    OS.Path.join(OS.Constants.Path.profileDir, "sessionCheckpoints.json"),
+  path: OS.Path.join(OS.Constants.Path.profileDir, "sessionCheckpoints.json"),
 
   /**
    * Load checkpoints from previous session asynchronously.
@@ -178,9 +174,6 @@
     );
 
     CrashMonitorInternal.initialized = true;
-    if (Services.metro && Services.metro.immersive) {
-      OS.File.makeDir(OS.Path.join(OS.Constants.Path.profileDir, "metro"));
-    }
     return promise;
   },
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/ctypes/tests/unit/test_jsctypes.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/ctypes/tests/unit/test_jsctypes.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/ctypes/tests/unit/test_jsctypes.js	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/ctypes/tests/unit/test_jsctypes.js	2015-04-24 19:31:09.000000000 +0000
@@ -300,7 +300,7 @@
 }
 
 function run_Int64_tests() {
-  do_check_throws(function() { ctypes.Int64(); }, Error);
+  do_check_throws(function() { ctypes.Int64(); }, TypeError);
 
   // Test that classes and prototypes are set up correctly.
   do_check_class(ctypes.Int64, "Function");
@@ -331,14 +331,14 @@
   do_check_eq(i.toString(), "0");
   for (let radix = 2; radix <= 36; ++radix)
     do_check_eq(i.toString(radix), "0");
-  do_check_throws(function() { i.toString(0); }, Error);
-  do_check_throws(function() { i.toString(1); }, Error);
-  do_check_throws(function() { i.toString(37); }, Error);
-  do_check_throws(function() { i.toString(10, 2); }, Error);
+  do_check_throws(function() { i.toString(0); }, RangeError);
+  do_check_throws(function() { i.toString(1); }, RangeError);
+  do_check_throws(function() { i.toString(37); }, RangeError);
+  do_check_throws(function() { i.toString(10, 2); }, TypeError);
 
   // Test Int64.toSource().
   do_check_eq(i.toSource(), "ctypes.Int64(\"0\")");
-  do_check_throws(function() { i.toSource(10); }, Error);
+  do_check_throws(function() { i.toSource(10); }, TypeError);
 
   i = ctypes.Int64("0x28590a1c921def71");
   do_check_eq(i.toString(), i.toString(10));
@@ -445,18 +445,18 @@
   do_check_eq(ctypes.Int64.compare(ctypes.Int64(-5), ctypes.Int64(-5)), 0);
   do_check_eq(ctypes.Int64.compare(ctypes.Int64(-5), ctypes.Int64(-4)), -1);
   do_check_eq(ctypes.Int64.compare(ctypes.Int64(-4), ctypes.Int64(-5)), 1);
-  do_check_throws(function() { ctypes.Int64.compare(ctypes.Int64(4), ctypes.UInt64(4)); }, Error);
-  do_check_throws(function() { ctypes.Int64.compare(4, 5); }, Error);
+  do_check_throws(function() { ctypes.Int64.compare(ctypes.Int64(4), ctypes.UInt64(4)); }, TypeError);
+  do_check_throws(function() { ctypes.Int64.compare(4, 5); }, TypeError);
 
   // Test ctypes.Int64.{lo,hi}.
   do_check_eq(ctypes.Int64.lo(ctypes.Int64(0x28590a1c921de000)), 0x921de000);
   do_check_eq(ctypes.Int64.hi(ctypes.Int64(0x28590a1c921de000)), 0x28590a1c);
   do_check_eq(ctypes.Int64.lo(ctypes.Int64(-0x28590a1c921de000)), 0x6de22000);
   do_check_eq(ctypes.Int64.hi(ctypes.Int64(-0x28590a1c921de000)), -0x28590a1d);
-  do_check_throws(function() { ctypes.Int64.lo(ctypes.UInt64(0)); }, Error);
-  do_check_throws(function() { ctypes.Int64.hi(ctypes.UInt64(0)); }, Error);
-  do_check_throws(function() { ctypes.Int64.lo(0); }, Error);
-  do_check_throws(function() { ctypes.Int64.hi(0); }, Error);
+  do_check_throws(function() { ctypes.Int64.lo(ctypes.UInt64(0)); }, TypeError);
+  do_check_throws(function() { ctypes.Int64.hi(ctypes.UInt64(0)); }, TypeError);
+  do_check_throws(function() { ctypes.Int64.lo(0); }, TypeError);
+  do_check_throws(function() { ctypes.Int64.hi(0); }, TypeError);
 
   // Test ctypes.Int64.join.
   do_check_eq(ctypes.Int64.join(0, 0).toString(), "0");
@@ -471,7 +471,7 @@
 }
 
 function run_UInt64_tests() {
-  do_check_throws(function() { ctypes.UInt64(); }, Error);
+  do_check_throws(function() { ctypes.UInt64(); }, TypeError);
 
   // Test that classes and prototypes are set up correctly.
   do_check_class(ctypes.UInt64, "Function");
@@ -502,14 +502,14 @@
   do_check_eq(i.toString(), "0");
   for (let radix = 2; radix <= 36; ++radix)
     do_check_eq(i.toString(radix), "0");
-  do_check_throws(function() { i.toString(0); }, Error);
-  do_check_throws(function() { i.toString(1); }, Error);
-  do_check_throws(function() { i.toString(37); }, Error);
-  do_check_throws(function() { i.toString(10, 2); }, Error);
+  do_check_throws(function() { i.toString(0); }, RangeError);
+  do_check_throws(function() { i.toString(1); }, RangeError);
+  do_check_throws(function() { i.toString(37); }, RangeError);
+  do_check_throws(function() { i.toString(10, 2); }, TypeError);
 
   // Test UInt64.toSource().
   do_check_eq(i.toSource(), "ctypes.UInt64(\"0\")");
-  do_check_throws(function() { i.toSource(10); }, Error);
+  do_check_throws(function() { i.toSource(10); }, TypeError);
 
   i = ctypes.UInt64("0x28590a1c921def71");
   do_check_eq(i.toString(), i.toString(10));
@@ -592,18 +592,18 @@
   do_check_eq(ctypes.UInt64.compare(ctypes.UInt64(5), ctypes.UInt64(5)), 0);
   do_check_eq(ctypes.UInt64.compare(ctypes.UInt64(5), ctypes.UInt64(4)), 1);
   do_check_eq(ctypes.UInt64.compare(ctypes.UInt64(4), ctypes.UInt64(5)), -1);
-  do_check_throws(function() { ctypes.UInt64.compare(ctypes.UInt64(4), ctypes.Int64(4)); }, Error);
-  do_check_throws(function() { ctypes.UInt64.compare(4, 5); }, Error);
+  do_check_throws(function() { ctypes.UInt64.compare(ctypes.UInt64(4), ctypes.Int64(4)); }, TypeError);
+  do_check_throws(function() { ctypes.UInt64.compare(4, 5); }, TypeError);
 
   // Test ctypes.UInt64.{lo,hi}.
   do_check_eq(ctypes.UInt64.lo(ctypes.UInt64(0x28590a1c921de000)), 0x921de000);
   do_check_eq(ctypes.UInt64.hi(ctypes.UInt64(0x28590a1c921de000)), 0x28590a1c);
   do_check_eq(ctypes.UInt64.lo(ctypes.UInt64(0xa8590a1c921de000)), 0x921de000);
   do_check_eq(ctypes.UInt64.hi(ctypes.UInt64(0xa8590a1c921de000)), 0xa8590a1c);
-  do_check_throws(function() { ctypes.UInt64.lo(ctypes.Int64(0)); }, Error);
-  do_check_throws(function() { ctypes.UInt64.hi(ctypes.Int64(0)); }, Error);
-  do_check_throws(function() { ctypes.UInt64.lo(0); }, Error);
-  do_check_throws(function() { ctypes.UInt64.hi(0); }, Error);
+  do_check_throws(function() { ctypes.UInt64.lo(ctypes.Int64(0)); }, TypeError);
+  do_check_throws(function() { ctypes.UInt64.hi(ctypes.Int64(0)); }, TypeError);
+  do_check_throws(function() { ctypes.UInt64.lo(0); }, TypeError);
+  do_check_throws(function() { ctypes.UInt64.hi(0); }, TypeError);
 
   // Test ctypes.UInt64.join.
   do_check_eq(ctypes.UInt64.join(0, 0).toString(), "0");
@@ -1166,7 +1166,7 @@
   do_check_eq(s.constructor.length, literal.length + 1);
   s = t.array(50)(literal);
   do_check_eq(s.readString(), literal);
-  do_check_throws(function() { t.array(3)(literal); }, Error);
+  do_check_throws(function() { t.array(3)(literal); }, TypeError);
 
   do_check_throws(function() { t.ptr(literal); }, TypeError);
   let p = t.ptr(s);
@@ -1258,7 +1258,7 @@
   do_check_eq(s.constructor.length, literal.length + 1);
   s = t.array(50)(literal);
   do_check_eq(s.readString(), literal);
-  do_check_throws(function() { t.array(3)(literal); }, Error);
+  do_check_throws(function() { t.array(3)(literal); }, TypeError);
 
   do_check_throws(function() { t.ptr(literal); }, TypeError);
   let p = t.ptr(s);
@@ -1372,10 +1372,10 @@
     ctypes.StructType("t", [{"c": ctypes.int32_t}, {"d": ctypes.int64_t}]),
     [ "fields" ], [ "define" ], [], [ "addressOfField" ], [ "a", "b" ]);
 
-  do_check_throws(function() { ctypes.StructType(); }, Error);
-  do_check_throws(function() { ctypes.StructType("a", [], 5); }, Error);
-  do_check_throws(function() { ctypes.StructType(null, []); }, Error);
-  do_check_throws(function() { ctypes.StructType("a", null); }, Error);
+  do_check_throws(function() { ctypes.StructType(); }, TypeError);
+  do_check_throws(function() { ctypes.StructType("a", [], 5); }, TypeError);
+  do_check_throws(function() { ctypes.StructType(null, []); }, TypeError);
+  do_check_throws(function() { ctypes.StructType("a", null); }, TypeError);
 
   // Check that malformed descriptors are an error.
   do_check_throws(function() {
@@ -1424,8 +1424,8 @@
   }, TypeError);
 
   // Check that 'define' works.
-  do_check_throws(function() { opaque_t.define(); }, Error);
-  do_check_throws(function() { opaque_t.define([], 0); }, Error);
+  do_check_throws(function() { opaque_t.define(); }, TypeError);
+  do_check_throws(function() { opaque_t.define([], 0); }, TypeError);
   do_check_throws(function() { opaque_t.define([{}]); }, Error);
   do_check_throws(function() { opaque_t.define([{ a: 0 }]); }, Error);
   do_check_throws(function() {
@@ -1551,7 +1551,7 @@
   do_check_eq(g.a, 1);
   do_check_eq(g.b, 2);
   do_check_throws(function() { g_t(1); }, TypeError);
-  do_check_throws(function() { g_t(1, 2, 3); }, Error);
+  do_check_throws(function() { g_t(1, 2, 3); }, TypeError);
 
   for (let field in g)
     do_check_true(field == "a" || field == "b");
@@ -1576,9 +1576,9 @@
   g_a = s.addressOfField("b");
   do_check_true(g_a.constructor === g_t.ptr);
   do_check_eq(g_a.contents.a, s.b.a);
-  do_check_throws(function() { s.addressOfField(); }, Error);
+  do_check_throws(function() { s.addressOfField(); }, TypeError);
   do_check_throws(function() { s.addressOfField("d"); }, Error);
-  do_check_throws(function() { s.addressOfField("a", 2); }, Error);
+  do_check_throws(function() { s.addressOfField("a", 2); }, TypeError);
 
   do_check_eq(s.toSource(), "s_t(4, {\"a\": 7, \"b\": 2}, 10)");
   do_check_eq(s.toSource(), s.toString());
@@ -1587,25 +1587,25 @@
   do_check_eq(s.b.b, s2.b.b);
 
   // Test that structs can be set from an object using 'value'.
-  do_check_throws(function() { s.value; }, Error);
+  do_check_throws(function() { s.value; }, TypeError);
   let s_init = { "a": 2, "b": { "a": 9, "b": 5 }, "c": 13 };
   s.value = s_init;
   do_check_eq(s.b.a, 9);
   do_check_eq(s.c, 13);
   do_check_throws(function() { s.value = 5; }, TypeError);
   do_check_throws(function() { s.value = ctypes.int32_t(); }, TypeError);
-  do_check_throws(function() { s.value = {}; }, Error);
-  do_check_throws(function() { s.value = { "a": 2 }; }, Error);
+  do_check_throws(function() { s.value = {}; }, TypeError);
+  do_check_throws(function() { s.value = { "a": 2 }; }, TypeError);
   do_check_throws(function() { s.value = { "a": 2, "b": 5, "c": 10 }; }, TypeError);
   do_check_throws(function() {
     s.value = { "5": 2, "b": { "a": 9, "b": 5 }, "c": 13 };
-  }, Error);
+  }, TypeError);
   do_check_throws(function() {
     s.value = { "a": 2, "b": { "a": 9, "b": 5 }, "c": 13, "d": 17 };
-  }, Error);
+  }, TypeError);
   do_check_throws(function() {
     s.value = { "a": 2, "b": { "a": 9, "b": 5, "e": 9 }, "c": 13 };
-  }, Error);
+  }, TypeError);
 
   // Test that structs can be constructed similarly through ExplicitConvert,
   // and that the single-field case is disambiguated correctly.
@@ -1657,11 +1657,11 @@
     ctypes.PointerType(ctypes.int32_t), ctypes.PointerType(ctypes.int64_t),
     [ "targetType" ], [], [ "contents" ], [ "isNull", "increment", "decrement" ], []);
 
-  do_check_throws(function() { ctypes.PointerType(); }, Error);
-  do_check_throws(function() { ctypes.PointerType(ctypes.int32_t, 5); }, Error);
-  do_check_throws(function() { ctypes.PointerType(null); }, Error);
-  do_check_throws(function() { ctypes.PointerType(ctypes.int32_t()); }, Error);
-  do_check_throws(function() { ctypes.PointerType("void"); }, Error);
+  do_check_throws(function() { ctypes.PointerType(); }, TypeError);
+  do_check_throws(function() { ctypes.PointerType(ctypes.int32_t, 5); }, TypeError);
+  do_check_throws(function() { ctypes.PointerType(null); }, TypeError);
+  do_check_throws(function() { ctypes.PointerType(ctypes.int32_t()); }, TypeError);
+  do_check_throws(function() { ctypes.PointerType("void"); }, TypeError);
 
   let name = "g_t";
   let g_t = ctypes.StructType(name, [{ a: ctypes.int32_t }, { b: ctypes.double }]);
@@ -1682,7 +1682,7 @@
 
   // Test ExplicitConvert.
   let p = p_t();
-  do_check_throws(function() { p.value; }, Error);
+  do_check_throws(function() { p.value; }, TypeError);
   do_check_eq(ptrValue(p), 0);
   do_check_throws(function() { p.contents; }, Error);
   do_check_throws(function() { p.contents = g; }, Error);
@@ -1798,10 +1798,10 @@
         let array_type_too_large = item_type.array(number_of_items + 1);
         let array_type_too_small = item_type.array(number_of_items - 1);
 
-        do_check_throws(function() { array_type_too_large(c_arraybuffer); }, Error);
-        do_check_throws(function() { array_type_too_small(c_arraybuffer); }, Error);
-        do_check_throws(function() { array_type_too_large(view); }, Error);
-        do_check_throws(function() { array_type_too_small(view); }, Error);
+        do_check_throws(function() { array_type_too_large(c_arraybuffer); }, TypeError);
+        do_check_throws(function() { array_type_too_small(c_arraybuffer); }, TypeError);
+        do_check_throws(function() { array_type_too_large(view); }, TypeError);
+        do_check_throws(function() { array_type_too_small(view); }, TypeError);
 
         // Convert subarray of typed array to array of right size and check contents
         c_array = array_type_too_small(view.subarray(1));
@@ -1835,19 +1835,19 @@
     [ "abi", "returnType", "argTypes", "isVariadic" ],
     undefined, undefined, undefined, undefined);
 
-  do_check_throws(function() { ctypes.FunctionType(); }, Error);
+  do_check_throws(function() { ctypes.FunctionType(); }, TypeError);
   do_check_throws(function() {
     ctypes.FunctionType(ctypes.default_abi, ctypes.void_t, [ ctypes.void_t ]);
   }, Error);
   do_check_throws(function() {
     ctypes.FunctionType(ctypes.default_abi, ctypes.void_t, [ ctypes.void_t ], 5);
-  }, Error);
+  }, TypeError);
   do_check_throws(function() {
     ctypes.FunctionType(ctypes.default_abi, ctypes.void_t, ctypes.void_t);
-  }, Error);
+  }, TypeError);
   do_check_throws(function() {
     ctypes.FunctionType(ctypes.default_abi, ctypes.void_t, null);
-  }, Error);
+  }, TypeError);
   do_check_throws(function() {
     ctypes.FunctionType(ctypes.default_abi, ctypes.int32_t());
   }, Error);
@@ -1884,7 +1884,7 @@
 
   // Test ExplicitConvert.
   let f = fp_t();
-  do_check_throws(function() { f.value; }, Error);
+  do_check_throws(function() { f.value; }, TypeError);
   do_check_eq(ptrValue(f), 0);
   f = fp_t(5);
   do_check_eq(ptrValue(f), 5);
@@ -1960,10 +1960,10 @@
     ctypes.ArrayType(ctypes.int32_t, 10), ctypes.ArrayType(ctypes.int64_t),
     [ "elementType", "length" ], [], [ "length" ], [ "addressOfElement" ]);
 
-  do_check_throws(function() { ctypes.ArrayType(); }, Error);
-  do_check_throws(function() { ctypes.ArrayType(null); }, Error);
-  do_check_throws(function() { ctypes.ArrayType(ctypes.int32_t, 1, 5); }, Error);
-  do_check_throws(function() { ctypes.ArrayType(ctypes.int32_t, -1); }, Error);
+  do_check_throws(function() { ctypes.ArrayType(); }, TypeError);
+  do_check_throws(function() { ctypes.ArrayType(null); }, TypeError);
+  do_check_throws(function() { ctypes.ArrayType(ctypes.int32_t, 1, 5); }, TypeError);
+  do_check_throws(function() { ctypes.ArrayType(ctypes.int32_t, -1); }, TypeError);
 
   let name = "g_t";
   let g_t = ctypes.StructType(name, [{ a: ctypes.int32_t }, { b: ctypes.double }]);
@@ -2011,7 +2011,7 @@
   do_check_eq(a2.constructor.length, 5);
   do_check_eq(a2.length, 5);
   do_check_eq(a2.constructor.size, g_t.size * 5);
-  do_check_throws(function() { new a2_t(); }, Error);
+  do_check_throws(function() { new a2_t(); }, TypeError);
   do_check_throws(function() { ctypes.ArrayType(ctypes.ArrayType(g_t)); }, Error);
   do_check_throws(function() { ctypes.ArrayType(ctypes.ArrayType(g_t), 5); }, Error);
 
@@ -2025,7 +2025,7 @@
   if (ctypes.size_t.size == 4) {
     do_check_throws(function() {
       ctypes.ArrayType(ctypes.int8_t, 0x100000000);
-    }, Error);
+    }, TypeError);
     do_check_throws(function() {
       ctypes.ArrayType(ctypes.int16_t, 0x80000000);
     }, Error);
@@ -2036,7 +2036,7 @@
   } else {
     do_check_throws(function() {
       ctypes.ArrayType(ctypes.int8_t, ctypes.UInt64("0xffffffffffffffff"));
-    }, Error);
+    }, TypeError);
     do_check_throws(function() {
       ctypes.ArrayType(ctypes.int16_t, ctypes.UInt64("0x8000000000000000"));
     }, Error);
@@ -2067,11 +2067,11 @@
 
   c.value = c;
   do_check_eq(c[3], 4);
-  do_check_throws(function() { c.value; }, Error);
-  do_check_throws(function() { c.value = [1, 2, 3, 4, 5]; }, Error);
-  do_check_throws(function() { c.value = [1, 2, 3, 4, 5, 6, 7]; }, Error);
+  do_check_throws(function() { c.value; }, TypeError);
+  do_check_throws(function() { c.value = [1, 2, 3, 4, 5]; }, TypeError);
+  do_check_throws(function() { c.value = [1, 2, 3, 4, 5, 6, 7]; }, TypeError);
   do_check_throws(function() { c.value = [1, 2, 7.4, 4, 5, 6]; }, TypeError);
-  do_check_throws(function() { c.value = []; }, Error);
+  do_check_throws(function() { c.value = []; }, TypeError);
 }
 
 function run_type_toString_tests() {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/downloads/nsDownloadManager.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/downloads/nsDownloadManager.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/downloads/nsDownloadManager.cpp	2015-04-22 13:06:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/downloads/nsDownloadManager.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -947,13 +947,8 @@
   // When MOZ_JSDOWNLOADS is undefined, we still check the preference that can
   // be used to enable the JavaScript API during the migration process.
   mUseJSTransfer = Preferences::GetBool(PREF_BD_USEJSTRANSFER, false);
-#elif defined(XP_WIN)
-    // When MOZ_JSDOWNLOADS is defined on Windows, this component is disabled
-    // unless we are running in Windows Metro.  The conversion of Windows Metro
-    // to use the JavaScript API for downloads is tracked in bug 906042.
-    mUseJSTransfer = !IsRunningInWindowsMetro();
 #else
-    mUseJSTransfer = true;
+  mUseJSTransfer = true;
 #endif
 
   if (mUseJSTransfer)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp	2015-04-24 19:31:09.000000000 +0000
@@ -120,6 +120,7 @@
   nullptr /* setProperty */,
   nullptr /* enumerate */,
   nullptr /* resolve */,
+  nullptr /* mayResolve */,
   nullptr /* convert */,
   Finalize /* finalize */
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/jsdownloads/src/DownloadIntegration.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/jsdownloads/src/DownloadIntegration.jsm	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/jsdownloads/src/DownloadIntegration.jsm	2015-04-24 19:31:09.000000000 +0000
@@ -461,13 +461,7 @@
 #elifdef MOZ_WIDGET_GONK
       directoryPath = yield this.getSystemDownloadsDirectory();
 #else
-      // For Metro mode on Windows 8,  we want searchability for documents
-      // that the user chose to open with an external application.
-      if (Services.metro && Services.metro.immersive) {
-        directoryPath = yield this.getSystemDownloadsDirectory();
-      } else {
-        directoryPath = this._getDirectory("TmpD");
-      }
+      directoryPath = this._getDirectory("TmpD");
 #endif
       throw new Task.Result(directoryPath);
     }.bind(this));
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/jsdownloads/src/DownloadPlatform.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/jsdownloads/src/DownloadPlatform.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/jsdownloads/src/DownloadPlatform.h	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/jsdownloads/src/DownloadPlatform.h	2015-04-24 19:31:09.000000000 +0000
@@ -9,9 +9,6 @@
 
 #include "nsCOMPtr.h"
 
-class nsIURI;
-class nsIFile;
-
 class DownloadPlatform : public mozIDownloadPlatform
 {
 protected:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_async_largefiles.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_async_largefiles.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_async_largefiles.js	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_async_largefiles.js	2015-04-24 19:31:09.000000000 +0000
@@ -83,7 +83,7 @@
         yield file.setPosition(0.5, OS.File.POS_START);
         do_throw("Shouldn't have succeeded");
       } catch (ex) {
-        do_check_true(ex.toString().contains("expected type"));
+        do_check_true(ex.toString().contains("can't pass"));
       }
       // Since setPosition should have bailed, it shouldn't have moved the
       // file pointer at all.
@@ -94,7 +94,7 @@
         yield file.setPosition(0xffffffff + 0.5, OS.File.POS_START);
         do_throw("Shouldn't have succeeded");
       } catch (ex) {
-        do_check_true(ex.toString().contains("expected type"));
+        do_check_true(ex.toString().contains("can't pass"));
       }
       // Since setPosition should have bailed, it shouldn't have moved the
       // file pointer at all.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/passwordmgr/LoginManagerParent.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/passwordmgr/LoginManagerParent.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/passwordmgr/LoginManagerParent.jsm	2015-04-22 13:06:02.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/passwordmgr/LoginManagerParent.jsm	2015-04-24 19:31:09.000000000 +0000
@@ -421,20 +421,12 @@
                    (usernameField ? usernameField.name  : ""),
                    newPasswordField.name);
 
+    let logins = Services.logins.findLogins({}, hostname, formSubmitURL, null);
+
     // If we didn't find a username field, but seem to be changing a
     // password, allow the user to select from a list of applicable
     // logins to update the password for.
-    if (!usernameField && oldPasswordField) {
-
-      var logins = Services.logins.findLogins({}, hostname, formSubmitURL, null);
-
-      if (logins.length == 0) {
-        // Could prompt to save this as a new password-only login.
-        // This seems uncommon, and might be wrong, so ignore.
-        log("(no logins for this host -- pwchange ignored)");
-        return;
-      }
-
+    if (!usernameField && oldPasswordField && logins.length > 0) {
       var prompter = getPrompter();
 
       if (logins.length == 1) {
@@ -452,10 +444,8 @@
     }
 
 
-    // Look for an existing login that matches the form login.
     var existingLogin = null;
-    var logins = Services.logins.findLogins({}, hostname, formSubmitURL, null);
-
+    // Look for an existing login that matches the form login.
     for (var i = 0; i < logins.length; i++) {
       var same, login = logins[i];
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/passwordmgr/test/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/passwordmgr/test/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/passwordmgr/test/mochitest.ini	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/passwordmgr/test/mochitest.ini	2015-04-24 19:31:09.000000000 +0000
@@ -13,6 +13,7 @@
   subtst_notifications_11.html
   subtst_notifications_11_popup.html
   subtst_notifications_2.html
+  subtst_notifications_2pw_0un.html
   subtst_notifications_3.html
   subtst_notifications_4.html
   subtst_notifications_5.html
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/passwordmgr/test/subtst_notifications_2pw_0un.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/passwordmgr/test/subtst_notifications_2pw_0un.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/passwordmgr/test/subtst_notifications_2pw_0un.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/passwordmgr/test/subtst_notifications_2pw_0un.html	2015-04-24 19:31:09.000000000 +0000
@@ -0,0 +1,25 @@
+<html>
+<head>
+  <title>Subtest for Login Manager notifications with 2 password fields and no username</title>
+</head>
+<body>
+<h2>Subtest 24</h2>
+<form id="form" action="formsubmit.sjs">
+  <input id="pass1" name="pass1" type="password" value="staticpw">
+  <input id="pass" name="pass" type="password">
+  <button type="submit">Submit</button>
+</form>
+
+<script>
+function submitForm() {
+  pass.value = "notifyp2";
+  form.submit();
+}
+
+window.onload = submitForm;
+var form      = document.getElementById("form");
+var pass      = document.getElementById("pass");
+
+</script>
+</body>
+</html>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/passwordmgr/test/test_notifications.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/passwordmgr/test/test_notifications.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/passwordmgr/test/test_notifications.html	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/passwordmgr/test/test_notifications.html	2015-04-24 19:31:09.000000000 +0000
@@ -48,6 +48,9 @@
                    "http://test1.example.org:80" + testpath + "subtst_notifications_1.html", // 21
                    "http://test1.example.org:80" + testpath + "subtst_notifications_7.html", // 22
                    "http://test1.example.org:80" + testpath + "subtst_notifications_6.html", // 23
+                   "subtst_notifications_2pw_0un.html",  // 24
+                   "subtst_notifications_2pw_0un.html",  // 25
+                   "subtst_notifications_2pw_0un.html",  // 26
                ];
 
 
@@ -378,6 +381,46 @@
         popup.remove();
         break;
 
+      case 24:
+        // Check for notification popup when a form with 2 password fields (no username) is
+        // submitted and there are no saved logins.
+        is(gotUser, "null", "Checking submitted username");
+        is(gotPass, "notifyp2", "Checking submitted password");
+        popup = getPopup(popupNotifications, "password-save");
+        ok(popup, "got notification popup");
+        popup.remove();
+
+        // Add login for the next test
+        pwmgr.addLogin(login1);
+        break;
+
+      case 25:
+        // Check for notification popup when a form with 2 password fields (no username) is
+        // submitted and there is a saved login with a username and different password.
+        is(gotUser, "null", "Checking submitted username");
+        is(gotPass, "notifyp2", "Checking submitted password");
+        popup = getPopup(popupNotifications, "password-change");
+        ok(popup, "got notification popup");
+        popup.remove();
+        // remove that login
+        pwmgr.removeLogin(login1);
+
+        // Add login for the next test
+        pwmgr.addLogin(login2B);
+        break;
+
+      case 26:
+        // Check for notification popup when a form with 2 password fields (no username) is
+        // submitted and there is a saved login with no username and a different password.
+        is(gotUser, "null", "Checking submitted username");
+        is(gotPass, "notifyp2", "Checking submitted password");
+        popup = getPopup(popupNotifications, "password-change");
+        ok(popup, "got notification popup");
+        popup.remove();
+        // remove that login
+        pwmgr.removeLogin(login2B);
+        break;
+
       default:
         ok(false, "Unexpected call to checkTest for test #" + testNum);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/perfmonitoring/AddonWatcher.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/perfmonitoring/AddonWatcher.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/perfmonitoring/AddonWatcher.jsm	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/perfmonitoring/AddonWatcher.jsm	2015-04-24 19:31:09.000000000 +0000
@@ -183,7 +183,6 @@
         // Report misbehaviors to the user.
 
         for (let filter of FILTERS) {
-          dump(`Checking addon ${addonId} with filter ${filter}\n`);
           let peak = stats.peaks[filter] || 0;
           stats.peaks[filter] = Math.max(diff[filter], peak);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js	2015-04-24 19:31:09.000000000 +0000
@@ -156,9 +156,13 @@
   info("Opening URL");
   newTab.linkedBrowser.loadURI(URL);
 
-  info("Setting up monotonicity testing");
-  monotinicity_tester(() => PerformanceStats.getSnapshot(), "parent process");
-  monotinicity_tester(() => promiseContentResponseOrNull(browser, "compartments-test:getStatistics", null), "content process" );
+  if (Services.sysinfo.getPropertyAsAString("name") == "Windows_NT") {
+    info("Deactivating sanity checks under Windows (bug 1151240)");
+  } else {
+    info("Setting up sanity checks");
+    monotinicity_tester(() => PerformanceStats.getSnapshot(), "parent process");
+    monotinicity_tester(() => promiseContentResponseOrNull(browser, "compartments-test:getStatistics", null), "content process" );
+  }
 
   let skipTotalUserTime = hasLowPrecision();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/Database.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/Database.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/Database.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/Database.h	2015-04-24 19:31:09.000000000 +0000
@@ -43,7 +43,6 @@
 // Fired when the connection has gone, nothing will work from now on.
 #define TOPIC_PLACES_CONNECTION_CLOSED "places-connection-closed"
 
-class nsIStringBundle;
 class nsIRunnable;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/nsNavBookmarks.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/nsNavBookmarks.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/nsNavBookmarks.h	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/nsNavBookmarks.h	2015-04-24 19:31:10.000000000 +0000
@@ -18,7 +18,6 @@
 #include "prtime.h"
 
 class nsNavBookmarks;
-class nsIOutputStream;
 
 namespace mozilla {
 namespace places {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/nsNavHistory.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/nsNavHistory.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/nsNavHistory.h	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/nsNavHistory.h	2015-04-24 19:31:10.000000000 +0000
@@ -51,7 +51,6 @@
 // Fired after frecency has been updated.
 #define TOPIC_FRECENCY_UPDATED "places-frecency-updated"
 
-class mozIAnnotationService;
 class nsNavHistory;
 class QueryKeyValuePair;
 class nsIEffectiveTLDService;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/PlacesUtils.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/PlacesUtils.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/PlacesUtils.jsm	2015-04-22 13:06:03.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/PlacesUtils.jsm	2015-04-24 19:31:10.000000000 +0000
@@ -438,6 +438,23 @@
   },
 
   /**
+   * Gets the concrete item-guid for the given node. For everything but folder
+   * shortcuts, this is just node.bookmarkGuid.  For folder shortcuts, this is
+   * node.targetFolderGuid (see nsINavHistoryService.idl for the semantics).
+   *
+   * @param aNode
+   *        a result node.
+   * @return the concrete item-guid for aNode.
+   * @note unlike getConcreteItemId, this doesn't allow retrieving the guid of a
+   *       ta container.
+   */
+  getConcreteItemGuid(aNode) {
+    if (aNode.type == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT)
+      return asQuery(aNode).targetFolderGuid;
+    return aNode.bookmarkGuid;
+  },
+
+  /**
    * Reverse a host based on the moz_places algorithm, that is reverse the host
    * string and add a trailing period.  For example "google.com" becomes
    * "moc.elgoog.".
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/autocomplete/head_autocomplete.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/autocomplete/head_autocomplete.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/autocomplete/head_autocomplete.js	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/autocomplete/head_autocomplete.js	2015-04-24 19:31:10.000000000 +0000
@@ -198,7 +198,7 @@
   gNextTestSetupTasks.push([task_addPageBook, arguments]);
 }
 
-function task_addPageBook(aURI, aTitle, aBook, aTags, aKey, aTransitionType, aNoVisit)
+function* task_addPageBook(aURI, aTitle, aBook, aTags, aKey, aTransitionType, aNoVisit)
 {
   // Add a page entry for the current uri
   gPages[aURI] = [aURI, aBook != undefined ? aBook : aTitle, aTags];
@@ -230,7 +230,7 @@
 
     // Add a keyword to the bookmark if we need to
     if (aKey != undefined)
-      bmsvc.setKeywordForBookmark(bmid, aKey);
+      yield PlacesUtils.keywords.insert({url: uri.spec, keyword: aKey});
 
     // Add tags if we need to
     if (aTags != undefined && aTags.length > 0) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/browser/browser_bug248970.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/browser/browser_bug248970.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/browser/browser_bug248970.js	2015-04-22 13:06:04.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/browser/browser_bug248970.js	2015-04-24 19:31:10.000000000 +0000
@@ -67,18 +67,16 @@
     let count = getPlacesItemsCount();
 
     // Create Bookmark
-    let bookmarkTitle = "title " + windowsToClose.length;
-    let bookmarkKeyword = "keyword " + windowsToClose.length;
-    let bookmarkUri = NetUtil.newURI("http://test-a-" + windowsToClose.length + ".com/");
+    let title = "title " + windowsToClose.length;
+    let keyword = "keyword " + windowsToClose.length;
+    let url = "http://test-a-" + windowsToClose.length + ".com/";
 
-    let id = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.bookmarksMenuFolderId,
-                                                  bookmarkUri,
-                                                  PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                                  bookmarkTitle);
-    PlacesUtils.bookmarks.setKeywordForBookmark(id, bookmarkKeyword);
+    yield PlacesUtils.bookmarks.insert({ url, title,
+                                         parentGuid: PlacesUtils.bookmarks.menuGuid });
+    yield PlacesUtils.keywords.insert({ url, keyword });
     count++;
 
-    ok(PlacesUtils.bookmarks.isBookmarked(bookmarkUri),
+    ok((yield PlacesUtils.bookmarks.fetch({ url })),
        "Bookmark should be bookmarked, data should be retrievable");
     is(getPlacesItemsCount(), count,
        "Check the new bookmark items count");
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/head_queries.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/head_queries.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/head_queries.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/head_queries.js	2015-04-24 19:31:10.000000000 +0000
@@ -133,7 +133,7 @@
 
       if (qdata.isFolder) {
         yield PlacesUtils.bookmarks.insert({
-          parentGuid: (yield PlacesUtils.promiseItemGuid(qdata.parentFolder)),
+          parentGuid: qdata.parentGuid,
           type: PlacesUtils.bookmarks.TYPE_FOLDER,
           title: qdata.title,
           index: qdata.index
@@ -141,17 +141,17 @@
       }
 
       if (qdata.isLivemark) {
-        PlacesUtils.livemarks.addLivemark({ title: qdata.title
-                                          , parentId: qdata.parentFolder
-                                          , index: qdata.index
-                                          , feedURI: uri(qdata.feedURI)
-                                          , siteURI: uri(qdata.uri)
-                                          }).then(null, do_throw);
+        yield PlacesUtils.livemarks.addLivemark({ title: qdata.title
+                                                , parentId: (yield PlacesUtils.promiseItemId(qdata.parentGuid))
+                                                , index: qdata.index
+                                                , feedURI: uri(qdata.feedURI)
+                                                , siteURI: uri(qdata.uri)
+                                                });
       }
 
       if (qdata.isBookmark) {
         let data = {
-          parentGuid: (yield PlacesUtils.promiseItemGuid(qdata.parentFolder)),
+          parentGuid: qdata.parentGuid,
           index: qdata.index,
           title: qdata.title,
           url: qdata.uri
@@ -168,8 +168,8 @@
         let item = yield PlacesUtils.bookmarks.insert(data);
 
         if (qdata.keyword) {
-          let itemId = yield PlacesUtils.promiseItemId(item.guid);
-          PlacesUtils.bookmarks.setKeywordForBookmark(itemId, qdata.keyword);
+          yield PlacesUtils.keywords.insert({ url: qdata.uri,
+                                              keyword: qdata.keyword });
         }
       }
 
@@ -179,7 +179,7 @@
 
       if (qdata.isSeparator) {
         yield PlacesUtils.bookmarks.insert({
-          parentGuid: (yield PlacesUtils.promiseItemGuid(qdata.parentFolder)),
+          parentGuid: qdata.parentGuid,
           type: PlacesUtils.bookmarks.TYPE_SEPARATOR,
           index: qdata.index
         });
@@ -227,8 +227,7 @@
   this.isTag = obj.isTag ? obj.isTag : false;
   this.tagArray = obj.tagArray ? obj.tagArray : null;
   this.isLivemark = obj.isLivemark ? obj.isLivemark : false;
-  this.parentFolder = obj.parentFolder ? obj.parentFolder
-                                       : PlacesUtils.placesRootId;
+  this.parentGuid = obj.parentGuid || PlacesUtils.bookmarks.rootGuid;
   this.feedURI = obj.feedURI ? obj.feedURI : "";
   this.index = obj.index ? obj.index : PlacesUtils.bookmarks.DEFAULT_INDEX;
   this.isFolder = obj.isFolder ? obj.isFolder : false;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/test_async.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/test_async.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/test_async.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/test_async.js	2015-04-24 19:31:10.000000000 +0000
@@ -268,17 +268,20 @@
   defaults: {
     bookmark: {
       parent: PlacesUtils.bookmarks.unfiledBookmarksFolder,
+      parentGuid: PlacesUtils.bookmarks.unfiledGuid,
       uri: "http://example.com/",
       title: "test bookmark"
     },
 
     folder: {
       parent: PlacesUtils.bookmarks.unfiledBookmarksFolder,
+      parentGuid: PlacesUtils.bookmarks.unfiledGuid,
       title: "test folder"
     },
 
     separator: {
-      parent: PlacesUtils.bookmarks.unfiledBookmarksFolder
+      parent: PlacesUtils.bookmarks.unfiledBookmarksFolder,
+      parentGuid: PlacesUtils.bookmarks.unfiledGuid
     }
   },
 
@@ -300,7 +303,7 @@
         return {
           isBookmark: true,
           uri: dat.uri,
-          parentFolder: dat.parent,
+          parentGuid: dat.parentGuid,
           index: PlacesUtils.bookmarks.DEFAULT_INDEX,
           title: dat.title,
           isInQuery: true
@@ -308,14 +311,14 @@
       case "separator":
         return {
           isSeparator: true,
-          parentFolder: dat.parent,
+          parentGuid: dat.parentGuid,
           index: PlacesUtils.bookmarks.DEFAULT_INDEX,
           isInQuery: true
         };
       case "folder":
         return {
           isFolder: true,
-          parentFolder: dat.parent,
+          parentGuid: dat.parentGuid,
           index: PlacesUtils.bookmarks.DEFAULT_INDEX,
           title: dat.title,
           isInQuery: true
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/test_history_queries_tags_liveUpdate.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/test_history_queries_tags_liveUpdate.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/test_history_queries_tags_liveUpdate.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/test_history_queries_tags_liveUpdate.js	2015-04-24 19:31:10.000000000 +0000
@@ -12,7 +12,7 @@
     lastVisit: gNow,
     isInQuery: true,
     isBookmark: true,
-    parentFolder: PlacesUtils.unfiledBookmarksFolderId,
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
     index: PlacesUtils.bookmarks.DEFAULT_INDEX,
     title: "example1",
   },
@@ -22,7 +22,7 @@
     lastVisit: gNow++,
     isInQuery: true,
     isBookmark: true,
-    parentFolder: PlacesUtils.unfiledBookmarksFolderId,
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
     index: PlacesUtils.bookmarks.DEFAULT_INDEX,
     title: "example2",
   },
@@ -32,7 +32,7 @@
     lastVisit: gNow++,
     isInQuery: true,
     isBookmark: true,
-    parentFolder: PlacesUtils.unfiledBookmarksFolderId,
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
     index: PlacesUtils.bookmarks.DEFAULT_INDEX,
     title: "example3",
   },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/test_onlyBookmarked.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/test_onlyBookmarked.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/test_onlyBookmarked.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/test_onlyBookmarked.js	2015-04-24 19:31:10.000000000 +0000
@@ -20,14 +20,14 @@
   // Add a bookmark that should be in the results
   { isBookmark: true,
     uri: "http://bookmarked.com/",
-    parentFolder: PlacesUtils.toolbarFolderId,
+    parentGuid: PlacesUtils.bookmarks.toolbarGuid,
     index: PlacesUtils.bookmarks.DEFAULT_INDEX,
     isInQuery: true },
 
   // Add a bookmark that should not be in the results
   { isBookmark: true,
     uri: "http://bookmarked-elsewhere.com/",
-    parentFolder: PlacesUtils.bookmarksMenuFolderId,
+    parentGuid: PlacesUtils.bookmarks.menuGuid,
     index: PlacesUtils.bookmarks.DEFAULT_INDEX,
     isInQuery: false },
 
@@ -82,14 +82,14 @@
     //Add a bookmark that should show up
     { isBookmark: true,
       uri: "http://bookmarked2.com/",
-      parentFolder: PlacesUtils.toolbarFolderId,
+      parentGuid: PlacesUtils.bookmarks.toolbarGuid,
       index: PlacesUtils.bookmarks.DEFAULT_INDEX,
       isInQuery: true },
 
     //Add a bookmark that should not show up
     { isBookmark: true,
       uri: "http://bookmarked-elsewhere2.com/",
-      parentFolder: PlacesUtils.bookmarksMenuFolderId,
+      parentGuid: PlacesUtils.bookmarks.menuGuid,
       index: PlacesUtils.bookmarks.DEFAULT_INDEX,
       isInQuery: false }
   ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/test_redirects.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/test_redirects.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/test_redirects.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/test_redirects.js	2015-04-24 19:31:10.000000000 +0000
@@ -271,7 +271,7 @@
   // Add an unvisited bookmark in the database, it should never appear.
   visits.push({ isBookmark: true,
     uri: "http://unvisited.bookmark.com/",
-    parentFolder: PlacesUtils.bookmarksMenuFolderId,
+    parentGuid: PlacesUtils.bookmarks.menuGuid,
     index: PlacesUtils.bookmarks.DEFAULT_INDEX,
     title: "Unvisited Bookmark",
     isInQuery: false });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/test_sorting.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/test_sorting.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/queries/test_sorting.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/queries/test_sorting.js	2015-04-24 19:31:10.000000000 +0000
@@ -17,7 +17,7 @@
     this._unsortedData = [
       { isBookmark: true,
         uri: "http://example.com/b",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "y",
         keyword: "b",
@@ -25,7 +25,7 @@
 
       { isBookmark: true,
         uri: "http://example.com/a",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "z",
         keyword: "a",
@@ -33,7 +33,7 @@
 
       { isBookmark: true,
         uri: "http://example.com/c",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "x",
         keyword: "c",
@@ -80,21 +80,21 @@
     this._unsortedData = [
       { isBookmark: true,
         uri: "http://example.com/b1",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "y",
         isInQuery: true },
 
       { isBookmark: true,
         uri: "http://example.com/a",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "z",
         isInQuery: true },
 
       { isBookmark: true,
         uri: "http://example.com/c",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "x",
         isInQuery: true },
@@ -102,7 +102,7 @@
       // if titles are equal, should fall back to URI
       { isBookmark: true,
         uri: "http://example.com/b2",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "y",
         isInQuery: true },
@@ -157,7 +157,7 @@
       { isVisit: true,
         isDetails: true,
         isBookmark: true,
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 0,
         uri: "http://example.com/c1",
         lastVisit: timeInMicroseconds - 2,
@@ -167,7 +167,7 @@
       { isVisit: true,
         isDetails: true,
         isBookmark: true,
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 1,
         uri: "http://example.com/a",
         lastVisit: timeInMicroseconds - 1,
@@ -177,7 +177,7 @@
       { isVisit: true,
         isDetails: true,
         isBookmark: true,
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 2,
         uri: "http://example.com/b",
         lastVisit: timeInMicroseconds - 3,
@@ -188,7 +188,7 @@
       { isVisit: true,
         isDetails: true,
         isBookmark: true,
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 3,
         uri: "http://example.com/c2",
         lastVisit: timeInMicroseconds - 2,
@@ -199,7 +199,7 @@
       { isVisit: true,
         isDetails: true,
         isBookmark: true,
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 4,
         uri: "http://example.com/c2",
         lastVisit: timeInMicroseconds - 2,
@@ -258,21 +258,21 @@
         isDetails: true,
         lastVisit: timeInMicroseconds,
         uri: "http://example.com/b",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 0,
         title: "y",
         isInQuery: true },
 
       { isBookmark: true,
         uri: "http://example.com/c",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 1,
         title: "x",
         isInQuery: true },
 
       { isBookmark: true,
         uri: "http://example.com/a",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 2,
         title: "z",
         isInQuery: true },
@@ -282,14 +282,14 @@
         isDetails: true,
         lastVisit: timeInMicroseconds + 1000,
         uri: "http://example.com/c",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 3,
         title: "x",
         isInQuery: true },
 
       // if no URI (e.g., node is a folder), should fall back to title
       { isFolder: true,
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 4,
         title: "a",
         isInQuery: true },
@@ -299,14 +299,14 @@
         isDetails: true,
         lastVisit: timeInMicroseconds + 1000,
         uri: "http://example.com/c",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 5,
         title: "x",
         isInQuery: true },
 
       // if no URI and titles are equal, should fall back to bookmark index
       { isFolder: true,
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 6,
         title: "a",
         isInQuery: true },
@@ -364,7 +364,7 @@
         uri: "http://example.com/a",
         lastVisit: timeInMicroseconds,
         title: "z",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 0,
         isInQuery: true },
 
@@ -372,7 +372,7 @@
         uri: "http://example.com/c",
         lastVisit: timeInMicroseconds,
         title: "x",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 1,
         isInQuery: true },
 
@@ -380,7 +380,7 @@
         uri: "http://example.com/b1",
         lastVisit: timeInMicroseconds,
         title: "y1",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 2,
         isInQuery: true },
 
@@ -389,7 +389,7 @@
         uri: "http://example.com/b2",
         lastVisit: timeInMicroseconds + 1000,
         title: "y2a",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 3,
         isInQuery: true },
 
@@ -398,7 +398,7 @@
         uri: "http://example.com/b2",
         lastVisit: timeInMicroseconds + 1000,
         title: "y2b",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 4,
         isInQuery: true },
     ];
@@ -462,7 +462,7 @@
     this._unsortedData = [
       { isBookmark: true,
         uri: "http://example.com/a",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "z",
         keyword: "a",
@@ -470,7 +470,7 @@
 
       { isBookmark: true,
         uri: "http://example.com/c",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "x",
         keyword: "c",
@@ -478,7 +478,7 @@
 
       { isBookmark: true,
         uri: "http://example.com/b1",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "y9",
         keyword: "b",
@@ -487,7 +487,7 @@
       // without a keyword, should fall back to title
       { isBookmark: true,
         uri: "http://example.com/null2",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "null8",
         keyword: null,
@@ -496,7 +496,7 @@
       // without a keyword, should fall back to title
       { isBookmark: true,
         uri: "http://example.com/null1",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "null9",
         keyword: null,
@@ -505,7 +505,7 @@
       // if keywords are equal, should fall back to title
       { isBookmark: true,
         uri: "http://example.com/b1",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "y8",
         keyword: "b",
@@ -562,7 +562,7 @@
     this._unsortedData = [
       { isBookmark: true,
         uri: "http://example.com/b1",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 0,
         title: "y1",
         dateAdded: timeInMicroseconds - 1000,
@@ -570,7 +570,7 @@
 
       { isBookmark: true,
         uri: "http://example.com/a",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 1,
         title: "z",
         dateAdded: timeInMicroseconds - 2000,
@@ -578,7 +578,7 @@
 
       { isBookmark: true,
         uri: "http://example.com/c",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 2,
         title: "x",
         dateAdded: timeInMicroseconds,
@@ -587,7 +587,7 @@
       // if dateAddeds are equal, should fall back to title
       { isBookmark: true,
         uri: "http://example.com/b2",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 3,
         title: "y2",
         dateAdded: timeInMicroseconds - 1000,
@@ -596,7 +596,7 @@
       // if dateAddeds and titles are equal, should fall back to bookmark index
       { isBookmark: true,
         uri: "http://example.com/b3",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 4,
         title: "y3",
         dateAdded: timeInMicroseconds - 1000,
@@ -654,7 +654,7 @@
     this._unsortedData = [
       { isBookmark: true,
         uri: "http://example.com/b1",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 0,
         title: "y1",
         dateAdded: timeAddedInMicroseconds,
@@ -663,7 +663,7 @@
 
       { isBookmark: true,
         uri: "http://example.com/a",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 1,
         title: "z",
         dateAdded: timeAddedInMicroseconds,
@@ -672,7 +672,7 @@
 
       { isBookmark: true,
         uri: "http://example.com/c",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 2,
         title: "x",
         dateAdded: timeAddedInMicroseconds,
@@ -682,7 +682,7 @@
       // if lastModifieds are equal, should fall back to title
       { isBookmark: true,
         uri: "http://example.com/b2",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 3,
         title: "y2",
         dateAdded: timeAddedInMicroseconds,
@@ -693,7 +693,7 @@
       // index
       { isBookmark: true,
         uri: "http://example.com/b3",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: 4,
         title: "y3",
         dateAdded: timeAddedInMicroseconds,
@@ -749,7 +749,7 @@
     this._unsortedData = [
       { isBookmark: true,
         uri: "http://url2.com/",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "title x",
         isTag: true,
@@ -758,7 +758,7 @@
 
       { isBookmark: true,
         uri: "http://url1a.com/",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "title y1",
         isTag: true,
@@ -767,14 +767,14 @@
 
       { isBookmark: true,
         uri: "http://url3a.com/",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "title w1",
         isInQuery: true },
 
       { isBookmark: true,
         uri: "http://url0.com/",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "title z",
         isTag: true,
@@ -784,7 +784,7 @@
       // if tags are equal, should fall back to title
       { isBookmark: true,
         uri: "http://url1b.com/",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "title y2",
         isTag: true,
@@ -794,7 +794,7 @@
       // if tags are equal, should fall back to title
       { isBookmark: true,
         uri: "http://url3b.com/",
-        parentFolder: PlacesUtils.bookmarks.toolbarFolder,
+        parentGuid: PlacesUtils.bookmarks.toolbarGuid,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "title w2",
         isInQuery: true },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/unit/test_placesTxn.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/unit/test_placesTxn.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/unit/test_placesTxn.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/unit/test_placesTxn.js	2015-04-24 19:31:10.000000000 +0000
@@ -10,6 +10,19 @@
 let txnManager = PlacesUtils.transactionManager;
 const DESCRIPTION_ANNO = "bookmarkProperties/description";
 
+function* promiseKeyword(keyword, href, postData) {
+  while (true) {
+    let entry = yield PlacesUtils.keywords.fetch(keyword);
+    if (href == null && !entry)
+      break;
+    if (entry && entry.url.href == href && entry.postData == postData) {
+      break;
+    }
+
+    yield new Promise(resolve => do_timeout(100, resolve));
+  }
+}
+
 // create and add bookmarks observer
 let observer = {
 
@@ -97,16 +110,14 @@
 // get bookmarks root id
 let root = PlacesUtils.bookmarksMenuFolderId;
 
-function run_test() {
+add_task(function* init() {
   bmsvc.addObserver(observer, false);
   do_register_cleanup(function () {
     bmsvc.removeObserver(observer);
   });
+});
 
-  run_next_test();
-}
-
-add_test(function test_create_folder_with_description() {
+add_task(function* test_create_folder_with_description() {
   const TEST_FOLDERNAME = "Test creating a folder with a description";
   const TEST_DESCRIPTION = "this is my test description";
 
@@ -145,11 +156,9 @@
   do_check_eq(observer._itemRemovedId, folderId);
   do_check_eq(observer._itemRemovedFolder, root);
   do_check_eq(observer._itemRemovedIndex, bmStartIndex);
-
-  run_next_test();
 });
 
-add_test(function test_create_item() {
+add_task(function* test_create_item() {
   let testURI = NetUtil.newURI("http://test_create_item.com");
 
   let txn = new PlacesCreateBookmarkTransaction(testURI, root, bmStartIndex,
@@ -177,11 +186,9 @@
   do_check_eq(observer._itemRemovedId, newId);
   do_check_eq(observer._itemRemovedFolder, root);
   do_check_eq(observer._itemRemovedIndex, bmStartIndex);
-
-  run_next_test();
 });
 
-add_test(function test_create_item_to_folder() {
+add_task(function* test_create_item_to_folder() {
   const TEST_FOLDERNAME = "Test creating item to a folder";
   let testURI = NetUtil.newURI("http://test_create_item_to_folder.com");
   let folderId = bmsvc.createFolder(root, TEST_FOLDERNAME, bmsvc.DEFAULT_INDEX);
@@ -208,11 +215,9 @@
   do_check_eq(observer._itemRemovedId, newBkmId);
   do_check_eq(observer._itemRemovedFolder, folderId);
   do_check_eq(observer._itemRemovedIndex, bmStartIndex);
-
-  run_next_test();
 });
 
-add_test(function test_move_items_to_folder() {
+add_task(function* test_move_items_to_folder() {
   let testFolderId = bmsvc.createFolder(root, "Test move items", bmsvc.DEFAULT_INDEX);
   let testURI = NetUtil.newURI("http://test_move_items.com");
   let testBkmId = bmsvc.insertBookmark(testFolderId, testURI, bmsvc.DEFAULT_INDEX, "1: Test move items");
@@ -282,11 +287,9 @@
   do_check_eq(observer._itemMovedOldIndex, 0);
   do_check_eq(observer._itemMovedNewParent, testFolderId);
   do_check_eq(observer._itemMovedNewIndex, 0);
-
-  run_next_test();
 });
 
-add_test(function test_remove_folder() {
+add_task(function* test_remove_folder() {
   let testFolder = bmsvc.createFolder(root, "Test Removing a Folder", bmsvc.DEFAULT_INDEX);
   let folderId = bmsvc.createFolder(testFolder, "Removed Folder", bmsvc.DEFAULT_INDEX);
 
@@ -311,25 +314,22 @@
   do_check_eq(observer._itemAddedId, folderId);
   do_check_eq(observer._itemAddedParent, testFolder);
   do_check_eq(observer._itemAddedIndex, 0);
-
-  run_next_test();
 });
 
-add_test(function test_remove_item_with_keyword_and_tag() {
+add_task(function* test_remove_item_with_tag() {
   // Notice in this case the tag persists since other bookmarks have same uri.
-  let testFolder = bmsvc.createFolder(root, "Test removing an item with a keyword and a tag",
+  let testFolder = bmsvc.createFolder(root, "Test removing an item with a tag",
                                       bmsvc.DEFAULT_INDEX);
 
-  const KEYWORD = "test: test removing an item with a keyword and a tag";
-  const TAG_NAME = "tag-test_remove_item_with_keyword_and_tag";
-  let testURI = NetUtil.newURI("http://test_remove_item_with_keyword_and_tag.com");
+  const KEYWORD = "test: test removing an item with a tag";
+  const TAG_NAME = "tag-test_remove_item_with_tag";
+  let testURI = NetUtil.newURI("http://test_remove_item_with_tag.com");
   let testBkmId = bmsvc.insertBookmark(testFolder, testURI, bmsvc.DEFAULT_INDEX, "test-item1");
 
   // create bookmark for not removing tag.
   bmsvc.insertBookmark(testFolder, testURI, bmsvc.DEFAULT_INDEX, "test-item2");
 
-  // set tag & keyword
-  bmsvc.setKeywordForBookmark(testBkmId, KEYWORD);
+  // set tag
   tagssvc.tagURI(testURI, [TAG_NAME]);
 
   let txn = new PlacesRemoveItemTransaction(testBkmId);
@@ -338,57 +338,65 @@
   do_check_eq(observer._itemRemovedId, testBkmId);
   do_check_eq(observer._itemRemovedFolder, testFolder);
   do_check_eq(observer._itemRemovedIndex, 0);
-  do_check_eq(bmsvc.getKeywordForBookmark(testBkmId), null);
-  do_check_eq(tagssvc.getTagsForURI(testURI)[0], TAG_NAME);
+  do_check_eq(tagssvc.getTagsForURI(testURI), TAG_NAME);
 
   txn.undoTransaction();
   let newbkmk2Id = observer._itemAddedId;
   do_check_eq(observer._itemAddedParent, testFolder);
   do_check_eq(observer._itemAddedIndex, 0);
-  do_check_eq(bmsvc.getKeywordForBookmark(newbkmk2Id), KEYWORD);
   do_check_eq(tagssvc.getTagsForURI(testURI)[0], TAG_NAME);
 
   txn.redoTransaction();
   do_check_eq(observer._itemRemovedId, newbkmk2Id);
   do_check_eq(observer._itemRemovedFolder, testFolder);
   do_check_eq(observer._itemRemovedIndex, 0);
-  do_check_eq(bmsvc.getKeywordForBookmark(newbkmk2Id), null);
   do_check_eq(tagssvc.getTagsForURI(testURI)[0], TAG_NAME);
 
   txn.undoTransaction();
   do_check_eq(observer._itemAddedParent, testFolder);
   do_check_eq(observer._itemAddedIndex, 0);
   do_check_eq(tagssvc.getTagsForURI(testURI)[0], TAG_NAME);
-
-  run_next_test();
 });
 
-add_test(function test_remove_item_with_tag() {
-  const TAG_NAME = "tag-test_remove_item_with_tag";
-  let testURI = NetUtil.newURI("http://test_remove_item_with_tag.com/");
-  let itemId = bmsvc.insertBookmark(root, testURI, bmsvc.DEFAULT_INDEX, "Test removing an item with a tag");
-  tagssvc.tagURI(testURI, [TAG_NAME]);
+add_task(function* test_remove_item_with_keyword() {
+  // Notice in this case the tag persists since other bookmarks have same uri.
+  let testFolder = bmsvc.createFolder(root, "Test removing an item with a keyword",
+                                      bmsvc.DEFAULT_INDEX);
 
-  let txn = new PlacesRemoveItemTransaction(itemId);
+  const KEYWORD = "test: test removing an item with a keyword";
+  const TAG_NAME = "tag-test_remove_item_with_keyword";
+  let testURI = NetUtil.newURI("http://test_remove_item_with_keyword.com");
+  let testBkmId = bmsvc.insertBookmark(testFolder, testURI, bmsvc.DEFAULT_INDEX, "test-item1");
 
-  txn.doTransaction();
-  do_check_true(tagssvc.getTagsForURI(testURI).length == 0);
+  // set keyword
+  yield PlacesUtils.keywords.insert({ url: testURI.spec, keyword: KEYWORD});
 
-  txn.undoTransaction();
-  do_check_eq(tagssvc.getTagsForURI(testURI)[0], TAG_NAME);
+  let txn = new PlacesRemoveItemTransaction(testBkmId);
 
-  txn.redoTransaction();
-  do_check_true(tagssvc.getTagsForURI(testURI).length == 0);
+  txn.doTransaction();
+  do_check_eq(observer._itemRemovedId, testBkmId);
+  do_check_eq(observer._itemRemovedFolder, testFolder);
+  do_check_eq(observer._itemRemovedIndex, 0);
+  yield promiseKeyword(KEYWORD, null);
 
   txn.undoTransaction();
-  do_check_eq(tagssvc.getTagsForURI(testURI)[0], TAG_NAME);
+  let newbkmk2Id = observer._itemAddedId;
+  do_check_eq(observer._itemAddedParent, testFolder);
+  do_check_eq(observer._itemAddedIndex, 0);
+  yield promiseKeyword(KEYWORD, testURI.spec);
 
   txn.redoTransaction();
+  do_check_eq(observer._itemRemovedId, newbkmk2Id);
+  do_check_eq(observer._itemRemovedFolder, testFolder);
+  do_check_eq(observer._itemRemovedIndex, 0);
+  yield promiseKeyword(KEYWORD, null);
 
-  run_next_test();
+  txn.undoTransaction();
+  do_check_eq(observer._itemAddedParent, testFolder);
+  do_check_eq(observer._itemAddedIndex, 0);
 });
 
-add_test(function test_creating_separator() {
+add_task(function* test_creating_separator() {
   let testFolder = bmsvc.createFolder(root, "Test creating a separator", bmsvc.DEFAULT_INDEX);
 
   let txn = new PlacesCreateSeparatorTransaction(testFolder, 0);
@@ -412,11 +420,9 @@
   do_check_eq(observer._itemRemovedId, newSepId);
   do_check_eq(observer._itemRemovedFolder, testFolder);
   do_check_eq(observer._itemRemovedIndex, 0);
-
-  run_next_test();
 });
 
-add_test(function test_removing_separator() {
+add_task(function* test_removing_separator() {
   let testFolder = bmsvc.createFolder(root, "Test removing a separator", bmsvc.DEFAULT_INDEX);
 
   let sepId = bmsvc.insertSeparator(testFolder, 0);
@@ -441,11 +447,9 @@
   do_check_eq(observer._itemAddedId, sepId); //New separator created
   do_check_eq(observer._itemAddedParent, testFolder);
   do_check_eq(observer._itemAddedIndex, 0);
-
-  run_next_test();
 });
 
-add_test(function test_editing_item_title() {
+add_task(function* test_editing_item_title() {
   const TITLE = "Test editing item title";
   const MOD_TITLE = "Mod: Test editing item title";
   let testURI = NetUtil.newURI("http://www.test_editing_item_title.com");
@@ -472,11 +476,9 @@
   do_check_eq(observer._itemChangedId, testBkmId);
   do_check_eq(observer._itemChangedProperty, "title");
   do_check_eq(observer._itemChangedValue, TITLE);
-
-  run_next_test();
 });
 
-add_test(function test_editing_item_uri() {
+add_task(function* test_editing_item_uri() {
   const OLD_TEST_URI = NetUtil.newURI("http://old.test_editing_item_uri.com/");
   const NEW_TEST_URI = NetUtil.newURI("http://new.test_editing_item_uri.com/");
   let testBkmId = bmsvc.insertBookmark(root, OLD_TEST_URI, bmsvc.DEFAULT_INDEX,
@@ -512,11 +514,9 @@
   do_check_eq(observer._itemChangedValue, OLD_TEST_URI.spec);
   do_check_eq(JSON.stringify(tagssvc.getTagsForURI(OLD_TEST_URI)), JSON.stringify(["tag"]));
   do_check_eq(JSON.stringify(tagssvc.getTagsForURI(NEW_TEST_URI)), JSON.stringify([]));
-
-  run_next_test();
 });
 
-add_test(function test_edit_description_transaction() {
+add_task(function* test_edit_description_transaction() {
   let testURI = NetUtil.newURI("http://test_edit_description_transaction.com");
   let testBkmId = bmsvc.insertBookmark(root, testURI, bmsvc.DEFAULT_INDEX, "Test edit description transaction");
 
@@ -532,11 +532,9 @@
   txn.doTransaction();
   do_check_eq(observer._itemChangedId, testBkmId);
   do_check_eq(observer._itemChangedProperty, DESCRIPTION_ANNO);
-
-  run_next_test();
 });
 
-add_test(function test_edit_keyword() {
+add_task(function* test_edit_keyword() {
   const KEYWORD = "keyword-test_edit_keyword";
 
   let testURI = NetUtil.newURI("http://test_edit_keyword.com");
@@ -553,11 +551,9 @@
   do_check_eq(observer._itemChangedId, testBkmId);
   do_check_eq(observer._itemChangedProperty, "keyword");
   do_check_eq(observer._itemChangedValue, "");
-
-  run_next_test();
 });
 
-add_test(function test_LoadInSidebar_transaction() {
+add_task(function* test_LoadInSidebar_transaction() {
   let testURI = NetUtil.newURI("http://test_LoadInSidebar_transaction.com");
   let testBkmId = bmsvc.insertBookmark(root, testURI, bmsvc.DEFAULT_INDEX, "Test LoadInSidebar transaction");
 
@@ -578,11 +574,9 @@
   do_check_eq(observer._itemChangedId, testBkmId);
   do_check_eq(observer._itemChangedProperty, LOAD_IN_SIDEBAR_ANNO);
   do_check_eq(observer._itemChanged_isAnnotationProperty, true);
-
-  run_next_test();
 });
 
-add_test(function test_generic_item_annotation() {
+add_task(function* test_generic_item_annotation() {
   let testURI = NetUtil.newURI("http://test_generic_item_annotation.com");
   let testBkmId = bmsvc.insertBookmark(root, testURI, bmsvc.DEFAULT_INDEX, "Test generic item annotation");
 
@@ -607,11 +601,9 @@
   do_check_eq(observer._itemChangedId, testBkmId);
   do_check_eq(observer._itemChangedProperty, "testAnno/testInt");
   do_check_eq(observer._itemChanged_isAnnotationProperty, true);
-
-  run_next_test();
 });
 
-add_test(function test_editing_item_date_added() {
+add_task(function* test_editing_item_date_added() {
   let testURI = NetUtil.newURI("http://test_editing_item_date_added.com");
   let testBkmId = bmsvc.insertBookmark(root, testURI, bmsvc.DEFAULT_INDEX,
                                        "Test editing item date added");
@@ -625,11 +617,9 @@
 
   txn.undoTransaction();
   do_check_eq(oldAdded, bmsvc.getItemDateAdded(testBkmId));
-
-  run_next_test();
 });
 
-add_test(function test_edit_item_last_modified() {
+add_task(function* test_edit_item_last_modified() {
   let testURI = NetUtil.newURI("http://test_edit_item_last_modified.com");
   let testBkmId = bmsvc.insertBookmark(root, testURI, bmsvc.DEFAULT_INDEX,
                                        "Test editing item last modified");
@@ -643,11 +633,9 @@
 
   txn.undoTransaction();
   do_check_eq(oldModified, bmsvc.getItemLastModified(testBkmId));
-
-  run_next_test();
 });
 
-add_test(function test_generic_page_annotation() {
+add_task(function* test_generic_page_annotation() {
   const TEST_ANNO = "testAnno/testInt";
   let testURI = NetUtil.newURI("http://www.mozilla.org/");
   PlacesTestUtils.addVisits(testURI).then(function () {
@@ -666,12 +654,10 @@
 
     txn.redoTransaction();
     do_check_true(annosvc.pageHasAnnotation(testURI, TEST_ANNO));
-
-    run_next_test();
   });
 });
 
-add_test(function test_sort_folder_by_name() {
+add_task(function* test_sort_folder_by_name() {
   let testFolder = bmsvc.createFolder(root, "Test PlacesSortFolderByNameTransaction",
                                       bmsvc.DEFAULT_INDEX);
   let testURI = NetUtil.newURI("http://test_sort_folder_by_name.com");
@@ -712,52 +698,37 @@
   do_check_eq(0, bmsvc.getItemIndex(b1));
   do_check_eq(1, bmsvc.getItemIndex(b2));
   do_check_eq(2, bmsvc.getItemIndex(b3));
-
-  run_next_test();
 });
 
-add_test(function test_edit_postData() {
-  function* promiseKeyword(keyword, href, postData) {
-    while (true) {
-      let entry = yield PlacesUtils.keywords.fetch(keyword);
-      if (entry && entry.url.href == href && entry.postData == postData) {
-        break;
-      }
-
-      yield new Promise(resolve => do_timeout(100, resolve));
-    }
-  }
+add_task(function* test_edit_postData() {
+  let postData = "post-test_edit_postData";
+  let testURI = NetUtil.newURI("http://test_edit_postData.com");
+
+  let testBkm = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.menuGuid,
+    url: "http://test_edit_postData.com",
+    title: "Test edit Post Data"
+  });
 
-  Task.spawn(function* () {
-    let postData = "post-test_edit_postData";
-    let testURI = NetUtil.newURI("http://test_edit_postData.com");
-
-    let testBkm = yield PlacesUtils.bookmarks.insert({
-      parentGuid: PlacesUtils.bookmarks.menuGuid,
-      url: "http://test_edit_postData.com",
-      title: "Test edit Post Data"
-    });
-
-    yield PlacesUtils.keywords.insert({
-      keyword: "kw",
-      url: "http://test_edit_postData.com"
-    });
+  yield PlacesUtils.keywords.insert({
+    keyword: "kw",
+    url: "http://test_edit_postData.com"
+  });
 
-    let testBkmId = yield PlacesUtils.promiseItemId(testBkm.guid);
-    let txn = new PlacesEditBookmarkPostDataTransaction(testBkmId, postData);
+  let testBkmId = yield PlacesUtils.promiseItemId(testBkm.guid);
+  let txn = new PlacesEditBookmarkPostDataTransaction(testBkmId, postData);
 
-    txn.doTransaction();
-    yield promiseKeyword("kw", testURI.spec, postData);
+  txn.doTransaction();
+  yield promiseKeyword("kw", testURI.spec, postData);
 
-    txn.undoTransaction();
-    entry = yield PlacesUtils.keywords.fetch("kw");
-    Assert.equal(entry.url.href, testURI.spec);
-    // We don't allow anymore to set a null post data.
-    //Assert.equal(null, post_data);
-  }).then(run_next_test);
+  txn.undoTransaction();
+  entry = yield PlacesUtils.keywords.fetch("kw");
+  Assert.equal(entry.url.href, testURI.spec);
+  // We don't allow anymore to set a null post data.
+  //Assert.equal(null, post_data);
 });
 
-add_test(function test_tagURI_untagURI() {
+add_task(function* test_tagURI_untagURI() {
   const TAG_1 = "tag-test_tagURI_untagURI-bar";
   const TAG_2 = "tag-test_tagURI_untagURI-foo";
   let tagURI = NetUtil.newURI("http://test_tagURI_untagURI.com");
@@ -785,11 +756,9 @@
 
   untagTxn.redoTransaction();
   do_check_eq(JSON.stringify(tagssvc.getTagsForURI(tagURI)), JSON.stringify([TAG_2]));
-
-  run_next_test();
 });
 
-add_test(function test_aggregate_removeItem_Txn() {
+add_task(function* test_aggregate_removeItem_Txn() {
   let testFolder = bmsvc.createFolder(root, "Test aggregate removeItem transaction", bmsvc.DEFAULT_INDEX);
 
   const TEST_URL = "http://test_aggregate_removeitem_txn.com/";
@@ -877,11 +846,9 @@
   // Check last added back item id.
   // Notice items are restored in reverse order.
   do_check_eq(observer._itemAddedId, newBkmk1Id);
-
-  run_next_test();
 });
 
-add_test(function test_create_item_with_childTxn() {
+add_task(function* test_create_item_with_childTxn() {
   let testFolder = bmsvc.createFolder(root, "Test creating an item with childTxns", bmsvc.DEFAULT_INDEX);
 
   const BOOKMARK_TITLE = "parent item";
@@ -931,11 +898,9 @@
   catch (ex) {
     do_throw("Setting a child transaction in a createItem transaction did throw: " + ex);
   }
-
-  run_next_test();
 });
 
-add_test(function test_create_folder_with_child_itemTxn() {
+add_task(function* test_create_folder_with_child_itemTxn() {
   let childURI = NetUtil.newURI("http://test_create_folder_with_child_itemTxn.com");
   let childItemTxn = new PlacesCreateBookmarkTransaction(childURI, root,
                                                          bmStartIndex, "childItem");
@@ -963,6 +928,4 @@
   catch (ex) {
     do_throw("Setting a child item transaction in a createFolder transaction did throw: " + ex);
   }
-
-  run_next_test();
 });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/unit/test_preventive_maintenance.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/unit/test_preventive_maintenance.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/unit/test_preventive_maintenance.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/unit/test_preventive_maintenance.js	2015-04-24 19:31:10.000000000 +0000
@@ -1166,30 +1166,32 @@
     ]);
   },
 
-  asyncCheck: function(aCallback) {
-    let stmt = mDBConn.createAsyncStatement(
-      "SELECT h.url FROM moz_places h WHERE h.hidden = 1"
-    );
-    stmt.executeAsync({
-      _count: 0,
-      handleResult: function(aResultSet) {
-        for (let row; (row = aResultSet.getNextRow());) {
-          let url = row.getResultByIndex(0);
-          do_check_true(/redirecting/.test(url));
-          this._count++;
+  check: function () {
+    return new Promise(resolve => {
+      let stmt = mDBConn.createAsyncStatement(
+        "SELECT h.url FROM moz_places h WHERE h.hidden = 1"
+      );
+      stmt.executeAsync({
+        _count: 0,
+        handleResult: function(aResultSet) {
+          for (let row; (row = aResultSet.getNextRow());) {
+            let url = row.getResultByIndex(0);
+            do_check_true(/redirecting/.test(url));
+            this._count++;
+          }
+        },
+        handleError: function(aError) {
+        },
+        handleCompletion: function(aReason) {
+          dump_table("moz_places");
+          dump_table("moz_historyvisits");
+          do_check_eq(aReason, Ci.mozIStorageStatementCallback.REASON_FINISHED);
+          do_check_eq(this._count, 2);
+          resolve();
         }
-      },
-      handleError: function(aError) {
-      },
-      handleCompletion: function(aReason) {
-        dump_table("moz_places");
-        dump_table("moz_historyvisits");
-        do_check_eq(aReason, Ci.mozIStorageStatementCallback.REASON_FINISHED);
-        do_check_eq(this._count, 2);
-        aCallback();
-      }
+      });
+      stmt.finalize();
     });
-    stmt.finalize();
   }
 });
 
@@ -1205,7 +1207,7 @@
   _bookmarkId: null,
   _separatorId: null,
 
-  setup: function() {
+  setup: function* () {
     // use valid api calls to create a bunch of items
     yield PlacesTestUtils.addVisits([
       { uri: this._uri1 },
@@ -1224,36 +1226,35 @@
     ts.tagURI(this._uri1, ["testtag"]);
     fs.setAndFetchFaviconForPage(this._uri2, SMALLPNG_DATA_URI, false,
                                  PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE);
-    bs.setKeywordForBookmark(this._bookmarkId, "testkeyword");
+    yield PlacesUtils.keywords.insert({ url: this._uri1.spec, keyword: "testkeyword" });
     as.setPageAnnotation(this._uri2, "anno", "anno", 0, as.EXPIRE_NEVER);
     as.setItemAnnotation(this._bookmarkId, "anno", "anno", 0, as.EXPIRE_NEVER);
   },
 
-  asyncCheck: function (aCallback) {
+  check: Task.async(function* () {
     // Check that all items are correct
-    PlacesUtils.asyncHistory.isURIVisited(this._uri1, function(aURI, aIsVisited) {
-      do_check_true(aIsVisited);
-      PlacesUtils.asyncHistory.isURIVisited(this._uri2, function(aURI, aIsVisited) {
-        do_check_true(aIsVisited);
-
-        do_check_eq(bs.getBookmarkURI(this._bookmarkId).spec, this._uri1.spec);
-        do_check_eq(bs.getItemIndex(this._folderId), 0);
-
-        do_check_eq(bs.getItemType(this._folderId), bs.TYPE_FOLDER);
-        do_check_eq(bs.getItemType(this._separatorId), bs.TYPE_SEPARATOR);
-
-        do_check_eq(ts.getTagsForURI(this._uri1).length, 1);
-        do_check_eq(bs.getKeywordForBookmark(this._bookmarkId), "testkeyword");
-        do_check_eq(as.getPageAnnotation(this._uri2, "anno"), "anno");
-        do_check_eq(as.getItemAnnotation(this._bookmarkId, "anno"), "anno");
-
-        fs.getFaviconURLForPage(this._uri2, function (aFaviconURI) {
-          do_check_true(aFaviconURI.equals(SMALLPNG_DATA_URI));
-          aCallback();
-        });
-      }.bind(this));
-    }.bind(this));
-  }
+    let isVisited = yield promiseIsURIVisited(this._uri1);
+    do_check_true(isVisited);
+    isVisited = yield promiseIsURIVisited(this._uri2);
+    do_check_true(isVisited);
+
+    do_check_eq(bs.getBookmarkURI(this._bookmarkId).spec, this._uri1.spec);
+    do_check_eq(bs.getItemIndex(this._folderId), 0);
+    do_check_eq(bs.getItemType(this._folderId), bs.TYPE_FOLDER);
+    do_check_eq(bs.getItemType(this._separatorId), bs.TYPE_SEPARATOR);
+
+    do_check_eq(ts.getTagsForURI(this._uri1).length, 1);
+    do_check_eq((yield PlacesUtils.keywords.fetch({ url: this._uri1.spec })).keyword, "testkeyword");
+    do_check_eq(as.getPageAnnotation(this._uri2, "anno"), "anno");
+    do_check_eq(as.getItemAnnotation(this._bookmarkId, "anno"), "anno");
+
+    yield new Promise(resolve => {
+      fs.getFaviconURLForPage(this._uri2, aFaviconURI => {
+        do_check_true(aFaviconURI.equals(SMALLPNG_DATA_URI));
+        resolve();
+      });
+    });
+  })
 });
 
 //------------------------------------------------------------------------------
@@ -1290,13 +1291,7 @@
     // Check the lastMaintenance time has been saved.
     do_check_neq(Services.prefs.getIntPref("places.database.lastMaintenance"), null);
 
-    if (test.asyncCheck) {
-      let deferred = Promise.defer();
-      test.asyncCheck(deferred.resolve);
-      yield deferred.promise;
-    } else {
-      test.check();
-    }
+    yield test.check();
 
     cleanDatabase();
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/unit/test_promiseBookmarksTree.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/unit/test_promiseBookmarksTree.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/unit/test_promiseBookmarksTree.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/unit/test_promiseBookmarksTree.js	2015-04-24 19:31:10.000000000 +0000
@@ -147,9 +147,9 @@
       let itemURI = uri(aNode.uri);
       compare_prop_to_value("charset",
                             yield PlacesUtils.getCharsetForURI(itemURI));
-      compare_prop_to_value("keyword",
-                            PlacesUtils.bookmarks
-                                       .getKeywordForBookmark(aNode.itemId));
+
+      let entry = yield PlacesUtils.keywords.fetch({ url: aNode.uri });
+      compare_prop_to_value("keyword", entry ? entry.keyword : null);
 
       if ("title" in aItem)
         compare_prop("title");
@@ -251,7 +251,3 @@
   do_check_eq(guidsPassedToExcludeCallback.size, 4);
   do_check_eq(placesRootWithoutTheMenu.children.length, 2);
 });
-
-function run_test() {
-  run_next_test();
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/unit/test_result_sort.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/unit/test_result_sort.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/unit/test_result_sort.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/unit/test_result_sort.js	2015-04-24 19:31:10.000000000 +0000
@@ -86,8 +86,8 @@
   do_print("Sort by keyword asc");
   result.sortingMode = NHQO.SORT_BY_KEYWORD_ASCENDING;
   checkOrder(id3, id2, id1);  // no keywords set - falling back to title sort
-  PlacesUtils.bookmarks.setKeywordForBookmark(id1, "a");
-  PlacesUtils.bookmarks.setKeywordForBookmark(id2, "z");
+  yield PlacesUtils.keywords.insert({ url: uri1.spec, keyword: "a" });
+  yield PlacesUtils.keywords.insert({ url: uri2.spec, keyword: "z" });
   checkOrder(id3, id1, id2);
 
   // XXXtodo: test history sortings (visit count, visit date)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/unit/test_telemetry.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/unit/test_telemetry.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/places/tests/unit/test_telemetry.js	2015-04-22 13:06:05.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/places/tests/unit/test_telemetry.js	2015-04-24 19:31:10.000000000 +0000
@@ -42,7 +42,7 @@
                                                     PlacesUtils.bookmarks.DEFAULT_INDEX,
                                                     "moz test");
   PlacesUtils.tagging.tagURI(uri, ["tag"]);
-  PlacesUtils.bookmarks.setKeywordForBookmark(itemId, "keyword");
+  yield PlacesUtils.keywords.insert({ url: uri.spec, keyword: "keyword"});
 
   // Set a large annotation.
   let content = "";
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/startup/nsAppStartup.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/startup/nsAppStartup.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/startup/nsAppStartup.cpp	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/startup/nsAppStartup.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -143,7 +143,6 @@
   mInterrupted(false),
   mIsSafeModeNecessary(false),
   mStartupCrashTrackingEnded(false),
-  mRestartTouchEnvironment(false),
   mRestartNotSameProfile(false)
 { }
 
@@ -235,7 +234,7 @@
 NS_IMETHODIMP
 nsAppStartup::CreateHiddenWindow()
 {
-#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
+#ifdef MOZ_WIDGET_GONK
   return NS_OK;
 #else
   nsCOMPtr<nsIAppShellService> appShellService
@@ -250,7 +249,7 @@
 NS_IMETHODIMP
 nsAppStartup::DestroyHiddenWindow()
 {
-#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
+#ifdef MOZ_WIDGET_GONK
   return NS_OK;
 #else
   nsCOMPtr<nsIAppShellService> appShellService
@@ -284,9 +283,7 @@
   }
 
   nsresult retval = NS_OK;
-  if (mRestartTouchEnvironment) {
-    retval = NS_SUCCESS_RESTART_METRO_APP;
-  } else if (mRestart) {
+  if (mRestart) {
     retval = NS_SUCCESS_RESTART_APP;
   } else if (mRestartNotSameProfile) {
     retval = NS_SUCCESS_RESTART_APP_NOT_SAME_PROFILE;
@@ -384,17 +381,12 @@
       gRestartMode = (aMode & 0xF0);
     }
 
-    if (!mRestartTouchEnvironment) {
-      mRestartTouchEnvironment = (aMode & eRestartTouchEnvironment) != 0;
-      gRestartMode = (aMode & 0xF0);
-    }
-
     if (!mRestartNotSameProfile) {
       mRestartNotSameProfile = (aMode & eRestartNotSameProfile) != 0;
       gRestartMode = (aMode & 0xF0);
     }
 
-    if (mRestart || mRestartTouchEnvironment || mRestartNotSameProfile) {
+    if (mRestart || mRestartNotSameProfile) {
       // Mark the next startup as a restart.
       PR_SetEnv("MOZ_APP_RESTART=1");
 
@@ -464,7 +456,7 @@
       NS_NAMED_LITERAL_STRING(shutdownStr, "shutdown");
       NS_NAMED_LITERAL_STRING(restartStr, "restart");
       obsService->NotifyObservers(nullptr, "quit-application",
-        (mRestart || mRestartTouchEnvironment || mRestartNotSameProfile) ?
+        (mRestart || mRestartNotSameProfile) ?
          restartStr.get() : shutdownStr.get());
     }
 
@@ -590,14 +582,6 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsAppStartup::GetRestartingTouchEnvironment(bool *aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = mRestartTouchEnvironment;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsAppStartup::SetInterrupted(bool aInterrupted)
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/startup/nsAppStartup.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/startup/nsAppStartup.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/startup/nsAppStartup.h	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/startup/nsAppStartup.h	2015-04-24 19:31:11.000000000 +0000
@@ -22,8 +22,6 @@
 #endif //defined(XP_WIN)
 
 
-struct PLEvent;
-
 // {7DD4D320-C84B-4624-8D45-7BB9B2356977}
 #define NS_TOOLKIT_APPSTARTUP_CID \
 { 0x7dd4d320, 0xc84b, 0x4624, { 0x8d, 0x45, 0x7b, 0xb9, 0xb2, 0x35, 0x69, 0x77 } }
@@ -62,7 +60,6 @@
   bool mInterrupted;    // Was startup interrupted by an interactive prompt?
   bool mIsSafeModeNecessary;       // Whether safe mode is necessary
   bool mStartupCrashTrackingEnded; // Whether startup crash tracking has already ended
-  bool mRestartTouchEnvironment;   // Quit (eRestartTouchEnvironment)
   bool mRestartNotSameProfile;     // Quit(eRestartNotSameProfile)
 
 #if defined(XP_WIN)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/startup/public/nsIAppStartup.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/startup/public/nsIAppStartup.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/startup/public/nsIAppStartup.idl	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/startup/public/nsIAppStartup.idl	2015-04-24 19:31:11.000000000 +0000
@@ -7,7 +7,7 @@
 
 interface nsICmdLineService;
 
-[scriptable, uuid(bc0cb41f-4924-4c69-a65b-e35225a8650f)]
+[scriptable, uuid(6621f6d5-6c04-4a0e-9e74-447db221484e)]
 
 interface nsIAppStartup : nsISupports
 {
@@ -32,11 +32,6 @@
      *             This return code indicates that the application should be
      *             restarted because quit was called with the eRestart flag.
 
-     * @returnCode NS_SUCCESS_RESTART_METRO_APP
-     *             This return code indicates that the application should be
-     *             restarted in metro because quit was called with the
-     *             eRestartTouchEnviroment flag.
-
      * @returnCode NS_SUCCESS_RESTART_APP_NOT_SAME_PROFILE
      *             This return code indicates that the application should be
      *             restarted without necessarily using the same profile because
@@ -133,13 +128,6 @@
     const uint32_t eRestartx86_64 = 0x40;
 
     /**
-     * Restart the application in a touch-optimized environment (such as Metro)
-     * after quitting. The application will be restarted with the same profile
-     * and an empty command line.
-     */
-    const uint32_t eRestartTouchEnvironment = 0x80;
-
-    /**
      * Restart the application after quitting.  The application will be
      * restarted with an empty command line and the normal profile selection
      * process will take place on startup.
@@ -185,12 +173,6 @@
      */
     readonly attribute boolean wasRestarted;
 
-    /**
-     * True if the application is being restarted in a touch-optimized
-     * environment (such as Metro).
-     */
-    readonly attribute boolean restartingTouchEnvironment;
-
     /** 
      * Returns an object with main, process, firstPaint, sessionRestored properties.
      * Properties may not be available depending on platform or application
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/Histograms.json thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/Histograms.json
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/Histograms.json	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/Histograms.json	2015-04-24 19:31:11.000000000 +0000
@@ -3446,50 +3446,59 @@
     "description": "PLACES: Days from last maintenance"
   },
   "UPDATE_CHECK_NO_UPDATE_EXTERNAL" : {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of no updates were found for a background update check (externally initiated)"
   },
   "UPDATE_CHECK_NO_UPDATE_NOTIFY" : {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of no updates were found for a background update check (timer initiated)"
   },
   "UPDATE_CHECK_CODE_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 50,
     "description": "Update: background update check result code except for no updates found (externally initiated)"
   },
   "UPDATE_CHECK_CODE_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 50,
     "description": "Update: background update check result code except for no updates found (timer initiated)"
   },
   "UPDATE_CHECK_EXTENDED_ERROR_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "keyed": true,
     "description": "Update: keyed count (key names are prefixed with AUS_CHECK_EX_ERR_) of background update check extended error code (externally initiated)"
   },
   "UPDATE_CHECK_EXTENDED_ERROR_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "keyed": true,
     "description": "Update: keyed count (key names are prefixed with AUS_CHECK_EX_ERR_) of background update check extended error code (timer initiated)"
   },
   "UPDATE_INVALID_LASTUPDATETIME_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems that have a last update time greater than the current time (externally initiated)"
   },
   "UPDATE_INVALID_LASTUPDATETIME_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems that have a last update time greater than the current time (timer initiated)"
   },
   "UPDATE_LAST_NOTIFY_INTERVAL_DAYS_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
     "n_buckets": 60,
@@ -3497,6 +3506,7 @@
     "description": "Update: interval in days since the last background update check (externally initiated)"
   },
   "UPDATE_LAST_NOTIFY_INTERVAL_DAYS_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
     "n_buckets": 30,
@@ -3504,214 +3514,253 @@
     "description": "Update: interval in days since the last background update check (timer initiated)"
   },
   "UPDATE_PING_COUNT_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems for this ping for comparison with other pings (externally initiated)"
   },
   "UPDATE_PING_COUNT_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems for this ping for comparison with other pings (timer initiated)"
   },
   "UPDATE_SERVICE_INSTALLED_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "boolean",
     "description": "Update: whether the service is installed (externally initiated)"
   },
   "UPDATE_SERVICE_INSTALLED_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "boolean",
     "description": "Update: whether the service is installed (timer initiated)"
   },
   "UPDATE_SERVICE_MANUALLY_UNINSTALLED_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems that manually uninstalled the service (externally initiated)"
   },
   "UPDATE_SERVICE_MANUALLY_UNINSTALLED_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems that manually uninstalled the service (timer initiated)"
   },
   "UPDATE_UNABLE_TO_APPLY_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems that cannot apply updates (externally initiated)"
   },
   "UPDATE_UNABLE_TO_APPLY_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems that cannot apply updates (timer initiated)"
   },
   "UPDATE_CANNOT_STAGE_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems that cannot stage updates (externally initiated)"
   },
   "UPDATE_CANNOT_STAGE_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems that cannot stage updates (timer initiated)"
   },
   "UPDATE_HAS_PREF_URL_OVERRIDE_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems that have an app.update.url.override preference (externally initiated)"
   },
   "UPDATE_HAS_PREF_URL_OVERRIDE_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of systems that have an app.update.url.override preference (timer initiated)"
   },
   "UPDATE_PREF_UPDATE_CANCELATIONS_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 100,
     "description": "Update: number of sequential update elevation request cancelations greater than 0 (externally initiated)"
   },
   "UPDATE_PREF_UPDATE_CANCELATIONS_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 100,
     "description": "Update: number of sequential update elevation request cancelations greater than 0 (timer initiated)"
   },
   "UPDATE_PREF_SERVICE_ERRORS_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 30,
     "description": "Update: number of sequential update service errors greater than 0 (externally initiated)"
   },
   "UPDATE_PREF_SERVICE_ERRORS_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 30,
     "description": "Update: number of sequential update service errors greater than 0 (timer initiated)"
   },
   "UPDATE_NOT_PREF_UPDATE_AUTO_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of when the app.update.auto boolean preference is not the default value of true (true values are not submitted)"
   },
   "UPDATE_NOT_PREF_UPDATE_AUTO_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of when the app.update.auto boolean preference is not the default value of true (true values are not submitted)"
   },
   "UPDATE_NOT_PREF_UPDATE_ENABLED_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of when the app.update.enabled boolean preference is not the default value of true (true values are not submitted)"
   },
   "UPDATE_NOT_PREF_UPDATE_ENABLED_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of when the app.update.enabled boolean preference is not the default value of true (true values are not submitted)"
   },
   "UPDATE_NOT_PREF_UPDATE_STAGING_ENABLED_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of when the app.update.staging.enabled boolean preference is not the default value of true (true values are not submitted)"
   },
   "UPDATE_NOT_PREF_UPDATE_STAGING_ENABLED_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of when the app.update.staging.enabled boolean preference is not the default value of true (true values are not submitted)"
   },
   "UPDATE_NOT_PREF_UPDATE_SERVICE_ENABLED_EXTERNAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of when the app.update.service.enabled boolean preference is not the default value of true (true values are not submitted)"
   },
   "UPDATE_NOT_PREF_UPDATE_SERVICE_ENABLED_NOTIFY": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "description": "Update: count of when the app.update.service.enabled boolean preference is not the default value of true (true values are not submitted)"
   },
   "UPDATE_DOWNLOAD_CODE_COMPLETE": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 50,
     "description": "Update: complete patch download result code"
   },
   "UPDATE_DOWNLOAD_CODE_PARTIAL": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 50,
     "description": "Update: complete patch download result code"
   },
   "UPDATE_STATE_CODE_COMPLETE_STARTUP": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 20,
     "description": "Update: the state of a complete update from update.status on startup"
   },
   "UPDATE_STATE_CODE_PARTIAL_STARTUP": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 20,
     "description": "Update: the state of a partial patch update from update.status on startup"
   },
   "UPDATE_STATE_CODE_UNKNOWN_STARTUP": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 20,
     "description": "Update: the state of an unknown patch update from update.status on startup"
   },
   "UPDATE_STATE_CODE_COMPLETE_STAGE": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 20,
     "description": "Update: the state of a complete patch update from update.status after staging"
   },
   "UPDATE_STATE_CODE_PARTIAL_STAGE": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 20,
     "description": "Update: the state of a partial patch update from update.status after staging"
   },
   "UPDATE_STATE_CODE_UNKNOWN_STAGE": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 20,
     "description": "Update: the state of an unknown patch update from update.status after staging"
   },
   "UPDATE_STATUS_ERROR_CODE_COMPLETE_STARTUP": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 100,
     "description": "Update: the status error code for a failed complete patch update from update.status on startup"
   },
   "UPDATE_STATUS_ERROR_CODE_PARTIAL_STARTUP": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 100,
     "description": "Update: the status error code for a failed partial patch update from update.status on startup"
   },
   "UPDATE_STATUS_ERROR_CODE_UNKNOWN_STARTUP": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 100,
     "description": "Update: the status error code for a failed unknown patch update from update.status on startup"
   },
   "UPDATE_STATUS_ERROR_CODE_COMPLETE_STAGE": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 100,
     "description": "Update: the status error code for a failed complete patch update from update.status after staging"
   },
   "UPDATE_STATUS_ERROR_CODE_PARTIAL_STAGE": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 100,
     "description": "Update: the status error code for a failed partial patch update from update.status after staging"
   },
   "UPDATE_STATUS_ERROR_CODE_UNKNOWN_STAGE": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 100,
     "description": "Update: the status error code for a failed unknown patch update from update.status after staging"
   },
   "UPDATE_WIZ_LAST_PAGE_CODE": {
+    "alert_emails": ["application-update-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 30,
@@ -3978,14 +4027,6 @@
     "extended_statistics_ok": true,
     "description": "Session restore: Time to JSON serialize session data (ms)"
   },
-  "FX_SESSION_RESTORE_SERIALIZE_DATA_LONGEST_OP_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": "30000",
-    "n_buckets": 10,
-    "extended_statistics_ok": true,
-    "description": "Session restore: Duration of the longest uninterruptible operation while serializing session data (ms)"
-  },
   "FX_SESSION_RESTORE_READ_FILE_MS": {
     "expires_in_version": "default",
     "kind": "exponential",
@@ -3994,14 +4035,6 @@
     "extended_statistics_ok": true,
     "description": "Session restore: Time to read the session data from the file on disk (ms)"
   },
-  "FX_SESSION_RESTORE_SEND_SERIALIZED_STATE_LONGEST_OP_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": "3000",
-    "n_buckets": 10,
-    "extended_statistics_ok": true,
-    "description": "Session restore: Time spent on the main thread sending the session data off the main thread for writing (ms)"
-  },
   "FX_SESSION_RESTORE_WRITE_STATE_LONGEST_OP_MS": {
     "expires_in_version": "40",
     "kind": "exponential",
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/moz.build	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/moz.build	2015-04-24 19:31:11.000000000 +0000
@@ -30,9 +30,10 @@
 ]
 
 EXTRA_JS_MODULES += [
-    'TelemetryFile.jsm',
+    'TelemetryArchive.jsm',
     'TelemetryLog.jsm',
     'TelemetryStopwatch.jsm',
+    'TelemetryStorage.jsm',
     'ThirdPartyCookieProbe.jsm',
     'UITelemetry.jsm',
 ]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/TelemetryArchive.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/TelemetryArchive.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/TelemetryArchive.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/TelemetryArchive.jsm	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,180 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 = [
+  "TelemetryArchive"
+];
+
+const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
+
+Cu.import("resource://gre/modules/Log.jsm", this);
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/Preferences.jsm", this);
+Cu.import("resource://gre/modules/Task.jsm", this);
+Cu.import("resource://gre/modules/osfile.jsm", this);
+
+const LOGGER_NAME = "Toolkit.Telemetry";
+const LOGGER_PREFIX = "TelemetryArchive::";
+
+const PREF_BRANCH = "toolkit.telemetry.";
+const PREF_ARCHIVE_ENABLED = PREF_BRANCH + "archive.enabled";
+
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStorage",
+                                  "resource://gre/modules/TelemetryStorage.jsm");
+
+this.TelemetryArchive = {
+  /**
+   * Get a list of the archived pings, sorted by the creation date.
+   * Note that scanning the archived pings on disk is delayed on startup,
+   * use promizeInitialized() to access this after scanning.
+   *
+   * @return {Promise<sequence<Object>>}
+   *                    A list of the archived ping info in the form:
+   *                    { id: <string>,
+   *                      timestampCreated: <number>,
+   *                      type: <string> }
+   */
+  promiseArchivedPingList: function() {
+    return TelemetryArchiveImpl.promiseArchivedPingList();
+  },
+
+  /**
+   * Load an archived ping from disk by id, asynchronously.
+   *
+   * @param id {String} The pings UUID.
+   * @return {Promise<PingData>} A promise resolved with the pings data on success.
+   */
+  promiseArchivedPingById: function(id) {
+    return TelemetryArchiveImpl.promiseArchivedPingById(id);
+  },
+
+  /**
+   * Archive a ping and persist it to disk.
+   *
+   * @param {object} ping The ping data to archive.
+   * @return {promise} Promise that is resolved when the ping is successfully archived.
+   */
+  promiseArchivePing: function(ping) {
+    return TelemetryArchiveImpl.promiseArchivePing(ping);
+  },
+
+  /**
+   * Used in tests only to fake a restart of the module.
+   */
+  _testReset: function() {
+    TelemetryArchiveImpl._testReset();
+  },
+};
+
+/**
+ * Checks if pings can be archived. Some products (e.g. Thunderbird) might not want
+ * to do that.
+ * @return {Boolean} True if pings should be archived, false otherwise.
+ */
+function shouldArchivePings() {
+  return Preferences.get(PREF_ARCHIVE_ENABLED, false);
+}
+
+let TelemetryArchiveImpl = {
+  _logger: null,
+
+  // Tracks the archived pings in a Map of (id -> {timestampCreated, type}).
+  // We use this to cache info on archived pings to avoid scanning the disk more than once.
+  _archivedPings: new Map(),
+  // Whether we already scanned the archived pings on disk.
+  _scannedArchiveDirectory: false,
+
+  get _log() {
+    if (!this._logger) {
+      this._logger = Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX);
+    }
+
+    return this._logger;
+  },
+
+  _testReset: function() {
+    this._archivedPings = new Map();
+    this._scannedArchiveDirectory = false;
+  },
+
+  promiseArchivePing: function(ping) {
+    if (!shouldArchivePings()) {
+      this._log.trace("promiseArchivePing - archiving is disabled");
+      return Promise.resolve();
+    }
+
+    for (let field of ["creationDate", "id", "type"]) {
+      if (!(field in ping)) {
+        this._log.warn("promiseArchivePing - missing field " + field)
+        return Promise.reject(new Error("missing field " + field));
+      }
+    }
+
+    const creationDate = new Date(ping.creationDate);
+    if (this._archivedPings.has(ping.id)) {
+      const data = this._archivedPings.get(ping.id);
+      if (data.timestampCreated > creationDate.getTime()) {
+        this._log.error("promiseArchivePing - trying to overwrite newer ping with the same id");
+        return Promise.reject(new Error("trying to overwrite newer ping with the same id"));
+      } else {
+        this._log.warn("promiseArchivePing - overwriting older ping with the same id");
+      }
+    }
+
+    this._archivedPings.set(ping.id, {
+      timestampCreated: creationDate.getTime(),
+      type: ping.type,
+    });
+
+    return TelemetryStorage.saveArchivedPing(ping);
+  },
+
+  _buildArchivedPingList: function() {
+    let list = [for (p of this._archivedPings) {
+      id: p[0],
+      timestampCreated: p[1].timestampCreated,
+      type: p[1].type,
+    }];
+
+    list.sort((a, b) => a.timestampCreated - b.timestampCreated);
+
+    return list;
+  },
+
+  promiseArchivedPingList: function() {
+    this._log.trace("promiseArchivedPingList");
+
+    if (this._scannedArchiveDirectory) {
+      return Promise.resolve(this._buildArchivedPingList())
+    }
+
+    return TelemetryStorage.loadArchivedPingList().then((loadedInfo) => {
+      // Add the ping info from scanning to the existing info.
+      // We might have pings added before lazily loading this list.
+      for (let [id, info] of loadedInfo) {
+        this._log.trace("promiseArchivedPingList - id: " + id + ", info: " + info);
+        this._archivedPings.set(id, {
+          timestampCreated: info.timestampCreated,
+          type: info.type,
+        });
+      }
+
+      this._scannedArchiveDirectory = true;
+      return this._buildArchivedPingList();
+    });
+  },
+
+  promiseArchivedPingById: function(id) {
+    this._log.trace("promiseArchivedPingById - id: " + id);
+    const data = this._archivedPings.get(id);
+    if (!data) {
+      this._log.trace("promiseArchivedPingById - no ping with id: " + id);
+      return Promise.reject(new Error("TelemetryArchive.promiseArchivedPingById - no ping with id " + id));
+    }
+
+    return TelemetryStorage.loadArchivedPing(id, data.timestampCreated, data.type);
+  },
+};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/TelemetryFile.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/TelemetryFile.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/TelemetryFile.jsm	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/TelemetryFile.jsm	1970-01-01 00:00:00.000000000 +0000
@@ -1,335 +0,0 @@
-/* -*- js-indent-level: 2; 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/. */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = ["TelemetryFile"];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/Services.jsm", this);
-Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
-Cu.import("resource://gre/modules/osfile.jsm", this);
-Cu.import("resource://gre/modules/Task.jsm", this);
-Cu.import("resource://gre/modules/Promise.jsm", this);
-
-XPCOMUtils.defineLazyModuleGetter(this, 'Deprecated',
-  'resource://gre/modules/Deprecated.jsm');
-
-const Telemetry = Services.telemetry;
-
-// Files that have been lying around for longer than MAX_PING_FILE_AGE are
-// deleted without being loaded.
-const MAX_PING_FILE_AGE = 14 * 24 * 60 * 60 * 1000; // 2 weeks
-
-// Files that are older than OVERDUE_PING_FILE_AGE, but younger than
-// MAX_PING_FILE_AGE indicate that we need to send all of our pings ASAP.
-const OVERDUE_PING_FILE_AGE = 7 * 24 * 60 * 60 * 1000; // 1 week
-
-// Maximum number of pings to save.
-const MAX_LRU_PINGS = 50;
-
-// The number of outstanding saved pings that we have issued loading
-// requests for.
-let pingsLoaded = 0;
-
-// The number of pings that we have destroyed due to being older
-// than MAX_PING_FILE_AGE.
-let pingsDiscarded = 0;
-
-// The number of pings that are older than OVERDUE_PING_FILE_AGE
-// but younger than MAX_PING_FILE_AGE.
-let pingsOverdue = 0;
-
-// Data that has neither been saved nor sent by ping
-let pendingPings = [];
-
-let isPingDirectoryCreated = false;
-
-this.TelemetryFile = {
-
-  get MAX_PING_FILE_AGE() {
-    return MAX_PING_FILE_AGE;
-  },
-
-  get OVERDUE_PING_FILE_AGE() {
-    return OVERDUE_PING_FILE_AGE;
-  },
-
-  get MAX_LRU_PINGS() {
-    return MAX_LRU_PINGS;
-  },
-
-  get pingDirectoryPath() {
-    return OS.Path.join(OS.Constants.Path.profileDir, "saved-telemetry-pings");
-  },
-
-  /**
-   * Save a single ping to a file.
-   *
-   * @param {object} ping The content of the ping to save.
-   * @param {string} file The destination file.
-   * @param {bool} overwrite If |true|, the file will be overwritten if it exists,
-   * if |false| the file will not be overwritten and no error will be reported if
-   * the file exists.
-   * @returns {promise}
-   */
-  savePingToFile: function(ping, file, overwrite) {
-    return Task.spawn(function*() {
-      try {
-        let pingString = JSON.stringify(ping);
-        yield OS.File.writeAtomic(file, pingString, {tmpPath: file + ".tmp",
-                                  noOverwrite: !overwrite});
-      } catch(e if e.becauseExists) {
-      }
-    })
-  },
-
-  /**
-   * Save a ping to its file.
-   *
-   * @param {object} ping The content of the ping to save.
-   * @param {bool} overwrite If |true|, the file will be overwritten
-   * if it exists.
-   * @returns {promise}
-   */
-  savePing: function(ping, overwrite) {
-    return Task.spawn(function*() {
-      yield getPingDirectory();
-      let file = pingFilePath(ping);
-      yield this.savePingToFile(ping, file, overwrite);
-    }.bind(this));
-  },
-
-  /**
-   * Save all pending pings.
-   *
-   * @param {object} sessionPing The additional session ping.
-   * @returns {promise}
-   */
-  savePendingPings: function(sessionPing) {
-    let p = pendingPings.reduce((p, ping) => {
-      // Restore the files with the previous pings if for some reason they have
-      // been deleted, don't overwrite them otherwise.
-      p.push(this.savePing(ping, false));
-      return p;}, [this.savePing(sessionPing, true)]);
-
-    pendingPings = [];
-    return Promise.all(p);
-  },
-
-  /**
-   * Add a ping to the saved pings directory so that it gets along with other pings. Note
-   * that the original ping file will not be modified.
-   *
-   * @param {String} aFilePath The path to the ping file that needs to be added to the
-   *                           saved pings directory.
-   * @return {Promise} A promise resolved when the ping is saved to the pings directory.
-   */
-  addPendingPing: function(aPingPath) {
-    // Pings in the saved ping directory need to have the ping id or slug (old format) as
-    // the file name. We load the ping content, check that it is valid, and use it to save
-    // the ping file with the correct file name.
-    return loadPingFile(aPingPath).then(ping => {
-        // Append the ping to the pending list.
-        pendingPings.push(ping);
-        // Since we read a ping successfully, update the related histogram.
-        Telemetry.getHistogramById("READ_SAVED_PING_SUCCESS").add(1);
-        // Save the ping to the saved pings directory.
-        return this.savePing(ping, false);
-      });
-  },
-
-  /**
-   * Remove the file for a ping
-   *
-   * @param {object} ping The ping.
-   * @returns {promise}
-   */
-  cleanupPingFile: function(ping) {
-    return OS.File.remove(pingFilePath(ping));
-  },
-
-  /**
-   * Load all saved pings.
-   *
-   * Once loaded, the saved pings can be accessed (destructively only)
-   * through |popPendingPings|.
-   *
-   * @returns {promise}
-   */
-  loadSavedPings: function() {
-    return Task.spawn(function*() {
-      let directory = TelemetryFile.pingDirectoryPath;
-      let iter = new OS.File.DirectoryIterator(directory);
-      let exists = yield iter.exists();
-
-      if (exists) {
-        let entries = yield iter.nextBatch();
-        let sortedEntries = [];
-
-        for (let entry of entries) {
-          if (entry.isDir) {
-            continue;
-          }
-
-          let info = yield OS.File.stat(entry.path);
-          sortedEntries.push({entry:entry, lastModificationDate: info.lastModificationDate});
-        }
-
-        sortedEntries.sort(function compare(a, b) {
-          return b.lastModificationDate - a.lastModificationDate;
-        });
-
-        let count = 0;
-        let result = [];
-
-        // Keep only the last MAX_LRU_PINGS entries to avoid that the backlog overgrows.
-        for (let i = 0; i < MAX_LRU_PINGS && i < sortedEntries.length; i++) {
-          let entry = sortedEntries[i].entry;
-          result.push(this.loadHistograms(entry.path))
-        }
-
-        for (let i = MAX_LRU_PINGS; i < sortedEntries.length; i++) {
-          let entry = sortedEntries[i].entry;
-          OS.File.remove(entry.path);
-        }
-
-        yield Promise.all(result);
-
-        Services.telemetry.getHistogramById('TELEMETRY_FILES_EVICTED').
-          add(sortedEntries.length - MAX_LRU_PINGS);
-      }
-
-      yield iter.close();
-    }.bind(this));
-  },
-
-  /**
-   * Load the histograms from a file.
-   *
-   * Once loaded, the saved pings can be accessed (destructively only)
-   * through |popPendingPings|.
-   *
-   * @param {string} file The file to load.
-   * @returns {promise}
-   */
-  loadHistograms: function loadHistograms(file) {
-    return OS.File.stat(file).then(function(info){
-      let now = Date.now();
-      if (now - info.lastModificationDate > MAX_PING_FILE_AGE) {
-        // We haven't had much luck in sending this file; delete it.
-        pingsDiscarded++;
-        return OS.File.remove(file);
-      }
-
-      // This file is a bit stale, and overdue for sending.
-      if (now - info.lastModificationDate > OVERDUE_PING_FILE_AGE) {
-        pingsOverdue++;
-      }
-
-      pingsLoaded++;
-      return addToPendingPings(file);
-    });
-  },
-
-  /**
-   * The number of pings loaded since the beginning of time.
-   */
-  get pingsLoaded() {
-    return pingsLoaded;
-  },
-
-  /**
-   * The number of pings loaded that are older than OVERDUE_PING_FILE_AGE
-   * but younger than MAX_PING_FILE_AGE.
-   */
-  get pingsOverdue() {
-    return pingsOverdue;
-  },
-
-  /**
-   * The number of pings that we just tossed out for being older than
-   * MAX_PING_FILE_AGE.
-   */
-  get pingsDiscarded() {
-    return pingsDiscarded;
-  },
-
-  /**
-   * Iterate destructively through the pending pings.
-   *
-   * @return {iterator}
-   */
-  popPendingPings: function*() {
-    while (pendingPings.length > 0) {
-      let data = pendingPings.pop();
-      yield data;
-    }
-  },
-
-  testLoadHistograms: function(file) {
-    pingsLoaded = 0;
-    return this.loadHistograms(file.path);
-  }
-};
-
-///// Utility functions
-function pingFilePath(ping) {
-  // Support legacy ping formats, who don't have an "id" field, but a "slug" field.
-  let pingIdentifier = (ping.slug) ? ping.slug : ping.id;
-  return OS.Path.join(TelemetryFile.pingDirectoryPath, pingIdentifier);
-}
-
-function getPingDirectory() {
-  return Task.spawn(function*() {
-    let directory = TelemetryFile.pingDirectoryPath;
-
-    if (!isPingDirectoryCreated) {
-      yield OS.File.makeDir(directory, { unixMode: OS.Constants.S_IRWXU });
-      isPingDirectoryCreated = true;
-    }
-
-    return directory;
-  });
-}
-
-/**
- * Loads a ping file.
- * @param {String} aFilePath The path of the ping file.
- * @return {Promise<Object>} A promise resolved with the ping content or rejected if the
- *                           ping contains invalid data.
- */
-let loadPingFile = Task.async(function* (aFilePath) {
-  let array = yield OS.File.read(aFilePath);
-  let decoder = new TextDecoder();
-  let string = decoder.decode(array);
-
-  let ping = JSON.parse(string);
-  // The ping's payload used to be stringified JSON.  Deal with that.
-  if (typeof(ping.payload) == "string") {
-    ping.payload = JSON.parse(ping.payload);
-  }
-  return ping;
-});
-
-function addToPendingPings(file) {
-  function onLoad(success) {
-    let success_histogram = Telemetry.getHistogramById("READ_SAVED_PING_SUCCESS");
-    success_histogram.add(success);
-  }
-
-  return loadPingFile(file).then(ping => {
-      pendingPings.push(ping);
-      onLoad(true);
-    },
-    () => {
-      onLoad(false);
-      return OS.File.remove(file);
-    });
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/TelemetryPing.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/TelemetryPing.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/TelemetryPing.jsm	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/TelemetryPing.jsm	2015-04-24 19:31:11.000000000 +0000
@@ -29,7 +29,6 @@
 const PREF_BRANCH_LOG = PREF_BRANCH + "log.";
 const PREF_SERVER = PREF_BRANCH + "server";
 const PREF_ENABLED = PREF_BRANCH + "enabled";
-const PREF_ARCHIVE_ENABLED = PREF_BRANCH + "archive.enabled";
 const PREF_LOG_LEVEL = PREF_BRANCH_LOG + "level";
 const PREF_LOG_DUMP = PREF_BRANCH_LOG + "dump";
 const PREF_CACHED_CLIENTID = PREF_BRANCH + "cachedClientID";
@@ -55,10 +54,8 @@
                                    "nsITelemetry");
 XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
                                   "resource://gre/modules/AsyncShutdown.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TelemetryFile",
-                                  "resource://gre/modules/TelemetryFile.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TelemetryLog",
-                                  "resource://gre/modules/TelemetryLog.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStorage",
+                                  "resource://gre/modules/TelemetryStorage.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ThirdPartyCookieProbe",
                                   "resource://gre/modules/ThirdPartyCookieProbe.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TelemetryEnvironment",
@@ -67,13 +64,8 @@
                                   "resource://gre/modules/SessionRecorder.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel",
                                   "resource://gre/modules/UpdateChannel.jsm");
-
-// Compute the path of the pings archive on the first use.
-const DATAREPORTING_DIR = "datareporting";
-const PINGS_ARCHIVE_DIR = "archived";
-XPCOMUtils.defineLazyGetter(this, "gPingsArchivePath", function() {
-  return OS.Path.join(OS.Constants.Path.profileDir, DATAREPORTING_DIR, PINGS_ARCHIVE_DIR);
-});
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetryArchive",
+                                  "resource://gre/modules/TelemetryArchive.jsm");
 
 /**
  * Setup Telemetry logging. This function also gets called when loggin related
@@ -123,25 +115,6 @@
 }
 
 /**
- * Build the path to the archived ping.
- * @param {String} aPingId The ping id.
- * @param {Object} aDate The ping creation date.
- * @param {String} aType The ping type.
- * @return {String} The full path to the archived ping.
- */
-function getArchivedPingPath(aPingId, aDate, aType) {
-  // Helper to pad the month to 2 digits, if needed (e.g. "1" -> "01").
-  let addLeftPadding = value => (value < 10) ? ("0" + value) : value;
-  // Get the ping creation date and generate the archive directory to hold it. Note
-  // that getMonth returns a 0-based month, so we need to add an offset.
-  let archivedPingDir = OS.Path.join(gPingsArchivePath,
-    aDate.getFullYear() + '-' + addLeftPadding(aDate.getMonth() + 1));
-  // Generate the archived ping file path as YYYY-MM/<TIMESTAMP>.UUID.type.json
-  let fileName = [aDate.getTime(), aPingId, aType, "json"].join(".");
-  return OS.Path.join(archivedPingDir, fileName);
-};
-
-/**
  * This is a policy object used to override behavior for testing.
  */
 let Policy = {
@@ -326,24 +299,33 @@
    *
    * @return The client id as string, or null.
    */
-   get clientID() {
+  get clientID() {
     return Impl.clientID;
-   },
+  },
 
-   /**
-    * The AsyncShutdown.Barrier to synchronize with TelemetryPing shutdown.
-    */
-   get shutdown() {
+  /**
+   * The AsyncShutdown.Barrier to synchronize with TelemetryPing shutdown.
+   */
+  get shutdown() {
     return Impl._shutdownBarrier.client;
-   },
+  },
 
-   /**
-    * The session recorder instance managed by Telemetry.
-    * @return {Object} The active SessionRecorder instance or null if not available.
-    */
-   getSessionRecorder: function() {
+  /**
+   * The session recorder instance managed by Telemetry.
+   * @return {Object} The active SessionRecorder instance or null if not available.
+   */
+  getSessionRecorder: function() {
     return Impl._sessionRecorder;
-   },
+  },
+
+  /**
+   * Allows waiting for TelemetryPings delayed initialization to complete.
+   * The returned promise is guaranteed to resolve before TelemetryPing is shutting down.
+   * @return {Promise} Resolved when delayed TelemetryPing initialization completed.
+   */
+  promiseInitialized: function() {
+    return Impl.promiseInitialized();
+  },
 });
 
 let Impl = {
@@ -452,7 +434,7 @@
   popPayloads: function popPayloads() {
     this._log.trace("popPayloads");
     function payloadIter() {
-      let iterator = TelemetryFile.popPendingPings();
+      let iterator = TelemetryStorage.popPendingPings();
       for (let data of iterator) {
         yield data;
       }
@@ -487,7 +469,7 @@
    * @return {Promise} Resolved when the ping is correctly moved to the saved pings directory.
    */
   addPendingPingFromFile: function(aPingPath, aRemoveOriginal) {
-    return TelemetryFile.addPendingPing(aPingPath).then(() => {
+    return TelemetryStorage.addPendingPing(aPingPath).then(() => {
         if (aRemoveOriginal) {
           return OS.File.remove(aPingPath);
         }
@@ -518,7 +500,7 @@
 
     let pingData = this.assemblePing(aType, aPayload, aOptions);
     // Always persist the pings if we are allowed to.
-    let archivePromise = this._archivePing(pingData)
+    let archivePromise = TelemetryArchive.promiseArchivePing(pingData)
       .catch(e => this._log.error("send - Failed to archive ping " + pingData.id, e));
 
     // Once ping is assembled, send it along with the persisted pings in the backlog.
@@ -526,7 +508,7 @@
       archivePromise,
       // Persist the ping if sending it fails.
       this.doPing(pingData, false)
-          .catch(() => TelemetryFile.savePing(pingData, true)),
+          .catch(() => TelemetryStorage.savePing(pingData, true)),
       this.sendPersistedPings(),
     ];
 
@@ -578,7 +560,7 @@
                     ", aOptions " + JSON.stringify(aOptions));
 
     let pingData = this.assemblePing(aType, aPayload, aOptions);
-    return TelemetryFile.savePendingPings(pingData);
+    return TelemetryStorage.savePendingPings(pingData);
   },
 
   /**
@@ -605,8 +587,8 @@
 
     let pingData = this.assemblePing(aType, aPayload, aOptions);
 
-    let savePromise = TelemetryFile.savePing(pingData, aOptions.overwrite);
-    let archivePromise = this._archivePing(pingData).catch(e => {
+    let savePromise = TelemetryStorage.savePing(pingData, aOptions.overwrite);
+    let archivePromise = TelemetryArchive.promiseArchivePing(pingData).catch(e => {
       this._log.error("addPendingPing - Failed to archive ping " + pingData.id, e);
     });
 
@@ -642,7 +624,7 @@
     this._log.trace("savePing - Type " + aType + ", Server " + this._server +
                     ", File Path " + aFilePath + ", aOptions " + JSON.stringify(aOptions));
     let pingData = this.assemblePing(aType, aPayload, aOptions);
-    return TelemetryFile.savePingToFile(pingData, aFilePath, aOptions.overwrite)
+    return TelemetryStorage.savePingToFile(pingData, aFilePath, aOptions.overwrite)
                         .then(() => pingData.id);
   },
 
@@ -656,7 +638,7 @@
     hping.add(new Date() - startTime);
 
     if (success && isPersisted) {
-      return TelemetryFile.cleanupPingFile(ping);
+      return TelemetryStorage.cleanupPingFile(ping);
     } else {
       return Promise.resolve();
     }
@@ -675,7 +657,7 @@
     } else {
       // This is a ping in the old format.
       if (!("slug" in ping)) {
-        // That's odd, we don't have a slug. Generate one so that TelemetryFile.jsm works.
+        // That's odd, we don't have a slug. Generate one so that TelemetryStorage.jsm works.
         ping.slug = generateUUID();
       }
 
@@ -912,11 +894,11 @@
       try {
         this._initialized = true;
 
-        yield TelemetryFile.loadSavedPings();
+        yield TelemetryStorage.loadSavedPings();
         // If we have any TelemetryPings lying around, we'll be aggressive
         // and try to send them all off ASAP.
-        if (TelemetryFile.pingsOverdue > 0) {
-          this._log.trace("setupChromeProcess - Sending " + TelemetryFile.pingsOverdue +
+        if (TelemetryStorage.pingsOverdue > 0) {
+          this._log.trace("setupChromeProcess - Sending " + TelemetryStorage.pingsOverdue +
                           " overdue pings now.");
           // It doesn't really matter what we pass to this.send as a reason,
           // since it's never sent to the server. All that this.send does with
@@ -928,24 +910,12 @@
         this._clientID = yield ClientID.getClientID();
         Preferences.set(PREF_CACHED_CLIENTID, this._clientID);
 
-        // If pings should be archived, make sure the archive directory exists.
-        if (this._shouldArchivePings()) {
-          const DATAREPORTING_PATH = OS.Path.join(OS.Constants.Path.profileDir, DATAREPORTING_DIR);
-          let reportError =
-            e => this._log.error("setupTelemetry - Unable to create the directory", e);
-          // Don't bail out if we can't create the archive folder, we might still be
-          // able to send telemetry pings to the servers.
-          yield OS.File.makeDir(DATAREPORTING_PATH, {ignoreExisting: true}).catch(reportError);
-          yield OS.File.makeDir(gPingsArchivePath, {ignoreExisting: true}).catch(reportError);
-        }
-
         Telemetry.asyncFetchTelemetryData(function () {});
         this._delayedInitTaskDeferred.resolve();
       } catch (e) {
         this._delayedInitTaskDeferred.reject(e);
       } finally {
         this._delayedInitTask = null;
-        this._delayedInitTaskDeferred = null;
       }
     }.bind(this), this._testMode ? TELEMETRY_TEST_DELAY : TELEMETRY_DELAY);
 
@@ -1059,32 +1029,6 @@
   },
 
   /**
-   * Checks if pings can be archived. Some products (e.g. Thunderbird) might not want
-   * to do that.
-   * @return {Boolean} True if pings should be archived, false otherwise.
-   */
-  _shouldArchivePings: function() {
-    return Preferences.get(PREF_ARCHIVE_ENABLED, true);
-  },
-
-  /**
-   * Save a ping to the pings archive. Note that any error should be handled by the caller.
-   * @param {Object} aPingData The content of the ping.
-   * @return {Promise} A promise resolved when the ping is saved to the archive.
-   */
-  _archivePing: Task.async(function*(aPingData) {
-    if (!this._shouldArchivePings()) {
-      return;
-    }
-
-    const creationDate = new Date(aPingData.creationDate);
-    const filePath = getArchivedPingPath(aPingData.id, creationDate, aPingData.type);
-    yield OS.File.makeDir(OS.Path.dirname(filePath), { ignoreExisting: true,
-                                                       from: OS.Constants.Path.profileDir });
-    yield TelemetryFile.savePingToFile(aPingData, filePath, true);
-  }),
-
-  /**
    * Get an object describing the current state of this module for AsyncShutdown diagnostics.
    */
   _getState: function() {
@@ -1096,4 +1040,13 @@
       connectionsBarrier: this._connectionsBarrier.state,
     };
   },
+
+  /**
+   * Allows waiting for TelemetryPings delayed initialization to complete.
+   * This will complete before TelemetryPing is shutting down.
+   * @return {Promise} Resolved when delayed TelemetryPing initialization completed.
+   */
+  promiseInitialized: function() {
+    return this._delayedInitTaskDeferred.promise;
+  },
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/TelemetrySession.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/TelemetrySession.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/TelemetrySession.jsm	2015-04-22 13:06:06.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/TelemetrySession.jsm	2015-04-24 19:31:11.000000000 +0000
@@ -136,8 +136,8 @@
                                   "resource://gre/modules/AsyncShutdown.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TelemetryPing",
                                   "resource://gre/modules/TelemetryPing.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TelemetryFile",
-                                  "resource://gre/modules/TelemetryFile.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStorage",
+                                  "resource://gre/modules/TelemetryStorage.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TelemetryLog",
                                   "resource://gre/modules/TelemetryLog.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ThirdPartyCookieProbe",
@@ -963,7 +963,7 @@
     } catch(e) {
     }
     if (!forSavedSession || hasPingBeenSent) {
-      ret.savedPings = TelemetryFile.pingsLoaded;
+      ret.savedPings = TelemetryStorage.pingsLoaded;
     }
 
     ret.activeTicks = -1;
@@ -981,8 +981,8 @@
       ret.activeTicks = activeTicks;
     }
 
-    ret.pingsOverdue = TelemetryFile.pingsOverdue;
-    ret.pingsDiscarded = TelemetryFile.pingsDiscarded;
+    ret.pingsOverdue = TelemetryStorage.pingsOverdue;
+    ret.pingsDiscarded = TelemetryStorage.pingsDiscarded;
 
     return ret;
   },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/TelemetryStorage.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/TelemetryStorage.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/TelemetryStorage.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/TelemetryStorage.jsm	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,689 @@
+/* -*- js-indent-level: 2; 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/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = ["TelemetryStorage"];
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cr = Components.results;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Log.jsm");
+Cu.import("resource://gre/modules/Services.jsm", this);
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/osfile.jsm", this);
+Cu.import("resource://gre/modules/Task.jsm", this);
+Cu.import("resource://gre/modules/Promise.jsm", this);
+
+XPCOMUtils.defineLazyModuleGetter(this, 'Deprecated',
+  'resource://gre/modules/Deprecated.jsm');
+
+const LOGGER_NAME = "Toolkit.Telemetry";
+const LOGGER_PREFIX = "TelemetryStorage::";
+
+const Telemetry = Services.telemetry;
+
+// Compute the path of the pings archive on the first use.
+const DATAREPORTING_DIR = "datareporting";
+const PINGS_ARCHIVE_DIR = "archived";
+XPCOMUtils.defineLazyGetter(this, "gPingsArchivePath", function() {
+  return OS.Path.join(OS.Constants.Path.profileDir, DATAREPORTING_DIR, PINGS_ARCHIVE_DIR);
+});
+
+// Files that have been lying around for longer than MAX_PING_FILE_AGE are
+// deleted without being loaded.
+const MAX_PING_FILE_AGE = 14 * 24 * 60 * 60 * 1000; // 2 weeks
+
+// Files that are older than OVERDUE_PING_FILE_AGE, but younger than
+// MAX_PING_FILE_AGE indicate that we need to send all of our pings ASAP.
+const OVERDUE_PING_FILE_AGE = 7 * 24 * 60 * 60 * 1000; // 1 week
+
+// Maximum number of pings to save.
+const MAX_LRU_PINGS = 50;
+
+// The number of outstanding saved pings that we have issued loading
+// requests for.
+let pingsLoaded = 0;
+
+// The number of pings that we have destroyed due to being older
+// than MAX_PING_FILE_AGE.
+let pingsDiscarded = 0;
+
+// The number of pings that are older than OVERDUE_PING_FILE_AGE
+// but younger than MAX_PING_FILE_AGE.
+let pingsOverdue = 0;
+
+// Data that has neither been saved nor sent by ping
+let pendingPings = [];
+
+let isPingDirectoryCreated = false;
+
+this.TelemetryStorage = {
+  get MAX_PING_FILE_AGE() {
+    return MAX_PING_FILE_AGE;
+  },
+
+  get OVERDUE_PING_FILE_AGE() {
+    return OVERDUE_PING_FILE_AGE;
+  },
+
+  get MAX_LRU_PINGS() {
+    return MAX_LRU_PINGS;
+  },
+
+  get pingDirectoryPath() {
+    return OS.Path.join(OS.Constants.Path.profileDir, "saved-telemetry-pings");
+  },
+
+  /**
+   * Save an archived ping to disk.
+   *
+   * @param {object} ping The ping data to archive.
+   * @return {promise} Promise that is resolved when the ping is successfully archived.
+   */
+  saveArchivedPing: function(ping) {
+    return TelemetryStorageImpl.saveArchivedPing(ping);
+  },
+
+  /**
+   * Load an archived ping from disk.
+   *
+   * @param {string} id The pings id.
+   * @param {number} timestampCreated The pings creation timestamp.
+   * @param {string} type The pings type.
+   * @return {promise<object>} Promise that is resolved with the ping data.
+   */
+  loadArchivedPing: function(id, timestampCreated, type) {
+    return TelemetryStorageImpl.loadArchivedPing(id, timestampCreated, type);
+  },
+
+  /**
+   * Get a list of info on the archived pings.
+   * This will scan the archive directory and grab basic data about the existing
+   * pings out of their filename.
+   *
+   * @return {promise<sequence<object>>}
+   */
+  loadArchivedPingList: function() {
+    return TelemetryStorageImpl.loadArchivedPingList();
+  },
+
+  /**
+   * Save a single ping to a file.
+   *
+   * @param {object} ping The content of the ping to save.
+   * @param {string} file The destination file.
+   * @param {bool} overwrite If |true|, the file will be overwritten if it exists,
+   * if |false| the file will not be overwritten and no error will be reported if
+   * the file exists.
+   * @returns {promise}
+   */
+  savePingToFile: function(ping, file, overwrite) {
+    return TelemetryStorageImpl.savePingToFile(ping, file, overwrite);
+  },
+
+  /**
+   * Save a ping to its file.
+   *
+   * @param {object} ping The content of the ping to save.
+   * @param {bool} overwrite If |true|, the file will be overwritten
+   * if it exists.
+   * @returns {promise}
+   */
+  savePing: function(ping, overwrite) {
+    return TelemetryStorageImpl.savePing(ping, overwrite);
+  },
+
+  /**
+   * Save all pending pings.
+   *
+   * @param {object} sessionPing The additional session ping.
+   * @returns {promise}
+   */
+  savePendingPings: function(sessionPing) {
+    return TelemetryStorageImpl.savePendingPings(sessionPing);
+  },
+
+  /**
+   * Add a ping to the saved pings directory so that it gets along with other pings. Note
+   * that the original ping file will not be modified.
+   *
+   * @param {String} aFilePath The path to the ping file that needs to be added to the
+   *                           saved pings directory.
+   * @return {Promise} A promise resolved when the ping is saved to the pings directory.
+   */
+  addPendingPing: function(aPingPath) {
+    return TelemetryStorageImpl.addPendingPing(aPingPath);
+  },
+
+  /**
+   * Remove the file for a ping
+   *
+   * @param {object} ping The ping.
+   * @returns {promise}
+   */
+  cleanupPingFile: function(ping) {
+    return TelemetryStorageImpl.cleanupPingFile(ping);
+  },
+
+  /**
+   * Load all saved pings.
+   *
+   * Once loaded, the saved pings can be accessed (destructively only)
+   * through |popPendingPings|.
+   *
+   * @returns {promise}
+   */
+  loadSavedPings: function() {
+    return TelemetryStorageImpl.loadSavedPings();
+  },
+
+  /**
+   * Load the histograms from a file.
+   *
+   * Once loaded, the saved pings can be accessed (destructively only)
+   * through |popPendingPings|.
+   *
+   * @param {string} file The file to load.
+   * @returns {promise}
+   */
+  loadHistograms: function loadHistograms(file) {
+    return TelemetryStorageImpl.loadHistograms(file);
+  },
+
+  /**
+   * The number of pings loaded since the beginning of time.
+   */
+  get pingsLoaded() {
+    return TelemetryStorageImpl.pingsLoaded;
+  },
+
+  /**
+   * The number of pings loaded that are older than OVERDUE_PING_FILE_AGE
+   * but younger than MAX_PING_FILE_AGE.
+   */
+  get pingsOverdue() {
+    return TelemetryStorageImpl.pingsOverdue;
+  },
+
+  /**
+   * The number of pings that we just tossed out for being older than
+   * MAX_PING_FILE_AGE.
+   */
+  get pingsDiscarded() {
+    return TelemetryStorageImpl.pingsDiscarded;
+  },
+
+  /**
+   * Iterate destructively through the pending pings.
+   *
+   * @return {iterator}
+   */
+  popPendingPings: function*() {
+    while (pendingPings.length > 0) {
+      let data = pendingPings.pop();
+      yield data;
+    }
+  },
+
+  testLoadHistograms: function(file) {
+    return TelemetryStorageImpl.testLoadHistograms(file);
+  },
+
+  /**
+   * Loads a ping file.
+   * @param {String} aFilePath The path of the ping file.
+   * @return {Promise<Object>} A promise resolved with the ping content or rejected if the
+   *                           ping contains invalid data.
+   */
+  loadPingFile: Task.async(function* (aFilePath) {
+    return TelemetryStorageImpl.loadPingFile(aFilePath);
+  }),
+};
+
+let TelemetryStorageImpl = {
+  _logger: null,
+
+  get _log() {
+    if (!this._logger) {
+      this._logger = Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX);
+    }
+
+    return this._logger;
+  },
+
+  /**
+   * Save an archived ping to disk.
+   *
+   * @param {object} ping The ping data to archive.
+   * @return {promise} Promise that is resolved when the ping is successfully archived.
+   */
+  saveArchivedPing: Task.async(function*(ping) {
+    const creationDate = new Date(ping.creationDate);
+    const filePath = getArchivedPingPath(ping.id, creationDate, ping.type);
+    yield OS.File.makeDir(OS.Path.dirname(filePath), { ignoreExisting: true,
+                                                       from: OS.Constants.Path.profileDir });
+    yield TelemetryStorage.savePingToFile(ping, filePath, true);
+  }),
+
+  /**
+   * Load an archived ping from disk.
+   *
+   * @param {string} id The pings id.
+   * @param {number} timestampCreated The pings creation timestamp.
+   * @param {string} type The pings type.
+   * @return {promise<object>} Promise that is resolved with the ping data.
+   */
+  loadArchivedPing: function(id, timestampCreated, type) {
+    this._log.trace("loadArchivedPing - id: " + id + ", timestampCreated: " + timestampCreated + ", type: " + type);
+    const path = getArchivedPingPath(id, new Date(timestampCreated), type);
+    this._log.trace("loadArchivedPing - loading ping from: " + path);
+    return this.loadPingFile(path);
+  },
+
+  /**
+   * Remove an archived ping from disk.
+   *
+   * @param {string} id The pings id.
+   * @param {number} timestampCreated The pings creation timestamp.
+   * @param {string} type The pings type.
+   * @return {promise<object>} Promise that is resolved when the pings is removed.
+   */
+  _removeArchivedPing: function(id, timestampCreated, type) {
+    this._log.trace("_removeArchivedPing - id: " + id + ", timestampCreated: " + timestampCreated + ", type: " + type);
+    const path = getArchivedPingPath(id, new Date(timestampCreated), type);
+    this._log.trace("_removeArchivedPing - removing ping from: " + path);
+    return OS.File.remove(path);
+  },
+
+  /**
+   * Get a list of info on the archived pings.
+   * This will scan the archive directory and grab basic data about the existing
+   * pings out of their filename.
+   *
+   * @return {promise<sequence<object>>}
+   */
+  loadArchivedPingList: Task.async(function*() {
+    this._log.trace("loadArchivedPingList");
+
+    if (!(yield OS.File.exists(gPingsArchivePath))) {
+      return new Map();
+    }
+
+    let archivedPings = new Map();
+    let dirIterator = new OS.File.DirectoryIterator(gPingsArchivePath);
+    let subdirs = (yield dirIterator.nextBatch()).filter(e => e.isDir);
+
+    // Walk through the monthly subdirs of the form <YYYY-MM>/
+    for (let dir of subdirs) {
+      const dirRegEx = /^[0-9]{4}-[0-9]{2}$/;
+      if (!dirRegEx.test(dir.name)) {
+        this._log.warn("loadArchivedPingList - skipping invalidly named subdirectory " + dir.path);
+        continue;
+      }
+
+      this._log.trace("loadArchivedPingList - checking in subdir: " + dir.path);
+      let pingIterator = new OS.File.DirectoryIterator(dir.path);
+      let pings = (yield pingIterator.nextBatch()).filter(e => !e.isDir);
+
+      // Now process any ping files of the form "<timestamp>.<uuid>.<type>.json"
+      for (let p of pings) {
+        // data may be null if the filename doesn't match the above format.
+        let data = this._getArchivedPingDataFromFileName(p.name);
+        if (!data) {
+          continue;
+        }
+
+        // In case of conflicts, overwrite only with newer pings.
+        if (archivedPings.has(data.id)) {
+          const overwrite = data.timestamp > archivedPings.get(data.id).timestampCreated;
+          this._log.warn("loadArchivedPingList - have seen this id before: " + data.id +
+                         ", overwrite: " + overwrite);
+          if (!overwrite) {
+            continue;
+          }
+
+          yield this._removeArchivedPing(data.id, data.timestampCreated, data.type)
+                    .catch((e) => this._log.warn("loadArchivedPingList - failed to remove ping", e));
+        }
+
+        archivedPings.set(data.id, {
+          timestampCreated: data.timestamp,
+          type: data.type,
+        });
+      }
+    }
+
+    return archivedPings;
+  }),
+
+  /**
+   * Save a single ping to a file.
+   *
+   * @param {object} ping The content of the ping to save.
+   * @param {string} file The destination file.
+   * @param {bool} overwrite If |true|, the file will be overwritten if it exists,
+   * if |false| the file will not be overwritten and no error will be reported if
+   * the file exists.
+   * @returns {promise}
+   */
+  savePingToFile: function(ping, filePath, overwrite) {
+    return Task.spawn(function*() {
+      try {
+        let pingString = JSON.stringify(ping);
+        yield OS.File.writeAtomic(filePath, pingString, {tmpPath: filePath + ".tmp",
+                                  noOverwrite: !overwrite});
+      } catch(e if e.becauseExists) {
+      }
+    })
+  },
+
+  /**
+   * Save a ping to its file.
+   *
+   * @param {object} ping The content of the ping to save.
+   * @param {bool} overwrite If |true|, the file will be overwritten
+   * if it exists.
+   * @returns {promise}
+   */
+  savePing: function(ping, overwrite) {
+    return Task.spawn(function*() {
+      yield getPingDirectory();
+      let file = pingFilePath(ping);
+      yield this.savePingToFile(ping, file, overwrite);
+    }.bind(this));
+  },
+
+  /**
+   * Save all pending pings.
+   *
+   * @param {object} sessionPing The additional session ping.
+   * @returns {promise}
+   */
+  savePendingPings: function(sessionPing) {
+    let p = pendingPings.reduce((p, ping) => {
+      // Restore the files with the previous pings if for some reason they have
+      // been deleted, don't overwrite them otherwise.
+      p.push(this.savePing(ping, false));
+      return p;}, [this.savePing(sessionPing, true)]);
+
+    pendingPings = [];
+    return Promise.all(p);
+  },
+
+  /**
+   * Add a ping to the saved pings directory so that it gets along with other pings. Note
+   * that the original ping file will not be modified.
+   *
+   * @param {String} aFilePath The path to the ping file that needs to be added to the
+   *                           saved pings directory.
+   * @return {Promise} A promise resolved when the ping is saved to the pings directory.
+   */
+  addPendingPing: function(aPingPath) {
+    // Pings in the saved ping directory need to have the ping id or slug (old format) as
+    // the file name. We load the ping content, check that it is valid, and use it to save
+    // the ping file with the correct file name.
+    return this.loadPingFile(aPingPath).then(ping => {
+        // Append the ping to the pending list.
+        pendingPings.push(ping);
+        // Since we read a ping successfully, update the related histogram.
+        Telemetry.getHistogramById("READ_SAVED_PING_SUCCESS").add(1);
+        // Save the ping to the saved pings directory.
+        return this.savePing(ping, false);
+      });
+  },
+
+  /**
+   * Remove the file for a ping
+   *
+   * @param {object} ping The ping.
+   * @returns {promise}
+   */
+  cleanupPingFile: function(ping) {
+    return OS.File.remove(pingFilePath(ping));
+  },
+
+  /**
+   * Load all saved pings.
+   *
+   * Once loaded, the saved pings can be accessed (destructively only)
+   * through |popPendingPings|.
+   *
+   * @returns {promise}
+   */
+  loadSavedPings: function() {
+    return Task.spawn(function*() {
+      let directory = TelemetryStorage.pingDirectoryPath;
+      let iter = new OS.File.DirectoryIterator(directory);
+      let exists = yield iter.exists();
+
+      if (exists) {
+        let entries = yield iter.nextBatch();
+        let sortedEntries = [];
+
+        for (let entry of entries) {
+          if (entry.isDir) {
+            continue;
+          }
+
+          let info = yield OS.File.stat(entry.path);
+          sortedEntries.push({entry:entry, lastModificationDate: info.lastModificationDate});
+        }
+
+        sortedEntries.sort(function compare(a, b) {
+          return b.lastModificationDate - a.lastModificationDate;
+        });
+
+        let count = 0;
+        let result = [];
+
+        // Keep only the last MAX_LRU_PINGS entries to avoid that the backlog overgrows.
+        for (let i = 0; i < MAX_LRU_PINGS && i < sortedEntries.length; i++) {
+          let entry = sortedEntries[i].entry;
+          result.push(this.loadHistograms(entry.path))
+        }
+
+        for (let i = MAX_LRU_PINGS; i < sortedEntries.length; i++) {
+          let entry = sortedEntries[i].entry;
+          OS.File.remove(entry.path);
+        }
+
+        yield Promise.all(result);
+
+        Services.telemetry.getHistogramById('TELEMETRY_FILES_EVICTED').
+          add(sortedEntries.length - MAX_LRU_PINGS);
+      }
+
+      yield iter.close();
+    }.bind(this));
+  },
+
+  /**
+   * Load the histograms from a file.
+   *
+   * Once loaded, the saved pings can be accessed (destructively only)
+   * through |popPendingPings|.
+   *
+   * @param {string} file The file to load.
+   * @returns {promise}
+   */
+  loadHistograms: function loadHistograms(file) {
+    return OS.File.stat(file).then(function(info){
+      let now = Date.now();
+      if (now - info.lastModificationDate > MAX_PING_FILE_AGE) {
+        // We haven't had much luck in sending this file; delete it.
+        pingsDiscarded++;
+        return OS.File.remove(file);
+      }
+
+      // This file is a bit stale, and overdue for sending.
+      if (now - info.lastModificationDate > OVERDUE_PING_FILE_AGE) {
+        pingsOverdue++;
+      }
+
+      pingsLoaded++;
+      return addToPendingPings(file);
+    });
+  },
+
+  /**
+   * The number of pings loaded since the beginning of time.
+   */
+  get pingsLoaded() {
+    return pingsLoaded;
+  },
+
+  /**
+   * The number of pings loaded that are older than OVERDUE_PING_FILE_AGE
+   * but younger than MAX_PING_FILE_AGE.
+   */
+  get pingsOverdue() {
+    return pingsOverdue;
+  },
+
+  /**
+   * The number of pings that we just tossed out for being older than
+   * MAX_PING_FILE_AGE.
+   */
+  get pingsDiscarded() {
+    return pingsDiscarded;
+  },
+
+  testLoadHistograms: function(file) {
+    pingsLoaded = 0;
+    return this.loadHistograms(file.path);
+  },
+
+  /**
+   * Loads a ping file.
+   * @param {String} aFilePath The path of the ping file.
+   * @return {Promise<Object>} A promise resolved with the ping content or rejected if the
+   *                           ping contains invalid data.
+   */
+  loadPingFile: Task.async(function* (aFilePath) {
+    let array = yield OS.File.read(aFilePath);
+    let decoder = new TextDecoder();
+    let string = decoder.decode(array);
+
+    let ping = JSON.parse(string);
+    // The ping's payload used to be stringified JSON.  Deal with that.
+    if (typeof(ping.payload) == "string") {
+      ping.payload = JSON.parse(ping.payload);
+    }
+    return ping;
+  }),
+
+  /**
+   * Archived pings are saved with file names of the form:
+   * "<timestamp>.<uuid>.<type>.json"
+   * This helper extracts that data from a given filename.
+   *
+   * @param fileName {String} The filename.
+   * @return {Object} Null if the filename didn't match the expected form.
+   *                  Otherwise an object with the extracted data in the form:
+   *                  { timestamp: <number>,
+   *                    id: <string>,
+   *                    type: <string> }
+   */
+  _getArchivedPingDataFromFileName: function(fileName) {
+    // Extract the parts.
+    let parts = fileName.split(".");
+    if (parts.length != 4) {
+      this._log.trace("_getArchivedPingDataFromFileName - should have 4 parts");
+      return null;
+    }
+
+    let [timestamp, uuid, type, extension] = parts;
+    if (extension != "json") {
+      this._log.trace("_getArchivedPingDataFromFileName - should have a 'json' extension");
+      return null;
+    }
+
+    // Check for a valid timestamp.
+    timestamp = parseInt(timestamp);
+    if (Number.isNaN(timestamp)) {
+      this._log.trace("_getArchivedPingDataFromFileName - should have a valid timestamp");
+      return null;
+    }
+
+    // Check for a valid UUID.
+    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    if (!uuidRegex.test(uuid)) {
+      this._log.trace("_getArchivedPingDataFromFileName - should have a valid id");
+      return null;
+    }
+
+    // Check for a valid type string.
+    const typeRegex = /^[a-z0-9][a-z0-9-]+[a-z0-9]$/i;
+    if (!typeRegex.test(type)) {
+      this._log.trace("_getArchivedPingDataFromFileName - should have a valid type");
+      return null;
+    }
+
+    return {
+      timestamp: timestamp,
+      id: uuid,
+      type: type,
+    };
+  },
+};
+
+///// Utility functions
+
+function pingFilePath(ping) {
+  // Support legacy ping formats, who don't have an "id" field, but a "slug" field.
+  let pingIdentifier = (ping.slug) ? ping.slug : ping.id;
+  return OS.Path.join(TelemetryStorage.pingDirectoryPath, pingIdentifier);
+}
+
+function getPingDirectory() {
+  return Task.spawn(function*() {
+    let directory = TelemetryStorage.pingDirectoryPath;
+
+    if (!isPingDirectoryCreated) {
+      yield OS.File.makeDir(directory, { unixMode: OS.Constants.S_IRWXU });
+      isPingDirectoryCreated = true;
+    }
+
+    return directory;
+  });
+}
+
+function addToPendingPings(file) {
+  function onLoad(success) {
+    let success_histogram = Telemetry.getHistogramById("READ_SAVED_PING_SUCCESS");
+    success_histogram.add(success);
+  }
+
+  return TelemetryStorage.loadPingFile(file).then(ping => {
+      pendingPings.push(ping);
+      onLoad(true);
+    },
+    () => {
+      onLoad(false);
+      return OS.File.remove(file);
+    });
+}
+
+/**
+ * Build the path to the archived ping.
+ * @param {String} aPingId The ping id.
+ * @param {Object} aDate The ping creation date.
+ * @param {String} aType The ping type.
+ * @return {String} The full path to the archived ping.
+ */
+function getArchivedPingPath(aPingId, aDate, aType) {
+  // Helper to pad the month to 2 digits, if needed (e.g. "1" -> "01").
+  let addLeftPadding = value => (value < 10) ? ("0" + value) : value;
+  // Get the ping creation date and generate the archive directory to hold it. Note
+  // that getMonth returns a 0-based month, so we need to add an offset.
+  let archivedPingDir = OS.Path.join(gPingsArchivePath,
+    aDate.getFullYear() + '-' + addLeftPadding(aDate.getMonth() + 1));
+  // Generate the archived ping file path as YYYY-MM/<TIMESTAMP>.UUID.type.json
+  let fileName = [aDate.getTime(), aPingId, aType, "json"].join(".");
+  return OS.Path.join(archivedPingDir, fileName);
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/head.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/head.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/head.js	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/head.js	2015-04-24 19:31:11.000000000 +0000
@@ -140,8 +140,8 @@
  *
  * @return Date The new faked date.
  */
-function fakeNow(...arguments) {
-  const date = new Date(...arguments);
+function fakeNow(...args) {
+  const date = new Date(...args);
 
   let ping = Cu.import("resource://gre/modules/TelemetryPing.jsm");
   ping.Policy.now = () => date;
@@ -162,9 +162,18 @@
   return Math.floor(aMsec / MILLISECONDS_PER_DAY);
 }
 
+// Returns a promise that resolves to true when the passed promise rejects,
+// false otherwise.
+function promiseRejects(promise) {
+  return promise.then(() => false, () => true);
+}
+
 // Set logging preferences for all the tests.
 Services.prefs.setCharPref("toolkit.telemetry.log.level", "Trace");
 TelemetryPing.initLogging();
 
+// Telemetry archiving should be on.
+Services.prefs.setBoolPref("toolkit.telemetry.archive.enabled", true);
+
 // Avoid timers interrupting test behavior.
 fakeSchedulerTimer(() => {}, () => {});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/test_PingAPI.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/test_PingAPI.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/test_PingAPI.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/test_PingAPI.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,129 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/
+*/
+
+// This tests the public Telemetry API for submitting pings.
+
+"use strict";
+
+Cu.import("resource://gre/modules/TelemetryPing.jsm", this);
+Cu.import("resource://gre/modules/TelemetryArchive.jsm", this);
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/osfile.jsm", this);
+Cu.import("resource://gre/modules/Task.jsm", this);
+Cu.import("resource://gre/modules/Services.jsm", this);
+
+XPCOMUtils.defineLazyGetter(this, "gPingsArchivePath", function() {
+  return OS.Path.join(OS.Constants.Path.profileDir, "datareporting", "archived");
+});
+
+
+function run_test() {
+  do_get_profile(true);
+  run_next_test();
+}
+
+add_task(function* test_archivedPings() {
+  yield TelemetryPing.setup();
+
+  const PINGS = [
+    {
+      type: "test-ping-api-1",
+      payload: { foo: "bar"},
+      dateCreated: new Date(2010, 1, 1, 10, 0, 0),
+    },
+    {
+      type: "test-ping-api-2",
+      payload: { moo: "meh"},
+      dateCreated: new Date(2010, 2, 1, 10, 0, 0),
+    },
+  ];
+
+  // Submit pings and check the ping list.
+  let expectedPingList = [];
+
+  for (let data of PINGS) {
+    fakeNow(data.dateCreated);
+    data.id = yield TelemetryPing.send(data.type, data.payload);
+    let list = yield TelemetryArchive.promiseArchivedPingList();
+
+    expectedPingList.push({
+      id: data.id,
+      type: data.type,
+      timestampCreated: data.dateCreated.getTime(),
+    });
+    Assert.deepEqual(list, expectedPingList, "Archived ping list should contain submitted pings");
+  }
+
+  // Check loading the archived pings.
+  let ids = [for (p of PINGS) p.id];
+  let checkLoadingPings = Task.async(function*() {
+    for (let data of PINGS) {
+      let ping = yield TelemetryArchive.promiseArchivedPingById(data.id);
+      Assert.equal(ping.id, data.id, "Archived ping should have matching id");
+      Assert.equal(ping.type, data.type, "Archived ping should have matching type");
+      Assert.equal(ping.creationDate, data.dateCreated.toISOString(),
+                   "Archived ping should have matching creation date");
+    }
+  });
+
+  yield checkLoadingPings();
+
+  // Check that we find the archived pings again by scanning after a restart.
+  yield TelemetryPing.setup();
+
+  let pingList = yield TelemetryArchive.promiseArchivedPingList();
+  Assert.deepEqual(expectedPingList, pingList,
+                   "Should have submitted pings in archive list after restart");
+  yield checkLoadingPings();
+
+  // Write invalid pings into the archive with both valid and invalid names.
+  let writeToArchivedDir = Task.async(function*(dirname, filename, content) {
+    const dirPath = OS.Path.join(gPingsArchivePath, dirname);
+    yield OS.File.makeDir(dirPath, { ignoreExisting: true });
+    const filePath = OS.Path.join(dirPath, filename);
+    const options = { tmpPath: filePath + ".tmp", noOverwrite: false };
+    yield OS.File.writeAtomic(filePath, content, options);
+  });
+
+  const FAKE_ID1 = "10000000-0123-0123-0123-0123456789a1";
+  const FAKE_ID2 = "20000000-0123-0123-0123-0123456789a2";
+  const FAKE_TYPE = "foo"
+
+  // These should get rejected.
+  yield writeToArchivedDir("xx", "foo.json", "{}");
+  yield writeToArchivedDir("2010-02", "xx.xx.xx.json", "{}");
+  // This one should get picked up...
+  yield writeToArchivedDir("2010-02", "1." + FAKE_ID1 + "." + FAKE_TYPE + ".json", "{}");
+  // ... but get overwritten by this one.
+  yield writeToArchivedDir("2010-02", "2." + FAKE_ID1 + "." + FAKE_TYPE + ".json", "");
+  // This should get picked up fine.
+  yield writeToArchivedDir("2010-02", "3." + FAKE_ID2 + "." + FAKE_TYPE + ".json", "");
+
+  expectedPingList.push({
+    id: FAKE_ID1,
+    type: "foo",
+    timestampCreated: 2,
+  });
+  expectedPingList.push({
+    id: FAKE_ID2,
+    type: "foo",
+    timestampCreated: 3,
+  });
+  expectedPingList.sort((a, b) => a.timestampCreated - b.timestampCreated);
+
+  // Reset the TelemetryArchive so we scan the archived dir again.
+  yield TelemetryArchive._testReset();
+
+  // Check that we are still picking up the valid archived pings on disk,
+  // plus the valid ones above.
+  pingList = yield TelemetryArchive.promiseArchivedPingList();
+  Assert.deepEqual(expectedPingList, pingList, "Should have picked up valid archived pings");
+  yield checkLoadingPings();
+
+  // Now check that we fail to load the two invalid pings from above.
+  Assert.ok((yield promiseRejects(TelemetryArchive.promiseArchivedPingById(FAKE_ID1))),
+            "Should have rejected invalid ping");
+  Assert.ok((yield promiseRejects(TelemetryArchive.promiseArchivedPingById(FAKE_ID2))),
+            "Should have rejected invalid ping");
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing_idle.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing_idle.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing_idle.js	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing_idle.js	2015-04-24 19:31:11.000000000 +0000
@@ -7,7 +7,7 @@
 Cu.import("resource://gre/modules/PromiseUtils.jsm", this);
 Cu.import("resource://gre/modules/Services.jsm", this);
 Cu.import("resource://gre/modules/Task.jsm", this);
-Cu.import("resource://gre/modules/TelemetryFile.jsm", this);
+Cu.import("resource://gre/modules/TelemetryStorage.jsm", this);
 Cu.import("resource://gre/modules/TelemetryPing.jsm", this);
 Cu.import("resource://gre/modules/TelemetrySession.jsm", this);
 
@@ -39,7 +39,7 @@
     application: {},
     payload: {},
   };
-  yield TelemetryFile.savePing(PENDING_PING, true);
+  yield TelemetryStorage.savePing(PENDING_PING, true);
 
   // Telemetry will not send this ping at startup, because it's not overdue.
   yield TelemetryPing.setup();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js	2015-04-24 19:31:11.000000000 +0000
@@ -13,7 +13,8 @@
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/TelemetryPing.jsm", this);
-Cu.import("resource://gre/modules/TelemetryFile.jsm", this);
+Cu.import("resource://gre/modules/TelemetryStorage.jsm", this);
+Cu.import("resource://gre/modules/TelemetryArchive.jsm", this);
 Cu.import("resource://gre/modules/Task.jsm", this);
 Cu.import("resource://gre/modules/Promise.jsm", this);
 Cu.import("resource://gre/modules/Preferences.jsm");
@@ -39,11 +40,6 @@
 let gRequestIterator = null;
 let gClientID = null;
 
-function getArchiveFilename(uuid, date, type) {
-  let ping = Cu.import("resource://gre/modules/TelemetryPing.jsm");
-  return ping.getArchivedPingPath(uuid, date, type);
-}
-
 function sendPing(aSendClientId, aSendEnvironment) {
   if (gServerStarted) {
     TelemetryPing.setServer("http://localhost:" + gHttpServer.identity.primaryPort);
@@ -155,9 +151,9 @@
 // Ensure that not overwriting an existing file fails silently
 add_task(function* test_overwritePing() {
   let ping = {id: "foo"}
-  yield TelemetryFile.savePing(ping, true);
-  yield TelemetryFile.savePing(ping, false);
-  yield TelemetryFile.cleanupPingFile(ping);
+  yield TelemetryStorage.savePing(ping, true);
+  yield TelemetryStorage.savePing(ping, false);
+  yield TelemetryStorage.cleanupPingFile(ping);
 });
 
 // Sends a ping to a non existing server.
@@ -240,18 +236,17 @@
   registerPingHandler(() => Assert.ok(false, "Telemetry must not send pings if not allowed to."));
   let pingId = yield sendPing(true, true);
 
-  // Check that the ping was persisted to the pings archive, even with upload disabled.
-  let pingPath = getArchiveFilename(pingId, now, TEST_PING_TYPE);
-  Assert.ok((yield OS.File.exists(pingPath)),
-            "TelemetryPing must archive pings if FHR is enabled.");
+  // Check that the ping was archived, even with upload disabled.
+  let ping = yield TelemetryArchive.promiseArchivedPingById(pingId);
+  Assert.equal(ping.id, pingId, "TelemetryPing must archive pings if FHR is enabled.");
 
   // Check that pings don't get archived if not allowed to.
   now = new Date(2010, 10, 18, 12, 0, 0);
   fakeNow(now);
   Preferences.set(PREF_ARCHIVE_ENABLED, false);
   pingId = yield sendPing(true, true);
-  pingPath = getArchiveFilename(pingId, now, TEST_PING_TYPE);
-  Assert.ok(!(yield OS.File.exists(pingPath)),
+  let promise = TelemetryArchive.promiseArchivedPingById(pingId);
+  Assert.ok((yield promiseRejects(promise)),
             "TelemetryPing must not archive pings if the archive pref is disabled.");
 
   // Enable archiving and the upload so that pings get sent and archived again.
@@ -266,9 +261,8 @@
 
   // Check that we archive pings when successfully sending them.
   yield gRequestIterator.next();
-  pingPath = getArchiveFilename(pingId, now, TEST_PING_TYPE);
-  Assert.ok((yield OS.File.exists(pingPath)),
-            "TelemetryPing must archive pings if FHR is enabled.");
+  ping = yield TelemetryArchive.promiseArchivedPingById(pingId);
+  Assert.equal(ping.id, pingId, "TelemetryPing must archive pings if FHR is enabled.");
 });
 
 add_task(function* stopServer(){
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js	2015-04-24 19:31:11.000000000 +0000
@@ -16,7 +16,7 @@
 Cu.import("resource://gre/modules/Services.jsm", this);
 Cu.import("resource://testing-common/httpd.js", this);
 Cu.import("resource://gre/modules/Promise.jsm", this);
-Cu.import("resource://gre/modules/TelemetryFile.jsm", this);
+Cu.import("resource://gre/modules/TelemetryStorage.jsm", this);
 Cu.import("resource://gre/modules/TelemetryPing.jsm", this);
 Cu.import("resource://gre/modules/Task.jsm", this);
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -27,12 +27,12 @@
           .getService(Ci.nsISupports)
           .wrappedJSObject);
 
-// We increment TelemetryFile's MAX_PING_FILE_AGE and
+// We increment TelemetryStorage's MAX_PING_FILE_AGE and
 // OVERDUE_PING_FILE_AGE by 1 minute so that our test pings exceed
 // those points in time, even taking into account file system imprecision.
 const ONE_MINUTE_MS = 60 * 1000;
-const EXPIRED_PING_FILE_AGE = TelemetryFile.MAX_PING_FILE_AGE + ONE_MINUTE_MS;
-const OVERDUE_PING_FILE_AGE = TelemetryFile.OVERDUE_PING_FILE_AGE + ONE_MINUTE_MS;
+const EXPIRED_PING_FILE_AGE = TelemetryStorage.MAX_PING_FILE_AGE + ONE_MINUTE_MS;
+const OVERDUE_PING_FILE_AGE = TelemetryStorage.OVERDUE_PING_FILE_AGE + ONE_MINUTE_MS;
 
 const PING_SAVE_FOLDER = "saved-telemetry-pings";
 const PING_TIMEOUT_LENGTH = 5000;
@@ -40,7 +40,7 @@
 const OVERDUE_PINGS = 6;
 const OLD_FORMAT_PINGS = 4;
 const RECENT_PINGS = 4;
-const LRU_PINGS = TelemetryFile.MAX_LRU_PINGS;
+const LRU_PINGS = TelemetryStorage.MAX_LRU_PINGS;
 
 const TOTAL_EXPECTED_PINGS = OVERDUE_PINGS + RECENT_PINGS + OLD_FORMAT_PINGS;
 
@@ -164,9 +164,9 @@
  * Reset Telemetry state.
  */
 function resetTelemetry() {
-  // Quick and dirty way to clear TelemetryFile's pendingPings
+  // Quick and dirty way to clear TelemetryStorage's pendingPings
   // collection, and put it back in its initial state.
-  let gen = TelemetryFile.popPendingPings();
+  let gen = TelemetryStorage.popPendingPings();
   for (let item of gen) {};
 }
 
@@ -202,7 +202,7 @@
 add_task(function* setupEnvironment() {
   yield TelemetryPing.setup();
 
-  let directory = TelemetryFile.pingDirectoryPath;
+  let directory = TelemetryStorage.pingDirectoryPath;
   yield File.makeDir(directory, { ignoreExisting: true, unixMode: OS.Constants.S_IRWXU });
 
   yield resetTelemetry();
@@ -246,7 +246,7 @@
   let tail = pings.slice(-3);
 
   yield startTelemetry();
-  let gen = TelemetryFile.popPendingPings();
+  let gen = TelemetryStorage.popPendingPings();
 
   for (let item of gen) {
     for (let id of tail) {
@@ -308,10 +308,10 @@
   ];
 
   // Write the ping to file and make it overdue.
-  yield TelemetryFile.savePing(PING_OLD_FORMAT, true);
-  yield TelemetryFile.savePing(PING_NO_INFO, true);
-  yield TelemetryFile.savePing(PING_NO_PAYLOAD, true);
-  yield TelemetryFile.savePingToFile(PING_NO_SLUG, PING_FILES_PATHS[3], true);
+  yield TelemetryStorage.savePing(PING_OLD_FORMAT, true);
+  yield TelemetryStorage.savePing(PING_NO_INFO, true);
+  yield TelemetryStorage.savePing(PING_NO_PAYLOAD, true);
+  yield TelemetryStorage.savePingToFile(PING_NO_SLUG, PING_FILES_PATHS[3], true);
 
   for (let f in PING_FILES_PATHS) {
     yield File.setDates(PING_FILES_PATHS[f], null, Date.now() - OVERDUE_PING_FILE_AGE);
@@ -320,7 +320,7 @@
   yield startTelemetry();
   assertReceivedPings(OLD_FORMAT_PINGS);
 
-  // |TelemetryFile.cleanup| doesn't know how to remove a ping with no slug or id,
+  // |TelemetryStorage.cleanup| doesn't know how to remove a ping with no slug or id,
   // so remove it manually so that the next test doesn't fail.
   yield OS.File.remove(PING_FILES_PATHS[3]);
 
@@ -379,7 +379,7 @@
     Path.join(Constants.Path.profileDir, PING_SAVE_FOLDER, PING_OLD_FORMAT.slug);
 
   // Write the ping to file and make it overdue.
-  yield TelemetryFile.savePing(PING_OLD_FORMAT, true);
+  yield TelemetryStorage.savePing(PING_OLD_FORMAT, true);
   yield File.setDates(filePath, null, Date.now() - OVERDUE_PING_FILE_AGE);
 
   let receivedPings = 0;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js	2015-04-24 19:31:11.000000000 +0000
@@ -16,7 +16,7 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/TelemetryPing.jsm", this);
 Cu.import("resource://gre/modules/TelemetrySession.jsm", this);
-Cu.import("resource://gre/modules/TelemetryFile.jsm", this);
+Cu.import("resource://gre/modules/TelemetryStorage.jsm", this);
 Cu.import("resource://gre/modules/TelemetryEnvironment.jsm", this);
 Cu.import("resource://gre/modules/Task.jsm", this);
 Cu.import("resource://gre/modules/Promise.jsm", this);
@@ -499,14 +499,14 @@
   do_check_eq(TelemetrySession.getPayload()["histograms"]["TELEMETRY_TEST_EXPIRED"], undefined);
 });
 
-// Checks that an invalid histogram file is deleted if TelemetryFile fails to parse it.
+// Checks that an invalid histogram file is deleted if TelemetryStorage fails to parse it.
 add_task(function* test_runInvalidJSON() {
   let pingFile = getSavedPingFile("invalid-histograms.dat");
 
   writeStringToFile(pingFile, "this.is.invalid.JSON");
   do_check_true(pingFile.exists());
 
-  yield TelemetryFile.testLoadHistograms(pingFile);
+  yield TelemetryStorage.testLoadHistograms(pingFile);
   do_check_false(pingFile.exists());
 });
 
@@ -568,7 +568,7 @@
 
   setupTestData();
   yield TelemetrySession.testSaveHistograms(histogramsFile);
-  yield TelemetryFile.testLoadHistograms(histogramsFile);
+  yield TelemetryStorage.testLoadHistograms(histogramsFile);
   yield sendPing();
 
   // Get requests received by dummy server.
@@ -1127,7 +1127,7 @@
   let mtime = histogramsFile.lastModifiedTime;
   histogramsFile.lastModifiedTime = mtime - (14 * 24 * 60 * 60 * 1000 + 60000); // 14 days, 1m
 
-  yield TelemetryFile.testLoadHistograms(histogramsFile);
+  yield TelemetryStorage.testLoadHistograms(histogramsFile);
   do_check_false(histogramsFile.exists());
 });
 
@@ -1137,15 +1137,15 @@
   const expectedPings = (gIsAndroid) ? 1 : 2;
   // Assure that we store the ping properly when saving sessions on shutdown.
   // We make the TelemetrySession shutdown to trigger a session save.
-  const dir = TelemetryFile.pingDirectoryPath;
+  const dir = TelemetryStorage.pingDirectoryPath;
   yield OS.File.removeDir(dir, {ignoreAbsent: true});
   yield OS.File.makeDir(dir);
   yield TelemetrySession.shutdown();
 
-  yield TelemetryFile.loadSavedPings();
-  Assert.equal(TelemetryFile.pingsLoaded, expectedPings);
+  yield TelemetryStorage.loadSavedPings();
+  Assert.equal(TelemetryStorage.pingsLoaded, expectedPings);
 
-  let pingsIterator = TelemetryFile.popPendingPings();
+  let pingsIterator = TelemetryStorage.popPendingPings();
   for (let ping of pingsIterator) {
     Assert.ok("type" in ping);
 
@@ -1272,7 +1272,7 @@
             "There must be an aborted session ping.");
 
   // This ping is not yet in the pending pings folder, so we can't access it using
-  // TelemetryFile.popPendingPings().
+  // TelemetryStorage.popPendingPings().
   let pingContent = yield OS.File.read(ABORTED_FILE, { encoding: "utf-8" });
   let abortedSessionPing = JSON.parse(pingContent);
 
@@ -1298,7 +1298,7 @@
 
   // Write the ping to the aborted-session file. TelemetrySession will add it to the
   // saved pings directory when it starts.
-  yield TelemetryFile.savePingToFile(abortedSessionPing, ABORTED_FILE, false);
+  yield TelemetryStorage.savePingToFile(abortedSessionPing, ABORTED_FILE, false);
 
   gRequestIterator = Iterator(new Request());
   yield TelemetrySession.reset();
@@ -1306,16 +1306,16 @@
   Assert.ok(!(yield OS.File.exists(ABORTED_FILE)),
             "The aborted session ping must be removed from the aborted session ping directory.");
 
-  // TelemetryFile requires all the pings to have their ID as filename. When appending
+  // TelemetryStorage requires all the pings to have their ID as filename. When appending
   // the aborted-session ping to the pending pings, we must verify that it exists.
   const PENDING_PING_FILE =
-    OS.Path.join(TelemetryFile.pingDirectoryPath, abortedSessionPing.id);
+    OS.Path.join(TelemetryStorage.pingDirectoryPath, abortedSessionPing.id);
   Assert.ok((yield OS.File.exists(PENDING_PING_FILE)),
             "The aborted session ping must exist in the saved pings directory.");
 
   // Trick: make the aborted ping file overdue so that it gets sent immediately when
   // resetting TelemetryPing.
-  const OVERDUE_PING_FILE_AGE = TelemetryFile.OVERDUE_PING_FILE_AGE + 60 * 1000;
+  const OVERDUE_PING_FILE_AGE = TelemetryStorage.OVERDUE_PING_FILE_AGE + 60 * 1000;
   yield OS.File.setDates(PENDING_PING_FILE, null, Date.now() - OVERDUE_PING_FILE_AGE);
   yield TelemetryPing.reset();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/xpcshell.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/xpcshell.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/telemetry/tests/unit/xpcshell.ini	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/telemetry/tests/unit/xpcshell.ini	2015-04-24 19:31:11.000000000 +0000
@@ -23,6 +23,7 @@
 [test_TelemetryEnvironment.js]
 # Bug 1144395: crash on Android 4.3
 skip-if = android_version == "18"
+[test_PingAPI.js]
 [test_TelemetryFlagClear.js]
 [test_TelemetryLateWrites.js]
 [test_TelemetryLockCount.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp	2015-04-24 19:31:11.000000000 +0000
@@ -188,6 +188,9 @@
   if (FindInReadable(NS_LITERAL_CSTRING("-track-"), tables)) {
     return NS_ERROR_TRACKING_URI;
   }
+  if (FindInReadable(NS_LITERAL_CSTRING("-unwanted-"), tables)) {
+    return NS_ERROR_UNWANTED_URI;
+  }
   return NS_OK;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/SafeBrowsing.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/SafeBrowsing.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/SafeBrowsing.jsm	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/SafeBrowsing.jsm	2015-04-24 19:31:11.000000000 +0000
@@ -199,8 +199,9 @@
   addMozEntries: function() {
     // Add test entries to the DB.
     // XXX bug 779008 - this could be done by DB itself?
-    const phishURL   = "itisatrap.org/firefox/its-a-trap.html";
-    const malwareURL = "itisatrap.org/firefox/its-an-attack.html";
+    const phishURL    = "itisatrap.org/firefox/its-a-trap.html";
+    const malwareURL  = "itisatrap.org/firefox/its-an-attack.html";
+    const unwantedURL = "itisatrap.org/firefox/unwanted.html";
 
     let update = "n:1000\ni:test-malware-simple\nad:1\n" +
                  "a:1:32:" + malwareURL.length + "\n" +
@@ -208,6 +209,9 @@
     update += "n:1000\ni:test-phish-simple\nad:1\n" +
               "a:1:32:" + phishURL.length + "\n" +
               phishURL;
+    update += "n:1000\ni:test-unwanted-simple\nad:1\n" +
+              "a:1:32:" + unwantedURL.length + "\n" +
+              unwantedURL;
     log("addMozEntries:", update);
 
     let db = Cc["@mozilla.org/url-classifier/dbservice;1"].
@@ -222,7 +226,7 @@
     };
 
     try {
-      db.beginUpdate(dummyListener, "test-malware-simple,test-phish-simple", "");
+      db.beginUpdate(dummyListener, "test-malware-simple,test-phish-simple,test-unwanted-simple", "");
       db.beginStream("", "");
       db.updateStream(update);
       db.finishStream();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/classifierFrame.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/classifierFrame.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/classifierFrame.html	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/classifierFrame.html	2015-04-24 19:31:11.000000000 +0000
@@ -33,8 +33,8 @@
 <!-- Try loading from a malware javascript URI -->
 <script type="text/javascript" src="http://malware.example.com/tests/toolkit/components/url-classifier/tests/mochitest/evil.js"></script>
 
-<!-- Try loading from a malware css URI -->
-<link rel="stylesheet" type="text/css" href="http://malware.example.com/tests/toolkit/components/url-classifier/tests/mochitest/evil.css"></link>
+<!-- Try loading from an uwanted software css URI -->
+<link rel="stylesheet" type="text/css" href="http://unwanted.example.com/tests/toolkit/components/url-classifier/tests/mochitest/evil.css"></link>
 
 <!-- XXX How is this part of the test supposed to work (= be checked)? -->
 <!-- Try loading a marked-as-malware css through an @import from a clean URI -->
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/mochitest.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/mochitest.ini	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/mochitest.ini	2015-04-24 19:31:11.000000000 +0000
@@ -9,6 +9,7 @@
   import.css
   raptor.jpg
   track.html
+  unwantedWorker.js
   workerFrame.html
 
 [test_classifier.html]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/test_classifier.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/test_classifier.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/test_classifier.html	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/test_classifier.html	2015-04-24 19:31:11.000000000 +0000
@@ -24,6 +24,12 @@
   "a:524:32:" + testData.length + "\n" +
   testData;
 
+testData = "unwanted.example.com/";
+testUpdate +=
+  "n:1000\ni:test-unwanted-simple\nad:1\n" +
+  "a:524:32:" + testData.length + "\n" +
+  testData;
+
 var dbService = Cc["@mozilla.org/url-classifier/dbservice;1"]
                 .getService(Ci.nsIUrlClassifierDBService);
 
@@ -55,7 +61,7 @@
     }
   };
 
-  dbService.beginUpdate(listener, "test-malware-simple", "");
+  dbService.beginUpdate(listener, "test-malware-simple,test-unwanted-simple", "");
   dbService.beginStream("", "");
   dbService.updateStream(update);
   dbService.finishStream();
@@ -63,7 +69,7 @@
 }
 
 SpecialPowers.pushPrefEnv(
-  {"set" : [["urlclassifier.malwareTable", "test-malware-simple"],
+  {"set" : [["urlclassifier.malwareTable", "test-malware-simple,test-unwanted-simple"],
             ["urlclassifier.phishTable", "test-phish-simple"]]},
   function() { doUpdate(testUpdate); });
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/test_classifier_worker.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/test_classifier_worker.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/test_classifier_worker.html	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/test_classifier_worker.html	2015-04-24 19:31:11.000000000 +0000
@@ -23,6 +23,12 @@
   "a:550:32:" + testData.length + "\n" +
   testData;
 
+testData = "example.com/tests/toolkit/components/url-classifier/tests/mochitest/unwantedWorker.js";
+testUpdate +=
+  "n:1000\ni:test-unwanted-simple\nad:550\n" +
+  "a:550:32:" + testData.length + "\n" +
+  testData;
+
 var dbService = Cc["@mozilla.org/url-classifier/dbservice;1"]
                 .getService(Ci.nsIUrlClassifierDBService);
 
@@ -54,7 +60,7 @@
     }
   };
 
-  dbService.beginUpdate(listener, "test-malware-simple", "");
+  dbService.beginUpdate(listener, "test-malware-simple,test-unwanted-simple", "");
   dbService.beginStream("", "");
   dbService.updateStream(update);
   dbService.finishStream();
@@ -73,7 +79,7 @@
 }
 
 SpecialPowers.pushPrefEnv(
-  {"set" : [["urlclassifier.malwareTable", "test-malware-simple"],
+  {"set" : [["urlclassifier.malwareTable", "test-malware-simple,test-unwanted-simple"],
             ["urlclassifier.phishTable", "test-phish-simple"]]},
   function() { doUpdate(testUpdate); });
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/unwantedWorker.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/unwantedWorker.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/unwantedWorker.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/unwantedWorker.js	2015-04-24 19:31:11.000000000 +0000
@@ -0,0 +1,3 @@
+onmessage = function() {
+  postMessage("loaded bad file");
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/workerFrame.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/workerFrame.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/mochitest/workerFrame.html	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/mochitest/workerFrame.html	2015-04-24 19:31:11.000000000 +0000
@@ -29,11 +29,27 @@
 
   worker.onmessage = function(event) {
     window.parent.postMessage("failure:failed to block evilWorker.js", "*");
-    startCleanWorker();
+    startUnwantedWorker();
   };
 
   worker.onerror = function(event) {
     window.parent.postMessage("success:blocked evilWorker.js", "*");
+    startUnwantedWorker();
+  };
+
+  worker.postMessage("");
+}
+
+function startUnwantedWorker() {
+  var worker = new Worker("unwantedWorker.js");
+
+  worker.onmessage = function(event) {
+    window.parent.postMessage("failure:failed to block unwantedWorker.js", "*");
+    startCleanWorker();
+  };
+
+  worker.onerror = function(event) {
+    window.parent.postMessage("success:blocked unwantedWorker.js", "*");
     startCleanWorker();
   };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js	2015-04-24 19:31:11.000000000 +0000
@@ -53,15 +53,18 @@
   delFile("safebrowsing/classifier.hashkey");
   delFile("safebrowsing/test-phish-simple.sbstore");
   delFile("safebrowsing/test-malware-simple.sbstore");
+  delFile("safebrowsing/test-unwanted-simple.sbstore");
   delFile("safebrowsing/test-phish-simple.cache");
   delFile("safebrowsing/test-malware-simple.cache");
+  delFile("safebrowsing/test-unwanted-simple.cache");
   delFile("safebrowsing/test-phish-simple.pset");
   delFile("safebrowsing/test-malware-simple.pset");
+  delFile("safebrowsing/test-unwanted-simple.pset");
   delFile("testLarge.pset");
   delFile("testNoDelta.pset");
 }
 
-var allTables = "test-phish-simple,test-malware-simple";
+var allTables = "test-phish-simple,test-malware-simple,test-unwanted-simple";
 
 var dbservice = Cc["@mozilla.org/url-classifier/dbservice;1"].getService(Ci.nsIUrlClassifierDBService);
 var streamUpdater = Cc["@mozilla.org/url-classifier/streamupdater;1"]
@@ -114,6 +117,10 @@
   return buildUpdate({"test-malware-simple" : chunks}, hashSize);
 }
 
+function buildUnwantedUpdate(chunks, hashSize) {
+  return buildUpdate({"test-unwanted-simple" : chunks}, hashSize);
+}
+
 function buildBareUpdate(chunks, hashSize) {
   return buildUpdate({"" : chunks}, hashSize);
 }
@@ -138,7 +145,7 @@
   };
 
   dbservice.beginUpdate(listener,
-                        "test-phish-simple,test-malware-simple");
+                        "test-phish-simple,test-malware-simple,test-unwanted-simple");
   dbservice.beginStream("", "");
   dbservice.updateStream(updateText);
   dbservice.finishStream();
@@ -180,7 +187,7 @@
     downloadFailure = failure;
   }
 
-  streamUpdater.downloadUpdates("test-phish-simple,test-malware-simple", "",
+  streamUpdater.downloadUpdates("test-phish-simple,test-malware-simple,test-unwanted-simple", "",
                                 dataUpdate, success, failure, downloadFailure);
 }
 
@@ -237,6 +244,11 @@
   this.checkUrls(urls, 'test-malware-simple', cb);
 },
 
+unwantedUrlsExist: function(urls, cb)
+{
+  this.checkUrls(urls, 'test-unwanted-simple', cb);
+},
+
 subsDontExist: function(urls, cb)
 {
   // XXX: there's no interface for checking items in the subs table
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/unit/test_dbservice.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/unit/test_dbservice.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/unit/test_dbservice.js	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/unit/test_dbservice.js	2015-04-24 19:31:11.000000000 +0000
@@ -47,18 +47,20 @@
   ];
 var chunk6 = chunk6Urls.join("\n");
 
-// we are going to add chunks 1, 2, 4, 5, and 6 to phish-simple, and
-// chunk 2 to malware-simple.  Then we'll remove the urls in chunk3
-// from phish-simple, then expire chunk 1 and chunks 4-6 from
-// phish-simple.
+// we are going to add chunks 1, 2, 4, 5, and 6 to phish-simple,
+// chunk 2 to malware-simple and chunk 3 to unwanted-simple.
+// Then we'll remove the urls in chunk3 from phish-simple, then
+// expire chunk 1 and chunks 4-6 from phish-simple.
 var phishExpected = {};
 var phishUnexpected = {};
 var malwareExpected = {};
+var unwantedExpected = {};
 for (var i = 0; i < chunk2Urls.length; i++) {
   phishExpected[chunk2Urls[i]] = true;
   malwareExpected[chunk2Urls[i]] = true;
 }
 for (var i = 0; i < chunk3Urls.length; i++) {
+  unwantedExpected[chunk3Urls[i]] = true;
   delete phishExpected[chunk3Urls[i]];
   phishUnexpected[chunk3Urls[i]] = true;
 }
@@ -115,7 +117,7 @@
   // there's a leading \n here because splitting left an empty string
   // after the trailing newline, which will sort first
   do_check_eq(parts.join("\n"),
-              "\ntest-malware-simple;a:1\ntest-phish-simple;a:2");
+              "\ntest-malware-simple;a:1\ntest-phish-simple;a:2\ntest-unwanted-simple;a:1");
 
   checkNoHost();
 }
@@ -133,7 +135,7 @@
   // there's a leading \n here because splitting left an empty string
   // after the trailing newline, which will sort first
   do_check_eq(parts.join("\n"),
-              "\ntest-malware-simple;a:1\ntest-phish-simple;a:2:s:3");
+              "\ntest-malware-simple;a:1\ntest-phish-simple;a:2:s:3\ntest-unwanted-simple;a:1");
 
   // verify that expiring a sub chunk removes its name from the list
   var data =
@@ -182,6 +184,16 @@
   }
 }
 
+function unwantedExists(result) {
+  dumpn("unwantedExists: " + result);
+
+  try {
+    do_check_true(result.indexOf("test-unwanted-simple") != -1);
+  } finally {
+    checkDone();
+  }
+}
+
 function checkState()
 {
   numExpecting = 0;
@@ -203,6 +215,12 @@
     dbservice.lookup(principal, allTables, malwareExists, true);
     numExpecting++;
   }
+
+  for (var key in unwantedExpected) {
+    var principal = secMan.getNoAppCodebasePrincipal(iosvc.newURI("http://" + key, null, null));
+    dbservice.lookup(principal, allTables, unwantedExists, true);
+    numExpecting++;
+  }
 }
 
 function testSubSuccess(result)
@@ -249,7 +267,10 @@
     chunk6 + "\n" +
     "i:test-malware-simple\n" +
     "a:1:32:" + chunk2.length + "\n" +
-      chunk2 + "\n";
+      chunk2 + "\n" +
+    "i:test-unwanted-simple\n" +
+    "a:1:32:" + chunk3.length + "\n" +
+      chunk3 + "\n";
 
   doSimpleUpdate(data, testAddSuccess, testFailure);
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/unit/test_streamupdater.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/unit/test_streamupdater.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/url-classifier/tests/unit/test_streamupdater.js	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/url-classifier/tests/unit/test_streamupdater.js	2015-04-24 19:31:11.000000000 +0000
@@ -131,6 +131,7 @@
   var add1Urls = [ "foo-multiple.com/a", "bar-multiple.com/c" ];
   var add2Urls = [ "foo-multiple.com/b" ];
   var add3Urls = [ "bar-multiple.com/d" ];
+  var add4Urls = [ "bar-multiple.com/e" ];
 
   var update = "n:1000\n";
   update += "i:test-phish-simple\n";
@@ -152,10 +153,17 @@
        "urls" : add3Urls }]);
   update += "u:data:," + encodeURIComponent(update3) + "\n";
 
+  update += "i:test-unwanted-simple\n";
+  var update4 = buildBareUpdate(
+    [{ "chunkNum" : 4,
+       "urls" : add4Urls }]);
+  update += "u:data:," + encodeURIComponent(update4) + "\n";
+
   var assertions = {
-    "tableData" : "test-malware-simple;a:3\ntest-phish-simple;a:1-2",
+    "tableData" : "test-malware-simple;a:3\ntest-phish-simple;a:1-2\ntest-unwanted-simple;a:4",
     "urlsExist" : add1Urls.concat(add2Urls),
-    "malwareUrlsExist" : add3Urls
+    "malwareUrlsExist" : add3Urls,
+    "unwantedUrlsExist" : add4Urls
   };
 
   doTest([update], assertions, false);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/viewsource/content/viewSource.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/viewsource/content/viewSource.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/components/viewsource/content/viewSource.js	2015-04-22 13:06:07.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/components/viewsource/content/viewSource.js	2015-04-24 19:31:11.000000000 +0000
@@ -242,33 +242,15 @@
 
   if (/^about:blocked/.test(errorDoc.documentURI)) {
     // The event came from a button on a malware/phishing block page
-    // First check whether it's malware or phishing, so that we can
-    // use the right strings/links
-    var isMalware = /e=malwareBlocked/.test(errorDoc.documentURI);
 
     if (target == errorDoc.getElementById('getMeOutButton')) {
       // Instead of loading some safe page, just close the window
       window.close();
     } else if (target == errorDoc.getElementById('reportButton')) {
-      // This is the "Why is this site blocked" button.  For malware,
-      // we can fetch a site-specific report, for phishing, we redirect
-      // to the generic page describing phishing protection.
-
-      if (isMalware) {
-        // Get the stop badware "why is this blocked" report url,
-        // append the current url, and go there.
-        try {
-          let reportURL = Services.urlFormatter.formatURLPref("browser.safebrowsing.malware.reportURL", true);
-          reportURL += errorDoc.location.href.slice(12);
-          openURL(reportURL);
-        } catch (e) {
-          Components.utils.reportError("Couldn't get malware report URL: " + e);
-        }
-      } else {
-        // It's a phishing site, just link to the generic information page
-        let url = Services.urlFormatter.formatURLPref("app.support.baseURL");
-        openURL(url + "phishing-malware");
-      }
+      // This is the "Why is this site blocked" button. We redirect
+      // to the generic page describing phishing/malware protection.
+      let url = Services.urlFormatter.formatURLPref("app.support.baseURL");
+      openURL(url + "phishing-malware");
     } else if (target == errorDoc.getElementById('ignoreWarningButton')) {
       // Allow users to override and continue through to the site
       gBrowser.loadURIWithFlags(content.location.href,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/content/aboutServiceWorkers.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/content/aboutServiceWorkers.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/content/aboutServiceWorkers.js	2015-04-22 13:06:08.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/content/aboutServiceWorkers.js	2015-04-24 19:31:11.000000000 +0000
@@ -9,6 +9,13 @@
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "PushNotificationService",
+  "@mozilla.org/push/NotificationService;1",
+  "nsIPushNotificationService"
+);
+
 const bundle = Services.strings.createBundle(
   "chrome://global/locale/aboutServiceWorkers.properties");
 
@@ -101,6 +108,15 @@
   createItem(bundle.GetStringFromName('activeCacheName'), info.activeCacheName);
   createItem(bundle.GetStringFromName('waitingCacheName'), info.waitingCacheName);
 
+  PushNotificationService.registration(info.scope).then(
+    pushRecord => {
+      createItem(bundle.GetStringFromName('pushEndpoint'), JSON.stringify(pushRecord));
+    },
+    error => {
+      dump("about:serviceworkers - push registration failed\n");
+    }
+  );
+
   let updateButton = document.createElement("button");
   updateButton.appendChild(document.createTextNode(bundle.GetStringFromName('update')));
   updateButton.onclick = function() {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/content/aboutSupport.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/content/aboutSupport.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/content/aboutSupport.js	2015-04-22 13:06:08.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/content/aboutSupport.js	2015-04-24 19:31:11.000000000 +0000
@@ -273,7 +273,7 @@
     let out = Object.create(data);
 
     if (apzInfo.length == 0)
-      out.asyncPanZoom = "none";
+      out.asyncPanZoom = localizedMsg(["apzNone"]);
     else
       out.asyncPanZoom = apzInfo.join("; ");
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/content/tests/browser/browser_default_image_filename.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/content/tests/browser/browser_default_image_filename.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/content/tests/browser/browser_default_image_filename.js	2015-04-22 13:06:08.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/content/tests/browser/browser_default_image_filename.js	2015-04-24 19:31:11.000000000 +0000
@@ -8,43 +8,38 @@
  * TestCase for bug 564387
  * <https://bugzilla.mozilla.org/show_bug.cgi?id=564387>
  */
-function test() {
-  waitForExplicitFinish();
-  var fileName;
-
+add_task(function* () {
+  let loadPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
   gBrowser.loadURI("data:image/gif;base64,R0lGODlhEAAOALMAAOazToeHh0tLS/7LZv/0jvb29t/f3//Ub//ge8WSLf/rhf/3kdbW1mxsbP//mf///yH5BAAAAAAALAAAAAAQAA4AAARe8L1Ekyky67QZ1hLnjM5UUde0ECwLJoExKcppV0aCcGCmTIHEIUEqjgaORCMxIC6e0CcguWw6aFjsVMkkIr7g77ZKPJjPZqIyd7sJAgVGoEGv2xsBxqNgYPj/gAwXEQA7");
+  yield loadPromise;
 
-  gBrowser.addEventListener("pageshow", function pageShown(event) {
-    if (event.target.location == "about:blank")
-      return;
-    gBrowser.removeEventListener("pageshow", pageShown);
-
-    executeSoon(function () {
-      document.addEventListener("popupshown", contextMenuOpened);
-
-      var img = gBrowser.contentDocument.getElementsByTagName("img")[0];
-      EventUtils.synthesizeMouseAtCenter(img,
-                                         { type: "contextmenu", button: 2 },
-                                         gBrowser.contentWindow);
-    });
-  });
+  let popupShownPromise = BrowserTestUtils.waitForEvent(document, "popupshown");
+
+  yield BrowserTestUtils.synthesizeMouseAtCenter("img",
+                                                 { type: "contextmenu", button: 2 },
+                                                 gBrowser.selectedBrowser);
 
-  function contextMenuOpened(event) {
-    event.currentTarget.removeEventListener("popupshown", contextMenuOpened);
+  yield popupShownPromise;
 
+  let showFilePickerPromise = new Promise(resolve => {
     MockFilePicker.showCallback = function(fp) {
       is(fp.defaultString, "index.gif");
-      executeSoon(finish);
-    };
+      resolve();
+    }
+  });
+
+  registerCleanupFunction(function () {
+    MockFilePicker.cleanup();
+  });
 
-    registerCleanupFunction(function () {
-      MockFilePicker.cleanup();
-    });
-
-    // Select "Save Image As" option from context menu
-    var saveImageAsCommand = document.getElementById("context-saveimage");
-    saveImageAsCommand.doCommand();
-
-    event.target.hidePopup();
-  }
-}
+  // Select "Save Image As" option from context menu
+  var saveImageAsCommand = document.getElementById("context-saveimage");
+  saveImageAsCommand.doCommand();
+
+  yield showFilePickerPromise;
+
+  let contextMenu = document.getElementById("contentAreaContextMenu");
+  let popupHiddenPromise = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
+  contextMenu.hidePopup();
+  yield popupHiddenPromise;
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/content/tests/browser/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/content/tests/browser/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/content/tests/browser/browser.ini	2015-04-22 13:06:08.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/content/tests/browser/browser.ini	2015-04-24 19:31:11.000000000 +0000
@@ -14,7 +14,6 @@
 skip-if = e10s # Bug 1064580
 [browser_contentTitle.js]
 [browser_default_image_filename.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_f7_caret_browsing.js]
 skip-if = e10s
 [browser_findbar.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/content/widgets/browser.xml thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/content/widgets/browser.xml
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/content/widgets/browser.xml	2015-04-22 13:06:09.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/content/widgets/browser.xml	2015-04-24 19:31:11.000000000 +0000
@@ -657,7 +657,7 @@
 
       <field name="blockedPopups">null</field>
 
-      <!-- Obsolete name for blockedPopups. Used by metro and android. -->
+      <!-- Obsolete name for blockedPopups. Used by android. -->
       <property name="pageReport"
          onget="return this.blockedPopups;"
          readonly="true"/>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.h	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.h	2015-04-24 19:31:12.000000000 +0000
@@ -41,7 +41,6 @@
 
 using std::map;
 using std::string;
-class MinidumpModule;
 
 class OnDemandSymbolSupplier : public SymbolSupplier {
  public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/crashreporter/nsExceptionHandler.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/crashreporter/nsExceptionHandler.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/crashreporter/nsExceptionHandler.cpp	2015-04-22 13:06:11.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/crashreporter/nsExceptionHandler.cpp	2015-04-24 19:31:12.000000000 +0000
@@ -1089,12 +1089,7 @@
   doReport = false;
   headlessClient = true;
 #elif defined(XP_WIN)
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Desktop) {
-    doReport = ShouldReport();
-  } else {
-    doReport = false;
-    headlessClient = true;
-  }
+  doReport = ShouldReport();
 #else
   // this environment variable prevents us from launching
   // the crash reporter client
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/apps/Simulator.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/apps/Simulator.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/apps/Simulator.jsm	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/apps/Simulator.jsm	2015-04-24 19:31:13.000000000 +0000
@@ -6,6 +6,16 @@
 
 Components.utils.import("resource://gre/modules/devtools/event-emitter.js");
 
+/**
+ * TODO (Bug 1132453) The `Simulator` module is deprecated, and should be
+ * removed once all simulator addons stop using it (see bug 1132452).
+ *
+ * If you want to register, unregister, or otherwise deal with installed
+ * simulators, please use the `Simulators` module defined in:
+ *
+ *   browser/devtools/webide/modules/simulators.js
+ */
+
 const EXPORTED_SYMBOLS = ["Simulator"];
 
 const Simulator = {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/addon.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/addon.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/addon.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/addon.js	2015-04-24 19:31:13.000000000 +0000
@@ -4,9 +4,33 @@
 
 "use strict";
 
+/**
+ * You can't require the AddonManager in a child process, but GCLI wants to
+ * check for 'items' in all processes, so we return empty array if the
+ * AddonManager is not available
+ */
+function getAddonManager() {
+  try {
+    return {
+      AddonManager: require("resource://gre/modules/AddonManager.jsm").AddonManager,
+      addonManagerActive: true
+    };
+  }
+  catch (ex) {
+    // Fake up an AddonManager just enough to let the file load
+    return {
+      AddonManager: {
+        getAllAddons() {},
+        getAddonsByTypes() {}
+      },
+      addonManagerActive: false
+    };
+  }
+}
+
 const { Cc, Ci, Cu } = require("chrome");
-const { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm", {});
-const gcli = require("gcli/index");
+const { AddonManager, addonManagerActive } = getAddonManager();
+const l10n = require("gcli/l10n");
 const { Promise: promise } = require("resource://gre/modules/Promise.jsm");
 
 const BRAND_SHORT_NAME = Cc["@mozilla.org/intl/stringbundle;1"]
@@ -49,7 +73,7 @@
   }, []);
 }
 
-exports.items = [
+var items = [
   {
     item: "type",
     name: "addon",
@@ -76,11 +100,11 @@
   },
   {
     name: "addon",
-    description: gcli.lookup("addonDesc")
+    description: l10n.lookup("addonDesc")
   },
   {
     name: "addon list",
-    description: gcli.lookup("addonListDesc"),
+    description: l10n.lookup("addonListDesc"),
     returnType: "addonsInfo",
     params: [{
       name: "type",
@@ -89,7 +113,7 @@
         data: [ "dictionary", "extension", "locale", "plugin", "theme", "all" ]
       },
       defaultValue: "all",
-      description: gcli.lookup("addonListTypeDesc")
+      description: l10n.lookup("addonListTypeDesc")
     }],
     exec: function(args, context) {
       let types = (args.type === "all") ? null : [ args.type ];
@@ -114,7 +138,7 @@
       if (!addonsInfo.addons.length) {
         return context.createView({
           html: "<p>${message}</p>",
-          data: { message: gcli.lookup("addonNoneOfType") }
+          data: { message: l10n.lookup("addonNoneOfType") }
         });
       }
 
@@ -126,7 +150,7 @@
         "theme": "addonListThemeHeading",
         "all": "addonListAllHeading"
       };
-      let header = gcli.lookup(headerLookups[addonsInfo.type] ||
+      let header = l10n.lookup(headerLookups[addonsInfo.type] ||
                                "addonListUnknownHeading");
 
       let operationLookups = {
@@ -138,7 +162,7 @@
       };
       function lookupOperation(opName) {
         let lookupName = operationLookups[opName];
-        return lookupName ? gcli.lookup(lookupName) : opName;
+        return lookupName ? l10n.lookup(lookupName) : opName;
       }
 
       function arrangeAddons(addons) {
@@ -193,14 +217,14 @@
               status: addon.isActive ? "enabled" : "disabled",
               version: addon.version,
               pendingOperations: addon.pendingOperations.length ?
-                (" (" + gcli.lookup("addonPending") + ": "
+                (" (" + l10n.lookup("addonPending") + ": "
                  + addon.pendingOperations.map(lookupOperation).join(", ")
                  + ")") :
                 "",
               toggleActionName: isActiveForToggle(addon) ? "disable": "enable",
               toggleActionMessage: isActiveForToggle(addon) ?
-                gcli.lookup("addonListOutDisable") :
-                gcli.lookup("addonListOutEnable")
+                l10n.lookup("addonListOutDisable") :
+                l10n.lookup("addonListOutEnable")
             };
           }),
           onclick: context.update,
@@ -210,33 +234,37 @@
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "addon enable",
-    description: gcli.lookup("addonEnableDesc"),
+    description: l10n.lookup("addonEnableDesc"),
     params: [
       {
         name: "addon",
         type: "addon",
-        description: gcli.lookup("addonNameDesc")
+        description: l10n.lookup("addonNameDesc")
       }
     ],
     exec: function(args, context) {
       let name = (args.addon.name + " " + args.addon.version).trim();
       if (args.addon.userDisabled) {
         args.addon.userDisabled = false;
-        return gcli.lookupFormat("addonEnabled", [ name ]);
+        return l10n.lookupFormat("addonEnabled", [ name ]);
       }
 
-      return gcli.lookupFormat("addonAlreadyEnabled", [ name ]);
+      return l10n.lookupFormat("addonAlreadyEnabled", [ name ]);
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "addon disable",
-    description: gcli.lookup("addonDisableDesc"),
+    description: l10n.lookup("addonDisableDesc"),
     params: [
       {
         name: "addon",
         type: "addon",
-        description: gcli.lookup("addonNameDesc")
+        description: l10n.lookup("addonNameDesc")
       }
     ],
     exec: function(args, context) {
@@ -247,10 +275,12 @@
       if (!args.addon.userDisabled ||
           args.addon.userDisabled === AddonManager.STATE_ASK_TO_ACTIVATE) {
         args.addon.userDisabled = true;
-        return gcli.lookupFormat("addonDisabled", [ name ]);
+        return l10n.lookupFormat("addonDisabled", [ name ]);
       }
 
-      return gcli.lookupFormat("addonAlreadyDisabled", [ name ]);
+      return l10n.lookupFormat("addonAlreadyDisabled", [ name ]);
     }
   }
 ];
+
+exports.items = addonManagerActive ? items : [];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/appcache.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/appcache.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/appcache.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/appcache.js	2015-04-24 19:31:13.000000000 +0000
@@ -4,19 +4,22 @@
 
 "use strict";
 
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 loader.lazyImporter(this, "AppCacheUtils", "resource:///modules/devtools/AppCacheUtils.jsm");
 
 exports.items = [
   {
+    item: "command",
     name: "appcache",
-    description: gcli.lookup("appCacheDesc")
+    description: l10n.lookup("appCacheDesc")
   },
   {
+    item: "command",
+    runAt: "server",
     name: "appcache validate",
-    description: gcli.lookup("appCacheValidateDesc"),
-    manual: gcli.lookup("appCacheValidateManual"),
+    description: l10n.lookup("appCacheValidateDesc"),
+    manual: l10n.lookup("appCacheValidateManual"),
     returnType: "appcacheerrors",
     params: [{
       group: "options",
@@ -24,7 +27,7 @@
         {
           type: "string",
           name: "uri",
-          description: gcli.lookup("appCacheValidateUriDesc"),
+          description: l10n.lookup("appCacheValidateUriDesc"),
           defaultValue: null,
         }
       ]
@@ -53,7 +56,7 @@
     exec: function([errors, manifestURI], context) {
       if (errors.length == 0) {
         return context.createView({
-          html: "<span>" + gcli.lookup("appCacheValidatedSuccessfully") + "</span>"
+          html: "<span>" + l10n.lookup("appCacheValidatedSuccessfully") + "</span>"
         });
       }
 
@@ -73,20 +76,24 @@
     }
   },
   {
+    item: "command",
+    runAt: "server",
     name: "appcache clear",
-    description: gcli.lookup("appCacheClearDesc"),
-    manual: gcli.lookup("appCacheClearManual"),
+    description: l10n.lookup("appCacheClearDesc"),
+    manual: l10n.lookup("appCacheClearManual"),
     exec: function(args, context) {
       let utils = new AppCacheUtils(args.uri);
       utils.clearAll();
 
-      return gcli.lookup("appCacheClearCleared");
+      return l10n.lookup("appCacheClearCleared");
     }
   },
   {
+    item: "command",
+    runAt: "server",
     name: "appcache list",
-    description: gcli.lookup("appCacheListDesc"),
-    manual: gcli.lookup("appCacheListManual"),
+    description: l10n.lookup("appCacheListDesc"),
+    manual: l10n.lookup("appCacheListManual"),
     returnType: "appcacheentries",
     params: [{
       group: "options",
@@ -94,7 +101,7 @@
         {
           type: "string",
           name: "search",
-          description: gcli.lookup("appCacheListSearchDesc"),
+          description: l10n.lookup("appCacheListSearchDesc"),
           defaultValue: null,
         },
       ]
@@ -115,35 +122,35 @@
           "  <li foreach='entry in ${entries}'>" +
           "    <table class='gcli-appcache-detail'>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("appCacheListKey") + "</td>" +
+          "        <td>" + l10n.lookup("appCacheListKey") + "</td>" +
           "        <td>${entry.key}</td>" +
           "      </tr>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("appCacheListFetchCount") + "</td>" +
+          "        <td>" + l10n.lookup("appCacheListFetchCount") + "</td>" +
           "        <td>${entry.fetchCount}</td>" +
           "      </tr>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("appCacheListLastFetched") + "</td>" +
+          "        <td>" + l10n.lookup("appCacheListLastFetched") + "</td>" +
           "        <td>${entry.lastFetched}</td>" +
           "      </tr>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("appCacheListLastModified") + "</td>" +
+          "        <td>" + l10n.lookup("appCacheListLastModified") + "</td>" +
           "        <td>${entry.lastModified}</td>" +
           "      </tr>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("appCacheListExpirationTime") + "</td>" +
+          "        <td>" + l10n.lookup("appCacheListExpirationTime") + "</td>" +
           "        <td>${entry.expirationTime}</td>" +
           "      </tr>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("appCacheListDataSize") + "</td>" +
+          "        <td>" + l10n.lookup("appCacheListDataSize") + "</td>" +
           "        <td>${entry.dataSize}</td>" +
           "      </tr>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("appCacheListDeviceID") + "</td>" +
+          "        <td>" + l10n.lookup("appCacheListDeviceID") + "</td>" +
           "        <td>${entry.deviceID} <span class='gcli-out-shortcut' " +
           "onclick='${onclick}' ondblclick='${ondblclick}' " +
           "data-command='appcache viewentry ${entry.key}'" +
-          ">" + gcli.lookup("appCacheListViewEntry") + "</span>" +
+          ">" + l10n.lookup("appCacheListViewEntry") + "</span>" +
           "        </td>" +
           "      </tr>" +
           "    </table>" +
@@ -158,14 +165,16 @@
     }
   },
   {
+    item: "command",
+    runAt: "server",
     name: "appcache viewentry",
-    description: gcli.lookup("appCacheViewEntryDesc"),
-    manual: gcli.lookup("appCacheViewEntryManual"),
+    description: l10n.lookup("appCacheViewEntryDesc"),
+    manual: l10n.lookup("appCacheViewEntryManual"),
     params: [
       {
         type: "string",
         name: "key",
-        description: gcli.lookup("appCacheViewEntryKey"),
+        description: l10n.lookup("appCacheViewEntryKey"),
         defaultValue: null,
       }
     ],
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/calllog.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/calllog.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/calllog.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/calllog.js	2015-04-24 19:31:13.000000000 +0000
@@ -6,6 +6,7 @@
 
 const { Cc, Ci, Cu } = require("chrome");
 const TargetFactory = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.TargetFactory;
+const l10n = require("gcli/l10n");
 const gcli = require("gcli/index");
 
 loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
@@ -24,11 +25,13 @@
 exports.items = [
   {
     name: "calllog",
-    description: gcli.lookup("calllogDesc")
+    description: l10n.lookup("calllogDesc")
   },
   {
+    item: "command",
+    runAt: "client",
     name: "calllog start",
-    description: gcli.lookup("calllogStartDesc"),
+    description: l10n.lookup("calllogStartDesc"),
 
     exec: function(args, context) {
       let contentWindow = context.environment.window;
@@ -45,7 +48,7 @@
       let target = TargetFactory.forTab(gBrowser.selectedTab);
       gDevTools.showToolbox(target, "webconsole");
 
-      return gcli.lookup("calllogStartReply");
+      return l10n.lookup("calllogStartReply");
     },
 
     callDescription: function(frame) {
@@ -72,13 +75,15 @@
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "calllog stop",
-    description: gcli.lookup("calllogStopDesc"),
+    description: l10n.lookup("calllogStopDesc"),
 
     exec: function(args, context) {
       let numDebuggers = debuggers.length;
       if (numDebuggers == 0) {
-        return gcli.lookup("calllogStopNoLogging");
+        return l10n.lookup("calllogStopNoLogging");
       }
 
       for (let dbg of debuggers) {
@@ -86,12 +91,14 @@
       }
       debuggers = [];
 
-      return gcli.lookupFormat("calllogStopReply", [ numDebuggers ]);
+      return l10n.lookupFormat("calllogStopReply", [ numDebuggers ]);
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "calllog chromestart",
-    description: gcli.lookup("calllogChromeStartDesc"),
+    description: l10n.lookup("calllogChromeStartDesc"),
     get hidden() gcli.hiddenByChromePref(),
     params: [
       {
@@ -104,8 +111,8 @@
       {
         name: "source",
         type: "string",
-        description: gcli.lookup("calllogChromeSourceTypeDesc"),
-        manual: gcli.lookup("calllogChromeSourceTypeManual"),
+        description: l10n.lookup("calllogChromeSourceTypeDesc"),
+        manual: l10n.lookup("calllogChromeSourceTypeManual"),
       }
     ],
     exec: function(args, context) {
@@ -117,20 +124,20 @@
           globalObj = Cu.import(args.source);
         }
         catch (e) {
-          return gcli.lookup("callLogChromeInvalidJSM");
+          return l10n.lookup("callLogChromeInvalidJSM");
         }
       } else if (args.sourceType == "content-variable") {
         if (args.source in contentWindow) {
           globalObj = Cu.getGlobalForObject(contentWindow[args.source]);
         } else {
-          throw new Error(gcli.lookup("callLogChromeVarNotFoundContent"));
+          throw new Error(l10n.lookup("callLogChromeVarNotFoundContent"));
         }
       } else if (args.sourceType == "chrome-variable") {
         let chromeWin = context.environment.chromeDocument.defaultView;
         if (args.source in chromeWin) {
           globalObj = Cu.getGlobalForObject(chromeWin[args.source]);
         } else {
-          return gcli.lookup("callLogChromeVarNotFoundChrome");
+          return l10n.lookup("callLogChromeVarNotFoundChrome");
         }
       } else {
         let chromeWin = context.environment.chromeDocument.defaultView;
@@ -147,13 +154,13 @@
         } catch(e) {
           // We need to save the message before cleaning up else e contains a dead
           // object.
-          let msg = gcli.lookup("callLogChromeEvalException") + ": " + e;
+          let msg = l10n.lookup("callLogChromeEvalException") + ": " + e;
           Cu.nukeSandbox(sandbox);
           return msg;
         }
 
         if (typeof returnVal == "undefined") {
-          return gcli.lookup("callLogChromeEvalNeedsObject");
+          return l10n.lookup("callLogChromeEvalNeedsObject");
         }
 
         globalObj = Cu.getGlobalForObject(returnVal);
@@ -164,7 +171,7 @@
 
       dbg.onEnterFrame = function(frame) {
         // BUG 773652 -  Make the output from the GCLI calllog command nicer
-        contentWindow.console.log(gcli.lookup("callLogChromeMethodCall") +
+        contentWindow.console.log(l10n.lookup("callLogChromeMethodCall") +
                                   ": " + this.callDescription(frame));
       }.bind(this);
 
@@ -172,7 +179,7 @@
       let target = TargetFactory.forTab(gBrowser.selectedTab);
       gDevTools.showToolbox(target, "webconsole");
 
-      return gcli.lookup("calllogChromeStartReply");
+      return l10n.lookup("calllogChromeStartReply");
     },
 
     valueToString: function(value) {
@@ -182,19 +189,21 @@
     },
 
     callDescription: function(frame) {
-      let name = frame.callee.name || gcli.lookup("callLogChromeAnonFunction");
+      let name = frame.callee.name || l10n.lookup("callLogChromeAnonFunction");
       let args = frame.arguments.map(this.valueToString).join(", ");
       return name + "(" + args + ")";
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "calllog chromestop",
-    description: gcli.lookup("calllogChromeStopDesc"),
+    description: l10n.lookup("calllogChromeStopDesc"),
     get hidden() gcli.hiddenByChromePref(),
     exec: function(args, context) {
       let numDebuggers = chromeDebuggers.length;
       if (numDebuggers == 0) {
-        return gcli.lookup("calllogChromeStopNoLogging");
+        return l10n.lookup("calllogChromeStopNoLogging");
       }
 
       for (let dbg of chromeDebuggers) {
@@ -207,7 +216,7 @@
       chromeDebuggers = [];
       sandboxes = [];
 
-      return gcli.lookupFormat("calllogChromeStopReply", [ numDebuggers ]);
+      return l10n.lookupFormat("calllogChromeStopReply", [ numDebuggers ]);
     }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/cmd.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/cmd.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/cmd.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/cmd.js	2015-04-24 19:31:13.000000000 +0000
@@ -11,6 +11,7 @@
 const { OS } = Cu.import("resource://gre/modules/osfile.jsm", {});
 const { TextEncoder, TextDecoder } = Cu.import('resource://gre/modules/commonjs/toolkit/loader.js', {});
 const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 loader.lazyGetter(this, "prefBranch", function() {
   let prefService = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService);
@@ -127,11 +128,13 @@
     get hidden() {
       return !prefBranch.prefHasUserValue(PREF_DIR);
     },
-    description: gcli.lookup("cmdDesc")
+    description: l10n.lookup("cmdDesc")
   },
   {
+    item: "command",
+    runAt: "client",
     name: "cmd refresh",
-    description: gcli.lookup("cmdRefreshDesc"),
+    description: l10n.lookup("cmdRefreshDesc"),
     get hidden() {
       return !prefBranch.prefHasUserValue(PREF_DIR);
     },
@@ -140,17 +143,19 @@
 
       let dirName = prefBranch.getComplexValue(PREF_DIR,
                                               Ci.nsISupportsString).data.trim();
-      return gcli.lookupFormat("cmdStatus3", [ dirName ]);
+      return l10n.lookupFormat("cmdStatus3", [ dirName ]);
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "cmd setdir",
-    description: gcli.lookup("cmdSetdirDesc"),
-    manual: gcli.lookup("cmdSetdirManual2"),
+    description: l10n.lookup("cmdSetdirDesc"),
+    manual: l10n.lookup("cmdSetdirManual2"),
     params: [
       {
         name: "directory",
-        description: gcli.lookup("cmdSetdirDirectoryDesc"),
+        description: l10n.lookup("cmdSetdirDirectoryDesc"),
         type: {
           name: "file",
           filetype: "directory",
@@ -169,7 +174,7 @@
 
       gcli.load();
 
-      return gcli.lookupFormat("cmdStatus3", [ args.directory ]);
+      return l10n.lookupFormat("cmdStatus3", [ args.directory ]);
     }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/cookie.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/cookie.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/cookie.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/cookie.js	2015-04-24 19:31:13.000000000 +0000
@@ -4,9 +4,14 @@
 
 "use strict";
 
-const { Cc, Ci, Cu } = require("chrome");
-const gcli = require("gcli/index");
-const cookieMgr = Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager2);
+const { Ci, Cc } = require("chrome");
+const l10n = require("gcli/l10n");
+const URL = require("sdk/url").URL;
+
+XPCOMUtils.defineLazyGetter(this, "cookieMgr", function() {
+  const { Cc, Ci } = require("chrome");
+  return Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager2);
+});
 
 /**
  * Check host value and remove port part as it is not used
@@ -26,7 +31,7 @@
  */
 function translateExpires(expires) {
   if (expires == 0) {
-    return gcli.lookup("cookieListOutSession");
+    return l10n.lookup("cookieListOutSession");
   }
   return new Date(expires).toLocaleString();
 }
@@ -49,13 +54,15 @@
 exports.items = [
   {
     name: "cookie",
-    description: gcli.lookup("cookieDesc"),
-    manual: gcli.lookup("cookieManual")
+    description: l10n.lookup("cookieDesc"),
+    manual: l10n.lookup("cookieManual")
   },
   {
+    item: "command",
+    runAt: "server",
     name: "cookie list",
-    description: gcli.lookup("cookieListDesc"),
-    manual: gcli.lookup("cookieListManual"),
+    description: l10n.lookup("cookieListDesc"),
+    manual: l10n.lookup("cookieListManual"),
     returnType: "cookies",
     exec: function(args, context) {
       let host = sanitizeHost(context.environment.document.location.host);
@@ -83,14 +90,16 @@
     }
   },
   {
+    item: "command",
+    runAt: "server",
     name: "cookie remove",
-    description: gcli.lookup("cookieRemoveDesc"),
-    manual: gcli.lookup("cookieRemoveManual"),
+    description: l10n.lookup("cookieRemoveDesc"),
+    manual: l10n.lookup("cookieRemoveManual"),
     params: [
       {
         name: "name",
         type: "string",
-        description: gcli.lookup("cookieRemoveKeyDesc"),
+        description: l10n.lookup("cookieRemoveKeyDesc"),
       }
     ],
     exec: function(args, context) {
@@ -114,8 +123,9 @@
     to: "view",
     exec: function(cookies, context) {
       if (cookies.length == 0) {
-        let host = sanitizeHost(context.environment.document.location.host);
-        let msg = gcli.lookupFormat("cookieListOutNoneHost", [ host ]);
+        let host = new URL(context.environment.target.url).host;
+        host = sanitizeHost(host);
+        let msg = l10n.lookupFormat("cookieListOutNoneHost", [ host ]);
         return context.createView({ html: "<span>" + msg + "</span>" });
       }
 
@@ -126,7 +136,7 @@
         cookie.attrs = (cookie.secure ? "secure" : " ") +
                        (cookie.httpOnly ? "httpOnly" : " ") +
                        (cookie.sameDomain ? "sameDomain" : " ") +
-                       (noAttrs ? gcli.lookup("cookieListOutNone") : " ");
+                       (noAttrs ? l10n.lookup("cookieListOutNone") : " ");
       }
 
       return context.createView({
@@ -136,29 +146,29 @@
           "    <div>${cookie.name}=${cookie.value}</div>" +
           "    <table class='gcli-cookielist-detail'>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("cookieListOutHost") + "</td>" +
+          "        <td>" + l10n.lookup("cookieListOutHost") + "</td>" +
           "        <td>${cookie.host}</td>" +
           "      </tr>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("cookieListOutPath") + "</td>" +
+          "        <td>" + l10n.lookup("cookieListOutPath") + "</td>" +
           "        <td>${cookie.path}</td>" +
           "      </tr>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("cookieListOutExpires") + "</td>" +
+          "        <td>" + l10n.lookup("cookieListOutExpires") + "</td>" +
           "        <td>${cookie.expires}</td>" +
           "      </tr>" +
           "      <tr>" +
-          "        <td>" + gcli.lookup("cookieListOutAttributes") + "</td>" +
+          "        <td>" + l10n.lookup("cookieListOutAttributes") + "</td>" +
           "        <td>${cookie.attrs}</td>" +
           "      </tr>" +
           "      <tr><td colspan='2'>" +
           "        <span class='gcli-out-shortcut' onclick='${onclick}'" +
           "            data-command='cookie set ${cookie.name} '" +
-          "            >" + gcli.lookup("cookieListOutEdit") + "</span>" +
+          "            >" + l10n.lookup("cookieListOutEdit") + "</span>" +
           "        <span class='gcli-out-shortcut'" +
           "            onclick='${onclick}' ondblclick='${ondblclick}'" +
           "            data-command='cookie remove ${cookie.name}'" +
-          "            >" + gcli.lookup("cookieListOutRemove") + "</span>" +
+          "            >" + l10n.lookup("cookieListOutRemove") + "</span>" +
           "      </td></tr>" +
           "    </table>" +
           "  </li>" +
@@ -173,55 +183,57 @@
     }
   },
   {
+    item: "command",
+    runAt: "server",
     name: "cookie set",
-    description: gcli.lookup("cookieSetDesc"),
-    manual: gcli.lookup("cookieSetManual"),
+    description: l10n.lookup("cookieSetDesc"),
+    manual: l10n.lookup("cookieSetManual"),
     params: [
       {
         name: "name",
         type: "string",
-        description: gcli.lookup("cookieSetKeyDesc")
+        description: l10n.lookup("cookieSetKeyDesc")
       },
       {
         name: "value",
         type: "string",
-        description: gcli.lookup("cookieSetValueDesc")
+        description: l10n.lookup("cookieSetValueDesc")
       },
       {
-        group: gcli.lookup("cookieSetOptionsDesc"),
+        group: l10n.lookup("cookieSetOptionsDesc"),
         params: [
           {
             name: "path",
             type: { name: "string", allowBlank: true },
             defaultValue: "/",
-            description: gcli.lookup("cookieSetPathDesc")
+            description: l10n.lookup("cookieSetPathDesc")
           },
           {
             name: "domain",
             type: "string",
             defaultValue: null,
-            description: gcli.lookup("cookieSetDomainDesc")
+            description: l10n.lookup("cookieSetDomainDesc")
           },
           {
             name: "secure",
             type: "boolean",
-            description: gcli.lookup("cookieSetSecureDesc")
+            description: l10n.lookup("cookieSetSecureDesc")
           },
           {
             name: "httpOnly",
             type: "boolean",
-            description: gcli.lookup("cookieSetHttpOnlyDesc")
+            description: l10n.lookup("cookieSetHttpOnlyDesc")
           },
           {
             name: "session",
             type: "boolean",
-            description: gcli.lookup("cookieSetSessionDesc")
+            description: l10n.lookup("cookieSetSessionDesc")
           },
           {
             name: "expires",
             type: "string",
             defaultValue: "Jan 17, 2038",
-            description: gcli.lookup("cookieSetExpiresDesc")
+            description: l10n.lookup("cookieSetExpiresDesc")
           },
         ]
       }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/csscoverage.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/csscoverage.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/csscoverage.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/csscoverage.js	2015-04-24 19:31:13.000000000 +0000
@@ -6,7 +6,8 @@
 
 const { Cc, Ci } = require("chrome");
 
-const { gDevTools } = require("resource:///modules/devtools/gDevTools.jsm");
+loader.lazyGetter(this, "gDevTools", () => require("resource:///modules/devtools/gDevTools.jsm").gDevTools);
+
 const promise = require("resource://gre/modules/Promise.jsm").Promise;
 
 const domtemplate = require("gcli/util/domtemplate");
@@ -27,6 +28,8 @@
     description: l10n.lookup("csscoverageDesc"),
   },
   {
+    item: "command",
+    runAt: "client",
     name: "csscoverage start",
     hidden: true,
     description: l10n.lookup("csscoverageStartDesc2"),
@@ -48,6 +51,8 @@
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "csscoverage stop",
     hidden: true,
     description: l10n.lookup("csscoverageStopDesc2"),
@@ -62,6 +67,8 @@
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "csscoverage oneshot",
     hidden: true,
     description: l10n.lookup("csscoverageOneShotDesc2"),
@@ -76,6 +83,8 @@
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "csscoverage toggle",
     hidden: true,
     description: l10n.lookup("csscoverageToggleDesc2"),
@@ -110,6 +119,8 @@
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "csscoverage report",
     hidden: true,
     description: l10n.lookup("csscoverageReportDesc2"),
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/folder.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/folder.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/folder.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/folder.js	2015-04-24 19:31:13.000000000 +0000
@@ -6,7 +6,7 @@
 
 const { Cc, Ci, Cu, CC } = require("chrome");
 const { Services } = require("resource://gre/modules/Services.jsm");
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 const dirService = Cc["@mozilla.org/file/directory_service;1"]
                       .getService(Ci.nsIProperties);
 
@@ -19,29 +19,31 @@
 
     if (file.exists()) {
       file.reveal();
-      return gcli.lookupFormat("folderOpenDirResult", [aPath]);
+      return l10n.lookupFormat("folderOpenDirResult", [aPath]);
     } else {
-      return gcli.lookup("folderInvalidPath");
+      return l10n.lookup("folderInvalidPath");
     }
   } catch (e) {
-    return gcli.lookup("folderInvalidPath");
+    return l10n.lookup("folderInvalidPath");
   }
 }
 
 exports.items = [
   {
     name: "folder",
-    description: gcli.lookup("folderDesc")
+    description: l10n.lookup("folderDesc")
   },
   {
+    item: "command",
+    runAt: "client",
     name: "folder open",
-    description: gcli.lookup("folderOpenDesc"),
+    description: l10n.lookup("folderOpenDesc"),
     params: [
       {
         name: "path",
         type: { name: "string", allowBlank: true },
         defaultValue: "~",
-        description: gcli.lookup("folderOpenDir")
+        description: l10n.lookup("folderOpenDir")
       }
     ],
     returnType: "string",
@@ -60,8 +62,10 @@
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "folder openprofile",
-    description: gcli.lookup("folderOpenProfileDesc"),
+    description: l10n.lookup("folderOpenProfileDesc"),
     returnType: "string",
     exec: function(args, context) {
       // Get the profile directory.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/highlight.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/highlight.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/highlight.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/highlight.js	2015-04-24 19:31:13.000000000 +0000
@@ -5,7 +5,7 @@
 "use strict";
 
 const {Cc, Ci, Cu} = require("chrome");
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 require("devtools/server/actors/inspector");
 const {BoxModelHighlighter} = require("devtools/server/actors/highlighter");
 
@@ -13,6 +13,7 @@
   return Services.strings.createBundle("chrome://browser/locale/devtools/gclicommands.properties");
 });
 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm","resource://gre/modules/PluralForm.jsm");
+const events = require("sdk/event/core");
 
 // How many maximum nodes can be highlighted in parallel
 const MAX_HIGHLIGHTED_ELEMENTS = 100;
@@ -34,36 +35,38 @@
 
 exports.items = [
   {
+    item: "command",
+    runAt: "server",
     name: "highlight",
-    description: gcli.lookup("highlightDesc"),
-    manual: gcli.lookup("highlightManual"),
+    description: l10n.lookup("highlightDesc"),
+    manual: l10n.lookup("highlightManual"),
     params: [
       {
         name: "selector",
         type: "nodelist",
-        description: gcli.lookup("highlightSelectorDesc"),
-        manual: gcli.lookup("highlightSelectorManual")
+        description: l10n.lookup("highlightSelectorDesc"),
+        manual: l10n.lookup("highlightSelectorManual")
       },
       {
-        group: gcli.lookup("highlightOptionsDesc"),
+        group: l10n.lookup("highlightOptionsDesc"),
         params: [
           {
             name: "hideguides",
             type: "boolean",
-            description: gcli.lookup("highlightHideGuidesDesc"),
-            manual: gcli.lookup("highlightHideGuidesManual")
+            description: l10n.lookup("highlightHideGuidesDesc"),
+            manual: l10n.lookup("highlightHideGuidesManual")
           },
           {
             name: "showinfobar",
             type: "boolean",
-            description: gcli.lookup("highlightShowInfoBarDesc"),
-            manual: gcli.lookup("highlightShowInfoBarManual")
+            description: l10n.lookup("highlightShowInfoBarDesc"),
+            manual: l10n.lookup("highlightShowInfoBarManual")
           },
           {
             name: "showall",
             type: "boolean",
-            description: gcli.lookup("highlightShowAllDesc"),
-            manual: gcli.lookup("highlightShowAllManual")
+            description: l10n.lookup("highlightShowAllDesc"),
+            manual: l10n.lookup("highlightShowAllManual")
           },
           {
             name: "region",
@@ -71,22 +74,22 @@
               name: "selection",
               data: ["content", "padding", "border", "margin"]
             },
-            description: gcli.lookup("highlightRegionDesc"),
-            manual: gcli.lookup("highlightRegionManual"),
+            description: l10n.lookup("highlightRegionDesc"),
+            manual: l10n.lookup("highlightRegionManual"),
             defaultValue: "border"
           },
           {
             name: "fill",
             type: "string",
-            description: gcli.lookup("highlightFillDesc"),
-            manual: gcli.lookup("highlightFillManual"),
+            description: l10n.lookup("highlightFillDesc"),
+            manual: l10n.lookup("highlightFillManual"),
             defaultValue: null
           },
           {
             name: "keep",
             type: "boolean",
-            description: gcli.lookup("highlightKeepDesc"),
-            manual: gcli.lookup("highlightKeepManual"),
+            description: l10n.lookup("highlightKeepDesc"),
+            manual: l10n.lookup("highlightKeepManual"),
           }
         ]
       }
@@ -100,14 +103,7 @@
       let env = context.environment;
 
       // Unhighlight on navigate
-      env.target.once("navigate", unhighlightAll);
-
-      // Build a tab context for the highlighter (which normally takes a
-      // TabActor as parameter to its constructor)
-      let tabContext = {
-        browser: env.chromeWindow.gBrowser.getBrowserForDocument(env.document),
-        window: env.window
-      };
+      events.on(env.__deprecatedTabActor, "will-navigate", unhighlightAll);
 
       let i = 0;
       for (let node of args.selector) {
@@ -115,7 +111,7 @@
           break;
         }
 
-        let highlighter = new BoxModelHighlighter(tabContext);
+        let highlighter = new BoxModelHighlighter(env.__deprecatedTabActor);
         if (args.fill) {
           highlighter.regionFill[args.region] = args.fill;
         }
@@ -133,7 +129,7 @@
       let output = PluralForm.get(args.selector.length, highlightText)
                              .replace("%1$S", args.selector.length);
       if (args.selector.length > i) {
-        output = gcli.lookupFormat("highlightOutputMaxReached",
+        output = l10n.lookupFormat("highlightOutputMaxReached",
           ["" + args.selector.length, "" + i]);
       }
 
@@ -141,9 +137,11 @@
     }
   },
   {
+    item: "command",
+    runAt: "server",
     name: "unhighlight",
-    description: gcli.lookup("unhighlightDesc"),
-    manual: gcli.lookup("unhighlightManual"),
+    description: l10n.lookup("unhighlightDesc"),
+    manual: l10n.lookup("unhighlightManual"),
     exec: unhighlightAll
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/inject.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/inject.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/inject.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/inject.js	2015-04-24 19:31:13.000000000 +0000
@@ -6,13 +6,15 @@
 
 const { Services } = require("resource://gre/modules/Services.jsm");
 const { listenOnce } = require("devtools/async-utils");
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 exports.items = [
   {
+    item: "command",
+    runAt: "server",
     name: "inject",
-    description: gcli.lookup("injectDesc"),
-    manual: gcli.lookup("injectManual2"),
+    description: l10n.lookup("injectDesc"),
+    manual: l10n.lookup("injectManual2"),
     params: [{
       name: "library",
       type: {
@@ -49,7 +51,7 @@
           }
         ]
       },
-      description: gcli.lookup("injectLibraryDesc")
+      description: l10n.lookup("injectLibraryDesc")
     }],
     exec: function*(args, context) {
       let document = context.environment.document;
@@ -67,7 +69,7 @@
         // Check if URI is valid
         Services.io.newURI(src, null, null);
       } catch(e) {
-        return gcli.lookupFormat("injectFailed", [name]);
+        return l10n.lookupFormat("injectFailed", [name]);
       }
 
       let newSource = document.createElement("script");
@@ -78,7 +80,7 @@
 
       yield loadPromise;
 
-      return gcli.lookupFormat("injectLoaded", [name]);
+      return l10n.lookupFormat("injectLoaded", [name]);
     }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/jsb.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/jsb.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/jsb.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/jsb.js	2015-04-24 19:31:13.000000000 +0000
@@ -5,7 +5,7 @@
 "use strict";
 
 const { Cc, Ci, Cu } = require("chrome");
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 const XMLHttpRequest = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"];
 const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 
@@ -15,23 +15,25 @@
 
 exports.items = [
   {
+    item: "command",
+    runAt: "client",
     name: "jsb",
-    description: gcli.lookup("jsbDesc"),
+    description: l10n.lookup("jsbDesc"),
     returnValue:"string",
     params: [
       {
         name: "url",
         type: "string",
-        description: gcli.lookup("jsbUrlDesc")
+        description: l10n.lookup("jsbUrlDesc")
       },
       {
-        group: gcli.lookup("jsbOptionsDesc"),
+        group: l10n.lookup("jsbOptionsDesc"),
         params: [
           {
             name: "indentSize",
             type: "number",
-            description: gcli.lookup("jsbIndentSizeDesc"),
-            manual: gcli.lookup("jsbIndentSizeManual"),
+            description: l10n.lookup("jsbIndentSizeDesc"),
+            manual: l10n.lookup("jsbIndentSizeManual"),
             defaultValue: Preferences.get("devtools.editor.tabsize", 2),
           },
           {
@@ -43,27 +45,27 @@
                 { name: "tab", value: "\t" }
               ]
             },
-            description: gcli.lookup("jsbIndentCharDesc"),
-            manual: gcli.lookup("jsbIndentCharManual"),
+            description: l10n.lookup("jsbIndentCharDesc"),
+            manual: l10n.lookup("jsbIndentCharManual"),
             defaultValue: " ",
           },
           {
             name: "doNotPreserveNewlines",
             type: "boolean",
-            description: gcli.lookup("jsbDoNotPreserveNewlinesDesc")
+            description: l10n.lookup("jsbDoNotPreserveNewlinesDesc")
           },
           {
             name: "preserveMaxNewlines",
             type: "number",
-            description: gcli.lookup("jsbPreserveMaxNewlinesDesc"),
-            manual: gcli.lookup("jsbPreserveMaxNewlinesManual"),
+            description: l10n.lookup("jsbPreserveMaxNewlinesDesc"),
+            manual: l10n.lookup("jsbPreserveMaxNewlinesManual"),
             defaultValue: -1
           },
           {
             name: "jslintHappy",
             type: "boolean",
-            description: gcli.lookup("jsbJslintHappyDesc"),
-            manual: gcli.lookup("jsbJslintHappyManual")
+            description: l10n.lookup("jsbJslintHappyDesc"),
+            manual: l10n.lookup("jsbJslintHappyManual")
           },
           {
             name: "braceStyle",
@@ -71,20 +73,20 @@
               name: "selection",
               data: ["collapse", "expand", "end-expand", "expand-strict"]
             },
-            description: gcli.lookup("jsbBraceStyleDesc2"),
-            manual: gcli.lookup("jsbBraceStyleManual2"),
+            description: l10n.lookup("jsbBraceStyleDesc2"),
+            manual: l10n.lookup("jsbBraceStyleManual2"),
             defaultValue: "collapse"
           },
           {
             name: "noSpaceBeforeConditional",
             type: "boolean",
-            description: gcli.lookup("jsbNoSpaceBeforeConditionalDesc")
+            description: l10n.lookup("jsbNoSpaceBeforeConditionalDesc")
           },
           {
             name: "unescapeStrings",
             type: "boolean",
-            description: gcli.lookup("jsbUnescapeStringsDesc"),
-            manual: gcli.lookup("jsbUnescapeStringsManual")
+            description: l10n.lookup("jsbUnescapeStringsDesc"),
+            manual: l10n.lookup("jsbUnescapeStringsManual")
           }
         ]
       }
@@ -107,12 +109,12 @@
       try {
         xhr.open("GET", args.url, true);
       } catch(e) {
-        return gcli.lookup("jsbInvalidURL");
+        return l10n.lookup("jsbInvalidURL");
       }
 
       let deferred = context.defer();
 
-      xhr.onreadystatechange = function(aEvt) {
+      xhr.onreadystatechange = function() {
         if (xhr.readyState == 4) {
           if (xhr.status == 200 || xhr.status == 0) {
             let browserDoc = context.environment.chromeDocument;
@@ -124,8 +126,8 @@
 
             deferred.resolve();
           } else {
-            deferred.resolve("Unable to load page to beautify: " + args.url + " " +
-                             xhr.status + " " + xhr.statusText);
+            deferred.reject("Unable to load page to beautify: " + args.url + " " +
+                            xhr.status + " " + xhr.statusText);
           }
         };
       }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/listen.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/listen.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/listen.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/listen.js	2015-04-24 19:31:13.000000000 +0000
@@ -6,7 +6,7 @@
 
 const { Cc, Ci, Cu } = require("chrome");
 const Services = require("Services");
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "DevToolsLoader",
   "resource://gre/modules/devtools/Loader.jsm");
@@ -34,9 +34,11 @@
 
 exports.items = [
   {
+    item: "command",
+    runAt: "client",
     name: "listen",
-    description: gcli.lookup("listenDesc"),
-    manual: gcli.lookupFormat("listenManual2", [ BRAND_SHORT_NAME ]),
+    description: l10n.lookup("listenDesc"),
+    manual: l10n.lookupFormat("listenManual2", [ BRAND_SHORT_NAME ]),
     params: [
       {
         name: "port",
@@ -44,23 +46,23 @@
         get defaultValue() {
           return Services.prefs.getIntPref("devtools.debugger.chrome-debugging-port");
         },
-        description: gcli.lookup("listenPortDesc"),
+        description: l10n.lookup("listenPortDesc"),
       }
     ],
     exec: function(args, context) {
       var listener = debuggerServer.createListener();
       if (!listener) {
-        throw new Error(gcli.lookup("listenDisabledOutput"));
+        throw new Error(l10n.lookup("listenDisabledOutput"));
       }
 
       listener.portOrPath = args.port;
       listener.open();
 
       if (debuggerServer.initialized) {
-        return gcli.lookupFormat("listenInitOutput", [ "" + args.port ]);
+        return l10n.lookupFormat("listenInitOutput", [ "" + args.port ]);
       }
 
-      return gcli.lookup("listenNoInitOutput");
+      return l10n.lookup("listenNoInitOutput");
     },
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/media.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/media.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/media.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/media.js	2015-04-24 19:31:13.000000000 +0000
@@ -4,21 +4,23 @@
 
 "use strict";
 
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 exports.items = [
   {
     name: "media",
-    description: gcli.lookup("mediaDesc")
+    description: l10n.lookup("mediaDesc")
   },
   {
+    item: "command",
+    runAt: "client",
     name: "media emulate",
-    description: gcli.lookup("mediaEmulateDesc"),
-    manual: gcli.lookup("mediaEmulateManual"),
+    description: l10n.lookup("mediaEmulateDesc"),
+    manual: l10n.lookup("mediaEmulateManual"),
     params: [
       {
         name: "type",
-        description: gcli.lookup("mediaEmulateType"),
+        description: l10n.lookup("mediaEmulateType"),
         type: {
            name: "selection",
            data: [
@@ -35,8 +37,10 @@
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "media reset",
-    description: gcli.lookup("mediaResetDesc"),
+    description: l10n.lookup("mediaResetDesc"),
     exec: function(args, context) {
       let markupDocumentViewer = context.environment.chromeWindow
                                         .gBrowser.markupDocumentViewer;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/pagemod.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/pagemod.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/pagemod.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/pagemod.js	2015-04-24 19:31:13.000000000 +0000
@@ -5,58 +5,60 @@
 "use strict";
 
 const { Cc, Ci, Cu } = require("chrome");
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 exports.items = [
   {
     name: "pagemod",
-    description: gcli.lookup("pagemodDesc"),
+    description: l10n.lookup("pagemodDesc"),
   },
   {
+    item: "command",
+    runAt: "server",
     name: "pagemod replace",
-    description: gcli.lookup("pagemodReplaceDesc"),
+    description: l10n.lookup("pagemodReplaceDesc"),
     params: [
       {
         name: "search",
         type: "string",
-        description: gcli.lookup("pagemodReplaceSearchDesc"),
+        description: l10n.lookup("pagemodReplaceSearchDesc"),
       },
       {
         name: "replace",
         type: "string",
-        description: gcli.lookup("pagemodReplaceReplaceDesc"),
+        description: l10n.lookup("pagemodReplaceReplaceDesc"),
       },
       {
         name: "ignoreCase",
         type: "boolean",
-        description: gcli.lookup("pagemodReplaceIgnoreCaseDesc"),
+        description: l10n.lookup("pagemodReplaceIgnoreCaseDesc"),
       },
       {
         name: "selector",
         type: "string",
-        description: gcli.lookup("pagemodReplaceSelectorDesc"),
+        description: l10n.lookup("pagemodReplaceSelectorDesc"),
         defaultValue: "*:not(script):not(style):not(embed):not(object):not(frame):not(iframe):not(frameset)",
       },
       {
         name: "root",
         type: "node",
-        description: gcli.lookup("pagemodReplaceRootDesc"),
+        description: l10n.lookup("pagemodReplaceRootDesc"),
         defaultValue: null,
       },
       {
         name: "attrOnly",
         type: "boolean",
-        description: gcli.lookup("pagemodReplaceAttrOnlyDesc"),
+        description: l10n.lookup("pagemodReplaceAttrOnlyDesc"),
       },
       {
         name: "contentOnly",
         type: "boolean",
-        description: gcli.lookup("pagemodReplaceContentOnlyDesc"),
+        description: l10n.lookup("pagemodReplaceContentOnlyDesc"),
       },
       {
         name: "attributes",
         type: "string",
-        description: gcli.lookup("pagemodReplaceAttributesDesc"),
+        description: l10n.lookup("pagemodReplaceAttributesDesc"),
         defaultValue: null,
       },
     ],
@@ -114,39 +116,41 @@
         }
       }
 
-      return gcli.lookupFormat("pagemodReplaceResult",
+      return l10n.lookupFormat("pagemodReplaceResult",
                               [elements.length, replacedTextNodes,
                                 replacedAttributes]);
     }
   },
   {
     name: "pagemod remove",
-    description: gcli.lookup("pagemodRemoveDesc"),
+    description: l10n.lookup("pagemodRemoveDesc"),
   },
   {
+    item: "command",
+    runAt: "server",
     name: "pagemod remove element",
-    description: gcli.lookup("pagemodRemoveElementDesc"),
+    description: l10n.lookup("pagemodRemoveElementDesc"),
     params: [
       {
         name: "search",
         type: "string",
-        description: gcli.lookup("pagemodRemoveElementSearchDesc"),
+        description: l10n.lookup("pagemodRemoveElementSearchDesc"),
       },
       {
         name: "root",
         type: "node",
-        description: gcli.lookup("pagemodRemoveElementRootDesc"),
+        description: l10n.lookup("pagemodRemoveElementRootDesc"),
         defaultValue: null,
       },
       {
         name: "stripOnly",
         type: "boolean",
-        description: gcli.lookup("pagemodRemoveElementStripOnlyDesc"),
+        description: l10n.lookup("pagemodRemoveElementStripOnlyDesc"),
       },
       {
         name: "ifEmptyOnly",
         type: "boolean",
-        description: gcli.lookup("pagemodRemoveElementIfEmptyOnlyDesc"),
+        description: l10n.lookup("pagemodRemoveElementIfEmptyOnlyDesc"),
       },
     ],
     exec: function(args, context) {
@@ -171,34 +175,36 @@
         }
       }
 
-      return gcli.lookupFormat("pagemodRemoveElementResultMatchedAndRemovedElements",
+      return l10n.lookupFormat("pagemodRemoveElementResultMatchedAndRemovedElements",
                               [elements.length, removed]);
     }
   },
   {
+    item: "command",
+    runAt: "server",
     name: "pagemod remove attribute",
-    description: gcli.lookup("pagemodRemoveAttributeDesc"),
+    description: l10n.lookup("pagemodRemoveAttributeDesc"),
     params: [
       {
         name: "searchAttributes",
         type: "string",
-        description: gcli.lookup("pagemodRemoveAttributeSearchAttributesDesc"),
+        description: l10n.lookup("pagemodRemoveAttributeSearchAttributesDesc"),
       },
       {
         name: "searchElements",
         type: "string",
-        description: gcli.lookup("pagemodRemoveAttributeSearchElementsDesc"),
+        description: l10n.lookup("pagemodRemoveAttributeSearchElementsDesc"),
       },
       {
         name: "root",
         type: "node",
-        description: gcli.lookup("pagemodRemoveAttributeRootDesc"),
+        description: l10n.lookup("pagemodRemoveAttributeRootDesc"),
         defaultValue: null,
       },
       {
         name: "ignoreCase",
         type: "boolean",
-        description: gcli.lookup("pagemodRemoveAttributeIgnoreCaseDesc"),
+        description: l10n.lookup("pagemodRemoveAttributeIgnoreCaseDesc"),
       },
     ],
     exec: function(args, context) {
@@ -225,18 +231,20 @@
         }
       }
 
-      return gcli.lookupFormat("pagemodRemoveAttributeResult",
+      return l10n.lookupFormat("pagemodRemoveAttributeResult",
                               [elements.length, removed]);
     }
   },
   // This command allows the user to export the page to HTML after DOM changes
   {
     name: "export",
-    description: gcli.lookup("exportDesc"),
+    description: l10n.lookup("exportDesc"),
   },
   {
+    item: "command",
+    runAt: "server",
     name: "export html",
-    description: gcli.lookup("exportHtmlDesc"),
+    description: l10n.lookup("exportHtmlDesc"),
     params: [
       {
         name: "destination",
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/paintflashing.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/paintflashing.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/paintflashing.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/paintflashing.js	2015-04-24 19:31:13.000000000 +0000
@@ -14,11 +14,19 @@
 const eventEmitter = new EventEmitter();
 
 const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
-function onPaintFlashingChanged(context) {
-  let tab = context.environment.chromeWindow.gBrowser.selectedTab;
-  let target = TargetFactory.forTab(tab);
-
+/**
+ * Keep a store of the paintFlashing state here. This is a nasty hack but
+ * the only other way to know is to ask the server, which is async and we need
+ * the answer synchronously in "paintflashing toggle".state()
+ */
+let isContentPaintFlashing = false;
+
+/**
+ * Fire events and telemetry when paintFlashing happens
+ */
+function onPaintFlashingChanged(target, value) {
   eventEmitter.emit("changed", { target: target });
   function fireChange() {
     eventEmitter.emit("changed", { target: target });
@@ -27,25 +35,60 @@
   target.off("navigate", fireChange);
   target.once("navigate", fireChange);
 
-  let window = context.environment.window;
-  let wUtils = window.QueryInterface(Ci.nsIInterfaceRequestor)
-                     .getInterface(Ci.nsIDOMWindowUtils);
-  if (wUtils.paintFlashing) {
+  if (value) {
     telemetry.toolOpened("paintflashing");
   } else {
     telemetry.toolClosed("paintflashing");
   }
 }
 
+/**
+ * Alter the paintFlashing state of a window and report on the new value.
+ * This works with chrome or content windows.
+ *
+ * This is a bizarre method that you could argue should be broken up into
+ * separate getter and setter functions, however keeping it as one helps
+ * to simplify the commands below.
+ *
+ * @param state {string} One of:
+ * - "on" which does window.paintFlashing = true
+ * - "off" which does window.paintFlashing = false
+ * - "toggle" which does window.paintFlashing = !window.paintFlashing
+ * - "query" which does nothing
+ * @return The new value of the window.paintFlashing flag
+ */
+function setPaintFlashing(window, state) {
+  const winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                         .getInterface(Ci.nsIDOMWindowUtils)
+
+  if (["on", "off", "toggle", "query"].indexOf(state) === -1) {
+    throw new Error("Unsupported state: " + state);
+  }
+
+  if (state === "on") {
+    winUtils.paintFlashing = true;
+  }
+  else if (state === "off") {
+    winUtils.paintFlashing = false;
+  }
+  else if (state === "toggle") {
+    winUtils.paintFlashing = !winUtils.paintFlashing;
+  }
+
+  return winUtils.paintFlashing;
+}
+
 exports.items = [
   {
     name: "paintflashing",
-    description: gcli.lookup("paintflashingDesc")
+    description: l10n.lookup("paintflashingDesc")
   },
   {
+    item: "command",
+    runAt: "client",
     name: "paintflashing on",
-    description: gcli.lookup("paintflashingOnDesc"),
-    manual: gcli.lookup("paintflashingManual"),
+    description: l10n.lookup("paintflashingOnDesc"),
+    manual: l10n.lookup("paintflashingManual"),
     params: [{
       group: "options",
       params: [
@@ -53,25 +96,27 @@
           type: "boolean",
           name: "chrome",
           get hidden() gcli.hiddenByChromePref(),
-          description: gcli.lookup("paintflashingChromeDesc"),
+          description: l10n.lookup("paintflashingChromeDesc"),
         }
       ]
     }],
-    exec: function(args, context) {
-      let window = args.chrome ?
-                  context.environment.chromeWindow :
-                  context.environment.window;
-
-      window.QueryInterface(Ci.nsIInterfaceRequestor)
-            .getInterface(Ci.nsIDOMWindowUtils)
-            .paintFlashing = true;
-      onPaintFlashingChanged(context);
+    exec: function*(args, context) {
+      if (!args.chrome) {
+        const value = yield context.updateExec("paintflashing_server --state on");
+        isContentPaintFlashing = value;
+        onPaintFlashingChanged(context.environment.target, value);
+      }
+      else {
+        setPaintFlashing(context.environment.chromeWindow, "on");
+      }
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "paintflashing off",
-    description: gcli.lookup("paintflashingOffDesc"),
-    manual: gcli.lookup("paintflashingManual"),
+    description: l10n.lookup("paintflashingOffDesc"),
+    manual: l10n.lookup("paintflashingManual"),
     params: [{
       group: "options",
       params: [
@@ -79,57 +124,59 @@
           type: "boolean",
           name: "chrome",
           get hidden() gcli.hiddenByChromePref(),
-          description: gcli.lookup("paintflashingChromeDesc"),
+          description: l10n.lookup("paintflashingChromeDesc"),
         }
       ]
     }],
     exec: function(args, context) {
-      let window = args.chrome ?
-                  context.environment.chromeWindow :
-                  context.environment.window;
-
-      window.QueryInterface(Ci.nsIInterfaceRequestor)
-            .getInterface(Ci.nsIDOMWindowUtils)
-            .paintFlashing = false;
-      onPaintFlashingChanged(context);
+      if (!args.chrome) {
+        const value = yield context.updateExec("paintflashing_server --state off");
+        isContentPaintFlashing = value;
+        onPaintFlashingChanged(context.environment.target, value);
+      }
+      else {
+        setPaintFlashing(context.environment.chromeWindow, "off");
+      }
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "paintflashing toggle",
     hidden: true,
     buttonId: "command-button-paintflashing",
     buttonClass: "command-button command-button-invertable",
     state: {
-      isChecked: function(aTarget) {
-        if (aTarget.isLocalTab) {
-          let isChecked = false;
-          let window = aTarget.tab.linkedBrowser.contentWindow;
-          if (window) {
-            let wUtils = window.QueryInterface(Ci.nsIInterfaceRequestor).
-                                getInterface(Ci.nsIDOMWindowUtils);
-            isChecked = wUtils.paintFlashing;
-          }
-          return isChecked;
-        } else {
-          throw new Error("Unsupported target");
+      isChecked: () => isContentPaintFlashing,
+      onChange: (_, handler) => eventEmitter.on("changed", handler),
+      offChange: (_, handler) => eventEmitter.off("changed", handler),
+    },
+    tooltipText: l10n.lookup("paintflashingTooltip"),
+    description: l10n.lookup("paintflashingToggleDesc"),
+    manual: l10n.lookup("paintflashingManual"),
+    exec: function(args, context) {
+      const value = yield context.updateExec("paintflashing_server --state toggle");
+      isContentPaintFlashing = value;
+      onPaintFlashingChanged(context.environment.target, value);
+    }
+  },
+  {
+    item: "command",
+    runAt: "server",
+    name: "paintflashing_server",
+    hidden: true,
+    params: [
+      {
+        name: "state",
+        type: {
+          name: "selection",
+          data: [ "on", "off", "toggle", "query" ]
         }
       },
-      onChange: function(aTarget, aChangeHandler) {
-        eventEmitter.on("changed", aChangeHandler);
-      },
-      offChange: function(aTarget, aChangeHandler) {
-        eventEmitter.off("changed", aChangeHandler);
-      },
-    },
-    tooltipText: gcli.lookup("paintflashingTooltip"),
-    description: gcli.lookup("paintflashingToggleDesc"),
-    manual: gcli.lookup("paintflashingManual"),
+    ],
+    returnType: "boolean",
     exec: function(args, context) {
-      let window = context.environment.window;
-      let wUtils = window.QueryInterface(Ci.nsIInterfaceRequestor).
-                   getInterface(Ci.nsIDOMWindowUtils);
-      wUtils.paintFlashing = !wUtils.paintFlashing;
-      onPaintFlashingChanged(context);
+      return setPaintFlashing(context.environment.window, args.state);
     }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/restart.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/restart.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/restart.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/restart.js	2015-04-24 19:31:13.000000000 +0000
@@ -5,7 +5,7 @@
 "use strict";
 
 const { Cc, Ci, Cu } = require("chrome");
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 const Services = require("Services");
 
 const BRAND_SHORT_NAME = Cc["@mozilla.org/intl/stringbundle;1"]
@@ -27,13 +27,15 @@
  */
 exports.items = [
   {
+    item: "command",
+    runAt: "client",
     name: "restart",
-    description: gcli.lookupFormat("restartBrowserDesc", [ BRAND_SHORT_NAME ]),
+    description: l10n.lookupFormat("restartBrowserDesc", [ BRAND_SHORT_NAME ]),
     params: [
       {
         name: "nocache",
         type: "boolean",
-        description: gcli.lookup("restartBrowserNocacheDesc")
+        description: l10n.lookup("restartBrowserNocacheDesc")
       }
     ],
     returnType: "string",
@@ -42,7 +44,7 @@
                       .createInstance(Ci.nsISupportsPRBool);
       Services.obs.notifyObservers(canceled, "quit-application-requested", "restart");
       if (canceled.data) {
-        return gcli.lookup("restartBrowserRequestCancelled");
+        return l10n.lookup("restartBrowserRequestCancelled");
       }
 
       // disable loading content from cache.
@@ -54,7 +56,7 @@
       Cc["@mozilla.org/toolkit/app-startup;1"]
           .getService(Ci.nsIAppStartup)
           .quit(Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart);
-      return gcli.lookupFormat("restartBrowserRestarting", [ BRAND_SHORT_NAME ]);
+      return l10n.lookupFormat("restartBrowserRestarting", [ BRAND_SHORT_NAME ]);
     }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/rulers.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/rulers.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/rulers.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/rulers.js	2015-04-24 19:31:13.000000000 +0000
@@ -9,6 +9,7 @@
 const events = require("sdk/event/core");
 
 const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 require("devtools/server/actors/inspector");
 const { RulersHighlighter } = require("devtools/server/actors/highlighter");
 
@@ -17,11 +18,11 @@
 exports.items = [
   {
     name: "rulers",
-    description: gcli.lookup("rulersDesc"),
-    manual: gcli.lookup("rulersManual"),
+    description: l10n.lookup("rulersDesc"),
+    manual: l10n.lookup("rulersManual"),
     buttonId: "command-button-rulers",
     buttonClass: "command-button command-button-invertable",
-    tooltipText: gcli.lookup("rulersTooltip"),
+    tooltipText: l10n.lookup("rulersTooltip"),
     state: {
       isChecked: function(aTarget) {
         if (aTarget.isLocalTab) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/screenshot.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/screenshot.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/screenshot.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/screenshot.js	2015-04-24 19:31:13.000000000 +0000
@@ -5,7 +5,8 @@
 "use strict";
 
 const { Cc, Ci, Cu } = require("chrome");
-const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
+const { Services } = require("resource://gre/modules/Services.jsm");
 
 loader.lazyImporter(this, "Downloads", "resource://gre/modules/Downloads.jsm");
 loader.lazyImporter(this, "LayoutHelpers", "resource://gre/modules/devtools/LayoutHelpers.jsm");
@@ -21,241 +22,443 @@
 // format: "Screen Shot yyyy-mm-dd at HH.MM.SS.png"
 const FILENAME_DEFAULT_VALUE = " ";
 
+/*
+ * There are 2 commands and 1 converter here. The 2 commands are nearly
+ * identical except that one runs on the client and one in the server.
+ *
+ * The server command is hidden, and is designed to be called from the client
+ * command when the --chrome flag is *not* used.
+ */
+
+/**
+ * Both commands have the same initial filename parameter
+ */
+const filenameParam = {
+  name: "filename",
+  type: "string",
+  defaultValue: FILENAME_DEFAULT_VALUE,
+  description: l10n.lookup("screenshotFilenameDesc"),
+  manual: l10n.lookup("screenshotFilenameManual")
+};
+
+/**
+ * Both commands have the same set of standard optional parameters
+ */
+const standardParams = {
+  group: l10n.lookup("screenshotGroupOptions"),
+  params: [
+    {
+      name: "clipboard",
+      type: "boolean",
+      description: l10n.lookup("screenshotClipboardDesc"),
+      manual: l10n.lookup("screenshotClipboardManual")
+    },
+    {
+      name: "imgur",
+      hidden: true, // Hidden because it fails with "Could not reach imgur API"
+      type: "boolean",
+      description: l10n.lookup("screenshotImgurDesc"),
+      manual: l10n.lookup("screenshotImgurManual")
+    },
+    {
+      name: "delay",
+      type: { name: "number", min: 0 },
+      defaultValue: 0,
+      description: l10n.lookup("screenshotDelayDesc"),
+      manual: l10n.lookup("screenshotDelayManual")
+    },
+    {
+      name: "fullpage",
+      type: "boolean",
+      description: l10n.lookup("screenshotFullPageDesc"),
+      manual: l10n.lookup("screenshotFullPageManual")
+    },
+    {
+      name: "selector",
+      type: "node",
+      defaultValue: null,
+      description: l10n.lookup("inspectNodeDesc"),
+      manual: l10n.lookup("inspectNodeManual")
+    }
+  ]
+};
+
 exports.items = [
   {
+    /**
+     * Format an 'imageSummary' (as output by the screenshot command).
+     * An 'imageSummary' is a simple JSON object that looks like this:
+     *
+     * {
+     *   destinations: [ "..." ], // Required array of descriptions of the
+     *                            // locations of the result image (the command
+     *                            // can have multiple outputs)
+     *   data: "...",             // Optional Base64 encoded image data
+     *   width:1024, height:768,  // Dimensions of the image data, required
+     *                            // if data != null
+     *   filename: "...",         // If set, clicking the image will open the
+     *                            // folder containing the given file
+     *   href: "...",             // If set, clicking the image will open the
+     *                            // link in a new tab
+     * }
+     */
+    item: "converter",
+    from: "imageSummary",
+    to: "dom",
+    exec: function(imageSummary, context) {
+      const document = context.document;
+      const root = document.createElement("div");
+
+      // Add a line to the result for each destination
+      imageSummary.destinations.forEach(destination => {
+        const title = document.createElement("div");
+        title.textContent = destination;
+        root.appendChild(title);
+      });
+
+      // Add the thumbnail image
+      if (imageSummary.data != null) {
+        const image = context.document.createElement("div");
+        const previewHeight = parseInt(256 * imageSummary.height / imageSummary.width);
+        const style = "" +
+            "width: 256px;" +
+            "height: " + previewHeight + "px;" +
+            "max-height: 256px;" +
+            "background-image: url('" + imageSummary.data + "');" +
+            "background-size: 256px " + previewHeight + "px;" +
+            "margin: 4px;" +
+            "display: block;";
+        image.setAttribute("style", style);
+        root.appendChild(image);
+      }
+
+      // Click handler
+      if (imageSummary.filename) {
+        root.style.cursor = "pointer";
+        root.addEventListener("click", () => {
+          if (imageSummary.filename) {
+            const file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+            file.initWithPath(imageSummary.filename);
+            file.reveal();
+          }
+        });
+      }
+
+      return root;
+    }
+  },
+  {
+    item: "command",
+    runAt: "client",
     name: "screenshot",
-    description: gcli.lookup("screenshotDesc"),
-    manual: gcli.lookup("screenshotManual"),
-    returnType: "dom",
+    description: l10n.lookup("screenshotDesc"),
+    manual: l10n.lookup("screenshotManual"),
+    returnType: "imageSummary",
     buttonId: "command-button-screenshot",
     buttonClass: "command-button command-button-invertable",
-    tooltipText: gcli.lookup("screenshotTooltip"),
+    tooltipText: l10n.lookup("screenshotTooltip"),
     params: [
+      filenameParam,
+      standardParams,
       {
-        name: "filename",
-        type: "string",
-        defaultValue: FILENAME_DEFAULT_VALUE,
-        description: gcli.lookup("screenshotFilenameDesc"),
-        manual: gcli.lookup("screenshotFilenameManual")
-      },
-      {
-        group: gcli.lookup("screenshotGroupOptions"),
+        group: l10n.lookup("screenshotAdvancedOptions"),
         params: [
           {
-            name: "clipboard",
-            type: "boolean",
-            description: gcli.lookup("screenshotClipboardDesc"),
-            manual: gcli.lookup("screenshotClipboardManual")
-          },
-          {
             name: "chrome",
             type: "boolean",
-            description: gcli.lookupFormat("screenshotChromeDesc2", [BRAND_SHORT_NAME]),
-            manual: gcli.lookupFormat("screenshotChromeManual2", [BRAND_SHORT_NAME])
-          },
-          {
-            name: "delay",
-            type: { name: "number", min: 0 },
-            defaultValue: 0,
-            description: gcli.lookup("screenshotDelayDesc"),
-            manual: gcli.lookup("screenshotDelayManual")
+            description: l10n.lookupFormat("screenshotChromeDesc2", [BRAND_SHORT_NAME]),
+            manual: l10n.lookupFormat("screenshotChromeManual2", [BRAND_SHORT_NAME])
           },
-          {
-            name: "fullpage",
-            type: "boolean",
-            description: gcli.lookup("screenshotFullPageDesc"),
-            manual: gcli.lookup("screenshotFullPageManual")
-          },
-          {
-            name: "selector",
-            type: "node",
-            defaultValue: null,
-            description: gcli.lookup("inspectNodeDesc"),
-            manual: gcli.lookup("inspectNodeManual")
-          }
         ]
-      }
+      },
     ],
     exec: function(args, context) {
       if (args.chrome && args.selector) {
         // Node screenshot with chrome option does not work as intended
         // Refer https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
         // throwing for now.
-        throw new Error(gcli.lookup("screenshotSelectorChromeConflict"));
+        throw new Error(l10n.lookup("screenshotSelectorChromeConflict"));
       }
-      var document = args.chrome? context.environment.chromeDocument
-                                : context.environment.document;
-      if (args.delay > 0) {
-        var deferred = context.defer();
-        document.defaultView.setTimeout(() => {
-          this.grabScreen(document, args.filename, args.clipboard,
-                          args.fullpage).then(deferred.resolve, deferred.reject);
-        }, args.delay * 1000);
-        return deferred.promise;
+
+      if (!args.chrome) {
+        // Re-execute the command on the server
+        const command = context.typed.replace(/^screenshot/, "screenshot_server");
+        return context.updateExec(command).then(output => {
+          return output.error ? Promise.reject(output.data) : output.data;
+        });
       }
 
-      return this.grabScreen(document, args.filename, args.clipboard,
-                             args.fullpage, args.selector);
+      return processScreenshot(args, context.environment.chromeDocument);
     },
-    grabScreen: function(document, filename, clipboard, fullpage, node) {
-      return Task.spawn(function() {
-        let window = document.defaultView;
-        let canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
-        let left = 0;
-        let top = 0;
-        let width;
-        let height;
-        let div = document.createElementNS("http://www.w3.org/1999/xhtml", "div");
-        let currentX = window.scrollX;
-        let currentY = window.scrollY;
-
-        if (fullpage) {
-          // Bug 961832: GCLI screenshot shows fixed position element in wrong
-          // position if we don't scroll to top
-          window.scrollTo(0,0);
-          width = window.innerWidth + window.scrollMaxX;
-          height = window.innerHeight + window.scrollMaxY;
-        } else if (node) {
-          let lh = new LayoutHelpers(window);
-          let rect = lh.getRect(node, window);
-          top = rect.top;
-          left = rect.left;
-          width = rect.width;
-          height = rect.height;
-        } else {
-          left = window.scrollX;
-          top = window.scrollY;
-          width = window.innerWidth;
-          height = window.innerHeight;
-        }
+  },
+  {
+    item: "command",
+    runAt: "server",
+    name: "screenshot_server",
+    hidden: true,
+    returnType: "imageSummary",
+    params: [ filenameParam, standardParams ],
+    exec: function(args, context) {
+      return processScreenshot(args, context.environment.document);
+    },
+  }
+];
 
-        let winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor)
-                             .getInterface(Ci.nsIDOMWindowUtils);
-        let scrollbarHeight = {};
-        let scrollbarWidth = {};
-        winUtils.getScrollbarSize(false, scrollbarWidth, scrollbarHeight);
-        width -= scrollbarWidth.value;
-        height -= scrollbarHeight.value;
-
-        canvas.width = width;
-        canvas.height = height;
-        let ctx = canvas.getContext("2d");
-        ctx.drawWindow(window, left, top, width, height, "#fff");
-        let data = canvas.toDataURL("image/png", "");
+/**
+ * This function simply handles the --delay argument before calling
+ * processScreenshotNow
+ */
+function processScreenshot(args, document) {
+  if (args.delay > 0) {
+    return new Promise((resolve, reject) => {
+      document.defaultView.setTimeout(() => {
+        processScreenshotNow(args, document).then(resolve, reject);
+      }, args.delay * 1000);
+    });
+  }
+  else {
+    return processScreenshotNow(args, document);
+  }
+}
 
-        if(fullpage) {
-          window.scrollTo(currentX, currentY);
-        }
+/**
+ * There are several possible destinations for the screenshot, SKIP is used
+ * in processScreenshotNow() whenever one of them is not used
+ */
+const SKIP = Promise.resolve();
+
+/**
+ * This is just like exec, except the 'delay' has been handled already so
+ * this is where we do that actual work of process the screenshot
+ */
+function processScreenshotNow(args, document) {
+  const reply = createScreenshotData(document, args);
+
+  const loadContext = document.defaultView
+                            .QueryInterface(Ci.nsIInterfaceRequestor)
+                            .getInterface(Ci.nsIWebNavigation)
+                            .QueryInterface(Ci.nsILoadContext);
+
+  const fileNeeded = args.filename != FILENAME_DEFAULT_VALUE ||
+                      (!args.imgur && !args.clipboard);
+
+  return Promise.all([
+    args.clipboard ? saveToClipboard(loadContext, reply) : SKIP,
+    args.imgur     ? uploadToImgur(reply)                : SKIP,
+    fileNeeded     ? saveToFile(loadContext, reply)      : SKIP,
+  ]).then(() => reply);
+}
+
+/**
+ * This does the dirty work of creating a base64 string out of an
+ * area of the browser window
+ */
+function createScreenshotData(document, args) {
+  const window = document.defaultView;
+  let left = 0;
+  let top = 0;
+  let width;
+  let height;
+  const currentX = window.scrollX;
+  const currentY = window.scrollY;
+
+  if (args.fullpage) {
+    // Bug 961832: GCLI screenshot shows fixed position element in wrong
+    // position if we don't scroll to top
+    window.scrollTo(0,0);
+    width = window.innerWidth + window.scrollMaxX;
+    height = window.innerHeight + window.scrollMaxY;
+  }
+  else if (args.selector) {
+    const lh = new LayoutHelpers(window);
+    ({ top, left, width, height }) = lh.getRect(args.selector, window);
+  }
+  else {
+    left = window.scrollX;
+    top = window.scrollY;
+    width = window.innerWidth;
+    height = window.innerHeight;
+  }
 
-        let loadContext = document.defaultView
-                                  .QueryInterface(Ci.nsIInterfaceRequestor)
-                                  .getInterface(Ci.nsIWebNavigation)
-                                  .QueryInterface(Ci.nsILoadContext);
-
-        if (clipboard) {
-          try {
-            let io = Cc["@mozilla.org/network/io-service;1"]
-                      .getService(Ci.nsIIOService);
-            let channel = io.newChannel2(data,
-                                         null,
-                                         null,
-                                         null,      // aLoadingNode
-                                         Services.scriptSecurityManager.getSystemPrincipal(),
-                                         null,      // aTriggeringPrincipal
-                                         Ci.nsILoadInfo.SEC_NORMAL,
-                                         Ci.nsIContentPolicy.TYPE_IMAGE);
-            let input = channel.open();
-            let imgTools = Cc["@mozilla.org/image/tools;1"]
-                            .getService(Ci.imgITools);
-
-            let container = {};
-            imgTools.decodeImageData(input, channel.contentType, container);
-
-            let wrapped = Cc["@mozilla.org/supports-interface-pointer;1"]
-                            .createInstance(Ci.nsISupportsInterfacePointer);
-            wrapped.data = container.value;
-
-            let trans = Cc["@mozilla.org/widget/transferable;1"]
-                          .createInstance(Ci.nsITransferable);
-            trans.init(loadContext);
-            trans.addDataFlavor(channel.contentType);
-            trans.setTransferData(channel.contentType, wrapped, -1);
-
-            let clipid = Ci.nsIClipboard;
-            let clip = Cc["@mozilla.org/widget/clipboard;1"].getService(clipid);
-            clip.setData(trans, null, clipid.kGlobalClipboard);
-            div.textContent = gcli.lookup("screenshotCopied");
-          }
-          catch (ex) {
-            div.textContent = gcli.lookup("screenshotErrorCopying");
-          }
-          throw new Task.Result(div);
-        }
+  const winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                       .getInterface(Ci.nsIDOMWindowUtils);
+  const scrollbarHeight = {};
+  const scrollbarWidth = {};
+  winUtils.getScrollbarSize(false, scrollbarWidth, scrollbarHeight);
+  width -= scrollbarWidth.value;
+  height -= scrollbarHeight.value;
+
+  const canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
+  canvas.width = width;
+  canvas.height = height;
+  const ctx = canvas.getContext("2d");
+  ctx.drawWindow(window, left, top, width, height, "#fff");
+  const data = canvas.toDataURL("image/png", "");
+
+  // See comment above on bug 961832
+  if (args.fullpage) {
+    window.scrollTo(currentX, currentY);
+  }
 
-        let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+  return {
+    destinations: [],
+    data: data,
+    height: height,
+    width: width,
+    filename: getFilename(args.filename),
+  };
+}
+
+/**
+ * We may have a filename specified in args, or we might have to generate
+ * one.
+ */
+function getFilename(defaultName) {
+  // Create a name for the file if not present
+  if (defaultName != FILENAME_DEFAULT_VALUE) {
+    return defaultName;
+  }
 
-        // Create a name for the file if not present
-        if (filename == FILENAME_DEFAULT_VALUE) {
-          let date = new Date();
-          let dateString = date.getFullYear() + "-" + (date.getMonth() + 1) +
-                          "-" + date.getDate();
-          dateString = dateString.split("-").map(function(part) {
-            if (part.length == 1) {
-              part = "0" + part;
-            }
-            return part;
-          }).join("-");
-          let timeString = date.toTimeString().replace(/:/g, ".").split(" ")[0];
-          filename = gcli.lookupFormat("screenshotGeneratedFilename",
-                                      [dateString, timeString]) + ".png";
-        }
-        // Check there is a .png extension to filename
-        else if (!filename.match(/.png$/i)) {
-          filename += ".png";
+  const date = new Date();
+  let dateString = date.getFullYear() + "-" + (date.getMonth() + 1) +
+                  "-" + date.getDate();
+  dateString = dateString.split("-").map(function(part) {
+    if (part.length == 1) {
+      part = "0" + part;
+    }
+    return part;
+  }).join("-");
+
+  const timeString = date.toTimeString().replace(/:/g, ".").split(" ")[0];
+  return l10n.lookupFormat("screenshotGeneratedFilename",
+                           [ dateString, timeString ]) + ".png";
+}
+
+/**
+ * Save the image data to the clipboard. This returns a promise, so it can
+ * be treated exactly like imgur / file processing, but it's really sync
+ * for now.
+ */
+function saveToClipboard(loadContext, reply) {
+  try {
+    const io = Cc["@mozilla.org/network/io-service;1"]
+                  .getService(Ci.nsIIOService);
+    const channel = io.newChannel2(reply.data, null, null,
+                                   null,      // aLoadingNode
+                                   Services.scriptSecurityManager.getSystemPrincipal(),
+                                   null,      // aTriggeringPrincipal
+                                   Ci.nsILoadInfo.SEC_NORMAL,
+                                   Ci.nsIContentPolicy.TYPE_IMAGE);
+    const input = channel.open();
+    const imgTools = Cc["@mozilla.org/image/tools;1"]
+                        .getService(Ci.imgITools);
+
+    const container = {};
+    imgTools.decodeImageData(input, channel.contentType, container);
+
+    const wrapped = Cc["@mozilla.org/supports-interface-pointer;1"]
+                      .createInstance(Ci.nsISupportsInterfacePointer);
+    wrapped.data = container.value;
+
+    const trans = Cc["@mozilla.org/widget/transferable;1"]
+                    .createInstance(Ci.nsITransferable);
+    trans.init(loadContext);
+    trans.addDataFlavor(channel.contentType);
+    trans.setTransferData(channel.contentType, wrapped, -1);
+
+    const clip = Cc["@mozilla.org/widget/clipboard;1"]
+                    .getService(Ci.nsIClipboard);
+    clip.setData(trans, null, Ci.nsIClipboard.kGlobalClipboard);
+
+    reply.destinations.push(l10n.lookup("screenshotCopied"));
+  }
+  catch (ex) {
+    console.error(ex);
+    reply.destinations.push(l10n.lookup("screenshotErrorCopying"));
+  }
+
+  return Promise.resolve();
+}
+
+/**
+ * Upload screenshot data to Imgur, returning a promise of a URL (as a string)
+ */
+function uploadToImgur(reply) {
+  return new Promise((resolve, reject) => {
+    const xhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
+                  .createInstance(Ci.nsIXMLHttpRequest);
+    const fd = Cc["@mozilla.org/files/formdata;1"]
+                  .createInstance(Ci.nsIDOMFormData);
+    fd.append("image", reply.data.split(",")[1]);
+    fd.append("type", "base64");
+    fd.append("title", reply.filename);
+
+    const postURL = Services.prefs.getCharPref("devtools.gcli.imgurUploadURL");
+    const clientID = "Client-ID " + Services.prefs.getCharPref("devtools.gcli.imgurClientID");
+
+    xhr.open("POST", postURL);
+    xhr.setRequestHeader("Authorization", clientID);
+    xhr.send(fd);
+    xhr.responseType = "json";
+
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState == 4) {
+        if (xhr.status == 200) {
+          reply.href = xhr.response.data.link;
+          reply.destinations.push(l10n.lookupFormat("screenshotImgurError",
+                                                    [ reply.href ]));
         }
-        // If the filename is relative, tack it onto the download directory
-        if (!filename.match(/[\\\/]/)) {
-          let preferredDir = yield Downloads.getPreferredDownloadsDirectory();
-          filename = OS.Path.join(preferredDir, filename);
+        else {
+          reply.destinations.push(l10n.lookup("screenshotImgurError"));
         }
 
-        try {
-          file.initWithPath(filename);
-        } catch (ex) {
-          div.textContent = gcli.lookup("screenshotErrorSavingToFile") + " " + filename;
-          throw new Task.Result(div);
-        }
+        resolve();
+      }
+    }
+  });
+}
 
-        let ioService = Cc["@mozilla.org/network/io-service;1"]
-                          .getService(Ci.nsIIOService);
+/**
+ * Save the screenshot data to disk, returning a promise which
+ * is resolved on completion
+ */
+function saveToFile(loadContext, reply) {
+  return Task.spawn(function*() {
+    try {
+      let filename = reply.filename;
+      // Check there is a .png extension to filename
+      if (!filename.match(/.png$/i)) {
+        filename += ".png";
+      }
 
-        let Persist = Ci.nsIWebBrowserPersist;
-        let persist = Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
-                        .createInstance(Persist);
-        persist.persistFlags = Persist.PERSIST_FLAGS_REPLACE_EXISTING_FILES |
-                               Persist.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
-
-        let source = ioService.newURI(data, "UTF8", null);
-        persist.saveURI(source, null, null, 0, null, null, file, loadContext);
-
-        div.textContent = gcli.lookup("screenshotSavedToFile") + " \"" + filename +
-                          "\"";
-        div.addEventListener("click", function openFile() {
-          div.removeEventListener("click", openFile);
-          file.reveal();
-        });
-        div.style.cursor = "pointer";
-        let image = document.createElement("div");
-        let previewHeight = parseInt(256*height/width);
-        image.setAttribute("style",
-                          "width:256px; height:" + previewHeight + "px;" +
-                          "max-height: 256px;" +
-                          "background-image: url('" + data + "');" +
-                          "background-size: 256px " + previewHeight + "px;" +
-                          "margin: 4px; display: block");
-        div.appendChild(image);
-        throw new Task.Result(div);
-      });
+      // If the filename is relative, tack it onto the download directory
+      if (!filename.match(/[\\\/]/)) {
+        const preferredDir = yield Downloads.getPreferredDownloadsDirectory();
+        filename = OS.Path.join(preferredDir, filename);
+        reply.filename = filename;
+      }
+
+      const file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+      file.initWithPath(filename);
+
+      const ioService = Cc["@mozilla.org/network/io-service;1"]
+                        .getService(Ci.nsIIOService);
+
+      const Persist = Ci.nsIWebBrowserPersist;
+      const persist = Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
+                      .createInstance(Persist);
+      persist.persistFlags = Persist.PERSIST_FLAGS_REPLACE_EXISTING_FILES |
+                             Persist.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
+
+      // TODO: UTF8? For an image?
+      const source = ioService.newURI(reply.data, "UTF8", null);
+      persist.saveURI(source, null, null, 0, null, null, file, loadContext);
+
+      reply.destinations.push(l10n.lookup("screenshotSavedToFile") + " \"" + filename + "\"");
     }
-  }
-];
+    catch (ex) {
+      console.error(ex);
+      reply.destinations.push(l10n.lookup("screenshotErrorSavingToFile") + " " + filename);
+    }
+  });
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/tools.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/tools.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/commands/tools.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/commands/tools.js	2015-04-24 19:31:13.000000000 +0000
@@ -9,6 +9,7 @@
 const { OS } = require("resource://gre/modules/osfile.jsm");
 const { devtools } = require("resource://gre/modules/devtools/Loader.jsm");
 const gcli = require("gcli/index");
+const l10n = require("gcli/l10n");
 
 const BRAND_SHORT_NAME = Cc["@mozilla.org/intl/stringbundle;1"]
                            .getService(Ci.nsIStringBundleService)
@@ -18,14 +19,16 @@
 exports.items = [
   {
     name: "tools",
-    description: gcli.lookupFormat("toolsDesc2", [ BRAND_SHORT_NAME ]),
-    manual: gcli.lookupFormat("toolsManual2", [ BRAND_SHORT_NAME ]),
+    description: l10n.lookupFormat("toolsDesc2", [ BRAND_SHORT_NAME ]),
+    manual: l10n.lookupFormat("toolsManual2", [ BRAND_SHORT_NAME ]),
     get hidden() gcli.hiddenByChromePref(),
   },
   {
+    item: "command",
+    runAt: "client",
     name: "tools srcdir",
-    description: gcli.lookup("toolsSrcdirDesc"),
-    manual: gcli.lookupFormat("toolsSrcdirManual2", [ BRAND_SHORT_NAME ]),
+    description: l10n.lookup("toolsSrcdirDesc"),
+    manual: l10n.lookupFormat("toolsSrcdirManual2", [ BRAND_SHORT_NAME ]),
     get hidden() gcli.hiddenByChromePref(),
     params: [
       {
@@ -35,7 +38,7 @@
           filetype: "directory",
           existing: "yes"
         } */,
-        description: gcli.lookup("toolsSrcdirDir")
+        description: l10n.lookup("toolsSrcdirDir")
       }
     ],
     returnType: "string",
@@ -50,29 +53,33 @@
                                          Ci.nsISupportsString, str);
           devtools.reload();
 
-          let msg = gcli.lookupFormat("toolsSrcdirReloaded", [ args.srcdir ]);
+          let msg = l10n.lookupFormat("toolsSrcdirReloaded", [ args.srcdir ]);
           throw new Error(msg);
         }
 
-        return gcli.lookupFormat("toolsSrcdirNotFound", [ args.srcdir ]);
+        return l10n.lookupFormat("toolsSrcdirNotFound", [ args.srcdir ]);
       });
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "tools builtin",
-    description: gcli.lookup("toolsBuiltinDesc"),
-    manual: gcli.lookup("toolsBuiltinManual"),
+    description: l10n.lookup("toolsBuiltinDesc"),
+    manual: l10n.lookup("toolsBuiltinManual"),
     get hidden() gcli.hiddenByChromePref(),
     returnType: "string",
     exec: function(args, context) {
       Services.prefs.clearUserPref("devtools.loader.srcdir");
       devtools.reload();
-      return gcli.lookup("toolsBuiltinReloaded");
+      return l10n.lookup("toolsBuiltinReloaded");
     }
   },
   {
+    item: "command",
+    runAt: "client",
     name: "tools reload",
-    description: gcli.lookup("toolsReloadDesc"),
+    description: l10n.lookup("toolsReloadDesc"),
     get hidden() {
       return gcli.hiddenByChromePref() ||
              !Services.prefs.prefHasUserValue("devtools.loader.srcdir");
@@ -81,7 +88,7 @@
     returnType: "string",
     exec: function(args, context) {
       devtools.reload();
-      return gcli.lookup("toolsReloaded2");
+      return l10n.lookup("toolsReloaded2");
     }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/moz.build	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/moz.build	2015-04-24 19:31:13.000000000 +0000
@@ -43,10 +43,6 @@
 
 EXTRA_JS_MODULES.devtools.gcli.connectors += [
     'source/lib/gcli/connectors/connectors.js',
-    'source/lib/gcli/connectors/index.js',
-    'source/lib/gcli/connectors/protocol.js',
-    'source/lib/gcli/connectors/rdp.js',
-    'source/lib/gcli/connectors/remoted.js',
 ]
 
 EXTRA_JS_MODULES.devtools.gcli.converters += [
@@ -71,7 +67,6 @@
 
 EXTRA_JS_MODULES.devtools.gcli.mozui += [
     'source/lib/gcli/mozui/completer.js',
-    'source/lib/gcli/mozui/ffdisplay.js',
     'source/lib/gcli/mozui/inputter.js',
     'source/lib/gcli/mozui/tooltip.js',
 ]
@@ -120,11 +115,11 @@
 ]
 
 EXTRA_JS_MODULES.devtools.gcli += [
-    'source/lib/gcli/api.js',
     'source/lib/gcli/cli.js',
     'source/lib/gcli/index.js',
     'source/lib/gcli/l10n.js',
     'source/lib/gcli/settings.js',
+    'source/lib/gcli/system.js',
 ]
 
 EXTRA_JS_MODULES.devtools += [
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/docs/writing-commands.md thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/docs/writing-commands.md
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/docs/writing-commands.md	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/docs/writing-commands.md	2015-04-24 19:31:13.000000000 +0000
@@ -89,7 +89,8 @@
 GCLI supports Mozilla style localization. To add a command that will only ever
 be used embedded in Firefox, this is the way to go. Your strings should be
 stored in ``browser/locales/en-US/chrome/browser/devtools/gclicommands.properties``,
-And you should access them using ``gcli.lookup(...)`` or ``gcli.lookupFormat()``
+And you should access them using ``let l10n = require("gcli/l10n")`` and then
+``l10n.lookup(...)`` or ``l10n.lookupFormat()``
 
 For examples of existing commands, take a look in
 ``browser/devtools/webconsole/GcliCommands.jsm``, which contains most of the
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/docs/writing-types.md thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/docs/writing-types.md
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/docs/writing-types.md	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/docs/writing-types.md	2015-04-24 19:31:13.000000000 +0000
@@ -7,7 +7,7 @@
 
 * string. This is a JavaScript string
 * number. A JavaScript number
-* boolean. A Javascript boolean
+* boolean. A JavaScript boolean
 * selection. This is an selection from a number of alternatives
 * delegate. This type could change depending on other factors, but is well
   defined when one of the conversion routines is called.
@@ -49,10 +49,10 @@
      */
     name: 'example',
 
-In addition, defining the following functions can be helpful, although Type
+In addition, defining the following function can be helpful, although Type
 contains default implementations:
-* increment(value)
-* decrement(value)
+
+* nudge(value, by)
 
 Type, Conversion and Status are all declared by commands.js.
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/api.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/api.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/api.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/api.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,217 +0,0 @@
-/*
- * Copyright 2012, Mozilla Foundation and contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-var Promise = require('./util/promise').Promise;
-var Commands = require('./commands/commands').Commands;
-var Connectors = require('./connectors/connectors').Connectors;
-var Converters = require('./converters/converters').Converters;
-var Fields = require('./fields/fields').Fields;
-var Languages = require('./languages/languages').Languages;
-var Settings = require('./settings').Settings;
-var Types = require('./types/types').Types;
-
-/**
- * This is the heart of the API that we expose to the outside
- */
-exports.createSystem = function() {
-
-  var components = {
-    connector: new Connectors(),
-    converter: new Converters(),
-    field: new Fields(),
-    language: new Languages(),
-    type: new Types()
-  };
-  components.setting = new Settings(components.type);
-  components.command = new Commands(components.type);
-
-  var getItemType = function(item) {
-    if (item.item) {
-      return item.item;
-    }
-    // Some items are registered using the constructor so we need to check
-    // the prototype for the the type of the item
-    return (item.prototype && item.prototype.item) ?
-           item.prototype.item : 'command';
-  };
-
-  var addItem = function(item) {
-    components[getItemType(item)].add(item);
-  };
-
-  var removeItem = function(item) {
-    components[getItemType(item)].remove(item);
-  };
-
-  /**
-   * loadableModules is a lookup of names to module loader functions (like
-   * the venerable 'require') to which we can pass a name and get back a
-   * JS object (or a promise of a JS object). This allows us to have custom
-   * loaders to get stuff from the filesystem etc.
-   */
-  var loadableModules = {};
-
-  /**
-   * loadedModules is a lookup by name of the things returned by the functions
-   * in loadableModules so we can track what we need to unload / reload.
-   */
-  var loadedModules = {};
-
-  var unloadModule = function(name) {
-    var existingModule = loadedModules[name];
-    if (existingModule != null) {
-      existingModule.items.forEach(removeItem);
-    }
-    delete loadedModules[name];
-  };
-
-  var loadModule = function(name) {
-    var existingModule = loadedModules[name];
-    unloadModule(name);
-
-    // And load the new items
-    try {
-      var loader = loadableModules[name];
-      return Promise.resolve(loader(name)).then(function(newModule) {
-        if (existingModule === newModule) {
-          return;
-        }
-
-        if (newModule == null) {
-          throw 'Module \'' + name + '\' not found';
-        }
-
-        if (newModule.items == null || typeof newModule.items.forEach !== 'function') {
-          console.log('Exported properties: ' + Object.keys(newModule).join(', '));
-          throw 'Module \'' + name + '\' has no \'items\' array export';
-        }
-
-        newModule.items.forEach(addItem);
-
-        loadedModules[name] = newModule;
-      });
-    }
-    catch (ex) {
-      console.error(ex);
-      return Promise.reject('Failure when loading \'' + name + '\'');
-    }
-  };
-
-  var pendingChanges = false;
-
-  var api = {
-    addItems: function(items) {
-      items.forEach(addItem);
-    },
-
-    removeItems: function(items) {
-      items.forEach(removeItem);
-    },
-
-    addItemsByModule: function(names, options) {
-      options = options || {};
-      if (typeof names === 'string') {
-        names = [ names ];
-      }
-      names.forEach(function(name) {
-        if (options.loader == null) {
-          options.loader = function(name) {
-            return require(name);
-          };
-        }
-        loadableModules[name] = options.loader;
-
-        if (options.delayedLoad) {
-          pendingChanges = true;
-        }
-        else {
-          loadModule(name).then(null, console.error);
-        }
-      });
-    },
-
-    removeItemsByModule: function(name) {
-      delete loadableModules[name];
-      unloadModule(name);
-    },
-
-    load: function() {
-      if (!pendingChanges) {
-        return Promise.resolve();
-      }
-
-      // clone loadedModules, so we can remove what is left at the end
-      var modules = Object.keys(loadedModules).map(function(name) {
-        return loadedModules[name];
-      });
-
-      var promises = Object.keys(loadableModules).map(function(name) {
-        delete modules[name];
-        return loadModule(name);
-      });
-
-      Object.keys(modules).forEach(unloadModule);
-      pendingChanges = false;
-
-      return Promise.all(promises);
-    }
-  };
-
-  Object.defineProperty(api, 'commands', {
-    get: function() { return components.command; },
-    set: function(commands) { components.command = commands; },
-    enumerable: true
-  });
-
-  Object.defineProperty(api, 'connectors', {
-    get: function() { return components.connector; },
-    enumerable: true
-  });
-
-  Object.defineProperty(api, 'converters', {
-    get: function() { return components.converter; },
-    enumerable: true
-  });
-
-  Object.defineProperty(api, 'fields', {
-    get: function() { return components.field; },
-    enumerable: true
-  });
-
-  Object.defineProperty(api, 'languages', {
-    get: function() { return components.language; },
-    enumerable: true
-  });
-
-  Object.defineProperty(api, 'settings', {
-    get: function() { return components.setting; },
-    enumerable: true
-  });
-
-  Object.defineProperty(api, 'types', {
-    get: function() { return components.type; },
-    set: function(types) {
-      components.type = types;
-      components.command.types = types;
-      components.setting.types = types;
-    },
-    enumerable: true
-  });
-
-  return api;
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/cli.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/cli.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/cli.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/cli.js	2015-04-24 19:31:13.000000000 +0000
@@ -101,16 +101,6 @@
 };
 
 /**
- * Some manual intervention is needed in parsing the { command.
- */
-function getEvalCommand(commands) {
-  if (getEvalCommand._cmd == null) {
-    getEvalCommand._cmd = commands.get(evalCmd.name);
-  }
-  return getEvalCommand._cmd;
-}
-
-/**
  * Assignment is a link between a parameter and the data for that parameter.
  * The data for the parameter is available as in the preferred type and as
  * an Argument for the CLI.
@@ -318,7 +308,7 @@
     var reply = customEval(args.javascript);
     return context.typedData(typeof reply, reply);
   },
-  isCommandRegexp: /^\s*{\s*/
+  isCommandRegexp: /^\s*\{\s*/
 };
 
 exports.items = [ evalCmd ];
@@ -585,11 +575,12 @@
         enumerable: true
       });
 
+      this._executionContext.updateExec = this._contextUpdateExec.bind(this);
+
       if (legacy) {
         this._executionContext.createView = view.createView;
         this._executionContext.exec = this.exec.bind(this);
         this._executionContext.update = this._contextUpdate.bind(this);
-        this._executionContext.updateExec = this._contextUpdateExec.bind(this);
 
         Object.defineProperty(this._executionContext, 'document', {
           get: function() { return requisition.document; },
@@ -669,7 +660,7 @@
  * this is still an error status.
  */
 Object.defineProperty(Requisition.prototype, 'status', {
-  get : function() {
+  get: function() {
     var status = Status.VALID;
     if (this._unassigned.length !== 0) {
       var isAllIncomplete = true;
@@ -704,7 +695,8 @@
  */
 Requisition.prototype.getStatusMessage = function() {
   if (this.commandAssignment.getStatus() !== Status.VALID) {
-    return l10n.lookup('cliUnknownCommand');
+    return l10n.lookupFormat('cliUnknownCommand2',
+                             [ this.commandAssignment.arg.text ]);
   }
 
   var assignments = this.getAssignments();
@@ -1455,26 +1447,9 @@
 /**
  * Replace the current value with the lower value if such a concept exists.
  */
-Requisition.prototype.decrement = function(assignment) {
+Requisition.prototype.nudge = function(assignment, by) {
   var ctx = this.executionContext;
-  var val = assignment.param.type.decrement(assignment.value, ctx);
-  return Promise.resolve(val).then(function(replacement) {
-    if (replacement != null) {
-      var val = assignment.param.type.stringify(replacement, ctx);
-      return Promise.resolve(val).then(function(str) {
-        var arg = assignment.arg.beget({ text: str });
-        return this.setAssignment(assignment, arg);
-      }.bind(this));
-    }
-  }.bind(this));
-};
-
-/**
- * Replace the current value with the higher value if such a concept exists.
- */
-Requisition.prototype.increment = function(assignment) {
-  var ctx = this.executionContext;
-  var val = assignment.param.type.increment(assignment.value, ctx);
+  var val = assignment.param.type.nudge(assignment.value, by, ctx);
   return Promise.resolve(val).then(function(replacement) {
     if (replacement != null) {
       var val = assignment.param.type.stringify(replacement, ctx);
@@ -1786,8 +1761,8 @@
   if (args[0].type === 'ScriptArgument') {
     // Special case: if the user enters { console.log('foo'); } then we need to
     // use the hidden 'eval' command
-    conversion = new Conversion(getEvalCommand(this.system.commands),
-                                new ScriptArgument());
+    var command = this.system.commands.get(evalCmd.name);
+    conversion = new Conversion(command, new ScriptArgument());
     this._setAssignmentInternal(this.commandAssignment, conversion);
     return;
   }
@@ -2045,7 +2020,7 @@
     typed = typed.replace(/\s*}\s*$/, '');
   }
 
-  var output = new Output(this.conversionContext, {
+  var output = new Output({
     command: command,
     args: args,
     typed: typed,
@@ -2115,10 +2090,15 @@
  * unexpected change to the current command.
  */
 Requisition.prototype._contextUpdateExec = function(typed, options) {
-  return this.updateExec(typed, options).then(function(reply) {
-    this.onExternalUpdate({ typed: typed });
+  var reqOpts = {
+    document: this.document,
+    environment: this.environment
+  };
+  var child = new Requisition(this.system, reqOpts);
+  return child.updateExec(typed, options).then(function(reply) {
+    child.destroy();
     return reply;
-  }.bind(this));
+  }.bind(child));
 };
 
 /**
@@ -2138,14 +2118,13 @@
 /**
  * A simple object to hold information about the output of a command
  */
-function Output(context, options) {
+function Output(options) {
   options = options || {};
   this.command = options.command || '';
   this.args = options.args || {};
   this.typed = options.typed || '';
   this.canonical = options.canonical || '';
   this.hidden = options.hidden === true ? true : false;
-  this.converters = context.system.converters;
 
   this.type = undefined;
   this.data = undefined;
@@ -2190,15 +2169,28 @@
  * Call converters.convert using the data in this Output object
  */
 Output.prototype.convert = function(type, conversionContext) {
-  return this.converters.convert(this.data, this.type, type, conversionContext);
+  var converters = conversionContext.system.converters;
+  return converters.convert(this.data, this.type, type, conversionContext);
 };
 
 Output.prototype.toJson = function() {
+  // Exceptions don't stringify, so we try a bit harder
+  var data = this.data;
+  if (this.error && JSON.stringify(this.data) === '{}') {
+    data = {
+      columnNumber: data.columnNumber,
+      fileName: data.fileName,
+      lineNumber: data.lineNumber,
+      message: data.message,
+      stack: data.stack
+    };
+  }
+
   return {
     typed: this.typed,
     type: this.type,
-    data: this.data,
-    error: this.error
+    data: data,
+    isError: this.error
   };
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/clear.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/clear.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/clear.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/clear.js	2015-04-24 19:31:13.000000000 +0000
@@ -22,6 +22,7 @@
   {
     // A command to clear the output area
     item: 'command',
+    runAt: 'client',
     name: 'clear',
     description: l10n.lookup('clearDesc'),
     returnType: 'clearoutput',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/commands.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/commands.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/commands.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/commands.js	2015-04-24 19:31:13.000000000 +0000
@@ -161,8 +161,11 @@
 
 /**
  * JSON serializer that avoids non-serializable data
+ * @param customProps Array of strings containing additional properties which,
+ * if specified in the command spec, will be included in the JSON. Normally we
+ * transfer only the properties required for GCLI to function.
  */
-Command.prototype.toJson = function() {
+Command.prototype.toJson = function(customProps) {
   var json = {
     item: 'command',
     name: this.name,
@@ -170,6 +173,7 @@
     returnType: this.returnType,
     isParent: (this.exec == null)
   };
+
   if (this.description !==  l10n.lookup('canonDescNone')) {
     json.description = this.description;
   }
@@ -179,10 +183,32 @@
   if (this.hidden != null) {
     json.hidden = this.hidden;
   }
+
+  if (Array.isArray(customProps)) {
+    customProps.forEach(function(prop) {
+      if (this[prop] != null) {
+        json[prop] = this[prop];
+      }
+    }.bind(this));
+  }
+
   return json;
 };
 
 /**
+ * Easy way to lookup parameters by full name
+ */
+Command.prototype.getParameterByName = function(name) {
+  var reply;
+  this.params.forEach(function(param) {
+    if (param.name === name) {
+      reply = param;
+    }
+  });
+  return reply;
+};
+
+/**
  * Easy way to lookup parameters by short name
  */
 Command.prototype.getParameterByShortName = function(short) {
@@ -251,9 +277,17 @@
                     ': Missing defaultValue for optional parameter.');
   }
 
-  this.defaultValue = (this.paramSpec.defaultValue !== undefined) ?
-                      this.paramSpec.defaultValue :
-                      this.type.getBlank().value;
+  if (this.paramSpec.defaultValue !== undefined) {
+    this.defaultValue = this.paramSpec.defaultValue;
+  }
+  else {
+    Object.defineProperty(this, 'defaultValue', {
+      get: function() {
+        return this.type.getBlank().value;
+      },
+      enumerable: true
+    });
+  }
 
   // Resolve the documentation
   this.manual = lookup(this.paramSpec.manual);
@@ -261,6 +295,9 @@
 
   // Is the user required to enter data for this parameter? (i.e. has
   // defaultValue been set to something other than undefined)
+  // TODO: When the defaultValue comes from type.getBlank().value (see above)
+  // then perhaps we should set using something like
+  //   isDataRequired = (type.getBlank().status !== VALID)
   this.isDataRequired = (this.defaultValue === undefined);
 
   // Are we allowed to assign data to this parameter using positional
@@ -327,9 +364,14 @@
 
 /**
  * A store for a list of commands
+ * @param types Each command uses a set of Types to parse its parameters so the
+ * Commands container needs access to the list of available types.
+ * @param location String that, if set will force all commands to have a
+ * matching runAt property to be accepted
  */
-function Commands(types) {
+function Commands(types, location) {
   this.types = types;
+  this.location = location;
 
   // A lookup hash of our registered commands
   this._commands = {};
@@ -344,12 +386,16 @@
 
 /**
  * Add a command to the list of known commands.
- * This function is exposed to the outside world (via gcli/index). It is
- * documented in docs/index.md for all the world to see.
  * @param commandSpec The command and its metadata.
- * @return The new command
+ * @return The new command, or null if a location property has been set and the
+ * commandSpec doesn't have a matching runAt property.
  */
 Commands.prototype.add = function(commandSpec) {
+  if (this.location != null && commandSpec.runAt != null &&
+      commandSpec.runAt !== this.location) {
+    return;
+  }
+
   if (this._commands[commandSpec.name] != null) {
     // Roughly commands.remove() without the event call, which we do later
     delete this._commands[commandSpec.name];
@@ -416,14 +462,17 @@
 /**
  * Get access to the stored commandMetaDatas (i.e. before they were made into
  * instances of Command/Parameters) so we can remote them.
+ * @param customProps Array of strings containing additional properties which,
+ * if specified in the command spec, will be included in the JSON. Normally we
+ * transfer only the properties required for GCLI to function.
  */
-Commands.prototype.getCommandSpecs = function() {
+Commands.prototype.getCommandSpecs = function(customProps) {
   var commandSpecs = [];
 
   Object.keys(this._commands).forEach(function(name) {
     var command = this._commands[name];
     if (!command.noRemote) {
-      commandSpecs.push(command.toJson());
+      commandSpecs.push(command.toJson(customProps));
     }
   }.bind(this));
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/connect.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/connect.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/connect.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/connect.js	2015-04-24 19:31:13.000000000 +0000
@@ -18,11 +18,12 @@
 
 var l10n = require('../util/l10n');
 var cli = require('../cli');
+var GcliFront = require('../connectors/remoted').GcliFront;
 
 /**
  * A lookup of the current connection
  */
-var connections = {};
+var fronts = {};
 
 /**
  * 'connection' type
@@ -32,8 +33,8 @@
   name: 'connection',
   parent: 'selection',
   lookup: function() {
-    return Object.keys(connections).map(function(prefix) {
-      return { name: prefix, value: connections[prefix] };
+    return Object.keys(fronts).map(function(prefix) {
+      return { name: prefix, value: fronts[prefix] };
     });
   }
 };
@@ -87,19 +88,19 @@
   returnType: 'string',
 
   exec: function(args, context) {
-    if (connections[args.prefix] != null) {
+    if (fronts[args.prefix] != null) {
       throw new Error(l10n.lookupFormat('connectDupReply', [ args.prefix ]));
     }
 
-    var connector = args.method || context.system.connectors.get('xhr');
+    args.method = args.method || context.system.connectors.get('xhr');
 
-    return connector.connect(args.url).then(function(connection) {
-      // Nasty: stash the prefix on the connection to help us tidy up
-      connection.prefix = args.prefix;
-      connections[args.prefix] = connection;
+    return GcliFront.create(args.method, args.url).then(function(front) {
+      // Nasty: stash the prefix on the front to help us tidy up
+      front.prefix = args.prefix;
+      fronts[args.prefix] = front;
 
-      return connection.call('specs').then(function(specs) {
-        var remoter = this.createRemoter(args.prefix, connection);
+      return front.specs().then(function(specs) {
+        var remoter = this.createRemoter(args.prefix, front);
         var commands = cli.getMapping(context).requisition.system.commands;
         commands.addProxyCommands(specs, remoter, args.prefix, args.url);
 
@@ -116,7 +117,7 @@
    * When we register a set of remote commands, we need to provide a proxy
    * executor. This is that executor.
    */
-  createRemoter: function(prefix, connection) {
+  createRemoter: function(prefix, front) {
     return function(cmdArgs, context) {
       var typed = context.typed;
 
@@ -126,12 +127,7 @@
         typed = typed.substring(prefix.length).replace(/^ */, '');
       }
 
-      var data = {
-        typed: typed,
-        args: cmdArgs
-      };
-
-      return connection.call('execute', data).then(function(reply) {
+      return front.execute(typed).then(function(reply) {
         var typedData = context.typedData(reply.type, reply.data);
         if (!reply.error) {
           return typedData;
@@ -162,11 +158,11 @@
   returnType: 'string',
 
   exec: function(args, context) {
-    var connection = args.prefix;
-    return connection.disconnect().then(function() {
+    var front = args.prefix;
+    return front.connection.disconnect().then(function() {
       var commands = cli.getMapping(context).requisition.system.commands;
-      var removed = commands.removeProxyCommands(connection.prefix);
-      delete connections[connection.prefix];
+      var removed = commands.removeProxyCommands(front.prefix);
+      delete fronts[front.prefix];
       return l10n.lookupFormat('disconnectReply', [ removed.length ]);
     });
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/global.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/global.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/global.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/global.js	2015-04-24 19:31:13.000000000 +0000
@@ -39,6 +39,7 @@
   {
     // A command to switch JS globals
     item: 'command',
+    runAt: 'client',
     name: 'global',
     description: l10n.lookup('globalDesc'),
     params: [
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/help.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/help.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/help.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/help.js	2015-04-24 19:31:13.000000000 +0000
@@ -205,6 +205,7 @@
     // 'help' command
     item: 'command',
     name: 'help',
+    runAt: 'client',
     description: l10n.lookup('helpDesc'),
     manual: l10n.lookup('helpManual'),
     params: [
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/mocks.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/mocks.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/mocks.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/mocks.js	2015-04-24 19:31:13.000000000 +0000
@@ -19,6 +19,7 @@
 var cli = require('../cli');
 var mockCommands = require('../test/mockCommands');
 var mockSettings = require('../test/mockSettings');
+var mockDocument = require('../test/mockDocument');
 
 exports.items = [
   {
@@ -46,11 +47,13 @@
     on: function(requisition) {
       mockCommands.setup(requisition);
       mockSettings.setup(requisition.system);
+      mockDocument.setup(requisition);
     },
 
     off: function(requisition) {
       mockCommands.shutdown(requisition);
       mockSettings.shutdown(requisition.system);
+      mockDocument.shutdown(requisition);
     }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/pref.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/pref.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/pref.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/pref.js	2015-04-24 19:31:13.000000000 +0000
@@ -30,6 +30,7 @@
     // 'pref show' command
     item: 'command',
     name: 'pref show',
+    runAt: 'client',
     description: l10n.lookup('prefShowDesc'),
     manual: l10n.lookup('prefShowManual'),
     params: [
@@ -49,6 +50,7 @@
     // 'pref set' command
     item: 'command',
     name: 'pref set',
+    runAt: 'client',
     description: l10n.lookup('prefSetDesc'),
     manual: l10n.lookup('prefSetManual'),
     params: [
@@ -73,6 +75,7 @@
     // 'pref reset' command
     item: 'command',
     name: 'pref reset',
+    runAt: 'client',
     description: l10n.lookup('prefResetDesc'),
     manual: l10n.lookup('prefResetManual'),
     params: [
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/preflist.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/preflist.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/preflist.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/preflist.js	2015-04-24 19:31:13.000000000 +0000
@@ -22,7 +22,7 @@
 /**
  * Format a list of settings for display
  */
-var prefsData = {
+var prefsViewConverter = {
   item: 'converter',
   from: 'prefsData',
   to: 'view',
@@ -98,6 +98,22 @@
 };
 
 /**
+ * Format a list of settings for display
+ */
+var prefsStringConverter = {
+  item: 'converter',
+  from: 'prefsData',
+  to: 'string',
+  exec: function(prefsData, conversionContext) {
+    var reply = '';
+    prefsData.settings.forEach(function(setting) {
+      reply += setting.name + ' -> ' + setting.value + '\n';
+    });
+    return reply;
+  }
+};
+
+/**
  * 'pref list' command
  */
 var prefList = {
@@ -136,6 +152,8 @@
   this.search = prefsData.search;
   this.settings = prefsData.settings;
   this.conversionContext = conversionContext;
+
+  this.onLoad = this.onLoad.bind(this);
 }
 
 /**
@@ -194,4 +212,4 @@
   this.conversionContext.update(typed);
 };
 
-exports.items = [ prefsData, prefList ];
+exports.items = [ prefsViewConverter, prefsStringConverter, prefList ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/test.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/test.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/test.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/commands/test.js	2015-04-24 19:31:13.000000000 +0000
@@ -70,10 +70,10 @@
       }
       else {
         options = {
-          isNode: (typeof(process) !== 'undefined' && process.title === 'node'),
+          isNode: (typeof(process) !== 'undefined' &&
+                   process.title.indexOf('node') != -1),
           isFirefox: false,
           isPhantomjs: false,
-          isNoDom: true,
           requisition: new Requisition(context.system)
         };
         options.automator = createRequisitionAutomator(options.requisition);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/connectors.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/connectors.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/connectors.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/connectors.js	2015-04-24 19:31:13.000000000 +0000
@@ -138,14 +138,21 @@
   }.bind(this));
 };
 
+var defaultConnectorName;
+
 /**
- * Get access to a connector by name. If name is undefined then use the first
- * registered connector as a default.
+ * Get access to a connector by name. If name is undefined then first try to
+ * use the same connector that we used last time, and if there was no last
+ * time, then just use the first registered connector as a default.
  */
 Connectors.prototype.get = function(name) {
   if (name == null) {
-    name = Object.keys(this._registered)[0];
+    name = (defaultConnectorName == null) ?
+        Object.keys(this._registered)[0] :
+        defaultConnectorName;
   }
+
+  defaultConnectorName = name;
   return this._registered[name];
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/index.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/index.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/index.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/index.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,185 +0,0 @@
-/*
- * Copyright 2012, Mozilla Foundation and contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-var api = require('../api');
-var Commands = require('../commands/commands').Commands;
-var Types = require('../types/types').Types;
-
-// Patch-up IE9
-require('../util/legacy');
-
-/*
- * GCLI is built from a number of components (called items) composed as
- * required for each environment.
- * When adding to or removing from this list, we should keep the basics in sync
- * with the other environments.
- * See:
- * - lib/gcli/index.js: Generic basic set (without commands)
- * - lib/gcli/demo.js: Adds demo commands to basic set for use in web demo
- * - gcli.js: Add commands to basic set for use in Node command line
- * - lib/gcli/index.js: (mozmaster branch) From scratch listing for Firefox
- * - lib/gcli/connectors/index.js: Client only items when executing remotely
- * - lib/gcli/connectors/direct.js: Test items for connecting to in-process GCLI
- */
-var items = [
-  // First we need to add the local types which other types depend on
-  require('../types/delegate').items,
-  require('../types/selection').items,
-  require('../types/array').items,
-
-  require('../types/boolean').items,
-  require('../types/command').items,
-  require('../types/date').items,
-  require('../types/file').items,
-  require('../types/javascript').items,
-  require('../types/node').items,
-  require('../types/number').items,
-  require('../types/resource').items,
-  require('../types/setting').items,
-  require('../types/string').items,
-  require('../types/union').items,
-  require('../types/url').items,
-
-  require('../fields/fields').items,
-  require('../fields/delegate').items,
-  require('../fields/selection').items,
-
-  require('../ui/intro').items,
-  require('../ui/focus').items,
-
-  require('../converters/converters').items,
-  require('../converters/basic').items,
-  require('../converters/html').items,
-  require('../converters/terminal').items,
-
-  require('../languages/command').items,
-  require('../languages/javascript').items,
-
-  require('./direct').items,
-  // require('./rdp').items, // Firefox remote debug protocol
-  require('./websocket').items,
-  require('./xhr').items,
-
-  require('../commands/context').items,
-
-].reduce(function(prev, curr) { return prev.concat(curr); }, []);
-
-/**
- * These are the commands stored on the remote side that have converters which
- * we'll need to present the data
- */
-var requiredConverters = [
-  require('../cli').items,
-
-  require('../commands/clear').items,
-  require('../commands/connect').items,
-  require('../commands/exec').items,
-  require('../commands/global').items,
-  require('../commands/help').items,
-  require('../commands/intro').items,
-  require('../commands/lang').items,
-  require('../commands/preflist').items,
-  require('../commands/pref').items,
-  require('../commands/test').items,
-
-].reduce(function(prev, curr) { return prev.concat(curr); }, [])
- .filter(function(item) { return item.item === 'converter'; });
-
-/**
- * Connect to a remote system and setup the commands/types/converters etc needed
- * to make it all work
- */
-exports.connect = function(options) {
-  options = options || {};
-
-  var system = api.createSystem();
-
-  // Ugly hack, to aid testing
-  exports.api = system;
-
-  options.types = system.types = new Types();
-  options.commands = system.commands = new Commands(system.types);
-
-  system.addItems(items);
-  system.addItems(requiredConverters);
-
-  var connector = system.connectors.get(options.connector);
-  return connector.connect(options.url).then(function(connection) {
-    options.connection = connection;
-    connection.on('commandsChanged', function(specs) {
-      exports.addItems(system, specs, connection);
-    });
-
-    return connection.call('specs').then(function(specs) {
-      exports.addItems(system, specs, connection);
-      return connection;
-    });
-  });
-};
-
-exports.addItems = function(gcli, specs, connection) {
-  exports.removeRemoteItems(gcli, connection);
-  var remoteItems = exports.addLocalFunctions(specs, connection);
-  gcli.addItems(remoteItems);
-};
-
-/**
- * Take the data from the 'specs' command (or the 'commandsChanged' event) and
- * add function to proxy the execution back over the connection
- */
-exports.addLocalFunctions = function(specs, connection) {
-  // Inject an 'exec' function into the commands, and the connection into
-  // all the remote types
-  specs.forEach(function(commandSpec) {
-    //
-    commandSpec.connection = connection;
-    commandSpec.params.forEach(function(param) {
-      param.type.connection = connection;
-    });
-
-    if (!commandSpec.isParent) {
-      commandSpec.exec = function(args, context) {
-        var data = {
-          typed: (context.prefix ? context.prefix + ' ' : '') + context.typed
-        };
-
-        return connection.call('execute', data).then(function(reply) {
-          var typedData = context.typedData(reply.type, reply.data);
-          if (!reply.error) {
-            return typedData;
-          }
-          else {
-            throw typedData;
-          }
-        });
-      };
-    }
-
-    commandSpec.isProxy = true;
-  });
-
-  return specs;
-};
-
-exports.removeRemoteItems = function(gcli, connection) {
-  gcli.commands.getAll().forEach(function(command) {
-    if (command.connection === connection) {
-      gcli.commands.remove(command);
-    }
-  });
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/protocol.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/protocol.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/protocol.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/protocol.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright 2012, Mozilla Foundation and contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-/**
- * This is a quick and dirty stub that allows us to write code in remoted.js
- * that looks like gcli.js
- */
-exports.method = function(func, spec) {
-  // An array of strings, being the names of the parameters
-  var argSpecs = [];
-  if (spec.request != null) {
-    Object.keys(spec.request).forEach(function(name) {
-      var arg = spec.request[name];
-      argSpecs[arg.index] = name;
-    });
-  }
-
-  return function(data) {
-    var args = (data == null) ?
-               [] :
-               argSpecs.map(function(name) { return data[name]; });
-    return func.apply(this, args);
-  };
-};
-
-var Arg = exports.Arg = function(index, type) {
-  if (this == null) {
-    return new Arg(index, type);
-  }
-
-  this.index = index;
-  this.type = type;
-};
-
-var RetVal = exports.RetVal = function(type) {
-  if (this == null) {
-    return new RetVal(type);
-  }
-
-  this.type = type;
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/rdp.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/rdp.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/rdp.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/rdp.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +0,0 @@
-/*
- * Copyright 2012, Mozilla Foundation and contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-var Cu = require('chrome').Cu;
-
-var DebuggerClient = Cu.import('resource://gre/modules/devtools/dbg-client.jsm', {}).DebuggerClient;
-var { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
-
-var Promise = require('../util/promise').Promise;
-var Connection = require('./connectors').Connection;
-
-/**
- * What port should we use by default?
- */
-Object.defineProperty(exports, 'defaultPort', {
-  get: function() {
-    var Services = Cu.import('resource://gre/modules/Services.jsm', {}).Services;
-    try {
-      return Services.prefs.getIntPref('devtools.debugger.chrome-debugging-port');
-    }
-    catch (ex) {
-      console.error('Can\'t use default port from prefs. Using 9999');
-      return 9999;
-    }
-  },
-  enumerable: true
-});
-
-exports.items = [
-  {
-    item: 'connector',
-    name: 'rdp',
-
-    connect: function(url) {
-      return RdpConnection.create(url);
-    }
-  }
-];
-
-/**
- * RdpConnection uses the Firefox Remote Debug Protocol
- */
-function RdpConnection(url) {
-  throw new Error('Use RdpConnection.create');
-}
-
-/**
- * Asynchronous construction
- */
-RdpConnection.create = Task.async(function*(url) {
-  this.host = url;
-  this.port = undefined; // TODO: Split out the port number
-
-  this.requests = {};
-  this.nextRequestId = 0;
-
-  this._emit = this._emit.bind(this);
-
-  let transport = yield DebuggerClient.socketConnect({
-    host: this.host,
-    port: this.port
-  });
-
-  return new Promise(function(resolve, reject) {
-    this.client = new DebuggerClient(transport);
-    this.client.connect(function() {
-      this.client.listTabs(function(response) {
-        this.actor = response.gcliActor;
-        resolve();
-      }.bind(this));
-    }.bind(this));
-  }.bind(this));
-});
-
-RdpConnection.prototype = Object.create(Connection.prototype);
-
-RdpConnection.prototype.call = function(command, data) {
-  return new Promise(function(resolve, reject) {
-    var request = { to: this.actor, type: command, data: data };
-
-    this.client.request(request, function(response) {
-      resolve(response.commandSpecs);
-    });
-  }.bind(this));
-};
-
-RdpConnection.prototype.disconnect = function() {
-  return new Promise(function(resolve, reject) {
-    this.client.close(function() {
-      resolve();
-    });
-
-    delete this._emit;
-  }.bind(this));
-};
-
-
-/**
- * A Request is a command typed at the client which lives until the command
- * has finished executing on the server
- */
-function Request(actor, typed, args) {
-  this.json = {
-    to: actor,
-    type: 'execute',
-    typed: typed,
-    args: args,
-    requestId: 'id-' + Request._nextRequestId++,
-  };
-
-  this.promise = new Promise(function(resolve, reject) {
-    this._resolve = resolve;
-  }.bind(this));
-}
-
-Request._nextRequestId = 0;
-
-/**
- * Called by the connection when a remote command has finished executing
- * @param error boolean indicating output state
- * @param type the type of the returned data
- * @param data the data itself
- */
-Request.prototype.complete = function(error, type, data) {
-  this._resolve({
-    error: error,
-    type: type,
-    data: data
-  });
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/remoted.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/remoted.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/remoted.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/connectors/remoted.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,275 +0,0 @@
-/*
- * Copyright 2012, Mozilla Foundation and contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* jshint quotmark:false, newcap:false */
-
-'use strict';
-
-var Promise = require('../util/promise').Promise;
-var host = require('../util/host');
-var fileparser = require('../util/fileparser');
-
-var protocol = require('./protocol');
-var method = protocol.method;
-var Arg = protocol.Arg;
-var RetVal = protocol.RetVal;
-
-/**
- * Provide JSON mapping services to remote functionality of a Requisition
- */
-var Remoter = exports.Remoter = function(requisition) {
-  this.requisition = requisition;
-  this._listeners = [];
-};
-
-/**
- * Add a new listener
- */
-Remoter.prototype.addListener = function(action) {
-  var listener = {
-    action: action,
-    caller: function() {
-      var commands = this.requisition.system.commands;
-      action('commandsChanged', commands.getCommandSpecs());
-    }.bind(this)
-  };
-  this._listeners.push(listener);
-
-  this.requisition.system.commands.onCommandsChange.add(listener.caller);
-};
-
-/**
- * Remove an existing listener
- */
-Remoter.prototype.removeListener = function(action) {
-  var listener;
-
-  this._listeners = this._listeners.filter(function(li) {
-    if (li.action === action) {
-      listener = li;
-      return false;
-    }
-    return true;
-  });
-
-  if (listener == null) {
-    throw new Error('action not a known listener');
-  }
-
-  this.requisition.system.commands.onCommandsChange.remove(listener.caller);
-};
-
-/**
- * These functions are designed to be remoted via RDP/XHR/websocket, etc
- */
-Remoter.prototype.exposed = {
-  /**
-   * Retrieve a list of the remotely executable commands
-   */
-  specs: method(function() {
-    return this.requisition.system.commands.getCommandSpecs();
-  }, {
-    request: {},
-    response: RetVal("json")
-  }),
-
-  /**
-   * Execute a GCLI command
-   * @return a promise of an object with the following properties:
-   * - data: The output of the command
-   * - type: The type of the data to allow selection of a converter
-   * - error: True if the output was considered an error
-   */
-  execute: method(function(typed) {
-    return this.requisition.updateExec(typed).then(function(output) {
-      return output.toJson();
-    });
-  }, {
-    request: {
-      typed: Arg(0, "string") // The command string
-    },
-    response: RetVal("json")
-  }),
-
-  /**
-   * Get the state of an input string. i.e. requisition.getStateData()
-   */
-  state: method(function(typed, start, rank) {
-    return this.requisition.update(typed).then(function() {
-      return this.requisition.getStateData(start, rank);
-    }.bind(this));
-  }, {
-    request: {
-      typed: Arg(0, "string"), // The command string
-      start: Arg(1, "number"), // Cursor start position
-      rank: Arg(2, "number") // The prediction offset (# times UP/DOWN pressed)
-    },
-    response: RetVal("json")
-  }),
-
-  /**
-   * Call type.parse to check validity. Used by the remote type
-   * @return a promise of an object with the following properties:
-   * - status: Of of the following strings: VALID|INCOMPLETE|ERROR
-   * - message: The message to display to the user
-   * - predictions: An array of suggested values for the given parameter
-   */
-  typeparse: method(function(typed, param) {
-    return this.requisition.update(typed).then(function() {
-      var assignment = this.requisition.getAssignment(param);
-
-      return Promise.resolve(assignment.predictions).then(function(predictions) {
-        return {
-          status: assignment.getStatus().toString(),
-          message: assignment.message,
-          predictions: predictions
-        };
-      });
-    }.bind(this));
-  }, {
-    request: {
-      typed: Arg(0, "string"), // The command string
-      param: Arg(1, "string") // The name of the parameter to parse
-    },
-    response: RetVal("json")
-  }),
-
-  /**
-   * Get the incremented value of some type
-   * @return a promise of a string containing the new argument text
-   */
-  typeincrement: method(function(typed, param) {
-    return this.requisition.update(typed).then(function() {
-      var assignment = this.requisition.getAssignment(param);
-      return this.requisition.increment(assignment).then(function() {
-        var arg = assignment.arg;
-        return arg == null ? undefined : arg.text;
-      });
-    });
-  }, {
-    request: {
-      typed: Arg(0, "string"), // The command string
-      param: Arg(1, "string") // The name of the parameter to parse
-    },
-    response: RetVal("string")
-  }),
-
-  /**
-   * See typeincrement
-   */
-  typedecrement: method(function(typed, param) {
-    return this.requisition.update(typed).then(function() {
-      var assignment = this.requisition.getAssignment(param);
-      return this.requisition.decrement(assignment).then(function() {
-        var arg = assignment.arg;
-        return arg == null ? undefined : arg.text;
-      });
-    });
-  }, {
-    request: {
-      typed: Arg(0, "string"), // The command string
-      param: Arg(1, "string") // The name of the parameter to parse
-    },
-    response: RetVal("string")
-  }),
-
-  /**
-   * Perform a lookup on a selection type to get the allowed values
-   */
-  selectioninfo: method(function(commandName, paramName, action) {
-    var command = this.requisition.system.commands.get(commandName);
-    if (command == null) {
-      throw new Error('No command called \'' + commandName + '\'');
-    }
-
-    var type;
-    command.params.forEach(function(param) {
-      if (param.name === paramName) {
-        type = param.type;
-      }
-    });
-    if (type == null) {
-      throw new Error('No parameter called \'' + paramName + '\' in \'' +
-                      commandName + '\'');
-    }
-
-    switch (action) {
-      case 'lookup':
-        return type.lookup(this.requisition.executionContext);
-      case 'data':
-        return type.data(this.requisition.executionContext);
-      default:
-        throw new Error('Action must be either \'lookup\' or \'data\'');
-    }
-  }, {
-    request: {
-      commandName: Arg(0, "string"), // The command containing the parameter in question
-      paramName: Arg(1, "string"), // The name of the parameter
-      action: Arg(2, "string") // 'lookup' or 'data' depending on the function to call
-    },
-    response: RetVal("json")
-  }),
-
-  /**
-   * Execute a system command
-   * @return a promise of a string containing the output of the command
-   */
-  system: method(function(cmd, args, cwd, env) {
-    var context = this.requisition.executionContext;
-    return host.spawn(context, { cmd: cmd, args: args, cwd: cwd, env: env });
-  }, {
-    request: {
-      cmd: Arg(0, "string"), // The executable to call
-      args: Arg(1, "array:string"), // Arguments to the executable
-      cwd: Arg(2, "string"), // The working directory
-      env: Arg(3, "json") // A map of environment variables
-    },
-    response: RetVal("json")
-  }),
-
-  /**
-   * Examine the filesystem for file matches
-   */
-  parsefile: method(function(typed, filetype, existing, matches) {
-    var options = {
-      filetype: filetype,
-      existing: existing,
-      matches: new RegExp(matches)
-    };
-
-    var context = this.requisition.executionContext;
-    return fileparser.parse(context, typed, options).then(function(reply) {
-      reply.status = reply.status.toString();
-      if (reply.predictor == null) {
-        return reply;
-      }
-
-      return reply.predictor().then(function(predictions) {
-        delete reply.predictor;
-        reply.predictions = predictions;
-        return reply;
-      });
-    });
-  }, {
-    request: {
-      typed: Arg(0, "string"), // The filename as typed by the user
-      filetype: Arg(1, "array:string"), // The expected filetype
-      existing: Arg(2, "string"), // Boolean which defines if a file/directory is expected to exist
-      matches: Arg(3, "json") // String of a regular expression which the result should match
-    },
-    response: RetVal("json")
-  })
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/converters/basic.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/converters/basic.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/converters/basic.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/converters/basic.js	2015-04-24 19:31:13.000000000 +0000
@@ -56,6 +56,17 @@
   },
   {
     item: 'converter',
+    from: 'json',
+    to: 'view',
+    exec: function(json, context) {
+      var html = JSON.stringify(json, null, '&#160;').replace(/\n/g, '<br/>');
+      return {
+        html: '<pre>' + html + '</pre>'
+      };
+    }
+  },
+  {
+    item: 'converter',
     from: 'number',
     to: 'string',
     exec: function(data) { return '' + data; }
@@ -71,5 +82,13 @@
     from: 'undefined',
     to: 'string',
     exec: function(data) { return ''; }
+  },
+  {
+    item: 'converter',
+    from: 'json',
+    to: 'string',
+    exec: function(json, conversionContext) {
+      return JSON.stringify(json, null, '  ');
+    }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/converters/converters.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/converters/converters.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/converters/converters.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/converters/converters.js	2015-04-24 19:31:13.000000000 +0000
@@ -99,7 +99,7 @@
   exec: function(ex, conversionContext) {
     var node = util.createElement(conversionContext.document, 'p');
     node.className = 'gcli-error';
-    node.textContent = ex;
+    node.textContent = errorStringConverter.exec(ex, conversionContext);
     return node;
   }
 };
@@ -112,6 +112,15 @@
   from: 'error',
   to: 'string',
   exec: function(ex, conversionContext) {
+    if (typeof ex === 'string') {
+      return ex;
+    }
+    if (ex instanceof Error) {
+      return '' + ex;
+    }
+    if (typeof ex.message === 'string') {
+      return ex.message;
+    }
     return '' + ex;
   }
 };
@@ -209,6 +218,15 @@
 };
 
 /**
+ * Get all the registered converters. Most for debugging
+ */
+Converters.prototype.getAll = function() {
+  return Object.keys(this._registered.from).map(function(name) {
+    return this._registered.from[name];
+  }.bind(this));
+};
+
+/**
  * Helper for get to pick the best fallback converter
  */
 Converters.prototype._getFallbackConverter = function(from, to) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/fields/fields.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/fields/fields.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/fields/fields.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/fields/fields.js	2015-04-24 19:31:13.000000000 +0000
@@ -199,6 +199,13 @@
   return new FieldConstructor(type, options);
 };
 
+/**
+ * Get all the registered fields. Most for debugging
+ */
+Fields.prototype.getAll = function() {
+  return this._fieldCtors.slice();
+};
+
 exports.Fields = Fields;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/fields/selection.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/fields/selection.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/fields/selection.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/fields/selection.js	2015-04-24 19:31:13.000000000 +0000
@@ -74,8 +74,10 @@
           prediction.value :
           prediction;
     }, this);
-    this.menu.show(items, conversion.arg.text);
-  }.bind(this), util.errorHandler);
+    if (this.menu != null) {
+      this.menu.show(items, conversion.arg.text);
+    }
+  }.bind(this)).catch(util.errorHandler);
 };
 
 SelectionField.prototype.itemClicked = function(ev) {
@@ -85,7 +87,7 @@
   this.type.parse(arg, context).then(function(conversion) {
     this.onFieldChange({ conversion: conversion });
     this.setMessage(conversion.message);
-  }.bind(this)).then(null, util.errorHandler);
+  }.bind(this)).catch(util.errorHandler);
 };
 
 SelectionField.prototype.getConversion = function() {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/index.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/index.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/index.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/index.js	2015-04-24 19:31:13.000000000 +0000
@@ -18,114 +18,7 @@
 
 var Cc = require('chrome').Cc;
 var Ci = require('chrome').Ci;
-var Cu = require('chrome').Cu;
 
-/*
- * GCLI is built from a number of components (called items) composed as
- * required for each environment.
- * When adding to or removing from this list, we should keep the basics in sync
- * with the other environments.
- * See:
- * - lib/gcli/index.js: Generic basic set (without commands)
- * - lib/gcli/demo.js: Adds demo commands to basic set for use in web demo
- * - gcli.js: Add commands to basic set for use in Node command line
- * - lib/gcli/index.js: (mozmaster branch) From scratch listing for Firefox
- * - lib/gcli/connectors/index.js: Client only items when executing remotely
- * - lib/gcli/connectors/direct.js: Test items for connecting to in-process GCLI
- */
-exports.items = [
-  require('./types/delegate').items,
-  require('./types/selection').items,
-  require('./types/array').items,
-
-  require('./types/boolean').items,
-  require('./types/command').items,
-  require('./types/date').items,
-  require('./types/file').items,
-  require('./types/javascript').items,
-  require('./types/node').items,
-  require('./types/number').items,
-  require('./types/resource').items,
-  require('./types/setting').items,
-  require('./types/string').items,
-  require('./types/union').items,
-  require('./types/url').items,
-
-  require('./fields/fields').items,
-  require('./fields/delegate').items,
-  require('./fields/selection').items,
-
-  require('./ui/focus').items,
-  require('./ui/intro').items,
-
-  require('./converters/converters').items,
-  require('./converters/basic').items,
-  // require('./converters/html').items, // Prevent use of innerHTML
-  require('./converters/terminal').items,
-
-  require('./languages/command').items,
-  require('./languages/javascript').items,
-
-  // require('./connectors/direct').items, // No need for loopback testing
-  // require('./connectors/rdp').items, // Needs fixing
-  // require('./connectors/websocket').items, // Not from chrome
-  // require('./connectors/xhr').items, // Not from chrome
-
-  // require('./cli').items, // No need for '{' with web console
-  require('./commands/clear').items,
-  // require('./commands/connect').items, // We need to fix our RDP connector
-  require('./commands/context').items,
-  // require('./commands/exec').items, // No exec in Firefox yet
-  require('./commands/global').items,
-  require('./commands/help').items,
-  // require('./commands/intro').items, // No need for intro command
-  require('./commands/lang').items,
-  // require('./commands/mocks').items, // Only for testing
-  require('./commands/pref').items,
-  // require('./commands/preflist').items, // Too slow in Firefox
-  // require('./commands/test').items, // Only for testing
-
-  // No demo or node commands
-
-].reduce(function(prev, curr) { return prev.concat(curr); }, []);
-
-var api = require('./api');
-var system = api.createSystem();
-
-// Export the system API by adding it to our exports
-Object.keys(system).forEach(function(key) {
-  exports[key] = system[key];
-});
-
-system.addItems(exports.items);
-
-var host = require('./util/host');
-
-exports.useTarget = host.script.useTarget;
-
-/**
- * This code is internal and subject to change without notice.
- * createDisplay() for Firefox requires an options object with the following
- * members:
- * - contentDocument: From the window of the attached tab
- * - chromeDocument: GCLITerm.document
- * - environment.hudId: GCLITerm.hudId
- * - jsEnvironment.globalObject: 'window'
- * - jsEnvironment.evalFunction: 'eval' in a sandbox
- * - inputElement: GCLITerm.inputNode
- * - completeElement: GCLITerm.completeNode
- * - hintElement: GCLITerm.hintNode
- * - inputBackgroundElement: GCLITerm.inputStack
- */
-exports.createDisplay = function(options) {
-  var FFDisplay = require('./mozui/ffdisplay').FFDisplay;
-  return new FFDisplay(system, options);
-};
-
-exports.createRequisition = function(options) {
-  var Requisition = require('./cli').Requisition;
-  return new Requisition(system, options);
-};
 
 var prefSvc = Cc['@mozilla.org/preferences-service;1']
                         .getService(Ci.nsIPrefService);
@@ -134,44 +27,3 @@
 exports.hiddenByChromePref = function() {
   return !prefBranch.prefHasUserValue('devtools.chrome.enabled');
 };
-
-
-try {
-  var Services = Cu.import('resource://gre/modules/Services.jsm', {}).Services;
-  var stringBundle = Services.strings.createBundle(
-          'chrome://browser/locale/devtools/gclicommands.properties');
-
-  /**
-   * Lookup a string in the GCLI string bundle
-   */
-  exports.lookup = function(name) {
-    try {
-      return stringBundle.GetStringFromName(name);
-    }
-    catch (ex) {
-      throw new Error('Failure in lookup(\'' + name + '\')');
-    }
-  };
-
-  /**
-   * Lookup a string in the GCLI string bundle
-   */
-  exports.lookupFormat = function(name, swaps) {
-    try {
-      return stringBundle.formatStringFromName(name, swaps, swaps.length);
-    }
-    catch (ex) {
-      throw new Error('Failure in lookupFormat(\'' + name + '\')');
-    }
-  };
-}
-catch (ex) {
-  console.error('Using string fallbacks', ex);
-
-  exports.lookup = function(name) {
-    return name;
-  };
-  exports.lookupFormat = function(name, swaps) {
-    return name;
-  };
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/command.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/command.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/command.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/command.js	2015-04-24 19:31:13.000000000 +0000
@@ -123,7 +123,6 @@
     this.commandDom = undefined;
   },
 
-  // From the requisition.textChanged event
   textChanged: function() {
     if (this.terminal == null) {
       return; // This can happen post-destroy()
@@ -184,7 +183,7 @@
       var isNew = (this.assignment !== newAssignment);
 
       this.assignment = newAssignment;
-      this.terminal.updateCompletion();
+      this.terminal.updateCompletion().catch(util.errorHandler);
 
       if (isNew) {
         this.updateHints();
@@ -251,7 +250,7 @@
     // If the user is on a valid value, then we increment the value, but if
     // they've typed something that's not right we page through predictions
     if (this.assignment.getStatus() === Status.VALID) {
-      return this.requisition.increment(this.assignment).then(function() {
+      return this.requisition.nudge(this.assignment, 1).then(function() {
         this.textChanged();
         this.focusManager.onInputChange();
         return true;
@@ -266,7 +265,7 @@
    */
   handleDownArrow: function() {
     if (this.assignment.getStatus() === Status.VALID) {
-      return this.requisition.decrement(this.assignment).then(function() {
+      return this.requisition.nudge(this.assignment, -1).then(function() {
         this.textChanged();
         this.focusManager.onInputChange();
         return true;
@@ -286,7 +285,10 @@
     }
 
     this.terminal.history.add(input);
-    this.terminal.unsetChoice();
+    this.terminal.unsetChoice().catch(util.errorHandler);
+
+    this.terminal._previousValue = this.terminal.inputElement.value;
+    this.terminal.inputElement.value = '';
 
     return this.requisition.exec().then(function() {
       this.textChanged();
@@ -496,7 +498,7 @@
         this.terminal.scrollToBottom();
         data.throbEle.style.display = ev.output.completed ? 'none' : 'block';
       }.bind(this));
-    }.bind(this)).then(null, console.error);
+    }.bind(this)).catch(console.error);
 
     this.terminal.addElement(data.rowinEle);
     this.terminal.addElement(data.rowoutEle);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/javascript.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/javascript.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/javascript.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/javascript.js	2015-04-24 19:31:13.000000000 +0000
@@ -42,8 +42,7 @@
     },
 
     exec: function(input) {
-      return this.eval(input).then(function(response) {
-        // console.log('javascript.exec', response);
+      return this.evaluate(input).then(function(response) {
         var output = (response.exception != null) ?
                       response.exception.class :
                       response.output;
@@ -80,8 +79,8 @@
       }.bind(this));
     },
 
-    eval: function(input) {
-      return host.script.eval(input);
+    evaluate: function(input) {
+      return host.script.evaluate(input);
     }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/languages.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/languages.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/languages.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/languages/languages.js	2015-04-24 19:31:13.000000000 +0000
@@ -51,8 +51,9 @@
   },
 
   handleTab: function() {
-    this.terminal.unsetChoice();
-    return RESOLVED;
+    return this.terminal.unsetChoice().then(function() {
+      return RESOLVED;
+    }, util.errorHandler);
   },
 
   handleInput: function(input) {
@@ -62,8 +63,9 @@
       }.bind(this));
     }
 
-    this.terminal.unsetChoice();
-    return RESOLVED;
+    return this.terminal.unsetChoice().then(function() {
+      return RESOLVED;
+    }, util.errorHandler);
   },
 
   handleReturn: function(input) {
@@ -80,7 +82,7 @@
 
       this.focusManager.outputted();
 
-      this.terminal.unsetChoice();
+      this.terminal.unsetChoice().catch(util.errorHandler);
       this.terminal.inputElement.value = '';
     }.bind(this));
   },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/ffdisplay.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/ffdisplay.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/ffdisplay.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/ffdisplay.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,237 +0,0 @@
-/*
- * Copyright 2012, Mozilla Foundation and contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-var Inputter = require('./inputter').Inputter;
-var Completer = require('./completer').Completer;
-var Tooltip = require('./tooltip').Tooltip;
-var FocusManager = require('../ui/focus').FocusManager;
-
-var Requisition = require('../cli').Requisition;
-
-var cli = require('../cli');
-var jstype = require('../types/javascript');
-var nodetype = require('../types/node');
-var resource = require('../types/resource');
-var intro = require('../ui/intro');
-
-var CommandOutputManager = require('../commands/commands').CommandOutputManager;
-
-/**
- * Handy utility to inject the content document (i.e. for the viewed page,
- * not for chrome) into the various components.
- */
-function setContentDocument(document) {
-  if (document) {
-    nodetype.setDocument(document);
-    resource.setDocument(document);
-  }
-  else {
-    resource.unsetDocument();
-    nodetype.unsetDocument();
-    jstype.unsetGlobalObject();
-  }
-}
-
-/**
- * FFDisplay is responsible for generating the UI for GCLI, this implementation
- * is a special case for use inside Firefox
- * @param options A configuration object containing the following:
- * - contentDocument (optional)
- * - chromeDocument
- * - hintElement
- * - inputElement
- * - completeElement
- * - backgroundElement
- * - outputDocument
- * - consoleWrap (optional)
- * - eval (optional)
- * - environment
- * - chromeWindow
- * - commandOutputManager (optional)
- */
-function FFDisplay(system, options) {
-  if (options.eval) {
-    cli.setEvalFunction(options.eval);
-  }
-  setContentDocument(options.contentDocument);
-
-  this.requisition = new Requisition(system, {
-    environment: options.environment,
-    document: options.outputDocument
-  });
-  this.onOutput = this.requisition.commandOutputManager.onOutput;
-
-  this.focusManager = new FocusManager(options.chromeDocument, system.settings);
-  this.onVisibilityChange = this.focusManager.onVisibilityChange;
-
-  this.inputter = new Inputter(options, {
-    requisition: this.requisition,
-    focusManager: this.focusManager,
-    element: options.inputElement
-  });
-
-  this.completer = new Completer({
-    requisition: this.requisition,
-    inputter: this.inputter,
-    backgroundElement: options.backgroundElement,
-    element: options.completeElement
-  });
-
-  this.tooltip = new Tooltip(options, {
-    requisition: this.requisition,
-    focusManager: this.focusManager,
-    inputter: this.inputter,
-    element: options.hintElement
-  });
-
-  this.inputter.tooltip = this.tooltip;
-
-  if (options.consoleWrap) {
-    this.resizer = this.resizer.bind(this);
-
-    this.consoleWrap = options.consoleWrap;
-    var win = options.consoleWrap.ownerDocument.defaultView;
-    win.addEventListener('resize', this.resizer, false);
-  }
-
-  this.options = options;
-}
-
-/**
- * The main Display calls this as part of startup since it registers listeners
- * for output first. The firefox display can't do this, so it has to be a
- * separate method
- */
-FFDisplay.prototype.maybeShowIntro = function() {
-  intro.maybeShowIntro(this.requisition.commandOutputManager,
-                       this.requisition.conversionContext);
-};
-
-/**
- * Called when the page to which we're attached changes
- * @params options Object with the following properties:
- * - contentDocument: Points to the page that we should now work against
- */
-FFDisplay.prototype.reattach = function(options) {
-  setContentDocument(options.contentDocument);
-};
-
-/**
- * Avoid memory leaks
- */
-FFDisplay.prototype.destroy = function() {
-  if (this.consoleWrap) {
-    var win = this.options.consoleWrap.ownerDocument.defaultView;
-    win.removeEventListener('resize', this.resizer, false);
-  }
-
-  this.tooltip.destroy();
-  this.completer.destroy();
-  this.inputter.destroy();
-  this.focusManager.destroy();
-
-  this.requisition.destroy();
-
-  setContentDocument(null);
-  cli.unsetEvalFunction();
-
-  delete this.options;
-
-  // We could also delete the following objects if we have hard-to-track-down
-  // memory leaks, as a belt-and-braces approach, however this prevents our
-  // DOM node hunter script from looking in all the nooks and crannies, so it's
-  // better if we can be leak-free without deleting them:
-  // - consoleWrap, resizer, tooltip, completer, inputter,
-  // - focusManager, onVisibilityChange, requisition, commandOutputManager
-};
-
-/**
- * Called on chrome window resize, or on divider slide
- */
-FFDisplay.prototype.resizer = function() {
-  // Bug 705109: There are several numbers hard-coded in this function.
-  // This is simpler than calculating them, but error-prone when the UI setup,
-  // the styling or display settings change.
-
-  var parentRect = this.options.consoleWrap.getBoundingClientRect();
-  // Magic number: 64 is the size of the toolbar above the output area
-  var parentHeight = parentRect.bottom - parentRect.top - 64;
-
-  // Magic number: 100 is the size at which we decide the hints are too small
-  // to be useful, so we hide them
-  if (parentHeight < 100) {
-    this.options.hintElement.classList.add('gcliterm-hint-nospace');
-  }
-  else {
-    this.options.hintElement.classList.remove('gcliterm-hint-nospace');
-    this.options.hintElement.style.overflowY = null;
-    this.options.hintElement.style.borderBottomColor = 'white';
-  }
-
-  // We also try to make the max-width of any GCLI elements so they don't
-  // extend outside the scroll area.
-  var doc = this.options.hintElement.ownerDocument;
-
-  var outputNode = this.options.hintElement.parentNode.parentNode.children[1];
-  var listItems = outputNode.getElementsByClassName('hud-msg-node');
-
-  // This is an top-side estimate. We could try to calculate it, maybe using
-  // something along these lines http://www.alexandre-gomes.com/?p=115 However
-  // experience has shown this to be hard to get to work reliably
-  // Also we don't need to be precise. If we use a number that is too big then
-  // the only down-side is too great a right margin
-  var scrollbarWidth = 20;
-
-  if (listItems.length > 0) {
-    var parentWidth = outputNode.getBoundingClientRect().width - scrollbarWidth;
-    var otherWidth;
-    var body;
-
-    for (var i = 0; i < listItems.length; ++i) {
-      var listItem = listItems[i];
-      // a.k.a 'var otherWidth = 132'
-      otherWidth = 0;
-      body = null;
-
-      for (var j = 0; j < listItem.children.length; j++) {
-        var child = listItem.children[j];
-
-        if (child.classList.contains('gcliterm-msg-body')) {
-          body = child.children[0];
-        }
-        else {
-          otherWidth += child.getBoundingClientRect().width;
-        }
-
-        var styles = doc.defaultView.getComputedStyle(child, null);
-        otherWidth += parseInt(styles.borderLeftWidth, 10) +
-                      parseInt(styles.borderRightWidth, 10) +
-                      parseInt(styles.paddingLeft, 10) +
-                      parseInt(styles.paddingRight, 10) +
-                      parseInt(styles.marginLeft, 10) +
-                      parseInt(styles.marginRight, 10);
-      }
-
-      if (body) {
-        body.style.width = (parentWidth - otherWidth) + 'px';
-      }
-    }
-  }
-};
-
-exports.FFDisplay = FFDisplay;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js	2015-04-24 19:31:13.000000000 +0000
@@ -27,14 +27,12 @@
 
 /**
  * A wrapper to take care of the functions concerning an input element
- * @param options Object containing user customization properties, including:
- * - promptWidth (default=22px)
  * @param components Object that links to other UI components. GCLI provided:
  * - requisition
  * - focusManager
  * - element
  */
-function Inputter(options, components) {
+function Inputter(components) {
   this.requisition = components.requisition;
   this.focusManager = components.focusManager;
 
@@ -187,7 +185,7 @@
 };
 
 /**
- * Handler for the Requisition.textChanged event
+ * Function called when we think the text might have changed
  */
 Inputter.prototype.textChanged = function() {
   if (!this.document) {
@@ -431,7 +429,7 @@
  * if something went wrong.
  */
 Inputter.prototype.onKeyUp = function(ev) {
-  this.handleKeyUp(ev).then(null, util.errorHandler);
+  this.handleKeyUp(ev).catch(util.errorHandler);
 };
 
 /**
@@ -476,9 +474,9 @@
   this._completed = this.requisition.update(this.element.value);
   this._previousValue = this.element.value;
 
-  return this._completed.then(function(updated) {
+  return this._completed.then(function() {
     // Abort UI changes if this UI update has been overtaken
-    if (updated) {
+    if (this._previousValue === this.element.value) {
       this._choice = null;
       this.textChanged();
       this.onChoiceChange({ choice: this._choice });
@@ -506,7 +504,7 @@
   // If the user is on a valid value, then we increment the value, but if
   // they've typed something that's not right we page through predictions
   if (this.assignment.getStatus() === Status.VALID) {
-    return this.requisition.increment(this.assignment).then(function() {
+    return this.requisition.nudge(this.assignment, 1).then(function() {
       // See notes on focusManager.onInputChange in onKeyDown
       this.textChanged();
       if (this.focusManager) {
@@ -538,7 +536,7 @@
 
   // See notes above for the UP key
   if (this.assignment.getStatus() === Status.VALID) {
-    return this.requisition.decrement(this.assignment).then(function() {
+    return this.requisition.nudge(this.assignment, -1).then(function() {
       // See notes on focusManager.onInputChange in onKeyDown
       this.textChanged();
       if (this.focusManager) {
@@ -591,9 +589,8 @@
   // 1 second) to the time of the keyup then we assume that we got them
   // both, and do the completion.
   if (hasContents && this.lastTabDownAt + 1000 > ev.timeStamp) {
-    // It's possible for TAB to not change the input, in which case the
-    // textChanged event will not fire, and the caret move will not be
-    // processed. So we check that this is done first
+    // It's possible for TAB to not change the input, in which case the caret
+    // move will not be processed. So we check that this is done first
     this._caretChange = Caret.TO_ARG_END;
     var inputState = this.getInputState();
     this._processCaretChange(inputState);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js	2015-04-24 19:31:13.000000000 +0000
@@ -33,9 +33,6 @@
 /**
  * A widget to display an inline dialog which allows the user to fill out
  * the arguments to a command.
- * @param options Object containing user customization properties, including:
- * - tooltipClass (default='gcli-tooltip'): Custom class name when generating
- *   the top level element which allows different layout systems
  * @param components Object that links to other UI components. GCLI provided:
  * - requisition: The Requisition to fill out
  * - inputter: An instance of Inputter
@@ -43,13 +40,13 @@
  * - panelElement (optional): The element to show/hide on visibility events
  * - element: The root element to populate
  */
-function Tooltip(options, components) {
+function Tooltip(components) {
   this.inputter = components.inputter;
   this.requisition = components.requisition;
   this.focusManager = components.focusManager;
 
   this.element = components.element;
-  this.element.classList.add(options.tooltipClass || 'gcli-tooltip');
+  this.element.classList.add('gcliterm-tooltip');
   this.document = this.element.ownerDocument;
 
   this.panelElement = components.panelElement;
@@ -176,7 +173,7 @@
     conversion.constrainPredictionIndex(context, ev.choice).then(function(choice) {
       this.field.menu._choice = choice;
       this.field.menu._updateHighlight();
-    }.bind(this)).then(null, util.errorHandler);
+    }.bind(this)).catch(util.errorHandler);
   }
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/settings.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/settings.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/settings.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/settings.js	2015-04-24 19:31:13.000000000 +0000
@@ -106,7 +106,6 @@
 
 /**
  * Add a new setting
- * @return The new Setting object
  */
 Settings.prototype.add = function(prefSpec) {
   var setting = new Setting(this, prefSpec);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/system.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/system.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/system.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/system.js	2015-04-24 19:31:13.000000000 +0000
@@ -0,0 +1,371 @@
+/*
+ * Copyright 2012, Mozilla Foundation and contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+var Promise = require('./util/promise').Promise;
+var util = require('./util/util');
+var Commands = require('./commands/commands').Commands;
+var Connectors = require('./connectors/connectors').Connectors;
+var Converters = require('./converters/converters').Converters;
+var Fields = require('./fields/fields').Fields;
+var Languages = require('./languages/languages').Languages;
+var Settings = require('./settings').Settings;
+var Types = require('./types/types').Types;
+
+/**
+ * This is the heart of the API that we expose to the outside.
+ * @param options Object that customizes how the system acts. Valid properties:
+ * - commands, connectors, converters, fields, languages, settings, types:
+ *   Custom configured manager objects for these item types
+ * - location: a system with a location will ignore commands that don't have a
+ *   matching runAt property. This is principly for client/server setups where
+ *   we import commands from the server to the client, so a system with
+ *   `{ location: 'client' }` will silently ignore commands with
+ *   `{ runAt: 'server' }`. Any system without a location will accept commands
+ *   with any runAt property (including none).
+ */
+exports.createSystem = function(options) {
+  options = options || {};
+  var location = options.location;
+
+  // The plural/singular thing may make you want to scream, but it allows us
+  // to say components[getItemType(item)], so a lookup here (and below) saves
+  // multiple lookups in the middle of the code
+  var components = {
+    connector: options.connectors || new Connectors(),
+    converter: options.converters || new Converters(),
+    field: options.fields || new Fields(),
+    language: options.languages || new Languages(),
+    type: options.types || new Types()
+  };
+  components.setting = new Settings(components.type);
+  components.command = new Commands(components.type, location);
+
+  var getItemType = function(item) {
+    if (item.item) {
+      return item.item;
+    }
+    // Some items are registered using the constructor so we need to check
+    // the prototype for the the type of the item
+    return (item.prototype && item.prototype.item) ?
+           item.prototype.item : 'command';
+  };
+
+  var addItem = function(item) {
+    try {
+      components[getItemType(item)].add(item);
+    }
+    catch (ex) {
+      if (item != null) {
+        console.error('While adding: ' + item.name);
+      }
+      throw ex;
+    }
+  };
+
+  var removeItem = function(item) {
+    components[getItemType(item)].remove(item);
+  };
+
+  /**
+   * loadableModules is a lookup of names to module loader functions (like
+   * the venerable 'require') to which we can pass a name and get back a
+   * JS object (or a promise of a JS object). This allows us to have custom
+   * loaders to get stuff from the filesystem etc.
+   */
+  var loadableModules = {};
+
+  /**
+   * loadedModules is a lookup by name of the things returned by the functions
+   * in loadableModules so we can track what we need to unload / reload.
+   */
+  var loadedModules = {};
+
+  var unloadModule = function(name) {
+    var existingModule = loadedModules[name];
+    if (existingModule != null) {
+      existingModule.items.forEach(removeItem);
+    }
+    delete loadedModules[name];
+  };
+
+  var loadModule = function(name) {
+    var existingModule = loadedModules[name];
+    unloadModule(name);
+
+    // And load the new items
+    try {
+      var loader = loadableModules[name];
+      return Promise.resolve(loader(name)).then(function(newModule) {
+        if (existingModule === newModule) {
+          return;
+        }
+
+        if (newModule == null) {
+          throw 'Module \'' + name + '\' not found';
+        }
+
+        if (newModule.items == null || typeof newModule.items.forEach !== 'function') {
+          console.log('Exported properties: ' + Object.keys(newModule).join(', '));
+          throw 'Module \'' + name + '\' has no \'items\' array export';
+        }
+
+        newModule.items.forEach(addItem);
+
+        loadedModules[name] = newModule;
+      });
+    }
+    catch (ex) {
+      console.error('Failed to load module ' + name + ': ' + ex);
+      console.error(ex.stack);
+
+      return Promise.resolve();
+    }
+  };
+
+  var pendingChanges = false;
+
+  var system = {
+    addItems: function(items) {
+      items.forEach(addItem);
+    },
+
+    removeItems: function(items) {
+      items.forEach(removeItem);
+    },
+
+    addItemsByModule: function(names, options) {
+      var promises = [];
+
+      options = options || {};
+      if (!options.delayedLoad) {
+        // We could be about to add many commands, just report the change once
+        this.commands.onCommandsChange.holdFire();
+      }
+
+      if (typeof names === 'string') {
+        names = [ names ];
+      }
+      names.forEach(function(name) {
+        if (options.loader == null) {
+          options.loader = function(name) {
+            return require(name);
+          };
+        }
+        loadableModules[name] = options.loader;
+
+        if (options.delayedLoad) {
+          pendingChanges = true;
+        }
+        else {
+          promises.push(loadModule(name).catch(console.error));
+        }
+      });
+
+      if (options.delayedLoad) {
+        return Promise.resolve();
+      }
+      else {
+        return Promise.all(promises).then(function() {
+          this.commands.onCommandsChange.resumeFire();
+        }.bind(this));
+      }
+    },
+
+    removeItemsByModule: function(name) {
+      this.commands.onCommandsChange.holdFire();
+
+      delete loadableModules[name];
+      unloadModule(name);
+
+      this.commands.onCommandsChange.resumeFire();
+    },
+
+    load: function() {
+      if (!pendingChanges) {
+        return Promise.resolve();
+      }
+      this.commands.onCommandsChange.holdFire();
+
+      // clone loadedModules, so we can remove what is left at the end
+      var modules = Object.keys(loadedModules).map(function(name) {
+        return loadedModules[name];
+      });
+
+      var promises = Object.keys(loadableModules).map(function(name) {
+        delete modules[name];
+        return loadModule(name).catch(console.error);
+      });
+
+      Object.keys(modules).forEach(unloadModule);
+      pendingChanges = false;
+
+      return Promise.all(promises).then(function() {
+        this.commands.onCommandsChange.resumeFire();
+      }.bind(this));
+    },
+
+    destroy: function() {
+      this.commands.onCommandsChange.holdFire();
+
+      Object.keys(loadedModules).forEach(function(name) {
+        unloadModule(name);
+      });
+
+      this.commands.onCommandsChange.resumeFire();
+    },
+
+    toString: function() {
+      return 'System [' +
+             'commands:' + components.command.getAll().length + ', ' +
+             'connectors:' + components.connector.getAll().length + ', ' +
+             'converters:' + components.converter.getAll().length + ', ' +
+             'fields:' + components.field.getAll().length + ', ' +
+             'settings:' + components.setting.getAll().length + ', ' +
+             'types:' + components.type.getTypeNames().length + ']';
+    }
+  };
+
+  Object.defineProperty(system, 'commands', {
+    get: function() { return components.command; },
+    enumerable: true
+  });
+
+  Object.defineProperty(system, 'connectors', {
+    get: function() { return components.connector; },
+    enumerable: true
+  });
+
+  Object.defineProperty(system, 'converters', {
+    get: function() { return components.converter; },
+    enumerable: true
+  });
+
+  Object.defineProperty(system, 'fields', {
+    get: function() { return components.field; },
+    enumerable: true
+  });
+
+  Object.defineProperty(system, 'languages', {
+    get: function() { return components.language; },
+    enumerable: true
+  });
+
+  Object.defineProperty(system, 'settings', {
+    get: function() { return components.setting; },
+    enumerable: true
+  });
+
+  Object.defineProperty(system, 'types', {
+    get: function() { return components.type; },
+    enumerable: true
+  });
+
+  return system;
+};
+
+/**
+ * Connect a local system with another at the other end of a connector
+ * @param system System to which we're adding commands
+ * @param front Front which allows access to the remote system from which we
+ * import commands
+ * @param customProps Array of strings specifying additional properties defined
+ * on remote commands that should be considered part of the metadata for the
+ * commands imported into the local system
+ */
+exports.connectFront = function(system, front, customProps) {
+  system._handleCommandsChanged = function() {
+    syncItems(system, front, customProps).catch(util.errorHandler);
+  };
+  front.on('commands-changed', system._handleCommandsChanged);
+
+  return syncItems(system, front, customProps);
+};
+
+/**
+ * Undo the effect of #connectFront
+ */
+exports.disconnectFront = function(system, front) {
+  front.off('commands-changed', system._handleCommandsChanged);
+  system._handleCommandsChanged = undefined;
+  removeItemsFromFront(system, front);
+};
+
+/**
+ * Remove the items in this system that came from a previous sync action, and
+ * re-add them. See connectFront() for explanation of properties
+ */
+function syncItems(system, front, customProps) {
+  return front.specs(customProps).then(function(specs) {
+    removeItemsFromFront(system, front);
+
+    var remoteItems = addLocalFunctions(specs, front);
+    system.addItems(remoteItems);
+
+    return system;
+  });
+};
+
+/**
+ * Take the data from the 'specs' command (or the 'commands-changed' event) and
+ * add function to proxy the execution back over the front
+ */
+function addLocalFunctions(specs, front) {
+  // Inject an 'exec' function into the commands, and the front into
+  // all the remote types
+  specs.forEach(function(commandSpec) {
+    // HACK: Tack the front to the command so we know how to remove it
+    // in removeItemsFromFront() below
+    commandSpec.front = front;
+
+    // Tell the type instances for a command how to contact their counterparts
+    // Don't confuse this with setting the front on the commandSpec which is
+    // about associating a proxied command with it's source for later removal.
+    // This is actually going to be used by the type
+    commandSpec.params.forEach(function(param) {
+      if (typeof param.type !== 'string') {
+        param.type.front = front;
+      }
+    });
+
+    if (!commandSpec.isParent) {
+      commandSpec.exec = function(args, context) {
+        var typed = (context.prefix ? context.prefix + ' ' : '') + context.typed;
+        return front.execute(typed).then(function(reply) {
+          var typedData = context.typedData(reply.type, reply.data);
+          return reply.isError ? Promise.reject(typedData) : typedData;
+        });
+      };
+    }
+
+    commandSpec.isProxy = true;
+  });
+
+  return specs;
+}
+
+/**
+ * Go through all the commands removing any that are associated with the
+ * given front. The method of association is the hack in addLocalFunctions.
+ */
+function removeItemsFromFront(system, front) {
+  system.commands.getAll().forEach(function(command) {
+    if (command.front === front) {
+      system.commands.remove(command);
+    }
+  });
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/date.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/date.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/date.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/date.js	2015-04-24 19:31:13.000000000 +0000
@@ -227,35 +227,22 @@
       return Promise.resolve(new Conversion(value, arg));
     },
 
-    decrement: function(value, context) {
+    nudge: function(value, by, context) {
       if (!isDate(value)) {
         return new Date();
       }
 
       var newValue = new Date(value);
-      newValue.setDate(value.getDate() - this.step);
+      newValue.setDate(value.getDate() + (by * this.step));
 
-      if (newValue >= this.getMin(context)) {
-        return newValue;
-      }
-      else {
+      if (newValue < this.getMin(context)) {
         return this.getMin(context);
       }
-    },
-
-    increment: function(value, context) {
-      if (!isDate(value)) {
-        return new Date();
-      }
-
-      var newValue = new Date(value);
-      newValue.setDate(value.getDate() + this.step);
-
-      if (newValue <= this.getMax(context)) {
-        return newValue;
+      else if (newValue > this.getMax(context)) {
+        return this.getMax();
       }
       else {
-        return this.getMax();
+        return newValue;
       }
     }
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/delegate.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/delegate.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/delegate.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/delegate.js	2015-04-24 19:31:13.000000000 +0000
@@ -19,6 +19,7 @@
 var Promise = require('../util/promise').Promise;
 var Conversion = require('./types').Conversion;
 var Status = require('./types').Status;
+var BlankArgument = require('./types').BlankArgument;
 
 /**
  * The types we expose for registration
@@ -29,14 +30,6 @@
     item: 'type',
     name: 'delegate',
 
-    constructor: function() {
-      if (typeof this.delegateType !== 'function' &&
-          typeof this.delegateType !== 'string') {
-        throw new Error('Instances of DelegateType need typeSpec.delegateType' +
-                        ' to be a function that returns a type');
-      }
-    },
-
     getSpec: function(commandName, paramName) {
       return {
         name: 'delegate',
@@ -47,9 +40,7 @@
     // Child types should implement this method to return an instance of the type
     // that should be used. If no type is available, or some sort of temporary
     // placeholder is required, BlankType can be used.
-    delegateType: function(context) {
-      throw new Error('Not implemented');
-    },
+    delegateType: undefined,
 
     stringify: function(value, context) {
       return this.getType(context).then(function(delegated) {
@@ -63,23 +54,19 @@
       }.bind(this));
     },
 
-    decrement: function(value, context) {
+    nudge: function(value, by, context) {
       return this.getType(context).then(function(delegated) {
-        return delegated.decrement ?
-               delegated.decrement(value, context) :
-               undefined;
-      }.bind(this));
-    },
-
-    increment: function(value, context) {
-      return this.getType(context).then(function(delegated) {
-        return delegated.increment ?
-               delegated.increment(value, context) :
+        return delegated.nudge ?
+               delegated.nudge(value, by, context) :
                undefined;
       }.bind(this));
     },
 
     getType: function(context) {
+      if (this.delegateType === undefined) {
+        return Promise.resolve(this.types.createType('blank'));
+      }
+
       var type = this.delegateType(context);
       if (typeof type.parse !== 'function') {
         type = this.types.createType(type);
@@ -87,8 +74,8 @@
       return Promise.resolve(type);
     },
 
-    // DelegateType is designed to be inherited from, so DelegateField needs a way
-    // to check if something works like a delegate without using 'name'
+    // DelegateType is designed to be inherited from, so DelegateField needs a
+    // way to check if something works like a delegate without using 'name'
     isDelegate: true,
 
     // Technically we perhaps should proxy this, except that properties are
@@ -99,12 +86,36 @@
   {
     item: 'type',
     name: 'remote',
-    param: undefined,
+    paramName: undefined,
+    blankIsValid: false,
+
+    getSpec: function(commandName, paramName) {
+      return {
+        name: 'remote',
+        commandName: commandName,
+        paramName: paramName,
+        blankIsValid: this.blankIsValid
+      };
+    },
+
+    getBlank: function(context) {
+      if (this.blankIsValid) {
+        return new Conversion({ stringified: '' },
+                              new BlankArgument(), Status.VALID);
+      }
+      else {
+        return new Conversion(undefined, new BlankArgument(),
+                              Status.INCOMPLETE, '');
+      }
+    },
 
     stringify: function(value, context) {
+      if (value == null) {
+        return '';
+      }
       // remote types are client only, and we don't attempt to transfer value
       // objects to the client (we can't be sure the are jsonable) so it is a
-      // but strange to be asked to stringify a value object, however since
+      // bit strange to be asked to stringify a value object, however since
       // parse creates a Conversion with a (fake) value object we might be
       // asked to stringify that. We can stringify fake value objects.
       if (typeof value.stringified === 'string') {
@@ -114,26 +125,16 @@
     },
 
     parse: function(arg, context) {
-      var args = { typed: context.typed, param: this.param };
-      return this.connection.call('typeparse', args).then(function(json) {
+      return this.front.parseType(context.typed, this.paramName).then(function(json) {
         var status = Status.fromString(json.status);
-        var val = { stringified: arg.text };
-        return new Conversion(val, arg, status, json.message, json.predictions);
-      });
-    },
-
-    decrement: function(value, context) {
-      var args = { typed: context.typed, param: this.param };
-      return this.connection.call('typedecrement', args).then(function(json) {
-        return { stringified: json.arg };
-      });
+        return new Conversion(undefined, arg, status, json.message, json.predictions);
+      }.bind(this));
     },
 
-    increment: function(value, context) {
-      var args = { typed: context.typed, param: this.param };
-      return this.connection.call('typeincrement', args).then(function(json) {
+    nudge: function(value, by, context) {
+      return this.front.nudgeType(context.typed, by, this.paramName).then(function(json) {
         return { stringified: json.arg };
-      });
+      }.bind(this));
     }
   },
   // 'blank' is a type for use with DelegateType when we don't know yet.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/javascript.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/javascript.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/javascript.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/javascript.js	2015-04-24 19:31:13.000000000 +0000
@@ -24,38 +24,6 @@
 var Status = require('./types').Status;
 
 /**
- * The object against which we complete, which is usually 'window' if it exists
- * but could be something else in non-web-content environments.
- */
-var globalObject;
-if (typeof window !== 'undefined') {
-  globalObject = window;
-}
-
-/**
- * Setter for the object against which JavaScript completions happen
- */
-exports.setGlobalObject = function(obj) {
-  globalObject = obj;
-};
-
-/**
- * Getter for the object against which JavaScript completions happen, for use
- * in testing
- */
-exports.getGlobalObject = function() {
-  return globalObject;
-};
-
-/**
- * Remove registration of object against which JavaScript completions happen
- */
-exports.unsetGlobalObject = function() {
-  globalObject = undefined;
-};
-
-
-/**
  * 'javascript' handles scripted input
  */
 function JavascriptType(typeSpec) {
@@ -63,8 +31,11 @@
 
 JavascriptType.prototype = Object.create(Type.prototype);
 
-JavascriptType.prototype.getSpec = function() {
-  return 'javascript';
+JavascriptType.prototype.getSpec = function(commandName, paramName) {
+  return {
+    name: 'remote',
+    paramName: paramName
+  };
 };
 
 JavascriptType.prototype.stringify = function(value, context) {
@@ -82,7 +53,8 @@
 
 JavascriptType.prototype.parse = function(arg, context) {
   var typed = arg.text;
-  var scope = globalObject;
+  var scope = (context.environment.window == null) ?
+              null : context.environment.window;
 
   // No input is undefined
   if (typed === '') {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/node.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/node.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/node.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/node.js	2015-04-24 19:31:13.000000000 +0000
@@ -25,42 +25,13 @@
 var BlankArgument = require('./types').BlankArgument;
 
 /**
- * The object against which we complete, which is usually 'window' if it exists
- * but could be something else in non-web-content environments.
- */
-var doc;
-if (typeof document !== 'undefined') {
-  doc = document;
-}
-
-/**
- * Setter for the document that contains the nodes we're matching
- */
-exports.setDocument = function(document) {
-  doc = document;
-};
-
-/**
- * Undo the effects of setDocument()
- */
-exports.unsetDocument = function() {
-  doc = undefined;
-};
-
-/**
- * Getter for the document that contains the nodes we're matching
- * Most for changing things back to how they were for unit testing
- */
-exports.getDocument = function() {
-  return doc;
-};
-
-/**
  * Helper functions to be attached to the prototypes of NodeType and
  * NodeListType to allow terminal to tell us which nodes should be highlighted
  */
 function onEnter(assignment) {
-  assignment.highlighter = new Highlighter(doc);
+  // TODO: GCLI doesn't support passing a context to notifications of cursor
+  // position, so onEnter/onLeave/onChange are disabled below until we fix this
+  assignment.highlighter = new Highlighter(context.environment.window.document);
   assignment.highlighter.nodelist = assignment.conversion.matches;
 }
 
@@ -94,8 +65,12 @@
     item: 'type',
     name: 'node',
 
-    getSpec: function() {
-      return 'node';
+    getSpec: function(commandName, paramName) {
+      return {
+        name: 'remote',
+        commandName: commandName,
+        paramName: paramName
+      };
     },
 
     stringify: function(value, context) {
@@ -110,12 +85,11 @@
 
       if (arg.text === '') {
         reply = new Conversion(undefined, arg, Status.INCOMPLETE);
-        reply.matches = util.createEmptyNodeList(doc);
       }
       else {
         var nodes;
         try {
-          nodes = doc.querySelectorAll(arg.text);
+          nodes = context.environment.window.document.querySelectorAll(arg.text);
           if (nodes.length === 0) {
             reply = new Conversion(undefined, arg, Status.INCOMPLETE,
                                    l10n.lookup('nodeParseNone'));
@@ -142,9 +116,9 @@
       return Promise.resolve(reply);
     },
 
-    onEnter: onEnter,
-    onLeave: onLeave,
-    onChange: onChange
+    // onEnter: onEnter,
+    // onLeave: onLeave,
+    // onChange: onChange
   },
   {
     // The 'nodelist' type is a CSS expression that refers to a node list
@@ -167,14 +141,21 @@
       }
     },
 
-    getSpec: function() {
-      return this.allowEmpty ?
-             { name: 'nodelist', allowEmpty: true } :
-             'nodelist';
+    getSpec: function(commandName, paramName) {
+      return {
+        name: 'remote',
+        commandName: commandName,
+        paramName: paramName,
+        blankIsValid: true
+      };
     },
 
     getBlank: function(context) {
-      var emptyNodeList = (doc == null ? [] : util.createEmptyNodeList(doc));
+      var emptyNodeList = [];
+      if (context != null && context.environment.window != null) {
+        var doc = context.environment.window.document;
+        emptyNodeList = util.createEmptyNodeList(doc);
+      }
       return new Conversion(emptyNodeList, new BlankArgument(), Status.VALID);
     },
 
@@ -190,16 +171,16 @@
       try {
         if (arg.text === '') {
           reply = new Conversion(undefined, arg, Status.INCOMPLETE);
-          reply.matches = util.createEmptyNodeList(doc);
         }
         else {
-          var nodes = doc.querySelectorAll(arg.text);
+          var nodes = context.environment.window.document.querySelectorAll(arg.text);
 
           if (nodes.length === 0 && !this.allowEmpty) {
             reply = new Conversion(undefined, arg, Status.INCOMPLETE,
                                    l10n.lookup('nodeParseNone'));
           }
           else {
+            nodes.__gcliQuery = arg.text;
             reply = new Conversion(nodes, arg, Status.VALID, '');
           }
 
@@ -209,14 +190,13 @@
       catch (ex) {
         reply = new Conversion(undefined, arg, Status.ERROR,
                                l10n.lookup('nodeParseSyntax'));
-        reply.matches = util.createEmptyNodeList(doc);
       }
 
       return Promise.resolve(reply);
     },
 
-    onEnter: onEnter,
-    onLeave: onLeave,
-    onChange: onChange
+    // onEnter: onEnter,
+    // onLeave: onLeave,
+    // onChange: onChange
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/number.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/number.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/number.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/number.js	2015-04-24 19:31:13.000000000 +0000
@@ -132,26 +132,28 @@
       return Promise.resolve(new Conversion(value, arg));
     },
 
-    decrement: function(value, context) {
+    nudge: function(value, by, context) {
       if (typeof value !== 'number' || isNaN(value)) {
-        return this.getMax(context) || 1;
+        if (by < 0) {
+          return this.getMax(context) || 1;
+        }
+        else {
+          var min = this.getMin(context);
+          return min != null ? min : 0;
+        }
       }
-      var newValue = value - this.step;
-      // Snap to the nearest incremental of the step
-      newValue = Math.ceil(newValue / this.step) * this.step;
-      return this._boundsCheck(newValue, context);
-    },
 
-    increment: function(value, context) {
-      if (typeof value !== 'number' || isNaN(value)) {
-        var min = this.getMin(context);
-        return min != null ? min : 0;
-      }
-      var newValue = value + this.step;
+      var newValue = value + (by * this.step);
+
       // Snap to the nearest incremental of the step
-      newValue = Math.floor(newValue / this.step) * this.step;
-      if (this.getMax(context) == null) {
-        return newValue;
+      if (by < 0) {
+        newValue = Math.ceil(newValue / this.step) * this.step;
+      }
+      else {
+        newValue = Math.floor(newValue / this.step) * this.step;
+        if (this.getMax(context) == null) {
+          return newValue;
+        }
       }
       return this._boundsCheck(newValue, context);
     },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/resource.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/resource.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/resource.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/resource.js	2015-04-24 19:31:13.000000000 +0000
@@ -23,38 +23,6 @@
 };
 
 /**
- * The object against which we complete, which is usually 'window' if it exists
- * but could be something else in non-web-content environments.
- */
-var doc;
-if (typeof document !== 'undefined') {
-  doc = document;
-}
-
-/**
- * Setter for the document that contains the nodes we're matching
- */
-exports.setDocument = function(document) {
-  doc = document;
-};
-
-/**
- * Undo the effects of setDocument()
- */
-exports.unsetDocument = function() {
-  ResourceCache.clear();
-  doc = undefined;
-};
-
-/**
- * Getter for the document that contains the nodes we're matching
- * Most for changing things back to how they were for unit testing
- */
-exports.getDocument = function() {
-  return doc;
-};
-
-/**
  * Resources are bits of CSS and JavaScript that the page either includes
  * directly or as a result of reading some remote resource.
  * Resource should not be used directly, but instead through a sub-class like
@@ -85,7 +53,7 @@
 function CssResource(domSheet) {
   this.name = domSheet.href;
   if (!this.name) {
-    this.name = domSheet.ownerNode.id ?
+    this.name = domSheet.ownerNode && domSheet.ownerNode.id ?
             'css#' + domSheet.ownerNode.id :
             'inline-css';
   }
@@ -103,12 +71,13 @@
   }.bind(this));
 };
 
-CssResource._getAllStyles = function() {
+CssResource._getAllStyles = function(context) {
   var resources = [];
-  if (doc == null) {
+  if (context.environment.window == null) {
     return resources;
   }
 
+  var doc = context.environment.window.document;
   Array.prototype.forEach.call(doc.styleSheets, function(domSheet) {
     CssResource._getStyle(domSheet, resources);
   });
@@ -182,11 +151,12 @@
   }.bind(this));
 };
 
-ScriptResource._getAllScripts = function() {
-  if (doc == null) {
+ScriptResource._getAllScripts = function(context) {
+  if (context.environment.window == null) {
     return [];
   }
 
+  var doc = context.environment.window.document;
   var scriptNodes = doc.querySelectorAll('script');
   var resources = Array.prototype.map.call(scriptNodes, function(scriptNode) {
     var resource = ResourceCache.get(scriptNode);
@@ -283,20 +253,20 @@
       }
     },
 
-    lookup: function() {
+    lookup: function(context) {
       var resources = [];
       if (this.include !== Resource.TYPE_SCRIPT) {
-        Array.prototype.push.apply(resources, CssResource._getAllStyles());
+        Array.prototype.push.apply(resources,
+                                   CssResource._getAllStyles(context));
       }
       if (this.include !== Resource.TYPE_CSS) {
-        Array.prototype.push.apply(resources, ScriptResource._getAllScripts());
+        Array.prototype.push.apply(resources,
+                                   ScriptResource._getAllScripts(context));
       }
 
-      return new Promise(function(resolve, reject) {
-        resolve(resources.map(function(resource) {
-          return { name: resource.name, value: resource };
-        }));
-      }.bind(this));
+      return Promise.resolve(resources.map(function(resource) {
+        return { name: resource.name, value: resource };
+      }));
     }
   }
 ];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/selection.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/selection.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/selection.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/selection.js	2015-04-24 19:31:13.000000000 +0000
@@ -78,8 +78,7 @@
   if (typeof this.lookup === 'function' || typeof this.data === 'function') {
     spec.commandName = commandName;
     spec.paramName = paramName;
-    spec.remoteLookup = (typeof this.lookup === 'function');
-    spec.remoteData = (typeof this.data === 'function');
+    spec.remoteLookup = true;
   }
   return spec;
 };
@@ -126,21 +125,9 @@
   var reply;
 
   if (this.remoteLookup) {
-    reply = this.connection.call('selectioninfo', {
-      action: 'lookup',
-      commandName: this.commandName,
-      paramName: this.paramName
-    });
+    reply = this.front.getSelectionLookup(this.commandName, this.paramName);
     reply = resolve(reply, context);
   }
-  else if (this.remoteData) {
-    reply = this.connection.call('selectioninfo', {
-      action: 'data',
-      commandName: this.commandName,
-      paramName: this.paramName
-    });
-    reply = resolve(reply, context).then(this._dataToLookup);
-  }
   else if (typeof this.lookup === 'function') {
     reply = resolve(this.lookup.bind(this), context);
   }
@@ -227,7 +214,7 @@
   }
 
   // Exact hidden matches. If 'hidden: true' then we only allow exact matches
-  // All the tests after here check that !option.value.hidden
+  // All the tests after here check that !isHidden(option)
   for (i = 0; i < lookup.length && predictions.length < maxPredictions; i++) {
     option = lookup[i];
     if (option.name === arg.text) {
@@ -238,7 +225,7 @@
   // Start with prefix matching
   for (i = 0; i < lookup.length && predictions.length < maxPredictions; i++) {
     option = lookup[i];
-    if (option._gcliLowerName.indexOf(match) === 0 && !option.value.hidden) {
+    if (option._gcliLowerName.indexOf(match) === 0 && !isHidden(option)) {
       if (predictions.indexOf(option) === -1) {
         predictions.push(option);
       }
@@ -249,7 +236,7 @@
   if (predictions.length < (maxPredictions / 2)) {
     for (i = 0; i < lookup.length && predictions.length < maxPredictions; i++) {
       option = lookup[i];
-      if (option._gcliLowerName.indexOf(match) !== -1 && !option.value.hidden) {
+      if (option._gcliLowerName.indexOf(match) !== -1 && !isHidden(option)) {
         if (predictions.indexOf(option) === -1) {
           predictions.push(option);
         }
@@ -261,7 +248,7 @@
   if (predictions.length === 0) {
     var names = [];
     lookup.forEach(function(opt) {
-      if (!opt.value.hidden) {
+      if (!isHidden(opt)) {
         names.push(opt.name);
       }
     });
@@ -306,11 +293,21 @@
                         Promise.resolve(predictions));
 };
 
+/**
+ * Checking that an option is hidden involves messing in properties on the
+ * value right now (which isn't a good idea really) we really should be marking
+ * that on the option, so this encapsulates the problem
+ */
+function isHidden(option) {
+  return option.hidden === true ||
+         (option.value != null && option.value.hidden);
+}
+
 SelectionType.prototype.getBlank = function(context) {
   var predictFunc = function(context2) {
     return Promise.resolve(this.getLookup(context2)).then(function(lookup) {
       return lookup.filter(function(option) {
-        return !option.value.hidden;
+        return !isHidden(option);
       }).slice(0, Conversion.maxPredictions - 1);
     });
   }.bind(this);
@@ -320,44 +317,45 @@
 };
 
 /**
- * For selections, up is down and black is white. It's like this, given a list
- * [ a, b, c, d ], it's natural to think that it starts at the top and that
- * going up the list, moves towards 'a'. However 'a' has the lowest index, so
- * for SelectionType, up is down and down is up.
- * Sorry.
+ * Increment and decrement are confusing for selections. +1 is -1 and -1 is +1.
+ * Given an array e.g. [ 'a', 'b', 'c' ] with the current selection on 'b',
+ * displayed to the user in the natural way, i.e.:
+ *
+ *   'a'
+ *   'b' <- highlighted as current value
+ *   'c'
+ *
+ * Pressing the UP arrow should take us to 'a', which decrements this index
+ * (compare pressing UP on a number which would increment the number)
+ *
+ * So for selections, we treat +1 as -1 and -1 as +1.
  */
-SelectionType.prototype.decrement = function(value, context) {
+SelectionType.prototype.nudge = function(value, by, context) {
   return this.getLookup(context).then(function(lookup) {
     var index = this._findValue(lookup, value);
     if (index === -1) {
-      index = 0;
+      if (by < 0) {
+        // We're supposed to be doing a decrement (which means +1), but the
+        // value isn't found, so we reset the index to the top of the list
+        // which is index 0
+        index = 0;
+      }
+      else {
+        // For an increment operation when there is nothing to start from, we
+        // want to start from the top, i.e. index 0, so the value before we
+        // 'increment' (see note above) must be 1.
+        index = 1;
+      }
     }
-    index++;
+
+    // This is where we invert the sense of up/down (see doc comment)
+    index -= by;
+
     if (index >= lookup.length) {
       index = 0;
     }
     return lookup[index].value;
   }.bind(this));
-};
-
-/**
- * See note on SelectionType.decrement()
- */
-SelectionType.prototype.increment = function(value, context) {
-  return this.getLookup(context).then(function(lookup) {
-    var index = this._findValue(lookup, value);
-    if (index === -1) {
-      // For an increment operation when there is nothing to start from, we
-      // want to start from the top, i.e. index 0, so the value before we
-      // 'increment' (see note above) must be 1.
-      index = 1;
-    }
-    index--;
-    if (index < 0) {
-      index = lookup.length - 1;
-    }
-    return lookup[index].value;
-  }.bind(this));
 };
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/setting.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/setting.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/setting.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/setting.js	2015-04-24 19:31:13.000000000 +0000
@@ -25,12 +25,15 @@
     cacheable: true,
     lookup: function(context) {
       var settings = context.system.settings;
+
+      // Lazily add a settings.onChange listener to clear the cache
       if (!this._registeredListener) {
         settings.onChange.add(function(ev) {
           this.clearCache();
         }, this);
         this._registeredListener = true;
       }
+
       return settings.getAll().map(function(setting) {
         return { name: setting.name, value: setting };
       });
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/types.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/types.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/types.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/types.js	2015-04-24 19:31:13.000000000 +0000
@@ -946,9 +946,9 @@
 }
 
 /**
- * Get a JSONable data structure that entirely describes this type
- * @param commandName/paramName The names of the command and parameter which we
- * are remoting to help the server get back to the remoted action.
+ * Get a JSONable data structure that entirely describes this type.
+ * commandName and paramName are the names of the command and parameter which
+ * we are remoting to help the server get back to the remoted action.
  */
 Type.prototype.getSpec = function(commandName, paramName) {
   throw new Error('Not implemented');
@@ -995,18 +995,12 @@
 Type.prototype.name = undefined;
 
 /**
- * If there is some concept of a higher value, return it,
+ * If there is some concept of a lower or higher value, return it,
  * otherwise return undefined.
+ * @param by number indicating how much to nudge by, usually +1 or -1 which is
+ * caused by the user pressing the UP/DOWN keys with the cursor in this type
  */
-Type.prototype.increment = function(value, context) {
-  return undefined;
-};
-
-/**
- * If there is some concept of a lower value, return it,
- * otherwise return undefined.
- */
-Type.prototype.decrement = function(value, context) {
+Type.prototype.nudge = function(value, by, context) {
   return undefined;
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/url.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/url.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/url.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/types/url.js	2015-04-24 19:31:13.000000000 +0000
@@ -61,7 +61,7 @@
           }.bind(this));
 
           // Try to create a URL with the current page as a base ref
-          if (context.environment.window) {
+          if ('window' in context.environment) {
             try {
               var base = context.environment.window.location.href;
               var localized = host.createUrl(arg.text, base);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/ui/menu.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/ui/menu.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/ui/menu.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/ui/menu.js	2015-04-24 19:31:13.000000000 +0000
@@ -256,16 +256,16 @@
 }
 
 /**
- * @return The current choice index
+ * @return {int} current choice index
  */
 Menu.prototype.getChoiceIndex = function() {
   return this._choice == null ? 0 : this._choice;
 };
 
 /**
- * Highlight the next option
+ * Highlight the next (for by=1) or previous (for by=-1) option
  */
-Menu.prototype.incrementChoice = function() {
+Menu.prototype.nudgeChoice = function(by) {
   if (this._choice == null) {
     this._choice = 0;
   }
@@ -273,20 +273,7 @@
   // There's an annoying up is down thing here, the menu is presented
   // with the zeroth index at the top working down, so the UP arrow needs
   // pick the choice below because we're working down
-  this._choice--;
-  this._updateHighlight();
-};
-
-/**
- * Highlight the previous option
- */
-Menu.prototype.decrementChoice = function() {
-  if (this._choice == null) {
-    this._choice = 0;
-  }
-
-  // See incrementChoice
-  this._choice++;
+  this._choice -= by;
   this._updateHighlight();
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/host.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/host.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/host.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/host.js	2015-04-24 19:31:13.000000000 +0000
@@ -219,7 +219,7 @@
 /**
  * Execute some JavaScript
  */
-exports.script.eval = function(javascript) {
+exports.script.evaluate = function(javascript) {
   return new Promise(function(resolve, reject) {
     var onResult = function(response) {
       var output = response.result;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/promise.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/promise.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/promise.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/promise.js	2015-04-24 19:31:13.000000000 +0000
@@ -16,95 +16,4 @@
 
 'use strict';
 
-var Cu = require('chrome').Cu;
-var Cc = require('chrome').Cc;
-var Ci = require('chrome').Ci;
-
-/*
- * Minimalist implementation of ES6 promises built on SDK promises. 2 things to
- * know:
- * - There is a hack in .then() to be async which matches A+ and toolkit
- *   promises. GCLI code works with either sync or async promises, but async
- *   is more correct
- * - There is an additional Promise.defer function which to matches the call
- *   in toolkit promises, which in turn matches the call in SDK promises
- *
- * Why not use toolkit promises directly? Because there is a strange bug that
- * we are investigating where thread executions vanish.
- * 
- * When we've solved the debugger/sdk/promise/gcli/helpers/overlap problem then
- * we should use this instead:
- * module.exports = exports = require('resource://gre/modules/Promise.jsm');
- */
-
-var promise = require('resource://gre/modules/devtools/deprecated-sync-thenables.js', {});
-
-/**
- * An implementation of ES6 promises in terms of SDK promises
- */
-var Promise = function(executor) {
-  this.deferred = promise.defer();
-  try {
-    executor.call(null, this.deferred.resolve, this.deferred.reject);
-  }
-  catch (ex) {
-    this.deferred.reject(ex);
-  }
-}
-
-var async = true;
-
-/**
- * The sync version of this would look like
- *     Promise.prototype.then = function(onResolve, onReject) {
- *      return this.deferred.promise.then(onResolve, onReject);
- *    };
- */
-Promise.prototype.then = function(onResolve, onReject) {
-  return new Promise(function(resolve, reject) {
-    setTimeout(function() {
-      try {
-        resolve(this.deferred.promise.then(onResolve, onReject));
-      }
-      catch (ex) {
-        reject(ex);
-      }
-    }.bind(this), 0);
-  }.bind(this));
-};
-
-Promise.all = promise.all;
-Promise.resolve = promise.resolve;
-Promise.defer = promise.defer;
-
-exports.Promise = Promise;
-
-
-/**
- * Implementation of the setTimeout/clearTimeout web APIs taken from the old
- * Timer.jsm module
- */
-
-// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4 days.
-var nextTimeoutId = 1; // setTimeout must return a positive integer
-
-var timeoutTable = new Map(); // int -> nsITimer
-
-var setTimeout = function(callback, millis) {
-  let id = nextTimeoutId++;
-  let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-  timer.initWithCallback(function setTimeout_timer() {
-    timeoutTable.delete(id);
-    callback.call(undefined);
-  }, millis, timer.TYPE_ONE_SHOT);
-
-  timeoutTable.set(id, timer);
-  return id;
-}
-
-var clearTimeout = function(aId) {
-  if (timeoutTable.has(aId)) {
-    timeoutTable.get(aId).cancel();
-    timeoutTable.delete(aId);
-  }
-}
+exports.Promise = require("resource://gre/modules/Promise.jsm").Promise;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/util.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/util.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/util.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/source/lib/gcli/util/util.js	2015-04-24 19:31:13.000000000 +0000
@@ -161,6 +161,24 @@
   };
 
   /**
+   * Fire an event just once using a promise.
+   */
+  event.once = function() {
+    if (arguments.length !== 0) {
+      throw new Error('event.once uses promise return values');
+    }
+
+    return new Promise(function(resolve, reject) {
+      var handler = function(arg) {
+        event.remove(handler);
+        resolve(arg);
+      };
+
+      event.add(handler);
+    });
+  },
+
+  /**
    * Temporarily prevent this event from firing.
    * @see resumeFire(ev)
    */
@@ -255,30 +273,20 @@
     return Promise.resolve([]);
   }
 
-  return new Promise(function(resolve, reject) {
-    var replies = [];
-
-    var callNext = function(index) {
-      var onSuccess = function(reply) {
-        replies[index] = reply;
-
-        if (index + 1 >= array.length) {
-          resolve(replies);
-        }
-        else {
-          callNext(index + 1);
-        }
-      };
-
-      var onFailure = function(ex) {
-        reject(ex);
-      };
+  var allReply = [];
+  var promise = Promise.resolve();
 
-      var reply = action.call(scope, array[index], index, array);
-      Promise.resolve(reply).then(onSuccess).then(null, onFailure);
-    };
+  array.forEach(function(member, i) {
+    promise = promise.then(function() {
+      var reply = action.call(scope, member, i, array);
+      return Promise.resolve(reply).then(function(data) {
+        allReply[i] = data;
+      });
+    });
+  });
 
-    callNext(0);
+  return promise.then(function() {
+    return allReply;
   });
 };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/Templater.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/Templater.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/gcli/Templater.jsm	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/gcli/Templater.jsm	2015-04-24 19:31:13.000000000 +0000
@@ -19,11 +19,7 @@
 XPCOMUtils.defineLazyModuleGetter(this, "console",
                                   "resource://gre/modules/devtools/Console.jsm");
 
-'do not use strict';
-
-// WARNING: do not 'use strict' without reading the notes in envEval();
-// Also don't remove the 'do not use strict' marker. The orion build uses these
-// markers to know where to insert AMD headers.
+'use strict';
 
 /**
  * For full documentation, see:
@@ -69,9 +65,9 @@
   processNode(state, node, data);
 };
 
-//
-//
-//
+if (typeof exports !== 'undefined') {
+  exports.template = template;
+}
 
 /**
  * Helper for the places where we need to act asynchronously and keep track of
@@ -182,6 +178,7 @@
               replacement = envEval(state, value.slice(2, -1), data, value);
               if (replacement && typeof replacement.then === 'function') {
                 node.setAttribute(name, '');
+                /* jshint loopfunc:true */
                 replacement.then(function(newValue) {
                   node.setAttribute(name, newValue);
                 }).then(null, console.error);
@@ -361,15 +358,16 @@
       });
       newData[paramName] = reply;
       if (node.parentNode != null) {
+        var clone;
         if (templNode.nodeName.toLowerCase() === 'loop') {
           for (var i = 0; i < templNode.childNodes.length; i++) {
-            var clone = templNode.childNodes[i].cloneNode(true);
+            clone = templNode.childNodes[i].cloneNode(true);
             node.parentNode.insertBefore(clone, node);
             processNode(cState, clone, newData);
           }
         }
         else {
-          var clone = templNode.cloneNode(true);
+          clone = templNode.cloneNode(true);
           clone.removeAttribute('foreach');
           node.parentNode.insertBefore(clone, node);
           processNode(cState, clone, newData);
@@ -543,10 +541,6 @@
 /**
  * Like eval, but that creates a context of the variables in <tt>env</tt> in
  * which the script is evaluated.
- * WARNING: This script uses 'with' which is generally regarded to be evil.
- * The alternative is to create a Function at runtime that takes X parameters
- * according to the X keys in the env object, and then call that function using
- * the values in the env object. This is likely to be slow, but workable.
  * @param script The string to be evaluated.
  * @param data The environment in which to eval the script.
  * @param frame Optional debugging string in case of failure.
@@ -566,9 +560,26 @@
             ' can not be resolved using a simple property path.');
         return '${' + script + '}';
       }
-      with (data) {
-        return eval(script);
-      }
+
+      // What we're looking to do is basically:
+      //   with(data) { return eval(script); }
+      // except in strict mode where 'with' is banned.
+      // So we create a function which has a parameter list the same as the
+      // keys in 'data' and with 'script' as its function body.
+      // We then call this function with the values in 'data'
+      var keys = allKeys(data);
+      var func = Function.apply(null, keys.concat("return " + script));
+
+      var values = keys.map(function(key) { return data[key]; });
+      return func.apply(null, values);
+
+      // TODO: The 'with' method is different from the code above in the value
+      // of 'this' when calling functions. For example:
+      //   envEval(state, 'foo()', { foo: function() { return this; } }, ...);
+      // The global for 'foo' when using 'with' is the data object. However the
+      // code above, the global is null. (Using 'func.apply(data, values)'
+      // changes 'this' in the 'foo()' frame, but not in the inside the body
+      // of 'foo', so that wouldn't help)
     }
   }
   catch (ex) {
@@ -581,6 +592,15 @@
 }
 
 /**
+ * Object.keys() that respects the prototype chain
+ */
+function allKeys(data) {
+  var keys = [];
+  for (var key in data) { keys.push(key); }
+  return keys;
+}
+
+/**
  * A generic way of reporting errors, for easy overloading in different
  * environments.
  * @param message the error message to report.
@@ -599,5 +619,5 @@
  * @param message the error message to report.
  */
 function logError(message) {
-  console.log(message);
+  console.error(message);
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/Loader.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/Loader.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/Loader.jsm	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/Loader.jsm	2015-04-24 19:31:13.000000000 +0000
@@ -79,6 +79,7 @@
         // corresponding addition to the SrcdirProvider mapping below as well.
         "": "resource://gre/modules/commonjs/",
         "main": "resource:///modules/devtools/main.js",
+        "definitions": "resource:///modules/devtools/definitions.js",
         "devtools": "resource:///modules/devtools",
         "devtools/toolkit": "resource://gre/modules/devtools",
         "devtools/server": "resource://gre/modules/devtools/server",
@@ -135,6 +136,7 @@
     let devtoolsDir = OS.Path.join(srcdir, "browser", "devtools");
     let toolkitDir = OS.Path.join(srcdir, "toolkit", "devtools");
     let mainURI = this.fileURI(OS.Path.join(devtoolsDir, "main.js"));
+    let definitionsURI = this.fileURI(OS.Path.join(devtoolsDir, "definitions.js"));
     let devtoolsURI = this.fileURI(devtoolsDir);
     let toolkitURI = this.fileURI(toolkitDir);
     let serverURI = this.fileURI(OS.Path.join(toolkitDir, "server"));
@@ -161,6 +163,7 @@
       paths: {
         "": "resource://gre/modules/commonjs/",
         "main": mainURI,
+        "definitions": definitionsURI,
         "devtools": devtoolsURI,
         "devtools/toolkit": toolkitURI,
         "devtools/server": serverURI,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/actors/actor-registry.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/actors/actor-registry.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/actors/actor-registry.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/actors/actor-registry.js	2015-04-24 19:31:13.000000000 +0000
@@ -89,11 +89,6 @@
       reject(e);
     }
 
-    if (uri.scheme != "resource") {
-      reject(new Error(
-        "Can only register actors whose URI scheme is 'resource'."));
-    }
-
     NetUtil.asyncFetch({
       uri,
       loadUsingSystemPrincipal: true,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/actors/animation.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/actors/animation.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/actors/animation.js	2015-04-22 13:06:12.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/actors/animation.js	2015-04-24 19:31:13.000000000 +0000
@@ -486,13 +486,16 @@
   },
 
   /**
-   * Retrieve the list of AnimationPlayerActor actors corresponding to
-   * currently running animations for a given node.
-   * @param {NodeActor} nodeActor The NodeActor type is defined in
+   * Retrieve the list of AnimationPlayerActor actors for currently running
+   * animations on a node and its descendants.
+   * @param {NodeActor} nodeActor The NodeActor as defined in
    * /toolkit/devtools/server/actors/inspector
    */
   getAnimationPlayersForNode: method(function(nodeActor) {
-    let animations = nodeActor.rawNode.getAnimations();
+    let animations = [
+      ...nodeActor.rawNode.getAnimations(),
+      ...this.getAllAnimations(nodeActor.rawNode)
+    ];
 
     // No care is taken here to destroy the previously stored actors because it
     // is assumed that the client is responsible for lifetimes of actors.
@@ -511,7 +514,10 @@
     this.stopAnimationPlayerUpdates();
     let win = nodeActor.rawNode.ownerDocument.defaultView;
     this.observer = new win.MutationObserver(this.onAnimationMutation);
-    this.observer.observe(nodeActor.rawNode, {animations: true});
+    this.observer.observe(nodeActor.rawNode, {
+      animations: true,
+      subtree: true
+    });
 
     return this.actors;
   }, {
@@ -596,23 +602,31 @@
   }),
 
   /**
-   * Iterates through all nodes in all of the tabActor's window documents and
-   * finds all existing animation players.
-   * This is currently used to allow playing/pausing all animations at once
-   * until the WebAnimations API provides a way to play/pause via the document
-   * timeline (alternatively, when bug 1123524 is fixed, we will be able to
-   * only iterate once and then listen for changes).
+   * Iterates through all nodes below a given rootNode (optionally also in
+   * nested frames) and finds all existing animation players.
+   * @param {DOMNode} rootNode The root node to start iterating at. Animation
+   * players will *not* be reported for this node.
+   * @param {Boolean} traverseFrames Whether we should iterate through nested
+   * frames too.
+   * @return {Array} An array of AnimationPlayer objects.
    */
-  getAllAnimationPlayers: function() {
+  getAllAnimations: function(rootNode, traverseFrames) {
     let animations = [];
 
     // These loops shouldn't be as bad as they look.
-    // Typically, there will be very few windows, and getElementsByTagName is
-    // really fast even on large DOM trees.
-    for (let window of this.tabActor.windows) {
-      let root = window.document.body || window.document;
-      for (let element of root.getElementsByTagNameNS("*", "*")) {
-        animations = [...animations, ...element.getAnimations()];
+    // Typically, there will be very few nested frames, and getElementsByTagName
+    // is really fast even on large DOM trees.
+    for (let element of rootNode.getElementsByTagNameNS("*", "*")) {
+      if (traverseFrames && element.contentWindow) {
+        animations = [
+          ...animations,
+          ...this.getAllAnimations(element.contentWindow.document, traverseFrames)
+        ];
+      } else {
+        animations = [
+          ...animations,
+          ...element.getAnimations()
+        ];
       }
     }
 
@@ -636,7 +650,10 @@
    */
   pauseAll: method(function() {
     let readyPromises = [];
-    for (let player of this.getAllAnimationPlayers()) {
+    // Until the WebAnimations API provides a way to play/pause via the document
+    // timeline, we have to iterate through the whole DOM to find all players.
+    for (let player of
+         this.getAllAnimations(this.tabActor.window.document, true)) {
       player.pause();
       readyPromises.push(player.ready);
     }
@@ -653,7 +670,10 @@
    */
   playAll: method(function() {
     let readyPromises = [];
-    for (let player of this.getAllAnimationPlayers()) {
+    // Until the WebAnimations API provides a way to play/pause via the document
+    // timeline, we have to iterate through the whole DOM to find all players.
+    for (let player of
+         this.getAllAnimations(this.tabActor.window.document, true)) {
       player.play();
       readyPromises.push(player.ready);
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/actors/gcli.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/actors/gcli.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/actors/gcli.js	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/actors/gcli.js	2015-04-24 19:31:13.000000000 +0000
@@ -4,58 +4,102 @@
 
 "use strict";
 
-var Cu = require('chrome').Cu;
-var XPCOMUtils = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {}).XPCOMUtils;
-
-XPCOMUtils.defineLazyModuleGetter(this, "console",
-                                  "resource://gre/modules/devtools/Console.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "CommandUtils",
-                                  "resource:///modules/devtools/DeveloperToolbar.jsm");
-
-XPCOMUtils.defineLazyGetter(this, "Requisition", function() {
-  return require("gcli/cli").Requisition;
-});
-
-XPCOMUtils.defineLazyGetter(this, "centralCanon", function() {
-  return require("gcli/commands/commands").centralCanon;
-});
-
-var util = require('gcli/util/util');
-
-var protocol = require("devtools/server/protocol");
-var method = protocol.method;
-var Arg = protocol.Arg;
-var Option = protocol.Option;
-var RetVal = protocol.RetVal;
+const { Task } = require("resource://gre/modules/Task.jsm");
+const {
+  method, Arg, Option, RetVal, Front, FrontClass, Actor, ActorClass
+} = require("devtools/server/protocol");
+const events = require("sdk/event/core");
+const { createSystem } = require("gcli/system");
 
 /**
  * Manage remote connections that want to talk to GCLI
  */
-var GcliActor = exports.GcliActor = protocol.ActorClass({
+const GcliActor = ActorClass({
   typeName: "gcli",
 
+  events: {
+    "commands-changed" : {
+      type: "commandsChanged"
+    }
+  },
+
   initialize: function(conn, tabActor) {
-    protocol.Actor.prototype.initialize.call(this, conn);
-    this.tabActor = tabActor;
-    let browser = tabActor.browser;
-
-    let environment = {
-      chromeWindow: browser.ownerGlobal,
-      chromeDocument: browser.ownerDocument,
-      window: browser.contentWindow,
-      document: browser.contentDocument
-    };
+    Actor.prototype.initialize.call(this, conn);
+
+    this._commandsChanged = this._commandsChanged.bind(this);
+
+    this._tabActor = tabActor;
+    this._requisitionPromise = undefined; // see _getRequisition()
+  },
+
+  disconnect: function() {
+    return this.destroy();
+  },
+
+  destroy: function() {
+    Actor.prototype.destroy.call(this);
+
+    // If _getRequisition has not been called, just bail quickly
+    if (this._requisitionPromise == null) {
+      this._commandsChanged = undefined;
+      this._tabActor = undefined;
+      return Promise.resolve();
+    }
+
+    return this._getRequisition().then(requisition => {
+      requisition.destroy();
+
+      this._system.commands.onCommandsChange.remove(this._commandsChanged);
+      this._system.destroy();
+      this._system = undefined;
+
+      this._requisitionPromise = undefined;
+      this._tabActor = undefined;
 
-    this.requisition = new Requisition({ environment: env });
+      this._commandsChanged = undefined;
+    });
   },
 
   /**
+   * Load a module into the requisition
+   */
+  _testOnly_addItemsByModule: method(function(names) {
+    return this._getRequisition().then(requisition => {
+      return requisition.system.addItemsByModule(names);
+    });
+  }, {
+    request: {
+      customProps: Arg(0, "array:string")
+    }
+  }),
+
+  /**
+   * Unload a module from the requisition
+   */
+  _testOnly_removeItemsByModule: method(function(names) {
+    return this._getRequisition().then(requisition => {
+      return requisition.system.removeItemsByModule(names);
+    });
+  }, {
+    request: {
+      customProps: Arg(0, "array:string")
+    }
+  }),
+
+  /**
    * Retrieve a list of the remotely executable commands
+   * @param customProps Array of strings containing additional properties which,
+   * if specified in the command spec, will be included in the JSON. Normally we
+   * transfer only the properties required for GCLI to function.
    */
-  specs: method(function() {
-    return this.requisition.canon.getCommandSpecs();
+  specs: method(function(customProps) {
+    return this._getRequisition().then(requisition => {
+      return requisition.system.commands.getCommandSpecs(customProps);
+    });
   }, {
-    request: {},
+    request: {
+      customProps: Arg(0, "nullable:array:string")
+    },
     response: RetVal("json")
   }),
 
@@ -67,8 +111,8 @@
    * - error: True if the output was considered an error
    */
   execute: method(function(typed) {
-    return this.requisition.updateExec(typed).then(function(output) {
-      return output.toJson();
+    return this._getRequisition().then(requisition => {
+      return requisition.updateExec(typed).then(output => output.toJson());
     });
   }, {
     request: {
@@ -81,8 +125,10 @@
    * Get the state of an input string. i.e. requisition.getStateData()
    */
   state: method(function(typed, start, rank) {
-    return this.requisition.update(typed).then(() => {
-      return this.requisition.getStateData(start, rank);
+    return this._getRequisition().then(requisition => {
+      return requisition.update(typed).then(() => {
+        return requisition.getStateData(start, rank);
+      });
     });
   }, {
     request: {
@@ -100,104 +146,145 @@
    * - message: The message to display to the user
    * - predictions: An array of suggested values for the given parameter
    */
-  typeparse: method(function(typed, param) {
-    return this.requisition.update(typed).then(function() {
-      var assignment = this.requisition.getAssignment(param);
-
-      return promise.resolve(assignment.predictions).then(function(predictions) {
-        return {
-          status: assignment.getStatus().toString(),
-          message: assignment.message,
-          predictions: predictions
-        };
+  parseType: method(function(typed, paramName) {
+    return this._getRequisition().then(requisition => {
+      return requisition.update(typed).then(() => {
+        let assignment = requisition.getAssignment(paramName);
+        return Promise.resolve(assignment.predictions).then(predictions => {
+          return {
+            status: assignment.getStatus().toString(),
+            message: assignment.message,
+            predictions: predictions
+          };
+        });
       });
     });
   }, {
     request: {
       typed: Arg(0, "string"), // The command string
-      param: Arg(1, "string") // The name of the parameter to parse
+      paramName: Arg(1, "string") // The name of the parameter to parse
     },
     response: RetVal("json")
   }),
 
   /**
-   * Get the incremented value of some type
+   * Get the incremented/decremented value of some type
    * @return a promise of a string containing the new argument text
    */
-  typeincrement: method(function(typed, param) {
-    return this.requisition.update(typed).then(function() {
-      var assignment = this.requisition.getAssignment(param);
-      return this.requisition.increment(assignment).then(function() {
+  nudgeType: method(function(typed, by, paramName) {
+    return this.requisition.update(typed).then(() => {
+      const assignment = this.requisition.getAssignment(paramName);
+      return this.requisition.nudge(assignment, by).then(() => {
         return assignment.arg == null ? undefined : assignment.arg.text;
       });
     });
   }, {
     request: {
-      typed: Arg(0, "string"), // The command string
-      param: Arg(1, "string") // The name of the parameter to parse
+      typed: Arg(0, "string"),    // The command string
+      by: Arg(1, "number"),       // +1/-1 for increment / decrement
+      paramName: Arg(2, "string") // The name of the parameter to parse
     },
     response: RetVal("string")
   }),
 
   /**
-   * See typeincrement
+   * Perform a lookup on a selection type to get the allowed values
    */
-  typedecrement: method(function(typed, param) {
-    return this.requisition.update(typed).then(function() {
-      var assignment = this.requisition.getAssignment(param);
-      return this.requisition.decrement(assignment).then(function() {
-        return assignment.arg == null ? undefined : assignment.arg.text;
+  getSelectionLookup: method(function(commandName, paramName) {
+    return this._getRequisition().then(requisition => {
+      const command = requisition.system.commands.get(commandName);
+      if (command == null) {
+        throw new Error("No command called '" + commandName + "'");
+      }
+
+      let type;
+      command.params.forEach(param => {
+        if (param.name === paramName) {
+          type = param.type;
+        }
+      });
+
+      if (type == null) {
+        throw new Error("No parameter called '" + paramName + "' in '" +
+                        commandName + "'");
+      }
+
+      const reply = type.getLookup(requisition.executionContext);
+      return Promise.resolve(reply).then(lookup => {
+        // lookup returns an array of objects with name/value properties and
+        // the values might not be JSONable, so remove them
+        return lookup.map(info => ({ name: info.name }));
       });
     });
   }, {
     request: {
-      typed: Arg(0, "string"), // The command string
-      param: Arg(1, "string") // The name of the parameter to parse
+      commandName: Arg(0, "string"), // The command containing the parameter in question
+      paramName: Arg(1, "string"),   // The name of the parameter
     },
-    response: RetVal("string")
+    response: RetVal("json")
   }),
 
   /**
-   * Perform a lookup on a selection type to get the allowed values
+   * Lazy init for a Requisition
    */
-  selectioninfo: method(function(commandName, paramName, action) {
-    var command = this.requisition.canon.getCommand(commandName);
-    if (command == null) {
-      throw new Error('No command called \'' + commandName + '\'');
+  _getRequisition: function() {
+    if (this._tabActor == null) {
+      throw new Error('GcliActor used post-destroy');
     }
 
-    var type;
-    command.params.forEach(function(param) {
-      if (param.name === paramName) {
-        type = param.type;
-      }
-    });
-    if (type == null) {
-      throw new Error('No parameter called \'' + paramName + '\' in \'' +
-                      commandName + '\'');
+    if (this._requisitionPromise != null) {
+      return this._requisitionPromise;
     }
 
-    switch (action) {
-      case 'lookup':
-        return type.lookup(context);
-      case 'data':
-        return type.data(context);
-      default:
-        throw new Error('Action must be either \'lookup\' or \'data\'');
-    }
-  }, {
-    request: {
-      typed: Arg(0, "string"), // The command containing the parameter in question
-      param: Arg(1, "string"), // The name of the parameter
-      action: Arg(1, "string") // 'lookup' or 'data' depending on the function to call
-    },
-    response: RetVal("json")
-  })
+    const Requisition = require("gcli/cli").Requisition;
+    const tabActor = this._tabActor;
+
+    this._system = createSystem({ location: "server" });
+    this._system.commands.onCommandsChange.add(this._commandsChanged);
+
+    const gcliInit = require("devtools/commandline/commands-index");
+    gcliInit.addAllItemsByModule(this._system);
+
+    // this._requisitionPromise should be created synchronously with the call
+    // to _getRequisition so that destroy can tell whether there is an async
+    // init in progress
+    this._requisitionPromise = this._system.load().then(() => {
+      const environment = {
+        get chromeWindow() {
+          throw new Error("environment.chromeWindow is not available in runAt:server commands");
+        },
+
+        get chromeDocument() {
+          throw new Error("environment.chromeDocument is not available in runAt:server commands");
+        },
+
+        get window() tabActor.window,
+        get document() tabActor.window.document,
+        get __deprecatedTabActor() tabActor,
+      };
+
+      return new Requisition(this._system, { environment: environment });
+    });
+
+    return this._requisitionPromise;
+  },
+
+  /**
+   * Pass events from requisition.system.commands.onCommandsChange upwards
+   */
+  _commandsChanged: function() {
+    events.emit(this, "commands-changed");
+  },
 });
 
-exports.GcliFront = protocol.FrontClass(GcliActor, {
+exports.GcliActor = GcliActor;
+
+/**
+ * 
+ */
+const GcliFront = exports.GcliFront = FrontClass(GcliActor, {
   initialize: function(client, tabForm) {
-    protocol.Front.prototype.initialize.call(this, client);
+    Front.prototype.initialize.call(this, client);
     this.actorID = tabForm.gcliActor;
 
     // XXX: This is the first actor type in its hierarchy to use the protocol
@@ -205,3 +292,22 @@
     this.manage(this);
   },
 });
+
+// A cache of created fronts: WeakMap<Client, Front>
+const knownFronts = new WeakMap();
+
+/**
+ * Create a GcliFront only when needed (returns a promise)
+ * For notes on target.makeRemote(), see
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1016330#c7
+ */
+exports.GcliFront.create = function(target) {
+  return target.makeRemote().then(() => {
+    let front = knownFronts.get(target.client);
+    if (front == null && target.form.gcliActor != null) {
+      front = new GcliFront(target.client, target.form);
+      knownFronts.set(target.client, front);
+    }
+    return front;
+  });
+};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/tests/browser/browser_animation_actors_16.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/tests/browser/browser_animation_actors_16.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/tests/browser/browser_animation_actors_16.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/tests/browser/browser_animation_actors_16.js	2015-04-24 19:31:13.000000000 +0000
@@ -0,0 +1,46 @@
+/* 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";
+
+// Check that the AnimationsActor can retrieve all animations inside a node's
+// subtree (but not going into iframes).
+
+const {AnimationsFront} = require("devtools/server/actors/animation");
+const {InspectorFront} = require("devtools/server/actors/inspector");
+
+const URL = MAIN_DOMAIN + "animation.html";
+
+add_task(function*() {
+  info("Creating a test document with 2 iframes containing animated nodes");
+  let doc = yield addTab("data:text/html;charset=utf-8," +
+                         "<iframe id='iframe' src='" + URL + "'></iframe>");
+
+  initDebuggerServer();
+  let client = new DebuggerClient(DebuggerServer.connectPipe());
+  let form = yield connectDebuggerClient(client);
+  let inspector = InspectorFront(client, form);
+  let walker = yield inspector.getWalker();
+  let front = AnimationsFront(client, form);
+
+  info("Try retrieving all animations from the root doc's <body> node");
+  let rootBody = yield walker.querySelector(walker.rootNode, "body");
+  let players = yield front.getAnimationPlayersForNode(rootBody);
+  is(players.length, 0, "The node has no animation players");
+
+  info("Retrieve all animations from the iframe's <body> node");
+  let iframe = yield walker.querySelector(walker.rootNode, "#iframe");
+  let {nodes} = yield walker.children(iframe);
+  let frameBody = yield walker.querySelector(nodes[0], "body");
+  players = yield front.getAnimationPlayersForNode(frameBody);
+
+  // Testing for a hard-coded number of animations here would intermittently
+  // fail depending on how fast or slow the test is (indeed, the test page
+  // contains short transitions, and delayed animations). So just make sure we
+  // at least have the infinitely running animations.
+  ok(players.length >= 4, "All subtree animations were retrieved");
+
+  yield closeDebuggerClient(client);
+  gBrowser.removeCurrentTab();
+});
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/tests/browser/browser.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/tests/browser/browser.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/tests/browser/browser.ini	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/tests/browser/browser.ini	2015-04-24 19:31:13.000000000 +0000
@@ -31,6 +31,7 @@
 [browser_animation_actors_13.js]
 [browser_animation_actors_14.js]
 [browser_animation_actors_15.js]
+[browser_animation_actors_16.js]
 [browser_canvasframe_helper_01.js]
 [browser_canvasframe_helper_02.js]
 [browser_canvasframe_helper_03.js]
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/tests/unit/head_dbg.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/tests/unit/head_dbg.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/devtools/server/tests/unit/head_dbg.js	2015-04-22 13:06:13.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/devtools/server/tests/unit/head_dbg.js	2015-04-24 19:31:13.000000000 +0000
@@ -14,6 +14,9 @@
 const { promiseInvoke } = devtools.require("devtools/async-utils");
 
 const Services = devtools.require("Services");
+// Always log packets when running tests. runxpcshelltests.py will throw
+// the output away anyway, unless you give it the --verbose flag.
+Services.prefs.setBoolPref("devtools.debugger.log", true);
 // Enable remote debugging for the relevant tests.
 Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/library/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/library/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/library/moz.build	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/library/moz.build	2015-04-24 19:31:14.000000000 +0000
@@ -28,13 +28,6 @@
         'winspool.drv'
     ]
 
-    if CONFIG['MOZ_METRO']:
-        DELAYLOAD_DLLS += [
-            'API-MS-WIN-CORE-WINRT-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL',
-            'API-MS-WIN-CORE-WINRT-STRING-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL',
-            'uiautomationcore.dll'
-        ]
-
     if CONFIG['ACCESSIBILITY']:
         DELAYLOAD_DLLS += ['oleacc.dll']
 
@@ -355,11 +348,6 @@
         OS_LIBS += [
             'oleacc',
         ]
-    if CONFIG['MOZ_METRO']:
-        OS_LIBS += [
-            'uiautomationcore',
-            'runtimeobject',
-        ]
 
 if CONFIG['MOZ_ENABLE_QT']:
     OS_LIBS += CONFIG['XEXT_LIBS']
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/locales/en-US/chrome/global/aboutServiceWorkers.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/locales/en-US/chrome/global/aboutServiceWorkers.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/locales/en-US/chrome/global/aboutServiceWorkers.properties	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/locales/en-US/chrome/global/aboutServiceWorkers.properties	2015-04-24 19:31:14.000000000 +0000
@@ -31,3 +31,5 @@
 
 # LOCALIZATION NODE the term "Service Worker" should not translated.
 unregisterError = Failed to unregister this Service Worker.
+
+pushEndpoint = Push Endpoint:
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/locales/en-US/chrome/global/aboutSupport.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/locales/en-US/chrome/global/aboutSupport.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/locales/en-US/chrome/global/aboutSupport.properties	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/locales/en-US/chrome/global/aboutSupport.properties	2015-04-24 19:31:14.000000000 +0000
@@ -96,6 +96,7 @@
 multiProcessStatus = %1$S/%2$S (default: %3$S)
 
 asyncPanZoom = Asynchronous Pan/Zoom
+apzNone = none
 wheelEnabled = wheel input enabled
 touchEnabled = touch input enabled
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/locales/en-US/chrome/places/places.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/locales/en-US/chrome/places/places.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/locales/en-US/chrome/places/places.properties	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/locales/en-US/chrome/places/places.properties	2015-04-24 19:31:14.000000000 +0000
@@ -29,8 +29,3 @@
 # %1$S is the file size
 # %2$S is the file size unit
 backupFileSizeText=%1$S %2$S
-
-# LOCALIZATION NOTE (windows8TouchTitle): this is the name of the folder used
-# to store bookmarks created in Metro mode and share bookmarks between Metro
-# and Desktop.
-windows8TouchTitle=Windows 8 Touch
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/modules/InlineSpellChecker.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/modules/InlineSpellChecker.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/modules/InlineSpellChecker.jsm	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/modules/InlineSpellChecker.jsm	2015-04-24 19:31:14.000000000 +0000
@@ -335,7 +335,7 @@
     this.mInlineSpellChecker.spellCheckRange(null); // causes recheck
   },
 
-  // callback for selecting a suggesteed replacement
+  // callback for selecting a suggested replacement
   replaceMisspelling: function(index)
   {
     if (this.mRemote) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/modules/NewTabUtils.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/modules/NewTabUtils.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/modules/NewTabUtils.jsm	2015-04-22 13:06:14.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/modules/NewTabUtils.jsm	2015-04-24 19:31:14.000000000 +0000
@@ -1311,15 +1311,17 @@
    * @return The "site" string or null
    */
   extractSite: function Links_extractSite(url) {
-    let uri;
+    let host;
     try {
-      uri = Services.io.newURI(url, null, null);
+      // Note that nsIURI.asciiHost throws NS_ERROR_FAILURE for some types of
+      // URIs, including jar and moz-icon URIs.
+      host = Services.io.newURI(url, null, null).asciiHost;
     } catch (ex) {
       return null;
     }
 
     // Strip off common subdomains of the same site (e.g., www, load balancer)
-    return uri.asciiHost.replace(/^(m|mobile|www\d*)\./, "");
+    return host.replace(/^(m|mobile|www\d*)\./, "");
   },
 
   init: function NewTabUtils_init() {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/modules/SelectParentHelper.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/modules/SelectParentHelper.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/modules/SelectParentHelper.jsm	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/modules/SelectParentHelper.jsm	2015-04-24 19:31:14.000000000 +0000
@@ -14,13 +14,7 @@
   populate: function(menulist, items, selectedIndex) {
     // Clear the current contents of the popup
     menulist.menupopup.textContent = "";
-    populateChildren(menulist.menupopup, items, selectedIndex);
-    // We expect the parent element of the popup to be a <xul:menulist> that
-    // has the popuponly attribute set to "true". This is necessary in order
-    // for a <xul:menupopup> to act like a proper <html:select> dropdown, as
-    // the <xul:menulist> does things like remember state and set the
-    // _moz-menuactive attribute on the selected <xul:menuitem>.
-    menulist.selectedIndex = selectedIndex;
+    populateChildren(menulist, items, selectedIndex);
   },
 
   open: function(browser, menulist, rect) {
@@ -71,8 +65,9 @@
 
 };
 
-function populateChildren(element, options, selectedIndex, startIndex = 0, isGroup = false) {
+function populateChildren(menulist, options, selectedIndex, startIndex = 0, isGroup = false) {
   let index = startIndex;
+  let element = menulist.menupopup;
 
   for (let option of options) {
     let item = element.ownerDocument.createElement("menuitem");
@@ -84,8 +79,16 @@
     if (option.children.length > 0) {
       item.classList.add("contentSelectDropdown-optgroup");
       item.setAttribute("disabled", "true");
-      index = populateChildren(element, option.children, selectedIndex, index, true);
+      index = populateChildren(menulist, option.children, selectedIndex, index, true);
     } else {
+      if (index == selectedIndex) {
+        // We expect the parent element of the popup to be a <xul:menulist> that
+        // has the popuponly attribute set to "true". This is necessary in order
+        // for a <xul:menupopup> to act like a proper <html:select> dropdown, as
+        // the <xul:menulist> does things like remember state and set the
+        // _moz-menuactive attribute on the selected <xul:menuitem>.
+        menulist.selectedItem = item;
+      }
       item.setAttribute("value", index++);
 
       if (isGroup) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/modules/tests/xpcshell/test_web_channel_broker.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/modules/tests/xpcshell/test_web_channel_broker.js	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/modules/tests/xpcshell/test_web_channel_broker.js	2015-04-24 19:31:14.000000000 +0000
@@ -77,7 +77,9 @@
       },
       principal: {
         origin: URL_STRING
-      }
+      },
+      objects: {
+      },
     };
 
     WebChannelBroker._listener(mockEvent);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/modules/WebChannel.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/modules/WebChannel.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/modules/WebChannel.jsm	2015-04-22 13:06:15.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/modules/WebChannel.jsm	2015-04-24 19:31:14.000000000 +0000
@@ -66,11 +66,15 @@
    */
   _listener: function (event) {
     let data = event.data;
-    let sender = event.target;
+    let sendingContext = {
+      browser: event.target,
+      eventTarget: event.objects.eventTarget,
+      principal: event.principal,
+    };
 
     if (data && data.id) {
       if (!event.principal) {
-        this._sendErrorEventToContent(data.id, sender, "Message principal missing");
+        this._sendErrorEventToContent(data.id, sendingContext, "Message principal missing");
       } else {
         let validChannelFound = false;
         data.message = data.message || {};
@@ -79,13 +83,13 @@
           if (channel.id === data.id &&
             channel._originCheckCallback(event.principal)) {
             validChannelFound = true;
-            channel.deliver(data, sender);
+            channel.deliver(data, sendingContext);
           }
         }
 
         // if no valid origins send an event that there is no such valid channel
         if (!validChannelFound) {
-          this._sendErrorEventToContent(data.id, sender, "No Such Channel");
+          this._sendErrorEventToContent(data.id, sendingContext, "No Such Channel");
         }
       }
     } else {
@@ -108,20 +112,24 @@
    *
    * @param id {String}
    *        The WebChannel id to include in the message
-   * @param sender {EventTarget}
-   *        EventTarget with a "messageManager" that will send be used to send the message
+   * @param sendingContext {Object}
+   *        Message sending context
    * @param [errorMsg] {String}
    *        Error message
    * @private
    */
-  _sendErrorEventToContent: function (id, sender, errorMsg) {
+  _sendErrorEventToContent: function (id, sendingContext, errorMsg) {
+    let { browser: targetBrowser, eventTarget, principal: targetPrincipal } = sendingContext;
+
     errorMsg = errorMsg || "Web Channel Broker error";
 
-    if (sender.messageManager) {
-      sender.messageManager.sendAsyncMessage("WebChannelMessageToContent", {
+    if (targetBrowser && targetBrowser.messageManager) {
+      targetBrowser.messageManager.sendAsyncMessage("WebChannelMessageToContent", {
         id: id,
         error: errorMsg,
-      }, sender);
+      }, { eventTarget: eventTarget }, targetPrincipal);
+    } else {
+      Cu.reportError("Failed to send a WebChannel error. Target invalid.");
     }
     Cu.reportError(id.toString() + " error message. " + errorMsg);
   },
@@ -211,8 +219,17 @@
    *        The WebChannel id that was used for this message
    *        @param {Object} message
    *        The message itself
-   *        @param {EventTarget} sender
-   *        The source of the message
+   *        @param sendingContext {Object}
+   *        The sending context of the source of the message. Can be passed to
+   *        `send` to respond to a message.
+   *               @param sendingContext.browser {browser}
+   *                      The <browser> object that captured the
+   *                      WebChannelMessageToChrome.
+   *               @param sendingContext.eventTarget {EventTarget}
+   *                      The <EventTarget> where the message was sent.
+   *               @param sendingContext.principal {Principal}
+   *                      The <Principal> of the EventTarget where the
+   *                      message was sent.
    */
   listen: function (callback) {
     if (this._deliverCallback) {
@@ -239,16 +256,27 @@
    *
    * @param message {Object}
    *        The message object that will be sent
-   * @param target {browser}
-   *        The <browser> object that has a "messageManager" that sends messages
-   *
+   * @param target {Object}
+   *        A <target> with the information of where to send the message.
+   *        @param target.browser {browser}
+   *               The <browser> object with a "messageManager" that will
+   *               be used to send the message.
+   *        @param target.principal {Principal}
+   *               Principal of the target. Prevents messages from
+   *               being dispatched to unexpected origins. The system principal
+   *               can be specified to send to any target.
+   *        @param [target.eventTarget] {EventTarget}
+   *               Optional eventTarget within the browser, use to send to a
+   *               specific element, e.g., an iframe.
    */
   send: function (message, target) {
-    if (message && target && target.messageManager) {
-      target.messageManager.sendAsyncMessage("WebChannelMessageToContent", {
+    let { browser, principal, eventTarget } = target;
+
+    if (message && browser && browser.messageManager && principal) {
+      browser.messageManager.sendAsyncMessage("WebChannelMessageToContent", {
         id: this.id,
         message: message
-      });
+      }, { eventTarget }, principal);
     } else if (!message) {
       Cu.reportError("Failed to send a WebChannel message. Message not set.");
     } else {
@@ -261,18 +289,26 @@
    *
    * @param data {Object}
    *        Message data
-   * @param sender {browser}
-   *        Message sender
+   * @param sendingContext {Object}
+   *        Message sending context.
+   *        @param sendingContext.browser {browser}
+   *               The <browser> object that captured the
+   *               WebChannelMessageToChrome.
+   *        @param sendingContext.eventTarget {EventTarget}
+   *               The <EventTarget> where the message was sent.
+   *        @param sendingContext.principal {Principal}
+   *               The <Principal> of the EventTarget where the message was sent.
+   *
    */
-  deliver: function(data, sender) {
+  deliver: function(data, sendingContext) {
     if (this._deliverCallback) {
       try {
-        this._deliverCallback(data.id, data.message, sender);
+        this._deliverCallback(data.id, data.message, sendingContext);
       } catch (ex) {
         this.send({
           errno: ERRNO_UNKNOWN_ERROR,
           error: ex.message ? ex.message : ERROR_UNKNOWN
-        }, sender);
+        }, sendingContext);
         Cu.reportError("Failed to execute callback:" + ex);
       }
     } else {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/installer/windows/nsis/common.nsh thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/installer/windows/nsis/common.nsh
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/installer/windows/nsis/common.nsh	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/installer/windows/nsis/common.nsh	2015-04-24 19:31:15.000000000 +0000
@@ -7803,128 +7803,3 @@
   Exch $0 ; return elapsed seconds
 !macroend
 
-!ifdef MOZ_METRO
-; Removes the CEH registration if it's set to our installation directory.
-; If it's set to some other installation directory, then it should be removed
-; by that installation.
-!macro RemoveDEHRegistrationIfMatchingCall un
-
-  Function ${un}RemoveDEHRegistrationIfMatchingCall
-    ; Retrieve DEH ID from the stack into $R9
-    Exch $R9
-    Exch 1
-
-    ; Retrieve Protocol Activation ID from stack into $R8
-    Exch $R8
-    Exch 2
-
-    ; Retrieve File Activation ID from stack into $R7
-    Exch $R7
-
-    ; Backup the old values of R6 and R5 on the stack
-    Push $R6
-    Push $R5
-
-    ; Conditionally remove the DEH as long as we are the default (HKCU)
-    ReadRegStr $R6 HKCU "Software\Classes\CLSID\$R9\LocalServer32" ""
-    ${${un}GetLongPath} "$INSTDIR" $R5
-    StrCmp "$R6" "" next +1
-    IfFileExists "$R6" +1 clearHKCU
-    ${${un}GetParent} "$R6" $R6
-    ${${un}GetLongPath} "$R6" $R6
-    StrCmp "$R5" "$R6" clearHKCU next
-    clearHKCU:
-    DeleteRegKey HKCU "Software\Classes\CLSID\$R9"
-    DeleteRegValue HKCU "Software\Classes\$R8\shell\open\command" "DelegateExecute"
-    DeleteRegValue HKCU "Software\Classes\$R7\shell\open\command" "DelegateExecute"
-    next:
-
-    ; Conditionally remove the DEH as long as we are the default (HKLM)
-    ReadRegStr $R6 HKLM "Software\Classes\CLSID\$R9\LocalServer32" ""
-    ${${un}GetLongPath} "$INSTDIR" $R5
-    StrCmp "$R6" "" done +1
-    IfFileExists "$R6" +1 clearHKLM
-    ${${un}GetParent} "$R6" $R6
-    ${${un}GetLongPath} "$R6" $R6
-    StrCmp "$R5" "$R6" clearHKLM done
-    clearHKLM:
-    DeleteRegKey HKLM "Software\Classes\CLSID\$R9"
-    DeleteRegValue HKLM "Software\Classes\$R8\shell\open\command" "DelegateExecute"
-    DeleteRegValue HKLM "Software\Classes\$R7\shell\open\command" "DelegateExecute"
-    done:
-
-    ; Always remove the AppUserModelID keys for this installation
-    DeleteRegKey HKCU "Software\Classes\$AppUserModelID"
-    DeleteRegKey HKLM "Software\Classes\$AppUserModelID"
-
-    ; Restore the registers back to their original state
-    Pop $R5
-    Pop $R6
-    Exch $R7
-    Exch 2
-    Exch $R8
-    Exch 1
-    Exch $R9
-  FunctionEnd
-!macroend
-
-!macro RemoveDEHRegistrationIfMatching
-  !insertmacro RemoveDEHRegistrationIfMatchingCall ""
-!macroend
-
-!macro un.RemoveDEHRegistrationIfMatching
-  !insertmacro RemoveDEHRegistrationIfMatchingCall "un."
-!macroend
-
-!macro CleanupMetroBrowserHandlerValues un DELEGATE_EXECUTE_HANDLER_ID \
-                                           PROTOCOL_ACTIVATION_ID \
-                                           FILE_ACTIVATION_ID
-  Push ${FILE_ACTIVATION_ID}
-  Push ${PROTOCOL_ACTIVATION_ID}
-  Push ${DELEGATE_EXECUTE_HANDLER_ID}
-  Call ${un}RemoveDEHRegistrationIfMatchingCall
-!macroend
-!define CleanupMetroBrowserHandlerValues '!insertmacro CleanupMetroBrowserHandlerValues ""'
-!define un.CleanupMetroBrowserHandlerValues '!insertmacro CleanupMetroBrowserHandlerValues "un."'
-
-!macro AddMetroBrowserHandlerValues DELEGATE_EXECUTE_HANDLER_ID \
-                                    DELEGATE_EXECUTE_HANDLER_PATH \
-                                    APP_USER_MODEL_ID \
-                                    PROTOCOL_ACTIVATION_ID \
-                                    FILE_ACTIVATION_ID
-  ; Win8 doesn't use conventional progid command data to launch anymore.
-  ; Instead it uses a delegate execute handler which is a light weight COM
-  ; server for choosing the metro or desktop browser to launch depending
-  ; on the current environment (metro/desktop) it was activated in.
-  WriteRegStr SHCTX "Software\Classes\${APP_USER_MODEL_ID}" "" ""
-  WriteRegStr SHCTX "Software\Classes\${APP_USER_MODEL_ID}\.exe" "" ""
-  WriteRegStr SHCTX "Software\Classes\${APP_USER_MODEL_ID}\.exe\shell" "" "open"
-  WriteRegStr SHCTX "Software\Classes\${APP_USER_MODEL_ID}\.exe\shell\open" "CommandId" "open"
-  WriteRegStr SHCTX "Software\Classes\${APP_USER_MODEL_ID}\.exe\shell\open\command" "" "$2"
-  WriteRegStr SHCTX "Software\Classes\${APP_USER_MODEL_ID}\.exe\shell\open\command" "DelegateExecute" "${DELEGATE_EXECUTE_HANDLER_ID}"
-
-  ; Augment the url handler registrations with additional data needed for Metro
-  WriteRegStr SHCTX "Software\Classes\${PROTOCOL_ACTIVATION_ID}" "AppUserModelID" "${APP_USER_MODEL_ID}"
-  WriteRegStr SHCTX "Software\Classes\${PROTOCOL_ACTIVATION_ID}\Application" "AppUserModelID" "${APP_USER_MODEL_ID}"
-  WriteRegStr SHCTX "Software\Classes\${PROTOCOL_ACTIVATION_ID}\Application" "ApplicationName" "$BrandShortName"
-  WriteRegStr SHCTX "Software\Classes\${PROTOCOL_ACTIVATION_ID}\Application" "ApplicationIcon" "$INSTDIR\${FileMainEXE},0"
-  WriteRegStr SHCTX "Software\Classes\${PROTOCOL_ACTIVATION_ID}\Application" "ApplicationCompany" "${CompanyName}"
-  WriteRegStr SHCTX "Software\Classes\${PROTOCOL_ACTIVATION_ID}\Application" "ApplicationDescription" "$(REG_APP_DESC)"
-  WriteRegStr SHCTX "Software\Classes\${PROTOCOL_ACTIVATION_ID}\shell" "" "open"
-  WriteRegStr SHCTX "Software\Classes\${PROTOCOL_ACTIVATION_ID}\shell\open" "CommandId" "open"
-  WriteRegStr SHCTX "Software\Classes\${PROTOCOL_ACTIVATION_ID}\shell\open\command" "DelegateExecute" "${DELEGATE_EXECUTE_HANDLER_ID}"
-
-  ; Augment the file handler registrations with additional data needed for Metro
-  WriteRegStr SHCTX "Software\Classes\${FILE_ACTIVATION_ID}" "AppUserModelID" "${APP_USER_MODEL_ID}"
-  WriteRegStr SHCTX "Software\Classes\${FILE_ACTIVATION_ID}\shell" "" "open"
-  WriteRegStr SHCTX "Software\Classes\${FILE_ACTIVATION_ID}\shell\open" "CommandId" "open"
-  WriteRegStr SHCTX "Software\Classes\${FILE_ACTIVATION_ID}\shell\open\command" "DelegateExecute" "${DELEGATE_EXECUTE_HANDLER_ID}"
-
-  ; Win8 Metro delegate execute handler registration
-  WriteRegStr SHCTX "Software\Classes\CLSID\${DELEGATE_EXECUTE_HANDLER_ID}" "" "$BrandShortName CommandExecuteHandler"
-  WriteRegStr SHCTX "Software\Classes\CLSID\${DELEGATE_EXECUTE_HANDLER_ID}" "AppId" "${DELEGATE_EXECUTE_HANDLER_ID}"
-  WriteRegStr SHCTX "Software\Classes\CLSID\${DELEGATE_EXECUTE_HANDLER_ID}\LocalServer32" "" "${DELEGATE_EXECUTE_HANDLER_PATH}"
-!macroend
-!define AddMetroBrowserHandlerValues "!insertmacro AddMetroBrowserHandlerValues"
-!endif ;end MOZ_METRO
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/common/updatehelper.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/common/updatehelper.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/common/updatehelper.cpp	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/common/updatehelper.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -2,17 +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/. */
 
-#ifdef MOZ_METRO
-// Needed for COM calls to launch Metro applications
-#undef WINVER
-#undef _WIN32_WINNT
-#define WINVER 0x602
-#define _WIN32_WINNT 0x602
-#include <objbase.h>
-#include <shobjidl.h>
-#pragma comment(lib, "ole32.lib")
-#endif
-
 #include <windows.h>
 
 // Needed for CreateToolhelp32Snapshot
@@ -760,71 +749,3 @@
   RegCloseKey(baseKey);
   return success;
 }
-
-#ifdef MOZ_METRO
-  /*
-  * Retrieve the app model id of the firefox metro browser.
-  *
-  * @aPathBuffer Buffer to fill
-  * @aCharLength Length of buffer to fill in characters
-  */
-  bool GetDefaultBrowserAppModelID(WCHAR* aIDBuffer, long aCharLength)
-  {
-    if (!aIDBuffer || aCharLength <= 0)
-      return false;
-
-    memset(aIDBuffer, 0, (sizeof(WCHAR)*aCharLength));
-    static const WCHAR* kDefaultMetroBrowserIDPathKey = L"FirefoxURL";
-
-    HKEY key;
-    if (RegOpenKeyExW(HKEY_CLASSES_ROOT, kDefaultMetroBrowserIDPathKey,
-                      0, KEY_READ, &key) != ERROR_SUCCESS) {
-      return false;
-    }
-    DWORD len = aCharLength * sizeof(WCHAR);
-    memset(aIDBuffer, 0, len);
-    if (RegQueryValueExW(key, L"AppUserModelID", nullptr, nullptr,
-                         (LPBYTE)aIDBuffer, &len) != ERROR_SUCCESS || !len) {
-      RegCloseKey(key);
-      return false;
-    }
-    RegCloseKey(key);
-    return true;
-  }
-
-  HRESULT
-  LaunchDefaultMetroBrowser()
-  {
-    CoInitialize(nullptr);
-    HRESULT hr = E_FAIL;
-    // The interface that allows us to activate the browser
-    IApplicationActivationManager *activateMgr;
-    if (FAILED(hr = CoCreateInstance(CLSID_ApplicationActivationManager,
-                                     nullptr, CLSCTX_LOCAL_SERVER,
-                                     IID_IApplicationActivationManager,
-                                     (void**)&activateMgr))) {
-      CoUninitialize();
-      return hr;
-    }
-
-    // Activation is based on the browser's registered app model id
-    WCHAR appModelID[256];
-    if (!GetDefaultBrowserAppModelID(appModelID, (sizeof(appModelID)/sizeof(WCHAR)))) {
-      activateMgr->Release();
-      CoUninitialize();
-      return hr;
-    }
-
-    // Hand off focus rights to the out-of-process activation server. Without
-    // this the metro interface won't launch.
-    CoAllowSetForegroundWindow(activateMgr, nullptr);
-
-    // Launch default browser in Metro
-    DWORD processID;
-    hr = activateMgr->ActivateApplication(appModelID, L"", AO_NOERRORUI,
-                                          &processID);
-    activateMgr->Release();
-    CoUninitialize();
-    return hr;
-  }
-#endif
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/common/updatehelper.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/common/updatehelper.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/common/updatehelper.h	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/common/updatehelper.h	2015-04-24 19:31:15.000000000 +0000
@@ -32,8 +32,3 @@
 #define TEST_ONLY_FALLBACK_KEY_PATH \
   BASE_SERVICE_REG_KEY L"\\3932ecacee736d366d6436db0f55bce4"
 
-#ifdef MOZ_METRO
-  bool GetDefaultBrowserAppModelID(WCHAR* aIDBuffer, long aCharLength);
-  HRESULT LaunchDefaultMetroBrowser();
-#endif
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/nsIUpdateService.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/nsIUpdateService.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/nsIUpdateService.idl	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/nsIUpdateService.idl	2015-04-24 19:31:15.000000000 +0000
@@ -443,9 +443,8 @@
   /**
    * Whether or not a different instance is handling updates of this
    * installation.  This currently only ever returns true on Windows
-   * when 2 instances of an application are open or when both the Metro
-   * and Desktop browsers are open.  Only one of the instances will actually
-   * handle updates for the installation.
+   * when 2 instances of an application are open. Only one of the instances
+   * will actually handle updates for the installation.
    */
   readonly attribute boolean isOtherInstanceHandlingUpdates;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/nsUpdateService.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/nsUpdateService.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/nsUpdateService.js	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/nsUpdateService.js	2015-04-24 19:31:15.000000000 +0000
@@ -660,10 +660,8 @@
   // For Gonk, the updater will remount the /system partition to move staged
   // files into place.
   if (AppConstants.platform == "gonk") {
-    if (getPref("getBoolPref", PREF_APP_UPDATE_SERVICE_ENABLED, false)) {
-      LOG("getCanStageUpdates - able to stage updates because this is gonk");
+    LOG("getCanStageUpdates - able to stage updates because this is gonk");
       return true;
-    }
   }
 
   if (!hasUpdateMutex()) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/tests/chrome/utils.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/tests/chrome/utils.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/tests/chrome/utils.js	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/tests/chrome/utils.js	2015-04-24 19:31:15.000000000 +0000
@@ -203,7 +203,6 @@
 // The following vars are for restoring previous preference values (if present)
 // when the test finishes.
 var gAppUpdateEnabled;            // app.update.enabled
-var gAppUpdateMetroEnabled;       // app.update.metro.enabled
 var gAppUpdateServiceEnabled;     // app.update.service.enabled
 var gAppUpdateStagingEnabled;     // app.update.staging.enabled
 var gAppUpdateURLDefault;         // app.update.url (default prefbranch)
@@ -966,11 +965,6 @@
   }
   Services.prefs.setBoolPref(PREF_APP_UPDATE_ENABLED, true);
 
-  if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_METRO_ENABLED)) {
-    gAppUpdateMetroEnabled = Services.prefs.getBoolPref(PREF_APP_UPDATE_METRO_ENABLED);
-  }
-  Services.prefs.setBoolPref(PREF_APP_UPDATE_METRO_ENABLED, true);
-
   if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_SERVICE_ENABLED)) {
     gAppUpdateServiceEnabled = Services.prefs.getBoolPref(PREF_APP_UPDATE_SERVICE_ENABLED);
   }
@@ -1051,12 +1045,6 @@
     Services.prefs.clearUserPref(PREF_APP_UPDATE_ENABLED);
   }
 
-  if (gAppUpdateMetroEnabled !== undefined) {
-    Services.prefs.setBoolPref(PREF_APP_UPDATE_METRO_ENABLED, gAppUpdateMetroEnabled);
-  } else if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_METRO_ENABLED)) {
-    Services.prefs.clearUserPref(PREF_APP_UPDATE_METRO_ENABLED);
-  }
-
   if (gAppUpdateServiceEnabled !== undefined) {
     Services.prefs.setBoolPref(PREF_APP_UPDATE_SERVICE_ENABLED, gAppUpdateServiceEnabled);
   } else if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_SERVICE_ENABLED)) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/tests/data/shared.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/tests/data/shared.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/tests/data/shared.js	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/tests/data/shared.js	2015-04-24 19:31:15.000000000 +0000
@@ -17,7 +17,6 @@
 const PREF_APP_UPDATE_CERT_REQUIREBUILTIN = "app.update.cert.requireBuiltIn";
 const PREF_APP_UPDATE_CHANNEL             = "app.update.channel";
 const PREF_APP_UPDATE_ENABLED             = "app.update.enabled";
-const PREF_APP_UPDATE_METRO_ENABLED       = "app.update.metro.enabled";
 const PREF_APP_UPDATE_IDLETIME            = "app.update.idletime";
 const PREF_APP_UPDATE_LOG                 = "app.update.log";
 const PREF_APP_UPDATE_NEVER_BRANCH        = "app.update.never.";
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js	2015-04-24 19:31:15.000000000 +0000
@@ -1015,7 +1015,6 @@
  */
 function setDefaultPrefs() {
   Services.prefs.setBoolPref(PREF_APP_UPDATE_ENABLED, true);
-  Services.prefs.setBoolPref(PREF_APP_UPDATE_METRO_ENABLED, true);
   // Don't display UI for a successful installation. Some apps may not set this
   // pref to false like Firefox does.
   Services.prefs.setBoolPref(PREF_APP_UPDATE_SHOW_INSTALLED_UI, false);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/updater/updater.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/updater/updater.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/mozapps/update/updater/updater.cpp	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/mozapps/update/updater/updater.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -65,7 +65,6 @@
 
 // Amount of time in ms to wait for the parent process to close
 #define PARENT_WAIT 5000
-#define IMMERSIVE_PARENT_WAIT 15000
 
 #if defined(XP_MACOSX)
 // These functions are defined in launchchild_osx.mm
@@ -1731,23 +1730,6 @@
 #include "nsWindowsHelpers.h"
 #include "uachelper.h"
 #include "pathhash.h"
-
-#ifdef MOZ_METRO
-/**
- * Determines if the update came from an Immersive browser
- * @return true if the update came from an immersive browser
- */
-bool
-IsUpdateFromMetro(int argc, NS_tchar **argv)
-{
-  for (int i = 0; i < argc; i++) {
-    if (!wcsicmp(L"-ServerName:DefaultBrowserServer", argv[i])) {
-      return true;
-    }
-  }
-  return false;
-}
-#endif
 #endif
 
 static void
@@ -1774,14 +1756,6 @@
   // Do not allow the callback to run when running an update through the
   // service as session 0.  The unelevated updater.exe will do the launching.
   if (!usingService) {
-#if defined(MOZ_METRO)
-    // If our callback application is the default metro browser, then
-    // launch it now.
-    if (IsUpdateFromMetro(argc, argv)) {
-      LaunchDefaultMetroBrowser();
-      return;
-    }
-#endif
     WinLaunchChild(argv[0], argc, argv, nullptr);
   }
 #else
@@ -2484,15 +2458,10 @@
     // Otherwise, wait for the parent process to exit before starting the
     // update.
     if (parent) {
-      bool updateFromMetro = false;
-#ifdef MOZ_METRO
-      updateFromMetro = IsUpdateFromMetro(argc, argv);
-#endif
-      DWORD waitTime = updateFromMetro ?
-                       IMMERSIVE_PARENT_WAIT : PARENT_WAIT;
+      DWORD waitTime = PARENT_WAIT;
       DWORD result = WaitForSingleObject(parent, waitTime);
       CloseHandle(parent);
-      if (result != WAIT_OBJECT_0 && !updateFromMetro)
+      if (result != WAIT_OBJECT_0)
         return 1;
     }
   }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/system/gnome/nsPackageKitService.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/system/gnome/nsPackageKitService.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/system/gnome/nsPackageKitService.cpp	2015-04-22 13:06:17.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/system/gnome/nsPackageKitService.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -11,6 +11,7 @@
 #include "nsPackageKitService.h"
 #include "nsStringAPI.h"
 #include "prlink.h"
+#include "mozilla/unused.h"
 
 #include <glib.h>
 #include <glib-object.h>
@@ -157,7 +158,7 @@
   }
 
   g_object_unref(proxy);
-  observer->Release();
+  unused << observer.forget().take();
 }
 
 static void
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/webapps/WebappOSUtils.jsm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/webapps/WebappOSUtils.jsm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/webapps/WebappOSUtils.jsm	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/webapps/WebappOSUtils.jsm	2015-04-24 19:31:15.000000000 +0000
@@ -224,7 +224,7 @@
 #endif
 
 #endif
-    // Anything unsupported, like Metro
+    // Anything unsupported
     throw new Error("Unsupported apps platform");
   },
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsAppRunner.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsAppRunner.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsAppRunner.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsAppRunner.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -97,9 +97,6 @@
 #include <windows.h>
 #include "cairo/cairo-features.h"
 #include "mozilla/WindowsVersion.h"
-#ifdef MOZ_METRO
-#include <roapi.h>
-#endif
 
 #ifndef PROCESS_DEP_ENABLE
 #define PROCESS_DEP_ENABLE 0x1
@@ -128,10 +125,6 @@
 #include "nsXREDirProvider.h"
 #include "nsToolkitCompsCID.h"
 
-#if defined(XP_WIN) && defined(MOZ_METRO)
-#include "updatehelper.h"
-#endif
-
 #include "nsINIParser.h"
 #include "mozilla/Omnijar.h"
 #include "mozilla/StartupTimeline.h"
@@ -577,16 +570,12 @@
 /**
  * Determines if there is support for showing the profile manager
  *
- * @return true in all environments except for Windows Metro
+ * @return true in all environments
 */
 static bool
 CanShowProfileManager()
 {
-#if defined(XP_WIN)
-  return XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Desktop;
-#else
   return true;
-#endif
 }
 
 bool gSafeMode = false;
@@ -2879,38 +2868,6 @@
 bool fire_glxtest_process();
 #endif
 
-#if defined(XP_WIN) && defined(MOZ_METRO)
-#ifndef AHE_TYPE
-enum AHE_TYPE {
-  AHE_DESKTOP = 0,
-  AHE_IMMERSIVE = 1
-};
-#endif
-
-/*
- * The Windows launcher uses this value to decide what front end ui
- * to launch. We always launch the same ui unless the user
- * specifically asks to switch. Update the value on every startup
- * based on the environment requested.
- */
-void
-SetLastWinRunType(AHE_TYPE aType)
-{
-  HKEY key;
-  LONG result = RegOpenKeyExW(HKEY_CURRENT_USER,
-                              L"SOFTWARE\\Mozilla\\Firefox",
-                              0, KEY_WRITE, &key);
-  if (result != ERROR_SUCCESS) {
-    return;
-  }
-  DWORD value = (DWORD)aType;
-  result = RegSetValueEx(key, L"MetroLastAHE", 0, REG_DWORD,
-                         reinterpret_cast<LPBYTE>(&value),
-                         sizeof(DWORD));
-  RegCloseKey(key);
-}
-#endif // defined(XP_WIN) && defined(MOZ_METRO)
-
 #include "GeckoProfiler.h"
 
 // Encapsulates startup and shutdown state for XRE_main
@@ -3004,19 +2961,6 @@
   fire_glxtest_process();
 #endif
 
-#if defined(XP_WIN) && defined(MOZ_METRO)
-  // Don't remove this arg, we want to pass it on to nsUpdateDriver 
-  if (CheckArg("metro-update", false, nullptr, false) == ARG_FOUND ||
-      XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    // If we're doing a restart update that was initiated from metro land,
-    // we'll be running desktop to handle the actual update. Request that
-    // after the restart we launch into metro.
-    SetLastWinRunType(AHE_IMMERSIVE);
-  } else {
-    SetLastWinRunType(AHE_DESKTOP);
-  }
-#endif
-
   SetupErrorHandling(gArgv[0]);
 
 #ifdef CAIRO_HAS_DWRITE_FONT
@@ -3735,12 +3679,6 @@
     *aExitFlag = true;
     return 0;
   }
-#if defined(XP_WIN) && defined(MOZ_METRO)
-  if (CheckArg("metro-update", false) == ARG_FOUND) {
-    *aExitFlag = true;
-    return 0;
-  }
-#endif
 #endif
 
   rv = NS_NewToolkitProfileService(getter_AddRefs(mProfileSvc));
@@ -4219,7 +4157,6 @@
   // Check for an application initiated restart.  This is one that
   // corresponds to nsIAppStartup.quit(eRestart)
   if (rv == NS_SUCCESS_RESTART_APP
-      || rv == NS_SUCCESS_RESTART_METRO_APP
       || rv == NS_SUCCESS_RESTART_APP_NOT_SAME_PROFILE) {
     appInitiatedRestart = true;
 
@@ -4264,12 +4201,6 @@
     MOZ_gdk_display_close(mGdkDisplay);
 #endif
 
-#if defined(MOZ_METRO) && defined(XP_WIN)
-    if (rv == NS_SUCCESS_RESTART_METRO_APP) {
-      LaunchDefaultMetroBrowser();
-      rv = NS_OK;
-    } else
-#endif
     {
       rv = LaunchChild(mNativeApp, true);
     }
@@ -4297,128 +4228,6 @@
   return NS_FAILED(rv) ? 1 : 0;
 }
 
-#if defined(MOZ_METRO) && defined(XP_WIN)
-extern bool XRE_MetroCoreApplicationRun();
-static XREMain* xreMainPtr;
-
-// must be called by the thread we want as the main thread
-nsresult
-XRE_metroStartup(bool runXREMain)
-{
-  nsresult rv;
-
-  // XXX This call, odly enough, will set this thread as
-  // the main thread. (see bug 1033358)
-  ScopedLogging log;
-
-  bool exit = false;
-  if (xreMainPtr->XRE_mainStartup(&exit) != 0 || exit)
-    return NS_ERROR_FAILURE;
-
-  // Start the real application
-  xreMainPtr->mScopedXPCOM = MakeUnique<ScopedXPCOMStartup>();
-  if (!xreMainPtr->mScopedXPCOM)
-    return NS_ERROR_FAILURE;
-
-  rv = xreMainPtr->mScopedXPCOM->Initialize();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (runXREMain) {
-    rv = xreMainPtr->XRE_mainRun();
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  return NS_OK;
-}
-
-void
-XRE_metroShutdown()
-{
-  xreMainPtr->mScopedXPCOM = nullptr;
-
-#ifdef MOZ_INSTRUMENT_EVENT_LOOP
-  mozilla::ShutdownEventTracing();
-#endif
-
-  // unlock the profile after ScopedXPCOMStartup object (xpcom) 
-  // has gone out of scope.  see bug #386739 for more details
-  xreMainPtr->mProfileLock->Unlock();
-  gProfileLock = nullptr;
-
-#ifdef MOZ_CRASHREPORTER
-  if (xreMainPtr->mAppData->flags & NS_XRE_ENABLE_CRASH_REPORTER)
-      CrashReporter::UnsetExceptionHandler();
-#endif
-
-  XRE_DeinitCommandLine();
-}
-
-class WinRTInitWrapper
-{
-public:
-  WinRTInitWrapper() {
-    mResult = ::RoInitialize(RO_INIT_MULTITHREADED);
-  }
-  ~WinRTInitWrapper() {
-    if (SUCCEEDED(mResult)) {
-      ::RoUninitialize();
-    }
-  }
-  HRESULT mResult;
-};
-
-int
-XRE_mainMetro(int argc, char* argv[], const nsXREAppData* aAppData)
-{
-  char aLocal;
-  GeckoProfilerInitRAII profilerGuard(&aLocal);
-
-  PROFILER_LABEL("Startup", "XRE_Main",
-    js::ProfileEntry::Category::OTHER);
-
-  mozilla::IOInterposerInit ioInterposerGuard;
-
-  nsresult rv = NS_OK;
-
-  xreMainPtr = new XREMain();
-  if (!xreMainPtr) {
-    return 1;
-  }
-
-  // Inits Winrt and COM underneath it.
-  WinRTInitWrapper wrap;
-
-  gArgc = argc;
-  gArgv = argv;
-
-  NS_ENSURE_TRUE(aAppData, 2);
-
-  xreMainPtr->mAppData = new ScopedAppData(aAppData);
-  if (!xreMainPtr->mAppData)
-    return 1;
-  // used throughout this file
-  gAppData = xreMainPtr->mAppData;
-
-  // init
-  bool exit = false;
-  if (xreMainPtr->XRE_mainInit(&exit) != 0 || exit)
-    return 1;
-
-  // Located in widget, will call back into XRE_metroStartup and
-  // XRE_metroShutdown above.
-  if (!XRE_MetroCoreApplicationRun()) {
-    return 1;
-  }
-
-  // XRE_metroShutdown should have already been called on the worker
-  // thread that called XRE_metroStartup.
-  NS_ASSERTION(!xreMainPtr->mScopedXPCOM,
-               "XPCOM Shutdown hasn't occured, and we are exiting.");
-  return 0;
-}
-
-void SetWindowsEnvironment(WindowsEnvironmentType aEnvID);
-#endif // MOZ_METRO || !defined(XP_WIN)
-
 void
 XRE_StopLateWriteChecks(void) {
   mozilla::StopLateWriteChecks();
@@ -4427,34 +4236,10 @@
 int
 XRE_main(int argc, char* argv[], const nsXREAppData* aAppData, uint32_t aFlags)
 {
-#if !defined(MOZ_METRO) || !defined(XP_WIN)
   XREMain main;
   int result = main.XRE_main(argc, argv, aAppData);
   mozilla::RecordShutdownEndTimeStamp();
   return result;
-#else
-  if (aFlags == XRE_MAIN_FLAG_USE_METRO) {
-    SetWindowsEnvironment(WindowsEnvironmentType_Metro);
-  }
-
-  // Desktop
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Desktop) {
-    XREMain main;
-    int result = main.XRE_main(argc, argv, aAppData);
-    mozilla::RecordShutdownEndTimeStamp();
-    return result;
-  }
-
-  // Metro
-  NS_ASSERTION(XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro,
-               "Unknown Windows environment");
-
-  SetLastWinRunType(AHE_IMMERSIVE);
-
-  int result = XRE_mainMetro(argc, argv, aAppData);
-  mozilla::RecordShutdownEndTimeStamp();
-  return result;
-#endif // MOZ_METRO || !defined(XP_WIN)
 }
 
 nsresult
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsAppRunner.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsAppRunner.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsAppRunner.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsAppRunner.h	2015-04-24 19:31:15.000000000 +0000
@@ -32,11 +32,7 @@
 // and we load localstore from somewhere else.
 #define NS_LOCALSTORE_UNSAFE_FILE "LStoreS"
 
-class nsACString;
-struct nsStaticModuleInfo;
-
 class nsINativeAppSupport;
-class nsICmdLineService;
 class nsXREDirProvider;
 class nsIToolkitProfileService;
 class nsIFile;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsEmbedFunctions.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsEmbedFunctions.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsEmbedFunctions.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsEmbedFunctions.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -843,23 +843,6 @@
 }
 #endif
 
-#ifdef XP_WIN
-static WindowsEnvironmentType
-sWindowsEnvironmentType = WindowsEnvironmentType_Desktop;
-
-void
-SetWindowsEnvironment(WindowsEnvironmentType aEnvID)
-{
-  sWindowsEnvironmentType = aEnvID;
-}
-
-WindowsEnvironmentType
-XRE_GetWindowsEnvironment()
-{
-  return sWindowsEnvironmentType;
-}
-#endif // XP_WIN
-
 #ifdef MOZ_B2G_LOADER
 extern const nsXREAppData* gAppData;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsUpdateDriver.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsUpdateDriver.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsUpdateDriver.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsUpdateDriver.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -331,19 +331,6 @@
   return false;
 }
 
-#if defined(XP_WIN) && defined(MOZ_METRO)
-static bool
-IsWindowsMetroUpdateRequest(int appArgc, char **appArgv)
-{
-  for (int index = 0; index < appArgc; index++) {
-    if (!strcmp(appArgv[index], "--metro-update")) {
-      return true;
-    }
-  }
-  return false;
-}
-#endif
-
 static bool
 CopyFileIntoUpdateDir(nsIFile *parentDir, const char *leafName, nsIFile *updateDir)
 {
@@ -570,13 +557,6 @@
   pid.AppendLiteral("/replace");
 
   int immersiveArgc = 0;
-#if defined(XP_WIN) && defined(MOZ_METRO)
-  // If this is desktop doing an update for metro, or if we're the metro browser
-  // we want to launch the metro browser after we're finished.
-  if (IsWindowsMetroUpdateRequest(appArgc, appArgv) || IsRunningInWindowsMetro()) {
-    immersiveArgc = 1;
-  }
-#endif
   int argc = appArgc + 6 + immersiveArgc;
   char **argv = new char*[argc + 1];
   if (!argv)
@@ -842,13 +822,6 @@
   }
 
   int immersiveArgc = 0;
-#if defined(XP_WIN) && defined(MOZ_METRO)
-  // If this is desktop doing an update for metro, or if we're the metro browser
-  // we want to launch the metro browser after we're finished.
-  if (IsWindowsMetroUpdateRequest(appArgc, appArgv) || IsRunningInWindowsMetro()) {
-    immersiveArgc = 1;
-  }
-#endif
   int argc = appArgc + 6 + immersiveArgc;
   char **argv = new char*[argc + 1 ];
   if (!argv)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsWindowsWMain.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsWindowsWMain.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsWindowsWMain.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsWindowsWMain.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -16,7 +16,7 @@
 #include "nsSetDllDirectory.h"
 #endif
 
-#if defined(MOZ_METRO) || defined(__GNUC__)
+#if defined(__GNUC__)
 #define XRE_DONT_SUPPORT_XPSP2
 #endif
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsXREDirProvider.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsXREDirProvider.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/toolkit/xre/nsXREDirProvider.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/toolkit/xre/nsXREDirProvider.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -406,9 +406,6 @@
     else if (!strcmp(aProperty, NS_APP_PREFS_50_FILE)) {
       rv = file->AppendNative(NS_LITERAL_CSTRING("prefs.js"));
     }
-    else if (!strcmp(aProperty, NS_METRO_APP_PREFS_50_FILE)) {
-      rv = file->AppendNative(NS_LITERAL_CSTRING("metro-prefs.js"));
-    }
     else if (!strcmp(aProperty, NS_LOCALSTORE_UNSAFE_FILE)) {
       rv = file->AppendNative(NS_LITERAL_CSTRING("localstore.rdf"));
     }
@@ -1100,8 +1097,7 @@
   // Get the local app data directory and if a vendor name exists append it.
   // If only a product name exists, append it.  If neither exist fallback to
   // old handling.  We don't use the product name on purpose because we want a
-  // shared update directory for different apps run from the same path (like
-  // Metro & Desktop).
+  // shared update directory for different apps run from the same path.
   nsCOMPtr<nsIFile> localDir;
   if (pathHashResult && (hasVendor || gAppData->name) &&
       NS_SUCCEEDED(GetUserDataDirectoryHome(getter_AddRefs(localDir), true)) &&
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/GeckoProfilerFunc.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/GeckoProfilerFunc.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/GeckoProfilerFunc.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/GeckoProfilerFunc.h	2015-04-24 19:31:15.000000000 +0000
@@ -65,6 +65,9 @@
 
 const char** mozilla_sampler_get_features();
 
+void mozilla_sampler_get_buffer_info(uint32_t *aCurrentPosition, uint32_t *aTotalSize,
+                                     uint32_t *aGeneration);
+
 void mozilla_sampler_init(void* stackTop);
 
 void mozilla_sampler_shutdown();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/GeckoProfiler.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/GeckoProfiler.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/GeckoProfiler.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/GeckoProfiler.h	2015-04-24 19:31:15.000000000 +0000
@@ -170,6 +170,22 @@
 // Returns a null terminated char* array.
 static inline char** profiler_get_features() { return nullptr; }
 
+// Get information about the current buffer status.
+// Retursn (using outparams) the current write position in the buffer,
+// the total size of the buffer, and the generation of the buffer.
+// This information may be useful to a user-interface displaying the
+// current status of the profiler, allowing the user to get a sense
+// for how fast the buffer is being written to, and how much
+// data is visible.
+static inline void profiler_get_buffer_info(uint32_t *aCurrentPosition,
+                                            uint32_t *aTotalSize,
+                                            uint32_t *aGeneration)
+{
+  *aCurrentPosition = 0;
+  *aTotalSize = 0;
+  *aGeneration = 0;
+}
+
 // Discard the profile, throw away the profile and notify 'profiler-locked'.
 // This function is to be used when entering private browsing to prevent
 // the profiler from collecting sensitive data.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/GeckoProfilerImpl.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/GeckoProfilerImpl.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/GeckoProfilerImpl.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/GeckoProfilerImpl.h	2015-04-24 19:31:15.000000000 +0000
@@ -37,7 +37,6 @@
 #endif
 
 class TableTicker;
-class JSCustomObject;
 
 namespace mozilla {
 class TimeStamp;
@@ -169,6 +168,13 @@
 }
 
 static inline
+void profiler_get_buffer_info(uint32_t *aCurrentPosition, uint32_t *aTotalSize,
+                              uint32_t *aGeneration)
+{
+  return mozilla_sampler_get_buffer_info(aCurrentPosition, aTotalSize, aGeneration);
+}
+
+static inline
 void profiler_lock()
 {
   return mozilla_sampler_lock();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/nsIProfiler.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/nsIProfiler.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/nsIProfiler.idl	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/nsIProfiler.idl	2015-04-24 19:31:15.000000000 +0000
@@ -12,7 +12,7 @@
 
 [ref] native StringArrayRef(const nsTArray<nsCString>);
 
-[scriptable, uuid(42d1e0e3-303a-424f-89ea-4f15c699d767)]
+[scriptable, uuid(edd65f3f-c2a2-4217-a2e2-40347ba4a2b3)]
 interface nsIProfiler : nsISupports
 {
   void StartProfiler(in uint32_t aEntries, in double aInterval,
@@ -31,6 +31,9 @@
   boolean IsActive();
   void GetFeatures(out uint32_t aCount, [retval, array, size_is(aCount)] out string aFeatures);
 
+  void GetBufferInfo(out uint32_t aCurrentPosition, out uint32_t aTotalSize,
+                     out uint32_t aGeneration);
+
   /**
    * Returns a JSON string of an array of shared library objects.
    * Every object has three properties: start, end, and name.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/nsProfiler.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/nsProfiler.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/nsProfiler.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/nsProfiler.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -248,3 +248,13 @@
   *aCount = len;
   return NS_OK;
 }
+
+NS_IMETHODIMP
+nsProfiler::GetBufferInfo(uint32_t *aCurrentPosition, uint32_t *aTotalSize, uint32_t *aGeneration)
+{
+  MOZ_ASSERT(aCurrentPosition);
+  MOZ_ASSERT(aTotalSize);
+  MOZ_ASSERT(aGeneration);
+  profiler_get_buffer_info(aCurrentPosition, aTotalSize, aGeneration);
+  return NS_OK;
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/platform.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/platform.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/platform.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/platform.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -81,10 +81,7 @@
                                                             sInterposeObserver;
 
 // The name that identifies the gecko thread for calls to
-// profiler_register_thread. For all platform except metro
-// the thread that calls mozilla_sampler_init is considered
-// the gecko thread.  With metro the gecko thread is
-// registered later based on this thread name.
+// profiler_register_thread.
 static const char * gGeckoThreadName = "GeckoMain";
 
 void Sampler::Startup() {
@@ -467,10 +464,6 @@
   tlsPseudoStack.set(stack);
 
   bool isMainThread = true;
-#ifdef XP_WIN
-  // For metrofx, we'll register the main thread once it's created.
-  isMainThread = !(XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro);
-#endif
   Sampler::RegisterCurrentThread(isMainThread ?
                                    gGeckoThreadName : "Application Thread",
                                  stack, isMainThread, stackTop);
@@ -650,6 +643,23 @@
   return features;
 }
 
+void mozilla_sampler_get_buffer_info(uint32_t *aCurrentPosition, uint32_t *aTotalSize,
+                                     uint32_t *aGeneration)
+{
+  *aCurrentPosition = 0;
+  *aTotalSize = 0;
+  *aGeneration = 0;
+
+  if (!stack_key_initialized)
+    return;
+
+  TableTicker *t = tlsTicker.get();
+  if (!t)
+    return;
+
+  t->GetBufferInfo(aCurrentPosition, aTotalSize, aGeneration);
+}
+
 // Values are only honored on the first start
 void mozilla_sampler_start(int aProfileEntries, double aInterval,
                            const char** aFeatures, uint32_t aFeatureCount,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/PseudoStack.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/PseudoStack.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/PseudoStack.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/PseudoStack.h	2015-04-24 19:31:15.000000000 +0000
@@ -75,8 +75,6 @@
 template<typename T>
 class ProfilerLinkedList;
 class JSStreamWriter;
-class JSCustomArray;
-class ThreadProfile;
 class ProfilerMarker {
   friend class ProfilerLinkedList<ProfilerMarker>;
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/TableTicker.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/TableTicker.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/TableTicker.cpp	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/TableTicker.cpp	2015-04-24 19:31:15.000000000 +0000
@@ -1079,3 +1079,11 @@
 
   return profile;
 }
+
+void
+TableTicker::GetBufferInfo(uint32_t *aCurrentPosition, uint32_t *aTotalSize, uint32_t *aGeneration)
+{
+  *aCurrentPosition = mBuffer->mWritePos;
+  *aTotalSize = mBuffer->mEntrySize;
+  *aGeneration = mBuffer->mGeneration;
+}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/TableTicker.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/TableTicker.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/tools/profiler/TableTicker.h	2015-04-22 13:06:18.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/tools/profiler/TableTicker.h	2015-04-24 19:31:15.000000000 +0000
@@ -45,8 +45,6 @@
 extern int sFrameNumber;
 extern int sLastFrameNumber;
 
-class BreakpadSampler;
-
 class TableTicker: public Sampler {
  public:
   TableTicker(double aInterval, int aEntrySize,
@@ -212,6 +210,8 @@
   bool DisplayListDump() const { return mDisplayListDump; }
   bool ProfileRestyle() const { return mProfileRestyle; }
 
+  void GetBufferInfo(uint32_t *aCurrentPosition, uint32_t *aTotalSize, uint32_t *aGeneration);
+
 protected:
   // Called within a signal. This function must be reentrant
   virtual void InplaceTick(TickSample* sample);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -400,16 +400,6 @@
   else {
     return NS_ERROR_FAILURE;
   }
-#elif defined(XP_WIN)
-  // On metro we want to be able to search opened files and the temp directory
-  // is exlcuded in searches.
-  nsresult rv;
-  if (IsRunningInWindowsMetro()) {
-    rv = NS_GetSpecialDirectory(NS_WIN_DEFAULT_DOWNLOAD_DIR, getter_AddRefs(dir));
-  } else {
-    rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(dir));
-  }
-  NS_ENSURE_SUCCESS(rv, rv);
 #else
   // On all other platforms, we default to the systems temporary directory.
   nsresult rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(dir));
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/uriloader/prefetch/nsOfflineCacheUpdate.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/uriloader/prefetch/nsOfflineCacheUpdate.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/uriloader/prefetch/nsOfflineCacheUpdate.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/uriloader/prefetch/nsOfflineCacheUpdate.h	2015-04-24 19:31:16.000000000 +0000
@@ -36,9 +36,6 @@
 
 class nsOfflineCacheUpdate;
 
-class nsIUTF8StringEnumerator;
-class nsILoadContext;
-
 class nsOfflineCacheUpdateItem : public nsIStreamListener
                                , public nsIRunnable
                                , public nsIInterfaceRequestor
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/uriloader/prefetch/nsPrefetchService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/uriloader/prefetch/nsPrefetchService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/uriloader/prefetch/nsPrefetchService.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/uriloader/prefetch/nsPrefetchService.h	2015-04-24 19:31:16.000000000 +0000
@@ -20,7 +20,6 @@
 #include "mozilla/Attributes.h"
 
 class nsPrefetchService;
-class nsPrefetchListener;
 class nsPrefetchNode;
 
 //-----------------------------------------------------------------------------
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/uriloader/prefetch/OfflineCacheUpdateParent.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/uriloader/prefetch/OfflineCacheUpdateParent.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/uriloader/prefetch/OfflineCacheUpdateParent.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/uriloader/prefetch/OfflineCacheUpdateParent.h	2015-04-24 19:31:16.000000000 +0000
@@ -14,10 +14,6 @@
 
 namespace mozilla {
 
-namespace dom {
-class TabParent;
-}
-
 namespace ipc {
 class URIParams;
 } // namespace ipc
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties	2015-04-24 19:31:16.000000000 +0000
@@ -29,6 +29,7 @@
 externalProtocolChkMsg=Remember my choice for all links of this type.
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
+unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
 cspBlocked=This application tried to access a resource that has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The application cannot continue loading because an error in the data transmission was detected.
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/android/AndroidBridge.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/android/AndroidBridge.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/android/AndroidBridge.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/android/AndroidBridge.h	2015-04-24 19:31:16.000000000 +0000
@@ -36,8 +36,6 @@
 // #define DEBUG_ANDROID_EVENTS
 // #define DEBUG_ANDROID_WIDGET
 
-class nsWindow;
-class nsIDOMMozSmsMessage;
 class nsIObserver;
 class Task;
 
@@ -62,10 +60,6 @@
 } // namespace mobilemessage
 } // namespace dom
 
-namespace layers {
-class CompositorParent;
-} // namespace layers
-
 // The order and number of the members in this structure must correspond
 // to the attrsAppearance array in GeckoAppShell.getSystemColors()
 typedef struct AndroidSystemColors {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/android/AndroidJavaWrappers.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/android/AndroidJavaWrappers.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/android/AndroidJavaWrappers.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/android/AndroidJavaWrappers.h	2015-04-24 19:31:16.000000000 +0000
@@ -27,7 +27,6 @@
 //#define FORCE_ALOG 1
 
 class nsIAndroidDisplayport;
-class nsIAndroidViewport;
 class nsIWidget;
 
 namespace mozilla {
@@ -505,6 +504,16 @@
         return event;
     }
 
+    bool IsInputEvent() const {
+        return mType == AndroidGeckoEvent::MOTION_EVENT ||
+            mType == AndroidGeckoEvent::NATIVE_GESTURE_EVENT ||
+            mType == AndroidGeckoEvent::LONG_PRESS ||
+            mType == AndroidGeckoEvent::KEY_EVENT ||
+            mType == AndroidGeckoEvent::IME_EVENT ||
+            mType == AndroidGeckoEvent::IME_KEY_EVENT ||
+            mType == AndroidGeckoEvent::APZ_INPUT_EVENT;
+    }
+
     int Action() { return mAction; }
     int Type() { return mType; }
     bool AckNeeded() { return mAckNeeded; }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/android/GfxInfo.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/android/GfxInfo.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/android/GfxInfo.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/android/GfxInfo.h	2015-04-24 19:31:16.000000000 +0000
@@ -16,10 +16,6 @@
 
 namespace mozilla {
 
-namespace gl {
-class GLContext;
-}
-
 namespace widget {
 
 class GfxInfo : public GfxInfoBase
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/android/nsAppShell.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/android/nsAppShell.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/android/nsAppShell.cpp	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/android/nsAppShell.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -26,7 +26,7 @@
 #include "nsINetworkLinkService.h"
 #include "nsCategoryManagerUtils.h"
 
-#include "mozilla/BackgroundHangMonitor.h"
+#include "mozilla/HangMonitor.h"
 #include "mozilla/Services.h"
 #include "mozilla/unused.h"
 #include "mozilla/Preferences.h"
@@ -41,7 +41,8 @@
 
 #include "mozilla/dom/ScreenOrientation.h"
 #ifdef MOZ_GAMEPAD
-#include "mozilla/dom/GamepadService.h"
+#include "mozilla/dom/GamepadFunctions.h"
+#include "mozilla/dom/Gamepad.h"
 #endif
 
 #include "GeckoProfiler.h"
@@ -244,6 +245,7 @@
         if (!curEvent && mayWait) {
             PROFILER_LABEL("nsAppShell", "ProcessNextNativeEvent::Wait",
                 js::ProfileEntry::Category::EVENTS);
+            mozilla::HangMonitor::Suspend();
 
             // hmm, should we really hardcode this 10s?
 #if defined(DEBUG_ANDROID_EVENTS)
@@ -264,7 +266,9 @@
     if (!curEvent)
         return false;
 
-    mozilla::BackgroundHangMonitor().NotifyActivity();
+    mozilla::HangMonitor::NotifyActivity(curEvent->IsInputEvent() ?
+            mozilla::HangMonitor::kUIActivity :
+            mozilla::HangMonitor::kGeneralActivity);
 
     EVLOG("nsAppShell: event %p %d", (void*)curEvent.get(), curEvent->Type());
 
@@ -653,19 +657,15 @@
 
     case AndroidGeckoEvent::GAMEPAD_ADDREMOVE: {
 #ifdef MOZ_GAMEPAD
-        nsRefPtr<mozilla::dom::GamepadService> svc =
-            mozilla::dom::GamepadService::GetService();
-        if (svc) {
             if (curEvent->Action() == AndroidGeckoEvent::ACTION_GAMEPAD_ADDED) {
-                int svc_id = svc->AddGamepad("android",
-                                             mozilla::dom::GamepadMappingType::Standard,
-                                             mozilla::dom::kStandardGamepadButtons,
-                                             mozilla::dom::kStandardGamepadAxes);
+            int svc_id = dom::GamepadFunctions::AddGamepad("android",
+                                                           dom::GamepadMappingType::Standard,
+                                                           dom::kStandardGamepadButtons,
+                                                           dom::kStandardGamepadAxes);
                 widget::GeckoAppShell::GamepadAdded(curEvent->ID(),
                                                     svc_id);
             } else if (curEvent->Action() == AndroidGeckoEvent::ACTION_GAMEPAD_REMOVED) {
-                svc->RemoveGamepad(curEvent->ID());
-            }
+            dom::GamepadFunctions::RemoveGamepad(curEvent->ID());
         }
 #endif
         break;
@@ -673,12 +673,9 @@
 
     case AndroidGeckoEvent::GAMEPAD_DATA: {
 #ifdef MOZ_GAMEPAD
-        nsRefPtr<mozilla::dom::GamepadService> svc =
-            mozilla::dom::GamepadService::GetService();
-        if (svc) {
             int id = curEvent->ID();
             if (curEvent->Action() == AndroidGeckoEvent::ACTION_GAMEPAD_BUTTON) {
-                 svc->NewButtonEvent(id, curEvent->GamepadButton(),
+            dom::GamepadFunctions::NewButtonEvent(id, curEvent->GamepadButton(),
                                      curEvent->GamepadButtonPressed(),
                                      curEvent->GamepadButtonValue());
             } else if (curEvent->Action() == AndroidGeckoEvent::ACTION_GAMEPAD_AXES) {
@@ -686,8 +683,7 @@
                 const nsTArray<float>& values = curEvent->GamepadValues();
                 for (unsigned i = 0; i < values.Length(); i++) {
                     if (valid & (1<<i)) {
-                        svc->NewAxisMoveEvent(id, i, values[i]);
-                    }
+                    dom::GamepadFunctions::NewAxisMoveEvent(id, i, values[i]);
                 }
             }
         }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsAppShell.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsAppShell.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsAppShell.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsAppShell.h	2015-04-24 19:31:16.000000000 +0000
@@ -11,8 +11,6 @@
 #ifndef nsAppShell_h_
 #define nsAppShell_h_
 
-class nsCocoaWindow;
-
 #include "nsBaseAppShell.h"
 #include "nsTArray.h"
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsChildView.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsChildView.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsChildView.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsChildView.h	2015-04-24 19:31:16.000000000 +0000
@@ -33,7 +33,6 @@
 #import <Cocoa/Cocoa.h>
 #import <AppKit/NSOpenGL.h>
 
-class gfxASurface;
 class nsChildView;
 class nsCocoaWindow;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsChildView.mm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsChildView.mm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsChildView.mm	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsChildView.mm	2015-04-24 19:31:16.000000000 +0000
@@ -4470,7 +4470,7 @@
   else
     geckoEvent.button = WidgetMouseEvent::eLeftButton;
 
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
   mBlockedLastMouseDown = NO;
 
   // XXX maybe call markedTextSelectionChanged:client: here?
@@ -4496,7 +4496,8 @@
     geckoEvent.button = WidgetMouseEvent::eLeftButton;
 
   // This might destroy our widget (and null out mGeckoChild).
-  bool defaultPrevented = mGeckoChild->DispatchWindowEvent(geckoEvent);
+  bool defaultPrevented =
+    (mGeckoChild->DispatchInputEvent(&geckoEvent) == nsEventStatus_eConsumeNoDefault);
 
   // Check to see if we are double-clicking in the titlebar.
   CGFloat locationInTitlebar = [[self window] frame].size.height - [theEvent locationInWindow].y;
@@ -4622,7 +4623,7 @@
                               WidgetMouseEvent::eReal);
   [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
 
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -4640,7 +4641,7 @@
                               WidgetMouseEvent::eReal);
   [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
 
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
 
   // Note, sending the above event might have destroyed our widget since we didn't retain.
   // Fine so long as we don't access any local variables from here on.
@@ -4668,7 +4669,7 @@
   geckoEvent.button = WidgetMouseEvent::eRightButton;
   geckoEvent.clickCount = [theEvent clickCount];
 
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
   if (!mGeckoChild)
     return;
 
@@ -4692,7 +4693,7 @@
   geckoEvent.clickCount = [theEvent clickCount];
 
   nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -4709,7 +4710,7 @@
 
   // send event into Gecko by going directly to the
   // the widget.
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
 }
 
 - (void)otherMouseDown:(NSEvent *)theEvent
@@ -4731,7 +4732,7 @@
   geckoEvent.button = WidgetMouseEvent::eMiddleButton;
   geckoEvent.clickCount = [theEvent clickCount];
 
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -4747,7 +4748,7 @@
   geckoEvent.button = WidgetMouseEvent::eMiddleButton;
 
   nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
 }
 
 - (void)otherMouseDragged:(NSEvent*)theEvent
@@ -4762,7 +4763,7 @@
 
   // send event into Gecko by going directly to the
   // the widget.
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
 }
 
 static int32_t RoundUp(double aDouble)
@@ -4776,7 +4777,7 @@
   WidgetWheelEvent wheelEvent(true, msg, mGeckoChild);
   [self convertCocoaMouseWheelEvent:theEvent toGeckoEvent:&wheelEvent];
   mExpectingWheelStop = (msg == NS_WHEEL_START);
-  mGeckoChild->DispatchWindowEvent(wheelEvent);
+  mGeckoChild->DispatchAPZAwareEvent(wheelEvent.AsInputEvent());
 }
 
 - (void)sendWheelCondition:(BOOL)condition first:(uint32_t)first second:(uint32_t)second forEvent:(NSEvent *)theEvent
@@ -4991,7 +4992,7 @@
                               WidgetMouseEvent::eReal);
   [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
   geckoEvent.button = WidgetMouseEvent::eRightButton;
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
   if (!mGeckoChild)
     return nil;
 
@@ -5456,7 +5457,7 @@
   WidgetMouseEvent geckoEvent(true, NS_MOUSE_ACTIVATE, mGeckoChild,
                               WidgetMouseEvent::eReal);
   [self convertCocoaMouseEvent:aEvent toGeckoEvent:&geckoEvent];
-  return !mGeckoChild->DispatchWindowEvent(geckoEvent);
+  return (mGeckoChild->DispatchInputEvent(&geckoEvent) != nsEventStatus_eConsumeNoDefault);
 }
 
 // We must always call through to our superclass, even when mGeckoChild is
@@ -5634,7 +5635,7 @@
     [self convertWindowCoordinates:draggingLoc]);
 
   nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
+  mGeckoChild->DispatchInputEvent(&geckoEvent);
   if (!mGeckoChild)
     return NSDragOperationNone;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsLookAndFeel.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsLookAndFeel.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsLookAndFeel.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsLookAndFeel.h	2015-04-24 19:31:16.000000000 +0000
@@ -26,6 +26,10 @@
 
   static bool UseOverlayScrollbars();
 
+  virtual nsTArray<LookAndFeelInt> GetIntCacheImpl();
+  virtual void SetIntCacheImpl(const nsTArray<LookAndFeelInt>& lookAndFeelIntCache);
+
+  virtual void RefreshImpl();
 protected:
 
   // Apple hasn't defined a constant for scollbars with two arrows on each end, so we'll use this one.
@@ -34,6 +38,13 @@
 
   static bool SystemWantsOverlayScrollbars();
   static bool AllowOverlayScrollbarsOverlap();
+
+private:
+  int32_t mUseOverlayScrollbars;
+  bool mUseOverlayScrollbarsCached;
+
+  int32_t mAllowOverlayScrollbarsOverlap;
+  bool mAllowOverlayScrollbarsOverlapCached;
 };
 
 #endif // nsLookAndFeel_h_
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsLookAndFeel.mm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsLookAndFeel.mm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsLookAndFeel.mm	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsLookAndFeel.mm	2015-04-24 19:31:16.000000000 +0000
@@ -12,6 +12,7 @@
 #include "gfxFont.h"
 #include "gfxFontConstants.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/widget/WidgetMessageUtils.h"
 
 #import <Cocoa/Cocoa.h>
 
@@ -28,7 +29,12 @@
 + (mozNSScrollerStyle)preferredScrollerStyle;
 @end
 
-nsLookAndFeel::nsLookAndFeel() : nsXPLookAndFeel()
+nsLookAndFeel::nsLookAndFeel()
+ : nsXPLookAndFeel()
+ , mUseOverlayScrollbars(-1)
+ , mUseOverlayScrollbarsCached(false)
+ , mAllowOverlayScrollbarsOverlap(-1)
+ , mAllowOverlayScrollbarsOverlapCached(false)
 {
 }
 
@@ -359,10 +365,18 @@
       aResult = eScrollThumbStyle_Proportional;
       break;
     case eIntID_UseOverlayScrollbars:
-      aResult = SystemWantsOverlayScrollbars() ? 1 : 0;
+      if (!mUseOverlayScrollbarsCached) {
+        mUseOverlayScrollbars = SystemWantsOverlayScrollbars() ? 1 : 0;
+        mUseOverlayScrollbarsCached = true;
+      }
+      aResult = mUseOverlayScrollbars;
       break;
     case eIntID_AllowOverlayScrollbarsOverlap:
-      aResult = AllowOverlayScrollbarsOverlap() ? 1 : 0;
+      if (!mAllowOverlayScrollbarsOverlapCached) {
+        mAllowOverlayScrollbarsOverlap = AllowOverlayScrollbarsOverlap() ? 1 : 0;
+        mAllowOverlayScrollbarsOverlapCached = true;
+      }
+      aResult = mAllowOverlayScrollbarsOverlap;
       break;
     case eIntID_ScrollbarDisplayOnMouseMove:
       aResult = 0;
@@ -633,3 +647,51 @@
 
     NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
 }
+
+nsTArray<LookAndFeelInt>
+nsLookAndFeel::GetIntCacheImpl()
+{
+  nsTArray<LookAndFeelInt> lookAndFeelIntCache =
+    nsXPLookAndFeel::GetIntCacheImpl();
+
+  LookAndFeelInt useOverlayScrollbars;
+  useOverlayScrollbars.id = eIntID_UseOverlayScrollbars;
+  useOverlayScrollbars.value = GetInt(eIntID_UseOverlayScrollbars);
+  lookAndFeelIntCache.AppendElement(useOverlayScrollbars);
+
+  LookAndFeelInt allowOverlayScrollbarsOverlap;
+  allowOverlayScrollbarsOverlap.id = eIntID_AllowOverlayScrollbarsOverlap;
+  allowOverlayScrollbarsOverlap.value = GetInt(eIntID_AllowOverlayScrollbarsOverlap);
+  lookAndFeelIntCache.AppendElement(allowOverlayScrollbarsOverlap);
+
+  return lookAndFeelIntCache;
+}
+
+void
+nsLookAndFeel::SetIntCacheImpl(const nsTArray<LookAndFeelInt>& lookAndFeelIntCache)
+{
+  for (auto entry : lookAndFeelIntCache) {
+    switch(entry.id) {
+      case eIntID_UseOverlayScrollbars:
+        mUseOverlayScrollbars = entry.value;
+        mUseOverlayScrollbarsCached = true;
+        break;
+      case eIntID_AllowOverlayScrollbarsOverlap:
+        mAllowOverlayScrollbarsOverlap = entry.value;
+        mAllowOverlayScrollbarsOverlapCached = true;
+        break;
+    }
+  }
+}
+
+void
+nsLookAndFeel::RefreshImpl()
+{
+  // We should only clear the cache if we're in the main browser process.
+  // Otherwise, we should wait for the parent to inform us of new values
+  // to cache via LookAndFeel::SetIntCache.
+  if (XRE_GetProcessType() == GeckoProcessType_Default) {
+    mUseOverlayScrollbarsCached = false;
+    mAllowOverlayScrollbarsOverlapCached = false;
+  }
+}
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsMenuBarX.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsMenuBarX.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsMenuBarX.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsMenuBarX.h	2015-04-24 19:31:16.000000000 +0000
@@ -17,7 +17,6 @@
 
 class nsMenuX;
 class nsMenuBarX;
-class nsMenuItemX;
 class nsIWidget;
 class nsIContent;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsMenuBarX.mm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsMenuBarX.mm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsMenuBarX.mm	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsMenuBarX.mm	2015-04-24 19:31:16.000000000 +0000
@@ -186,6 +186,13 @@
   [quitMenuItem setTarget:nsMenuBarX::sNativeEventTarget];
   [quitMenuItem setTag:eCommand_ID_Quit];
   [sApplicationMenu addItem:quitMenuItem];
+
+  // Add debug logging to help decipher bug 1151345.
+#if !defined(RELEASE_BUILD) || defined(DEBUG)
+  NSLog(@"nsMenuBarX::ConstructFallbackNativeMenus(): labelUTF16 %s, keyUTF16 %s",
+        NS_ConvertUTF16toUTF8(labelUTF16).get(),
+        NS_ConvertUTF16toUTF8(keyUTF16).get());
+#endif
 }
 
 uint32_t nsMenuBarX::GetMenuCount()
@@ -552,13 +559,28 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
+  // Add debug logging to help decipher bug 1151345.
+#if !defined(RELEASE_BUILD) || defined(DEBUG)
+  NS_ConvertUTF16toUTF8 nodeID_UTF8(nodeID);
+#endif
+
   nsCOMPtr<nsIDocument> doc = inMenu->Content()->GetUncomposedDoc();
-  if (!doc)
+  if (!doc) {
+#if !defined(RELEASE_BUILD) || defined(DEBUG)
+    NSLog(@"nsMenuBarX::CreateNativeAppMenuItem(1): nodeID %s, doc is null!",
+          nodeID_UTF8.get());
+#endif
     return nil;
+  }
 
   nsCOMPtr<nsIDOMDocument> domdoc(do_QueryInterface(doc));
-  if (!domdoc)
+  if (!domdoc) {
+#if !defined(RELEASE_BUILD) || defined(DEBUG)
+    NSLog(@"nsMenuBarX::CreateNativeAppMenuItem(2): nodeID %s, domdoc is null!",
+          nodeID_UTF8.get());
+#endif
     return nil;
+  }
 
   // Get information from the gecko menu item
   nsAutoString label;
@@ -572,6 +594,10 @@
     menuItem->GetAttribute(NS_LITERAL_STRING("key"), key);
   }
   else {
+#if !defined(RELEASE_BUILD) || defined(DEBUG)
+    NSLog(@"nsMenuBarX::CreateNativeAppMenuItem(3): nodeID %s, menuItem is null!",
+          nodeID_UTF8.get());
+#endif
     return nil;
   }
 
@@ -617,7 +643,16 @@
   MenuItemInfo * info = [[MenuItemInfo alloc] initWithMenuGroupOwner:this];
   [newMenuItem setRepresentedObject:info];
   [info release];
-  
+
+#if !defined(RELEASE_BUILD) || defined(DEBUG)
+  if (!newMenuItem) {
+    NSLog(@"nsMenuBarX::CreateNativeAppMenuItem(4): nodeID %s, label %s, modifiers %s, key %s, newMenuItem is null!",
+          nodeID_UTF8.get(),
+          NS_ConvertUTF16toUTF8(label).get(),
+          NS_ConvertUTF16toUTF8(modifiers).get(),
+          NS_ConvertUTF16toUTF8(key).get());
+  }
+#endif
   return newMenuItem;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsMenuGroupOwnerX.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsMenuGroupOwnerX.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsMenuGroupOwnerX.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsMenuGroupOwnerX.h	2015-04-24 19:31:16.000000000 +0000
@@ -16,12 +16,10 @@
 #include "nsString.h"
 
 
-class nsMenuX;
 class nsMenuItemX;
 class nsChangeObserver;
 class nsIWidget;
 class nsIContent;
-class nsIDocument;
 
 class nsMenuGroupOwnerX : public nsMenuObjectX, public nsIMutationObserver
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsNativeThemeCocoa.mm thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsNativeThemeCocoa.mm
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/cocoa/nsNativeThemeCocoa.mm	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/cocoa/nsNativeThemeCocoa.mm	2015-04-24 19:31:16.000000000 +0000
@@ -2672,7 +2672,7 @@
         }
       }
       DrawProgress(cgContext, macRect, IsIndeterminateProgress(aFrame, eventState),
-                   aFrame->StyleDisplay()->mOrient != NS_STYLE_ORIENT_VERTICAL,
+                   !IsVerticalProgress(aFrame),
                    value, maxValue, aFrame);
       break;
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/HwcComposer2D.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/HwcComposer2D.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/HwcComposer2D.cpp	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/HwcComposer2D.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -35,7 +35,7 @@
 #include "VsyncSource.h"
 
 #if ANDROID_VERSION >= 17
-#include "libdisplay/FramebufferSurface.h"
+#include "libdisplay/DisplaySurface.h"
 #include "gfxPrefs.h"
 #include "nsThreadUtils.h"
 #endif
@@ -674,10 +674,10 @@
 bool
 HwcComposer2D::TryHwComposition()
 {
-    FramebufferSurface* fbsurface = (FramebufferSurface*)(GetGonkDisplay()->GetFBSurface());
+    DisplaySurface* dispSurface = (DisplaySurface*)(GetGonkDisplay()->GetDispSurface());
 
-    if (!(fbsurface && fbsurface->lastHandle)) {
-        LOGD("H/W Composition failed. FBSurface not initialized.");
+    if (!(dispSurface && dispSurface->lastHandle)) {
+        LOGD("H/W Composition failed. DispSurface not initialized.");
         return false;
     }
 
@@ -690,7 +690,7 @@
         }
     }
 
-    Prepare(fbsurface->lastHandle, -1);
+    Prepare(dispSurface->lastHandle, -1);
 
     /* Possible composition paths, after hwc prepare:
     1. GPU Composition
@@ -744,22 +744,22 @@
             // GPU or partial OVERLAY Composition
             return false;
         } else if (blitComposite) {
-            // BLIT Composition, flip FB target
-            GetGonkDisplay()->UpdateFBSurface(mDpy, mSur);
-            FramebufferSurface* fbsurface = (FramebufferSurface*)(GetGonkDisplay()->GetFBSurface());
-            if (!fbsurface) {
-                LOGE("H/W Composition failed. NULL FBSurface.");
+            // BLIT Composition, flip DispSurface target
+            GetGonkDisplay()->UpdateDispSurface(mDpy, mSur);
+            DisplaySurface* dispSurface = (DisplaySurface*)(GetGonkDisplay()->GetDispSurface());
+            if (!dispSurface) {
+                LOGE("H/W Composition failed. NULL DispSurface.");
                 return false;
             }
-            mList->hwLayers[idx].handle = fbsurface->lastHandle;
-            mList->hwLayers[idx].acquireFenceFd = fbsurface->GetPrevFBAcquireFd();
+            mList->hwLayers[idx].handle = dispSurface->lastHandle;
+            mList->hwLayers[idx].acquireFenceFd = dispSurface->GetPrevDispAcquireFd();
         }
     }
 
     // BLIT or full OVERLAY Composition
     Commit();
 
-    GetGonkDisplay()->SetFBReleaseFd(mList->hwLayers[idx].releaseFenceFd);
+    GetGonkDisplay()->SetDispReleaseFd(mList->hwLayers[idx].releaseFenceFd);
     mList->hwLayers[idx].releaseFenceFd = -1;
     return true;
 }
@@ -772,16 +772,16 @@
         return GetGonkDisplay()->SwapBuffers(mDpy, mSur);
     }
 
-    FramebufferSurface* fbsurface = (FramebufferSurface*)(GetGonkDisplay()->GetFBSurface());
-    if (!fbsurface) {
-        LOGE("H/W Composition failed. FBSurface not initialized.");
+    DisplaySurface* dispSurface = (DisplaySurface*)(GetGonkDisplay()->GetDispSurface());
+    if (!dispSurface) {
+        LOGE("H/W Composition failed. DispSurface not initialized.");
         return false;
     }
 
     if (mPrepared) {
         // No mHwc prepare, if already prepared in current draw cycle
-        mList->hwLayers[mList->numHwLayers - 1].handle = fbsurface->lastHandle;
-        mList->hwLayers[mList->numHwLayers - 1].acquireFenceFd = fbsurface->GetPrevFBAcquireFd();
+        mList->hwLayers[mList->numHwLayers - 1].handle = dispSurface->lastHandle;
+        mList->hwLayers[mList->numHwLayers - 1].acquireFenceFd = dispSurface->GetPrevDispAcquireFd();
     } else {
         mList->flags = HWC_GEOMETRY_CHANGED;
         mList->numHwLayers = 2;
@@ -792,19 +792,19 @@
         mList->hwLayers[0].acquireFenceFd = -1;
         mList->hwLayers[0].releaseFenceFd = -1;
         mList->hwLayers[0].displayFrame = {0, 0, mScreenRect.width, mScreenRect.height};
-        Prepare(fbsurface->lastHandle, fbsurface->GetPrevFBAcquireFd());
+        Prepare(dispSurface->lastHandle, dispSurface->GetPrevDispAcquireFd());
     }
 
     // GPU or partial HWC Composition
     Commit();
 
-    GetGonkDisplay()->SetFBReleaseFd(mList->hwLayers[mList->numHwLayers - 1].releaseFenceFd);
+    GetGonkDisplay()->SetDispReleaseFd(mList->hwLayers[mList->numHwLayers - 1].releaseFenceFd);
     mList->hwLayers[mList->numHwLayers - 1].releaseFenceFd = -1;
     return true;
 }
 
 void
-HwcComposer2D::Prepare(buffer_handle_t fbHandle, int fence)
+HwcComposer2D::Prepare(buffer_handle_t dispHandle, int fence)
 {
     int idx = mList->numHwLayers - 1;
     const hwc_rect_t r = {0, 0, mScreenRect.width, mScreenRect.height};
@@ -818,7 +818,7 @@
     mList->hwLayers[idx].hints = 0;
     mList->hwLayers[idx].flags = 0;
     mList->hwLayers[idx].transform = 0;
-    mList->hwLayers[idx].handle = fbHandle;
+    mList->hwLayers[idx].handle = dispHandle;
     mList->hwLayers[idx].blending = HWC_BLENDING_PREMULT;
     mList->hwLayers[idx].compositionType = HWC_FRAMEBUFFER_TARGET;
     setCrop(&mList->hwLayers[idx], r);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/HwcComposer2D.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/HwcComposer2D.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/HwcComposer2D.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/HwcComposer2D.h	2015-04-24 19:31:16.000000000 +0000
@@ -38,7 +38,6 @@
 
 namespace layers {
 class CompositorParent;
-class ContainerLayer;
 class Layer;
 }
 
@@ -103,7 +102,7 @@
 
 private:
     void Reset();
-    void Prepare(buffer_handle_t fbHandle, int fence);
+    void Prepare(buffer_handle_t dispHandle, int fence);
     bool Commit();
     bool TryHwComposition();
     bool ReallocLayerList();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/DisplaySurface.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/DisplaySurface.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/DisplaySurface.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/DisplaySurface.h	2015-04-24 19:31:16.000000000 +0000
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_SF_DISPLAY_SURFACE_H
+#define ANDROID_SF_DISPLAY_SURFACE_H
+
+#include <gui/ConsumerBase.h>
+#include <system/window.h>
+#include <utils/Errors.h>
+#include <utils/RefBase.h>
+#include <utils/StrongPointer.h>
+
+// ---------------------------------------------------------------------------
+namespace android {
+// ---------------------------------------------------------------------------
+
+class IGraphicBufferProducer;
+class String8;
+
+#if ANDROID_VERSION >= 21
+typedef IGraphicBufferConsumer StreamConsumer;
+#else
+typedef BufferQueue StreamConsumer;
+#endif
+
+class DisplaySurface : public ConsumerBase {
+public:
+    // beginFrame is called at the beginning of the composition loop, before
+    // the configuration is known. The DisplaySurface should do anything it
+    // needs to do to enable HWComposer to decide how to compose the frame.
+    // We pass in mustRecompose so we can keep VirtualDisplaySurface's state
+    // machine happy without actually queueing a buffer if nothing has changed.
+    virtual status_t beginFrame(bool mustRecompose) = 0;
+
+    // prepareFrame is called after the composition configuration is known but
+    // before composition takes place. The DisplaySurface can use the
+    // composition type to decide how to manage the flow of buffers between
+    // GLES and HWC for this frame.
+    enum CompositionType {
+        COMPOSITION_UNKNOWN = 0,
+        COMPOSITION_GLES    = 1,
+        COMPOSITION_HWC     = 2,
+        COMPOSITION_MIXED   = COMPOSITION_GLES | COMPOSITION_HWC
+    };
+    virtual status_t prepareFrame(CompositionType compositionType) = 0;
+
+    // Should be called when composition rendering is complete for a frame (but
+    // eglSwapBuffers hasn't necessarily been called). Required by certain
+    // older drivers for synchronization.
+    // TODO: Remove this when we drop support for HWC 1.0.
+    virtual status_t compositionComplete() = 0;
+
+    // Inform the surface that GLES composition is complete for this frame, and
+    // the surface should make sure that HWComposer has the correct buffer for
+    // this frame. Some implementations may only push a new buffer to
+    // HWComposer if GLES composition took place, others need to push a new
+    // buffer on every frame.
+    //
+    // advanceFrame must be followed by a call to  onFrameCommitted before
+    // advanceFrame may be called again.
+    virtual status_t advanceFrame() = 0;
+
+    // onFrameCommitted is called after the frame has been committed to the
+    // hardware composer. The surface collects the release fence for this
+    // frame's buffer.
+    virtual void onFrameCommitted() = 0;
+
+    virtual void dump(String8& result) const = 0;
+
+    virtual void resizeBuffers(const uint32_t w, const uint32_t h) = 0;
+
+    // setReleaseFenceFd stores a fence file descriptor that will signal when the
+    // current buffer is no longer being read. This fence will be returned to
+    // the producer when the current buffer is released by updateTexImage().
+    // Multiple fences can be set for a given buffer; they will be merged into
+    // a single union fence. The SurfaceTexture will close the file descriptor
+    // when finished with it.
+    virtual status_t setReleaseFenceFd(int fenceFd) = 0;
+
+    virtual int GetPrevDispAcquireFd() = 0;
+
+    buffer_handle_t lastHandle;
+
+protected:
+    DisplaySurface(const sp<StreamConsumer>& sc)
+#if ANDROID_VERSION >= 19
+        : ConsumerBase(sc, true)
+#else
+        : ConsumerBase(sc)
+#endif
+        , lastHandle(0)
+    { }
+    virtual ~DisplaySurface() {}
+};
+
+// ---------------------------------------------------------------------------
+} // namespace android
+// ---------------------------------------------------------------------------
+
+#endif // ANDROID_SF_DISPLAY_SURFACE_H
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/FramebufferSurface.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/FramebufferSurface.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/FramebufferSurface.cpp	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/FramebufferSurface.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -54,15 +54,10 @@
                                        uint32_t height,
                                        uint32_t format,
                                        const sp<StreamConsumer>& sc)
-#if ANDROID_VERSION >= 19
-    : ConsumerBase(sc, true)
-#else
-    : ConsumerBase(sc)
-#endif
+    : DisplaySurface(sc)
     , mDisplayType(disp)
     , mCurrentBufferSlot(-1)
     , mCurrentBuffer(0)
-    , lastHandle(0)
 {
     mName = "FramebufferSurface";
 
@@ -81,6 +76,21 @@
     consumer->setDefaultMaxBufferCount(NUM_FRAMEBUFFER_SURFACE_BUFFERS);
 }
 
+status_t FramebufferSurface::beginFrame(bool /*mustRecompose*/) {
+    return NO_ERROR;
+}
+
+status_t FramebufferSurface::prepareFrame(CompositionType /*compositionType*/) {
+    return NO_ERROR;
+}
+
+status_t FramebufferSurface::advanceFrame() {
+    // Once we remove FB HAL support, we can call nextBuffer() from here
+    // instead of using onFrameAvailable(). No real benefit, except it'll be
+    // more like VirtualDisplaySurface.
+    return NO_ERROR;
+}
+
 status_t FramebufferSurface::nextBuffer(sp<GraphicBuffer>& outBuffer, sp<Fence>& outFence) {
     Mutex::Autolock lock(mMutex);
 
@@ -174,28 +184,25 @@
     return err;
 }
 
-int FramebufferSurface::GetPrevFBAcquireFd() {
+int FramebufferSurface::GetPrevDispAcquireFd() {
     if (mPrevFBAcquireFence.get() && mPrevFBAcquireFence->isValid()) {
         return mPrevFBAcquireFence->dup();
     }
     return -1;
 }
 
-status_t FramebufferSurface::setUpdateRectangle(const Rect& r)
-{
-    return INVALID_OPERATION;
+void FramebufferSurface::onFrameCommitted() {
+  // XXX This role is almost same to setReleaseFenceFd().
 }
 
 status_t FramebufferSurface::compositionComplete()
 {
+    // Actual implementaiton is in GonkDisplay::SwapBuffers()
+    // XXX need to move that to here.
     return NO_ERROR;
 }
 
-void FramebufferSurface::dump(String8& result) {
-    ConsumerBase::dump(result);
-}
-
-void FramebufferSurface::dump(String8& result, const char* prefix) {
+void FramebufferSurface::dump(String8& result) const {
     ConsumerBase::dump(result);
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/FramebufferSurface.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/FramebufferSurface.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/FramebufferSurface.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/FramebufferSurface.h	2015-04-24 19:31:16.000000000 +0000
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include <gui/ConsumerBase.h>
+#include "DisplaySurface.h"
 
 // ---------------------------------------------------------------------------
 namespace android {
@@ -28,26 +28,25 @@
 
 class Rect;
 class String8;
-class HWComposer;
-
-#if ANDROID_VERSION >= 21
-typedef IGraphicBufferConsumer StreamConsumer;
-#else
-typedef BufferQueue StreamConsumer;
-#endif
 
 // ---------------------------------------------------------------------------
 
-class FramebufferSurface : public ConsumerBase {
+class FramebufferSurface : public DisplaySurface {
 public:
     FramebufferSurface(int disp, uint32_t width, uint32_t height, uint32_t format, const sp<StreamConsumer>& sc);
 
-    bool isUpdateOnDemand() const { return false; }
-    status_t setUpdateRectangle(const Rect& updateRect);
-    status_t compositionComplete();
-
-    virtual void dump(String8& result);
-    virtual void dump(String8& result, const char* prefix);
+    // From DisplaySurface
+    virtual status_t beginFrame(bool mustRecompose);
+    virtual status_t prepareFrame(CompositionType compositionType);
+    virtual status_t compositionComplete();
+    virtual status_t advanceFrame();
+    virtual void onFrameCommitted();
+    // Implementation of DisplaySurface::dump(). Note that ConsumerBase also
+    // has a non-virtual dump() with the same signature.
+    virtual void dump(String8& result) const;
+    // Cannot resize a buffers in a FramebufferSurface. Only works with virtual
+    // displays.
+    virtual void resizeBuffers(const uint32_t /*w*/, const uint32_t /*h*/) { };
 
     // setReleaseFenceFd stores a fence file descriptor that will signal when the
     // current buffer is no longer being read. This fence will be returned to
@@ -57,9 +56,8 @@
     // when finished with it.
     status_t setReleaseFenceFd(int fenceFd);
 
-    virtual int GetPrevFBAcquireFd();
+    virtual int GetPrevDispAcquireFd();
 
-    buffer_handle_t lastHandle;
 private:
     virtual ~FramebufferSurface() { }; // this class cannot be overloaded
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/GonkDisplay.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/GonkDisplay.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/GonkDisplay.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/GonkDisplay.h	2015-04-24 19:31:16.000000000 +0000
@@ -21,10 +21,6 @@
 
 namespace mozilla {
 
-namespace layers {
-class Layer;
-}
-
 typedef void * EGLDisplay;
 typedef void * EGLSurface;
 
@@ -40,7 +36,7 @@
 
     virtual void* GetHWCDevice() = 0;
 
-    virtual void* GetFBSurface() = 0;
+    virtual void* GetDispSurface() = 0;
 
     /**
      * Only GonkDisplayICS uses arguments.
@@ -51,20 +47,20 @@
 
     virtual bool QueueBuffer(ANativeWindowBuffer* buf) = 0;
 
-    virtual void UpdateFBSurface(EGLDisplay dpy, EGLSurface sur) = 0;
+    virtual void UpdateDispSurface(EGLDisplay dpy, EGLSurface sur) = 0;
 
     /**
      * Set FramebufferSurface ReleaseFence's file descriptor.
      * ReleaseFence will be signaled after the HWC has finished reading
      * from a buffer.
      */
-    virtual void SetFBReleaseFd(int fd) = 0;
+    virtual void SetDispReleaseFd(int fd) = 0;
 
     /**
      * Get FramebufferSurface AcquireFence's file descriptor
      * AcquireFence will be signaled when a buffer's content is available.
      */
-    virtual int GetPrevFBAcquireFd() = 0;
+    virtual int GetPrevDispAcquireFd() = 0;
 
     float xdpi;
     int32_t surfaceformat;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/GonkDisplayICS.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/GonkDisplayICS.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/GonkDisplayICS.cpp	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/GonkDisplayICS.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -173,12 +173,6 @@
     return mHwc;
 }
 
-void*
-GonkDisplayICS::GetFBSurface()
-{
-    return mFBSurface.get();
-}
-
 bool
 GonkDisplayICS::SwapBuffers(EGLDisplay dpy, EGLSurface sur)
 {
@@ -211,13 +205,13 @@
 }
 
 void
-GonkDisplayICS::UpdateFBSurface(EGLDisplay dpy, EGLSurface sur)
+GonkDisplayICS::UpdateDispSurface(EGLDisplay dpy, EGLSurface sur)
 {
     eglSwapBuffers(dpy, sur);
 }
 
 void
-GonkDisplayICS::SetFBReleaseFd(int fd)
+GonkDisplayICS::SetDispReleaseFd(int fd)
 {
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/GonkDisplayICS.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/GonkDisplayICS.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/GonkDisplayICS.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/GonkDisplayICS.h	2015-04-24 19:31:16.000000000 +0000
@@ -38,7 +38,10 @@
 
     virtual void* GetHWCDevice();
 
-    virtual void* GetFBSurface();
+    virtual void* GetDispSurface()
+    {
+        return nullptr;
+    }
 
     virtual bool SwapBuffers(EGLDisplay dpy, EGLSurface sur);
 
@@ -46,11 +49,11 @@
 
     virtual bool QueueBuffer(ANativeWindowBuffer* handle);
 
-    virtual void UpdateFBSurface(EGLDisplay dpy, EGLSurface sur);
+    virtual void UpdateDispSurface(EGLDisplay dpy, EGLSurface sur);
 
-    virtual void SetFBReleaseFd(int fd);
+    virtual void SetDispReleaseFd(int fd);
 
-    virtual int GetPrevFBAcquireFd()
+    virtual int GetPrevDispAcquireFd()
     {
         return -1;
     }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/GonkDisplayJB.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/GonkDisplayJB.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/GonkDisplayJB.cpp	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/GonkDisplayJB.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -26,6 +26,7 @@
 #include <hardware/power.h>
 #include <suspend/autosuspend.h>
 
+#include "FramebufferSurface.h"
 #if ANDROID_VERSION == 17
 #include "GraphicBufferAlloc.h"
 #endif
@@ -119,11 +120,11 @@
     sp<BufferQueue> consumer = new BufferQueue(true, mAlloc);
 #endif
 
-    mFBSurface = new FramebufferSurface(0, mWidth, mHeight, surfaceformat, consumer);
+    mDispSurface = new FramebufferSurface(0, mWidth, mHeight, surfaceformat, consumer);
 
 #if ANDROID_VERSION == 17
     sp<SurfaceTextureClient> stc = new SurfaceTextureClient(
-        static_cast<sp<ISurfaceTexture> >(mFBSurface->getBufferQueue()));
+        static_cast<sp<ISurfaceTexture> >(mDispSurface->getBufferQueue()));
 #else
     sp<Surface> stc = new Surface(producer);
 #endif
@@ -223,9 +224,9 @@
 }
 
 void*
-GonkDisplayJB::GetFBSurface()
+GonkDisplayJB::GetDispSurface()
 {
-    return mFBSurface.get();
+    return mDispSurface.get();
 }
 
 bool
@@ -238,7 +239,7 @@
     if (mFBDevice && mFBDevice->compositionComplete) {
         mFBDevice->compositionComplete(mFBDevice);
     }
-    return Post(mFBSurface->lastHandle, mFBSurface->GetPrevFBAcquireFd());
+    return Post(mDispSurface->lastHandle, mDispSurface->GetPrevDispAcquireFd());
 }
 
 bool
@@ -297,7 +298,7 @@
 #endif
     mHwc->prepare(mHwc, HWC_NUM_DISPLAY_TYPES, displays);
     int err = mHwc->set(mHwc, HWC_NUM_DISPLAY_TYPES, displays);
-    mFBSurface->setReleaseFenceFd(mList->hwLayers[1].releaseFenceFd);
+    mDispSurface->setReleaseFenceFd(mList->hwLayers[1].releaseFenceFd);
     if (mList->retireFenceFd >= 0)
         close(mList->retireFenceFd);
     return !err;
@@ -321,21 +322,21 @@
 }
 
 void
-GonkDisplayJB::UpdateFBSurface(EGLDisplay dpy, EGLSurface sur)
+GonkDisplayJB::UpdateDispSurface(EGLDisplay dpy, EGLSurface sur)
 {
     eglSwapBuffers(dpy, sur);
 }
 
 void
-GonkDisplayJB::SetFBReleaseFd(int fd)
+GonkDisplayJB::SetDispReleaseFd(int fd)
 {
-    mFBSurface->setReleaseFenceFd(fd);
+    mDispSurface->setReleaseFenceFd(fd);
 }
 
 int
-GonkDisplayJB::GetPrevFBAcquireFd()
+GonkDisplayJB::GetPrevDispAcquireFd()
 {
-    return mFBSurface->GetPrevFBAcquireFd();
+    return mDispSurface->GetPrevDispAcquireFd();
 }
 
 __attribute__ ((visibility ("default")))
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/GonkDisplayJB.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/GonkDisplayJB.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/GonkDisplayJB.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/GonkDisplayJB.h	2015-04-24 19:31:16.000000000 +0000
@@ -16,8 +16,8 @@
 #ifndef GONKDISPLAYJB_H
 #define GONKDISPLAYJB_H
 
+#include "DisplaySurface.h"
 #include "GonkDisplay.h"
-#include "FramebufferSurface.h"
 #include "hardware/hwcomposer.h"
 #include "hardware/power.h"
 #include "ui/Fence.h"
@@ -38,7 +38,7 @@
 
     virtual void* GetHWCDevice();
 
-    virtual void* GetFBSurface();
+    virtual void* GetDispSurface();
 
     virtual bool SwapBuffers(EGLDisplay dpy, EGLSurface sur);
 
@@ -46,11 +46,11 @@
 
     virtual bool QueueBuffer(ANativeWindowBuffer* buf);
 
-    virtual void UpdateFBSurface(EGLDisplay dpy, EGLSurface sur);
+    virtual void UpdateDispSurface(EGLDisplay dpy, EGLSurface sur);
 
-    virtual void SetFBReleaseFd(int fd);
+    virtual void SetDispReleaseFd(int fd);
 
-    virtual int GetPrevFBAcquireFd();
+    virtual int GetPrevDispAcquireFd();
 
     bool Post(buffer_handle_t buf, int fence);
 
@@ -60,7 +60,7 @@
     hwc_composer_device_1_t*  mHwc;
     framebuffer_device_t*     mFBDevice;
     power_module_t*           mPowerModule;
-    android::sp<android::FramebufferSurface> mFBSurface;
+    android::sp<android::DisplaySurface> mDispSurface;
     android::sp<ANativeWindow> mSTClient;
     android::sp<android::IGraphicBufferAlloc> mAlloc;
     int mFence;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/moz.build	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/moz.build	2015-04-24 19:31:16.000000000 +0000
@@ -18,7 +18,13 @@
     'BootAnimation.cpp',
 ]
 
-if CONFIG['ANDROID_VERSION'] >= '18':
+if CONFIG['ANDROID_VERSION'] >= '19':
+    SOURCES += [
+        'FramebufferSurface.cpp',
+        'GonkDisplayJB.cpp',
+        'VirtualDisplaySurface.cpp',
+    ]
+elif CONFIG['ANDROID_VERSION'] == '18':
     SOURCES += [
         'FramebufferSurface.cpp',
         'GonkDisplayJB.cpp',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/VirtualDisplaySurface.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/VirtualDisplaySurface.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/VirtualDisplaySurface.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/VirtualDisplaySurface.cpp	2015-04-24 19:31:16.000000000 +0000
@@ -0,0 +1,637 @@
+/*
+ * Copyright 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// #define LOG_NDEBUG 0
+#include "VirtualDisplaySurface.h"
+
+// ---------------------------------------------------------------------------
+namespace android {
+// ---------------------------------------------------------------------------
+
+#if defined(FORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS)
+static const bool sForceHwcCopy = true;
+#else
+static const bool sForceHwcCopy = false;
+#endif
+
+#define VDS_LOGE(msg, ...) ALOGE("[%s] " msg, \
+        mDisplayName.string(), ##__VA_ARGS__)
+#define VDS_LOGW_IF(cond, msg, ...) ALOGW_IF(cond, "[%s] " msg, \
+        mDisplayName.string(), ##__VA_ARGS__)
+#define VDS_LOGV(msg, ...) ALOGV("[%s] " msg, \
+        mDisplayName.string(), ##__VA_ARGS__)
+
+static const char* dbgCompositionTypeStr(DisplaySurface::CompositionType type) {
+    switch (type) {
+        case DisplaySurface::COMPOSITION_UNKNOWN: return "UNKNOWN";
+        case DisplaySurface::COMPOSITION_GLES:    return "GLES";
+        case DisplaySurface::COMPOSITION_HWC:     return "HWC";
+        case DisplaySurface::COMPOSITION_MIXED:   return "MIXED";
+        default:                                  return "<INVALID>";
+    }
+}
+
+VirtualDisplaySurface::VirtualDisplaySurface(int32_t dispId,
+        const sp<IGraphicBufferProducer>& sink,
+        const sp<IGraphicBufferProducer>& bqProducer,
+        const sp<StreamConsumer>& bqConsumer,
+        const String8& name)
+:   DisplaySurface(bqConsumer),
+    mDisplayId(dispId),
+    mDisplayName(name),
+    mOutputUsage(GRALLOC_USAGE_HW_COMPOSER),
+    mProducerSlotSource(0),
+    mDbgState(DBG_STATE_IDLE),
+    mDbgLastCompositionType(COMPOSITION_UNKNOWN),
+    mMustRecompose(false)
+{
+    mSource[SOURCE_SINK] = sink;
+    mSource[SOURCE_SCRATCH] = bqProducer;
+
+    resetPerFrameState();
+
+    int sinkWidth, sinkHeight;
+    sink->query(NATIVE_WINDOW_WIDTH, &sinkWidth);
+    sink->query(NATIVE_WINDOW_HEIGHT, &sinkHeight);
+    mSinkBufferWidth = sinkWidth;
+    mSinkBufferHeight = sinkHeight;
+
+    // Pick the buffer format to request from the sink when not rendering to it
+    // with GLES. If the consumer needs CPU access, use the default format
+    // set by the consumer. Otherwise allow gralloc to decide the format based
+    // on usage bits.
+    int sinkUsage;
+    sink->query(NATIVE_WINDOW_CONSUMER_USAGE_BITS, &sinkUsage);
+    if (sinkUsage & (GRALLOC_USAGE_SW_READ_MASK | GRALLOC_USAGE_SW_WRITE_MASK)) {
+        int sinkFormat;
+        sink->query(NATIVE_WINDOW_FORMAT, &sinkFormat);
+        mDefaultOutputFormat = sinkFormat;
+    } else {
+        mDefaultOutputFormat = HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;
+    }
+    mOutputFormat = mDefaultOutputFormat;
+
+    ConsumerBase::mName = String8::format("VDS: %s", mDisplayName.string());
+    mConsumer->setConsumerName(ConsumerBase::mName);
+    mConsumer->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER);
+    mConsumer->setDefaultBufferSize(sinkWidth, sinkHeight);
+    mConsumer->setDefaultMaxBufferCount(2);
+}
+
+VirtualDisplaySurface::~VirtualDisplaySurface() {
+}
+
+status_t VirtualDisplaySurface::beginFrame(bool mustRecompose) {
+    if (mDisplayId < 0)
+        return NO_ERROR;
+
+    mMustRecompose = mustRecompose;
+
+    VDS_LOGW_IF(mDbgState != DBG_STATE_IDLE,
+            "Unexpected beginFrame() in %s state", dbgStateStr());
+    mDbgState = DBG_STATE_BEGUN;
+
+    return refreshOutputBuffer();
+}
+
+status_t VirtualDisplaySurface::prepareFrame(CompositionType compositionType) {
+    if (mDisplayId < 0)
+        return NO_ERROR;
+
+    VDS_LOGW_IF(mDbgState != DBG_STATE_BEGUN,
+            "Unexpected prepareFrame() in %s state", dbgStateStr());
+    mDbgState = DBG_STATE_PREPARED;
+
+    mCompositionType = compositionType;
+    if (sForceHwcCopy && mCompositionType == COMPOSITION_GLES) {
+        // Some hardware can do RGB->YUV conversion more efficiently in hardware
+        // controlled by HWC than in hardware controlled by the video encoder.
+        // Forcing GLES-composed frames to go through an extra copy by the HWC
+        // allows the format conversion to happen there, rather than passing RGB
+        // directly to the consumer.
+        //
+        // On the other hand, when the consumer prefers RGB or can consume RGB
+        // inexpensively, this forces an unnecessary copy.
+        mCompositionType = COMPOSITION_MIXED;
+    }
+
+    if (mCompositionType != mDbgLastCompositionType) {
+        VDS_LOGV("prepareFrame: composition type changed to %s",
+                dbgCompositionTypeStr(mCompositionType));
+        mDbgLastCompositionType = mCompositionType;
+    }
+
+    if (mCompositionType != COMPOSITION_GLES &&
+            (mOutputFormat != mDefaultOutputFormat ||
+             mOutputUsage != GRALLOC_USAGE_HW_COMPOSER)) {
+        // We must have just switched from GLES-only to MIXED or HWC
+        // composition. Stop using the format and usage requested by the GLES
+        // driver; they may be suboptimal when HWC is writing to the output
+        // buffer. For example, if the output is going to a video encoder, and
+        // HWC can write directly to YUV, some hardware can skip a
+        // memory-to-memory RGB-to-YUV conversion step.
+        //
+        // If we just switched *to* GLES-only mode, we'll change the
+        // format/usage and get a new buffer when the GLES driver calls
+        // dequeueBuffer().
+        mOutputFormat = mDefaultOutputFormat;
+        mOutputUsage = GRALLOC_USAGE_HW_COMPOSER;
+        refreshOutputBuffer();
+    }
+
+    return NO_ERROR;
+}
+
+status_t VirtualDisplaySurface::compositionComplete() {
+    return NO_ERROR;
+}
+
+status_t VirtualDisplaySurface::advanceFrame() {
+    return NO_ERROR;
+
+// XXX Add HWC support
+
+#if 0
+    if (mDisplayId < 0)
+        return NO_ERROR;
+
+    if (mCompositionType == COMPOSITION_HWC) {
+        VDS_LOGW_IF(mDbgState != DBG_STATE_PREPARED,
+                "Unexpected advanceFrame() in %s state on HWC frame",
+                dbgStateStr());
+    } else {
+        VDS_LOGW_IF(mDbgState != DBG_STATE_GLES_DONE,
+                "Unexpected advanceFrame() in %s state on GLES/MIXED frame",
+                dbgStateStr());
+    }
+    mDbgState = DBG_STATE_HWC;
+
+    if (mOutputProducerSlot < 0 ||
+            (mCompositionType != COMPOSITION_HWC && mFbProducerSlot < 0)) {
+        // Last chance bailout if something bad happened earlier. For example,
+        // in a GLES configuration, if the sink disappears then dequeueBuffer
+        // will fail, the GLES driver won't queue a buffer, but SurfaceFlinger
+        // will soldier on. So we end up here without a buffer. There should
+        // be lots of scary messages in the log just before this.
+        VDS_LOGE("advanceFrame: no buffer, bailing out");
+        return NO_MEMORY;
+    }
+
+    sp<GraphicBuffer> fbBuffer = mFbProducerSlot >= 0 ?
+            mProducerBuffers[mFbProducerSlot] : sp<GraphicBuffer>(NULL);
+    sp<GraphicBuffer> outBuffer = mProducerBuffers[mOutputProducerSlot];
+    VDS_LOGV("advanceFrame: fb=%d(%p) out=%d(%p)",
+            mFbProducerSlot, fbBuffer.get(),
+            mOutputProducerSlot, outBuffer.get());
+
+    // At this point we know the output buffer acquire fence,
+    // so update HWC state with it.
+    mHwc.setOutputBuffer(mDisplayId, mOutputFence, outBuffer);
+
+    status_t result = NO_ERROR;
+    if (fbBuffer != NULL) {
+        result = mHwc.fbPost(mDisplayId, mFbFence, fbBuffer);
+    }
+
+    return result;
+#endif
+}
+
+void VirtualDisplaySurface::onFrameCommitted() {
+    return;
+
+// XXX Add HWC support
+
+#if 0
+    if (mDisplayId < 0)
+        return;
+
+    VDS_LOGW_IF(mDbgState != DBG_STATE_HWC,
+            "Unexpected onFrameCommitted() in %s state", dbgStateStr());
+    mDbgState = DBG_STATE_IDLE;
+
+    sp<Fence> fbFence = mHwc.getAndResetReleaseFence(mDisplayId);
+    if (mCompositionType == COMPOSITION_MIXED && mFbProducerSlot >= 0) {
+        // release the scratch buffer back to the pool
+        Mutex::Autolock lock(mMutex);
+        int sslot = mapProducer2SourceSlot(SOURCE_SCRATCH, mFbProducerSlot);
+        VDS_LOGV("onFrameCommitted: release scratch sslot=%d", sslot);
+        addReleaseFenceLocked(sslot, mProducerBuffers[mFbProducerSlot], fbFence);
+        releaseBufferLocked(sslot, mProducerBuffers[mFbProducerSlot],
+                EGL_NO_DISPLAY, EGL_NO_SYNC_KHR);
+    }
+
+    if (mOutputProducerSlot >= 0) {
+        int sslot = mapProducer2SourceSlot(SOURCE_SINK, mOutputProducerSlot);
+        QueueBufferOutput qbo;
+        sp<Fence> outFence = mHwc.getLastRetireFence(mDisplayId);
+        VDS_LOGV("onFrameCommitted: queue sink sslot=%d", sslot);
+        if (mMustRecompose) {
+            status_t result = mSource[SOURCE_SINK]->queueBuffer(sslot,
+                    QueueBufferInput(
+                        systemTime(), false /* isAutoTimestamp */,
+                        Rect(mSinkBufferWidth, mSinkBufferHeight),
+                        NATIVE_WINDOW_SCALING_MODE_FREEZE, 0 /* transform */,
+                        true /* async*/,
+                        outFence),
+                    &qbo);
+            if (result == NO_ERROR) {
+                updateQueueBufferOutput(qbo);
+            }
+        } else {
+            // If the surface hadn't actually been updated, then we only went
+            // through the motions of updating the display to keep our state
+            // machine happy. We cancel the buffer to avoid triggering another
+            // re-composition and causing an infinite loop.
+            mSource[SOURCE_SINK]->cancelBuffer(sslot, outFence);
+        }
+    }
+
+    resetPerFrameState();
+#endif
+}
+
+void VirtualDisplaySurface::dump(String8& /* result */) const {
+}
+
+void VirtualDisplaySurface::resizeBuffers(const uint32_t w, const uint32_t h) {
+    uint32_t tmpW, tmpH, transformHint, numPendingBuffers;
+    mQueueBufferOutput.deflate(&tmpW, &tmpH, &transformHint, &numPendingBuffers);
+    mQueueBufferOutput.inflate(w, h, transformHint, numPendingBuffers);
+
+    mSinkBufferWidth = w;
+    mSinkBufferHeight = h;
+}
+
+status_t VirtualDisplaySurface::requestBuffer(int pslot,
+        sp<GraphicBuffer>* outBuf) {
+    if (mDisplayId < 0)
+        return mSource[SOURCE_SINK]->requestBuffer(pslot, outBuf);
+
+    VDS_LOGW_IF(mDbgState != DBG_STATE_GLES,
+            "Unexpected requestBuffer pslot=%d in %s state",
+            pslot, dbgStateStr());
+
+    *outBuf = mProducerBuffers[pslot];
+    return NO_ERROR;
+}
+
+status_t VirtualDisplaySurface::setBufferCount(int bufferCount) {
+    return mSource[SOURCE_SINK]->setBufferCount(bufferCount);
+}
+
+status_t VirtualDisplaySurface::dequeueBuffer(Source source,
+        uint32_t format, uint32_t usage, int* sslot, sp<Fence>* fence) {
+    LOG_FATAL_IF(mDisplayId < 0, "mDisplayId=%d but should not be < 0.", mDisplayId);
+    // Don't let a slow consumer block us
+    bool async = (source == SOURCE_SINK);
+
+    status_t result = mSource[source]->dequeueBuffer(sslot, fence, async,
+            mSinkBufferWidth, mSinkBufferHeight, format, usage);
+    if (result < 0)
+        return result;
+    int pslot = mapSource2ProducerSlot(source, *sslot);
+    VDS_LOGV("dequeueBuffer(%s): sslot=%d pslot=%d result=%d",
+            dbgSourceStr(source), *sslot, pslot, result);
+    uint64_t sourceBit = static_cast<uint64_t>(source) << pslot;
+
+    if ((mProducerSlotSource & (1ULL << pslot)) != sourceBit) {
+        // This slot was previously dequeued from the other source; must
+        // re-request the buffer.
+        result |= BUFFER_NEEDS_REALLOCATION;
+        mProducerSlotSource &= ~(1ULL << pslot);
+        mProducerSlotSource |= sourceBit;
+    }
+
+    if (result & RELEASE_ALL_BUFFERS) {
+        for (uint32_t i = 0; i < BufferQueue::NUM_BUFFER_SLOTS; i++) {
+            if ((mProducerSlotSource & (1ULL << i)) == sourceBit)
+                mProducerBuffers[i].clear();
+        }
+    }
+    if (result & BUFFER_NEEDS_REALLOCATION) {
+        result = mSource[source]->requestBuffer(*sslot, &mProducerBuffers[pslot]);
+        if (result < 0) {
+            mProducerBuffers[pslot].clear();
+            mSource[source]->cancelBuffer(*sslot, *fence);
+            return result;
+        }
+        VDS_LOGV("dequeueBuffer(%s): buffers[%d]=%p fmt=%d usage=%#x",
+                dbgSourceStr(source), pslot, mProducerBuffers[pslot].get(),
+                mProducerBuffers[pslot]->getPixelFormat(),
+                mProducerBuffers[pslot]->getUsage());
+    }
+
+    return result;
+}
+
+status_t VirtualDisplaySurface::dequeueBuffer(int* pslot, sp<Fence>* fence, bool async,
+        uint32_t w, uint32_t h, uint32_t format, uint32_t usage) {
+    if (mDisplayId < 0)
+        return mSource[SOURCE_SINK]->dequeueBuffer(pslot, fence, async, w, h, format, usage);
+
+    VDS_LOGW_IF(mDbgState != DBG_STATE_PREPARED,
+            "Unexpected dequeueBuffer() in %s state", dbgStateStr());
+    mDbgState = DBG_STATE_GLES;
+
+    VDS_LOGW_IF(!async, "EGL called dequeueBuffer with !async despite eglSwapInterval(0)");
+    VDS_LOGV("dequeueBuffer %dx%d fmt=%d usage=%#x", w, h, format, usage);
+
+    status_t result = NO_ERROR;
+    Source source = fbSourceForCompositionType(mCompositionType);
+
+    if (source == SOURCE_SINK) {
+
+        if (mOutputProducerSlot < 0) {
+            // Last chance bailout if something bad happened earlier. For example,
+            // in a GLES configuration, if the sink disappears then dequeueBuffer
+            // will fail, the GLES driver won't queue a buffer, but SurfaceFlinger
+            // will soldier on. So we end up here without a buffer. There should
+            // be lots of scary messages in the log just before this.
+            VDS_LOGE("dequeueBuffer: no buffer, bailing out");
+            return NO_MEMORY;
+        }
+
+        // We already dequeued the output buffer. If the GLES driver wants
+        // something incompatible, we have to cancel and get a new one. This
+        // will mean that HWC will see a different output buffer between
+        // prepare and set, but since we're in GLES-only mode already it
+        // shouldn't matter.
+
+        usage |= GRALLOC_USAGE_HW_COMPOSER;
+        const sp<GraphicBuffer>& buf = mProducerBuffers[mOutputProducerSlot];
+        if ((usage & ~buf->getUsage()) != 0 ||
+                (format != 0 && format != (uint32_t)buf->getPixelFormat()) ||
+                (w != 0 && w != mSinkBufferWidth) ||
+                (h != 0 && h != mSinkBufferHeight)) {
+            VDS_LOGV("dequeueBuffer: dequeueing new output buffer: "
+                    "want %dx%d fmt=%d use=%#x, "
+                    "have %dx%d fmt=%d use=%#x",
+                    w, h, format, usage,
+                    mSinkBufferWidth, mSinkBufferHeight,
+                    buf->getPixelFormat(), buf->getUsage());
+            mOutputFormat = format;
+            mOutputUsage = usage;
+            result = refreshOutputBuffer();
+            if (result < 0)
+                return result;
+        }
+    }
+
+    if (source == SOURCE_SINK) {
+        *pslot = mOutputProducerSlot;
+        *fence = mOutputFence;
+    } else {
+        int sslot;
+        result = dequeueBuffer(source, format, usage, &sslot, fence);
+        if (result >= 0) {
+            *pslot = mapSource2ProducerSlot(source, sslot);
+        }
+    }
+    return result;
+}
+
+status_t VirtualDisplaySurface::detachBuffer(int /* slot */) {
+    VDS_LOGE("detachBuffer is not available for VirtualDisplaySurface");
+    return INVALID_OPERATION;
+}
+
+status_t VirtualDisplaySurface::detachNextBuffer(
+        sp<GraphicBuffer>* /* outBuffer */, sp<Fence>* /* outFence */) {
+    VDS_LOGE("detachNextBuffer is not available for VirtualDisplaySurface");
+    return INVALID_OPERATION;
+}
+
+status_t VirtualDisplaySurface::attachBuffer(int* /* outSlot */,
+        const sp<GraphicBuffer>& /* buffer */) {
+    VDS_LOGE("attachBuffer is not available for VirtualDisplaySurface");
+    return INVALID_OPERATION;
+}
+
+status_t VirtualDisplaySurface::queueBuffer(int pslot,
+        const QueueBufferInput& input, QueueBufferOutput* output) {
+    if (mDisplayId < 0)
+        return mSource[SOURCE_SINK]->queueBuffer(pslot, input, output);
+
+    VDS_LOGW_IF(mDbgState != DBG_STATE_GLES,
+            "Unexpected queueBuffer(pslot=%d) in %s state", pslot,
+            dbgStateStr());
+    mDbgState = DBG_STATE_GLES_DONE;
+
+    VDS_LOGV("queueBuffer pslot=%d", pslot);
+
+    status_t result;
+    if (mCompositionType == COMPOSITION_MIXED) {
+        // Queue the buffer back into the scratch pool
+        QueueBufferOutput scratchQBO;
+        int sslot = mapProducer2SourceSlot(SOURCE_SCRATCH, pslot);
+        result = mSource[SOURCE_SCRATCH]->queueBuffer(sslot, input, &scratchQBO);
+        if (result != NO_ERROR)
+            return result;
+
+        // Now acquire the buffer from the scratch pool -- should be the same
+        // slot and fence as we just queued.
+        Mutex::Autolock lock(mMutex);
+        BufferQueue::BufferItem item;
+        result = acquireBufferLocked(&item, 0);
+        if (result != NO_ERROR)
+            return result;
+        VDS_LOGW_IF(item.mBuf != sslot,
+                "queueBuffer: acquired sslot %d from SCRATCH after queueing sslot %d",
+                item.mBuf, sslot);
+        mFbProducerSlot = mapSource2ProducerSlot(SOURCE_SCRATCH, item.mBuf);
+        mFbFence = mSlots[item.mBuf].mFence;
+
+    } else {
+        LOG_FATAL_IF(mCompositionType != COMPOSITION_GLES,
+                "Unexpected queueBuffer in state %s for compositionType %s",
+                dbgStateStr(), dbgCompositionTypeStr(mCompositionType));
+
+        // Extract the GLES release fence for HWC to acquire
+        int64_t timestamp;
+        bool isAutoTimestamp;
+        Rect crop;
+        int scalingMode;
+        uint32_t transform;
+        bool async;
+        input.deflate(&timestamp, &isAutoTimestamp, &crop, &scalingMode,
+                &transform, &async, &mFbFence);
+
+        mFbProducerSlot = pslot;
+        mOutputFence = mFbFence;
+    }
+
+    *output = mQueueBufferOutput;
+    return NO_ERROR;
+}
+
+void VirtualDisplaySurface::cancelBuffer(int pslot, const sp<Fence>& fence) {
+    if (mDisplayId < 0)
+        return mSource[SOURCE_SINK]->cancelBuffer(mapProducer2SourceSlot(SOURCE_SINK, pslot), fence);
+
+    VDS_LOGW_IF(mDbgState != DBG_STATE_GLES,
+            "Unexpected cancelBuffer(pslot=%d) in %s state", pslot,
+            dbgStateStr());
+    VDS_LOGV("cancelBuffer pslot=%d", pslot);
+    Source source = fbSourceForCompositionType(mCompositionType);
+    return mSource[source]->cancelBuffer(
+            mapProducer2SourceSlot(source, pslot), fence);
+}
+
+int VirtualDisplaySurface::query(int what, int* value) {
+    switch (what) {
+        case NATIVE_WINDOW_WIDTH:
+            *value = mSinkBufferWidth;
+            break;
+        case NATIVE_WINDOW_HEIGHT:
+            *value = mSinkBufferHeight;
+            break;
+        default:
+            return mSource[SOURCE_SINK]->query(what, value);
+    }
+    return NO_ERROR;
+}
+
+#if ANDROID_VERSION >= 21
+status_t VirtualDisplaySurface::connect(const sp<IProducerListener>& listener,
+        int api, bool producerControlledByApp,
+        QueueBufferOutput* output) {
+    QueueBufferOutput qbo;
+    status_t result = mSource[SOURCE_SINK]->connect(listener, api,
+            producerControlledByApp, &qbo);
+    if (result == NO_ERROR) {
+        updateQueueBufferOutput(qbo);
+        *output = mQueueBufferOutput;
+    }
+    return result;
+}
+#else
+status_t VirtualDisplaySurface::connect(const sp<IBinder>& token,
+        int api, bool producerControlledByApp,
+        QueueBufferOutput* output) {
+    QueueBufferOutput qbo;
+    status_t result = mSource[SOURCE_SINK]->connect(token, api, producerControlledByApp, &qbo);
+    if (result == NO_ERROR) {
+        updateQueueBufferOutput(qbo);
+        *output = mQueueBufferOutput;
+    }
+    return result;
+}
+#endif
+
+status_t VirtualDisplaySurface::disconnect(int api) {
+    return mSource[SOURCE_SINK]->disconnect(api);
+}
+
+#if ANDROID_VERSION >= 21
+status_t VirtualDisplaySurface::setSidebandStream(const sp<NativeHandle>& /*stream*/) {
+    return INVALID_OPERATION;
+}
+#endif
+
+void VirtualDisplaySurface::allocateBuffers(bool /* async */,
+        uint32_t /* width */, uint32_t /* height */, uint32_t /* format */,
+        uint32_t /* usage */) {
+    // TODO: Should we actually allocate buffers for a virtual display?
+}
+
+void VirtualDisplaySurface::updateQueueBufferOutput(
+        const QueueBufferOutput& qbo) {
+    uint32_t w, h, transformHint, numPendingBuffers;
+    qbo.deflate(&w, &h, &transformHint, &numPendingBuffers);
+    mQueueBufferOutput.inflate(w, h, 0, numPendingBuffers);
+}
+
+void VirtualDisplaySurface::resetPerFrameState() {
+    mCompositionType = COMPOSITION_UNKNOWN;
+    mFbFence = Fence::NO_FENCE;
+    mOutputFence = Fence::NO_FENCE;
+    mOutputProducerSlot = -1;
+    mFbProducerSlot = -1;
+}
+
+status_t VirtualDisplaySurface::refreshOutputBuffer() {
+
+    return INVALID_OPERATION;
+
+// XXX Add HWC support
+
+#if 0
+    if (mOutputProducerSlot >= 0) {
+        mSource[SOURCE_SINK]->cancelBuffer(
+                mapProducer2SourceSlot(SOURCE_SINK, mOutputProducerSlot),
+                mOutputFence);
+    }
+
+    int sslot;
+    status_t result = dequeueBuffer(SOURCE_SINK, mOutputFormat, mOutputUsage,
+            &sslot, &mOutputFence);
+    if (result < 0)
+        return result;
+    mOutputProducerSlot = mapSource2ProducerSlot(SOURCE_SINK, sslot);
+
+    // On GLES-only frames, we don't have the right output buffer acquire fence
+    // until after GLES calls queueBuffer(). So here we just set the buffer
+    // (for use in HWC prepare) but not the fence; we'll call this again with
+    // the proper fence once we have it.
+    result = mHwc.setOutputBuffer(mDisplayId, Fence::NO_FENCE,
+            mProducerBuffers[mOutputProducerSlot]);
+
+    return result;
+#endif
+}
+
+// This slot mapping function is its own inverse, so two copies are unnecessary.
+// Both are kept to make the intent clear where the function is called, and for
+// the (unlikely) chance that we switch to a different mapping function.
+int VirtualDisplaySurface::mapSource2ProducerSlot(Source source, int sslot) {
+    if (source == SOURCE_SCRATCH) {
+        return BufferQueue::NUM_BUFFER_SLOTS - sslot - 1;
+    } else {
+        return sslot;
+    }
+}
+int VirtualDisplaySurface::mapProducer2SourceSlot(Source source, int pslot) {
+    return mapSource2ProducerSlot(source, pslot);
+}
+
+VirtualDisplaySurface::Source
+VirtualDisplaySurface::fbSourceForCompositionType(CompositionType type) {
+    return type == COMPOSITION_MIXED ? SOURCE_SCRATCH : SOURCE_SINK;
+}
+
+const char* VirtualDisplaySurface::dbgStateStr() const {
+    switch (mDbgState) {
+        case DBG_STATE_IDLE:      return "IDLE";
+        case DBG_STATE_PREPARED:  return "PREPARED";
+        case DBG_STATE_GLES:      return "GLES";
+        case DBG_STATE_GLES_DONE: return "GLES_DONE";
+        case DBG_STATE_HWC:       return "HWC";
+        default:                  return "INVALID";
+    }
+}
+
+const char* VirtualDisplaySurface::dbgSourceStr(Source s) {
+    switch (s) {
+        case SOURCE_SINK:    return "SINK";
+        case SOURCE_SCRATCH: return "SCRATCH";
+        default:             return "INVALID";
+    }
+}
+
+// ---------------------------------------------------------------------------
+} // namespace android
+// ---------------------------------------------------------------------------
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/VirtualDisplaySurface.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/VirtualDisplaySurface.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/libdisplay/VirtualDisplaySurface.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/libdisplay/VirtualDisplaySurface.h	2015-04-24 19:31:16.000000000 +0000
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_SF_VIRTUAL_DISPLAY_SURFACE_H
+#define ANDROID_SF_VIRTUAL_DISPLAY_SURFACE_H
+
+#include <gui/IGraphicBufferProducer.h>
+
+#include "DisplaySurface.h"
+
+// ---------------------------------------------------------------------------
+namespace android {
+// ---------------------------------------------------------------------------
+
+class HWComposer;
+class IProducerListener;
+
+/* This DisplaySurface implementation supports virtual displays, where GLES
+ * and/or HWC compose into a buffer that is then passed to an arbitrary
+ * consumer (the sink) running in another process.
+ *
+ * The simplest case is when the virtual display will never use the h/w
+ * composer -- either the h/w composer doesn't support writing to buffers, or
+ * there are more virtual displays than it supports simultaneously. In this
+ * case, the GLES driver works directly with the output buffer queue, and
+ * calls to the VirtualDisplay from SurfaceFlinger and DisplayHardware do
+ * nothing.
+ *
+ * If h/w composer might be used, then each frame will fall into one of three
+ * configurations: GLES-only, HWC-only, and MIXED composition. In all of these,
+ * we must provide a FB target buffer and output buffer for the HWC set() call.
+ *
+ * In GLES-only composition, the GLES driver is given a buffer from the sink to
+ * render into. When the GLES driver queues the buffer to the
+ * VirtualDisplaySurface, the VirtualDisplaySurface holds onto it instead of
+ * immediately queueing it to the sink. The buffer is used as both the FB
+ * target and output buffer for HWC, though on these frames the HWC doesn't
+ * do any work for this display and doesn't write to the output buffer. After
+ * composition is complete, the buffer is queued to the sink.
+ *
+ * In HWC-only composition, the VirtualDisplaySurface dequeues a buffer from
+ * the sink and passes it to HWC as both the FB target buffer and output
+ * buffer. The HWC doesn't need to read from the FB target buffer, but does
+ * write to the output buffer. After composition is complete, the buffer is
+ * queued to the sink.
+ *
+ * On MIXED frames, things become more complicated, since some h/w composer
+ * implementations can't read from and write to the same buffer. This class has
+ * an internal BufferQueue that it uses as a scratch buffer pool. The GLES
+ * driver is given a scratch buffer to render into. When it finishes rendering,
+ * the buffer is queued and then immediately acquired by the
+ * VirtualDisplaySurface. The scratch buffer is then used as the FB target
+ * buffer for HWC, and a separate buffer is dequeued from the sink and used as
+ * the HWC output buffer. When HWC composition is complete, the scratch buffer
+ * is released and the output buffer is queued to the sink.
+ */
+class VirtualDisplaySurface : public DisplaySurface,
+                              public BnGraphicBufferProducer {
+public:
+    VirtualDisplaySurface(int32_t dispId,
+            const sp<IGraphicBufferProducer>& sink,
+            const sp<IGraphicBufferProducer>& bqProducer,
+            const sp<StreamConsumer>& bqConsumer,
+            const String8& name);
+
+    //
+    // DisplaySurface interface
+    //
+    virtual status_t beginFrame(bool mustRecompose);
+    virtual status_t prepareFrame(CompositionType compositionType);
+    virtual status_t compositionComplete();
+    virtual status_t advanceFrame();
+    virtual void onFrameCommitted();
+    virtual void dump(String8& result) const;
+    virtual void resizeBuffers(const uint32_t w, const uint32_t h);
+
+    virtual status_t setReleaseFenceFd(int fenceFd) { return INVALID_OPERATION; }
+    virtual int GetPrevDispAcquireFd() { return -1; };
+
+private:
+    enum Source {SOURCE_SINK = 0, SOURCE_SCRATCH = 1};
+
+    virtual ~VirtualDisplaySurface();
+
+    //
+    // IGraphicBufferProducer interface, used by the GLES driver.
+    //
+    virtual status_t requestBuffer(int pslot, sp<GraphicBuffer>* outBuf);
+    virtual status_t setBufferCount(int bufferCount);
+    virtual status_t dequeueBuffer(int* pslot, sp<Fence>* fence, bool async,
+            uint32_t w, uint32_t h, uint32_t format, uint32_t usage);
+    virtual status_t detachBuffer(int slot);
+    virtual status_t detachNextBuffer(sp<GraphicBuffer>* outBuffer,
+            sp<Fence>* outFence);
+    virtual status_t attachBuffer(int* slot, const sp<GraphicBuffer>& buffer);
+    virtual status_t queueBuffer(int pslot,
+            const QueueBufferInput& input, QueueBufferOutput* output);
+    virtual void cancelBuffer(int pslot, const sp<Fence>& fence);
+    virtual int query(int what, int* value);
+#if ANDROID_VERSION >= 21
+    virtual status_t connect(const sp<IProducerListener>& listener,
+            int api, bool producerControlledByApp, QueueBufferOutput* output);
+#else
+    virtual status_t connect(const sp<IBinder>& token,
+            int api, bool producerControlledByApp, QueueBufferOutput* output);
+#endif
+    virtual status_t disconnect(int api);
+#if ANDROID_VERSION >= 21
+    virtual status_t setSidebandStream(const sp<NativeHandle>& stream);
+#endif
+    virtual void allocateBuffers(bool async, uint32_t width, uint32_t height,
+            uint32_t format, uint32_t usage);
+
+    //
+    // Utility methods
+    //
+    static Source fbSourceForCompositionType(CompositionType type);
+    status_t dequeueBuffer(Source source, uint32_t format, uint32_t usage,
+            int* sslot, sp<Fence>* fence);
+    void updateQueueBufferOutput(const QueueBufferOutput& qbo);
+    void resetPerFrameState();
+    status_t refreshOutputBuffer();
+
+    // Both the sink and scratch buffer pools have their own set of slots
+    // ("source slots", or "sslot"). We have to merge these into the single
+    // set of slots used by the GLES producer ("producer slots" or "pslot") and
+    // internally in the VirtualDisplaySurface. To minimize the number of times
+    // a producer slot switches which source it comes from, we map source slot
+    // numbers to producer slot numbers differently for each source.
+    static int mapSource2ProducerSlot(Source source, int sslot);
+    static int mapProducer2SourceSlot(Source source, int pslot);
+
+    //
+    // Immutable after construction
+    //
+    const int32_t mDisplayId;
+    const String8 mDisplayName;
+    sp<IGraphicBufferProducer> mSource[2]; // indexed by SOURCE_*
+    uint32_t mDefaultOutputFormat;
+
+    //
+    // Inter-frame state
+    //
+
+    // To avoid buffer reallocations, we track the buffer usage and format
+    // we used on the previous frame and use it again on the new frame. If
+    // the composition type changes or the GLES driver starts requesting
+    // different usage/format, we'll get a new buffer.
+    uint32_t mOutputFormat;
+    uint32_t mOutputUsage;
+
+    // Since we present a single producer interface to the GLES driver, but
+    // are internally muxing between the sink and scratch producers, we have
+    // to keep track of which source last returned each producer slot from
+    // dequeueBuffer. Each bit in mProducerSlotSource corresponds to a producer
+    // slot. Both mProducerSlotSource and mProducerBuffers are indexed by a
+    // "producer slot"; see the mapSlot*() functions.
+    uint64_t mProducerSlotSource;
+    sp<GraphicBuffer> mProducerBuffers[BufferQueue::NUM_BUFFER_SLOTS];
+
+    // The QueueBufferOutput with the latest info from the sink, and with the
+    // transform hint cleared. Since we defer queueBuffer from the GLES driver
+    // to the sink, we have to return the previous version.
+    QueueBufferOutput mQueueBufferOutput;
+
+    // Details of the current sink buffer. These become valid when a buffer is
+    // dequeued from the sink, and are used when queueing the buffer.
+    uint32_t mSinkBufferWidth, mSinkBufferHeight;
+
+    //
+    // Intra-frame state
+    //
+
+    // Composition type and GLES buffer source for the current frame.
+    // Valid after prepareFrame(), cleared in onFrameCommitted.
+    CompositionType mCompositionType;
+
+    // mFbFence is the fence HWC should wait for before reading the framebuffer
+    // target buffer.
+    sp<Fence> mFbFence;
+
+    // mOutputFence is the fence HWC should wait for before writing to the
+    // output buffer.
+    sp<Fence> mOutputFence;
+
+    // Producer slot numbers for the buffers to use for HWC framebuffer target
+    // and output.
+    int mFbProducerSlot;
+    int mOutputProducerSlot;
+
+    // Debug only -- track the sequence of events in each frame so we can make
+    // sure they happen in the order we expect. This class implicitly models
+    // a state machine; this enum/variable makes it explicit.
+    //
+    // +-----------+-------------------+-------------+
+    // | State     | Event             || Next State |
+    // +-----------+-------------------+-------------+
+    // | IDLE      | beginFrame        || BEGUN      |
+    // | BEGUN     | prepareFrame      || PREPARED   |
+    // | PREPARED  | dequeueBuffer [1] || GLES       |
+    // | PREPARED  | advanceFrame [2]  || HWC        |
+    // | GLES      | queueBuffer       || GLES_DONE  |
+    // | GLES_DONE | advanceFrame      || HWC        |
+    // | HWC       | onFrameCommitted  || IDLE       |
+    // +-----------+-------------------++------------+
+    // [1] COMPOSITION_GLES and COMPOSITION_MIXED frames.
+    // [2] COMPOSITION_HWC frames.
+    //
+    enum DbgState {
+        // no buffer dequeued, don't know anything about the next frame
+        DBG_STATE_IDLE,
+        // output buffer dequeued, framebuffer source not yet known
+        DBG_STATE_BEGUN,
+        // output buffer dequeued, framebuffer source known but not provided
+        // to GLES yet.
+        DBG_STATE_PREPARED,
+        // GLES driver has a buffer dequeued
+        DBG_STATE_GLES,
+        // GLES driver has queued the buffer, we haven't sent it to HWC yet
+        DBG_STATE_GLES_DONE,
+        // HWC has the buffer for this frame
+        DBG_STATE_HWC,
+    };
+    DbgState mDbgState;
+    CompositionType mDbgLastCompositionType;
+
+    const char* dbgStateStr() const;
+    static const char* dbgSourceStr(Source s);
+
+    bool mMustRecompose;
+};
+
+// ---------------------------------------------------------------------------
+} // namespace android
+// ---------------------------------------------------------------------------
+
+#endif // ANDROID_SF_VIRTUAL_DISPLAY_SURFACE_H
+
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.h	2015-04-24 19:31:16.000000000 +0000
@@ -23,8 +23,6 @@
 
 namespace android {
 
-class GonkBufferSlot;
-
 class GonkBufferQueueProducer : public BnGraphicBufferProducer,
                             private IBinder::DeathRecipient {
 public:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/nsWindow.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/nsWindow.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gonk/nsWindow.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gonk/nsWindow.h	2015-04-24 19:31:16.000000000 +0000
@@ -23,22 +23,8 @@
 #include "Units.h"
 
 extern nsIntRect gScreenBounds;
-
-namespace mozilla {
-namespace gl {
-class GLContext;
-}
-namespace layers {
-class LayersManager;
-}
-}
-
 class ANativeWindowBuffer;
 
-namespace android {
-class FramebufferNativeWindow;
-}
-
 namespace widget {
 struct InputContext;
 struct InputContextAction;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gtk/nsNativeThemeGTK.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gtk/nsNativeThemeGTK.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gtk/nsNativeThemeGTK.cpp	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gtk/nsNativeThemeGTK.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -597,7 +597,7 @@
       EventStates eventStates = GetContentState(stateFrame, aWidgetType);
 
       aGtkWidgetType = IsIndeterminateProgress(stateFrame, eventStates)
-                         ? (stateFrame->StyleDisplay()->mOrient == NS_STYLE_ORIENT_VERTICAL)
+                         ? IsVerticalProgress(stateFrame)
                            ? MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE
                            : MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE
                          : MOZ_GTK_PROGRESS_CHUNK;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gtk/nsPSPrinters.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gtk/nsPSPrinters.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gtk/nsPSPrinters.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gtk/nsPSPrinters.h	2015-04-24 19:31:17.000000000 +0000
@@ -10,8 +10,6 @@
 #include "nsString.h"
 #include "nsTArray.h"
 
-class nsCUPSShim;
-
 class nsPSPrinterList {
     public:
         nsPSPrinterList();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gtk/nsWindow.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gtk/nsWindow.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/gtk/nsWindow.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/gtk/nsWindow.h	2015-04-24 19:31:17.000000000 +0000
@@ -61,7 +61,6 @@
 
 class gfxASurface;
 class gfxPattern;
-class nsDragService;
 class nsPluginNativeWindowGtk;
 #if defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
 #  define MOZ_HAVE_SHMIMAGE
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/LookAndFeel.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/LookAndFeel.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/LookAndFeel.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/LookAndFeel.h	2015-04-24 19:31:16.000000000 +0000
@@ -12,9 +12,16 @@
 
 #include "nsDebug.h"
 #include "nsColor.h"
+#include "nsTArray.h"
 
 struct gfxFontStyle;
 
+struct LookAndFeelInt
+{
+  int32_t id;
+  int32_t value;
+};
+
 namespace mozilla {
 
 class LookAndFeel
@@ -583,6 +590,13 @@
    * cached data would be released.
    */
   static void Refresh();
+
+  /**
+   * If the implementation is caching values, these accessors allow the
+   * cache to be exported and imported.
+   */
+  static nsTArray<LookAndFeelInt> GetIntCache();
+  static void SetIntCache(const nsTArray<LookAndFeelInt>& aLookAndFeelIntCache);
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/MetroUIUtils.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/MetroUIUtils.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/MetroUIUtils.idl	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/MetroUIUtils.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +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 "nsISupports.idl"
-
-[scriptable, uuid(398fb953-335d-42f1-9e91-e238b56bf4ad)]
-
-interface nsIMetroUIUtils : nsISupports {
-  /**
-   * Obtains the current page URI
-  */
-  attribute AString currentPageURI;
-
-  /**
-   * Obtains the current page title
-  */
-  attribute AString currentPageTitle;
-
-  /**
-   * Determines if the browser has selected content
-  */
-  attribute boolean hasSelectedContent;
-
-  /**
-   * Determines the text that should be shared
-  */
-  attribute AString shareText;
-
-  /**
-   * Determines the HTML that should be shared
-  */
-  attribute AString shareHTML;
-};
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/moz.build	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/moz.build	2015-04-24 19:31:17.000000000 +0000
@@ -85,12 +85,6 @@
     'nsITransferable.idl',
 ]
 
-if CONFIG['MOZ_METRO']:
-    XPIDL_SOURCES += [
-        'MetroUIUtils.idl',
-        'nsIWinMetroUtils.idl',
-    ]
-
 XPIDL_MODULE = 'widget'
 
 EXPORTS += [
@@ -133,6 +127,7 @@
 
 EXPORTS.mozilla.widget += [
     'PuppetBidiKeyboard.h',
+    'WidgetMessageUtils.h',
 ]
 
 UNIFIED_SOURCES += [
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/NativeKeyToDOMKeyName.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/NativeKeyToDOMKeyName.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/NativeKeyToDOMKeyName.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/NativeKeyToDOMKeyName.h	2015-04-24 19:31:16.000000000 +0000
@@ -15,7 +15,7 @@
  * aKeyNameIndex is the widget::KeyNameIndex value.
  */
 
-// Windows (both Desktop and Metro)
+// Windows
 #define KEY_MAP_WIN(aCPPKeyName, aNativeKey)
 #define KEY_MAP_WIN_JPN(aCPPKeyName, aNativeKey)
 #define KEY_MAP_WIN_KOR(aCPPKeyName, aNativeKey)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsAppShellSingleton.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsAppShellSingleton.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsAppShellSingleton.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsAppShellSingleton.h	2015-04-24 19:31:17.000000000 +0000
@@ -28,9 +28,6 @@
  */
 
 #include "nsXULAppAPI.h"
-#if defined(MOZ_METRO) && defined(XP_WIN)
-#include "winrt/MetroAppShell.h"
-#endif
 
 static nsIAppShell *sAppShell;
 
@@ -39,29 +36,13 @@
 {
   NS_ASSERTION(!sAppShell, "already initialized");
 
-#if !defined(MOZ_METRO) || !defined(XP_WIN)
   sAppShell = new nsAppShell();
-#else
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    sAppShell = new MetroAppShell();
-  } else {
-    sAppShell = new nsAppShell();
-  }
-#endif
   if (!sAppShell)
     return NS_ERROR_OUT_OF_MEMORY;
   NS_ADDREF(sAppShell);
 
   nsresult rv;
-#if !defined(MOZ_METRO) || !defined(XP_WIN)
   rv = static_cast<nsAppShell*>(sAppShell)->Init();
-#else
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    rv = static_cast<MetroAppShell*>(sAppShell)->Init();
-  } else {
-    rv = static_cast<nsAppShell*>(sAppShell)->Init();
-  }
-#endif
   if (NS_FAILED(rv)) {
     NS_RELEASE(sAppShell);
     return rv;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsBaseAppShell.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsBaseAppShell.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsBaseAppShell.cpp	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsBaseAppShell.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -31,6 +31,7 @@
   , mSwitchTime(0)
   , mLastNativeEventTime(0)
   , mEventloopNestingState(eEventloopNone)
+  , mRunningSyncSections(false)
   , mRunning(false)
   , mExiting(false)
   , mBlockNativeEvent(false)
@@ -350,6 +351,11 @@
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!mSyncSections.IsEmpty(), "Nothing to do!");
 
+  // We don't support re-entering sync sections. This effectively means that
+  // sync sections may not spin the event loop.
+  MOZ_RELEASE_ASSERT(!mRunningSyncSections);
+  mRunningSyncSections = true;
+
   // We've got synchronous sections. Run all of them that are are awaiting a
   // stable state if aStable is true (i.e. we really are in a stable state).
   // Also run the synchronous sections that are simply waiting for the right
@@ -377,6 +383,7 @@
   }
 
   mSyncSections.SwapElements(pendingSyncSections);
+  mRunningSyncSections = false;
 }
 
 void
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsBaseAppShell.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsBaseAppShell.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsBaseAppShell.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsBaseAppShell.h	2015-04-24 19:31:17.000000000 +0000
@@ -134,6 +134,7 @@
   };
   EventloopNestingState mEventloopNestingState;
   nsTArray<SyncSection> mSyncSections;
+  bool mRunningSyncSections;
   bool mRunning;
   bool mExiting;
   /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsBaseClipboard.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsBaseClipboard.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsBaseClipboard.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsBaseClipboard.h	2015-04-24 19:31:17.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsITransferable.h"
 
 class nsITransferable;
-class nsDataObj;
 class nsIClipboardOwner;
 class nsIWidget;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsBaseDragService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsBaseDragService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsBaseDragService.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsBaseDragService.h	2015-04-24 19:31:17.000000000 +0000
@@ -24,10 +24,8 @@
 
 class nsIContent;
 class nsIDOMNode;
-class nsIFrame;
 class nsPresContext;
 class nsIImageLoadingContent;
-class nsICanvasElementExternal;
 
 namespace mozilla {
 namespace gfx {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsIWidget.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsIWidget.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsIWidget.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsIWidget.h	2015-04-24 19:31:17.000000000 +0000
@@ -28,9 +28,6 @@
 #include "Units.h"
 
 // forward declarations
-class   nsFontMetrics;
-class   nsDeviceContext;
-struct  nsFont;
 class   nsIRollupListener;
 class   imgIContainer;
 class   nsIContent;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsIWinMetroUtils.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsIWinMetroUtils.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsIWinMetroUtils.idl	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsIWinMetroUtils.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +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/. */
-
-#include "nsISupports.idl"
-
-/**
- * Integration with the "Metro"/"Modern" UI environment in Windows 8.
- *
- * Note: browser/metro/base/content/browser.js contains a stub
- * implementation of this interface for non-Windows systems, for testing and
- * development purposes only.
- */
-[scriptable, uuid(319faae0-82ca-4c2f-8a24-2b2445e5a72a)]
-interface nsIWinMetroUtils : nsISupports
-{
-  /**
-   * Determine if the current device has the hardware capabilities to run
-   * in metro mode.
-   */
-  readonly attribute boolean supported;
-
-  /**
-   * Determine if the current browser is running in the metro immersive
-   * environment.
-   */
-  readonly attribute boolean immersive;
-
-  /**
-   * Determine the activation URI
-   */
-  readonly attribute AString activationURI;
-
-  /**
-   * Determine the previous execution state. The possible values of this
-   * attribute are exactly those values in the
-   * Windows::ApplicationModel::Activation enumeration.
-   */
-  readonly attribute long previousExecutionState;
-
-  /**
-   * Helper for our restart logic up in the about flyout. We set this
-   * right before we restart for an update so that MetroAppShell can
-   * communicate this to the ceh.
-   */
-  attribute boolean updatePending;
-
-  /*
-   * Determine if metro firefox is running in the foreground.
-   */
-  readonly attribute boolean foreground;
-
-   /**
-    * Show the settings flyout
-    */
-   void showSettingsFlyout();
-
-  /**
-   * Launches the specified application with the specified arguments and
-   * switches to Desktop mode if in metro mode.
-   */
-   void launchInDesktop(in AString aPath, in AString aArguments); 
-
-  /**
-   * Displays a native Windows 8 toast.
-   *
-   * @param aAppId  Application ID for current application.
-   *                If using Metro mode, it can be null string.
-   */
-   void showNativeToast(in AString aTitle, in AString aMessage,
-                        in AString anImage, in AString aCookie,
-                        [optional] in AString aAppId);
-
-  /**
-   * Secondary tiles are a Windows 8 specific feature for pinning new tiles
-   * to the start screen.   Tiles can later be activated whether the browser is
-   * already opened or not. 
-   */
-
-  /**
-   * Pins a new tile to the Windows 8 start screen.
-   * 
-   * @param aTileID         An ID which can later be used to remove the tile
-   *                        ID must only contain valid filesystem characters
-   * @param aShortName      A short name for the tile
-   * @param aDiplayName     The name that will be displayed on the tile
-   * @param aActivationArgs The arguments to pass to the browser upon 
-   *                        activation of the tile
-   * @param aTileImage An image for the normal tile view
-   * @param aSmallTileImage An image for the small tile view
-   */
-  void pinTileAsync(in AString aTileID,
-                    in AString aShortName,
-                    in AString aDisplayName,
-                    in AString aActivationArgs,
-                    in AString aTileImage,
-                    in AString aSmallTileImage);
-
-  /**
-   * Unpins a tile from the Windows 8 start screen.
-   * 
-   * @param aTileID An existing ID which was previously pinned
-   *                ID must only contain valid filesystem characters
-   */
-  void unpinTileAsync(in AString aTileID);
-
-  /**
-   * Determines if a tile is pinned to the Windows 8 start screen.
-   * 
-   * @param aTileID An ID which may have been pinned with pinTileAsync
-   *                ID must only contain valid filesystem characters
-   * @return true if the tile is pinned
-   */
-  bool isTilePinned(in AString aTileID);
-
-  /**
-   * Soft keyboard attributes. Used in unison with shown/hidden observer
-   * events sent via FrameworkView.
-   *
-   * keyboardVisible - returns true if the soft keyboard is currently
-   * displayed, false otherwise.
-   * keyboardX, keyboardY, keyboardWidth, keyboardHeight - occlude rect
-   * of the keyboard when displayed in device independent pixels.
-   */
-  readonly attribute boolean keyboardVisible;
-  readonly attribute unsigned long keyboardX;
-  readonly attribute unsigned long keyboardY;
-  readonly attribute unsigned long keyboardWidth;
-  readonly attribute unsigned long keyboardHeight;
-
-  /**
-   * Settings panel links. addSettingsPanelEntry adds an entry to
-   * the settings flyout panel that the user can invoke.
-   *
-   * @param aChromePanelId panel id invoked via nsIBrowserDOMWindow's
-   * ShowPanel api. Example: 'prefs-container'
-   * @return a unique identifier that will be passed as "data" in the
-   * "metro-settings-entry-selected" notification when the entry is clicked
-   */
-  unsigned long addSettingsPanelEntry(in AString aLabel);
-
-  /**
-   * Change the value of the "switch primary and secondary buttons" preference.
-   * See the Windows SwapMouseButton API docs for details.
-   * Included here for use in automated tests (see bug 839460).
-   *
-   * @param aSwap true to enable the preference, false to disable it.
-   * @return original value of the preference.
-   */
-  bool swapMouseButton(in bool aSwap);
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsNativeTheme.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsNativeTheme.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsNativeTheme.cpp	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsNativeTheme.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -557,15 +557,28 @@
 bool
 nsNativeTheme::IsVerticalProgress(nsIFrame* aFrame)
 {
-  return aFrame &&
-         aFrame->StyleDisplay()->mOrient == NS_STYLE_ORIENT_VERTICAL;
+  if (!aFrame) {
+    return false;
+  }
+  return IsVerticalMeter(aFrame);
 }
 
 bool
 nsNativeTheme::IsVerticalMeter(nsIFrame* aFrame)
 {
   NS_PRECONDITION(aFrame, "You have to pass a non-null aFrame");
-  return aFrame->StyleDisplay()->mOrient == NS_STYLE_ORIENT_VERTICAL;
+  switch (aFrame->StyleDisplay()->mOrient) {
+    case NS_STYLE_ORIENT_HORIZONTAL:
+      return false;
+    case NS_STYLE_ORIENT_VERTICAL:
+      return true;
+    case NS_STYLE_ORIENT_INLINE:
+      return aFrame->GetWritingMode().IsVertical();
+    case NS_STYLE_ORIENT_BLOCK:
+      return !aFrame->GetWritingMode().IsVertical();
+  }
+  NS_NOTREACHED("unexpected -moz-orient value");
+  return false;
 }
 
 // menupopup:
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsPrintOptionsImpl.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsPrintOptionsImpl.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsPrintOptionsImpl.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsPrintOptionsImpl.h	2015-04-24 19:31:17.000000000 +0000
@@ -15,7 +15,6 @@
 #include "nsFont.h"
 
 class nsIPrintSettings;
-class nsIWebBrowserPrint;
 
 /**
  *   Class nsPrintOptions
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsTransferable.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsTransferable.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsTransferable.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsTransferable.h	2015-04-24 19:31:17.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsWeakPtr.h"
 
 class nsString;
-class nsDataObj;
 
 //
 // DataStruct
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsWidgetsCID.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsWidgetsCID.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsWidgetsCID.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsWidgetsCID.h	2015-04-24 19:31:17.000000000 +0000
@@ -126,10 +126,6 @@
 #define NS_WIN_JUMPLISTBUILDER_CID \
 { 0x73a5946f, 0x608d, 0x454f, { 0x9d, 0x33, 0xb, 0x8f, 0x8c, 0x72, 0x94, 0xb6 } }
 
-// {DE95B8C9-F0E8-4AD5-95A2-06C12F53EC2E}
-#define NS_WIN_METROUTILS_CID \
-{ 0xde95b8c9, 0xf0e8, 0x4ad5, { 0x95, 0xa2, 0x06, 0xc1, 0x2f, 0x53, 0xec, 0x2e }}
-
 // {2B9A1F2C-27CE-45b6-8D4E-755D0E34F8DB}
 #define NS_WIN_JUMPLISTITEM_CID \
 { 0x2b9a1f2c, 0x27ce, 0x45b6, { 0x8d, 0x4e, 0x75, 0x5d, 0x0e, 0x34, 0xf8, 0xdb } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsXPLookAndFeel.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsXPLookAndFeel.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsXPLookAndFeel.cpp	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsXPLookAndFeel.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsFont.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/widget/WidgetMessageUtils.h"
 
 #include "gfxPlatform.h"
 #include "qcms.h"
@@ -453,6 +454,15 @@
   if (NS_SUCCEEDED(Preferences::GetBool("ui.use_native_colors", &val))) {
     sUseNativeColors = val;
   }
+
+  if (XRE_GetProcessType() == GeckoProcessType_Content) {
+    mozilla::dom::ContentChild* cc =
+      mozilla::dom::ContentChild::GetSingleton();
+
+    nsTArray<LookAndFeelInt> lookAndFeelIntCache;
+    cc->SendGetLookAndFeelCache(lookAndFeelIntCache);
+    LookAndFeel::SetIntCache(lookAndFeelIntCache);
+  }
 }
 
 nsXPLookAndFeel::~nsXPLookAndFeel()
@@ -703,6 +713,12 @@
     sCachedColorBits[i] = 0;
 }
 
+nsTArray<LookAndFeelInt>
+nsXPLookAndFeel::GetIntCacheImpl()
+{
+  return nsTArray<LookAndFeelInt>();
+}
+
 namespace mozilla {
 
 // static
@@ -763,4 +779,18 @@
   nsLookAndFeel::GetInstance()->RefreshImpl();
 }
 
+// static
+nsTArray<LookAndFeelInt>
+LookAndFeel::GetIntCache()
+{
+  return nsLookAndFeel::GetInstance()->GetIntCacheImpl();
+}
+
+// static
+void
+LookAndFeel::SetIntCache(const nsTArray<LookAndFeelInt>& aLookAndFeelIntCache)
+{
+  return nsLookAndFeel::GetInstance()->SetIntCacheImpl(aLookAndFeelIntCache);
+}
+
 } // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsXPLookAndFeel.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsXPLookAndFeel.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/nsXPLookAndFeel.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/nsXPLookAndFeel.h	2015-04-24 19:31:17.000000000 +0000
@@ -7,6 +7,7 @@
 #define __nsXPLookAndFeel
 
 #include "mozilla/LookAndFeel.h"
+#include "nsTArray.h"
 
 class nsLookAndFeel;
 
@@ -79,6 +80,9 @@
     return 600;
   }
 
+  virtual nsTArray<LookAndFeelInt> GetIntCacheImpl();
+  virtual void SetIntCacheImpl(const nsTArray<LookAndFeelInt>& aLookAndFeelIntCache) {}
+
 protected:
   nsXPLookAndFeel();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/PuppetWidget.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/PuppetWidget.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/PuppetWidget.h	2015-04-22 13:06:19.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/PuppetWidget.h	2015-04-24 19:31:16.000000000 +0000
@@ -24,8 +24,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
 
-class gfxASurface;
-
 namespace mozilla {
 
 namespace dom {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/qt/nsWindow.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/qt/nsWindow.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/qt/nsWindow.h	2015-04-22 13:06:20.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/qt/nsWindow.h	2015-04-24 19:31:17.000000000 +0000
@@ -59,7 +59,6 @@
 
 #endif /* MOZ_LOGGING */
 
-class nsIdleService;
 class QCloseEvent;
 class QFocusEvent;
 class QHideEvent;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/tests/chrome.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/tests/chrome.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/tests/chrome.ini	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/tests/chrome.ini	2015-04-24 19:31:17.000000000 +0000
@@ -83,7 +83,7 @@
 [test_plugin_input_event.html]
 skip-if = toolkit != "windows"
 [test_mouse_scroll.xul]
-skip-if = true
+skip-if = toolkit != "windows"
 support-files = window_mouse_scroll_win.html
 
 # Privacy relevant
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/tests/test_assign_event_data.html thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/tests/test_assign_event_data.html
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/tests/test_assign_event_data.html	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/tests/test_assign_event_data.html	2015-04-24 19:31:17.000000000 +0000
@@ -29,6 +29,31 @@
         margin-left: 0;
       }
     }
+    #pointer-target {
+      border: 1px dashed red;
+      background: yellow;
+      margin: 0px 10px;
+      padding: 0px 10px;
+    }
+    #scrollable-div {
+      background: green;
+      overflow: auto;
+      width: 30px;
+      height: 30px;
+    }
+    #scrolled-div {
+      background: magenta;
+      width: 10px;
+      height: 10px;
+    }
+    #form {
+      background: silver;
+      padding: 0px 10px;
+    }
+    #animated-div {
+      background: cyan;
+      padding: 0px 10px;
+    }
   </style>
 </head>
 <body>
@@ -36,9 +61,10 @@
   <input id="input-text">
   <button id="button">button</button>
   <a id="a" href="about:blank">hyper link</a>
-  <div id="scrollable-div" style="overflow: auto; width: 30px; height: 30px;"><div id="scrolled-div" style="width: 10px; height: 10px;"></div></div>
-  <form id="form"></form>
-  <div id="animated-div"></div>
+  <span id="pointer-target">span</span>
+  <div id="scrollable-div"><div id="scrolled-div"></div></div>
+  <form id="form">form</form>
+  <div id="animated-div">&nbsp;</div>
 </div>
 <div id="content" style="display: none">
 </div>
@@ -48,7 +74,7 @@
 <script class="testbody" type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
-SimpleTest.expectAssertions(0, 32);
+SimpleTest.expectAssertions(0, 34);
 
 const kIsMac = (navigator.platform.indexOf("Mac") == 0);
 const kIsWin = (navigator.platform.indexOf("Win") == 0);
@@ -566,6 +592,32 @@
     },
     todoMismatch: [],
   },
+  { description: "PointerEvent (pointerdown)",
+    targetID: "pointer-target", eventType: "pointerdown",
+    dispatchEvent: function () {
+      var elem = document.getElementById(this.targetID);
+      var rect = elem.getBoundingClientRect();
+      synthesizePointer(elem, rect.width/2, rect.height/2,
+                        { type: this.eventType, button: 1, clickCount: 1, inputSource: 2, pressure: 0.25, isPrimary: true });
+    },
+    canRun: function () {
+      return true;
+    },
+    todoMismatch: [],
+  },
+  { description: "PointerEvent (pointerup)",
+    targetID: "pointer-target", eventType: "pointerup",
+    dispatchEvent: function () {
+      var elem = document.getElementById(this.targetID);
+      var rect = elem.getBoundingClientRect();
+      synthesizePointer(elem, rect.width/2, rect.height/2,
+                        { type: this.eventType, button: -1, ctrlKey: true, shiftKey: true, altKey: true, isSynthesized: false });
+    },
+    canRun: function () {
+      return true;
+    },
+    todoMismatch: [],
+  },
 ];
 
 function doTest(aTest)
@@ -638,7 +690,7 @@
 function init()
 {
   SpecialPowers.pushPrefEnv({"set":[["middlemouse.contentLoadURL", false],
-  			            ["middlemouse.paste", false],
+                                    ["middlemouse.paste", false],
                                     ["general.autoScroll", false],
                                     ["mousewheel.default.action", 0],
                                     ["mousewheel.default.action.override_x", -1],
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/WidgetMessageUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/WidgetMessageUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/WidgetMessageUtils.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/WidgetMessageUtils.h	2015-04-24 19:31:16.000000000 +0000
@@ -0,0 +1,39 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozilla_WidgetMessageUtils_h
+#define mozilla_WidgetMessageUtils_h
+
+#include "ipc/IPCMessageUtils.h"
+#include "mozilla/LookAndFeel.h"
+
+namespace IPC {
+
+template<>
+struct ParamTraits<LookAndFeelInt>
+{
+  typedef LookAndFeelInt paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam)
+  {
+    WriteParam(aMsg, aParam.id);
+    WriteParam(aMsg, aParam.value);
+  }
+
+  static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
+  {
+    int32_t id, value;
+    if (ReadParam(aMsg, aIter, &id) &&
+        ReadParam(aMsg, aIter, &value)) {
+      aResult->id = id;
+      aResult->value = value;
+      return true;
+    }
+    return false;
+  }
+};
+
+} // namespace IPC
+
+#endif // WidgetMessageUtils_h
\ No newline at end of file
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/KeyboardLayout.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/KeyboardLayout.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/KeyboardLayout.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/KeyboardLayout.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -299,11 +299,6 @@
                aMouseEvent.mClass == eSimpleGestureEventClass,
                "called with non-mouse event");
 
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    // Buttons for immersive mode are handled in MetroInput.
-    return;
-  }
-
   WidgetMouseEventBase& mouseEvent = *aMouseEvent.AsMouseEventBase();
   mouseEvent.buttons = 0;
   if (::GetKeyState(VK_LBUTTON) < 0) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/KeyboardLayout.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/KeyboardLayout.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/KeyboardLayout.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/KeyboardLayout.h	2015-04-24 19:31:17.000000000 +0000
@@ -37,7 +37,6 @@
 #define VK_OEM_CLEAR            0xFE
 
 class nsIIdleServiceInternal;
-struct nsModifierKeyState;
 
 namespace mozilla {
 namespace widget {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/moz.build	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/moz.build	2015-04-24 19:31:17.000000000 +0000
@@ -4,9 +4,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/.
 
-if CONFIG['MOZ_METRO']:
-    DIRS += ['winrt']
-
 TEST_DIRS += ['tests']
 
 EXPORTS += [
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsClipboard.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsClipboard.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsClipboard.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsClipboard.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -294,9 +294,6 @@
       result = NS_OK;
     }
   } else {
-#ifdef MOZ_METRO
-    return result;
-#endif
     // We really shouldn't ever get here
     // but just in case
     *aData = nullptr;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsClipboard.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsClipboard.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsClipboard.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsClipboard.h	2015-04-24 19:31:17.000000000 +0000
@@ -12,7 +12,6 @@
 #include <windows.h>
 
 class nsITransferable;
-class nsIClipboardOwner;
 class nsIWidget;
 class nsIFile;
 struct IDataObject;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsDataObjCollection.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsDataObjCollection.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsDataObjCollection.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsDataObjCollection.h	2015-04-24 19:31:17.000000000 +0000
@@ -14,8 +14,6 @@
 #include "nsDataObj.h"
 #include "mozilla/Attributes.h"
 
-class CEnumFormatEtc;
-
 #define MULTI_MIME "Mozilla/IDataObjectCollectionFormat"
 
 EXTERN_C const IID IID_IDataObjCollection;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsDragService.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsDragService.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsDragService.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsDragService.h	2015-04-24 19:31:17.000000000 +0000
@@ -10,11 +10,8 @@
 #include <windows.h>
 #include <shlobj.h>
 
-struct IDropSource;
 struct IDataObject;
-class  nsNativeDragTarget;
 class  nsDataObjCollection;
-class  nsString;
 
 /**
  * Native Win32 DragService wrapper
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsLookAndFeel.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsLookAndFeel.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsLookAndFeel.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsLookAndFeel.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -480,11 +480,10 @@
         aResult = 0;
         break;
     case eIntID_ColorPickerAvailable:
-        // We don't have a color picker implemented on Metro yet (bug 895464)
-        aResult = (XRE_GetWindowsEnvironment() != WindowsEnvironmentType_Metro);
+        aResult = true;
         break;
     case eIntID_UseOverlayScrollbars:
-        aResult = (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro);
+        aResult = false;
         break;
     case eIntID_AllowOverlayScrollbarsOverlap:
         aResult = 0;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsNativeDragTarget.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsNativeDragTarget.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsNativeDragTarget.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsNativeDragTarget.h	2015-04-24 19:31:17.000000000 +0000
@@ -20,8 +20,6 @@
 class nsIDragService;
 class nsIWidget;
 
-struct IDataObject;
-
 /*
  * nsNativeDragTarget implements the IDropTarget interface and gets most of its
  * behavior from the associated adapter (m_dragDrop).
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsTextStore.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsTextStore.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsTextStore.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsTextStore.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -10,9 +10,6 @@
 
 #include "nscore.h"
 #include "nsWindow.h"
-#ifdef MOZ_METRO
-#include "winrt/MetroWidget.h"
-#endif
 #include "nsPrintfCString.h"
 #include "WinUtils.h"
 #include "mozilla/Preferences.h"
@@ -3413,22 +3410,20 @@
   if (event.mReply.mRect.height <= 0)
     event.mReply.mRect.height = 1;
 
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Desktop) {
-    // convert to unclipped screen rect
-    nsWindow* refWindow = static_cast<nsWindow*>(
-      event.mReply.mFocusedWidget ? event.mReply.mFocusedWidget : mWidget);
-    // Result rect is in top level widget coordinates
-    refWindow = refWindow->GetTopLevelWindow(false);
-    if (!refWindow) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
-             ("TSF: 0x%p   nsTextStore::GetTextExt() FAILED due to "
-              "no top level window", this));
-      return E_FAIL;
-    }
-
-    event.mReply.mRect.MoveBy(refWindow->WidgetToScreenOffset());
+  // convert to unclipped screen rect
+  nsWindow* refWindow = static_cast<nsWindow*>(
+    event.mReply.mFocusedWidget ? event.mReply.mFocusedWidget : mWidget);
+  // Result rect is in top level widget coordinates
+  refWindow = refWindow->GetTopLevelWindow(false);
+  if (!refWindow) {
+    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+           ("TSF: 0x%p   nsTextStore::GetTextExt() FAILED due to "
+            "no top level window", this));
+    return E_FAIL;
   }
 
+  event.mReply.mRect.MoveBy(refWindow->WidgetToScreenOffset());
+
   // get bounding screen rect to test for clipping
   if (!GetScreenExtInternal(*prc)) {
     PR_LOG(sTextStoreLog, PR_LOG_ERROR,
@@ -3524,50 +3519,36 @@
     return false;
   }
 
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    nsIntRect boundRect;
-    if (NS_FAILED(mWidget->GetClientBounds(boundRect))) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
-             ("TSF: 0x%p   nsTextStore::GetScreenExtInternal() FAILED due to "
-              "failed to get the client bounds", this));
-      return false;
-    }
-    ::SetRect(&aScreenExt, boundRect.x, boundRect.y,
-              boundRect.XMost(), boundRect.YMost());
-  } else {
-    NS_ASSERTION(XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Desktop,
-                 "environment isn't WindowsEnvironmentType_Desktop!");
-    nsWindow* refWindow = static_cast<nsWindow*>(
-      event.mReply.mFocusedWidget ?
-        event.mReply.mFocusedWidget : mWidget);
-    // Result rect is in top level widget coordinates
-    refWindow = refWindow->GetTopLevelWindow(false);
-    if (!refWindow) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
-             ("TSF: 0x%p   nsTextStore::GetScreenExtInternal() FAILED due to "
-              "no top level window", this));
-      return false;
-    }
+  nsWindow* refWindow = static_cast<nsWindow*>(
+    event.mReply.mFocusedWidget ?
+      event.mReply.mFocusedWidget : mWidget);
+  // Result rect is in top level widget coordinates
+  refWindow = refWindow->GetTopLevelWindow(false);
+  if (!refWindow) {
+    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+           ("TSF: 0x%p   nsTextStore::GetScreenExtInternal() FAILED due to "
+            "no top level window", this));
+    return false;
+  }
 
-    nsIntRect boundRect;
-    if (NS_FAILED(refWindow->GetClientBounds(boundRect))) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
-             ("TSF: 0x%p   nsTextStore::GetScreenExtInternal() FAILED due to "
-              "failed to get the client bounds", this));
-      return false;
-    }
+  nsIntRect boundRect;
+  if (NS_FAILED(refWindow->GetClientBounds(boundRect))) {
+    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+           ("TSF: 0x%p   nsTextStore::GetScreenExtInternal() FAILED due to "
+            "failed to get the client bounds", this));
+    return false;
+  }
 
-    boundRect.MoveTo(0, 0);
+  boundRect.MoveTo(0, 0);
 
-    // Clip frame rect to window rect
-    boundRect.IntersectRect(LayoutDevicePixel::ToUntyped(event.mReply.mRect), boundRect);
-    if (!boundRect.IsEmpty()) {
-      boundRect.MoveBy(refWindow->WidgetToScreenOffsetUntyped());
-      ::SetRect(&aScreenExt, boundRect.x, boundRect.y,
-                boundRect.XMost(), boundRect.YMost());
-    } else {
-      ::SetRectEmpty(&aScreenExt);
-    }
+  // Clip frame rect to window rect
+  boundRect.IntersectRect(LayoutDevicePixel::ToUntyped(event.mReply.mRect), boundRect);
+  if (!boundRect.IsEmpty()) {
+    boundRect.MoveBy(refWindow->WidgetToScreenOffsetUntyped());
+    ::SetRect(&aScreenExt, boundRect.x, boundRect.y,
+              boundRect.XMost(), boundRect.YMost());
+  } else {
+    ::SetRectEmpty(&aScreenExt);
   }
 
   PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
@@ -4498,11 +4479,6 @@
 void
 nsTextStore::CreateNativeCaret()
 {
-  // This method must work only on desktop application.
-  if (XRE_GetWindowsEnvironment() != WindowsEnvironmentType_Desktop) {
-    return;
-  }
-
   PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::CreateNativeCaret(), "
           "mComposition.IsComposing()=%s",
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsTextStore.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsTextStore.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsTextStore.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsTextStore.h	2015-04-24 19:31:17.000000000 +0000
@@ -38,10 +38,6 @@
 struct ITfDisplayAttributeMgr;
 struct ITfCategoryMgr;
 class nsWindow;
-#ifdef MOZ_METRO
-class MetroWidget;
-#endif
-class TSFStaticSink;
 
 namespace mozilla {
 namespace widget {
@@ -297,7 +293,7 @@
   // application.  Otherwise, this does nothing.
   void     CreateNativeCaret();
 
-  // Holds the pointer to our current win32 or metro widget
+  // Holds the pointer to our current win32 widget
   nsRefPtr<nsWindowBase>       mWidget;
   // Document manager for the currently focused editor
   nsRefPtr<ITfDocumentMgr>     mDocumentMgr;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsWidgetFactory.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsWidgetFactory.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsWidgetFactory.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsWidgetFactory.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -31,13 +31,6 @@
 #include "nsWindow.h"
 // Content processes
 #include "nsFilePickerProxy.h"
-// Metro
-#ifdef MOZ_METRO
-#include "winrt/MetroAppShell.h"
-#include "winrt/MetroWidget.h"
-#include "winrt/nsMetroFilePicker.h"
-#include "winrt/nsWinMetroUtils.h"
-#endif
 
 // Drag & Drop, Clipboard
 #include "nsClipboardHelper.h"
@@ -68,18 +61,7 @@
   if (aOuter != nullptr) {
     return NS_ERROR_NO_AGGREGATION;
   }
-  nsCOMPtr<nsIWidget> widget;
-
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-#ifdef MOZ_METRO
-    widget = new MetroWidget;
-#else
-    NS_RUNTIMEABORT("build does not support metro.");
-#endif
-  } else {
-    widget = new nsWindow;
-  }
-
+  nsCOMPtr<nsIWidget> widget = new nsWindow;
   return widget->QueryInterface(aIID, aResult);
 }
 
@@ -91,14 +73,7 @@
   if (aOuter != nullptr) {
     return NS_ERROR_NO_AGGREGATION;
   }
-  nsCOMPtr<nsIWidget> widget;
-
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    return NS_NOINTERFACE;
-  } else {
-    widget = new ChildWindow;
-  }
-
+  nsCOMPtr<nsIWidget> widget = new ChildWindow;
   return widget->QueryInterface(aIID, aResult);
 }
 
@@ -110,17 +85,7 @@
   if (aOuter != nullptr) {
     return NS_ERROR_NO_AGGREGATION;
   }
-  nsCOMPtr<nsIFilePicker> picker;
-
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-#ifdef MOZ_METRO
-    picker = new nsMetroFilePicker;
-#else
-    NS_RUNTIMEABORT("build does not support metro.");
-#endif
-  } else {
-    picker = new nsFilePicker;
-  }
+  nsCOMPtr<nsIFilePicker> picker = new nsFilePicker;
   return picker->QueryInterface(aIID, aResult);
 }
 
@@ -132,20 +97,7 @@
   if (aOuter != nullptr) {
     return NS_ERROR_NO_AGGREGATION;
   }
-  nsCOMPtr<nsIColorPicker> picker;
-
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-#ifdef MOZ_METRO
-    // TODO
-    // picker = new nsMetroColorPicker;
-    NS_ERROR("metro color picker isn't implemented currently");
-    return NS_ERROR_NO_INTERFACE;
-#else
-    NS_RUNTIMEABORT("build does not support metro.");
-#endif
-  } else {
-    picker = new nsColorPicker;
-  }
+  nsCOMPtr<nsIColorPicker> picker = new nsColorPicker;
   return picker->QueryInterface(aIID, aResult);
 }
 
@@ -164,9 +116,6 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
-#ifdef MOZ_METRO
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsWinMetroUtils)
-#endif
 #ifdef NS_PRINTING
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsWin, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrinterEnumeratorWin)
@@ -201,9 +150,6 @@
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSEPARATOR_CID);
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTLINK_CID);
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSHORTCUT_CID);
-#ifdef MOZ_METRO
-NS_DEFINE_NAMED_CID(NS_WIN_METROUTILS_CID);
-#endif
 NS_DEFINE_NAMED_CID(NS_DRAGSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_BIDIKEYBOARD_CID);
 #ifdef NS_PRINTING
@@ -238,9 +184,6 @@
   { &kNS_WIN_JUMPLISTSHORTCUT_CID, false, nullptr, JumpListShortcutConstructor },
   { &kNS_DRAGSERVICE_CID, false, nullptr, nsDragServiceConstructor, Module::MAIN_PROCESS_ONLY },
   { &kNS_BIDIKEYBOARD_CID, false, nullptr, nsBidiKeyboardConstructor },
-#ifdef MOZ_METRO
-  { &kNS_WIN_METROUTILS_CID, false, nullptr, nsWinMetroUtilsConstructor },
-#endif
 #ifdef NS_PRINTING
   { &kNS_PRINTSETTINGSSERVICE_CID, false, nullptr, nsPrintOptionsWinConstructor },
   { &kNS_PRINTER_ENUMERATOR_CID, false, nullptr, nsPrinterEnumeratorWinConstructor },
@@ -273,9 +216,6 @@
   { "@mozilla.org/windows-jumplistshortcut;1", &kNS_WIN_JUMPLISTSHORTCUT_CID },
   { "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID, Module::MAIN_PROCESS_ONLY },
   { "@mozilla.org/widget/bidikeyboard;1", &kNS_BIDIKEYBOARD_CID },
-#ifdef MOZ_METRO
-  { "@mozilla.org/windows-metroutils;1", &kNS_WIN_METROUTILS_CID },
-#endif
 #ifdef NS_PRINTING
   { "@mozilla.org/gfx/printsettings-service;1", &kNS_PRINTSETTINGSSERVICE_CID },
   { "@mozilla.org/gfx/printerenumerator;1", &kNS_PRINTER_ENUMERATOR_CID },
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsWindow.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsWindow.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsWindow.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsWindow.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -1297,11 +1297,6 @@
 
 void nsWindow::ConfigureAPZCTreeManager()
 {
-  // We currently only enable APZ for E10s windows.
-  if (!mozilla::BrowserTabsRemoteAutostart() || !mRequireOffMainThreadCompositing) {
-    return;
-  }
-
   nsBaseWidget::ConfigureAPZCTreeManager();
 
   // When APZ is enabled, we can actually enable raw touch events because we
@@ -5398,23 +5393,6 @@
     }
     break;
 
-    case WM_SETTINGCHANGE:
-      if (IsWin8OrLater() && lParam &&
-          !wcsicmp(L"ConvertibleSlateMode", (wchar_t*)lParam)) {
-        // If we're switching into slate mode, switch to Metro for hardware
-        // that supports this feature if the pref is set.
-        if (GetSystemMetrics(SM_CONVERTIBLESLATEMODE) == 0 &&
-            Preferences::GetBool("browser.shell.desktop-auto-switch-enabled",
-                                 false)) {
-          nsCOMPtr<nsIAppStartup> appStartup(do_GetService(NS_APPSTARTUP_CONTRACTID));
-          if (appStartup) {
-            appStartup->Quit(nsIAppStartup::eForceQuit |
-                             nsIAppStartup::eRestartTouchEnvironment);
-          }
-        }
-      }
-    break;
-
     default:
     {
       if (msg == nsAppShell::GetTaskbarButtonCreatedMessage()) {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsWindow.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsWindow.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/nsWindow.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/nsWindow.h	2015-04-24 19:31:17.000000000 +0000
@@ -49,14 +49,12 @@
 
 class nsNativeDragTarget;
 class nsIRollupListener;
-class nsIFile;
 class nsIntRegion;
 class imgIContainer;
 
 namespace mozilla {
 namespace widget {
 class NativeKey;
-class ModifierKeyState;
 struct MSGResult;
 } // namespace widget
 } // namespacw mozilla;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/WinMouseScrollHandler.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/WinMouseScrollHandler.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/WinMouseScrollHandler.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/WinMouseScrollHandler.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -1086,11 +1086,6 @@
 void
 MouseScrollHandler::Device::Init()
 {
-  // Not supported in metro mode.
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    return;
-  }
-
   sFakeScrollableWindowNeeded =
     GetWorkaroundPref("ui.trackpoint_hack.enabled",
                       (TrackPoint::IsDriverInstalled() ||
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/APZController.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/APZController.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/APZController.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/APZController.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,314 +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 "APZController.h"
-#include "base/message_loop.h"
-#include "mozilla/layers/GeckoContentController.h"
-#include "nsThreadUtils.h"
-#include "MetroUtils.h"
-#include "nsPrintfCString.h"
-#include "mozilla/layers/APZCCallbackHelper.h"
-#include "nsIDocument.h"
-#include "nsPresContext.h"
-#include "nsIDOMElement.h"
-#include "mozilla/dom/Element.h"
-#include "nsIDOMWindowUtils.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsLayoutUtils.h"
-#include "mozilla/TouchEvents.h"
-
-//#define DEBUG_CONTROLLER 1
-
-#ifdef DEBUG_CONTROLLER
-#include "WinUtils.h"
-using namespace mozilla::widget;
-#endif
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-nsRefPtr<mozilla::layers::APZCTreeManager> APZController::sAPZC;
-
-/*
- * Metro layout specific - test to see if a sub document is a
- * tab.
- */
-static bool
-IsTab(nsCOMPtr<nsIDocument>& aSubDocument)
-{
-  nsRefPtr<nsIDocument> parent = aSubDocument->GetParentDocument();
-  if (!parent) {
-    NS_WARNING("huh? IsTab should always get a sub document for a parameter");
-    return false;
-  }
-  return parent->IsRootDisplayDocument();
-}
-
-/*
- * Returns the sub document associated with the scroll id.
- */
-static bool
-GetDOMTargets(uint64_t aScrollId,
-              nsCOMPtr<nsIDocument>& aSubDocument,
-              nsCOMPtr<nsIContent>& aTargetContent)
-{
-  // For tabs and subframes this will return the HTML sub document
-  aTargetContent = nsLayoutUtils::FindContentFor(aScrollId);
-  if (!aTargetContent) {
-    return false;
-  }
-  nsCOMPtr<mozilla::dom::Element> domElement = do_QueryInterface(aTargetContent);
-  if (!domElement) {
-    return false;
-  }
-
-  aSubDocument = domElement->OwnerDoc();
-
-  if (!aSubDocument) {
-    return false;
-  }
-
-  // If the root element equals domElement, FindElementWithViewId found
-  // a document, vs. an element within a document.
-  if (aSubDocument->GetRootElement() == domElement && IsTab(aSubDocument)) {
-    aTargetContent = nullptr;
-  }
-
-  return true;
-}
-
-void
-APZController::SetPendingResponseFlusher(APZPendingResponseFlusher* aFlusher)
-{
-  mFlusher = aFlusher;
-}
-
-void
-APZController::ContentReceivedInputBlock(const uint64_t aInputBlockId, bool aPreventDefault)
-{
-  if (!sAPZC) {
-    return;
-  }
-  sAPZC->ContentReceivedInputBlock(aInputBlockId, aPreventDefault);
-}
-
-bool
-APZController::HitTestAPZC(ScreenIntPoint& aPoint)
-{
-  if (!sAPZC) {
-    return false;
-  }
-  return sAPZC->HitTestAPZC(aPoint);
-}
-
-void
-APZController::TransformCoordinateToGecko(const ScreenIntPoint& aPoint,
-                                          LayoutDeviceIntPoint* aRefPointOut)
-{
-  if (!sAPZC || !aRefPointOut) {
-    return;
-  }
-  sAPZC->TransformCoordinateToGecko(aPoint, aRefPointOut);
-}
-
-nsEventStatus
-APZController::ReceiveInputEvent(WidgetInputEvent* aEvent,
-                                 ScrollableLayerGuid* aOutTargetGuid,
-                                 uint64_t* aOutInputBlockId)
-{
-  MOZ_ASSERT(aEvent);
-
-  if (!sAPZC) {
-    return nsEventStatus_eIgnore;
-  }
-  return sAPZC->ReceiveInputEvent(*aEvent->AsInputEvent(), aOutTargetGuid, aOutInputBlockId);
-}
-
-// APZC sends us this request when we need to update the display port on
-// the scrollable frame the apzc is managing.
-void
-APZController::RequestContentRepaint(const FrameMetrics& aFrameMetrics)
-{
-#ifdef DEBUG_CONTROLLER
-  WinUtils::Log("APZController::RequestContentRepaint scrollid=%I64d",
-    aFrameMetrics.GetScrollId());
-#endif
-
-  // This must be on the gecko thread since we access the dom
-  MOZ_ASSERT(NS_IsMainThread());
-
-#ifdef DEBUG_CONTROLLER
-  WinUtils::Log("APZController: mScrollOffset: %f %f", aFrameMetrics.mScrollOffset.x,
-    aFrameMetrics.mScrollOffset.y);
-#endif
-
-  nsCOMPtr<nsIDocument> subDocument;
-  nsCOMPtr<nsIContent> targetContent;
-  if (!GetDOMTargets(aFrameMetrics.GetScrollId(),
-                     subDocument, targetContent)) {
-    return;
-  }
-
-  // If we're dealing with a sub frame or content editable element,
-  // call UpdateSubFrame.
-  if (targetContent) {
-#ifdef DEBUG_CONTROLLER
-    WinUtils::Log("APZController: detected subframe or content editable");
-#endif
-    FrameMetrics metrics = aFrameMetrics;
-    mozilla::layers::APZCCallbackHelper::UpdateSubFrame(targetContent, metrics);
-    return;
-  }
-
-#ifdef DEBUG_CONTROLLER
-  WinUtils::Log("APZController: detected tab");
-#endif
-
-  // We're dealing with a tab, call UpdateRootFrame.
-  FrameMetrics metrics = aFrameMetrics;
-  if (subDocument->GetShell()) {
-    mozilla::layers::APZCCallbackHelper::UpdateRootFrame(subDocument->GetShell(), metrics);
-  }
-
-#ifdef DEBUG_CONTROLLER
-  WinUtils::Log("APZController: %I64d mDisplayPortMargins: %0.2f %0.2f %0.2f %0.2f",
-    metrics.GetScrollId(),
-    metrics.GetDisplayPortMargins().left,
-    metrics.GetDisplayPortMargins().top,
-    metrics.GetDisplayPortMargins().right,
-    metrics.GetDisplayPortMargins().bottom);
-#endif
-}
-
-void
-APZController::RequestFlingSnap(const FrameMetrics::ViewID& aScrollId,
-                                const mozilla::CSSPoint& aDestination)
-{
-#ifdef DEBUG_CONTROLLER
-  WinUtils::Log("APZController::RequestFlingSnap scrollid=%I64d destination: %lu %lu",
-    aScrollId, aDestination.x, aDestination.y);
-#endif
-  mozilla::layers::APZCCallbackHelper::RequestFlingSnap(aScrollId, aDestination);
-}
-
-void
-APZController::AcknowledgeScrollUpdate(const FrameMetrics::ViewID& aScrollId,
-                                       const uint32_t& aScrollGeneration)
-{
-#ifdef DEBUG_CONTROLLER
-  WinUtils::Log("APZController::AcknowledgeScrollUpdate scrollid=%I64d gen=%lu",
-    aScrollId, aScrollGeneration);
-#endif
-  mozilla::layers::APZCCallbackHelper::AcknowledgeScrollUpdate(aScrollId, aScrollGeneration);
-}
-
-void
-APZController::HandleDoubleTap(const CSSPoint& aPoint,
-                               Modifiers aModifiers,
-                               const ScrollableLayerGuid& aGuid)
-{
-}
-
-void
-APZController::HandleSingleTap(const CSSPoint& aPoint,
-                               Modifiers aModifiers,
-                               const ScrollableLayerGuid& aGuid)
-{
-}
-
-void
-APZController::HandleLongTap(const CSSPoint& aPoint,
-                             Modifiers aModifiers,
-                             const mozilla::layers::ScrollableLayerGuid& aGuid,
-                             uint64_t aInputBlockId)
-{
-  if (mFlusher) {
-    mFlusher->FlushPendingContentResponse();
-  }
-  ContentReceivedInputBlock(aInputBlockId, false);
-}
-
-// requests that we send a mozbrowserasyncscroll domevent. not in use.
-void
-APZController::SendAsyncScrollDOMEvent(bool aIsRoot,
-                                       const CSSRect &aContentRect,
-                                       const CSSSize &aScrollableSize)
-{
-}
-
-void
-APZController::PostDelayedTask(Task* aTask, int aDelayMs)
-{
-  MessageLoop::current()->PostDelayedTask(FROM_HERE, aTask, aDelayMs);
-}
-
-bool
-APZController::GetRootZoomConstraints(ZoomConstraints* aOutConstraints)
-{
-  if (aOutConstraints) {
-    // Until we support the meta-viewport tag properly allow zooming
-    // from 1/4 to 4x by default.
-    aOutConstraints->mAllowZoom = true;
-    aOutConstraints->mAllowDoubleTapZoom = false;
-    aOutConstraints->mMinZoom = CSSToParentLayerScale(0.25f);
-    aOutConstraints->mMaxZoom = CSSToParentLayerScale(4.0f);
-    return true;
-  }
-  return false;
-}
-
-// apzc notifications
-
-class TransformedStartEvent : public nsRunnable
-{
-  NS_IMETHOD Run() {
-    MetroUtils::FireObserver("apzc-transform-start", L"");
-    return NS_OK;
-  }
-};
-
-class TransformedEndEvent : public nsRunnable
-{
-  NS_IMETHOD Run() {
-    MetroUtils::FireObserver("apzc-transform-end", L"");
-    return NS_OK;
-  }
-};
-
-void
-APZController::NotifyAPZStateChange(const ScrollableLayerGuid& aGuid,
-                                    APZStateChange aChange,
-                                    int aArg)
-{
-  switch (aChange) {
-    case APZStateChange::TransformBegin:
-    {
-      if (NS_IsMainThread()) {
-        MetroUtils::FireObserver("apzc-transform-begin", L"");
-        return;
-      }
-      nsCOMPtr<nsIRunnable> runnable = new TransformedStartEvent();
-      NS_DispatchToMainThread(runnable);
-      break;
-    }
-    case APZStateChange::TransformEnd:
-    {
-      if (NS_IsMainThread()) {
-        MetroUtils::FireObserver("apzc-transform-end", L"");
-        return;
-      }
-      nsCOMPtr<nsIRunnable> runnable = new TransformedEndEvent();
-      NS_DispatchToMainThread(runnable);
-      break;
-    }
-    default:
-    {
-      // We don't currently care about other state changes.
-      break;
-    }
-  }
-}
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/APZController.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/APZController.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/APZController.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/APZController.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +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/. */
-
-#pragma once
-
-#include "mozwrlbase.h"
-
-#include "mozilla/layers/GeckoContentController.h"
-#include "mozilla/layers/APZCTreeManager.h"
-#include "mozilla/EventForwards.h"
-#include "FrameMetrics.h"
-#include "Units.h"
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-class APZPendingResponseFlusher
-{
-public:
-  virtual void FlushPendingContentResponse() = 0;
-};
-
-class APZController :
-  public mozilla::layers::GeckoContentController
-{
-  typedef mozilla::layers::FrameMetrics FrameMetrics;
-  typedef mozilla::layers::ScrollableLayerGuid ScrollableLayerGuid;
-  typedef mozilla::layers::ZoomConstraints ZoomConstraints;
-
-public:
-  APZController() :
-    mFlusher(nullptr)
-  {
-  }
-
-  // GeckoContentController interface
-  virtual void RequestContentRepaint(const FrameMetrics& aFrameMetrics);
-  virtual void RequestFlingSnap(const FrameMetrics::ViewID& aScrollId,
-                                const mozilla::CSSPoint& aDestination);
-  virtual void AcknowledgeScrollUpdate(const FrameMetrics::ViewID& aScrollId, const uint32_t& aScrollGeneration);
-  virtual void HandleDoubleTap(const mozilla::CSSPoint& aPoint,
-                               Modifiers aModifiers,
-                               const mozilla::layers::ScrollableLayerGuid& aGuid);
-  virtual void HandleSingleTap(const mozilla::CSSPoint& aPoint,
-                               Modifiers aModifiers,
-                               const mozilla::layers::ScrollableLayerGuid& aGuid);
-  virtual void HandleLongTap(const mozilla::CSSPoint& aPoint,
-                             Modifiers aModifiers,
-                             const mozilla::layers::ScrollableLayerGuid& aGuid,
-                             uint64_t aInputBlockId);
-  virtual void SendAsyncScrollDOMEvent(bool aIsRoot, const mozilla::CSSRect &aContentRect, const mozilla::CSSSize &aScrollableSize);
-  virtual void PostDelayedTask(Task* aTask, int aDelayMs);
-  virtual bool GetRootZoomConstraints(ZoomConstraints* aOutConstraints);
-  virtual void NotifyAPZStateChange(const ScrollableLayerGuid& aGuid,
-                                    APZStateChange aChange,
-                                    int aArg);
-
-  void SetPendingResponseFlusher(APZPendingResponseFlusher* aFlusher);
-  
-  bool HitTestAPZC(mozilla::ScreenIntPoint& aPoint);
-  void TransformCoordinateToGecko(const mozilla::ScreenIntPoint& aPoint,
-                                  LayoutDeviceIntPoint* aRefPointOut);
-  void ContentReceivedInputBlock(uint64_t aInputBlockId, bool aPreventDefault);
-  nsEventStatus ReceiveInputEvent(mozilla::WidgetInputEvent* aEvent,
-                                  ScrollableLayerGuid* aOutTargetGuid,
-                                  uint64_t* aOutInputBlockId);
-
-public:
-  // todo: make this a member variable as prep for multiple views
-  static nsRefPtr<mozilla::layers::APZCTreeManager> sAPZC;
-
-private:
-  APZPendingResponseFlusher* mFlusher;
-};
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/DisplayInfo_sdk81.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/DisplayInfo_sdk81.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/DisplayInfo_sdk81.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/DisplayInfo_sdk81.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,458 +0,0 @@
-
-/* this file contains the definitions for DisplayInformation related interfaces
-  copied over from Windows.Graphics.Display.h file in the windows 8.1 SDK 
-  This file can be deleted once our build system moves to 8.1. */
-
- /* File created by MIDL compiler version 8.00.0603 */
-/* @@MIDL_FILE_HEADING(  ) */
-
-/* Forward Declarations */ 
-
-#ifndef ____FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_FWD_DEFINED__
-#define ____FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_FWD_DEFINED__
-typedef interface __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable;
-
-#endif 	/* ____FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_FWD_DEFINED__ */
-
-
-#ifndef ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics_FWD_DEFINED__
-#define ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics_FWD_DEFINED__
-typedef interface __x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics __x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics;
-
-#ifdef __cplusplus
-namespace ABI {
-    namespace Windows {
-        namespace Graphics {
-            namespace Display {
-                interface IDisplayInformationStatics;
-            } /* end namespace */
-        } /* end namespace */
-    } /* end namespace */
-} /* end namespace */
-
-#endif /* __cplusplus */
-
-#endif 	/* ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics_FWD_DEFINED__ */
-
-
-#ifndef ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation_FWD_DEFINED__
-#define ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation_FWD_DEFINED__
-typedef interface __x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation __x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation;
-
-#ifdef __cplusplus
-namespace ABI {
-    namespace Windows {
-        namespace Graphics {
-            namespace Display {
-                interface IDisplayInformation;
-            } /* end namespace */
-        } /* end namespace */
-    } /* end namespace */
-} /* end namespace */
-
-#endif /* __cplusplus */
-
-#endif 	/* ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation_FWD_DEFINED__ */
-
-
-#ifdef __cplusplus
-namespace ABI {
-namespace Windows {
-namespace Graphics {
-namespace Display {
-class DisplayInformation;
-} /*Display*/
-} /*Graphics*/
-} /*Windows*/
-}
-#endif
-
-#ifdef __cplusplus
-namespace ABI {
-namespace Windows {
-namespace Graphics {
-namespace Display {
-interface IDisplayInformation;
-} /*Display*/
-} /*Graphics*/
-} /*Windows*/
-}
-#endif
-
-interface IInspectable;
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0000 */
-/* [local] */ 
-
-
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0000_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0000_v0_0_s_ifspec;
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0580 */
-
-
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0580 */
-
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0580_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0580_v0_0_s_ifspec;
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0001 */
-/* [local] */ 
-
-#ifndef DEF___FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_USE
-#define DEF___FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_USE
-#if defined(__cplusplus) && !defined(RO_NO_TEMPLATE_NAME)
-namespace ABI { namespace Windows { namespace Foundation {
-template <>
-struct __declspec(uuid("86c4f619-67b6-51c7-b30d-d8cf13625327"))
-ITypedEventHandler<ABI::Windows::Graphics::Display::DisplayInformation*,IInspectable*> : ITypedEventHandler_impl<ABI::Windows::Foundation::Internal::AggregateType<ABI::Windows::Graphics::Display::DisplayInformation*, ABI::Windows::Graphics::Display::IDisplayInformation*>,IInspectable*> {
-static const wchar_t* z_get_rc_name_impl() {
-return L"Windows.Foundation.TypedEventHandler`2<Windows.Graphics.Display.DisplayInformation, Object>"; }
-};
-typedef ITypedEventHandler<ABI::Windows::Graphics::Display::DisplayInformation*,IInspectable*> __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_t;
-#define ____FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_FWD_DEFINED__
-#define __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable ABI::Windows::Foundation::__FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_t
-
-/* ABI */ } /* Windows */ } /* Foundation */ }
-#endif //__cplusplus
-#endif /* DEF___FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_USE */
-
-#ifndef DEF___FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable
-#define DEF___FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable
-#if !defined(__cplusplus) || defined(RO_NO_TEMPLATE_NAME)
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0004 */
-/* [local] */ 
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0004_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0004_v0_0_s_ifspec;
-
-#ifndef ____FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_INTERFACE_DEFINED__
-#define ____FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_INTERFACE_DEFINED__
-
-/* interface __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable */
-/* [unique][uuid][object] */ 
-
-
-
-/* interface __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable */
-/* [unique][uuid][object] */ 
-
-
-EXTERN_C const IID IID___FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("86c4f619-67b6-51c7-b30d-d8cf13625327")
-    __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable : public IUnknown
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE Invoke( 
-            /* [in] */ __RPC__in_opt ABI::Windows::Graphics::Display::IDisplayInformation *sender,
-            /* [in] */ __RPC__in_opt IInspectable *e) = 0;
-        
-    };
-    
-    
-#else 	/* C style interface */
-
-    typedef struct __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectableVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            __RPC__in __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable * This,
-            /* [in] */ __RPC__in REFIID riid,
-            /* [annotation][iid_is][out] */ 
-            _COM_Outptr_  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            __RPC__in __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            __RPC__in __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            __RPC__in __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable * This,
-            /* [in] */ __RPC__in_opt __x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation *sender,
-            /* [in] */ __RPC__in_opt IInspectable *e);
-        
-        END_INTERFACE
-    } __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectableVtbl;
-
-    interface __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable
-    {
-        CONST_VTBL struct __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectableVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
-
-#define __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
-
-#define __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
-
-
-#define __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_Invoke(This,sender,e)	\
-    ( (This)->lpVtbl -> Invoke(This,sender,e) ) 
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-
-#endif 	/* ____FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable_INTERFACE_DEFINED__ */
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0005 */
-/* [local] */ 
-
-#endif /* pinterface */
-#endif /* DEF___FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable */
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0005 */
-/* [local] */ 
-
-
-/* interface __x_ABI_CWindows_CGraphics_CDisplay_CIDisplayPropertiesEventHandler */
-/* [uuid][object] */ 
-
-
-
-/* interface ABI::Windows::Graphics::Display::IDisplayPropertiesEventHandler */
-/* [uuid][object] */ 
-
-
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0006 */
-/* [local] */ 
-
-#if !defined(____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics_INTERFACE_DEFINED__)
-extern const __declspec(selectany) _Null_terminated_ WCHAR InterfaceName_Windows_Graphics_Display_IDisplayInformationStatics[] = L"Windows.Graphics.Display.IDisplayInformationStatics";
-#endif /* !defined(____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics_INTERFACE_DEFINED__) */
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0006 */
-/* [local] */ 
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0006_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0006_v0_0_s_ifspec;
-
-#ifndef ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics_INTERFACE_DEFINED__
-#define ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics_INTERFACE_DEFINED__
-
-/* interface __x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics */
-/* [uuid][object] */ 
-
-
-
-/* interface ABI::Windows::Graphics::Display::IDisplayInformationStatics */
-/* [uuid][object] */ 
-
-
-EXTERN_C const IID IID___x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    namespace ABI {
-        namespace Windows {
-            namespace Graphics {
-                namespace Display {
-                    
-                    MIDL_INTERFACE("C6A02A6C-D452-44DC-BA07-96F3C6ADF9D1")
-                    IDisplayInformationStatics : public IInspectable
-                    {
-                    public:
-                        virtual HRESULT STDMETHODCALLTYPE GetForCurrentView( 
-                            /* [out][retval] */ __RPC__deref_out_opt ABI::Windows::Graphics::Display::IDisplayInformation **current) = 0;
-                        
-                        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AutoRotationPreferences( 
-                            /* [out][retval] */ __RPC__out ABI::Windows::Graphics::Display::DisplayOrientations *value) = 0;
-                        
-                        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_AutoRotationPreferences( 
-                            /* [in] */ ABI::Windows::Graphics::Display::DisplayOrientations value) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE add_DisplayContentsInvalidated( 
-                            /* [in] */ __RPC__in_opt __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable *handler,
-                            /* [out][retval] */ __RPC__out EventRegistrationToken *token) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE remove_DisplayContentsInvalidated( 
-                            /* [in] */ EventRegistrationToken token) = 0;
-                        
-                    };
-
-                    extern const __declspec(selectany) IID & IID_IDisplayInformationStatics = __uuidof(IDisplayInformationStatics);
-
-                    
-                }  /* end namespace */
-            }  /* end namespace */
-        }  /* end namespace */
-    }  /* end namespace */
-
-#endif 	/* C style interface */
-
-
-
-
-#endif 	/* ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformationStatics_INTERFACE_DEFINED__ */
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0007 */
-/* [local] */ 
-
-#if !defined(____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation_INTERFACE_DEFINED__)
-extern const __declspec(selectany) _Null_terminated_ WCHAR InterfaceName_Windows_Graphics_Display_IDisplayInformation[] = L"Windows.Graphics.Display.IDisplayInformation";
-#endif /* !defined(____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation_INTERFACE_DEFINED__) */
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0007 */
-/* [local] */ 
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0007_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0007_v0_0_s_ifspec;
-
-#ifndef ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation_INTERFACE_DEFINED__
-#define ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation_INTERFACE_DEFINED__
-
-/* interface __x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation */
-/* [uuid][object] */ 
-
-
-
-/* interface ABI::Windows::Graphics::Display::IDisplayInformation */
-/* [uuid][object] */ 
-
-
-EXTERN_C const IID IID___x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    namespace ABI {
-        namespace Windows {
-            namespace Graphics {
-                namespace Display {
-                    
-                    MIDL_INTERFACE("BED112AE-ADC3-4DC9-AE65-851F4D7D4799")
-                    IDisplayInformation : public IInspectable
-                    {
-                    public:
-                        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_CurrentOrientation( 
-                            /* [out][retval] */ __RPC__out ABI::Windows::Graphics::Display::DisplayOrientations *value) = 0;
-                        
-                        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NativeOrientation( 
-                            /* [out][retval] */ __RPC__out ABI::Windows::Graphics::Display::DisplayOrientations *value) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE add_OrientationChanged( 
-                            /* [in] */ __RPC__in_opt __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable *handler,
-                            /* [out][retval] */ __RPC__out EventRegistrationToken *token) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE remove_OrientationChanged( 
-                            /* [in] */ EventRegistrationToken token) = 0;
-                        
-                        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ResolutionScale( 
-                            /* [out][retval] */ __RPC__out ABI::Windows::Graphics::Display::ResolutionScale *value) = 0;
-                        
-                        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LogicalDpi( 
-                            /* [out][retval] */ __RPC__out FLOAT *value) = 0;
-                        
-                        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RawDpiX( 
-                            /* [out][retval] */ __RPC__out FLOAT *value) = 0;
-                        
-                        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RawDpiY( 
-                            /* [out][retval] */ __RPC__out FLOAT *value) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE add_DpiChanged( 
-                            /* [in] */ __RPC__in_opt __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable *handler,
-                            /* [out][retval] */ __RPC__out EventRegistrationToken *token) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE remove_DpiChanged( 
-                            /* [in] */ EventRegistrationToken token) = 0;
-                        
-                        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_StereoEnabled( 
-                            /* [out][retval] */ __RPC__out boolean *value) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE add_StereoEnabledChanged( 
-                            /* [in] */ __RPC__in_opt __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable *handler,
-                            /* [out][retval] */ __RPC__out EventRegistrationToken *token) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE remove_StereoEnabledChanged( 
-                            /* [in] */ EventRegistrationToken token) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE GetColorProfileAsync( 
-                            /* [out][retval] */ __RPC__deref_out_opt __FIAsyncOperation_1_Windows__CStorage__CStreams__CIRandomAccessStream **asyncInfo) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE add_ColorProfileChanged( 
-                            /* [in] */ __RPC__in_opt __FITypedEventHandler_2_Windows__CGraphics__CDisplay__CDisplayInformation_IInspectable *handler,
-                            /* [out][retval] */ __RPC__out EventRegistrationToken *token) = 0;
-                        
-                        virtual HRESULT STDMETHODCALLTYPE remove_ColorProfileChanged( 
-                            /* [in] */ EventRegistrationToken token) = 0;
-                        
-                    };
-
-                    extern const __declspec(selectany) IID & IID_IDisplayInformation = __uuidof(IDisplayInformation);
-
-                    
-                }  /* end namespace */
-            }  /* end namespace */
-        }  /* end namespace */
-    }  /* end namespace */
-
-#endif 	/* C style interface */
-
-
-
-
-#endif 	/* ____x_ABI_CWindows_CGraphics_CDisplay_CIDisplayInformation_INTERFACE_DEFINED__ */
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0008 */
-/* [local] */ 
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0009 */
-/* [local] */ 
-
-#ifndef RUNTIMECLASS_Windows_Graphics_Display_DisplayInformation_DEFINED
-#define RUNTIMECLASS_Windows_Graphics_Display_DisplayInformation_DEFINED
-extern const __declspec(selectany) _Null_terminated_ WCHAR RuntimeClass_Windows_Graphics_Display_DisplayInformation[] = L"Windows.Graphics.Display.DisplayInformation";
-#endif
-
-
-/* interface __MIDL_itf_windows2Egraphics2Edisplay_0000_0009 */
-/* [local] */ 
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0009_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_windows2Egraphics2Edisplay_0000_0009_v0_0_s_ifspec;
-
-/* Additional Prototypes for ALL interfaces */
-
-/* end of Additional Prototypes */
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/FrameworkView.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/FrameworkView.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/FrameworkView.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/FrameworkView.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,507 +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/. */
-
-#include "FrameworkView.h"
-#include "MetroAppShell.h"
-#include "MetroWidget.h"
-#include "mozilla/AutoRestore.h"
-#include "MetroUtils.h"
-#include "MetroApp.h"
-#include "UIABridgePublic.h"
-#include "KeyboardLayout.h"
-
-// generated
-#include "UIABridge.h"
-
-using namespace mozilla;
-using namespace mozilla::widget::winrt;
-#ifdef ACCESSIBILITY
-using namespace mozilla::a11y;
-#endif
-using namespace ABI::Windows::ApplicationModel;
-using namespace ABI::Windows::ApplicationModel::Core;
-using namespace ABI::Windows::ApplicationModel::Activation;
-using namespace ABI::Windows::UI::Core;
-using namespace ABI::Windows::UI::ViewManagement;
-using namespace ABI::Windows::UI::Input;
-using namespace ABI::Windows::Devices::Input;
-using namespace ABI::Windows::System;
-using namespace ABI::Windows::Foundation;
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-// statics
-bool FrameworkView::sKeyboardIsVisible = false;
-Rect FrameworkView::sKeyboardRect;
-HSTRING FrameworkView::sActivationURI = NULL;
-ApplicationExecutionState FrameworkView::sPreviousExecutionState;
-nsTArray<nsString>* sSettingsArray;
-
-FrameworkView::FrameworkView(MetroApp* aMetroApp) :
-  mDPI(-1.0f),
-  mWidget(nullptr),
-  mShuttingDown(false),
-  mMetroApp(aMetroApp),
-  mWindow(nullptr),
-  mMetroInput(nullptr),
-  mWinVisible(false),
-  mWinActiveState(false)
-{
-  mActivated.value = 0;
-  mWindowActivated.value = 0;
-  mWindowVisibilityChanged.value = 0;
-  mWindowSizeChanged.value = 0;
-  mSoftKeyboardHidden.value = 0;
-  mSoftKeyboardShown.value = 0;
-  mDisplayPropertiesChanged.value = 0;
-  mAutomationProviderRequested.value = 0;
-  mDataTransferRequested.value = 0;
-  mSearchQuerySubmitted.value = 0;
-  mPlayToRequested.value = 0;
-  mSettingsPane.value = 0;
-  mPrintManager.value = 0;
-  memset(&sKeyboardRect, 0, sizeof(Rect));
-  sSettingsArray = new nsTArray<nsString>();
-  LogFunction();
-}
-
-////////////////////////////////////////////////////
-// IFrameworkView impl.
-
-HRESULT
-FrameworkView::Initialize(ICoreApplicationView* aAppView)
-{
-  LogFunction();
-  if (mShuttingDown)
-    return E_FAIL;
-
-  aAppView->add_Activated(Callback<__FITypedEventHandler_2_Windows__CApplicationModel__CCore__CCoreApplicationView_Windows__CApplicationModel__CActivation__CIActivatedEventArgs_t>(
-    this, &FrameworkView::OnActivated).Get(), &mActivated);
-
-  //CoCreateInstance(CLSID_WICImagingFactory, nullptr,
-  //                 CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&mWicFactory));
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::Uninitialize()
-{
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::Load(HSTRING aEntryPoint)
-{
-  return S_OK;
-}
-
-// called by winrt on startup
-HRESULT
-FrameworkView::Run()
-{
-  LogFunction();
-
-  // Initialize XPCOM, create mWidget and go! We get a
-  // callback in MetroAppShell::Run, in which we kick
-  // off normal browser execution / event dispatching.
-  mMetroApp->Run();
-
-  // Gecko is completely shut down at this point.
-  WinUtils::Log("Exiting FrameworkView::Run()");
-
-  WindowsDeleteString(sActivationURI);
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::ActivateView()
-{
-  LogFunction();
-
-  UpdateWidgetSizeAndPosition();
-
-  nsIntRegion region(nsIntRect(0, 0, mWindowBounds.width, mWindowBounds.height));
-  mWidget->Paint(region);
-
-  // Activate the window, this kills the splash screen
-  mWindow->Activate();
-
-  ProcessLaunchArguments();
-  AddEventHandlers();
-  SetupContracts();
-
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::SetWindow(ICoreWindow* aWindow)
-{
-  LogFunction();
-
-  NS_ASSERTION(!mWindow, "Attempting to set a window on a view that already has a window!");
-  NS_ASSERTION(aWindow, "Attempting to set a null window on a view!");
-
-  mWindow = aWindow;
-  UpdateLogicalDPI();
-  return S_OK;
-}
-
-////////////////////////////////////////////////////
-// FrameworkView impl.
-
-void
-FrameworkView::AddEventHandlers() {
-  NS_ASSERTION(mWindow, "SetWindow must be called before AddEventHandlers!");
-  NS_ASSERTION(mWidget, "SetWidget must be called before AddEventHAndlers!");
-
-  mMetroInput = Make<MetroInput>(mWidget.Get(),
-                                 mWindow.Get());
-
-  mWindow->add_VisibilityChanged(Callback<__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CVisibilityChangedEventArgs>(
-    this, &FrameworkView::OnWindowVisibilityChanged).Get(), &mWindowVisibilityChanged);
-  mWindow->add_Activated(Callback<__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowActivatedEventArgs_t>(
-    this, &FrameworkView::OnWindowActivated).Get(), &mWindowActivated);
-  mWindow->add_SizeChanged(Callback<__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs_t>(
-    this, &FrameworkView::OnWindowSizeChanged).Get(), &mWindowSizeChanged);
-
-  mWindow->add_AutomationProviderRequested(Callback<__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CAutomationProviderRequestedEventArgs_t>(
-    this, &FrameworkView::OnAutomationProviderRequested).Get(), &mAutomationProviderRequested);
-
-  HRESULT hr;
-  ComPtr<ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> dispProps;
-  if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(), dispProps.GetAddressOf()))) {
-    hr = dispProps->add_LogicalDpiChanged(Callback<ABI::Windows::Graphics::Display::IDisplayPropertiesEventHandler, FrameworkView>(
-      this, &FrameworkView::OnLogicalDpiChanged).Get(), &mDisplayPropertiesChanged);
-    LogHRESULT(hr);
-  }
-
-  ComPtr<ABI::Windows::UI::ViewManagement::IInputPaneStatics> inputStatic;
-  if (SUCCEEDED(hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_ViewManagement_InputPane).Get(), inputStatic.GetAddressOf()))) {
-    ComPtr<ABI::Windows::UI::ViewManagement::IInputPane> inputPane;
-    if (SUCCEEDED(inputStatic->GetForCurrentView(inputPane.GetAddressOf()))) {
-      inputPane->add_Hiding(Callback<__FITypedEventHandler_2_Windows__CUI__CViewManagement__CInputPane_Windows__CUI__CViewManagement__CInputPaneVisibilityEventArgs_t>(
-        this, &FrameworkView::OnSoftkeyboardHidden).Get(), &mSoftKeyboardHidden);
-      inputPane->add_Showing(Callback<__FITypedEventHandler_2_Windows__CUI__CViewManagement__CInputPane_Windows__CUI__CViewManagement__CInputPaneVisibilityEventArgs_t>(
-        this, &FrameworkView::OnSoftkeyboardShown).Get(), &mSoftKeyboardShown);
-    }
-  }
-}
-
-// Called by MetroApp
-void
-FrameworkView::Shutdown()
-{
-  LogFunction();
-  mShuttingDown = true;
-
-  if (mWindow && mWindowVisibilityChanged.value) {
-    mWindow->remove_VisibilityChanged(mWindowVisibilityChanged);
-    mWindow->remove_Activated(mWindowActivated);
-    mWindow->remove_Closed(mWindowClosed);
-    mWindow->remove_SizeChanged(mWindowSizeChanged);
-    mWindow->remove_AutomationProviderRequested(mAutomationProviderRequested);
-  }
-
-  ComPtr<ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> dispProps;
-  if (mDisplayPropertiesChanged.value &&
-      SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(), dispProps.GetAddressOf()))) {
-    dispProps->remove_LogicalDpiChanged(mDisplayPropertiesChanged);
-  }
-
-  ComPtr<ABI::Windows::UI::ViewManagement::IInputPaneStatics> inputStatic;
-  if (mSoftKeyboardHidden.value &&
-      SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_ViewManagement_InputPane).Get(), inputStatic.GetAddressOf()))) {
-    ComPtr<ABI::Windows::UI::ViewManagement::IInputPane> inputPane;
-    if (SUCCEEDED(inputStatic->GetForCurrentView(inputPane.GetAddressOf()))) {
-      inputPane->remove_Hiding(mSoftKeyboardHidden);
-      inputPane->remove_Showing(mSoftKeyboardShown);
-    }
-  }
-
-  if (mAutomationProvider) {
-    ComPtr<IUIABridge> provider;
-    mAutomationProvider.As(&provider);
-    if (provider) {
-      provider->Disconnect();
-    }
-  }
-  mAutomationProvider = nullptr;
-
-  mMetroInput = nullptr;
-  delete sSettingsArray;
-  sSettingsArray = nullptr;
-  mWidget = nullptr;
-  mMetroApp = nullptr;
-  mWindow = nullptr;
-}
-
-void
-FrameworkView::SetCursor(CoreCursorType aCursorType, DWORD aCustomId)
-{
-  if (mShuttingDown) {
-    return;
-  }
-  NS_ASSERTION(mWindow, "SetWindow must be called before SetCursor!");
-  ComPtr<ABI::Windows::UI::Core::ICoreCursorFactory> factory;
-  AssertHRESULT(GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_Core_CoreCursor).Get(), factory.GetAddressOf()));
-  ComPtr<ABI::Windows::UI::Core::ICoreCursor> cursor;
-  AssertHRESULT(factory->CreateCursor(aCursorType, aCustomId, cursor.GetAddressOf()));
-  mWindow->put_PointerCursor(cursor.Get());
-}
-
-void
-FrameworkView::ClearCursor()
-{
-  if (mShuttingDown) {
-    return;
-  }
-  NS_ASSERTION(mWindow, "SetWindow must be called before ClearCursor!");
-  mWindow->put_PointerCursor(nullptr);
-}
-
-void
-FrameworkView::UpdateLogicalDPI()
-{
-  ComPtr<ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> dispProps;
-  HRESULT hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(),
-                                    dispProps.GetAddressOf());
-  AssertHRESULT(hr);
-  FLOAT value;
-  AssertHRESULT(dispProps->get_LogicalDpi(&value));
-  SetDpi(value);
-}
-
-void
-FrameworkView::GetBounds(nsIntRect &aRect)
-{
-  // May be called by compositor thread
-  if (mShuttingDown) {
-    return;
-  }
-  aRect = mWindowBounds;
-}
-
-void
-FrameworkView::UpdateWidgetSizeAndPosition()
-{
-  if (mShuttingDown)
-    return;
-
-  NS_ASSERTION(mWindow, "SetWindow must be called before UpdateWidgetSizeAndPosition!");
-  NS_ASSERTION(mWidget, "SetWidget must be called before UpdateWidgetSizeAndPosition!");
-
-  UpdateBounds();
-  mWidget->Move(0, 0);
-  mWidget->Resize(0, 0, mWindowBounds.width, mWindowBounds.height, true);
-  mWidget->SizeModeChanged();
-}
-
-bool
-FrameworkView::IsEnabled() const
-{
-  return mWinActiveState;
-}
-
-bool
-FrameworkView::IsVisible() const
-{
-  // we could check the wnd in MetroWidget for this, but
-  // generally we don't let nsIWidget control visibility
-  // or activation.
-  return mWinVisible;
-}
-
-void FrameworkView::SetDpi(float aDpi)
-{
-  if (aDpi != mDPI) {
-    LogFunction();
-
-    mDPI = aDpi;
-
-    // notify the widget that dpi has changed
-    if (mWidget) {
-      mWidget->ChangedDPI();
-      UpdateBounds();
-    }
-  }
-}
-
-void
-FrameworkView::UpdateBounds()
-{
-  if (!mWidget)
-    return;
-
-  RECT winRect;
-  GetClientRect(mWidget->GetICoreWindowHWND(), &winRect);
-
-  mWindowBounds = nsIntRect(winRect.left,
-                            winRect.top,
-                            winRect.right - winRect.left,
-                            winRect.bottom - winRect.top);
-}
-
-void
-FrameworkView::SetWidget(MetroWidget* aWidget)
-{
-  NS_ASSERTION(!mWidget, "Attempting to set a widget for a view that already has a widget!");
-  NS_ASSERTION(aWidget, "Attempting to set a null widget for a view!");
-  LogFunction();
-  mWidget = aWidget;
-  mWidget->FindMetroWindow();
-  UpdateBounds();
-}
-
-////////////////////////////////////////////////////
-// Event handlers
-
-void
-FrameworkView::SendActivationEvent() 
-{
-  if (mShuttingDown) {
-    return;
-  }
-  NS_ASSERTION(mWindow, "SetWindow must be called before SendActivationEvent!");
-  mWidget->Activated(mWinActiveState);
-  if (mWinActiveState) {
-    UpdateWidgetSizeAndPosition();
-  }
-  EnsureAutomationProviderCreated();
-}
-
-HRESULT
-FrameworkView::OnWindowVisibilityChanged(ICoreWindow* aWindow,
-                                         IVisibilityChangedEventArgs* aArgs)
-{
-  // If we're visible, or we can't determine if we're visible, just store
-  // that we are visible.
-  boolean visible;
-  mWinVisible = FAILED(aArgs->get_Visible(&visible)) || visible;
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::OnActivated(ICoreApplicationView* aApplicationView,
-                           IActivatedEventArgs* aArgs)
-{
-  LogFunction();
-
-  if (mShuttingDown) {
-    return S_OK;
-  }
-
-  aArgs->get_PreviousExecutionState(&sPreviousExecutionState);
-  bool startup = sPreviousExecutionState == ApplicationExecutionState::ApplicationExecutionState_Terminated ||
-                 sPreviousExecutionState == ApplicationExecutionState::ApplicationExecutionState_ClosedByUser ||
-                 sPreviousExecutionState == ApplicationExecutionState::ApplicationExecutionState_NotRunning;
-  ProcessActivationArgs(aArgs, startup);
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::OnSoftkeyboardHidden(IInputPane* aSender,
-                                    IInputPaneVisibilityEventArgs* aArgs)
-{
-  LogFunction();
-  sKeyboardIsVisible = false;
-  memset(&sKeyboardRect, 0, sizeof(Rect));
-  MetroUtils::FireObserver("metro_softkeyboard_hidden");
-  aArgs->put_EnsuredFocusedElementInView(true);
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::OnSoftkeyboardShown(IInputPane* aSender,
-                                   IInputPaneVisibilityEventArgs* aArgs)
-{
-  LogFunction();
-  sKeyboardIsVisible = true;
-  aSender->get_OccludedRect(&sKeyboardRect);
-  MetroUtils::FireObserver("metro_softkeyboard_shown");
-  aArgs->put_EnsuredFocusedElementInView(true);
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::OnWindowSizeChanged(ICoreWindow* aSender, IWindowSizeChangedEventArgs* aArgs)
-{
-  LogFunction();
-  UpdateWidgetSizeAndPosition();
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::OnWindowActivated(ICoreWindow* aSender, IWindowActivatedEventArgs* aArgs)
-{
-  LogFunction();
-  if (!mWidget) {
-    return S_OK;
-  }
-  CoreWindowActivationState state;
-  aArgs->get_WindowActivationState(&state);
-  mWinActiveState = !(state == CoreWindowActivationState::CoreWindowActivationState_Deactivated);
-  SendActivationEvent();
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::OnLogicalDpiChanged(IInspectable* aSender)
-{
-  LogFunction();
-  UpdateLogicalDPI();
-  if (mWidget) {
-    mWidget->Invalidate();
-  }
-  return S_OK;
-}
-
-bool
-FrameworkView::EnsureAutomationProviderCreated()
-{
-#ifdef ACCESSIBILITY
-  if (!mWidget || mShuttingDown)
-    return false;
-
-  if (mAutomationProvider) {
-    return true;
-  }
-
-  Accessible *rootAccessible = mWidget->GetRootAccessible();
-  if (rootAccessible) {
-    IInspectable* inspectable;
-    HRESULT hr;
-    AssertRetHRESULT(hr = UIABridge_CreateInstance(&inspectable), hr); // Addref
-    IUIABridge* bridge = nullptr;
-    inspectable->QueryInterface(IID_IUIABridge, (void**)&bridge); // Addref
-    if (bridge) {
-      bridge->Init(this, mWindow.Get(), (ULONG)rootAccessible);
-      mAutomationProvider = inspectable;
-      inspectable->Release();
-      return true;
-    }
-  }
-#endif
-  return false;
-}
-
-HRESULT
-FrameworkView::OnAutomationProviderRequested(ICoreWindow* aSender,
-                                             IAutomationProviderRequestedEventArgs* aArgs)
-{
-  LogFunction();
-  if (!EnsureAutomationProviderCreated())
-    return E_FAIL;
-  HRESULT hr = aArgs->put_AutomationProvider(mAutomationProvider.Get());
-  if (FAILED(hr)) {
-    WinUtils::Log("put failed? %X", hr);
-  }
-  return S_OK;
-}
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/FrameworkView.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/FrameworkView.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/FrameworkView.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/FrameworkView.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +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/. */
-
-#pragma once
-
-#include "MetroWidget.h"
-#include "MetroInput.h"
-#include "gfxWindowsPlatform.h"
-#include "nsDataHashtable.h"
-
-#include "mozwrlbase.h"
-
-#include <windows.system.h>
-#include <Windows.ApplicationModel.core.h>
-#include <Windows.ApplicationModel.h>
-#include <Windows.Applicationmodel.Activation.h>
-#include <Windows.ApplicationModel.search.h>
-#include <windows.ui.core.h>
-#include <windows.ui.viewmanagement.h>
-#include <windows.ui.applicationsettings.h>
-#include <windows.ui.popups.h>
-#include <windows.graphics.printing.h>
-#include <windows.graphics.display.h>
-#include <windows.media.playto.h>
-#include <d2d1_1.h>
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-class MetroApp;
-
-class FrameworkView : public Microsoft::WRL::RuntimeClass<ABI::Windows::ApplicationModel::Core::IFrameworkView>
-{
-  InspectableClass(L"FrameworkView", TrustLevel::BaseTrust)
-
-  typedef mozilla::layers::LayerManager LayerManager;
-
-  typedef ABI::Windows::Foundation::Rect Rect;
-  typedef ABI::Windows::UI::Core::IWindowSizeChangedEventArgs IWindowSizeChangedEventArgs;
-  typedef ABI::Windows::UI::Core::ICoreWindowEventArgs ICoreWindowEventArgs;
-  typedef ABI::Windows::UI::Core::IWindowActivatedEventArgs IWindowActivatedEventArgs;
-  typedef ABI::Windows::UI::Core::IAutomationProviderRequestedEventArgs IAutomationProviderRequestedEventArgs;
-  typedef ABI::Windows::UI::Core::ICoreWindow ICoreWindow;
-  typedef ABI::Windows::UI::Core::ICoreDispatcher ICoreDispatcher;
-  typedef ABI::Windows::UI::Core::IVisibilityChangedEventArgs IVisibilityChangedEventArgs;
-  typedef ABI::Windows::UI::ViewManagement::IInputPaneVisibilityEventArgs IInputPaneVisibilityEventArgs;
-  typedef ABI::Windows::UI::ViewManagement::IInputPane IInputPane;
-  typedef ABI::Windows::UI::ViewManagement::ApplicationViewState ApplicationViewState;
-  typedef ABI::Windows::UI::ApplicationSettings::ISettingsPane ISettingsPane;
-  typedef ABI::Windows::UI::ApplicationSettings::ISettingsPaneCommandsRequestedEventArgs ISettingsPaneCommandsRequestedEventArgs;
-  typedef ABI::Windows::UI::Popups::IUICommand IUICommand;
-  typedef ABI::Windows::ApplicationModel::Activation::ILaunchActivatedEventArgs ILaunchActivatedEventArgs;
-  typedef ABI::Windows::ApplicationModel::Activation::IActivatedEventArgs IActivatedEventArgs;
-  typedef ABI::Windows::ApplicationModel::Activation::ISearchActivatedEventArgs ISearchActivatedEventArgs;
-  typedef ABI::Windows::ApplicationModel::Activation::IFileActivatedEventArgs IFileActivatedEventArgs;
-  typedef ABI::Windows::ApplicationModel::Core::ICoreApplicationView ICoreApplicationView;
-  typedef ABI::Windows::ApplicationModel::DataTransfer::IDataTransferManager IDataTransferManager;
-  typedef ABI::Windows::ApplicationModel::DataTransfer::IDataRequestedEventArgs IDataRequestedEventArgs;
-  typedef ABI::Windows::ApplicationModel::Search::ISearchPane ISearchPane;
-  typedef ABI::Windows::ApplicationModel::Search::ISearchPaneQuerySubmittedEventArgs ISearchPaneQuerySubmittedEventArgs;
-  typedef ABI::Windows::Media::PlayTo::IPlayToManager IPlayToManager;
-  typedef ABI::Windows::Media::PlayTo::IPlayToSourceRequestedEventArgs IPlayToSourceRequestedEventArgs;
-  typedef ABI::Windows::Graphics::Printing::IPrintManager IPrintManager;
-  typedef ABI::Windows::Graphics::Printing::IPrintTaskRequestedEventArgs IPrintTaskRequestedEventArgs;
-  typedef ABI::Windows::Graphics::Printing::IPrintTaskSourceRequestedArgs IPrintTaskSourceRequestedArgs;
-
-public:
-  FrameworkView(MetroApp* aMetroApp);
-
-  // IFrameworkView Methods
-  STDMETHODIMP Initialize(ICoreApplicationView* aAppView);
-  STDMETHODIMP SetWindow(ICoreWindow* aWindow);
-  STDMETHODIMP Load(HSTRING aEntryPoint);
-  STDMETHODIMP Run();
-  STDMETHODIMP Uninitialize();
-
-  HRESULT ActivateView();
-
-  // Public apis for MetroWidget
-  float GetDPI() { return mDPI; }
-  ICoreWindow* GetCoreWindow() { return mWindow.Get(); }
-  void SetWidget(MetroWidget* aWidget);
-  MetroWidget* GetWidget() { return mWidget.Get(); }
-  void GetBounds(nsIntRect &aRect);
-  void SetCursor(ABI::Windows::UI::Core::CoreCursorType aCursorType, DWORD aCustomId = 0);
-  void ClearCursor();
-  bool IsEnabled() const;
-  bool IsVisible() const;
-
-  // Activation apis for nsIWinMetroUtils
-  static int GetPreviousExecutionState() { return sPreviousExecutionState; }
-  static void GetActivationURI(nsAString &aActivationURI) {
-    unsigned int length;
-    aActivationURI = WindowsGetStringRawBuffer(sActivationURI, &length);
-  }
-
-  // Soft keyboard info for nsIWinMetroUtils
-  static bool IsKeyboardVisible() { return sKeyboardIsVisible; }
-  static ABI::Windows::Foundation::Rect KeyboardVisibleRect() { return sKeyboardRect; }
-
-  // MetroApp apis
-  void SetupContracts();
-  void Shutdown();
-
-  // MetroContracts settings panel enumerator entry
-  void AddSetting(ISettingsPaneCommandsRequestedEventArgs* aArgs, uint32_t aId,
-                  Microsoft::WRL::Wrappers::HString& aSettingName);
-protected:
-  // Event Handlers
-  HRESULT OnActivated(ICoreApplicationView* aApplicationView,
-                      IActivatedEventArgs* aArgs);
-  HRESULT OnWindowVisibilityChanged(ICoreWindow* aCoreWindow,
-                                    IVisibilityChangedEventArgs* aArgs);
-
-  HRESULT OnWindowSizeChanged(ICoreWindow* aSender,
-                              IWindowSizeChangedEventArgs* aArgs);
-  HRESULT OnWindowActivated(ICoreWindow* aSender,
-                            IWindowActivatedEventArgs* aArgs);
-  HRESULT OnLogicalDpiChanged(IInspectable* aSender);
-
-  HRESULT OnAutomationProviderRequested(ICoreWindow* aSender,
-                                        IAutomationProviderRequestedEventArgs* aArgs);
-
-  HRESULT OnSoftkeyboardHidden(IInputPane* aSender,
-                               IInputPaneVisibilityEventArgs* aArgs);
-  HRESULT OnSoftkeyboardShown(IInputPane* aSender,
-                              IInputPaneVisibilityEventArgs* aArgs);
-
-  HRESULT OnDataShareRequested(IDataTransferManager*, IDataRequestedEventArgs* aArgs);
-  HRESULT OnSearchQuerySubmitted(ISearchPane* aPane, ISearchPaneQuerySubmittedEventArgs* aArgs);
-  HRESULT OnSettingsCommandsRequested(ISettingsPane* aPane, ISettingsPaneCommandsRequestedEventArgs* aArgs);
-  HRESULT OnPlayToSourceRequested(IPlayToManager* aPane, IPlayToSourceRequestedEventArgs* aArgs);
-  HRESULT OnSettingsCommandInvoked(IUICommand* aCommand);
-  HRESULT OnPrintTaskRequested(IPrintManager* aMgr, IPrintTaskRequestedEventArgs* aArgs);
-  HRESULT OnPrintTaskSourceRequested(IPrintTaskSourceRequestedArgs* aArgs);
-
-protected:
-  void SetDpi(float aDpi);
-  void UpdateWidgetSizeAndPosition();
-  void PerformURILoad(Microsoft::WRL::Wrappers::HString& aString);
-  void PerformSearch(Microsoft::WRL::Wrappers::HString& aQuery);
-  void PerformURILoadOrSearch(Microsoft::WRL::Wrappers::HString& aString);
-  bool EnsureAutomationProviderCreated();
-  void SearchActivated(Microsoft::WRL::ComPtr<ISearchActivatedEventArgs>& aArgs, bool aStartup);
-  void FileActivated(Microsoft::WRL::ComPtr<IFileActivatedEventArgs>& aArgs, bool aStartup);
-  void LaunchActivated(Microsoft::WRL::ComPtr<ILaunchActivatedEventArgs>& aArgs, bool aStartup);
-  void ProcessActivationArgs(IActivatedEventArgs* aArgs, bool aStartup);
-  void UpdateForWindowSizeChange();
-  void SendActivationEvent();
-  void UpdateLogicalDPI();
-  void FireViewStateObservers();
-  void ProcessLaunchArguments();
-  void UpdateBounds();
-
-  // Printing and preview
-  void CreatePrintControl(IPrintDocumentPackageTarget* aDocPackageTarget, 
-                          D2D1_PRINT_CONTROL_PROPERTIES* aPrintControlProperties);
-  HRESULT ClosePrintControl();
-  void PrintPage(uint32_t aPageNumber, D2D1_RECT_F aImageableArea,
-                 D2D1_SIZE_F aPageSize, IStream* aPagePrintTicketStream);
-  void AddEventHandlers();
-
-private:
-  EventRegistrationToken mActivated;
-  EventRegistrationToken mWindowActivated;
-  EventRegistrationToken mWindowVisibilityChanged;
-  EventRegistrationToken mWindowClosed;
-  EventRegistrationToken mWindowSizeChanged;
-  EventRegistrationToken mSoftKeyboardHidden;
-  EventRegistrationToken mSoftKeyboardShown;
-  EventRegistrationToken mDisplayPropertiesChanged;
-  EventRegistrationToken mAutomationProviderRequested;
-  EventRegistrationToken mDataTransferRequested;
-  EventRegistrationToken mSearchQuerySubmitted;
-  EventRegistrationToken mPlayToRequested;
-  EventRegistrationToken mSettingsPane;
-  EventRegistrationToken mPrintManager;
-
-private:
-  nsIntRect mWindowBounds; // in device-pixel coordinates
-  float mDPI;
-  bool mShuttingDown;
-  nsAutoString mActivationCommandLine;
-  Microsoft::WRL::ComPtr<IInspectable> mAutomationProvider;
-  //Microsoft::WRL::ComPtr<ID2D1PrintControl> mD2DPrintControl;
-  // Private critical section protects D2D device context for on-screen
-  // rendering from that for print/preview in the different thread.
-  //Microsoft::WRL::ComPtr<IWICImagingFactory2> mWicFactory;
-  Microsoft::WRL::ComPtr<MetroApp> mMetroApp;
-  Microsoft::WRL::ComPtr<ICoreWindow> mWindow;
-  Microsoft::WRL::ComPtr<MetroWidget> mWidget;
-  Microsoft::WRL::ComPtr<MetroInput> mMetroInput;
-  bool mWinVisible;
-  bool mWinActiveState;
-
-  static bool sKeyboardIsVisible;
-  static Rect sKeyboardRect;
-  static HSTRING sActivationURI;
-  static ABI::Windows::ApplicationModel::Activation::ApplicationExecutionState sPreviousExecutionState;
-};
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/Makefile.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/Makefile.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/Makefile.in	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -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/.
-
-MIDL_GENERATED_FILES = \
-	UIABridge_i.c \
-	UIABridge_p.c \
-	dlldata.c \
-	$(NULL)
-
-GARBAGE += $(MIDL_GENERATED_FILES) done_gen
-
-do_interfaces_gen: UIABridge.idl
-	$(MIDL) $(srcdir)/UIABridge.idl -I $(srcdir)
-	touch $@
-
-export:: do_interfaces_gen
-
-include $(topsrcdir)/config/rules.mk
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroApp.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroApp.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroApp.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroApp.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,282 +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/. */
-
-#include "MetroApp.h"
-#include "MetroWidget.h"
-#include "mozilla/IOInterposer.h"
-#include "mozilla/widget/AudioSession.h"
-#include "nsIRunnable.h"
-#include "MetroUtils.h"
-#include "MetroAppShell.h"
-#include "nsICommandLineRunner.h"
-#include "FrameworkView.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "GeckoProfiler.h"
-#include <shellapi.h>
-
-using namespace ABI::Windows::ApplicationModel;
-using namespace ABI::Windows::ApplicationModel::Core;
-using namespace ABI::Windows::UI::Core;
-using namespace ABI::Windows::System;
-using namespace ABI::Windows::Foundation;
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-using namespace mozilla::widget;
-
-// Metro specific XRE methods we call from here on an
-// appropriate thread.
-extern nsresult XRE_metroStartup(bool runXREMain);
-extern void XRE_metroShutdown();
-
-static const char* gGeckoThreadName = "GeckoMain";
-
-#ifdef PR_LOGGING
-extern PRLogModuleInfo* gWindowsLog;
-#endif
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-ComPtr<FrameworkView> sFrameworkView;
-ComPtr<MetroApp> sMetroApp;
-ComPtr<ICoreApplication> sCoreApp;
-bool MetroApp::sGeckoShuttingDown = false;
-
-////////////////////////////////////////////////////
-// IFrameworkViewSource impl.
-
-// Called after CoreApplication::Run(app)
-HRESULT
-MetroApp::CreateView(ABI::Windows::ApplicationModel::Core::IFrameworkView **aViewProvider)
-{
-  // This entry point is called on the metro main thread, but the thread won't
-  // be recognized as such until after Run() is called below. XPCOM has not
-  // gone through startup at this point.
-
-  // Note that we create the view which creates our native window for us. The
-  // gecko widget gets created by gecko, and the two get hooked up later in
-  // MetroWidget::Create().
-
-  LogFunction();
-
-  sFrameworkView = Make<FrameworkView>(this);
-  sFrameworkView.Get()->AddRef();
-  *aViewProvider = sFrameworkView.Get();
-  return !sFrameworkView ? E_FAIL : S_OK;
-}
-
-////////////////////////////////////////////////////
-// MetroApp impl.
-
-void
-MetroApp::Run()
-{
-  LogThread();
-
-  // Name this thread for debugging and register it with the profiler
-  // and IOInterposer as the main gecko thread.
-  char aLocal;
-  PR_SetCurrentThreadName(gGeckoThreadName);
-  profiler_register_thread(gGeckoThreadName, &aLocal);
-  IOInterposer::RegisterCurrentThread(true);
-
-  HRESULT hr;
-  hr = sCoreApp->add_Suspending(Callback<__FIEventHandler_1_Windows__CApplicationModel__CSuspendingEventArgs_t>(
-    this, &MetroApp::OnSuspending).Get(), &mSuspendEvent);
-  AssertHRESULT(hr);
-
-  hr = sCoreApp->add_Resuming(Callback<__FIEventHandler_1_IInspectable_t>(
-    this, &MetroApp::OnResuming).Get(), &mResumeEvent);
-  AssertHRESULT(hr);
-
-  WinUtils::Log("Calling XRE_metroStartup.");
-  nsresult rv = XRE_metroStartup(true);
-  WinUtils::Log("Exiting XRE_metroStartup.");
-  if (NS_FAILED(rv)) {
-    WinUtils::Log("XPCOM startup initialization failed, bailing. rv=%X", rv);
-    CoreExit();
-  }
-}
-
-// Free all xpcom related resources before calling the xre shutdown call.
-// Must be called on the metro main thread. Currently called from appshell.
-void
-MetroApp::Shutdown()
-{
-  LogThread();
-
-  if (sCoreApp) {
-    sCoreApp->remove_Suspending(mSuspendEvent);
-    sCoreApp->remove_Resuming(mResumeEvent);
-  }
-
-  if (sFrameworkView) {
-    sFrameworkView->Shutdown();
-  }
-
-  MetroApp::sGeckoShuttingDown = true;
-
-  // Shut down xpcom
-  XRE_metroShutdown();
-
-  // Unhook this thread from the profiler
-  profiler_unregister_thread();
-}
-
-// Request a shutdown of the application
-void
-MetroApp::CoreExit()
-{
-  LogFunction();
-  HRESULT hr;
-  ComPtr<ICoreApplicationExit> coreExit;
-  HStringReference className(RuntimeClass_Windows_ApplicationModel_Core_CoreApplication);
-  hr = GetActivationFactory(className.Get(), coreExit.GetAddressOf());
-  NS_ASSERTION(SUCCEEDED(hr), "Activation of ICoreApplicationExit");
-  if (SUCCEEDED(hr)) {
-    coreExit->Exit();
-  }
-}
-
-void
-MetroApp::ActivateBaseView()
-{
-  if (sFrameworkView) {
-    sFrameworkView->ActivateView();
-  }
-}
-
-/*
- * TBD: when we support multiple widgets, we'll need a way to sync up the view
- * created in CreateView with the widget gecko creates. Currently we only have
- * one view (sFrameworkView) and one main widget.
- */
-void
-MetroApp::SetWidget(MetroWidget* aPtr)
-{
-  LogThread();
-
-  NS_ASSERTION(aPtr, "setting null base widget?");
-
-  // Both of these calls AddRef the ptr we pass in
-  aPtr->SetView(sFrameworkView.Get());
-  sFrameworkView->SetWidget(aPtr);
-}
-
-////////////////////////////////////////////////////
-// MetroApp events
-
-HRESULT
-MetroApp::OnSuspending(IInspectable* aSender, ISuspendingEventArgs* aArgs)
-{
-  LogThread();
-  PostSuspendResumeProcessNotification(true);
-  return S_OK;
-}
-
-HRESULT
-MetroApp::OnResuming(IInspectable* aSender, IInspectable* aArgs)
-{
-  LogThread();
-  PostSuspendResumeProcessNotification(false);
-  return S_OK;
-}
-
-HRESULT
-MetroApp::OnAsyncTileCreated(ABI::Windows::Foundation::IAsyncOperation<bool>* aOperation,
-                             AsyncStatus aStatus)
-{
-  WinUtils::Log("Async operation status: %d", aStatus);
-  MetroUtils::FireObserver("metro_on_async_tile_created");
-  return S_OK;
-}
-
-// static
-void
-MetroApp::PostSuspendResumeProcessNotification(const bool aIsSuspend)
-{
-  static bool isSuspend = false;
-  if (isSuspend == aIsSuspend) {
-    return;
-  }
-  isSuspend = aIsSuspend;
-  MetroUtils::FireObserver(aIsSuspend ? "suspend_process_notification" :
-                                        "resume_process_notification");
-}
-
-// static
-void
-MetroApp::PostSleepWakeNotification(const bool aIsSleep)
-{
-  static bool isSleep = false;
-  if (isSleep == aIsSleep) {
-    return;
-  }
-  isSleep = aIsSleep;
-  MetroUtils::FireObserver(aIsSleep ? "sleep_notification" :
-                                      "wake_notification");
-}
-
-} } }
-
-
-static bool
-IsBackgroundSessionClosedStartup()
-{
-  int argc;
-  LPWSTR *argv = CommandLineToArgvW(GetCommandLineW(), &argc);
-  bool backgroundSessionClosed = argc > 1 && !wcsicmp(argv[1], L"-BackgroundSessionClosed");
-  LocalFree(argv);
-  return backgroundSessionClosed;
-}
-
-bool
-XRE_MetroCoreApplicationRun()
-{
-  HRESULT hr;
-  LogThread();
-
-  using namespace mozilla::widget::winrt;
-
-  sMetroApp = Make<MetroApp>();
-
-  HStringReference className(RuntimeClass_Windows_ApplicationModel_Core_CoreApplication);
-  hr = GetActivationFactory(className.Get(), sCoreApp.GetAddressOf());
-  if (FAILED(hr)) {
-    LogHRESULT(hr);
-    return false;
-  }
-
-  // Perform any cleanup for unclean shutdowns here, such as when the background session
-  // is closed via the appbar on the left when outside of Metro.  Windows restarts the
-  // process solely for cleanup reasons.
-  if (IsBackgroundSessionClosedStartup() && SUCCEEDED(XRE_metroStartup(false))) {
-
-    // Whether or  not to use sessionstore depends on if the bak exists.  Since host process
-    // shutdown isn't a crash we shouldn't restore sessionstore.
-    nsCOMPtr<nsIFile> sessionBAK;
-    if (NS_FAILED(NS_GetSpecialDirectory("ProfDS", getter_AddRefs(sessionBAK)))) {
-      return false;
-    }
-
-    sessionBAK->AppendNative(nsDependentCString("sessionstore.bak"));
-    bool exists;
-    if (NS_SUCCEEDED(sessionBAK->Exists(&exists)) && exists) {
-      sessionBAK->Remove(false);
-    }
-    return false;
-  }
-
-  hr = sCoreApp->Run(sMetroApp.Get());
-
-  WinUtils::Log("Exiting CoreApplication::Run");
-
-  sCoreApp = nullptr;
-  sMetroApp = nullptr;
-
-  return true;
-}
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroApp.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroApp.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroApp.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroApp.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +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/. */
-
-#pragma once
-
-#include "mozwrlbase.h"
-
-#include <windows.system.h>
-#include <windows.ui.core.h>
-#include <Windows.ApplicationModel.core.h>
-#include <Windows.ApplicationModel.h>
-#include <Windows.Applicationmodel.Activation.h>
-
-class MetroWidget;
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-class MetroApp : public Microsoft::WRL::RuntimeClass<ABI::Windows::ApplicationModel::Core::IFrameworkViewSource>
-{
-  InspectableClass(L"MetroApp", TrustLevel::BaseTrust)
-
-  typedef ABI::Windows::UI::Core::CoreDispatcherPriority CoreDispatcherPriority;
-  typedef ABI::Windows::ApplicationModel::Activation::LaunchActivatedEventArgs LaunchActivatedEventArgs;
-  typedef ABI::Windows::ApplicationModel::ISuspendingEventArgs ISuspendingEventArgs;
-  typedef ABI::Windows::ApplicationModel::Core::IFrameworkView IFrameworkView;
-  typedef ABI::Windows::ApplicationModel::Core::ICoreApplication ICoreApplication;
-
-public:
-  // IFrameworkViewSource
-  STDMETHODIMP CreateView(IFrameworkView **viewProvider);
-
-  // ICoreApplication event
-  HRESULT OnSuspending(IInspectable* aSender, ISuspendingEventArgs* aArgs);
-  HRESULT OnResuming(IInspectable* aSender, IInspectable* aArgs);
-
-  // nsIWinMetroUtils tile related async callbacks
-  HRESULT OnAsyncTileCreated(ABI::Windows::Foundation::IAsyncOperation<bool>* aOperation, AsyncStatus aStatus);
-
-  void Run();
-  void CoreExit();
-  void Shutdown();
-  void ActivateBaseView();
-
-  // Set when gecko enters xpcom shutdown.
-  static bool sGeckoShuttingDown;
-
-  // Shared pointers between framework and widget
-  void SetWidget(MetroWidget* aPtr);
-
-  static void PostSuspendResumeProcessNotification(bool aIsSuspend);
-  static void PostSleepWakeNotification(bool aIsSuspend);
-
-private:
-  EventRegistrationToken mSuspendEvent;
-  EventRegistrationToken mResumeEvent;
-};
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroAppShell.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroAppShell.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroAppShell.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroAppShell.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,522 +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/. */
-
-#include "MetroAppShell.h"
-
-#include "mozilla/AutoRestore.h"
-#include "mozilla/TimeStamp.h"
-#include "mozilla/widget/AudioSession.h"
-#include "mozilla/ipc/WindowsMessageLoop.h"
-
-#include "nsIObserverService.h"
-#include "nsIAppStartup.h"
-#include "nsToolkitCompsCID.h"
-#include "nsIPowerManagerService.h"
-
-#include "nsXULAppAPI.h"
-#include "nsServiceManagerUtils.h"
-#include "WinUtils.h"
-#include "nsWinMetroUtils.h"
-#include "MetroUtils.h"
-#include "MetroApp.h"
-#include "FrameworkView.h"
-#include "WakeLockListener.h"
-
-#include <shellapi.h>
-
-using namespace mozilla;
-using namespace mozilla::widget;
-using namespace mozilla::widget::winrt;
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-using namespace ABI::Windows::UI::Core;
-using namespace ABI::Windows::Foundation;
-
-// ProcessNextNativeEvent message wait timeout, see bug 907410.
-#define MSG_WAIT_TIMEOUT 250
-// MetroInput will occasionally ask us to flush all input so that the dom is
-// up to date. This is the maximum amount of time we'll agree to spend in
-// NS_ProcessPendingEvents.
-#define PURGE_MAX_TIMEOUT 50
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-extern ComPtr<MetroApp> sMetroApp;
-} } }
-
-namespace mozilla {
-namespace widget {
-// pulled from win32 app shell
-extern UINT sAppShellGeckoMsgId;
-} }
-
-static ComPtr<ICoreWindowStatic> sCoreStatic;
-static bool sIsDispatching = false;
-static bool sShouldPurgeThreadQueue = false;
-static bool sBlockNativeEvents = false;
-static TimeStamp sPurgeThreadQueueStart;
-
-MetroAppShell::~MetroAppShell()
-{
-  if (mEventWnd) {
-    SendMessage(mEventWnd, WM_CLOSE, 0, 0);
-  }
-}
-
-nsresult
-MetroAppShell::Init()
-{
-  LogFunction();
-
-  WNDCLASSW wc;
-  HINSTANCE module = GetModuleHandle(nullptr);
-
-  mozilla::ipc::windows::InitUIThread();
-
-  const char16_t *const kWindowClass = L"nsAppShell:EventWindowClass";
-  if (!GetClassInfoW(module, kWindowClass, &wc)) {
-    wc.style         = 0;
-    wc.lpfnWndProc   = EventWindowProc;
-    wc.cbClsExtra    = 0;
-    wc.cbWndExtra    = 0;
-    wc.hInstance     = module;
-    wc.hIcon         = nullptr;
-    wc.hCursor       = nullptr;
-    wc.hbrBackground = (HBRUSH) nullptr;
-    wc.lpszMenuName  = (LPCWSTR) nullptr;
-    wc.lpszClassName = kWindowClass;
-    RegisterClassW(&wc);
-  }
-
-  mEventWnd = CreateWindowW(kWindowClass, L"nsAppShell:EventWindow",
-                           0, 0, 0, 10, 10, nullptr, nullptr, module, nullptr);
-  NS_ENSURE_STATE(mEventWnd);
-
-  nsresult rv;
-  nsCOMPtr<nsIObserverService> observerService = 
-    do_GetService("@mozilla.org/observer-service;1", &rv);
-  if (NS_SUCCEEDED(rv)) {
-    observerService->AddObserver(this, "dl-start", false);
-    observerService->AddObserver(this, "dl-done", false);
-    observerService->AddObserver(this, "dl-cancel", false);
-    observerService->AddObserver(this, "dl-failed", false);
-  }
-
-  return nsBaseAppShell::Init();
-}
-
-HRESULT
-SHCreateShellItemArrayFromShellItemDynamic(IShellItem *psi, REFIID riid, void **ppv)
-{
-  HMODULE shell32DLL = LoadLibraryW(L"shell32.dll");
-  if (!shell32DLL) {
-    return E_FAIL;
-  }
-
-  typedef BOOL (WINAPI* SHFn)(IShellItem *psi, REFIID riid, void **ppv);
-
-  HRESULT hr = E_FAIL;
-  SHFn SHCreateShellItemArrayFromShellItemDynamicPtr =
-    (SHFn)GetProcAddress(shell32DLL, "SHCreateShellItemArrayFromShellItem");
-  FreeLibrary(shell32DLL);
-  if (SHCreateShellItemArrayFromShellItemDynamicPtr) {
-    hr = SHCreateShellItemArrayFromShellItemDynamicPtr(psi, riid, ppv);
-  }
-
-  FreeLibrary(shell32DLL);
-  return hr;
-}
-
-HRESULT
-WinLaunchDeferredMetroFirefox()
-{
-  // Create an instance of the Firefox Metro CEH which is used to launch the browser
-  const CLSID CLSID_FirefoxMetroDEH = {0x5100FEC1,0x212B, 0x4BF5 ,{0x9B,0xF8, 0x3E,0x65, 0x0F,0xD7,0x94,0xA3}};
-
-  nsRefPtr<IExecuteCommand> executeCommand;
-  HRESULT hr = CoCreateInstance(CLSID_FirefoxMetroDEH,
-                                nullptr,
-                                CLSCTX_LOCAL_SERVER,
-                                IID_IExecuteCommand,
-                                getter_AddRefs(executeCommand));
-  if (FAILED(hr))
-    return hr;
-
-  // Get the currently running exe path
-  WCHAR exePath[MAX_PATH + 1] = { L'\0' };
-  if (!::GetModuleFileNameW(0, exePath, MAX_PATH))
-    return hr;
-
-  // Convert the path to a long path since GetModuleFileNameW returns the path
-  // that was used to launch Firefox which is not necessarily a long path.
-  if (!::GetLongPathNameW(exePath, exePath, MAX_PATH))
-    return hr;
-
-  // Create an IShellItem for the current browser path
-  nsRefPtr<IShellItem> shellItem;
-  hr = WinUtils::SHCreateItemFromParsingName(exePath, nullptr, IID_IShellItem,
-                                             getter_AddRefs(shellItem));
-  if (FAILED(hr))
-    return hr;
-
-  // Convert to an IShellItemArray which is used for the path to launch
-  nsRefPtr<IShellItemArray> shellItemArray;
-  hr = SHCreateShellItemArrayFromShellItemDynamic(shellItem, IID_IShellItemArray, getter_AddRefs(shellItemArray));
-  if (FAILED(hr))
-    return hr;
-
-  // Set the path to launch and parameters needed
-  nsRefPtr<IObjectWithSelection> selection;
-  hr = executeCommand->QueryInterface(IID_IObjectWithSelection, getter_AddRefs(selection));
-  if (FAILED(hr))
-    return hr;
-  hr = selection->SetSelection(shellItemArray);
-  if (FAILED(hr))
-    return hr;
-
-  if (nsWinMetroUtils::sUpdatePending) {
-    hr = executeCommand->SetParameters(L"--metro-update");
-  } else {
-    hr = executeCommand->SetParameters(L"--metro-restart");
-  }
-  if (FAILED(hr))
-    return hr;
-
-  // Run the default browser through the CEH
-  return executeCommand->Execute();
-}
-
-static WakeLockListener*
-InitWakeLock()
-{
-  nsCOMPtr<nsIPowerManagerService> powerManagerService =
-    do_GetService(POWERMANAGERSERVICE_CONTRACTID);
-  if (powerManagerService) {
-    WakeLockListener* pLock = new WakeLockListener();
-    powerManagerService->AddWakeLockListener(pLock);
-    return pLock;
-  }
-  else {
-    NS_WARNING("Failed to retrieve PowerManagerService, wakelocks will be broken!");
-  }
-  return nullptr;
-}
-
-static void
-ShutdownWakeLock(WakeLockListener* aLock)
-{
-  if (!aLock) {
-    return;
-  }
-  nsCOMPtr<nsIPowerManagerService> powerManagerService =
-    do_GetService(POWERMANAGERSERVICE_CONTRACTID);
-  if (powerManagerService) {
-    powerManagerService->RemoveWakeLockListener(aLock);
-  }
-}
-
-// Called by appstartup->run in xre, which is initiated by a call to
-// XRE_metroStartup in MetroApp. This call is on the metro main thread.
-NS_IMETHODIMP
-MetroAppShell::Run(void)
-{
-  LogFunction();
-  nsresult rv = NS_OK;
-
-  switch(XRE_GetProcessType()) {
-    case  GeckoProcessType_Content:
-    case GeckoProcessType_IPDLUnitTest:
-      mozilla::widget::StartAudioSession();
-      rv = nsBaseAppShell::Run();
-      mozilla::widget::StopAudioSession();
-    break;
-    case  GeckoProcessType_Plugin:
-      NS_WARNING("We don't support plugins currently.");
-      // Just exit
-      rv = NS_ERROR_NOT_IMPLEMENTED;
-    break;
-    case GeckoProcessType_Default: {
-      {
-        nsRefPtr<WakeLockListener> wakeLock = InitWakeLock();
-        mozilla::widget::StartAudioSession();
-        sMetroApp->ActivateBaseView();
-        rv = nsBaseAppShell::Run();
-        mozilla::widget::StopAudioSession();
-        ShutdownWakeLock(wakeLock);
-      }
-
-      nsCOMPtr<nsIAppStartup> appStartup (do_GetService(NS_APPSTARTUP_CONTRACTID));
-      bool restartingInMetro = false, restartingInDesktop = false;
-
-      if (!appStartup || NS_FAILED(appStartup->GetRestarting(&restartingInDesktop))) {
-        WinUtils::Log("appStartup->GetRestarting() unsuccessful");
-      }
-
-      if (appStartup && NS_SUCCEEDED(appStartup->GetRestartingTouchEnvironment(&restartingInMetro)) &&
-          restartingInMetro) {
-        restartingInDesktop = false;
-      }
-
-      // This calls XRE_metroShutdown() in xre. Shuts down gecko, including
-      // releasing the profile, and destroys MessagePump.
-      sMetroApp->Shutdown();
-
-      // Handle update restart or browser switch requests
-      if (restartingInDesktop) {
-        WinUtils::Log("Relaunching desktop browser");
-        // We can't call into the ceh to do this. Microsoft prevents switching to
-        // desktop unless we go through shell execute.
-        SHELLEXECUTEINFOW sinfo;
-        memset(&sinfo, 0, sizeof(SHELLEXECUTEINFOW));
-        sinfo.cbSize       = sizeof(SHELLEXECUTEINFOW);
-        // Per microsoft's metro style enabled desktop browser documentation
-        // SEE_MASK_FLAG_LOG_USAGE is needed if we want to change from immersive
-        // mode to desktop mode.
-        sinfo.fMask        = SEE_MASK_FLAG_LOG_USAGE;
-        // The ceh will filter out this fake target.
-        sinfo.lpFile       = L"http://-desktop/";
-        sinfo.lpVerb       = L"open";
-        sinfo.lpParameters = L"--desktop-restart";
-        sinfo.nShow        = SW_SHOWNORMAL;
-        ShellExecuteEx(&sinfo);
-      } else if (restartingInMetro) {
-        HRESULT hresult = WinLaunchDeferredMetroFirefox();
-        WinUtils::Log("Relaunching metro browser (hr=%X)", hresult);
-      }
-
-      // This will free the real main thread in CoreApplication::Run()
-      // once winrt cleans up this thread.
-      sMetroApp->CoreExit();
-    }
-    break;
-  }
-
-  return rv;
-}
-
-// Called in certain cases where we have async input events in the thread
-// queue and need to make sure they get dispatched before the stack unwinds.
-void // static
-MetroAppShell::MarkEventQueueForPurge()
-{
-  sShouldPurgeThreadQueue = true;
-
-  // If we're dispatching native events, wait until the dispatcher is
-  // off the stack.
-  if (sIsDispatching) {
-    return;
-  }
-
-  // Safe to process pending events now
-  DispatchAllGeckoEvents();
-}
-
-// Notification from MetroInput that all events it wanted delivered
-// have been dispatched. It is safe to start processing windowing
-// events.
-void // static
-MetroAppShell::InputEventsDispatched()
-{
-  sBlockNativeEvents = false;
-}
-
-// static
-void
-MetroAppShell::DispatchAllGeckoEvents()
-{
-  // Only do this if requested and when we're not shutting down
-  if (!sShouldPurgeThreadQueue || MetroApp::sGeckoShuttingDown) {
-    return;
-  }
-
-  NS_ASSERTION(NS_IsMainThread(), "DispatchAllGeckoEvents should be called on the main thread");
-
-  sShouldPurgeThreadQueue = false;
-  sPurgeThreadQueueStart = TimeStamp::Now();
-
-  sBlockNativeEvents = true;
-  nsIThread *thread = NS_GetCurrentThread();
-  NS_ProcessPendingEvents(thread, PURGE_MAX_TIMEOUT);
-  sBlockNativeEvents = false;
-}
-
-static void
-ProcessNativeEvents(CoreProcessEventsOption eventOption)
-{
-  HRESULT hr;
-  if (!sCoreStatic) {
-    hr = GetActivationFactory(HStringReference(L"Windows.UI.Core.CoreWindow").Get(), sCoreStatic.GetAddressOf());
-    NS_ASSERTION(SUCCEEDED(hr), "GetActivationFactory failed?");
-    AssertHRESULT(hr);
-  }
-
-  ComPtr<ICoreWindow> window;
-  AssertHRESULT(sCoreStatic->GetForCurrentThread(window.GetAddressOf()));
-  ComPtr<ICoreDispatcher> dispatcher;
-  hr = window->get_Dispatcher(&dispatcher);
-  NS_ASSERTION(SUCCEEDED(hr), "get_Dispatcher failed?");
-  AssertHRESULT(hr);
-  dispatcher->ProcessEvents(eventOption);
-}
-
-// static
-bool
-MetroAppShell::ProcessOneNativeEventIfPresent()
-{
-  if (sIsDispatching) {
-    // Calling into ProcessNativeEvents is harmless, but won't actually process any
-    // native events. So we log here so we can spot this and get a handle on the
-    // corner cases where this can happen.
-    WinUtils::Log("WARNING: Reentrant call into process events detected, returning early.");
-    return false;
-  }
-
-  {
-    AutoRestore<bool> dispatching(sIsDispatching);
-    sIsDispatching = true;
-    ProcessNativeEvents(CoreProcessEventsOption::CoreProcessEventsOption_ProcessOneIfPresent);
-  }
-
-  DispatchAllGeckoEvents();
-
-  return !!HIWORD(::GetQueueStatus(MOZ_QS_ALLEVENT));
-}
-
-bool
-MetroAppShell::ProcessNextNativeEvent(bool mayWait)
-{
-  // NS_ProcessPendingEvents will process thread events *and* call
-  // nsBaseAppShell::OnProcessNextEvent to process native events. However
-  // we do not want native events getting dispatched while we are trying
-  // to dispatch pending input in DispatchAllGeckoEvents since a native
-  // event may be a UIA Automation call coming in to check focus.
-  if (sBlockNativeEvents) {
-    if ((TimeStamp::Now() - sPurgeThreadQueueStart).ToMilliseconds()
-        < PURGE_MAX_TIMEOUT) {
-      return false;
-    }
-    sBlockNativeEvents = false;
-  }
-
-  if (ProcessOneNativeEventIfPresent()) {
-    return true;
-  }
-  if (mayWait) {
-    DWORD result = ::MsgWaitForMultipleObjectsEx(0, nullptr, MSG_WAIT_TIMEOUT,
-                                                 MOZ_QS_ALLEVENT,
-                                                 MWMO_INPUTAVAILABLE|MWMO_ALERTABLE);
-    NS_WARN_IF_FALSE(result != WAIT_FAILED, "Wait failed");
-  }
-  return ProcessOneNativeEventIfPresent();
-}
-
-void
-MetroAppShell::NativeCallback()
-{
-  NS_ASSERTION(NS_IsMainThread(), "Native callbacks must be on the metro main thread");
-
-  // We shouldn't process native events during xpcom shutdown - this can
-  // trigger unexpected xpcom event dispatching for the main thread when
-  // the thread manager is in the process of shutting down non-main threads,
-  // resulting in shutdown hangs.
-  if (MetroApp::sGeckoShuttingDown) {
-    return;
-  }
-
-  NativeEventCallback();
-}
-
-// static
-LRESULT CALLBACK
-MetroAppShell::EventWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  if (uMsg == sAppShellGeckoMsgId) {
-    MetroAppShell *as = reinterpret_cast<MetroAppShell *>(lParam);
-    as->NativeCallback();
-    NS_RELEASE(as);
-    return TRUE;
-  }
-  return DefWindowProc(hwnd, uMsg, wParam, lParam);
-}
-
-void
-MetroAppShell::ScheduleNativeEventCallback()
-{
-  NS_ADDREF_THIS();
-  PostMessage(mEventWnd, sAppShellGeckoMsgId, 0, reinterpret_cast<LPARAM>(this));
-}
-
-void
-MetroAppShell::DoProcessMoreGeckoEvents()
-{
-  ScheduleNativeEventCallback();
-}
-
-static HANDLE
-PowerCreateRequestDyn(REASON_CONTEXT *context)
-{
-  typedef HANDLE (WINAPI * PowerCreateRequestPtr)(REASON_CONTEXT *context);
-  static HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll");
-  static PowerCreateRequestPtr powerCreateRequest =
-    (PowerCreateRequestPtr)GetProcAddress(kernel32, "PowerCreateRequest");
-  if (!powerCreateRequest)
-    return INVALID_HANDLE_VALUE;
-  return powerCreateRequest(context);
-}
-
-static BOOL
-PowerClearRequestDyn(HANDLE powerRequest, POWER_REQUEST_TYPE requestType)
-{
-  typedef BOOL (WINAPI * PowerClearRequestPtr)(HANDLE powerRequest, POWER_REQUEST_TYPE requestType);
-  static HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll");
-  static PowerClearRequestPtr powerClearRequest =
-    (PowerClearRequestPtr)GetProcAddress(kernel32, "PowerClearRequest");
-  if (!powerClearRequest)
-    return FALSE;
-  return powerClearRequest(powerRequest, requestType);
-}
-
-static BOOL
-PowerSetRequestDyn(HANDLE powerRequest, POWER_REQUEST_TYPE requestType)
-{
-  typedef BOOL (WINAPI * PowerSetRequestPtr)(HANDLE powerRequest, POWER_REQUEST_TYPE requestType);
-  static HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll");
-  static PowerSetRequestPtr powerSetRequest =
-    (PowerSetRequestPtr)GetProcAddress(kernel32, "PowerSetRequest");
-  if (!powerSetRequest)
-    return FALSE;
-  return powerSetRequest(powerRequest, requestType);
-}
-
-NS_IMETHODIMP
-MetroAppShell::Observe(nsISupports *subject, const char *topic,
-                       const char16_t *data)
-{
-    NS_ENSURE_ARG_POINTER(topic);
-    if (!strcmp(topic, "dl-start")) {
-      if (mPowerRequestCount++ == 0) {
-        WinUtils::Log("Download started - Disallowing suspend");
-        REASON_CONTEXT context;
-        context.Version = POWER_REQUEST_CONTEXT_VERSION;
-        context.Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING;
-        context.Reason.SimpleReasonString = L"downloading";
-        mPowerRequest.own(PowerCreateRequestDyn(&context));
-        PowerSetRequestDyn(mPowerRequest, PowerRequestExecutionRequired);
-      }
-      return NS_OK;
-    } else if (!strcmp(topic, "dl-done") ||
-               !strcmp(topic, "dl-cancel") ||
-               !strcmp(topic, "dl-failed")) {
-      if (--mPowerRequestCount == 0 && mPowerRequest) {
-        WinUtils::Log("All downloads ended - Allowing suspend");
-        PowerClearRequestDyn(mPowerRequest, PowerRequestExecutionRequired); 
-        mPowerRequest.reset();
-      }
-      return NS_OK;
-    }
-
-    return nsBaseAppShell::Observe(subject, topic, data);
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroAppShell.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroAppShell.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroAppShell.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroAppShell.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +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/. */
-
-#pragma once
-
-#include "nsBaseAppShell.h"
-#include <windows.h>
-#include "nsWindowsHelpers.h"
-#include "nsIObserver.h"
-
-class MetroAppShell : public nsBaseAppShell
-{
-public:
-  NS_DECL_NSIOBSERVER
-
-  MetroAppShell() :
-    mEventWnd(nullptr),
-    mPowerRequestCount(0)
-  {
-  }
-
-  nsresult Init();
-  void DoProcessMoreGeckoEvents();
-  void NativeCallback();
-
-  static LRESULT CALLBACK EventWindowProc(HWND, UINT, WPARAM, LPARAM);
-  static bool ProcessOneNativeEventIfPresent();
-  static void MarkEventQueueForPurge();
-  static void InputEventsDispatched();
-
-protected:
-  NS_IMETHOD Run();
-
-  virtual void ScheduleNativeEventCallback();
-  virtual bool ProcessNextNativeEvent(bool mayWait);
-  static void DispatchAllGeckoEvents();
-  virtual ~MetroAppShell();
-
-  HWND mEventWnd;
-  nsAutoHandle mPowerRequest;
-  ULONG mPowerRequestCount;
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroContracts.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroContracts.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroContracts.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroContracts.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,576 +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/. */
-
-#include "FrameworkView.h"
-#include "MetroUtils.h"
-#include "nsICommandLineRunner.h"
-#include "nsNetUtil.h"
-#include "nsIDOMChromeWindow.h"
-#include "nsIURI.h"
-#include "nsPrintfCString.h"
-#include "mozilla/Services.h"
-#include <wrl/wrappers/corewrappers.h>
-#include <shellapi.h>
-#include <DXGIFormat.h>
-#include <d2d1_1.h>
-#include <printpreview.h>
-#include <D3D10.h>
-#include "MetroUIUtils.h"
-#include "nsIStringBundle.h"
-
-using namespace mozilla;
-using namespace ABI::Windows::Foundation;
-using namespace ABI::Windows::Foundation::Collections;
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-
-// Play to contract
-using namespace ABI::Windows::Media::PlayTo;
-
-// Activation contracts
-using namespace ABI::Windows::ApplicationModel::Activation;
-using namespace ABI::Windows::ApplicationModel::DataTransfer;
-using namespace ABI::Windows::ApplicationModel::Search;
-
-// Settings contract
-using namespace ABI::Windows::UI::ApplicationSettings;
-using namespace ABI::Windows::UI::Popups;
-
-// Print contract
-using namespace ABI::Windows::Graphics::Printing;
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-extern nsTArray<nsString>* sSettingsArray;
-
-void
-FrameworkView::SearchActivated(ComPtr<ISearchActivatedEventArgs>& aArgs, bool aStartup)
-{
-  if (!aArgs)
-    return;
-
-  HString data;
-  AssertHRESULT(aArgs->get_QueryText(data.GetAddressOf()));
-  if (WindowsIsStringEmpty(data.Get()))
-    return;
-
-  unsigned int length;
-  WinUtils::LogW(L"SearchActivated text=%s", data.GetRawBuffer(&length));
-  if (aStartup) {
-    WindowsDuplicateString(data.Get(), &sActivationURI);
-  } else {
-    PerformURILoadOrSearch(data);
-  }
-}
-
-void
-FrameworkView::FileActivated(ComPtr<IFileActivatedEventArgs>& aArgs, bool aStartup)
-{
-  if (!aArgs)
-    return;
-
-  ComPtr<IVectorView<ABI::Windows::Storage::IStorageItem*>> list;
-  AssertHRESULT(aArgs->get_Files(list.GetAddressOf()));
-  ComPtr<ABI::Windows::Storage::IStorageItem> item;
-  AssertHRESULT(list->GetAt(0, item.GetAddressOf()));
-  HString filePath;
-  AssertHRESULT(item->get_Path(filePath.GetAddressOf()));
-
-  if (aStartup) {
-    WindowsDuplicateString(filePath.Get(), &sActivationURI);
-  } else {
-    PerformURILoad(filePath);
-  }
-}
-
-void
-FrameworkView::LaunchActivated(ComPtr<ILaunchActivatedEventArgs>& aArgs, bool aStartup)
-{
-  if (!aArgs)
-    return;
-  HString data;
-  AssertHRESULT(aArgs->get_Arguments(data.GetAddressOf()));
-  if (WindowsIsStringEmpty(data.Get()))
-    return;
-
-  // If we're being launched from a secondary tile then we have a 2nd command line param of --url
-  // and a third of the secondary tile.  We want it in sActivationURI so that browser.js will
-  // load it in without showing the start UI.
-  int argc;
-  unsigned int length;
-  LPWSTR* argv = CommandLineToArgvW(data.GetRawBuffer(&length), &argc);
-  if (aStartup && argc == 2 &&
-      (!wcsicmp(argv[0], L"-url") ||
-       !wcsicmp(argv[0], L"--url") ||
-       !wcsicmp(argv[0], L"/url"))) {
-    WindowsCreateString(argv[1], wcslen(argv[1]), &sActivationURI);
-  } else {
-    // Some other command line or this is not a startup.
-    // If it is startup we process it later when XPCOM is initialilzed.
-    mActivationCommandLine = data.GetRawBuffer(&length);
-    if (!aStartup) {
-      ProcessLaunchArguments();
-    }
-  }
-}
-
-void
-FrameworkView::ProcessLaunchArguments()
-{
-  if (!mActivationCommandLine.Length())
-    return;
-
-  int argc;
-  LPWSTR* argv = CommandLineToArgvW(mActivationCommandLine.BeginReading(), &argc);
-  nsCOMPtr<nsICommandLineRunner> cmdLine =
-    (do_CreateInstance("@mozilla.org/toolkit/command-line;1"));
-  if (!cmdLine) {
-    NS_WARNING("Unable to instantiate command line runner.");
-    return;
-  }
-
-  LPSTR *argvUTF8 = new LPSTR[argc];
-  for (int i = 0; i < argc; ++i) {
-    NS_ConvertUTF16toUTF8 arg(argv[i]);
-    argvUTF8[i] = new char[arg.Length() + 1];
-    strcpy(argvUTF8[i], const_cast<char *>(arg.BeginReading()));
-    WinUtils::LogW(L"Launch arg[%d]: '%s'", i, argv[i]);
-  }
-
-  nsresult rv = cmdLine->Init(argc,
-                              argvUTF8,
-                              nullptr,
-                              nsICommandLine::STATE_REMOTE_EXPLICIT);
-  if (NS_SUCCEEDED(rv)) {
-    cmdLine->Run();
-  } else {
-    NS_WARNING("cmdLine->Init failed.");
-  }
-
-  for (int i = 0; i < argc; ++i) {
-    delete[] argvUTF8[i];
-  }
-  delete[] argvUTF8;
-}
-
-void
-FrameworkView::ProcessActivationArgs(IActivatedEventArgs* aArgs, bool aStartup)
-{
-  ActivationKind kind;
-  if (!aArgs || FAILED(aArgs->get_Kind(&kind)))
-    return;
-  ComPtr<IActivatedEventArgs> args(aArgs);
-  if (kind == ActivationKind::ActivationKind_Protocol) {
-    WinUtils::Log("Activation argument kind: Protocol");
-    ComPtr<IProtocolActivatedEventArgs> protoArgs;
-    AssertHRESULT(args.As(&protoArgs));
-    ComPtr<IUriRuntimeClass> uri;
-    AssertHRESULT(protoArgs->get_Uri(uri.GetAddressOf()));
-    if (!uri)
-      return;
-
-    HString data;
-    AssertHRESULT(uri->get_AbsoluteUri(data.GetAddressOf()));
-    if (WindowsIsStringEmpty(data.Get()))
-      return;
-
-    if (aStartup) {
-      WindowsDuplicateString(data.Get(), &sActivationURI);
-    } else {
-      PerformURILoad(data);
-    }
-  } else if (kind == ActivationKind::ActivationKind_Search) {
-    WinUtils::Log("Activation argument kind: Search");
-    ComPtr<ISearchActivatedEventArgs> searchArgs;
-    args.As(&searchArgs);
-    SearchActivated(searchArgs, aStartup);
-  } else if (kind == ActivationKind::ActivationKind_File) {
-    WinUtils::Log("Activation argument kind: File");
-    ComPtr<IFileActivatedEventArgs> fileArgs;
-    args.As(&fileArgs);
-    FileActivated(fileArgs, aStartup);
-  } else if (kind == ActivationKind::ActivationKind_Launch) {
-    WinUtils::Log("Activation argument kind: Launch");
-    ComPtr<ILaunchActivatedEventArgs> launchArgs;
-    args.As(&launchArgs);
-    LaunchActivated(launchArgs, aStartup);
-  }
-}
-
-void
-FrameworkView::SetupContracts()
-{
-  LogFunction();
-  HRESULT hr;
-
-  // Add support for the share charm to indicate that we share data to other apps
-  ComPtr<IDataTransferManagerStatics> transStatics;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_ApplicationModel_DataTransfer_DataTransferManager).Get(),
-                            transStatics.GetAddressOf());
-  AssertHRESULT(hr);
-  ComPtr<IDataTransferManager> trans;
-  AssertHRESULT(transStatics->GetForCurrentView(trans.GetAddressOf()));
-  trans->add_DataRequested(Callback<__FITypedEventHandler_2_Windows__CApplicationModel__CDataTransfer__CDataTransferManager_Windows__CApplicationModel__CDataTransfer__CDataRequestedEventArgs_t>(
-    this, &FrameworkView::OnDataShareRequested).Get(), &mDataTransferRequested);
-
-  // Add support for the search charm to indicate that you can search using our app.
-  ComPtr<ISearchPaneStatics> searchStatics;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_ApplicationModel_Search_SearchPane).Get(),
-                            searchStatics.GetAddressOf());
-  AssertHRESULT(hr);
-  ComPtr<ISearchPane> searchPane;
-  AssertHRESULT(searchStatics->GetForCurrentView(searchPane.GetAddressOf()));
-  searchPane->add_QuerySubmitted(Callback<__FITypedEventHandler_2_Windows__CApplicationModel__CSearch__CSearchPane_Windows__CApplicationModel__CSearch__CSearchPaneQuerySubmittedEventArgs_t>(
-    this, &FrameworkView::OnSearchQuerySubmitted).Get(), &mSearchQuerySubmitted);
-
-  // Add support for the devices play to charm
-  ComPtr<IPlayToManagerStatics> playToStatics;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_Media_PlayTo_PlayToManager).Get(),
-                            playToStatics.GetAddressOf());
-  AssertHRESULT(hr);
-  ComPtr<IPlayToManager> playTo;
-  AssertHRESULT(playToStatics->GetForCurrentView(playTo.GetAddressOf()));
-  playTo->add_SourceRequested(Callback<__FITypedEventHandler_2_Windows__CMedia__CPlayTo__CPlayToManager_Windows__CMedia__CPlayTo__CPlayToSourceRequestedEventArgs_t>(
-    this, &FrameworkView::OnPlayToSourceRequested).Get(), &mPlayToRequested);
-
-  // Add support for the settings charm
-  ComPtr<ISettingsPaneStatics> settingsPaneStatics;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_ApplicationSettings_SettingsPane).Get(),
-                            settingsPaneStatics.GetAddressOf());
-  AssertHRESULT(hr);
-  ComPtr<ISettingsPane> settingsPane;
-  AssertHRESULT(settingsPaneStatics->GetForCurrentView(settingsPane.GetAddressOf()));
-  settingsPane->add_CommandsRequested(Callback<__FITypedEventHandler_2_Windows__CUI__CApplicationSettings__CSettingsPane_Windows__CUI__CApplicationSettings__CSettingsPaneCommandsRequestedEventArgs_t>(
-    this, &FrameworkView::OnSettingsCommandsRequested).Get(), &mSettingsPane);
-
-  // Add support for the settings print charm
-  ComPtr<IPrintManagerStatic> printStatics;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Printing_PrintManager).Get(),
-                            printStatics.GetAddressOf());
-  AssertHRESULT(hr);
-  ComPtr<IPrintManager> printManager;
-  AssertHRESULT(printStatics->GetForCurrentView(printManager.GetAddressOf()));
-  printManager->add_PrintTaskRequested(Callback<__FITypedEventHandler_2_Windows__CGraphics__CPrinting__CPrintManager_Windows__CGraphics__CPrinting__CPrintTaskRequestedEventArgs_t>(
-    this, &FrameworkView::OnPrintTaskRequested).Get(), &mPrintManager);
-}
-
-void
-FrameworkView::PerformURILoad(HString& aURI)
-{
-  LogFunction();
-
-  unsigned int length;
-  WinUtils::LogW(L"PerformURILoad uri=%s", aURI.GetRawBuffer(&length));
-
-  nsCOMPtr<nsICommandLineRunner> cmdLine =
-    (do_CreateInstance("@mozilla.org/toolkit/command-line;1"));
-  if (!cmdLine) {
-    NS_WARNING("Unable to instantiate command line runner.");
-    return;
-  }
-
-  nsAutoCString utf8data(NS_ConvertUTF16toUTF8(aURI.GetRawBuffer(&length)));
-
-  // NB: The first argument gets stripped by nsICommandLineRunner::Init,
-  //     so it doesn't matter what we pass as the first argument, but we
-  //     have to pass something.
-  const char *argv[] = { "", // This argument gets stripped
-                         "-url",
-                         utf8data.BeginReading() };
-  nsresult rv = cmdLine->Init(ArrayLength(argv),
-                              const_cast<char **>(argv), nullptr,
-                              nsICommandLine::STATE_REMOTE_EXPLICIT);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("cmdLine->Init failed.");
-    return;
-  }
-  cmdLine->Run();
-}
-
-void
-FrameworkView::PerformSearch(HString& aQuery)
-{
-  LogFunction();
-
-  nsCOMPtr<nsICommandLineRunner> cmdLine =
-    (do_CreateInstance("@mozilla.org/toolkit/command-line;1"));
-  if (!cmdLine) {
-    NS_WARNING("Unable to instantiate command line runner.");
-    return;
-  }
-
-  nsAutoCString parameter;
-  parameter.Append('"');
-  unsigned int length;
-  parameter.Append(NS_ConvertUTF16toUTF8(aQuery.GetRawBuffer(&length)));
-  parameter.Append('"');
-
-  // NB: The first argument gets stripped by nsICommandLineRunner::Init,
-  //     so it doesn't matter what we pass as the first argument, but we
-  //     have to pass something.
-  const char *argv[] = { "", // This argument gets stripped
-                         "-search",
-                         parameter.BeginReading() };
-  nsresult rv = cmdLine->Init(ArrayLength(argv),
-                              const_cast<char **>(argv), nullptr,
-                              nsICommandLine::STATE_REMOTE_EXPLICIT);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("cmdLine->Init failed.");
-    return;
-  }
-  cmdLine->Run();
-}
-
-void
-FrameworkView::PerformURILoadOrSearch(HString& aString)
-{
-  LogFunction();
-
-  if (WindowsIsStringEmpty(aString.Get())) {
-    WinUtils::Log("Emptry string passed to PerformURILoadOrSearch");
-    return;
-  }
-
-  // If we have a URI then devert to load the URI directly
-  ComPtr<IUriRuntimeClass> uri;
-  MetroUtils::CreateUri(aString.Get(), uri);
-  if (uri) {
-    PerformURILoad(aString);
-  } else {
-    PerformSearch(aString);
-  }
-}
-
-HRESULT
-FrameworkView::OnDataShareRequested(IDataTransferManager* aDTM,
-                                    IDataRequestedEventArgs* aArg)
-{
-  // Only share pages that contain a title and a URI
-  nsCOMPtr<nsIMetroUIUtils> metroUIUtils = do_CreateInstance("@mozilla.org/metro-ui-utils;1");
-  if (!metroUIUtils)
-      return E_FAIL;
-
-  nsString url, title;
-  nsresult rv = metroUIUtils->GetCurrentPageURI(url);
-  nsresult rv2 = metroUIUtils->GetCurrentPageTitle(title);
-  if (NS_FAILED(rv) || NS_FAILED(rv2)) {
-    return E_FAIL;
-  }
-
-  // Get the package to share
-  HRESULT hr;
-  ComPtr<IDataRequest> request;
-  AssertRetHRESULT(hr = aArg->get_Request(request.GetAddressOf()), hr);
-  ComPtr<IDataPackage> dataPackage;
-  AssertRetHRESULT(hr = request->get_Data(dataPackage.GetAddressOf()), hr);
-  ComPtr<IDataPackagePropertySet> props;
-  AssertRetHRESULT(hr = dataPackage->get_Properties(props.GetAddressOf()), hr);
-
-  // Only add a URI to the package when there is no selected content.
-  // This is because most programs treat URIs as highest priority to generate
-  // their own preview, but we only want the selected content to show up.
-  bool hasSelectedContent = false;
-  metroUIUtils->GetHasSelectedContent(&hasSelectedContent);
-  if (!hasSelectedContent) {
-    ComPtr<IUriRuntimeClass> uri;
-    AssertRetHRESULT(hr = MetroUtils::CreateUri(HStringReference(url.BeginReading()).Get(), uri), hr);
-
-    // If there is no selection, then we don't support sharing for sites that
-    // are not HTTP, HTTPS, FTP, and FILE.
-    HString schemeHString;
-    uri->get_SchemeName(schemeHString.GetAddressOf());
-    unsigned int length;
-    LPCWSTR scheme = schemeHString.GetRawBuffer(&length);
-    if (!scheme || wcscmp(scheme, L"http") && wcscmp(scheme, L"https") &&
-        wcscmp(scheme, L"ftp") && wcscmp(scheme, L"file")) {
-      return S_OK;
-    }
-
-    AssertRetHRESULT(hr = dataPackage->SetUri(uri.Get()), hr);
-  }
-
-  // Add whatever content metroUIUtils wants us to for the text sharing
-  nsString shareText;
-  if (NS_SUCCEEDED(metroUIUtils->GetShareText(shareText)) && shareText.Length()) {
-    AssertRetHRESULT(hr = dataPackage->SetText(HStringReference(shareText.BeginReading()).Get()) ,hr);
-  }
-
-  // Add whatever content metroUIUtils wants us to for the HTML sharing
-  nsString shareHTML;
-  if (NS_SUCCEEDED(metroUIUtils->GetShareHTML(shareHTML)) && shareHTML.Length()) {
-    // The sharing format needs some special headers, so pass it through Windows
-    ComPtr<IHtmlFormatHelperStatics> htmlFormatHelper;
-    hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_ApplicationModel_DataTransfer_HtmlFormatHelper).Get(),
-                              htmlFormatHelper.GetAddressOf());
-    AssertRetHRESULT(hr, hr);
-    HSTRING fixedHTML;
-    htmlFormatHelper->CreateHtmlFormat(HStringReference(shareHTML.BeginReading()).Get(), &fixedHTML);
-
-    // And now add the fixed HTML to the data package
-    AssertRetHRESULT(hr = dataPackage->SetHtmlFormat(fixedHTML), hr);
-  }
-
-  // Obtain the brand name
-  nsCOMPtr<nsIStringBundleService> bundleService = 
-    do_GetService(NS_STRINGBUNDLE_CONTRACTID);
-  NS_ENSURE_TRUE(bundleService, E_FAIL);
-  nsCOMPtr<nsIStringBundle> brandBundle;
-  nsString brandName;
-  bundleService->CreateBundle("chrome://branding/locale/brand.properties",
-    getter_AddRefs(brandBundle));
-  NS_ENSURE_TRUE(brandBundle, E_FAIL);
-  if(brandBundle) {
-    brandBundle->GetStringFromName(MOZ_UTF16("brandFullName"),
-                                   getter_Copies(brandName));
-  }
-
-  // Set these properties at the end.  Otherwise users can get a
-  // "There was a problem with the data package" error when there
-  // is simply nothing to share.
-  props->put_ApplicationName(HStringReference(brandName.BeginReading()).Get());
-  if (title.Length()) {
-    props->put_Title(HStringReference(title.BeginReading()).Get());
-  } else {
-    props->put_Title(HStringReference(brandName.BeginReading()).Get());
-  }
-  props->put_Description(HStringReference(url.BeginReading()).Get());
-
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::OnSearchQuerySubmitted(ISearchPane* aPane,
-                                      ISearchPaneQuerySubmittedEventArgs* aArgs)
-{
-  LogFunction();
-  HString aQuery;
-  aArgs->get_QueryText(aQuery.GetAddressOf());
-  PerformURILoadOrSearch(aQuery);
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::OnSettingsCommandInvoked(IUICommand* aCommand)
-{
-  LogFunction();
-  HRESULT hr;
-  uint32_t id;
-  ComPtr<IPropertyValue> prop;
-  AssertRetHRESULT(hr = aCommand->get_Id((IInspectable**)prop.GetAddressOf()), hr);
-  AssertRetHRESULT(hr = prop->GetUInt32(&id), hr);
-
-  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
-  if (obs) {
-    NS_ConvertASCIItoUTF16 idStr(nsPrintfCString("%lu", id));
-    obs->NotifyObservers(nullptr, "metro-settings-entry-selected", idStr.BeginReading());
-  }
-
-  return S_OK;
-}
-
-void
-FrameworkView::AddSetting(ISettingsPaneCommandsRequestedEventArgs* aArgs,
-                          uint32_t aId, HString& aSettingName)
-{
-  HRESULT hr;
-
-  ComPtr<ABI::Windows::UI::ApplicationSettings::ISettingsPaneCommandsRequest> request;
-  AssertHRESULT(aArgs->get_Request(request.GetAddressOf()));
-
-  // ApplicationCommands - vector that holds SettingsCommand to be invoked
-  ComPtr<IVector<ABI::Windows::UI::ApplicationSettings::SettingsCommand*>> list;
-  AssertHRESULT(request->get_ApplicationCommands(list.GetAddressOf()));
-
-  ComPtr<IUICommand> command;
-  ComPtr<ISettingsCommandFactory> factory;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_ApplicationSettings_SettingsCommand).Get(),
-                            factory.GetAddressOf());
-  AssertHRESULT(hr);
-
-  // Create the IInspectable string property that identifies this command
-  ComPtr<IInspectable> prop;
-  ComPtr<IPropertyValueStatics> propStatics;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_Foundation_PropertyValue).Get(),
-                            propStatics.GetAddressOf());
-  AssertHRESULT(hr);
-  hr = propStatics->CreateUInt32(aId, prop.GetAddressOf());
-  AssertHRESULT(hr);
-
-  // Create the command
-  hr = factory->CreateSettingsCommand(prop.Get(), aSettingName.Get(),
-    Callback<ABI::Windows::UI::Popups::IUICommandInvokedHandler>(
-      this, &FrameworkView::OnSettingsCommandInvoked).Get(), command.GetAddressOf());
-  AssertHRESULT(hr);
-
-  // Add it to the list
-  hr = list->Append(command.Get());
-  AssertHRESULT(hr);
-}
-
-HRESULT
-FrameworkView::OnSettingsCommandsRequested(ISettingsPane* aPane,
-                                           ISettingsPaneCommandsRequestedEventArgs* aArgs)
-{
-  if (!sSettingsArray)
-    return E_FAIL;
-  if (!sSettingsArray->Length())
-    return S_OK;
-  for (uint32_t i = 0; i < sSettingsArray->Length(); i++) {
-    HString label;
-    label.Set(sSettingsArray->ElementAt(i).BeginReading());
-    AddSetting(aArgs, i, label);
-  }
-  return S_OK;
-}
-
-HRESULT
-FrameworkView::OnPlayToSourceRequested(IPlayToManager* aPlayToManager,
-                                       IPlayToSourceRequestedEventArgs* aArgs)
-{
-  // TODO: Implement PlayTo, find the element on the page and then do something similar to this:
-  // PlayToReceiver::Dispatcher.Helper.BeginInvoke(
-  // mMediaElement = ref new Windows::UI::Xaml::Controls::MediaElement();
-  // mMediaElement->Source = ref new Uri("http://www.youtube.com/watch?v=2U0NFgoNI7s");
-  // aArgs->SourceRequest->SetSource(mMediaElement->PlayToSource);
- return S_OK;
-}
-
-HRESULT
-FrameworkView::OnPrintTaskSourceRequested(IPrintTaskSourceRequestedArgs* aArgs)
-{
- return S_OK;
-}
-
-HRESULT
-FrameworkView::OnPrintTaskRequested(IPrintManager* aPrintManager,
-                                    IPrintTaskRequestedEventArgs* aArgs)
-{
- return S_OK;
-}
-
-void
-FrameworkView::CreatePrintControl(IPrintDocumentPackageTarget* docPackageTarget,
-                                  D2D1_PRINT_CONTROL_PROPERTIES* printControlProperties)
-{
-}
-
-HRESULT
-FrameworkView::ClosePrintControl()
-{
-  return S_OK;
-}
-
-// Print out one page, with the given print ticket.
-// This sample has only one page and we ignore pageNumber below.
-void FrameworkView::PrintPage(uint32_t pageNumber,
-                              D2D1_RECT_F imageableArea,
-                              D2D1_SIZE_F pageSize,
-                              IStream* pagePrintTicketStream)
-{
-}
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroD3DCheckHelper.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroD3DCheckHelper.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroD3DCheckHelper.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroD3DCheckHelper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +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/. */
-
-#pragma once
-
-/* this file is included by exe stubs, don't pull xpcom into it. */
-
-#include <d3d10_1.h>
-#include <dxgi.h>
-#include <d3d10misc.h>
-
-/*
- * Checks to see if the d3d implementation supports feature level 9.3 or
- * above. Metrofx can't run on systems that fail this check.
- *
- * Note, this can hit perf, don't call this unless you absolutely have to.
- * Both the ceh and winrt widget code save a cached result in the registry.
- */
-static bool D3DFeatureLevelCheck()
-{
-  HMODULE dxgiModule = LoadLibraryA("dxgi.dll");
-  if (!dxgiModule) {
-    return false;
-  }
-  decltype(CreateDXGIFactory1)* createDXGIFactory1 =
-    (decltype(CreateDXGIFactory1)*) GetProcAddress(dxgiModule, "CreateDXGIFactory1");
-  if (!createDXGIFactory1) {
-    FreeLibrary(dxgiModule);
-    return false;
-  }
-
-  HMODULE d3d10module = LoadLibraryA("d3d10_1.dll");
-  if (!d3d10module) {
-    FreeLibrary(dxgiModule);
-    return false;
-  }
-  decltype(D3D10CreateDevice1)* createD3DDevice =
-    (decltype(D3D10CreateDevice1)*) GetProcAddress(d3d10module,
-                                                   "D3D10CreateDevice1");
-  if (!createD3DDevice) {
-    FreeLibrary(d3d10module);
-    FreeLibrary(dxgiModule);
-    return false;
-  }
-
-  IDXGIFactory1* factory1;
-  if (FAILED(createDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&factory1))) {
-    FreeLibrary(d3d10module);
-    FreeLibrary(dxgiModule);
-    return false;
-  }
-
-  IDXGIAdapter1* adapter1;
-  if (FAILED(factory1->EnumAdapters1(0, &adapter1))) {
-    factory1->Release();
-    FreeLibrary(d3d10module);
-    FreeLibrary(dxgiModule);
-    return false;
-  }
-
-  // Try for DX10.1
-  ID3D10Device1* device;
-  if (FAILED(createD3DDevice(adapter1, D3D10_DRIVER_TYPE_HARDWARE, nullptr,
-                             D3D10_CREATE_DEVICE_BGRA_SUPPORT |
-                             D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
-                             D3D10_FEATURE_LEVEL_10_1,
-                             D3D10_1_SDK_VERSION, &device))) {
-    // Try for DX10
-    if (FAILED(createD3DDevice(adapter1, D3D10_DRIVER_TYPE_HARDWARE, nullptr,
-                               D3D10_CREATE_DEVICE_BGRA_SUPPORT |
-                               D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
-                               D3D10_FEATURE_LEVEL_10_0,
-                               D3D10_1_SDK_VERSION, &device))) {
-      // Try for DX9.3 (we fall back to cairo and cairo has support for D3D 9.3)
-      if (FAILED(createD3DDevice(adapter1, D3D10_DRIVER_TYPE_HARDWARE, nullptr,
-                                 D3D10_CREATE_DEVICE_BGRA_SUPPORT |
-                                 D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
-                                 D3D10_FEATURE_LEVEL_9_3,
-                                 D3D10_1_SDK_VERSION, &device))) {
-        adapter1->Release();
-        factory1->Release();
-        FreeLibrary(d3d10module);
-        FreeLibrary(dxgiModule);
-        return false;
-      }
-    }
-  }
-  device->Release();
-  adapter1->Release();
-  factory1->Release();
-  FreeLibrary(d3d10module);
-  FreeLibrary(dxgiModule);
-  return true;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroInput.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroInput.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroInput.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroInput.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1573 +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/. */
-
-// Moz headers (alphabetical)
-#include "MetroInput.h"
-#include "MetroUtils.h" // Logging, POINT_CEIL_*, ActivateGenericInstance, etc
-#include "MetroWidget.h" // MetroInput::mWidget
-#include "mozilla/dom/Touch.h"  // Touch
-#include "nsTArray.h" // Touch lists
-#include "nsIDOMSimpleGestureEvent.h" // Constants for gesture events
-#include "InputData.h"
-#include "UIABridgePrivate.h"
-#include "MetroAppShell.h"
-#include "mozilla/EventStateManager.h"
-#include "mozilla/EventStates.h"
-#include "mozilla/MouseEvents.h"
-#include "mozilla/TouchEvents.h"
-#include "mozilla/Preferences.h"  // for Preferences
-#include "WinUtils.h"
-#include "nsIPresShell.h"
-#include "nsPoint.h"
-
-// System headers (alphabetical)
-#include <windows.ui.core.h> // ABI::Window::UI::Core namespace
-#include <windows.ui.input.h> // ABI::Window::UI::Input namespace
-
-//#define DEBUG_INPUT
-
-// Using declarations
-using namespace ABI::Windows; // UI, System, Foundation namespaces
-using namespace Microsoft; // WRL namespace (ComPtr, possibly others)
-using namespace mozilla;
-using namespace mozilla::widget;
-using namespace mozilla::widget::winrt;
-using namespace mozilla::dom;
-
-// File-scoped statics (unnamed namespace)
-namespace {
-  // XXX: Set these min values appropriately
-  const double SWIPE_MIN_DISTANCE = 5.0;
-  const double SWIPE_MIN_VELOCITY = 5.0;
-
-  // Convenience typedefs for event handler types
-  typedef Foundation::__FITypedEventHandler_2_Windows__CUI__CInput__CEdgeGesture_Windows__CUI__CInput__CEdgeGestureEventArgs_t EdgeGestureHandler;
-  typedef Foundation::__FITypedEventHandler_2_Windows__CUI__CCore__CCoreDispatcher_Windows__CUI__CCore__CAcceleratorKeyEventArgs_t AcceleratorKeyActivatedHandler;
-  typedef Foundation::__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs_t PointerEventHandler;
-  typedef Foundation::__FITypedEventHandler_2_Windows__CUI__CInput__CGestureRecognizer_Windows__CUI__CInput__CTappedEventArgs_t TappedEventHandler;
-  typedef Foundation::__FITypedEventHandler_2_Windows__CUI__CInput__CGestureRecognizer_Windows__CUI__CInput__CRightTappedEventArgs_t RightTappedEventHandler;
-  typedef Foundation::__FITypedEventHandler_2_Windows__CUI__CInput__CGestureRecognizer_Windows__CUI__CInput__CManipulationStartedEventArgs_t ManipulationStartedEventHandler;
-  typedef Foundation::__FITypedEventHandler_2_Windows__CUI__CInput__CGestureRecognizer_Windows__CUI__CInput__CManipulationUpdatedEventArgs_t ManipulationUpdatedEventHandler;
-  typedef Foundation::__FITypedEventHandler_2_Windows__CUI__CInput__CGestureRecognizer_Windows__CUI__CInput__CManipulationCompletedEventArgs_t ManipulationCompletedEventHandler;
-
-  // Other convenience typedefs
-  typedef ABI::Windows::UI::Core::ICoreAcceleratorKeys ICoreAcceleratorKeys;
-
-  /**
-   * Specifies whether touch-action property is in force.
-   */
-  static bool gTouchActionPropertyEnabled = false;
-
-  /**
-   * Creates and returns a new {@link Touch} from the given
-   * ABI::Windows::UI::Input::IPointerPoint.  Note that the caller is
-   * responsible for freeing the memory for the Touch returned from
-   * this function.
-   *
-   * @param aPoint the ABI::Windows::UI::Input::IPointerPoint containing the
-   *               metadata from which to create our new {@link Touch}
-   * @return a new {@link Touch} representing the touch point. The caller
-   *         is responsible for freeing the memory for this touch point.
-   */
-  Touch*
-  CreateDOMTouch(UI::Input::IPointerPoint* aPoint) {
-    WRL::ComPtr<UI::Input::IPointerPointProperties> props;
-    Foundation::Point position;
-    uint32_t pointerId;
-    Foundation::Rect contactRect;
-    float pressure;
-    float tiltX;
-    float tiltY;
-
-    aPoint->get_Properties(props.GetAddressOf());
-    aPoint->get_Position(&position);
-    aPoint->get_PointerId(&pointerId);
-    props->get_ContactRect(&contactRect);
-    props->get_Pressure(&pressure);
-    props->get_XTilt(&tiltX);
-    props->get_YTilt(&tiltY);
-
-    nsIntPoint touchPoint = MetroUtils::LogToPhys(position);
-    nsIntPoint touchRadius;
-    touchRadius.x = WinUtils::LogToPhys(contactRect.Width) / 2;
-    touchRadius.y = WinUtils::LogToPhys(contactRect.Height) / 2;
-    Touch* touch =
-           new Touch(pointerId,
-                     touchPoint,
-                     // Rotation radius and angle.
-                     // W3C touch events v1 do not use these.
-                     // The draft for W3C touch events v2 explains that
-                     // radius and angle should describe the ellipse that
-                     // most closely circumscribes the touching area.  Since
-                     // Windows gives us a bounding rectangle rather than an
-                     // ellipse, we provide the ellipse that is most closely
-                     // circumscribed by the bounding rectangle that Windows
-                     // gave us.
-                     touchRadius,
-                     0.0f,
-                     // Pressure
-                     // W3C touch events v1 do not use this.
-                     // The current draft for W3C touch events v2 says that
-                     // this should be a value between 0.0 and 1.0, which is
-                     // consistent with what Windows provides us here.
-                     // XXX: Windows defaults to 0.5, but the current W3C
-                     // draft says that the value should be 0.0 if no value
-                     // known.
-                     pressure);
-    touch->tiltX = tiltX;
-    touch->tiltY = tiltY;
-    return touch;
-  }
-
-  /**
-   * Test if a touchpoint position has moved. See Touch.Equals for
-   * criteria.
-   *
-   * @param aTouch previous touch point
-   * @param aPoint new winrt touch point
-   * @return true if the point has moved
-   */
-  bool
-  HasPointMoved(Touch* aTouch, UI::Input::IPointerPoint* aPoint) {
-    WRL::ComPtr<UI::Input::IPointerPointProperties> props;
-    Foundation::Point position;
-    Foundation::Rect contactRect;
-    float pressure;
-
-    aPoint->get_Properties(props.GetAddressOf());
-    aPoint->get_Position(&position);
-    props->get_ContactRect(&contactRect);
-    props->get_Pressure(&pressure);
-    nsIntPoint touchPoint = MetroUtils::LogToPhys(position);
-    nsIntPoint touchRadius;
-    touchRadius.x = WinUtils::LogToPhys(contactRect.Width) / 2;
-    touchRadius.y = WinUtils::LogToPhys(contactRect.Height) / 2;
-
-    // from Touch.Equals
-    return touchPoint != aTouch->mRefPoint ||
-           pressure != aTouch->Force() ||
-           /* mRotationAngle == aTouch->RotationAngle() || */
-           touchRadius.x != aTouch->RadiusX() ||
-           touchRadius.y != aTouch->RadiusY();
-  }
-
-  /**
-   * Converts from the Devices::Input::PointerDeviceType enumeration
-   * to a nsIDOMMouseEvent::MOZ_SOURCE_* value.
-   *
-   * @param aDeviceType the value to convert
-   * @param aMozInputSource the converted value
-   */
-  void
-  MozInputSourceFromDeviceType(
-              Devices::Input::PointerDeviceType const& aDeviceType,
-              unsigned short& aMozInputSource) {
-    if (Devices::Input::PointerDeviceType::PointerDeviceType_Mouse
-                  == aDeviceType) {
-      aMozInputSource = nsIDOMMouseEvent::MOZ_SOURCE_MOUSE;
-    } else if (Devices::Input::PointerDeviceType::PointerDeviceType_Touch
-                  == aDeviceType) {
-      aMozInputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
-    } else if (Devices::Input::PointerDeviceType::PointerDeviceType_Pen
-                  == aDeviceType) {
-      aMozInputSource = nsIDOMMouseEvent::MOZ_SOURCE_PEN;
-    }
-  }
-
-  int16_t
-  ButtonsForPointerPoint(UI::Input::IPointerPoint* aPoint) {
-    WRL::ComPtr<UI::Input::IPointerPointProperties> props;
-    aPoint->get_Properties(props.GetAddressOf());
-
-    int16_t buttons = 0;
-    boolean buttonPressed;
-
-    props->get_IsLeftButtonPressed(&buttonPressed);
-    if (buttonPressed) {
-      buttons |= WidgetMouseEvent::eLeftButtonFlag;
-    }
-    props->get_IsMiddleButtonPressed(&buttonPressed);
-    if (buttonPressed) {
-      buttons |= WidgetMouseEvent::eMiddleButtonFlag;
-    }
-    props->get_IsRightButtonPressed(&buttonPressed);
-    if (buttonPressed) {
-      buttons |= WidgetMouseEvent::eRightButtonFlag;
-    }
-    props->get_IsXButton1Pressed(&buttonPressed);
-    if (buttonPressed) {
-      buttons |= WidgetMouseEvent::e4thButtonFlag;
-    }
-    props->get_IsXButton2Pressed(&buttonPressed);
-    if (buttonPressed) {
-      buttons |= WidgetMouseEvent::e5thButtonFlag;
-    }
-    return buttons;
-  }
-
-  /**
-   * This function is for use with mTouches.Enumerate.  It will
-   * append each element it encounters to the {@link nsTArray}
-   * of {@link mozilla::dom::Touch}es passed in through the third (void*)
-   * parameter.
-   *
-   * NOTE: This function will set the `mChanged` member of each
-   * element it encounters to `false`, since this function is only
-   * used to populate a touchlist that is about to be dispatched
-   * in a gecko touch event.
-   *
-   * @param aKey the key of the current element being enumerated
-   * @param aData the value of the current element being enumerated
-   * @param aTouchList the {@link WidgetTouchEvent::TouchArray} to append to
-   */
-  PLDHashOperator
-  AppendToTouchList(const unsigned int& aKey,
-                    nsRefPtr<Touch>& aData,
-                    void *aTouchList)
-  {
-    WidgetTouchEvent::TouchArray* touches =
-              static_cast<WidgetTouchEvent::TouchArray*>(aTouchList);
-    nsRefPtr<Touch> copy = new Touch(aData->mIdentifier,
-               aData->mRefPoint,
-               aData->mRadius,
-               aData->mRotationAngle,
-               aData->mForce);
-    copy->tiltX = aData->tiltX;
-    copy->tiltY = aData->tiltY;
-    touches->AppendElement(copy);
-    aData->mChanged = false;
-    return PL_DHASH_NEXT;
-  }
-
-  // Helper for making sure event ptrs get freed.
-  class AutoDeleteEvent
-  {
-  public:
-    AutoDeleteEvent(WidgetGUIEvent* aPtr) :
-      mPtr(aPtr) {}
-    ~AutoDeleteEvent() {
-      if (mPtr) {
-        delete mPtr;
-      }
-    }
-    WidgetGUIEvent* mPtr;
-  };
-}
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-MetroInput::InputPrecisionLevel MetroInput::sCurrentInputLevel =
-  MetroInput::InputPrecisionLevel::LEVEL_IMPRECISE;
-
-MetroInput::MetroInput(MetroWidget* aWidget,
-                       UI::Core::ICoreWindow* aWindow)
-              : mWidget(aWidget),
-                mNonApzTargetForTouch(false),
-                mWindow(aWindow),
-                mInputBlockId(0)
-{
-  LogFunction();
-  NS_ASSERTION(aWidget, "Attempted to create MetroInput for null widget!");
-  NS_ASSERTION(aWindow, "Attempted to create MetroInput for null window!");
-
-  mWidget->SetApzPendingResponseFlusher(this);
-
-  Preferences::AddBoolVarCache(&gTouchActionPropertyEnabled, "layout.css.touch_action.enabled", gTouchActionPropertyEnabled);
-  mTokenPointerPressed.value = 0;
-  mTokenPointerReleased.value = 0;
-  mTokenPointerMoved.value = 0;
-  mTokenPointerEntered.value = 0;
-  mTokenPointerExited.value = 0;
-  mTokenEdgeStarted.value = 0;
-  mTokenEdgeCanceled.value = 0;
-  mTokenEdgeCompleted.value = 0;
-  mTokenManipulationCompleted.value = 0;
-  mTokenTapped.value = 0;
-  mTokenRightTapped.value = 0;
-
-  // Create our Gesture Recognizer
-  ActivateGenericInstance(RuntimeClass_Windows_UI_Input_GestureRecognizer,
-                          mGestureRecognizer);
-  NS_ASSERTION(mGestureRecognizer, "Failed to create GestureRecognizer!");
-
-  RegisterInputEvents();
-}
-
-MetroInput::~MetroInput()
-{
-  LogFunction();
-  UnregisterInputEvents();
-}
-
-/* static */
-bool MetroInput::IsInputModeImprecise()
-{
-  return sCurrentInputLevel == LEVEL_IMPRECISE;
-}
-
-/**
- * Tracks the current input level (precise/imprecise) and fires an observer
- * when the mode changes.
- */
-void
-MetroInput::UpdateInputLevel(InputPrecisionLevel aInputLevel)
-{
-  // ignore mouse input if we have active touch input.
-  if (aInputLevel == LEVEL_PRECISE && mTouches.Count() > 0) {
-    return;
-  }
-  if (sCurrentInputLevel != aInputLevel) {
-    sCurrentInputLevel = aInputLevel;
-    MetroUtils::FireObserver(sCurrentInputLevel == LEVEL_PRECISE ?
-                               "metro_precise_input" : "metro_imprecise_input");
-  }
-}
-
-/**
- * Processes an IEdgeGestureEventArgs and returns the input source type
- * for the event. Also updates input level via UpdateInputLevel.
- */
-uint16_t
-MetroInput::ProcessInputTypeForGesture(UI::Input::IEdgeGestureEventArgs* aArgs)
-{
-  MOZ_ASSERT(aArgs);
-  UI::Input::EdgeGestureKind kind;
-  aArgs->get_Kind(&kind);
-  switch(kind) {
-    case UI::Input::EdgeGestureKind::EdgeGestureKind_Touch:
-      UpdateInputLevel(LEVEL_IMPRECISE);
-      return nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
-    break;
-    case UI::Input::EdgeGestureKind::EdgeGestureKind_Keyboard:
-      return nsIDOMMouseEvent::MOZ_SOURCE_KEYBOARD;
-    break;
-    case UI::Input::EdgeGestureKind::EdgeGestureKind_Mouse:
-      UpdateInputLevel(LEVEL_PRECISE);
-      return nsIDOMMouseEvent::MOZ_SOURCE_MOUSE;
-    break;
-  }
-  return nsIDOMMouseEvent::MOZ_SOURCE_UNKNOWN;
-}
-
-/**
- * When the user swipes her/his finger in from the top of the screen,
- * we receive this event.
- *
- * @param sender the CoreDispatcher that fired this event
- * @param aArgs the event-specific args we use when processing this event
- * @returns S_OK
- */
-HRESULT
-MetroInput::OnEdgeGestureStarted(UI::Input::IEdgeGesture* sender,
-                                 UI::Input::IEdgeGestureEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-  WidgetSimpleGestureEvent geckoEvent(true,
-                                      NS_SIMPLE_GESTURE_EDGE_STARTED,
-                                      mWidget.Get());
-  mModifierKeyState.Update();
-  mModifierKeyState.InitInputEvent(geckoEvent);
-  geckoEvent.time = ::GetMessageTime();
-  geckoEvent.inputSource = ProcessInputTypeForGesture(aArgs);
-
-  // Safe
-  DispatchEventIgnoreStatus(&geckoEvent);
-  return S_OK;
-}
-
-/**
- * This event can be received if the user swipes her/his finger back to
- * the top of the screen, or continues moving her/his finger such that
- * the movement is interpreted as a "grab this window" gesture
- *
- * @param sender the CoreDispatcher that fired this event
- * @param aArgs the event-specific args we use when processing this event
- * @returns S_OK
- */
-HRESULT
-MetroInput::OnEdgeGestureCanceled(UI::Input::IEdgeGesture* sender,
-                                  UI::Input::IEdgeGestureEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-  WidgetSimpleGestureEvent geckoEvent(true,
-                                      NS_SIMPLE_GESTURE_EDGE_CANCELED,
-                                      mWidget.Get());
-  mModifierKeyState.Update();
-  mModifierKeyState.InitInputEvent(geckoEvent);
-  geckoEvent.time = ::GetMessageTime();
-  geckoEvent.inputSource = ProcessInputTypeForGesture(aArgs);
-
-  // Safe
-  DispatchEventIgnoreStatus(&geckoEvent);
-  return S_OK;
-}
-
-/**
- * This event is received if the user presses ctrl+Z or lifts her/his
- * finger after causing an EdgeGestureStarting event to fire.
- *
- * @param sender the CoreDispatcher that fired this event
- * @param aArgs the event-specific args we use when processing this event
- * @returns S_OK
- */
-HRESULT
-MetroInput::OnEdgeGestureCompleted(UI::Input::IEdgeGesture* sender,
-                                   UI::Input::IEdgeGestureEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-  WidgetSimpleGestureEvent geckoEvent(true,
-                                      NS_SIMPLE_GESTURE_EDGE_COMPLETED,
-                                      mWidget.Get());
-  mModifierKeyState.Update();
-  mModifierKeyState.InitInputEvent(geckoEvent);
-  geckoEvent.time = ::GetMessageTime();
-  geckoEvent.inputSource = ProcessInputTypeForGesture(aArgs);
-
-  // Safe
-  DispatchEventIgnoreStatus(&geckoEvent);
-  return S_OK;
-}
-
-/**
- * This helper function is used by our processing of PointerPressed,
- * PointerReleased, and PointerMoved events.
- * It dispatches a gecko event in response to the input received.  This
- * function should only be called for non-touch (i.e. pen or mouse) input
- * events.
- *
- * @param aPoint the PointerPoint for the input event
- */
-void
-MetroInput::OnPointerNonTouch(UI::Input::IPointerPoint* aPoint) {
-  WRL::ComPtr<UI::Input::IPointerPointProperties> props;
-  UI::Input::PointerUpdateKind pointerUpdateKind;
-
-  aPoint->get_Properties(props.GetAddressOf());
-  props->get_PointerUpdateKind(&pointerUpdateKind);
-
-  uint32_t message = NS_MOUSE_MOVE;
-  int16_t button = 0;
-
-  switch (pointerUpdateKind) {
-    case UI::Input::PointerUpdateKind::PointerUpdateKind_LeftButtonPressed:
-      button = WidgetMouseEvent::buttonType::eLeftButton;
-      message = NS_MOUSE_BUTTON_DOWN;
-      break;
-    case UI::Input::PointerUpdateKind::PointerUpdateKind_MiddleButtonPressed:
-      button = WidgetMouseEvent::buttonType::eMiddleButton;
-      message = NS_MOUSE_BUTTON_DOWN;
-      break;
-    case UI::Input::PointerUpdateKind::PointerUpdateKind_RightButtonPressed:
-      button = WidgetMouseEvent::buttonType::eRightButton;
-      message = NS_MOUSE_BUTTON_DOWN;
-      break;
-    case UI::Input::PointerUpdateKind::PointerUpdateKind_LeftButtonReleased:
-      button = WidgetMouseEvent::buttonType::eLeftButton;
-      message = NS_MOUSE_BUTTON_UP;
-      break;
-    case UI::Input::PointerUpdateKind::PointerUpdateKind_MiddleButtonReleased:
-      button = WidgetMouseEvent::buttonType::eMiddleButton;
-      message = NS_MOUSE_BUTTON_UP;
-      break;
-    case UI::Input::PointerUpdateKind::PointerUpdateKind_RightButtonReleased:
-      button = WidgetMouseEvent::buttonType::eRightButton;
-      message = NS_MOUSE_BUTTON_UP;
-      break;
-  }
-
-  UpdateInputLevel(LEVEL_PRECISE);
-
-  WidgetMouseEvent* event =
-    new WidgetMouseEvent(true, message, mWidget.Get(),
-                         WidgetMouseEvent::eReal,
-                         WidgetMouseEvent::eNormal);
-  event->button = button;
-  aPoint->get_PointerId(&event->pointerId);
-  InitGeckoMouseEventFromPointerPoint(event, aPoint);
-  DispatchAsyncEventIgnoreStatus(event);
-}
-
-void
-MetroInput::InitTouchEventTouchList(WidgetTouchEvent* aEvent)
-{
-  MOZ_ASSERT(aEvent);
-  mTouches.Enumerate(&AppendToTouchList,
-                      static_cast<void*>(&aEvent->touches));
-}
-
-bool
-MetroInput::ShouldDeliverInputToRecognizer()
-{
-  return mRecognizerWantsEvents;
-}
-
-void
-MetroInput::GetAllowedTouchBehavior(WidgetTouchEvent* aTransformedEvent, nsTArray<TouchBehaviorFlags>& aOutBehaviors)
-{
-  for (uint32_t i = 0; i < aTransformedEvent->touches.Length(); i++) {
-    // performing hit testing fallback: asking content to perform hit testing itself
-    // (in spite that this operation has high latency).
-    aOutBehaviors.AppendElement(mWidget->ContentGetAllowedTouchBehavior(aTransformedEvent->touches[i]->mRefPoint));
-  }
-}
-
-// This event is raised when the user pushes the left mouse button, presses a
-// pen to the surface, or presses a touch screen.
-HRESULT
-MetroInput::OnPointerPressed(UI::Core::ICoreWindow* aSender,
-                             UI::Core::IPointerEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-
-  WRL::ComPtr<UI::Input::IPointerPoint> currentPoint;
-  WRL::ComPtr<Devices::Input::IPointerDevice> device;
-  Devices::Input::PointerDeviceType deviceType;
-
-  aArgs->get_CurrentPoint(currentPoint.GetAddressOf());
-  currentPoint->get_PointerDevice(device.GetAddressOf());
-  device->get_PointerDeviceType(&deviceType);
-
-  // For mouse and pen input, simply call our helper function
-  if (deviceType !=
-          Devices::Input::PointerDeviceType::PointerDeviceType_Touch) {
-    OnPointerNonTouch(currentPoint.Get());
-    mGestureRecognizer->ProcessDownEvent(currentPoint.Get());
-    return S_OK;
-  }
-
-  // This is touch input.
-  UpdateInputLevel(LEVEL_IMPRECISE);
-
-  // Create the new touch point and add it to our event.
-  uint32_t pointerId;
-  currentPoint->get_PointerId(&pointerId);
-  nsRefPtr<Touch> touch = CreateDOMTouch(currentPoint.Get());
-  touch->mChanged = true;
-  mTouches.Put(pointerId, touch);
-
-  WidgetTouchEvent* touchEvent =
-    new WidgetTouchEvent(true, NS_TOUCH_START, mWidget.Get());
-
-  if (mTouches.Count() == 1) {
-    // If this is the first touchstart of a touch session reset some
-    // tracking flags.
-    mRecognizerWantsEvents = true;
-  }
-
-  InitTouchEventTouchList(touchEvent);
-  DispatchAsyncTouchEvent(touchEvent);
-
-  if (ShouldDeliverInputToRecognizer()) {
-    mGestureRecognizer->ProcessDownEvent(currentPoint.Get());
-  }
-  return S_OK;
-}
-
-void
-MetroInput::AddPointerMoveDataToRecognizer(UI::Core::IPointerEventArgs* aArgs)
-{
-  if (ShouldDeliverInputToRecognizer()) {
-    WRL::ComPtr<Foundation::Collections::IVector<UI::Input::PointerPoint*>>
-        pointerPoints;
-    aArgs->GetIntermediatePoints(pointerPoints.GetAddressOf());
-    mGestureRecognizer->ProcessMoveEvents(pointerPoints.Get());
-  }
-}
-
-// This event is raised when the user moves the mouse, moves a pen that is
-// in contact with the surface, or moves a finger that is in contact with
-// a touch screen.
-HRESULT
-MetroInput::OnPointerMoved(UI::Core::ICoreWindow* aSender,
-                           UI::Core::IPointerEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-
-  WRL::ComPtr<UI::Input::IPointerPoint> currentPoint;
-  WRL::ComPtr<Devices::Input::IPointerDevice> device;
-  Devices::Input::PointerDeviceType deviceType;
-
-  aArgs->get_CurrentPoint(currentPoint.GetAddressOf());
-  currentPoint->get_PointerDevice(device.GetAddressOf());
-  device->get_PointerDeviceType(&deviceType);
-
-  // For mouse and pen input, simply call our helper function
-  if (deviceType !=
-          Devices::Input::PointerDeviceType::PointerDeviceType_Touch) {
-    OnPointerNonTouch(currentPoint.Get());
-    AddPointerMoveDataToRecognizer(aArgs);
-    return S_OK;
-  }
-
-  // This is touch input.
-  UpdateInputLevel(LEVEL_IMPRECISE);
-
-  // Get the touch associated with this touch point.
-  uint32_t pointerId;
-  currentPoint->get_PointerId(&pointerId);
-  nsRefPtr<Touch> touch = mTouches.Get(pointerId);
-
-  // Some old drivers cause us to receive a PointerMoved event for a touchId
-  // after we've already received a PointerReleased event for that touchId.
-  // To work around those busted drivers, we simply ignore TouchMoved events
-  // for touchIds that we are not currently tracking.  See bug 819223.
-  if (!touch) {
-    return S_OK;
-  }
-
-  AddPointerMoveDataToRecognizer(aArgs);
-
-  // If the point hasn't moved, filter it out per the spec. Pres shell does
-  // this as well, but we need to know when our first touchmove is going to
-  // get delivered so we can check the result.
-  if (!HasPointMoved(touch, currentPoint.Get())) {
-    return S_OK;
-  }
-
-  touch = CreateDOMTouch(currentPoint.Get());
-  touch->mChanged = true;
-  // replacing old touch point in mTouches map
-  mTouches.Put(pointerId, touch);
-
-  WidgetTouchEvent* touchEvent =
-    new WidgetTouchEvent(true, NS_TOUCH_MOVE, mWidget.Get());
-  InitTouchEventTouchList(touchEvent);
-  DispatchAsyncTouchEvent(touchEvent);
-
-  return S_OK;
-}
-
-// This event is raised when the user lifts the left mouse button, lifts a
-// pen from the surface, or lifts her/his finger from a touch screen.
-HRESULT
-MetroInput::OnPointerReleased(UI::Core::ICoreWindow* aSender,
-                              UI::Core::IPointerEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-
-  WRL::ComPtr<UI::Input::IPointerPoint> currentPoint;
-  WRL::ComPtr<Devices::Input::IPointerDevice> device;
-  Devices::Input::PointerDeviceType deviceType;
-
-  aArgs->get_CurrentPoint(currentPoint.GetAddressOf());
-  currentPoint->get_PointerDevice(device.GetAddressOf());
-  device->get_PointerDeviceType(&deviceType);
-
-  // For mouse and pen input, simply call our helper function
-  if (deviceType !=
-          Devices::Input::PointerDeviceType::PointerDeviceType_Touch) {
-    OnPointerNonTouch(currentPoint.Get());
-    mGestureRecognizer->ProcessUpEvent(currentPoint.Get());
-    return S_OK;
-  }
-
-  // This is touch input.
-  UpdateInputLevel(LEVEL_IMPRECISE);
-
-  // Get the touch associated with this touch point.
-  uint32_t pointerId;
-  currentPoint->get_PointerId(&pointerId);
-  nsRefPtr<Touch> touch = mTouches.Get(pointerId);
-
-  // Purge any pending moves for this pointer
-  if (touch->mChanged) {
-    WidgetTouchEvent* touchEvent =
-      new WidgetTouchEvent(true, NS_TOUCH_MOVE, mWidget.Get());
-    InitTouchEventTouchList(touchEvent);
-    DispatchAsyncTouchEvent(touchEvent);
-  }
-
-  // Remove this touch point from our map. Eventually all touch points are
-  // removed for this session since we receive released events for every
-  // point.
-  mTouches.Remove(pointerId);
-
-  // touchend events only have a single touch; the touch that has been removed
-  WidgetTouchEvent* touchEvent =
-    new WidgetTouchEvent(true, NS_TOUCH_END, mWidget.Get());
-  touchEvent->touches.AppendElement(CreateDOMTouch(currentPoint.Get()));
-  DispatchAsyncTouchEvent(touchEvent);
-
-  if (ShouldDeliverInputToRecognizer()) {
-    mGestureRecognizer->ProcessUpEvent(currentPoint.Get());
-  }
-
-  return S_OK;
-}
-
-// Tests for chrome vs. content target so we know whether input coordinates need
-// to be transformed through the apz. Eventually this hit testing should move
-// into the apz (bug 918288).
-bool
-MetroInput::HitTestChrome(const LayoutDeviceIntPoint& pt)
-{
-  // Confirm this event targets content. We pick this up in browser's input.js.
-  WidgetMouseEvent hittest(true, NS_MOUSE_MOZHITTEST, mWidget.Get(),
-                           WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
-  hittest.refPoint = pt;
-  nsEventStatus status;
-  mWidget->DispatchEvent(&hittest, status);
-  return (status == nsEventStatus_eConsumeNoDefault);
-}
-
-/**
- * Returns true if the position is in chrome, false otherwise.
- */
-bool
-MetroInput::TransformRefPoint(const Foundation::Point& aPosition, LayoutDeviceIntPoint& aRefPointOut)
-{
-  // If this event is destined for content we need to transform our ref point through
-  // the apz so that zoom can be accounted for.
-  aRefPointOut = LayoutDeviceIntPoint::FromUntyped(MetroUtils::LogToPhys(aPosition));
-  ScreenIntPoint spt(aRefPointOut.x, aRefPointOut.y);
-  // This is currently a general contained rect hit test, it may produce a false positive for
-  // overlay chrome elements.
-  bool apzIntersect = mWidget->ApzHitTest(spt);
-  if (!apzIntersect) {
-    return true;
-  }
-  if (HitTestChrome(aRefPointOut)) {
-    return true;
-  }
-  mWidget->ApzTransformGeckoCoordinate(spt, &aRefPointOut);
-  return false;
-}
-
-void
-MetroInput::TransformTouchEvent(WidgetTouchEvent* aEvent)
-{
-  WidgetTouchEvent::TouchArray& touches = aEvent->touches;
-  for (uint32_t i = 0; i < touches.Length(); ++i) {
-    dom::Touch* touch = touches[i];
-    if (touch) {
-      LayoutDeviceIntPoint lpt;
-      ScreenIntPoint spt;
-      spt.x = touch->mRefPoint.x;
-      spt.y = touch->mRefPoint.y;
-      mWidget->ApzTransformGeckoCoordinate(spt, &lpt);
-      touch->mRefPoint.x = lpt.x;
-      touch->mRefPoint.y = lpt.y;
-    }
-  }
-}
-
-void
-MetroInput::InitGeckoMouseEventFromPointerPoint(
-                                  WidgetMouseEvent* aEvent,
-                                  UI::Input::IPointerPoint* aPointerPoint)
-{
-  NS_ASSERTION(aPointerPoint, "InitGeckoMouseEventFromPointerPoint "
-                              "called with null PointerPoint!");
-
-  WRL::ComPtr<UI::Input::IPointerPointProperties> props;
-  WRL::ComPtr<Devices::Input::IPointerDevice> device;
-  Devices::Input::PointerDeviceType deviceType;
-  Foundation::Point position;
-  uint64_t timestamp;
-  float pressure;
-  boolean canBeDoubleTap;
-  float tiltX;
-  float tiltY;
-
-  aPointerPoint->get_Position(&position);
-  aPointerPoint->get_Timestamp(&timestamp);
-  aPointerPoint->get_PointerDevice(device.GetAddressOf());
-  device->get_PointerDeviceType(&deviceType);
-  aPointerPoint->get_Properties(props.GetAddressOf());
-  aPointerPoint->get_PointerId(&aEvent->pointerId);
-  props->get_Pressure(&pressure);
-  props->get_XTilt(&tiltX);
-  props->get_YTilt(&tiltY);
-
-  mGestureRecognizer->CanBeDoubleTap(aPointerPoint, &canBeDoubleTap);
-
-  TransformRefPoint(position, aEvent->refPoint);
-
-  if (!canBeDoubleTap) {
-    aEvent->clickCount = 1;
-  } else {
-    aEvent->clickCount = 2;
-  }
-  aEvent->pressure = pressure;
-  aEvent->tiltX = tiltX;
-  aEvent->tiltY = tiltY;
-  aEvent->buttons = ButtonsForPointerPoint(aPointerPoint);
-
-  MozInputSourceFromDeviceType(deviceType, aEvent->inputSource);
-}
-
-// This event is raised when a precise pointer moves into the bounding box of
-// our window.  For touch input, this will be raised before the PointerPressed
-// event.
-HRESULT
-MetroInput::OnPointerEntered(UI::Core::ICoreWindow* aSender,
-                             UI::Core::IPointerEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-
-  WRL::ComPtr<UI::Input::IPointerPoint> currentPoint;
-  WRL::ComPtr<Devices::Input::IPointerDevice> device;
-  Devices::Input::PointerDeviceType deviceType;
-
-  aArgs->get_CurrentPoint(currentPoint.GetAddressOf());
-  currentPoint->get_PointerDevice(device.GetAddressOf());
-  device->get_PointerDeviceType(&deviceType);
-
-  // We only dispatch mouseenter and mouseexit events for mouse and pen input.
-  if (deviceType !=
-          Devices::Input::PointerDeviceType::PointerDeviceType_Touch) {
-    WidgetMouseEvent* event =
-      new WidgetMouseEvent(true, NS_MOUSE_ENTER, mWidget.Get(),
-                           WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
-    UpdateInputLevel(LEVEL_PRECISE);
-    InitGeckoMouseEventFromPointerPoint(event, currentPoint.Get());
-    DispatchAsyncEventIgnoreStatus(event);
-    return S_OK;
-  }
-  UpdateInputLevel(LEVEL_IMPRECISE);
-  return S_OK;
-}
-
-// This event is raised when a precise pointer leaves the bounding box of
-// our window.  For touch input, this will be raised before the
-// PointerReleased event.
-HRESULT
-MetroInput::OnPointerExited(UI::Core::ICoreWindow* aSender,
-                            UI::Core::IPointerEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-
-  WRL::ComPtr<UI::Input::IPointerPoint> currentPoint;
-  WRL::ComPtr<Devices::Input::IPointerDevice> device;
-  Devices::Input::PointerDeviceType deviceType;
-
-  aArgs->get_CurrentPoint(currentPoint.GetAddressOf());
-  currentPoint->get_PointerDevice(device.GetAddressOf());
-  device->get_PointerDeviceType(&deviceType);
-
-  // We only dispatch mouseenter and mouseexit events for mouse and pen input.
-  if (deviceType !=
-          Devices::Input::PointerDeviceType::PointerDeviceType_Touch) {
-    WidgetMouseEvent* event =
-      new WidgetMouseEvent(true, NS_MOUSE_EXIT, mWidget.Get(),
-                           WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
-    event->exit = WidgetMouseEvent::eTopLevel;
-    UpdateInputLevel(LEVEL_PRECISE);
-    InitGeckoMouseEventFromPointerPoint(event, currentPoint.Get());
-    DispatchAsyncEventIgnoreStatus(event);
-    return S_OK;
-  }
-  UpdateInputLevel(LEVEL_IMPRECISE);
-  return S_OK;
-}
-
-// Gecko expects a "finished" event to be sent that has the cumulative
-// changes since the gesture began.  The idea is that consumers could hook
-// only this last event and still effectively support magnification and
-// rotation. We accomplish sending this "finished" event by calling our
-// helper function with a cumulative "delta" value.
-//
-// After sending the "finished" event, this function detects and sends
-// swipe gestures.
-HRESULT
-MetroInput::OnManipulationCompleted(
-                        UI::Input::IGestureRecognizer* aSender,
-                        UI::Input::IManipulationCompletedEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-
-  Devices::Input::PointerDeviceType deviceType;
-  aArgs->get_PointerDeviceType(&deviceType);
-  if (deviceType ==
-              Devices::Input::PointerDeviceType::PointerDeviceType_Mouse) {
-    return S_OK;
-  }
-
-  UI::Input::ManipulationDelta delta;
-  Foundation::Point position;
-
-  aArgs->get_Position(&position);
-  aArgs->get_Cumulative(&delta);
-
-  // We check that the distance the user's finger traveled and the
-  // velocity with which it traveled exceed our thresholds for
-  // classifying the movement as a swipe.
-  UI::Input::ManipulationVelocities velocities;
-  aArgs->get_Velocities(&velocities);
-
-  bool isHorizontalSwipe =
-            abs(velocities.Linear.X) >= SWIPE_MIN_VELOCITY
-         && abs(delta.Translation.X) >= SWIPE_MIN_DISTANCE;
-  bool isVerticalSwipe =
-            abs(velocities.Linear.Y) >= SWIPE_MIN_VELOCITY
-         && abs(delta.Translation.Y) >= SWIPE_MIN_DISTANCE;
-
-  // If our thresholds were exceeded for both a vertical and a horizontal
-  // swipe, it means the user is flinging her/his finger around and we
-  // should just ignore the input.
-  if (isHorizontalSwipe && isVerticalSwipe) {
-    return S_OK;
-  }
-
-  if (isHorizontalSwipe) {
-    WidgetSimpleGestureEvent* swipeEvent =
-      new WidgetSimpleGestureEvent(true, NS_SIMPLE_GESTURE_SWIPE,
-                                   mWidget.Get());
-    swipeEvent->direction = delta.Translation.X > 0
-                         ? nsIDOMSimpleGestureEvent::DIRECTION_RIGHT
-                         : nsIDOMSimpleGestureEvent::DIRECTION_LEFT;
-    swipeEvent->delta = delta.Translation.X;
-    swipeEvent->inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
-    swipeEvent->refPoint = LayoutDeviceIntPoint::FromUntyped(MetroUtils::LogToPhys(position));
-    DispatchAsyncEventIgnoreStatus(swipeEvent);
-  }
-
-  if (isVerticalSwipe) {
-    WidgetSimpleGestureEvent* swipeEvent =
-      new WidgetSimpleGestureEvent(true, NS_SIMPLE_GESTURE_SWIPE,
-                                   mWidget.Get());
-    swipeEvent->direction = delta.Translation.Y > 0
-                         ? nsIDOMSimpleGestureEvent::DIRECTION_DOWN
-                         : nsIDOMSimpleGestureEvent::DIRECTION_UP;
-    swipeEvent->delta = delta.Translation.Y;
-    swipeEvent->inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
-    swipeEvent->refPoint = LayoutDeviceIntPoint::FromUntyped(MetroUtils::LogToPhys(position));
-    DispatchAsyncEventIgnoreStatus(swipeEvent);
-  }
-
-  return S_OK;
-}
-
-// This event is raised when a sequence of pointer events has been
-// interpreted by the GestureRecognizer as a tap (this could be a mouse
-// click, a pen tap, or a tap on a touch surface).
-HRESULT
-MetroInput::OnTapped(UI::Input::IGestureRecognizer* aSender,
-                     UI::Input::ITappedEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-
-  Devices::Input::PointerDeviceType deviceType;
-  aArgs->get_PointerDeviceType(&deviceType);
-
-  unsigned int tapCount;
-  aArgs->get_TapCount(&tapCount);
-
-  // For mouse and pen input, we send mousedown/mouseup/mousemove
-  // events as soon as we detect the input event.  For touch input, a set of
-  // mousedown/mouseup events will be sent only once a tap has been detected.
-  if (deviceType != Devices::Input::PointerDeviceType::PointerDeviceType_Touch) {
-    return S_OK;
-  }
-
-  Foundation::Point position;
-  aArgs->get_Position(&position);
-  HandleTap(position, tapCount);
-  return S_OK;
-}
-
-// This event is raised when a sequence of pointer events has been
-// interpreted by the GestureRecognizer as a right tap.
-// This could be a mouse right-click, a right-click on a pen, or
-// a tap-and-hold on a touch surface.
-HRESULT
-MetroInput::OnRightTapped(UI::Input::IGestureRecognizer* aSender,
-                          UI::Input::IRightTappedEventArgs* aArgs)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-
-  Devices::Input::PointerDeviceType deviceType;
-  aArgs->get_PointerDeviceType(&deviceType);
-
-  Foundation::Point position;
-  aArgs->get_Position(&position);
-  HandleLongTap(position);
-
-  return S_OK;
-}
-
-void
-MetroInput::HandleTap(const Foundation::Point& aPoint, unsigned int aTapCount)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-
-  LayoutDeviceIntPoint refPoint;
-  TransformRefPoint(aPoint, refPoint);
-
-  WidgetMouseEvent* mouseEvent =
-    new WidgetMouseEvent(true, NS_MOUSE_MOVE, mWidget.Get(),
-                         WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
-  mouseEvent->refPoint = refPoint;
-  mouseEvent->clickCount = aTapCount;
-  mouseEvent->inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
-  DispatchAsyncEventIgnoreStatus(mouseEvent);
-
-  mouseEvent =
-    new WidgetMouseEvent(true, NS_MOUSE_BUTTON_DOWN, mWidget.Get(),
-                         WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
-  mouseEvent->refPoint = refPoint;
-  mouseEvent->clickCount = aTapCount;
-  mouseEvent->inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
-  mouseEvent->button = WidgetMouseEvent::buttonType::eLeftButton;
-  DispatchAsyncEventIgnoreStatus(mouseEvent);
-
-  mouseEvent =
-    new WidgetMouseEvent(true, NS_MOUSE_BUTTON_UP, mWidget.Get(),
-                         WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
-  mouseEvent->refPoint = refPoint;
-  mouseEvent->clickCount = aTapCount;
-  mouseEvent->inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
-  mouseEvent->button = WidgetMouseEvent::buttonType::eLeftButton;
-  DispatchAsyncEventIgnoreStatus(mouseEvent);
-
-  // Make sure all gecko events are dispatched and the dom is up to date
-  // so that when ui automation comes in looking for focus info it gets
-  // the right information.
-  MetroAppShell::MarkEventQueueForPurge();
-}
-
-void
-MetroInput::HandleLongTap(const Foundation::Point& aPoint)
-{
-#ifdef DEBUG_INPUT
-  LogFunction();
-#endif
-  LayoutDeviceIntPoint refPoint;
-  TransformRefPoint(aPoint, refPoint);
-
-  WidgetMouseEvent* contextEvent =
-    new WidgetMouseEvent(true, NS_CONTEXTMENU, mWidget.Get(),
-                         WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
-  contextEvent->refPoint = refPoint;
-  contextEvent->inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
-  DispatchAsyncEventIgnoreStatus(contextEvent);
-}
-
-/**
- * Implementation Details
- */
-nsEventStatus MetroInput::sThrowawayStatus;
-
-void
-MetroInput::DispatchAsyncEventIgnoreStatus(WidgetInputEvent* aEvent)
-{
-  aEvent->time = ::GetMessageTime();
-  mModifierKeyState.Update();
-  mModifierKeyState.InitInputEvent(*aEvent);
-  mInputEventQueue.Push(aEvent);
-  nsCOMPtr<nsIRunnable> runnable =
-    NS_NewRunnableMethod(this, &MetroInput::DeliverNextQueuedEventIgnoreStatus);
-  NS_DispatchToCurrentThread(runnable);
-}
-
-void
-MetroInput::DeliverNextQueuedEventIgnoreStatus()
-{
-  nsAutoPtr<WidgetGUIEvent> event =
-    static_cast<WidgetGUIEvent*>(mInputEventQueue.PopFront());
-  MOZ_ASSERT(event.get());
-  DispatchEventIgnoreStatus(event.get());
-
-  // Let app shell know we've delivered that last input we wanted purged
-  // via a call to MarkEventQueueForPurge().
-  if (event->message == NS_MOUSE_BUTTON_UP) {
-    MetroAppShell::InputEventsDispatched();
-  }
-
-  // Clear :hover/:active states for mouse events generated by HandleTap
-  WidgetMouseEvent* mouseEvent = event.get()->AsMouseEvent();
-  if (!mouseEvent) {
-    return;
-  }
-  if (mouseEvent->message != NS_MOUSE_BUTTON_UP ||
-      mouseEvent->inputSource != nsIDOMMouseEvent::MOZ_SOURCE_TOUCH) {
-    return;
-  }
-  nsCOMPtr<nsIPresShell> presShell = mWidget->GetPresShell();
-  if (presShell) {
-    EventStateManager* esm = presShell->GetPresContext()->EventStateManager();
-    if (esm) {
-      esm->SetContentState(nullptr, NS_EVENT_STATE_HOVER);
-    }
-  }
-}
-
-void
-MetroInput::DispatchAsyncTouchEvent(WidgetTouchEvent* aEvent)
-{
-  aEvent->time = ::GetMessageTime();
-  mModifierKeyState.Update();
-  mModifierKeyState.InitInputEvent(*aEvent);
-  mInputEventQueue.Push(aEvent);
-  nsCOMPtr<nsIRunnable> runnable =
-    NS_NewRunnableMethod(this, &MetroInput::DeliverNextQueuedTouchEvent);
-  NS_DispatchToCurrentThread(runnable);
-}
-
-static void DumpTouchIds(const char* aTarget, WidgetTouchEvent* aEvent)
-{
-  // comment out for touch moves
-  if (aEvent->message == NS_TOUCH_MOVE) {
-    return;
-  }
-  switch(aEvent->message) {
-    case NS_TOUCH_START:
-    WinUtils::Log("DumpTouchIds: NS_TOUCH_START block");
-    break;
-    case NS_TOUCH_MOVE:
-    WinUtils::Log("DumpTouchIds: NS_TOUCH_MOVE block");
-    break;
-    case NS_TOUCH_END:
-    WinUtils::Log("DumpTouchIds: NS_TOUCH_END block");
-    break;
-    case NS_TOUCH_CANCEL:
-    WinUtils::Log("DumpTouchIds: NS_TOUCH_CANCEL block");
-    break;
-  }
-  WidgetTouchEvent::TouchArray& touches = aEvent->touches;
-  for (uint32_t i = 0; i < touches.Length(); ++i) {
-    dom::Touch* touch = touches[i];
-    if (!touch) {
-      continue;
-    }
-    int32_t id = touch->Identifier();
-    WinUtils::Log("   id=%d target=%s", id, aTarget);
-  }
-}
-
-static void DumpTouchBehavior(nsTArray<uint32_t>& aBehavior)
-{
-  WinUtils::Log("DumpTouchBehavior: Touch behavior flags set for current touch session:");
-  for (uint32_t i = 0; i < aBehavior.Length(); i++) {
-    if (mozilla::layers::AllowedTouchBehavior::VERTICAL_PAN & aBehavior[i]) {
-      WinUtils::Log("VERTICAL_PAN");
-    }
-
-    if (mozilla::layers::AllowedTouchBehavior::HORIZONTAL_PAN & aBehavior[i]) {
-      WinUtils::Log("HORIZONTAL_PAN");
-    }
-
-    if (mozilla::layers::AllowedTouchBehavior::UNKNOWN & aBehavior[i]) {
-      WinUtils::Log("UNKNOWN");
-    }
-
-    if ((mozilla::layers::AllowedTouchBehavior::NONE & aBehavior[i]) == 0) {
-      WinUtils::Log("NONE");
-    }
-  }
-}
-
-/*
- * nsPreShell's processing of WidgetTouchEvent events:
- *
- * NS_TOUCH_START:
- *  Interprets a single touch point as the first touch point of a block and will reset its
- *  queue when it receives this. For multiple touch points it sets all points in its queue
- *  and marks new points as changed.
- * NS_TOUCH_MOVE:
- *  Uses the equality tests in dom::Touch to test if a touch point has changed (moved).
- *  If a point has moved, keeps this touch point in the event, otherwise it removes
- *  the touch point. Note if no points have changed, it exits without sending a dom event.
- * NS_TOUCH_CANCEL/NS_TOUCH_END
- *  Assumes any point in touchEvent->touches has been removed or canceled.
-*/
-
-//#define DUMP_TOUCH_IDS(aTarget, aEvent) DumpTouchIds(aTarget, aEvent)
-#define DUMP_TOUCH_IDS(...)
-
-//#define DUMP_ALLOWED_TOUCH_BEHAVIOR(aBehavior) DumpTouchBehavior(aBehavior)
-#define DUMP_ALLOWED_TOUCH_BEHAVIOR(...)
-
-void
-MetroInput::HandleTouchStartEvent(WidgetTouchEvent* aEvent)
-{
-  // This is the start of a new touch block. See what the APZ wants to do with it.
-
-  WidgetTouchEvent transformedEvent(*aEvent);
-  DUMP_TOUCH_IDS("APZC(1)", aEvent);
-  nsEventStatus result = mWidget->ApzReceiveInputEvent(&transformedEvent, &mTargetAPZCGuid, &mInputBlockId);
-  if (result == nsEventStatus_eConsumeNoDefault) {
-    // The APZ said: throw this event away entirely.
-    CancelGesture();
-    return;
-  }
-
-  // If the APZ is using this block, send it touch-action behavior.
-  if (gTouchActionPropertyEnabled) {
-    nsTArray<TouchBehaviorFlags> touchBehaviors;
-    // Retrieving touch behaviors from apzctm and from the content (if needed)
-    // then setting it back to the apzc. The apzc we retrieved touch behaviors
-    // from and we're setting to may changes if there are multiple touches (in that
-    // case apzctm needs to take common ancestor of them).
-    GetAllowedTouchBehavior(&transformedEvent, touchBehaviors);
-    // Setting the touch behaviors to the apzc that will be responsible
-    // for interpreting it. It may be not the same apzc we retrieved touch
-    // action values from. E.g. for zooming we're taking parent apzc of a few ones
-    // that were touched but touch behaviors would be taken from childs.
-    DUMP_ALLOWED_TOUCH_BEHAVIOR(touchBehaviors);
-    mWidget->ApzcSetAllowedTouchBehavior(mInputBlockId, touchBehaviors);
-  }
-
-  // Pass the event on to content
-  DUMP_TOUCH_IDS("DOM(2)", aEvent);
-  nsEventStatus contentStatus = nsEventStatus_eIgnore;
-  mWidget->DispatchEvent(&transformedEvent, contentStatus);
-  if (nsEventStatus_eConsumeNoDefault == contentStatus) {
-    // Content consumed the event, so we need to notify the APZ
-    // to not do anything with this touch block.
-    mWidget->ApzContentConsumingTouch(mInputBlockId);
-    mCancelable = false;
-
-    // Also cancel the gesture detection.
-    CancelGesture();
-  }
-}
-
-void
-MetroInput::HandleFirstTouchMoveEvent(WidgetTouchEvent* aEvent)
-{
-  // If the APZ is using this block, pass the event to it.
-  WidgetTouchEvent transformedEvent(*aEvent);
-  DUMP_TOUCH_IDS("APZC(2)", aEvent);
-  nsEventStatus apzcStatus = mWidget->ApzReceiveInputEvent(&transformedEvent, &mTargetAPZCGuid, &mInputBlockId);
-  if (apzcStatus == nsEventStatus_eConsumeNoDefault) {
-    // The APZ said: throw this event away entirely.
-    CancelGesture();
-    return;
-  }
-
-  // ==== RANDOM INTERLUDE ABOut POINTER EVENTS ====
-  // We need to dispatch here only touch event, not pointer one.
-  // That's because according to the spec pointer events doesn't imply pointermove event
-  // between pointerdown and pointercancel (If default touch behavior is triggered).
-  // But at the same time we need to dispatch at least touchmove event to let content to
-  // consume it (or not consume).
-  // TODO: determine how to dispatch only one kind of events: currently there are two options:
-  // 1) Create two separate instances of the WidgetTouchEvent and WidgetPointerEvent and
-  // dispatch them separately.
-  // 2) Add a boolean flag to the WidgetTouchEvent that states whether this event should produce
-  // both touch and pointer event or only touch one.
-  // Anyway it's worth to add this stuff only after patches from bug 822898 (Pointer events) are
-  // fully commited.
-  // ==== END RANDOM INTERLUDE ABOut POINTER EVENTS ====
-
-  // And pass the untransformed event to content.
-  DUMP_TOUCH_IDS("DOM(3)", aEvent);
-  nsEventStatus contentStatus = nsEventStatus_eIgnore;
-  mWidget->DispatchEvent(&transformedEvent, contentStatus);
-
-  // Let the apz know if content wants to consume touch events.
-  if (mCancelable) {
-    if (nsEventStatus_eConsumeNoDefault == contentStatus) {
-      mWidget->ApzContentConsumingTouch(mInputBlockId);
-    } else {
-      mWidget->ApzContentIgnoringTouch(mInputBlockId);
-      if (apzcStatus == nsEventStatus_eConsumeDoDefault) {
-        SendPointerCancelToContent(transformedEvent);
-      }
-    }
-    mCancelable = false;
-  }
-
-  // Cancel the gesture detection as well if content is taking this block.
-  if (nsEventStatus_eConsumeNoDefault == contentStatus) {
-    CancelGesture();
-  }
-}
-
-void
-MetroInput::SendPointerCancelToContent(const WidgetTouchEvent& aEvent)
-{
-  // The APZ is consuming the touch pointers specified in |aEvent| so
-  // we need to send pointer-cancel events for them to content. We
-  // do that by sending touchcancel events which the EventStateManager
-  // turns into pointer-cancel events
-  WidgetTouchEvent cancel(aEvent);
-  cancel.message = NS_TOUCH_CANCEL;
-  for (uint32_t i = 0; i < cancel.touches.Length(); i++) {
-    cancel.touches[i]->convertToPointer = true;
-  }
-  nsEventStatus status;
-  mWidget->DispatchEvent(&cancel, status);
-}
-
-bool
-MetroInput::SendPendingResponseToApz()
-{
-  // If this is called, content has missed its chance to consume this event block
-  // so we should notify the APZ that content is ignoring this touch block.
-  if (mCancelable) {
-    mWidget->ApzContentIgnoringTouch(mInputBlockId);
-    mCancelable = false;
-    return true;
-  }
-  return false;
-}
-
-void
-MetroInput::FlushPendingContentResponse()
-{
-  SendPendingResponseToApz();
-}
-
-void
-MetroInput::CancelGesture()
-{
-  if (mRecognizerWantsEvents) {
-    mRecognizerWantsEvents = false;
-    mGestureRecognizer->CompleteGesture();
-  }
-}
-
-void
-MetroInput::DeliverNextQueuedTouchEvent()
-{
-  /*
-   * Note: never rely on the contents of mTouches here, since this is a delayed
-   *       callback. mTouches will likely have been modified.
-   */
-
-  nsEventStatus status = nsEventStatus_eIgnore;
-
-  WidgetTouchEvent* event =
-    static_cast<WidgetTouchEvent*>(mInputEventQueue.PopFront());
-  MOZ_ASSERT(event);
-
-  AutoDeleteEvent wrap(event);
-
-  // This is the start of a new touch block. If we haven't
-  // responded to the APZ about the last touch block, do that
-  // now, and reset variables for the new touch block.
-  if (event->message == NS_TOUCH_START) {
-    SendPendingResponseToApz();
-
-    mCancelable = true;
-    mTargetAPZCGuid = ScrollableLayerGuid();
-    mInputBlockId = 0;
-  }
-
-  // Test for non-apz vs. apz target. To do this we only use the first touch
-  // point since that will be the input batch target. Cache this for touch events
-  // since HitTestChrome has to send a dom event.
-  if (event->message == NS_TOUCH_START && event->touches.Length() == 1) {
-    nsRefPtr<Touch> touch = event->touches[0];
-    LayoutDeviceIntPoint pt = LayoutDeviceIntPoint::FromUntyped(touch->mRefPoint);
-    // This is currently a general contained rect hit test, it may produce a false
-    // positive for overlay chrome elements. Also, some content pages won't support
-    // apzc, so this may be false for content as well.
-    bool apzIntersect = mWidget->ApzHitTest(mozilla::ScreenIntPoint(pt.x, pt.y));
-    mNonApzTargetForTouch = (!apzIntersect || HitTestChrome(pt));
-  }
-
-  // If this event is destined for dom, deliver it directly there bypassing
-  // the apz. Continue doing this until the number of active touch points drops
-  // to zero. After that we recompute mNonApzTargetForTouch in the block above.
-  if (mNonApzTargetForTouch) {
-    DUMP_TOUCH_IDS("DOM(1)", event);
-    mWidget->DispatchEvent(event, status);
-    if (mCancelable) {
-      // Disable gesture based events (taps, swipes, rotation) if
-      // preventDefault is called on touchstart.
-      if (nsEventStatus_eConsumeNoDefault == status) {
-        CancelGesture();
-      }
-      if (event->message == NS_TOUCH_MOVE) {
-        mCancelable = false;
-      }
-    }
-    return;
-  }
-
-  // Special handling for the start and first move events
-  if (event->message == NS_TOUCH_START) {
-    HandleTouchStartEvent(event);
-    return;
-  } else if (mCancelable && event->message == NS_TOUCH_MOVE) {
-    HandleFirstTouchMoveEvent(event);
-    return;
-  }
-
-  // If we get here, content has already had its chance to consume this event
-  // block. If it didn't do so we can inform the APZ that content is ignoring
-  // this event block.
-  bool responseSent = SendPendingResponseToApz();
-
-  // Normal processing of events. Send it to the APZ first for handling and
-  // untransformation. then pass the untransformed event to content.
-  DUMP_TOUCH_IDS("APZC(3)", event);
-  status = mWidget->ApzReceiveInputEvent(event, nullptr, nullptr);
-  if (status == nsEventStatus_eConsumeNoDefault) {
-    CancelGesture();
-    return;
-  }
-  if (responseSent && status == nsEventStatus_eConsumeDoDefault) {
-    SendPointerCancelToContent(*event);
-    return;
-  }
-  DUMP_TOUCH_IDS("DOM(4)", event);
-  mWidget->DispatchEvent(event, status);
-}
-
-void
-MetroInput::DispatchEventIgnoreStatus(WidgetGUIEvent *aEvent)
-{
-  mWidget->DispatchEvent(aEvent, sThrowawayStatus);
-}
-
-void
-MetroInput::UnregisterInputEvents() {
-  // Unregister ourselves for the edge swipe event
-  WRL::ComPtr<UI::Input::IEdgeGestureStatics> edgeStatics;
-  if (SUCCEEDED(Foundation::GetActivationFactory(
-        WRL::Wrappers::HStringReference(
-              RuntimeClass_Windows_UI_Input_EdgeGesture).Get(),
-      edgeStatics.GetAddressOf()))) {
-    WRL::ComPtr<UI::Input::IEdgeGesture> edge;
-    if (SUCCEEDED(edgeStatics->GetForCurrentView(edge.GetAddressOf()))) {
-      edge->remove_Starting(mTokenEdgeStarted);
-      edge->remove_Canceled(mTokenEdgeCanceled);
-      edge->remove_Completed(mTokenEdgeCompleted);
-    }
-  }
-  // Unregister ourselves from the window events. This is extremely important;
-  // once this object is destroyed we don't want Windows to try to send events
-  // to it.
-  mWindow->remove_PointerPressed(mTokenPointerPressed);
-  mWindow->remove_PointerReleased(mTokenPointerReleased);
-  mWindow->remove_PointerMoved(mTokenPointerMoved);
-  mWindow->remove_PointerEntered(mTokenPointerEntered);
-  mWindow->remove_PointerExited(mTokenPointerExited);
-
-  // Unregistering from the gesture recognizer events probably isn't as
-  // necessary since we're about to destroy the gesture recognizer, but
-  // it can't hurt.
-  mGestureRecognizer->remove_ManipulationCompleted(
-                                        mTokenManipulationCompleted);
-  mGestureRecognizer->remove_Tapped(mTokenTapped);
-  mGestureRecognizer->remove_RightTapped(mTokenRightTapped);
-}
-
-void
-MetroInput::RegisterInputEvents()
-{
-  NS_ASSERTION(mWindow, "Must have a window to register for input events!");
-  NS_ASSERTION(mGestureRecognizer,
-               "Must have a GestureRecognizer for input events!");
-  // Register for edge swipe
-  WRL::ComPtr<UI::Input::IEdgeGestureStatics> edgeStatics;
-  Foundation::GetActivationFactory(
-            WRL::Wrappers::HStringReference(
-                    RuntimeClass_Windows_UI_Input_EdgeGesture)
-            .Get(),
-            edgeStatics.GetAddressOf());
-  WRL::ComPtr<UI::Input::IEdgeGesture> edge;
-  edgeStatics->GetForCurrentView(edge.GetAddressOf());
-
-  edge->add_Starting(
-      WRL::Callback<EdgeGestureHandler>(
-                                  this,
-                                  &MetroInput::OnEdgeGestureStarted).Get(),
-      &mTokenEdgeStarted);
-
-  edge->add_Canceled(
-      WRL::Callback<EdgeGestureHandler>(
-                                  this,
-                                  &MetroInput::OnEdgeGestureCanceled).Get(),
-      &mTokenEdgeCanceled);
-
-  edge->add_Completed(
-      WRL::Callback<EdgeGestureHandler>(
-                                  this,
-                                  &MetroInput::OnEdgeGestureCompleted).Get(),
-      &mTokenEdgeCompleted);
-
-  // Set up our Gesture Recognizer to raise events for the gestures we
-  // care about
-  mGestureRecognizer->put_GestureSettings(
-            UI::Input::GestureSettings::GestureSettings_Tap
-          | UI::Input::GestureSettings::GestureSettings_DoubleTap
-          | UI::Input::GestureSettings::GestureSettings_RightTap
-          | UI::Input::GestureSettings::GestureSettings_Hold
-          | UI::Input::GestureSettings::GestureSettings_ManipulationTranslateX
-          | UI::Input::GestureSettings::GestureSettings_ManipulationTranslateY);
-
-  // Register for the pointer events on our Window
-  mWindow->add_PointerPressed(
-      WRL::Callback<PointerEventHandler>(
-        this,
-        &MetroInput::OnPointerPressed).Get(),
-      &mTokenPointerPressed);
-
-  mWindow->add_PointerReleased(
-      WRL::Callback<PointerEventHandler>(
-        this,
-        &MetroInput::OnPointerReleased).Get(),
-      &mTokenPointerReleased);
-
-  mWindow->add_PointerMoved(
-      WRL::Callback<PointerEventHandler>(
-        this,
-        &MetroInput::OnPointerMoved).Get(),
-      &mTokenPointerMoved);
-
-  mWindow->add_PointerEntered(
-      WRL::Callback<PointerEventHandler>(
-        this,
-        &MetroInput::OnPointerEntered).Get(),
-      &mTokenPointerEntered);
-
-  mWindow->add_PointerExited(
-      WRL::Callback<PointerEventHandler>(
-        this,
-        &MetroInput::OnPointerExited).Get(),
-      &mTokenPointerExited);
-
-  // Register for the events raised by our Gesture Recognizer
-  mGestureRecognizer->add_Tapped(
-      WRL::Callback<TappedEventHandler>(
-        this,
-        &MetroInput::OnTapped).Get(),
-      &mTokenTapped);
-
-  mGestureRecognizer->add_RightTapped(
-      WRL::Callback<RightTappedEventHandler>(
-        this,
-        &MetroInput::OnRightTapped).Get(),
-      &mTokenRightTapped);
-
-  mGestureRecognizer->add_ManipulationCompleted(
-      WRL::Callback<ManipulationCompletedEventHandler>(
-        this,
-        &MetroInput::OnManipulationCompleted).Get(),
-      &mTokenManipulationCompleted);
-}
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroInput.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroInput.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroInput.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroInput.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,292 +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/. */
-
-#pragma once
-
-// Moz headers (alphabetical)
-#include "APZController.h"
-#include "keyboardlayout.h"   // mModifierKeyState
-#include "nsBaseHashtable.h"  // mTouches
-#include "nsHashKeys.h"       // type of key for mTouches
-#include "mozwrlbase.h"
-#include "nsDeque.h"
-#include "mozilla/EventForwards.h"
-#include "mozilla/layers/APZCTreeManager.h"
-
-// System headers (alphabetical)
-#include <EventToken.h>     // EventRegistrationToken
-#include <stdint.h>         // uint32_t
-#include <wrl\client.h>     // Microsoft::WRL::ComPtr class
-#include <wrl\implements.h> // Microsoft::WRL::InspectableClass macro
-
-// Moz forward declarations
-class MetroWidget;
-
-namespace mozilla {
-namespace dom {
-class Touch;
-}
-}
-
-// Windows forward declarations
-namespace ABI {
-  namespace Windows {
-    namespace Devices {
-      namespace Input {
-        enum PointerDeviceType;
-      }
-    };
-    namespace Foundation {
-      struct Point;
-    };
-    namespace UI {
-      namespace Core {
-        struct ICoreWindow;
-        struct IAcceleratorKeyEventArgs;
-        struct IKeyEventArgs;
-        struct IPointerEventArgs;
-      };
-      namespace Input {
-        struct IEdgeGesture;
-        struct IEdgeGestureEventArgs;
-        struct IGestureRecognizer;
-        struct IManipulationCompletedEventArgs;
-        struct IManipulationStartedEventArgs;
-        struct IManipulationUpdatedEventArgs;
-        struct IPointerPoint;
-        struct IRightTappedEventArgs;
-        struct ITappedEventArgs;
-        struct ManipulationDelta;
-      };
-    };
-  };
-};
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-class MetroInput : public Microsoft::WRL::RuntimeClass<IInspectable>,
-                   public APZPendingResponseFlusher
-{
-  InspectableClass(L"MetroInput", BaseTrust);
-
-private:
-  typedef mozilla::layers::AllowedTouchBehavior AllowedTouchBehavior;
-  typedef uint32_t TouchBehaviorFlags;
-
-  // Devices
-  typedef ABI::Windows::Devices::Input::PointerDeviceType PointerDeviceType;
-
-  // Foundation
-  typedef ABI::Windows::Foundation::Point Point;
-
-  // UI::Core
-  typedef ABI::Windows::UI::Core::ICoreWindow ICoreWindow;
-  typedef ABI::Windows::UI::Core::IAcceleratorKeyEventArgs \
-                                  IAcceleratorKeyEventArgs;
-  typedef ABI::Windows::UI::Core::IKeyEventArgs IKeyEventArgs;
-  typedef ABI::Windows::UI::Core::IPointerEventArgs IPointerEventArgs;
-
-  // UI::Input
-  typedef ABI::Windows::UI::Input::IEdgeGesture IEdgeGesture;
-  typedef ABI::Windows::UI::Input::IEdgeGestureEventArgs IEdgeGestureEventArgs;
-  typedef ABI::Windows::UI::Input::IGestureRecognizer IGestureRecognizer;
-  typedef ABI::Windows::UI::Input::IManipulationCompletedEventArgs \
-                                   IManipulationCompletedEventArgs;
-  typedef ABI::Windows::UI::Input::IManipulationStartedEventArgs \
-                                   IManipulationStartedEventArgs;
-  typedef ABI::Windows::UI::Input::IManipulationUpdatedEventArgs \
-                                   IManipulationUpdatedEventArgs;
-  typedef ABI::Windows::UI::Input::IPointerPoint IPointerPoint;
-  typedef ABI::Windows::UI::Input::IRightTappedEventArgs IRightTappedEventArgs;
-  typedef ABI::Windows::UI::Input::ITappedEventArgs ITappedEventArgs;
-  typedef ABI::Windows::UI::Input::ManipulationDelta ManipulationDelta;
-
-  typedef mozilla::layers::ScrollableLayerGuid ScrollableLayerGuid;
-
-public:
-  MetroInput(MetroWidget* aWidget,
-             ICoreWindow* aWindow);
-  virtual ~MetroInput();
-
-  // These input events are received from our window. These are basic
-  // pointer and keyboard press events. MetroInput responds to them
-  // by sending gecko events and forwarding these input events to its
-  // GestureRecognizer to be processed into more complex input events
-  // (tap, rightTap, rotate, etc)
-  HRESULT OnPointerPressed(ICoreWindow* aSender,
-                           IPointerEventArgs* aArgs);
-  HRESULT OnPointerReleased(ICoreWindow* aSender,
-                            IPointerEventArgs* aArgs);
-  HRESULT OnPointerMoved(ICoreWindow* aSender,
-                         IPointerEventArgs* aArgs);
-  HRESULT OnPointerEntered(ICoreWindow* aSender,
-                           IPointerEventArgs* aArgs);
-  HRESULT OnPointerExited(ICoreWindow* aSender,
-                          IPointerEventArgs* aArgs);
-
-  // The Edge gesture event is special.  It does not come from our window
-  // or from our GestureRecognizer.
-  HRESULT OnEdgeGestureStarted(IEdgeGesture* aSender,
-                               IEdgeGestureEventArgs* aArgs);
-  HRESULT OnEdgeGestureCanceled(IEdgeGesture* aSender,
-                                IEdgeGestureEventArgs* aArgs);
-  HRESULT OnEdgeGestureCompleted(IEdgeGesture* aSender,
-                                 IEdgeGestureEventArgs* aArgs);
-
-  // Swipe gesture callback from the GestureRecognizer.
-  HRESULT OnManipulationCompleted(IGestureRecognizer* aSender,
-                                  IManipulationCompletedEventArgs* aArgs);
-
-  // Tap gesture callback from the GestureRecognizer.
-  HRESULT OnTapped(IGestureRecognizer* aSender, ITappedEventArgs* aArgs);
-  HRESULT OnRightTapped(IGestureRecognizer* aSender,
-                        IRightTappedEventArgs* aArgs);
-
-  void HandleTap(const Point& aPoint, unsigned int aTapCount);
-  void HandleLongTap(const Point& aPoint);
-
-  // The APZPendingResponseFlusher implementation
-  void FlushPendingContentResponse();
-
-  static bool IsInputModeImprecise();
-
-private:
-  Microsoft::WRL::ComPtr<ICoreWindow> mWindow;
-  Microsoft::WRL::ComPtr<MetroWidget> mWidget;
-  Microsoft::WRL::ComPtr<IGestureRecognizer> mGestureRecognizer;
-
-  ModifierKeyState mModifierKeyState;
-
-  // Tracking input level
-  enum InputPrecisionLevel {
-    LEVEL_PRECISE,
-    LEVEL_IMPRECISE
-  };
-  static InputPrecisionLevel sCurrentInputLevel;
-  void UpdateInputLevel(InputPrecisionLevel aInputLevel);
-
-  // Initialization/Uninitialization helpers
-  void RegisterInputEvents();
-  void UnregisterInputEvents();
-
-  // Hit testing for apz content
-  bool mNonApzTargetForTouch;
-  bool HitTestChrome(const LayoutDeviceIntPoint& pt);
-
-  // Event processing helpers.  See function definitions for more info.
-  bool TransformRefPoint(const Point& aPosition,
-                         LayoutDeviceIntPoint& aRefPointOut);
-  void TransformTouchEvent(WidgetTouchEvent* aEvent);
-  void OnPointerNonTouch(IPointerPoint* aPoint);
-  void AddPointerMoveDataToRecognizer(IPointerEventArgs* aArgs);
-  void InitGeckoMouseEventFromPointerPoint(WidgetMouseEvent* aEvent,
-                                           IPointerPoint* aPoint);
-  void ProcessManipulationDelta(ManipulationDelta const& aDelta,
-                                Point const& aPosition,
-                                uint32_t aMagEventType,
-                                uint32_t aRotEventType);
-  uint16_t ProcessInputTypeForGesture(IEdgeGestureEventArgs* aArgs);
-  bool ShouldDeliverInputToRecognizer();
-
-  // Returns array of allowed touch behaviors  for touch points of given TouchEvent.
-  // Note: event argument should be transformed via apzc before supplying to this method.
-  void GetAllowedTouchBehavior(WidgetTouchEvent* aTransformedEvent, nsTArray<TouchBehaviorFlags>& aOutBehaviors);
-
-  // First, read the comment in gfx/layers/apz/src/TouchBlockState.h.
-  // The following booleans track the following pieces of state:
-  // mCancelable - if we have not yet notified the APZ code about the prevent-
-  //    default status of the current touch block. This is flipped from true
-  //    to false when this notification happens.
-  // mRecognizerWantsEvents - If the gesture recognizer should be receiving
-  //    events. This is normally true, but will be set to false if the APZ
-  //    decides the touch block should be thrown away entirely, or if content
-  //    consumes the touch block.
-  //    XXX There is a hazard with mRecognizerWantsEvents because it is accessed
-  //    both in the sync and async portions of the code.
-  bool mCancelable;
-  bool mRecognizerWantsEvents;
-
-  // In the old Win32 way of doing things, we would receive a WM_TOUCH event
-  // that told us the state of every touchpoint on the touch surface.  If
-  // multiple touchpoints had moved since the last update we would learn
-  // about all their movement simultaneously.
-  //
-  // In the new WinRT way of doing things, we receive a separate
-  // PointerPressed/PointerMoved/PointerReleased event for each touchpoint
-  // that has changed.
-  //
-  // When we learn of touch input, we dispatch gecko events in response.
-  // With the new WinRT way of doing things, we would end up sending many
-  // more gecko events than we would using the Win32 mechanism.  E.g.,
-  // for 5 active touchpoints, we would be sending 5 times as many gecko
-  // events.  This caused performance to visibly degrade on modestly-powered
-  // machines.  In response, we no longer send touch events immediately
-  // upon receiving PointerPressed or PointerMoved.  Instead, we store
-  // the updated touchpoint info and record the fact that the touchpoint
-  // has changed.  If ever we try to update a touchpoint has already
-  // changed, we dispatch a touch event containing all the changed touches.
-  void InitTouchEventTouchList(WidgetTouchEvent* aEvent);
-  nsBaseHashtable<nsUint32HashKey,
-                  nsRefPtr<mozilla::dom::Touch>,
-                  nsRefPtr<mozilla::dom::Touch> > mTouches;
-
-  // These registration tokens are set when we register ourselves to receive
-  // events from our window.  We must hold on to them for the entire duration
-  // that we want to receive these events.  When we are done, we must
-  // unregister ourself with the window using these tokens.
-  EventRegistrationToken mTokenPointerPressed;
-  EventRegistrationToken mTokenPointerReleased;
-  EventRegistrationToken mTokenPointerMoved;
-  EventRegistrationToken mTokenPointerEntered;
-  EventRegistrationToken mTokenPointerExited;
-
-  // When we register ourselves to handle edge gestures, we receive a
-  // token. To we unregister ourselves, we must use the token we received.
-  EventRegistrationToken mTokenEdgeStarted;
-  EventRegistrationToken mTokenEdgeCanceled;
-  EventRegistrationToken mTokenEdgeCompleted;
-
-  // These registration tokens are set when we register ourselves to receive
-  // events from our GestureRecognizer.  It's probably not a huge deal if we
-  // don't unregister ourselves with our GestureRecognizer before destroying
-  // the GestureRecognizer, but it can't hurt.
-  EventRegistrationToken mTokenManipulationCompleted;
-  EventRegistrationToken mTokenTapped;
-  EventRegistrationToken mTokenRightTapped;
-
-  // Due to a limitation added in 8.1 the ui thread can't re-enter the main
-  // native event dispatcher in MetroAppShell. So all events delivered to us
-  // on the ui thread via a native event dispatch call get bounced through
-  // the gecko thread event queue using runnables. Most events can be sent
-  // async without the need to see the status result. Those that do have
-  // specialty callbacks. Note any event that arrives to us on the ui thread
-  // that originates from another thread is safe to send sync.
-
-  // Async event dispatching
-  void DispatchAsyncEventIgnoreStatus(WidgetInputEvent* aEvent);
-  void DispatchAsyncTouchEvent(WidgetTouchEvent* aEvent);
-
-  // Async event callbacks
-  void DeliverNextQueuedEventIgnoreStatus();
-  void DeliverNextQueuedTouchEvent();
-
-  void HandleTouchStartEvent(WidgetTouchEvent* aEvent);
-  void HandleFirstTouchMoveEvent(WidgetTouchEvent* aEvent);
-  void SendPointerCancelToContent(const WidgetTouchEvent& aEvent);
-  bool SendPendingResponseToApz();
-  void CancelGesture();
-
-  // Sync event dispatching
-  void DispatchEventIgnoreStatus(WidgetGUIEvent* aEvent);
-
-  nsDeque mInputEventQueue;
-  mozilla::layers::ScrollableLayerGuid mTargetAPZCGuid;
-  uint64_t mInputBlockId;
-  static nsEventStatus sThrowawayStatus;
-};
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroUIUtils.js thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroUIUtils.js
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroUIUtils.js	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroUIUtils.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +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/. */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-const Cr = Components.results;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-function MetroUIUtils() {
-}
-
-const URLElements = {
-  "a": "href",
-  "applet": ["archive", "code", "codebase"],
-  "area": "href",
-  "audio": "src",
-  "base": "href",
-  "blockquote": ["cite"],
-  "body": "background",
-  "button": "formaction",
-  "command": "icon",
-  "del": ["cite"],
-  "embed": "src",
-  "form": "action",
-  "frame": ["longdesc", "src"],
-  "iframe": ["longdesc", "src"],
-  "img": ["longdesc", "src"],
-  "input": ["formaction", "src"],
-  "ins": ["cite"],
-  "link": "href",
-  "object": ["archive", "codebase", "data"],
-  "q": ["cite"],
-  "script": "src",
-  "source": "src",
-};
-
-MetroUIUtils.prototype = {
-  classID : Components.ID("e4626085-17f7-4068-a225-66c1acc0485c"),
-  QueryInterface : XPCOMUtils.generateQI([Ci.nsIMetroUIUtils]),
-  /**
-   * Loads the specified panel in the browser.
-   * @ param aPanelId The identifier of the pane to load
-  */
-  showPanel: function(aPanelId) {
-    let browserWin = Services.wm.getMostRecentWindow("navigator:browser");
-    browserWin.PanelUI.show(aPanelId);
-  },
-
-  /**
-   * Determines if the browser has selected content
-  */
-  get hasSelectedContent() {
-    try {
-      let browserWin = Services.wm.getMostRecentWindow("navigator:browser");
-      let tabBrowser = browserWin.getBrowser();
-      if (!browserWin || !tabBrowser || !tabBrowser.contentWindow) {
-        return false;
-      }
-
-      let sel = tabBrowser.contentWindow.getSelection();
-      return sel && sel.toString();
-    } catch(e) {
-      return false;
-    }
-  },
-
-  /**
-   * Obtains the current page title
-  */
-  get currentPageTitle() {
-    let browserWin = Services.wm.getMostRecentWindow("navigator:browser");
-    if (!browserWin || !browserWin.content || !browserWin.content.document) {
-      throw Cr.NS_ERROR_FAILURE;
-    }
-    return browserWin.content.document.title || "";
-  },
-
-  /**
-   * Obtains the current page URI
-  */
-  get currentPageURI() {
-    let browserWin = Services.wm.getMostRecentWindow("navigator:browser");
-    if (!browserWin || !browserWin.content || !browserWin.content.document) {
-      throw Cr.NS_ERROR_FAILURE;
-    }
-    return browserWin.content.document.URL || "";
-  },
-
-  /**
-   * Determines the text that should be shared
-  */
-  get shareText() {
-    let browserWin = Services.wm.getMostRecentWindow("navigator:browser");
-    let tabBrowser = browserWin.getBrowser();
-    if (browserWin && tabBrowser && tabBrowser.contentWindow) {
-      let sel = tabBrowser.contentWindow.getSelection();
-      if (sel && sel.rangeCount)
-        return sel;
-    }
-
-    throw Cr.NS_ERROR_FAILURE;
-  },
-
-  /**
-   * Replaces the node's attribute value to be a fully qualified URL
-  */
-  _expandAttribute : function(ioService, doc, node, attrName) {
-    let attrValue = node.getAttribute(attrName);
-    if (!attrValue)
-      return;
-
-    try {
-      let uri = ioService.newURI(attrValue, null, doc.baseURIObject);
-      node.setAttribute(attrName, uri.spec);
-    } catch (e) {
-    }
-  },
-
-  /*
-   * Replaces all attribute values in 'n' which contain URLs recursiely
-   * to fully qualified URLs.
-  */
-  _expandURLs: function(doc, n) {
-    let ioService = Cc["@mozilla.org/network/io-service;1"].
-                    getService(Ci.nsIIOService);
-    for (let i = 0; i < n.children.length; i++) {
-      let child = n.children[i];
-      let childTagName = child.tagName.toLowerCase();
-      
-      // Iterate through all known tags which can contain URLs. A tag either
-      // contains a single attribute name or an array of attribute names.
-      for (let tagName in URLElements) {
-        if (tagName === childTagName) {
-          if (URLElements[tagName] instanceof Array) {
-            URLElements[tagName].forEach(function(attrName) {
-              this._expandAttribute(ioService ,doc, child, attrName);
-            }, this);
-          } else {
-            this._expandAttribute(ioService ,doc, child, URLElements[tagName]);
-          }
-        }
-      }
-
-      this._expandURLs(doc, child);
-    }
-  },
-
-  /**
-   * Determines the HTML that should be shared
-  */
-  get shareHTML() {
-    let browserWin = Services.wm.getMostRecentWindow("navigator:browser");
-    let tabBrowser = browserWin.getBrowser();
-    let sel;
-    if (browserWin && tabBrowser && tabBrowser.contentWindow &&
-        (sel = tabBrowser.contentWindow.getSelection()) && sel.rangeCount) {
-      let div = tabBrowser.contentWindow.document.createElement("DIV");
-      for (let i = 0; i < sel.rangeCount; i++) {
-        let contents = sel.getRangeAt(i).cloneContents(true);
-        div.appendChild(contents);
-      }
-      this._expandURLs(tabBrowser.contentWindow.document, div);
-      return div.outerHTML;
-    }
-
-    throw Cr.NS_ERROR_FAILURE;
-  }
-};
-
-var component = [MetroUIUtils];
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory(component);
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroUIUtils.manifest thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroUIUtils.manifest
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroUIUtils.manifest	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroUIUtils.manifest	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-# MetroUIUtils.js
-component {e4626085-17f7-4068-a225-66c1acc0485c} MetroUIUtils.js
-contract @mozilla.org/metro-ui-utils;1 {e4626085-17f7-4068-a225-66c1acc0485c}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroUtils.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroUtils.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroUtils.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroUtils.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +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/. */
-
-#include "MetroUtils.h"
-#include <windows.h>
-#include "nsICommandLineRunner.h"
-#include "nsNetUtil.h"
-#include "nsIBrowserDOMWindow.h"
-#include "nsIWebNavigation.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIDOMWindow.h"
-#include "nsIDOMChromeWindow.h"
-#include "nsIWindowMediator.h"
-#include "nsIURI.h"
-#include "prlog.h"
-#include "nsIObserverService.h"
-#include "nsRect.h"
-
-#include <wrl/wrappers/corewrappers.h>
-#include <windows.ui.applicationsettings.h>
-#include <windows.graphics.display.h>
-#include "DisplayInfo_sdk81.h"
-
-using namespace ABI::Windows::UI::ApplicationSettings;
-
-using namespace mozilla;
-
-using namespace ABI::Windows::Foundation;
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-using namespace ABI::Windows::UI::ViewManagement;
-using namespace ABI::Windows::Graphics::Display;
-
-// Conversion between logical and physical coordinates
-
-double
-MetroUtils::LogToPhysFactor()
-{
-  ComPtr<IDisplayInformationStatics> dispInfoStatics;
-  if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(),
-                                      dispInfoStatics.GetAddressOf()))) {
-    ComPtr<IDisplayInformation> dispInfo;
-    if (SUCCEEDED(dispInfoStatics->GetForCurrentView(&dispInfo))) {
-      FLOAT dpi;
-      if (SUCCEEDED(dispInfo->get_LogicalDpi(&dpi))) {
-        return (double)dpi / 96.0f;
-      }
-    }
-  }
-
-  ComPtr<IDisplayPropertiesStatics> dispProps;
-  if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(),
-                                      dispProps.GetAddressOf()))) {
-    FLOAT dpi;
-    if (SUCCEEDED(dispProps->get_LogicalDpi(&dpi))) {
-      return (double)dpi / 96.0f;
-    }
-  }
-
-  return 1.0;
-}
-
-double
-MetroUtils::PhysToLogFactor()
-{
-  return 1.0 / LogToPhysFactor();
-}
-
-double
-MetroUtils::ScaleFactor()
-{
-  // Return the resolution scale factor reported by the metro environment.
-  // XXX TODO: also consider the desktop resolution setting, as IE appears to do?
-  ComPtr<IDisplayInformationStatics> dispInfoStatics;
-  if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(),
-                                      dispInfoStatics.GetAddressOf()))) {
-    ComPtr<IDisplayInformation> dispInfo;
-    if (SUCCEEDED(dispInfoStatics->GetForCurrentView(&dispInfo))) {
-      ResolutionScale scale;
-      if (SUCCEEDED(dispInfo->get_ResolutionScale(&scale))) {
-        return (double)scale / 100.0;
-      }
-    }
-  }
-
-  ComPtr<IDisplayPropertiesStatics> dispProps;
-  if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(),
-                                     dispProps.GetAddressOf()))) {
-    ResolutionScale scale;
-    if (SUCCEEDED(dispProps->get_ResolutionScale(&scale))) {
-      return (double)scale / 100.0;
-    }
-  }
-
-  return 1.0;
-}
-
-nsIntPoint
-MetroUtils::LogToPhys(const Point& aPt)
-{
-  double factor = LogToPhysFactor();
-  return nsIntPoint(int32_t(NS_round(aPt.X * factor)), int32_t(NS_round(aPt.Y * factor)));
-}
-
-nsIntRect
-MetroUtils::LogToPhys(const Rect& aRect)
-{
-  double factor = LogToPhysFactor();
-  return nsIntRect(int32_t(NS_round(aRect.X * factor)),
-                   int32_t(NS_round(aRect.Y * factor)),
-                   int32_t(NS_round(aRect.Width * factor)),
-                   int32_t(NS_round(aRect.Height * factor)));
-}
-
-Point
-MetroUtils::PhysToLog(const nsIntPoint& aPt)
-{
-  // Points contain FLOATs
-  FLOAT factor = (FLOAT)PhysToLogFactor();
-  Point p = { FLOAT(aPt.x) * factor, FLOAT(aPt.y) * factor };
-  return p;
-}
-
-nsresult
-MetroUtils::FireObserver(const char* aMessage, const char16_t* aData)
-{
-  nsCOMPtr<nsIObserverService> observerService =
-    mozilla::services::GetObserverService();
-  if (observerService) {
-    return observerService->NotifyObservers(nullptr, aMessage, aData);
-  }
-  return NS_ERROR_FAILURE;
-}
-
-HRESULT MetroUtils::CreateUri(HSTRING aUriStr, ComPtr<IUriRuntimeClass>& aUriOut)
-{
-  HRESULT hr;
-  ComPtr<IUriRuntimeClassFactory> uriFactory;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_Foundation_Uri).Get(), &uriFactory);
-  AssertRetHRESULT(hr, hr);
-  ComPtr<IUriRuntimeClass> uri;
-  return uriFactory->CreateUri(aUriStr, &aUriOut);
-}
-
-HRESULT MetroUtils::CreateUri(HString& aHString, ComPtr<IUriRuntimeClass>& aUriOut)
-{
-  return MetroUtils::CreateUri(aHString.Get(), aUriOut);
-}
-
-HRESULT
-MetroUtils::GetViewState(ApplicationViewState& aState)
-{
-  HRESULT hr;
-  ComPtr<IApplicationViewStatics> appViewStatics;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_ViewManagement_ApplicationView).Get(),
-    appViewStatics.GetAddressOf());
-  AssertRetHRESULT(hr, hr);
-  hr = appViewStatics->get_Value(&aState);
-  return hr;
-}
-
-HRESULT
-MetroUtils::TryUnsnap(bool* aResult)
-{
-  HRESULT hr;
-  ComPtr<IApplicationViewStatics> appViewStatics;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_ViewManagement_ApplicationView).Get(),
-    appViewStatics.GetAddressOf());
-  AssertRetHRESULT(hr, hr);
-  boolean success = false;
-  hr = appViewStatics->TryUnsnap(&success);
-  if (aResult)
-    *aResult = success;
-  return hr;
-}
-
-HRESULT
-MetroUtils::ShowSettingsFlyout()
-{
-  ComPtr<ISettingsPaneStatics> settingsPaneStatics;
-  HRESULT hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_ApplicationSettings_SettingsPane).Get(),
-                                    settingsPaneStatics.GetAddressOf());
-  if (SUCCEEDED(hr)) {
-    settingsPaneStatics->Show();
-  }
-
-  return hr;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroUtils.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroUtils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +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/. */
-
-#pragma once
-
-#include "nsDebug.h"
-#include "nsThreadUtils.h"
-#include "nsString.h"
-#include "nsPoint.h"
-#include "WinUtils.h"
-#include "nsRect.h"
-
-#include "mozwrlbase.h"
-
-#include <stdio.h>
-#include <windows.foundation.h>
-#include <windows.ui.viewmanagement.h>
-
-// HRESULT checkers, these warn on failure in debug builds
-#ifdef DEBUG
-#define DebugLogHR(hr) LogHRESULT(hr)
-#else
-#define DebugLogHR(hr)
-#endif
-#define AssertHRESULT(hr)           \
-  if (FAILED(hr)) {                 \
-    DebugLogHR(hr);                 \
-    return;                         \
-  }
-#define AssertRetHRESULT(hr, res)   \
-  if (FAILED(hr)) {                 \
-    DebugLogHR(hr);                 \
-    return res;                     \
-  }
-
-// MS Point helpers
-#define POINT_CEIL_X(position) (uint32_t)ceil(position.X)
-#define POINT_CEIL_Y(position) (uint32_t)ceil(position.Y)
-
-class nsIBrowserDOMWindow;
-class nsIDOMWindow;
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-template<unsigned int size, typename T>
-HRESULT ActivateGenericInstance(wchar_t const (&RuntimeClassName)[size], Microsoft::WRL::ComPtr<T>& aOutObject) {
-  Microsoft::WRL::ComPtr<IActivationFactory> factory;
-  HRESULT hr = ABI::Windows::Foundation::GetActivationFactory(Microsoft::WRL::Wrappers::HStringReference(RuntimeClassName).Get(),
-                                                              factory.GetAddressOf());
-  if (FAILED(hr))
-    return hr;
-  Microsoft::WRL::ComPtr<IInspectable> inspect;
-  hr = factory->ActivateInstance(inspect.GetAddressOf());
-  if (FAILED(hr))
-    return hr;
-  return inspect.As(&aOutObject);
-}
-
-} } }
-
-class MetroUtils
-{
-  typedef ABI::Windows::Foundation::IUriRuntimeClass IUriRuntimeClass;
-  typedef Microsoft::WRL::Wrappers::HString HString;
-  typedef ABI::Windows::UI::ViewManagement::ApplicationViewState ApplicationViewState;
-  typedef ABI::Windows::Foundation::Point Point;
-  typedef ABI::Windows::Foundation::Rect Rect;
-
-public:
-  // Functions to convert between logical pixels as used by most Windows APIs
-  // and physical (device) pixels.
-  static double LogToPhysFactor();
-  static double PhysToLogFactor();
-  static nsIntPoint LogToPhys(const Point& aPt);
-  static nsIntRect LogToPhys(const Rect& aRect);
-  static Point PhysToLog(const nsIntPoint& aPt);
-
-  // Resolution scale factor
-  static double ScaleFactor();
-
-  static nsresult FireObserver(const char* aMessage, const char16_t* aData = nullptr);
-
-  static HRESULT CreateUri(HSTRING aUriStr, Microsoft::WRL::ComPtr<IUriRuntimeClass>& aUriOut);
-  static HRESULT CreateUri(HString& aHString, Microsoft::WRL::ComPtr<IUriRuntimeClass>& aUriOut);
-  static HRESULT GetViewState(ApplicationViewState& aState);
-  static HRESULT TryUnsnap(bool* aResult = nullptr);
-  static HRESULT ShowSettingsFlyout();
-
-private:
-  static nsresult GetBrowserDOMWindow(nsCOMPtr<nsIBrowserDOMWindow> &aBWin);
-  static nsresult GetMostRecentWindow(const char16_t* aType, nsIDOMWindow** aWindow);
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroWidget.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroWidget.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroWidget.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroWidget.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1628 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=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/. */
-
-#include "ContentHelper.h"
-#include "MetroWidget.h"
-#include "MetroApp.h"
-#include "mozilla/Preferences.h"
-#include "nsToolkit.h"
-#include "KeyboardLayout.h"
-#include "MetroUtils.h"
-#include "WinUtils.h"
-#include "nsToolkitCompsCID.h"
-#include "nsIAppStartup.h"
-#include "../resource.h"
-#include "nsIWidgetListener.h"
-#include "nsIPresShell.h"
-#include "nsPrintfCString.h"
-#include "nsWindowDefs.h"
-#include "FrameworkView.h"
-#include "nsTextStore.h"
-#include "Layers.h"
-#include "ClientLayerManager.h"
-#include "BasicLayers.h"
-#include "FrameMetrics.h"
-#include <windows.devices.input.h>
-#include "Windows.Graphics.Display.h"
-#include "DisplayInfo_sdk81.h"
-#include "nsNativeDragTarget.h"
-#ifdef MOZ_CRASHREPORTER
-#include "nsExceptionHandler.h"
-#endif
-#include "UIABridgePrivate.h"
-#include "WinMouseScrollHandler.h"
-#include "InputData.h"
-#include "mozilla/TextEvents.h"
-#include "mozilla/TouchEvents.h"
-#include "mozilla/MiscEvents.h"
-#include "gfxPrefs.h"
-
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-
-using namespace mozilla;
-using namespace mozilla::widget;
-using namespace mozilla::layers;
-using namespace mozilla::widget::winrt;
-
-using namespace ABI::Windows::ApplicationModel;
-using namespace ABI::Windows::ApplicationModel::Core;
-using namespace ABI::Windows::ApplicationModel::Activation;
-using namespace ABI::Windows::UI::Input;
-using namespace ABI::Windows::Devices::Input;
-using namespace ABI::Windows::UI::Core;
-using namespace ABI::Windows::System;
-using namespace ABI::Windows::Foundation;
-using namespace ABI::Windows::Foundation::Collections;
-using namespace ABI::Windows::Graphics::Display;
-
-#ifdef PR_LOGGING
-extern PRLogModuleInfo* gWindowsLog;
-#endif
-
-#if !defined(SM_CONVERTIBLESLATEMODE)
-#define SM_CONVERTIBLESLATEMODE 0x2003
-#endif
-
-static uint32_t gInstanceCount = 0;
-const char16_t* kMetroSubclassThisProp = L"MetroSubclassThisProp";
-HWND MetroWidget::sICoreHwnd = nullptr;
-
-namespace mozilla {
-namespace widget {
-UINT sDefaultBrowserMsgId = RegisterWindowMessageW(L"DefaultBrowserClosing");
-} }
-
-// WM_GETOBJECT id pulled from uia headers
-#define MOZOBJID_UIAROOT -25
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-extern ComPtr<MetroApp> sMetroApp;
-extern ComPtr<IUIABridge> gProviderRoot;
-} } }
-
-namespace {
-
-  void SendInputs(uint32_t aModifiers, INPUT* aExtraInputs, uint32_t aExtraInputsLen)
-  {
-    // keySequence holds the virtual key values of each of the keys we intend
-    // to press
-    nsAutoTArray<KeyPair,32> keySequence;
-    for (uint32_t i = 0; i < ArrayLength(sModifierKeyMap); ++i) {
-      const uint32_t* map = sModifierKeyMap[i];
-      if (aModifiers & map[0]) {
-        keySequence.AppendElement(KeyPair(map[1], map[2]));
-      }
-    }
-
-    uint32_t const len = keySequence.Length() * 2 + aExtraInputsLen;
-
-    // The `inputs` array is a sequence of input events that will happen
-    // serially.  We set the array up so that each modifier key is pressed
-    // down, then the additional input events happen,
-    // then each modifier key is released in reverse order of when
-    // it was pressed down.  We pass this array to `SendInput`.
-    //
-    // inputs[0]: modifier key (e.g. shift, ctrl, etc) down
-    // ...        ...
-    // inputs[keySequence.Length()-1]: modifier key (e.g. shift, ctrl, etc) down
-    // inputs[keySequence.Length()]: aExtraInputs[0]
-    // inputs[keySequence.Length()+1]: aExtraInputs[1]
-    // ...        ...
-    // inputs[keySequence.Length() + aExtraInputsLen - 1]: aExtraInputs[aExtraInputsLen - 1]
-    // inputs[keySequence.Length() + aExtraInputsLen]: modifier key (e.g. shift, ctrl, etc) up
-    // ...        ...
-    // inputs[len-1]: modifier key (e.g. shift, ctrl, etc) up
-    INPUT* inputs = new INPUT[len];
-    memset(inputs, 0, len * sizeof(INPUT));
-    for (uint32_t i = 0; i < keySequence.Length(); ++i) {
-      inputs[i].type = inputs[len-i-1].type = INPUT_KEYBOARD;
-      inputs[i].ki.wVk = inputs[len-i-1].ki.wVk = keySequence[i].mSpecific
-                                                ? keySequence[i].mSpecific
-                                                : keySequence[i].mGeneral;
-      inputs[len-i-1].ki.dwFlags |= KEYEVENTF_KEYUP;
-    }
-    for (uint32_t i = 0; i < aExtraInputsLen; i++) {
-      inputs[keySequence.Length()+i] = aExtraInputs[i];
-    }
-    WinUtils::Log("  Sending inputs");
-    for (uint32_t i = 0; i < len; i++) {
-      if (inputs[i].type == INPUT_KEYBOARD) {
-        WinUtils::Log("    Key press: 0x%x %s",
-            inputs[i].ki.wVk,
-            inputs[i].ki.dwFlags & KEYEVENTF_KEYUP
-            ? "UP"
-            : "DOWN");
-      } else if(inputs[i].type == INPUT_MOUSE) {
-        WinUtils::Log("    Mouse input: 0x%x 0x%x",
-            inputs[i].mi.dwFlags,
-            inputs[i].mi.mouseData);
-      } else {
-        WinUtils::Log("    Unknown input type!");
-      }
-    }
-    ::SendInput(len, inputs, sizeof(INPUT));
-    delete[] inputs;
-
-    // The inputs have been sent, and the WM_* messages they generate are
-    // waiting to be processed by our event loop.  Now we manually pump
-    // those messages so that, upon our return, all the inputs have been
-    // processed.
-    WinUtils::Log("  Inputs sent. Waiting for input messages to clear");
-    MSG msg;
-    while (WinUtils::PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) {
-      if (nsTextStore::ProcessRawKeyMessage(msg)) {
-        continue;  // the message is consumed by TSF
-      }
-      ::TranslateMessage(&msg);
-      ::DispatchMessage(&msg);
-      WinUtils::Log("    Dispatched 0x%x 0x%x 0x%x", msg.message, msg.wParam, msg.lParam);
-    }
-    WinUtils::Log("  No more input messages");
-  }
-}
-
-NS_IMPL_ISUPPORTS_INHERITED0(MetroWidget, nsBaseWidget)
-
-MetroWidget::MetroWidget() :
-  mTransparencyMode(eTransparencyOpaque),
-  mWnd(nullptr),
-  mMetroWndProc(nullptr),
-  mTempBasicLayerInUse(false),
-  mRootLayerTreeId(),
-  nsWindowBase()
-{
-  // Global initialization
-  if (!gInstanceCount) {
-    UserActivity();
-    nsTextStore::Initialize();
-    MouseScrollHandler::Initialize();
-    KeyboardLayout::GetInstance()->OnLayoutChange(::GetKeyboardLayout(0));
-  } // !gInstanceCount
-  gInstanceCount++;
-}
-
-MetroWidget::~MetroWidget()
-{
-  LogThis();
-
-  gInstanceCount--;
-
-  // Global shutdown
-  if (!gInstanceCount) {
-    APZController::sAPZC = nullptr;
-    nsTextStore::Terminate();
-  } // !gInstanceCount
-}
-
-static bool gTopLevelAssigned = false;
-NS_IMETHODIMP
-MetroWidget::Create(nsIWidget *aParent,
-                    nsNativeWidget aNativeParent,
-                    const nsIntRect &aRect,
-                    nsWidgetInitData *aInitData)
-{
-  LogFunction();
-
-  nsWidgetInitData defaultInitData;
-  if (!aInitData)
-    aInitData = &defaultInitData;
-
-  mWindowType = aInitData->mWindowType;
-
-  // Ensure that the toolkit is created.
-  nsToolkit::GetToolkit();
-
-  BaseCreate(aParent, aRect, aInitData);
-
-  if (mWindowType != eWindowType_toplevel) {
-    switch(mWindowType) {
-      case eWindowType_dialog:
-      WinUtils::Log("eWindowType_dialog window requested, returning failure.");
-      break;
-      case eWindowType_child:
-      WinUtils::Log("eWindowType_child window requested, returning failure.");
-      break;
-      case eWindowType_popup:
-      WinUtils::Log("eWindowType_popup window requested, returning failure.");
-      break;
-      case eWindowType_plugin:
-      WinUtils::Log("eWindowType_plugin window requested, returning failure.");
-      break;
-      // we should support toolkit's eWindowType_invisible at some point.
-      case eWindowType_invisible:
-      WinUtils::Log("eWindowType_invisible window requested, this doesn't actually exist!");
-      return NS_OK;
-    }
-    NS_WARNING("Invalid window type requested.");
-    return NS_ERROR_FAILURE;
-  }
-
-  if (gTopLevelAssigned) {
-    // Need to accept so that the mochitest-chrome test harness window
-    // can be created.
-    NS_WARNING("New eWindowType_toplevel window requested after FrameworkView widget created.");
-    NS_WARNING("Widget created but the physical window does not exist! Fix me!");
-    return NS_OK;
-  }
-
-  // the main widget gets created first
-  gTopLevelAssigned = true;
-  sMetroApp->SetWidget(this);
-  WinUtils::SetNSWindowBasePtr(mWnd, this);
-
-  if (mWidgetListener) {
-    mWidgetListener->WindowActivated();
-  }
-
-  return NS_OK;
-}
-
-void
-MetroWidget::SetView(FrameworkView* aView)
-{
-  mView = aView;
-  // If we've already set this up, it points to a useless
-  // layer manager, so reset it.
-  mLayerManager = nullptr;
-}
-
-NS_IMETHODIMP
-MetroWidget::Destroy()
-{
-  if (mOnDestroyCalled)
-    return NS_OK;
-  WinUtils::Log("[%X] %s mWnd=%X type=%d", this, __FUNCTION__, mWnd, mWindowType);
-  mOnDestroyCalled = true;
-
-  nsCOMPtr<nsIWidget> kungFuDeathGrip(this);
-
-  if (ShouldUseAPZC()) {
-    nsresult rv;
-    nsCOMPtr<nsIObserverService> observerService = do_GetService("@mozilla.org/observer-service;1", &rv);
-    if (NS_SUCCEEDED(rv)) {
-      observerService->RemoveObserver(this, "apzc-scroll-offset-changed");
-      observerService->RemoveObserver(this, "apzc-zoom-to-rect");
-      observerService->RemoveObserver(this, "apzc-disable-zoom");
-    }
-  }
-
-  RemoveSubclass();
-  NotifyWindowDestroyed();
-
-  // Prevent the widget from sending additional events.
-  mWidgetListener = nullptr;
-  mAttachedWidgetListener = nullptr;
-
-  // Release references to children, device context, toolkit, and app shell.
-  nsBaseWidget::Destroy();
-  nsBaseWidget::OnDestroy();
-  WinUtils::SetNSWindowBasePtr(mWnd, nullptr);
-
-  if (mLayerManager) {
-    mLayerManager->Destroy();
-  }
-
-  mLayerManager = nullptr;
-  mView = nullptr;
-  mIdleService = nullptr;
-  mWnd = nullptr;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-MetroWidget::SetParent(nsIWidget *aNewParent)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-MetroWidget::Show(bool bState)
-{
-  return NS_OK;
-}
-
-uint32_t
-MetroWidget::GetMaxTouchPoints() const
-{
-  ComPtr<IPointerDeviceStatics> deviceStatics;
-
-  HRESULT hr = GetActivationFactory(
-    HStringReference(RuntimeClass_Windows_Devices_Input_PointerDevice).Get(),
-    deviceStatics.GetAddressOf());
-
-  if (FAILED(hr)) {
-    return 0;
-  }
-
-  ComPtr< IVectorView<PointerDevice*> > deviceList;
-  hr = deviceStatics->GetPointerDevices(&deviceList);
-
-  if (FAILED(hr)) {
-    return 0;
-  }
-
-  uint32_t deviceNum = 0;
-  deviceList->get_Size(&deviceNum);
-
-  uint32_t maxTouchPoints = 0;
-  for (uint32_t index = 0; index < deviceNum; ++index) {
-    ComPtr<IPointerDevice> device;
-    PointerDeviceType deviceType;
-
-    if (FAILED(deviceList->GetAt(index, device.GetAddressOf()))) {
-      continue;
-    }
-
-    if (FAILED(device->get_PointerDeviceType(&deviceType)))  {
-      continue;
-    }
-
-    if (deviceType == PointerDeviceType_Touch) {
-      uint32_t deviceMaxTouchPoints = 0;
-      device->get_MaxContacts(&deviceMaxTouchPoints);
-      maxTouchPoints = std::max(maxTouchPoints, deviceMaxTouchPoints);
-    }
-  }
-
-  return maxTouchPoints;
-}
-
-NS_IMETHODIMP
-MetroWidget::IsVisible(bool & aState)
-{
-  aState = mView->IsVisible();
-  return NS_OK;
-}
-
-bool
-MetroWidget::IsVisible() const
-{
-  if (!mView)
-    return false;
-  return mView->IsVisible();
-}
-
-NS_IMETHODIMP
-MetroWidget::EnableDragDrop(bool aEnable) {
-  if (aEnable) {
-    if (nullptr == mNativeDragTarget) {
-      mNativeDragTarget = new nsNativeDragTarget(this);
-      if (!mNativeDragTarget) {
-        return NS_ERROR_FAILURE;
-      }
-    }
-
-    HRESULT hr = ::RegisterDragDrop(mWnd, static_cast<LPDROPTARGET>(mNativeDragTarget));
-    return SUCCEEDED(hr) ? NS_OK : NS_ERROR_FAILURE;
-  } else {
-    if (nullptr == mNativeDragTarget) {
-      return NS_OK;
-    }
-
-    HRESULT hr = ::RevokeDragDrop(mWnd);
-    return SUCCEEDED(hr) ? NS_OK : NS_ERROR_FAILURE;
-  }
-}
-
-NS_IMETHODIMP
-MetroWidget::IsEnabled(bool *aState)
-{
-  *aState = mView->IsEnabled();
-  return NS_OK;
-}
-
-bool
-MetroWidget::IsEnabled() const
-{
-  if (!mView)
-    return false;
-  return mView->IsEnabled();
-}
-
-NS_IMETHODIMP
-MetroWidget::Enable(bool bState)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-MetroWidget::GetBounds(nsIntRect &aRect)
-{
-  if (mView) {
-    mView->GetBounds(aRect);
-  } else {
-    nsIntRect rect(0,0,0,0);
-    aRect = rect;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-MetroWidget::GetScreenBounds(nsIntRect &aRect)
-{
-  if (mView) {
-    mView->GetBounds(aRect);
-  } else {
-    nsIntRect rect(0,0,0,0);
-    aRect = rect;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-MetroWidget::GetClientBounds(nsIntRect &aRect)
-{
-  if (mView) {
-    mView->GetBounds(aRect);
-  } else {
-    nsIntRect rect(0,0,0,0);
-    aRect = rect;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-MetroWidget::SetCursor(nsCursor aCursor)
-{
-  if (!mView)
-    return NS_ERROR_FAILURE;
-
-  switch (aCursor) {
-    case eCursor_select:
-      mView->SetCursor(CoreCursorType::CoreCursorType_IBeam);
-      break;
-    case eCursor_wait:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Wait);
-      break;
-    case eCursor_hyperlink:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Hand);
-      break;
-    case eCursor_standard:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Arrow);
-      break;
-    case eCursor_n_resize:
-    case eCursor_s_resize:
-      mView->SetCursor(CoreCursorType::CoreCursorType_SizeNorthSouth);
-      break;
-    case eCursor_w_resize:
-    case eCursor_e_resize:
-      mView->SetCursor(CoreCursorType::CoreCursorType_SizeWestEast);
-      break;
-    case eCursor_nw_resize:
-    case eCursor_se_resize:
-      mView->SetCursor(CoreCursorType::CoreCursorType_SizeNorthwestSoutheast);
-      break;
-    case eCursor_ne_resize:
-    case eCursor_sw_resize:
-      mView->SetCursor(CoreCursorType::CoreCursorType_SizeNortheastSouthwest);
-      break;
-    case eCursor_crosshair:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Cross);
-      break;
-    case eCursor_move:
-      mView->SetCursor(CoreCursorType::CoreCursorType_SizeAll);
-      break;
-    case eCursor_help:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Help);
-      break;
-    // CSS3 custom cursors
-    case eCursor_copy:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Custom, IDC_COPY);
-      break;
-    case eCursor_alias:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Custom, IDC_ALIAS);
-      break;
-    case eCursor_cell:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Custom, IDC_CELL);
-      break;
-    case eCursor_grab:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Custom, IDC_GRAB);
-      break;
-    case eCursor_grabbing:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Custom, IDC_GRABBING);
-      break;
-    case eCursor_spinning:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Wait);
-      break;
-    case eCursor_context_menu:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Arrow);
-      break;
-    case eCursor_zoom_in:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Custom, IDC_ZOOMIN);
-      break;
-    case eCursor_zoom_out:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Custom, IDC_ZOOMOUT);
-      break;
-    case eCursor_not_allowed:
-    case eCursor_no_drop:
-      mView->SetCursor(CoreCursorType::CoreCursorType_UniversalNo);
-      break;
-    case eCursor_col_resize:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Custom, IDC_COLRESIZE);
-      break;
-    case eCursor_row_resize:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Custom, IDC_ROWRESIZE);
-      break;
-    case eCursor_vertical_text:
-      mView->SetCursor(CoreCursorType::CoreCursorType_Custom, IDC_VERTICALTEXT);
-      break;
-    case eCursor_all_scroll:
-      mView->SetCursor(CoreCursorType::CoreCursorType_SizeAll);
-      break;
-    case eCursor_nesw_resize:
-      mView->SetCursor(CoreCursorType::CoreCursorType_SizeNortheastSouthwest);
-      break;
-    case eCursor_nwse_resize:
-      mView->SetCursor(CoreCursorType::CoreCursorType_SizeNorthwestSoutheast);
-      break;
-    case eCursor_ns_resize:
-      mView->SetCursor(CoreCursorType::CoreCursorType_SizeNorthSouth);
-      break;
-    case eCursor_ew_resize:
-      mView->SetCursor(CoreCursorType::CoreCursorType_SizeWestEast);
-      break;
-    case eCursor_none:
-      mView->ClearCursor();
-      break;
-    default:
-      NS_WARNING("Invalid cursor type");
-      break;
-  }
-  return NS_OK;
-}
-
-nsresult
-MetroWidget::SynthesizeNativeKeyEvent(int32_t aNativeKeyboardLayout,
-                                      int32_t aNativeKeyCode,
-                                      uint32_t aModifierFlags,
-                                      const nsAString& aCharacters,
-                                      const nsAString& aUnmodifiedCharacters,
-                                      nsIObserver* aObserver)
-{
-  AutoObserverNotifier notifier(aObserver, "keyevent");
-  KeyboardLayout* keyboardLayout = KeyboardLayout::GetInstance();
-  return keyboardLayout->SynthesizeNativeKeyEvent(
-           this, aNativeKeyboardLayout, aNativeKeyCode, aModifierFlags,
-           aCharacters, aUnmodifiedCharacters);
-}
-
-nsresult
-MetroWidget::SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
-                                        uint32_t aNativeMessage,
-                                        uint32_t aModifierFlags,
-                                        nsIObserver* aObserver)
-{
-  WinUtils::Log("ENTERED SynthesizeNativeMouseEvent");
-
-  AutoObserverNotifier notifier(aObserver, "mouseevent");
-  INPUT inputs[2];
-  memset(inputs, 0, 2*sizeof(INPUT));
-  inputs[0].type = inputs[1].type = INPUT_MOUSE;
-  inputs[0].mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE;
-  // Inexplicably, the x and y coordinates that we want to move the mouse to
-  // are specified as values in the range (0, 65535). (0,0) represents the
-  // top left of the primary monitor and (65535, 65535) represents the
-  // bottom right of the primary monitor.
-  inputs[0].mi.dx = (aPoint.x * 65535) / ::GetSystemMetrics(SM_CXSCREEN);
-  inputs[0].mi.dy = (aPoint.y * 65535) / ::GetSystemMetrics(SM_CYSCREEN);
-  inputs[1].mi.dwFlags = aNativeMessage;
-  SendInputs(aModifierFlags, inputs, 2);
-
-  WinUtils::Log("Exiting SynthesizeNativeMouseEvent");
-  return NS_OK;
-}
-
-nsresult
-MetroWidget::SynthesizeNativeMouseScrollEvent(LayoutDeviceIntPoint aPoint,
-                                              uint32_t aNativeMessage,
-                                              double aDeltaX,
-                                              double aDeltaY,
-                                              double aDeltaZ,
-                                              uint32_t aModifierFlags,
-                                              uint32_t aAdditionalFlags
-                                              nsIObserver* aObserver)
-{
-  AutoObserverNotifier notifier(aObserver, "mousescrollevent");
-  return MouseScrollHandler::SynthesizeNativeMouseScrollEvent(
-           this, aPoint, aNativeMessage,
-           (aNativeMessage == WM_MOUSEWHEEL || aNativeMessage == WM_VSCROLL) ?
-             static_cast<int32_t>(aDeltaY) : static_cast<int32_t>(aDeltaX),
-           aModifierFlags, aAdditionalFlags);
-}
-
-static void
-CloseGesture()
-{
-  LogFunction();
-  nsCOMPtr<nsIAppStartup> appStartup =
-    do_GetService(NS_APPSTARTUP_CONTRACTID);
-  if (appStartup) {
-    appStartup->Quit(nsIAppStartup::eForceQuit);
-  }
-}
-
-// Async event sending for mouse and keyboard input.
-
-// defined in nsWindowBase, called from shared module WinMouseScrollHandler.
-bool
-MetroWidget::DispatchWheelEvent(mozilla::WidgetWheelEvent* aEvent)
-{
-  WidgetWheelEvent* wheelEvent =
-    new WidgetWheelEvent(aEvent->mFlags.mIsTrusted, aEvent->message, aEvent->widget);
-  wheelEvent->AssignWheelEventData(*aEvent, true);
-  mEventQueue.Push(wheelEvent);
-  nsCOMPtr<nsIRunnable> runnable =
-    NS_NewRunnableMethod(this, &MetroWidget::DeliverNextScrollEvent);
-  NS_DispatchToCurrentThread(runnable);
-  return false;
-}
-
-bool
-MetroWidget::DispatchContentCommandEvent(mozilla::WidgetGUIEvent* aEvent)
-{
-  WidgetContentCommandEvent* cmdEvent =
-    new WidgetContentCommandEvent(aEvent->mFlags.mIsTrusted, aEvent->message, aEvent->widget);
-  cmdEvent->AssignContentCommandEventData(*aEvent, true);
-  mEventQueue.Push(cmdEvent);
-  nsCOMPtr<nsIRunnable> runnable =
-    NS_NewRunnableMethod(this, &MetroWidget::DeliverNextScrollEvent);
-  NS_DispatchToCurrentThread(runnable);
-  return false;
-}
-
-void
-MetroWidget::DeliverNextScrollEvent()
-{
-  WidgetGUIEvent* event =
-    static_cast<WidgetGUIEvent*>(mEventQueue.PopFront());
-  DispatchWindowEvent(event);
-  delete event;
-}
-
-// defined in nsWindowBase, called from shared module KeyboardLayout.
-bool
-MetroWidget::DispatchKeyboardEvent(WidgetKeyboardEvent* aEvent)
-{
-  MOZ_ASSERT(aEvent);
-  WidgetKeyboardEvent* keyEvent =
-    new WidgetKeyboardEvent(aEvent->mFlags.mIsTrusted,
-                            aEvent->message, aEvent->widget);
-  // XXX note this leaves pluginEvent null, which is fine for now.
-  keyEvent->AssignKeyEventData(*aEvent, true);
-  mKeyEventQueue.Push(keyEvent);
-  nsCOMPtr<nsIRunnable> runnable =
-    NS_NewRunnableMethod(this, &MetroWidget::DeliverNextKeyboardEvent);
-  NS_DispatchToCurrentThread(runnable);
-  return false;
-}
-
-// Used in conjunction with mKeyEventQueue to find a keypress event
-// that should not be delivered due to the return result of the
-// preceeding keydown.
-class KeyQueryIdAndCancel : public nsDequeFunctor {
-public:
-  KeyQueryIdAndCancel(uint32_t aIdToCancel) :
-    mId(aIdToCancel) {
-  }
-  virtual void* operator() (void* aObject) {
-    WidgetKeyboardEvent* event = static_cast<WidgetKeyboardEvent*>(aObject);
-    if (event->mUniqueId == mId) {
-      event->mFlags.mPropagationStopped = true;
-    }
-    return nullptr;
-  }
-protected:
-  uint32_t mId;
-};
-
-void
-MetroWidget::DeliverNextKeyboardEvent()
-{
-  WidgetKeyboardEvent* event =
-    static_cast<WidgetKeyboardEvent*>(mKeyEventQueue.PopFront());
-  if (event->mFlags.mPropagationStopped) {
-    // This can happen if a keypress was previously cancelled.
-    delete event;
-    return;
-  }
-
-  if (DispatchWindowEvent(event) && event->message == NS_KEY_DOWN) {
-    // keydown events may be followed by multiple keypress events which
-    // shouldn't be sent if preventDefault is called on keydown.
-    KeyQueryIdAndCancel query(event->mUniqueId);
-    mKeyEventQueue.ForEach(query);
-  }
-  delete event;
-}
-
-// static
-LRESULT CALLBACK
-MetroWidget::StaticWindowProcedure(HWND aWnd, UINT aMsg, WPARAM aWParam, LPARAM aLParam)
-{
-  MetroWidget* self = reinterpret_cast<MetroWidget*>(
-    GetProp(aWnd, kMetroSubclassThisProp));
-  if (!self) {
-    NS_NOTREACHED("Missing 'this' prop on subclassed metro window, this is bad.");
-    return 0;
-  }
-  return self->WindowProcedure(aWnd, aMsg, aWParam, aLParam);
-}
-
-LRESULT
-MetroWidget::WindowProcedure(HWND aWnd, UINT aMsg, WPARAM aWParam, LPARAM aLParam)
-{
-  if(sDefaultBrowserMsgId == aMsg) {
-    CloseGesture();
-  } else if (WM_SETTINGCHANGE == aMsg) {
-    if (aLParam && !wcsicmp(L"ConvertibleSlateMode", (wchar_t*)aLParam)) {
-      // If we're switching away from slate mode, switch to Desktop for
-      // hardware that supports this feature if the pref is set.
-      if (GetSystemMetrics(SM_CONVERTIBLESLATEMODE) != 0 &&
-          Preferences::GetBool("browser.shell.metro-auto-switch-enabled",
-                               false)) {
-        nsCOMPtr<nsIAppStartup> appStartup(do_GetService(NS_APPSTARTUP_CONTRACTID));
-        if (appStartup) {
-          appStartup->Quit(nsIAppStartup::eForceQuit | nsIAppStartup::eRestart);
-        }
-      }
-    }
-  }
-
-  // Indicates if we should hand messages to the default windows
-  // procedure for processing.
-  bool processDefault = true;
-
-  // The result returned if we do not do default processing.
-  LRESULT processResult = 0;
-
-  MSGResult msgResult(&processResult);
-  MouseScrollHandler::ProcessMessage(this, aMsg, aWParam, aLParam, msgResult);
-  if (msgResult.mConsumed) {
-    return processResult;
-  }
-
-  nsTextStore::ProcessMessage(this, aMsg, aWParam, aLParam, msgResult);
-  if (msgResult.mConsumed) {
-    return processResult;
-  }
-
-  switch (aMsg) {
-    case WM_POWERBROADCAST:
-    {
-      switch (aWParam)
-      {
-        case PBT_APMSUSPEND:
-          MetroApp::PostSleepWakeNotification(true);
-          break;
-        case PBT_APMRESUMEAUTOMATIC:
-        case PBT_APMRESUMECRITICAL:
-        case PBT_APMRESUMESUSPEND:
-          MetroApp::PostSleepWakeNotification(false);
-          break;
-      }
-      break;
-    }
-
-    // Keyboard handling is passed to KeyboardLayout, which delivers gecko events
-    // via DispatchKeyboardEvent.
-
-    case WM_KEYDOWN:
-    case WM_SYSKEYDOWN:
-    {
-      MSG msg = WinUtils::InitMSG(aMsg, aWParam, aLParam, aWnd);
-      // If this method doesn't call NativeKey::HandleKeyDownMessage(), this
-      // method must clean up the redirected message information itself.  For
-      // more information, see above comment of
-      // RedirectedKeyDownMessageManager::AutoFlusher class definition in
-      // KeyboardLayout.h.
-      RedirectedKeyDownMessageManager::AutoFlusher
-        redirectedMsgFlusher(this, msg);
-
-      if (nsTextStore::IsComposingOn(this)) {
-        break;
-      }
-
-      ModifierKeyState modKeyState;
-      NativeKey nativeKey(this, msg, modKeyState);
-      processDefault = !nativeKey.HandleKeyDownMessage();
-      // HandleKeyDownMessage cleaned up the redirected message information
-      // itself, so, we should do nothing.
-      redirectedMsgFlusher.Cancel();
-      break;
-    }
-
-    case WM_KEYUP:
-    case WM_SYSKEYUP:
-    {
-      if (nsTextStore::IsComposingOn(this)) {
-        break;
-      }
-
-      MSG msg = WinUtils::InitMSG(aMsg, aWParam, aLParam, aWnd);
-      ModifierKeyState modKeyState;
-      NativeKey nativeKey(this, msg, modKeyState);
-      processDefault = !nativeKey.HandleKeyUpMessage();
-      break;
-    }
-
-    case WM_CHAR:
-    case WM_SYSCHAR:
-    {
-      if (nsTextStore::IsComposingOn(this)) {
-        nsTextStore::CommitComposition(false);
-      }
-
-      MSG msg = WinUtils::InitMSG(aMsg, aWParam, aLParam, aWnd);
-      ModifierKeyState modKeyState;
-      NativeKey nativeKey(this, msg, modKeyState);
-      processDefault = !nativeKey.HandleCharMessage(msg);
-      break;
-    }
-
-    case WM_INPUTLANGCHANGE:
-    {
-      KeyboardLayout::GetInstance()->
-        OnLayoutChange(reinterpret_cast<HKL>(aLParam));
-      processResult = 1;
-      break;
-    }
-
-    case WM_APPCOMMAND:
-    {
-      MSG msg = WinUtils::InitMSG(aMsg, aWParam, aLParam, aWnd);
-      processDefault = HandleAppCommandMsg(msg, &processResult);
-      break;
-    }
-
-    case WM_GETOBJECT:
-    {
-      DWORD dwObjId = (LPARAM)(DWORD) aLParam;
-      // Passing this to CallWindowProc can result in a failure due to a timing issue
-      // in winrt core window server code, so we call it directly here. Also, it's not
-      // clear Windows::UI::Core::WindowServer::OnAutomationProviderRequestedEvent is
-      // compatible with metro enabled desktop browsers, it makes an initial call to
-      // UiaReturnRawElementProvider passing the return result from FrameworkView
-      // OnAutomationProviderRequested as the hwnd (me scratches head) which results in
-      // GetLastError always being set to invalid handle (6) after CallWindowProc returns.
-      if (dwObjId == MOZOBJID_UIAROOT && gProviderRoot) {
-        ComPtr<IRawElementProviderSimple> simple;
-        gProviderRoot.As(&simple);
-        if (simple) {
-          LRESULT res = UiaReturnRawElementProvider(aWnd, aWParam, aLParam, simple.Get());
-          if (res) {
-            return res;
-          }
-          NS_ASSERTION(res, "UiaReturnRawElementProvider failed!");
-          WinUtils::Log("UiaReturnRawElementProvider failed! GetLastError=%X", GetLastError());
-        }
-      }
-      break;
-    }
-
-    default:
-    {
-      break;
-    }
-  }
-
-  if (processDefault) {
-    return CallWindowProc(mMetroWndProc, aWnd, aMsg, aWParam,
-                          aLParam);
-  }
-  return processResult;
-}
-
-static BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam)
-{
-  WCHAR className[56];
-  if (GetClassNameW(hwnd, className, sizeof(className)/sizeof(WCHAR)) &&
-      !wcscmp(L"Windows.UI.Core.CoreWindow", className)) {
-    DWORD processID = 0;
-    GetWindowThreadProcessId(hwnd, &processID);
-    if (processID && processID == GetCurrentProcessId()) {
-      *((HWND*)lParam) = hwnd;
-      return FALSE;
-    }
-  }
-  return TRUE;
-}
-
-void
-MetroWidget::FindMetroWindow()
-{
-  LogFunction();
-  if (mWnd)
-    return;
-  EnumWindows(EnumWindowsProc, (LPARAM)&mWnd);
-  NS_ASSERTION(mWnd, "Couldn't find our metro CoreWindow, this is bad.");
-
-  // subclass it
-  SetSubclass();
-  sICoreHwnd = mWnd;
-  return;
-}
-
-void
-MetroWidget::SetSubclass()
-{
-  if (!mWnd) {
-    NS_NOTREACHED("SetSubclass called without a valid hwnd.");
-    return;
-  }
-
-  WNDPROC wndProc = reinterpret_cast<WNDPROC>(
-    GetWindowLongPtr(mWnd, GWLP_WNDPROC));
-  if (wndProc != StaticWindowProcedure) {
-      if (!SetPropW(mWnd, kMetroSubclassThisProp, this)) {
-        NS_NOTREACHED("SetProp failed, can't continue.");
-        return;
-      }
-      mMetroWndProc =
-        reinterpret_cast<WNDPROC>(
-          SetWindowLongPtr(mWnd, GWLP_WNDPROC,
-            reinterpret_cast<LONG_PTR>(StaticWindowProcedure)));
-      NS_ASSERTION(mMetroWndProc != StaticWindowProcedure, "WTF?");
-  }
-}
-
-void
-MetroWidget::RemoveSubclass()
-{
-  if (!mWnd)
-    return;
-  WNDPROC wndProc = reinterpret_cast<WNDPROC>(
-    GetWindowLongPtr(mWnd, GWLP_WNDPROC));
-  if (wndProc == StaticWindowProcedure) {
-      NS_ASSERTION(mMetroWndProc, "Should have old proc here.");
-      SetWindowLongPtr(mWnd, GWLP_WNDPROC,
-        reinterpret_cast<LONG_PTR>(mMetroWndProc));
-      mMetroWndProc = nullptr;
-  }
-  RemovePropW(mWnd, kMetroSubclassThisProp);
-}
-
-bool
-MetroWidget::ShouldUseOffMainThreadCompositing()
-{
-  // Either we're not initialized yet, or this is the toolkit widget
-  if (!mView) {
-    return false;
-  }
-  // toolkit or test widgets can't use omtc, they don't have ICoreWindow.
-  return gfxPlatform::UsesOffMainThreadCompositing() &&
-         mWindowType == eWindowType_toplevel;
-}
-
-bool
-MetroWidget::ShouldUseBasicManager()
-{
-  // toolkit or test widgets fall back on empty shadow layers
-  return (mWindowType != eWindowType_toplevel);
-}
-
-bool
-MetroWidget::ShouldUseAPZC()
-{
-  return gfxPrefs::AsyncPanZoomEnabled();
-}
-
-void
-MetroWidget::SetWidgetListener(nsIWidgetListener* aWidgetListener)
-{
-  mWidgetListener = aWidgetListener;
-}
-
-void
-MetroWidget::ConfigureAPZCTreeManager()
-{
-  nsBaseWidget::ConfigureAPZCTreeManager();
-
-  nsresult rv;
-  nsCOMPtr<nsIObserverService> observerService = do_GetService("@mozilla.org/observer-service;1", &rv);
-  if (NS_SUCCEEDED(rv)) {
-    observerService->AddObserver(this, "apzc-scroll-offset-changed", false);
-    observerService->AddObserver(this, "apzc-zoom-to-rect", false);
-    observerService->AddObserver(this, "apzc-disable-zoom", false);
-  }
-}
-
-already_AddRefed<GeckoContentController>
-MetroWidget::CreateRootContentController()
-{
-  MOZ_ASSERT(!mController);
-
-  mController = new APZController();
-  return mController;
-}
-
-MetroWidget::TouchBehaviorFlags
-MetroWidget::ContentGetAllowedTouchBehavior(const LayoutDeviceIntPoint& aPoint)
-{
-  return ContentHelper::GetAllowedTouchBehavior(this, aPoint);
-}
-
-void
-MetroWidget::ApzcSetAllowedTouchBehavior(uint64_t aInputBlockId,
-                                         nsTArray<TouchBehaviorFlags>& aBehaviors)
-{
-  LogFunction();
-  if (!APZController::sAPZC) {
-    return;
-  }
-  APZController::sAPZC->SetAllowedTouchBehavior(aInputBlockId, aBehaviors);
-}
-
-void
-MetroWidget::ApzContentConsumingTouch(uint64_t aInputBlockId)
-{
-  LogFunction();
-  if (!mController) {
-    return;
-  }
-  mController->ContentReceivedInputBlock(aInputBlockId, true);
-}
-
-void
-MetroWidget::ApzContentIgnoringTouch(uint64_t aInputBlockId)
-{
-  LogFunction();
-  if (!mController) {
-    return;
-  }
-  mController->ContentReceivedInputBlock(aInputBlockId, false);
-}
-
-bool
-MetroWidget::ApzHitTest(ScreenIntPoint& pt)
-{
-  if (!mController) {
-    return false;
-  }
-  return mController->HitTestAPZC(pt);
-}
-
-void
-MetroWidget::ApzTransformGeckoCoordinate(const ScreenIntPoint& aPoint,
-                                         LayoutDeviceIntPoint* aRefPointOut)
-{
-  if (!mController) {
-    return;
-  }
-  mController->TransformCoordinateToGecko(aPoint, aRefPointOut);
-}
-
-nsEventStatus
-MetroWidget::ApzReceiveInputEvent(WidgetInputEvent* aEvent,
-                                  ScrollableLayerGuid* aOutTargetGuid,
-                                  uint64_t* aOutInputBlockId)
-{
-  MOZ_ASSERT(aEvent);
-
-  if (!mController) {
-    return nsEventStatus_eIgnore;
-  }
-  return mController->ReceiveInputEvent(aEvent, aOutTargetGuid, aOutInputBlockId);
-}
-
-void
-MetroWidget::SetApzPendingResponseFlusher(APZPendingResponseFlusher* aFlusher)
-{
-  mController->SetPendingResponseFlusher(aFlusher);
-}
-
-LayerManager*
-MetroWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
-                             LayersBackend aBackendHint,
-                             LayerManagerPersistence aPersistence,
-                             bool* aAllowRetaining)
-{
-  bool retaining = true;
-
-  // If we initialized earlier than the view, recreate the layer manager now
-  if (mLayerManager &&
-      mTempBasicLayerInUse &&
-      ShouldUseOffMainThreadCompositing()) {
-    mLayerManager = nullptr;
-    mTempBasicLayerInUse = false;
-    retaining = false;
-  }
-
-  HRESULT hr = S_OK;
-
-  // Create a layer manager: try to use an async compositor first, if enabled.
-  // Otherwise fall back on the main thread d3d manager.
-  if (!mLayerManager) {
-    if (ShouldUseOffMainThreadCompositing()) {
-      NS_ASSERTION(aShadowManager == nullptr, "Async Compositor not supported with e10s");
-      CreateCompositor();
-    } else {
-      mLayerManager = CreateBasicLayerManager();
-    }
-    // Either we're not ready to initialize yet due to a missing view pointer,
-    // or something has gone wrong.
-    if (!mLayerManager) {
-      if (!mView) {
-        NS_WARNING("Using temporary basic layer manager.");
-        mLayerManager = new BasicLayerManager(this);
-        mTempBasicLayerInUse = true;
-      } else {
-#ifdef MOZ_CRASHREPORTER
-        if (FAILED(hr)) {
-          char errorBuf[10];
-          errorBuf[0] = '\0';
-          _snprintf_s(errorBuf, sizeof(errorBuf), _TRUNCATE, "%X", hr);
-          CrashReporter::
-            AnnotateCrashReport(NS_LITERAL_CSTRING("HRESULT"),
-                                nsDependentCString(errorBuf));
-        }
-#endif
-        NS_RUNTIMEABORT("Couldn't create layer manager");
-      }
-    }
-  }
-
-  if (aAllowRetaining) {
-    *aAllowRetaining = retaining;
-  }
-
-  return mLayerManager;
-}
-
-NS_IMETHODIMP
-MetroWidget::Invalidate(bool aEraseBackground,
-                        bool aUpdateNCArea,
-                        bool aIncludeChildren)
-{
-  nsIntRect rect;
-  if (mView) {
-    mView->GetBounds(rect);
-  }
-  Invalidate(rect);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-MetroWidget::Invalidate(const nsIntRect & aRect)
-{
-  if (mWnd) {
-    RECT rect;
-    rect.left   = aRect.x;
-    rect.top    = aRect.y;
-    rect.right  = aRect.x + aRect.width;
-    rect.bottom = aRect.y + aRect.height;
-    InvalidateRect(mWnd, &rect, FALSE);
-  }
-
-  return NS_OK;
-}
-
-nsTransparencyMode
-MetroWidget::GetTransparencyMode()
-{
-  return mTransparencyMode;
-}
-
-void
-MetroWidget::SetTransparencyMode(nsTransparencyMode aMode)
-{
-  mTransparencyMode = aMode;
-}
-
-nsIWidgetListener*
-MetroWidget::GetPaintListener()
-{
-  if (mOnDestroyCalled)
-    return nullptr;
-  return mAttachedWidgetListener ? mAttachedWidgetListener :
-    mWidgetListener;
-}
-
-void MetroWidget::Paint(const nsIntRegion& aInvalidRegion)
-{
-  gfxWindowsPlatform::GetPlatform()->UpdateRenderMode();
-
-  nsIWidgetListener* listener = GetPaintListener();
-  if (!listener)
-    return;
-
-  listener->WillPaintWindow(this);
-
-  // Refresh since calls like WillPaintWindow can destroy the widget
-  listener = GetPaintListener();
-  if (!listener)
-    return;
-
-  listener->PaintWindow(this, aInvalidRegion);
-
-  listener = GetPaintListener();
-  if (!listener)
-    return;
-
-  listener->DidPaintWindow();
-}
-
-void MetroWidget::UserActivity()
-{
-  // Check if we have the idle service, if not we try to get it.
-  if (!mIdleService) {
-    mIdleService = do_GetService("@mozilla.org/widget/idleservice;1");
-  }
-
-  // Check that we now have the idle service.
-  if (mIdleService) {
-    mIdleService->ResetIdleTimeOut(0);
-  }
-}
-
-// InitEvent assumes physical coordinates and is used by shared win32 code. Do
-// not hand winrt event coordinates to this routine.
-void
-MetroWidget::InitEvent(WidgetGUIEvent& event, nsIntPoint* aPoint)
-{
-  if (!aPoint) {
-    event.refPoint.x = event.refPoint.y = 0;
-  } else {
-    event.refPoint.x = aPoint->x;
-    event.refPoint.y = aPoint->y;
-  }
-  event.time = ::GetMessageTime();
-}
-
-bool
-MetroWidget::DispatchWindowEvent(WidgetGUIEvent* aEvent)
-{
-  MOZ_ASSERT(aEvent);
-  nsEventStatus status = nsEventStatus_eIgnore;
-  DispatchEvent(aEvent, status);
-  return (status == nsEventStatus_eConsumeNoDefault);
-}
-
-NS_IMETHODIMP
-MetroWidget::DispatchEvent(WidgetGUIEvent* event, nsEventStatus & aStatus)
-{
-  if (event->AsInputEvent()) {
-    UserActivity();
-  }
-
-  aStatus = nsEventStatus_eIgnore;
-
-  // Top level windows can have a view attached which requires events be sent
-  // to the underlying base window and the view. Added when we combined the
-  // base chrome window with the main content child for nc client area (title
-  // bar) rendering.
-  if (mAttachedWidgetListener) {
-    aStatus = mAttachedWidgetListener->HandleEvent(event, mUseAttachedEvents);
-  }
-  else if (mWidgetListener) {
-    aStatus = mWidgetListener->HandleEvent(event, mUseAttachedEvents);
-  }
-
-  // the window can be destroyed during processing of seemingly innocuous events like, say,
-  // mousedowns due to the magic of scripting. mousedowns will return nsEventStatus_eIgnore,
-  // which causes problems with the deleted window. therefore:
-  if (mOnDestroyCalled)
-    aStatus = nsEventStatus_eConsumeNoDefault;
-  return NS_OK;
-}
-
-#ifdef ACCESSIBILITY
-mozilla::a11y::Accessible*
-MetroWidget::GetAccessible()
-{
-  // We want the ability to forcibly disable a11y on windows, because
-  // some non-a11y-related components attempt to bring it up.  See bug
-  // 538530 for details; we have a pref here that allows it to be disabled
-  // for performance and testing resons.
-  //
-  // This pref is checked only once, and the browser needs a restart to
-  // pick up any changes.
-  static int accForceDisable = -1;
-
-  if (accForceDisable == -1) {
-    const char* kPrefName = "accessibility.win32.force_disabled";
-    if (Preferences::GetBool(kPrefName, false)) {
-      accForceDisable = 1;
-    } else {
-      accForceDisable = 0;
-    }
-  }
-
-  // If the pref was true, return null here, disabling a11y.
-  if (accForceDisable)
-      return nullptr;
-
-  return GetRootAccessible();
-}
-#endif
-
-double
-MetroWidget::GetDefaultScaleInternal()
-{
-  return MetroUtils::ScaleFactor();
-}
-
-LayoutDeviceIntPoint
-MetroWidget::CSSIntPointToLayoutDeviceIntPoint(const CSSIntPoint &aCSSPoint)
-{
-  CSSToLayoutDeviceScale scale = GetDefaultScale();
-  LayoutDeviceIntPoint devPx(int32_t(NS_round(scale.scale * aCSSPoint.x)),
-                             int32_t(NS_round(scale.scale * aCSSPoint.y)));
-  return devPx;
-}
-
-float
-MetroWidget::GetDPI()
-{
-  if (!mView) {
-    return 96.0;
-  }
-  return mView->GetDPI();
-}
-
-void
-MetroWidget::ChangedDPI()
-{
-  if (mWidgetListener) {
-    nsIPresShell* presShell = mWidgetListener->GetPresShell();
-    if (presShell) {
-      presShell->BackingScaleFactorChanged();
-    }
-  }
-}
-
-already_AddRefed<nsIPresShell>
-MetroWidget::GetPresShell()
-{
-  if (mWidgetListener) {
-    nsCOMPtr<nsIPresShell> ps = mWidgetListener->GetPresShell();
-    return ps.forget();
-  }
-  return nullptr;
-}
-
-NS_IMETHODIMP
-MetroWidget::ConstrainPosition(bool aAllowSlop, int32_t *aX, int32_t *aY)
-{
-  return NS_OK;
-}
-
-void
-MetroWidget::SizeModeChanged()
-{
-  if (mWidgetListener) {
-    mWidgetListener->SizeModeChanged(nsSizeMode_Normal);
-  }
-}
-
-void
-MetroWidget::Activated(bool aActiveated)
-{
-  if (mWidgetListener) {
-    aActiveated ?
-      mWidgetListener->WindowActivated() :
-      mWidgetListener->WindowDeactivated();
-  }
-}
-
-NS_IMETHODIMP
-MetroWidget::Move(double aX, double aY)
-{
-  NotifyWindowMoved(aX, aY);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-MetroWidget::Resize(double aWidth, double aHeight, bool aRepaint)
-{
-  return Resize(0, 0, aWidth, aHeight, aRepaint);
-}
-
-NS_IMETHODIMP
-MetroWidget::Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint)
-{
-  WinUtils::Log("Resize: %f %f %f %f", aX, aY, aWidth, aHeight);
-  if (mAttachedWidgetListener) {
-    mAttachedWidgetListener->WindowResized(this, aWidth, aHeight);
-  }
-  if (mWidgetListener) {
-    mWidgetListener->WindowResized(this, aWidth, aHeight);
-  }
-  Invalidate();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-MetroWidget::SetFocus(bool aRaise)
-{
-  return NS_OK;
-}
-
-nsresult
-MetroWidget::ConfigureChildren(const nsTArray<Configuration>& aConfigurations)
-{
-  return NS_OK;
-}
-
-void*
-MetroWidget::GetNativeData(uint32_t aDataType)
-{
-  switch(aDataType) {
-    case NS_NATIVE_WINDOW:
-      return mWnd;
-    case NS_NATIVE_ICOREWINDOW:
-      if (mView) {
-        return reinterpret_cast<IUnknown*>(mView->GetCoreWindow());
-      }
-      break;
-   case NS_NATIVE_TSF_THREAD_MGR:
-   case NS_NATIVE_TSF_CATEGORY_MGR:
-   case NS_NATIVE_TSF_DISPLAY_ATTR_MGR:
-     return nsTextStore::GetNativeData(aDataType);
-  }
-  return nullptr;
-}
-
-void
-MetroWidget::FreeNativeData(void * data, uint32_t aDataType)
-{
-}
-
-NS_IMETHODIMP
-MetroWidget::SetTitle(const nsAString& aTitle)
-{
-  return NS_OK;
-}
-
-LayoutDeviceIntPoint
-MetroWidget::WidgetToScreenOffset()
-{
-  return LayoutDeviceIntPoint(0,0);
-}
-
-NS_IMETHODIMP
-MetroWidget::CaptureRollupEvents(nsIRollupListener * aListener,
-                                 bool aDoCapture)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(void)
-MetroWidget::SetInputContext(const InputContext& aContext,
-                             const InputContextAction& aAction)
-{
-  // XXX This should set mInputContext.mNativeIMEContext properly
-  mInputContext = aContext;
-  nsTextStore::SetInputContext(this, mInputContext, aAction);
-  bool enable = (mInputContext.mIMEState.mEnabled == IMEState::ENABLED ||
-                 mInputContext.mIMEState.mEnabled == IMEState::PLUGIN);
-  if (enable &&
-      mInputContext.mIMEState.mOpen != IMEState::DONT_CHANGE_OPEN_STATE) {
-    bool open = (mInputContext.mIMEState.mOpen == IMEState::OPEN);
-    nsTextStore::SetIMEOpenState(open);
-  }
-}
-
-NS_IMETHODIMP_(nsIWidget::InputContext)
-MetroWidget::GetInputContext()
-{
-  return mInputContext;
-}
-
-nsresult
-MetroWidget::NotifyIMEInternal(const IMENotification& aIMENotification)
-{
-  switch (aIMENotification.mMessage) {
-    case REQUEST_TO_COMMIT_COMPOSITION:
-      nsTextStore::CommitComposition(false);
-      return NS_OK;
-    case REQUEST_TO_CANCEL_COMPOSITION:
-      nsTextStore::CommitComposition(true);
-      return NS_OK;
-    case NOTIFY_IME_OF_FOCUS:
-      return nsTextStore::OnFocusChange(true, this, mInputContext);
-    case NOTIFY_IME_OF_BLUR:
-      return nsTextStore::OnFocusChange(false, this, mInputContext);
-    case NOTIFY_IME_OF_SELECTION_CHANGE:
-      return nsTextStore::OnSelectionChange();
-    case NOTIFY_IME_OF_TEXT_CHANGE:
-      return nsTextStore::OnTextChange(aIMENotification);
-    case NOTIFY_IME_OF_POSITION_CHANGE:
-      return nsTextStore::OnLayoutChange();
-    case NOTIFY_IME_OF_MOUSE_BUTTON_EVENT:
-      return nsTextStore::OnMouseButtonEvent(aIMENotification);
-    default:
-      return NS_ERROR_NOT_IMPLEMENTED;
-  }
-}
-
-NS_IMETHODIMP
-MetroWidget::GetToggledKeyState(uint32_t aKeyCode, bool* aLEDState)
-{
-  NS_ENSURE_ARG_POINTER(aLEDState);
-  *aLEDState = (::GetKeyState(aKeyCode) & 1) != 0;
-  return NS_OK;
-}
-
-nsIMEUpdatePreference
-MetroWidget::GetIMEUpdatePreference()
-{
-  return nsTextStore::GetIMEUpdatePreference();
-}
-
-NS_IMETHODIMP
-MetroWidget::ReparentNativeWidget(nsIWidget* aNewParent)
-{
-  return NS_OK;
-}
-
-void
-MetroWidget::SuppressBlurEvents(bool aSuppress)
-{
-}
-
-bool
-MetroWidget::BlurEventsSuppressed()
-{
-  return false;
-}
-
-void
-MetroWidget::PickerOpen()
-{
-}
-
-void
-MetroWidget::PickerClosed()
-{
-}
-
-bool
-MetroWidget::HasPendingInputEvent()
-{
-  if (HIWORD(GetQueueStatus(QS_INPUT)))
-    return true;
-  return false;
-}
-
-NS_IMETHODIMP
-MetroWidget::Observe(nsISupports *subject, const char *topic, const char16_t *data)
-{
-  NS_ENSURE_ARG_POINTER(topic);
-  if (!strcmp(topic, "apzc-zoom-to-rect")) {
-    CSSRect rect = CSSRect();
-    uint64_t viewId = 0;
-    int32_t presShellId = 0;
-
-    int reScan = swscanf(data, L"%f,%f,%f,%f,%d,%llu",
-                 &rect.x, &rect.y, &rect.width, &rect.height,
-                 &presShellId, &viewId);
-    if(reScan != 6) {
-      NS_WARNING("Malformed apzc-zoom-to-rect message");
-    }
-
-    ScrollableLayerGuid guid = ScrollableLayerGuid(mRootLayerTreeId, presShellId, viewId);
-    APZController::sAPZC->ZoomToRect(guid, rect);
-  }
-  else if (!strcmp(topic, "apzc-disable-zoom")) {
-    uint64_t viewId = 0;
-    int32_t presShellId = 0;
-
-    int reScan = swscanf(data, L"%d,%llu",
-      &presShellId, &viewId);
-    if (reScan != 2) {
-      NS_WARNING("Malformed apzc-disable-zoom message");
-    }
-
-    ScrollableLayerGuid guid = ScrollableLayerGuid(mRootLayerTreeId, presShellId, viewId);
-    APZController::sAPZC->UpdateZoomConstraints(guid,
-      ZoomConstraints(false, false, CSSToScreenScale(1.0f), CSSToScreenScale(1.0f)));
-  }
-  return NS_OK;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroWidget.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroWidget.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/MetroWidget.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/MetroWidget.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,280 +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/. */
-
-#pragma once
-
-#include "nscore.h"
-#include "nsdefs.h"
-#include "prlog.h"
-#include "nsAutoPtr.h"
-#include "nsBaseWidget.h"
-#include "nsWindowBase.h"
-#include "nsString.h"
-#include "nsTArray.h"
-#include "nsWindowDbg.h"
-#include "WindowHook.h"
-#include "TaskbarWindowPreview.h"
-#include "nsIdleService.h"
-#ifdef ACCESSIBILITY
-#include "mozilla/a11y/Accessible.h"
-#endif
-#include "mozilla/EventForwards.h"
-#include "mozilla/layers/CompositorParent.h"
-#include "mozilla/layers/LayerManagerComposite.h"
-#include "nsDeque.h"
-#include "APZController.h"
-
-#include "mozwrlbase.h"
-
-#include <windows.system.h>
-#include <windows.ui.core.h>
-#include <Windows.ApplicationModel.core.h>
-#include <Windows.ApplicationModel.h>
-#include <Windows.Applicationmodel.Activation.h>
-
-class nsNativeDragTarget;
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-class APZPendingResponseFlusher;
-class FrameworkView;
-
-} } }
-
-class DispatchMsg;
-
-class MetroWidget : public nsWindowBase,
-                    public nsIObserver
-{
-  typedef uint32_t TouchBehaviorFlags;
-
-  typedef mozilla::widget::WindowHook WindowHook;
-  typedef mozilla::widget::TaskbarWindowPreview TaskbarWindowPreview;
-  typedef ABI::Windows::UI::Input::IPointerPoint IPointerPoint;
-  typedef ABI::Windows::UI::Core::IPointerEventArgs IPointerEventArgs;
-  typedef ABI::Windows::UI::Core::IKeyEventArgs IKeyEventArgs;
-  typedef ABI::Windows::UI::Core::ICharacterReceivedEventArgs ICharacterReceivedEventArgs;
-  typedef mozilla::widget::winrt::FrameworkView FrameworkView;
-  typedef mozilla::widget::winrt::APZController APZController;
-  typedef mozilla::widget::winrt::APZPendingResponseFlusher APZPendingResponseFlusher;
-  typedef mozilla::layers::ScrollableLayerGuid ScrollableLayerGuid;
-
-  static LRESULT CALLBACK
-  StaticWindowProcedure(HWND aWnd, UINT aMsg, WPARAM aWParan, LPARAM aLParam);
-  LRESULT WindowProcedure(HWND aWnd, UINT aMsg, WPARAM aWParan, LPARAM aLParam);
-
-public:
-  MetroWidget();
-  virtual ~MetroWidget();
-
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIOBSERVER
-
-  static HWND GetICoreWindowHWND() { return sICoreHwnd; }
-
-  // nsWindowBase
-  virtual bool DispatchWindowEvent(mozilla::WidgetGUIEvent* aEvent) override;
-  virtual bool DispatchKeyboardEvent(mozilla::WidgetKeyboardEvent* aEvent) override;
-  virtual bool DispatchWheelEvent(mozilla::WidgetWheelEvent* aEvent) override;
-  virtual bool DispatchContentCommandEvent(mozilla::WidgetContentCommandEvent* aEvent) override;
-  virtual bool DispatchPluginEvent(const MSG &aMsg) override { return false; }
-  virtual bool IsTopLevelWidget() override { return true; }
-  virtual nsWindowBase* GetParentWindowBase(bool aIncludeOwner) override { return nullptr; }
-  // InitEvent assumes physical coordinates and is used by shared win32 code. Do
-  // not hand winrt event coordinates to this routine.
-  virtual void InitEvent(mozilla::WidgetGUIEvent& aEvent,
-                         nsIntPoint* aPoint = nullptr) override;
-
-  // nsBaseWidget
-  virtual void SetWidgetListener(nsIWidgetListener* aWidgetListener);
-
-  // nsIWidget interface
-  NS_IMETHOD    Create(nsIWidget *aParent,
-                       nsNativeWidget aNativeParent,
-                       const nsIntRect &aRect,
-                       nsWidgetInitData *aInitData = nullptr);
-  NS_IMETHOD    Destroy();
-  NS_IMETHOD    EnableDragDrop(bool aEnable);
-  NS_IMETHOD    SetParent(nsIWidget *aNewParent);
-  NS_IMETHOD    Show(bool bState);
-  NS_IMETHOD    IsVisible(bool & aState);
-  NS_IMETHOD    IsEnabled(bool *aState);
-  NS_IMETHOD    GetBounds(nsIntRect &aRect);
-  NS_IMETHOD    GetScreenBounds(nsIntRect &aRect);
-  NS_IMETHOD    GetClientBounds(nsIntRect &aRect);
-  NS_IMETHOD    Invalidate(bool aEraseBackground = false,
-                bool aUpdateNCArea = false,
-                bool aIncludeChildren = false);
-  NS_IMETHOD    Invalidate(const nsIntRect & aRect);
-  NS_IMETHOD    DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
-                              nsEventStatus& aStatus);
-  NS_IMETHOD    ConstrainPosition(bool aAllowSlop, int32_t *aX, int32_t *aY);
-  NS_IMETHOD    Move(double aX, double aY);
-  NS_IMETHOD    Resize(double aWidth, double aHeight, bool aRepaint);
-  NS_IMETHOD    Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint);
-  NS_IMETHOD    SetFocus(bool aRaise);
-  NS_IMETHOD    Enable(bool aState);
-  NS_IMETHOD    SetCursor(nsCursor aCursor);
-  NS_IMETHOD    SetTitle(const nsAString& aTitle);
-  NS_IMETHOD    CaptureRollupEvents(nsIRollupListener * aListener,
-                                    bool aDoCapture);
-  NS_IMETHOD    ReparentNativeWidget(nsIWidget* aNewParent);
-  virtual nsresult SynthesizeNativeKeyEvent(int32_t aNativeKeyboardLayout,
-                                            int32_t aNativeKeyCode,
-                                            uint32_t aModifierFlags,
-                                            const nsAString& aCharacters,
-                                            const nsAString& aUnmodifiedCharacters,
-                                            nsIObserver* aObserver);
-  virtual nsresult SynthesizeNativeMouseEvent(mozilla::LayoutDeviceIntPoint aPoint,
-                                              uint32_t aNativeMessage,
-                                              uint32_t aModifierFlags,
-                                              nsIObserver* aObserver);
-  virtual nsresult SynthesizeNativeMouseScrollEvent(mozilla::LayoutDeviceIntPoint aPoint,
-                                                    uint32_t aNativeMessage,
-                                                    double aDeltaX,
-                                                    double aDeltaY,
-                                                    double aDeltaZ,
-                                                    uint32_t aModifierFlags,
-                                                    uint32_t aAdditionalFlags,
-                                                    nsIObserver* aObserver);
-  virtual bool  HasPendingInputEvent();
-  virtual double GetDefaultScaleInternal();
-  float         GetDPI();
-  mozilla::LayoutDeviceIntPoint CSSIntPointToLayoutDeviceIntPoint(const mozilla::CSSIntPoint &aCSSPoint);
-  void          ChangedDPI();
-  virtual uint32_t GetMaxTouchPoints() const override;
-  virtual bool  IsVisible() const;
-  virtual bool  IsEnabled() const;
-  // ShouldUseOffMainThreadCompositing is defined in base widget
-  virtual bool  ShouldUseOffMainThreadCompositing();
-  bool          ShouldUseBasicManager();
-  bool          ShouldUseAPZC();
-  virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
-                                        LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE,
-                                        LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
-                                        bool* aAllowRetaining = nullptr);
-  virtual void GetPreferredCompositorBackends(nsTArray<mozilla::layers::LayersBackend>& aHints) { aHints.AppendElement(mozilla::layers::LayersBackend::LAYERS_D3D11); }
-
-  // IME related interfaces
-  NS_IMETHOD_(void) SetInputContext(const InputContext& aContext,
-                                    const InputContextAction& aAction);
-  NS_IMETHOD_(nsIWidget::InputContext) GetInputContext();
-  NS_IMETHOD    GetToggledKeyState(uint32_t aKeyCode, bool* aLEDState);
-  virtual nsIMEUpdatePreference GetIMEUpdatePreference() override;
-
-  // FrameworkView helpers
-  void SizeModeChanged();
-  void Activated(bool aActiveated);
-  void Paint(const nsIntRegion& aInvalidRegion);
-
-  MetroWidget* MetroWidget::GetTopLevelWindow(bool aStopOnDialogOrPopup) { return this; }
-  virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations);
-  virtual void* GetNativeData(uint32_t aDataType);
-  virtual void  FreeNativeData(void * data, uint32_t aDataType);
-  virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset();
-
-  already_AddRefed<nsIPresShell> GetPresShell();
-
-  void UserActivity();
-
-#ifdef ACCESSIBILITY
-  mozilla::a11y::Accessible* DispatchAccessibleEvent(uint32_t aEventType);
-  mozilla::a11y::Accessible* GetAccessible();
-#endif // ACCESSIBILITY
-
-  // needed for current nsIFilePicker
-  void PickerOpen();
-  void PickerClosed();
-  bool DestroyCalled() { return false; }
-  void SuppressBlurEvents(bool aSuppress);
-  bool BlurEventsSuppressed();
-
-  // needed for nsITaskbarWindowPreview
-  bool HasTaskbarIconBeenCreated() { return false; }
-  void SetHasTaskbarIconBeenCreated(bool created = true) { }
-  already_AddRefed<nsITaskbarWindowPreview> GetTaskbarPreview() { return nullptr; }
-  void SetTaskbarPreview(nsITaskbarWindowPreview *preview) { }
-  WindowHook& GetWindowHook() { return mWindowHook; }
-
-  void SetView(FrameworkView* aView);
-  void FindMetroWindow();
-  virtual void SetTransparencyMode(nsTransparencyMode aMode);
-  virtual nsTransparencyMode GetTransparencyMode();
-
-  TouchBehaviorFlags ContentGetAllowedTouchBehavior(const LayoutDeviceIntPoint& aPoint);
-
-  // apzc controller related api
-  void ApzcSetAllowedTouchBehavior(uint64_t aInputBlockId, nsTArray<TouchBehaviorFlags>& aBehaviors);
-
-  // Hit test a point to see if an apzc would consume input there
-  bool ApzHitTest(mozilla::ScreenIntPoint& pt);
-  // Transforms a coord so that it properly targets gecko content based
-  // on apzc transforms currently applied.
-  void ApzTransformGeckoCoordinate(const mozilla::ScreenIntPoint& pt,
-                                   mozilla::LayoutDeviceIntPoint* aRefPointOut);
-  // send ContentRecievedTouch calls to the apz with appropriate preventDefault params
-  void ApzContentConsumingTouch(uint64_t aInputBlockId);
-  void ApzContentIgnoringTouch(uint64_t aInputBlockId);
-  // Input handling
-  nsEventStatus ApzReceiveInputEvent(mozilla::WidgetInputEvent* aEvent,
-                                     ScrollableLayerGuid* aOutTargetGuid,
-                                     uint64_t* aOutInputBlockId);
-  // Callback for the APZController
-  void SetApzPendingResponseFlusher(APZPendingResponseFlusher* aFlusher);
-
-protected:
-  friend class FrameworkView;
-
-  struct OleInitializeWrapper {
-    HRESULT const hr;
-
-    OleInitializeWrapper()
-      : hr(::OleInitialize(nullptr))
-    {
-    }
-
-    ~OleInitializeWrapper() {
-      if (SUCCEEDED(hr)) {
-        ::OleFlushClipboard();
-        ::OleUninitialize();
-      }
-    }
-  };
-
-  // nsBaseWidget
-  void ConfigureAPZCTreeManager() override;
-  already_AddRefed<GeckoContentController> NewRootContentController() override;
-
-  void SetSubclass();
-  void RemoveSubclass();
-  nsIWidgetListener* GetPaintListener();
-
-  virtual nsresult NotifyIMEInternal(
-                     const IMENotification& aIMENotification) override;
-
-  // Async event dispatching
-  void DispatchAsyncScrollEvent(DispatchMsg* aEvent);
-  void DeliverNextScrollEvent();
-  void DeliverNextKeyboardEvent();
-
-protected:
-  OleInitializeWrapper mOleInitializeWrapper;
-  WindowHook mWindowHook;
-  Microsoft::WRL::ComPtr<FrameworkView> mView;
-  nsTransparencyMode mTransparencyMode;
-  nsIntRegion mInvalidatedRegion;
-  nsCOMPtr<nsIIdleServiceInternal> mIdleService;
-  HWND mWnd;
-  static HWND sICoreHwnd;
-  WNDPROC mMetroWndProc;
-  bool mTempBasicLayerInUse;
-  uint64_t mRootLayerTreeId;
-  nsDeque mEventQueue;
-  nsDeque mKeyEventQueue;
-  nsRefPtr<APZController> mController;
-  nsRefPtr<nsNativeDragTarget> mNativeDragTarget;
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/moz.build	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-SOURCES += [
-    'APZController.cpp',
-    'FrameworkView.cpp',
-    'MetroApp.cpp',
-    'MetroAppShell.cpp',
-    'MetroContracts.cpp',
-    'MetroInput.cpp',
-    'MetroUtils.cpp',
-    'MetroWidget.cpp',
-    'nsMetroFilePicker.cpp',
-    'nsWinMetroUtils.cpp',
-    'ToastNotificationHandler.cpp',
-    'UIAAccessibilityBridge.cpp',
-    'UIABridge.cpp',
-    'WakeLockListener.cpp',
-]
-
-EXTRA_COMPONENTS += [
-    'MetroUIUtils.js',
-    'MetroUIUtils.manifest',
-]
-
-EXPORTS.mozilla.widget += [
-    'MetroD3DCheckHelper.h',
-]
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-
-LOCAL_INCLUDES += [
-    '../',
-    '/layout/generic',
-    '/layout/xul',
-    '/toolkit/xre',
-    '/widget',
-    '/xpcom/base',
-]
-
-DEFINES['MOZ_UNICODE'] = True
-
-for var in ('MOZ_ENABLE_D3D9_LAYER', 'MOZ_ENABLE_D3D10_LAYER'):
-    if CONFIG[var]:
-        DEFINES[var] = True
-
-CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/mozwrlbase.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/mozwrlbase.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/mozwrlbase.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/mozwrlbase.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +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/. */
-
-#pragma once
-
-/*
- * Includes <wrl.h> and it's children. Defines imports needed by
- * corewrappers.h in the case where windows.h has already been
- * included w/WINVER < 0x600. Also ups WINVER/_WIN32_WINNT prior
- * to including wrl.h. Mozilla's build currently has WINVER set to
- * 0x502 for XP support.
- */
-
-#if _WIN32_WINNT < 0x600
-
-#include <windows.h>
-
-VOID
-WINAPI
-ReleaseSRWLockExclusive(
-    _Inout_ PSRWLOCK SRWLock
-    );
-
-VOID
-WINAPI
-ReleaseSRWLockShared(
-    _Inout_ PSRWLOCK SRWLock
-    );
-
-BOOL
-WINAPI
-InitializeCriticalSectionEx(
-    _Out_ LPCRITICAL_SECTION lpCriticalSection,
-    _In_ DWORD dwSpinCount,
-    _In_ DWORD Flags
-    );
-
-VOID
-WINAPI
-InitializeSRWLock(
-    _Out_ PSRWLOCK SRWLock
-    );
-
-VOID
-WINAPI
-AcquireSRWLockExclusive(
-    _Inout_ PSRWLOCK SRWLock
-    );
-
-BOOLEAN
-WINAPI
-TryAcquireSRWLockExclusive(
-    _Inout_ PSRWLOCK SRWLock
-    );
-
-BOOLEAN
-WINAPI
-TryAcquireSRWLockShared(
-    _Inout_ PSRWLOCK SRWLock
-    );
-
-VOID
-WINAPI
-AcquireSRWLockShared(
-    _Inout_ PSRWLOCK SRWLock
-    );
-
-#undef WINVER
-#undef _WIN32_WINNT
-#define WINVER 0x600
-#define _WIN32_WINNT 0x600
-
-#endif // _WIN32_WINNT < 0x600
-
-#include <wrl.h>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/nsMetroFilePicker.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/nsMetroFilePicker.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/nsMetroFilePicker.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/nsMetroFilePicker.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,484 +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/. */
-
-#include "nsMetroFilePicker.h"
-#include "nsComponentManagerUtils.h"
-#include "nsNetUtil.h"
-#include "nsAutoPtr.h"
-#include "MetroUtils.h"
-
-#include <windows.ui.viewmanagement.h>
-#include <windows.storage.search.h>
-
-using namespace ABI::Windows::Foundation;
-using namespace ABI::Windows::Foundation::Collections;
-using namespace ABI::Windows::Storage;
-using namespace ABI::Windows::Storage::Pickers;
-using namespace ABI::Windows::Storage::Streams;
-using namespace ABI::Windows::UI;
-using namespace ABI::Windows::UI::ViewManagement;
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-using namespace mozilla::widget::winrt;
-
-///////////////////////////////////////////////////////////////////////////////
-// nsIFilePicker
-
-nsMetroFilePicker::nsMetroFilePicker()
-{
-}
-
-nsMetroFilePicker::~nsMetroFilePicker()
-{
-}
-
-NS_IMPL_ISUPPORTS(nsMetroFilePicker, nsIFilePicker)
-
-NS_IMETHODIMP
-nsMetroFilePicker::Init(nsIDOMWindow *parent, const nsAString& title, int16_t mode)
-{
-  mMode = mode;
-  HRESULT hr;
-  switch(mMode) {
-  case nsIFilePicker::modeOpen:
-  case nsIFilePicker::modeOpenMultiple:
-    hr = ActivateGenericInstance(RuntimeClass_Windows_Storage_Pickers_FileOpenPicker, mFileOpenPicker);
-    AssertRetHRESULT(hr, NS_ERROR_UNEXPECTED);
-    return NS_OK;
-  case nsIFilePicker::modeSave:
-    hr = ActivateGenericInstance(RuntimeClass_Windows_Storage_Pickers_FileSavePicker, mFileSavePicker);
-    AssertRetHRESULT(hr, NS_ERROR_UNEXPECTED);
-    return NS_OK;
-  default:
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-}
-
-NS_IMETHODIMP
-nsMetroFilePicker::Show(int16_t *aReturnVal)
-{
-  // Metro file picker only offers an async variant which calls back to the 
-  // UI thread, which is the main thread.  We therefore can't call it
-  // synchronously from the main thread.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-HRESULT nsMetroFilePicker::OnPickSingleFile(IAsyncOperation<StorageFile*>* aFile,
-                                            AsyncStatus aStatus)
-{
-  if (aStatus != ABI::Windows::Foundation::AsyncStatus::Completed) {
-    if (mCallback)
-      mCallback->Done(nsIFilePicker::returnCancel);
-    return S_OK;
-  }
-
-  HRESULT hr;
-  ComPtr<IStorageFile> file;
-  hr = aFile->GetResults(file.GetAddressOf());
-  // When the user cancels hr == S_OK and file is nullptr
-  if (FAILED(hr) || !file) {
-    if (mCallback)
-      mCallback->Done(nsIFilePicker::returnCancel);
-    return S_OK;
-  }
-  ComPtr<IStorageItem> storageItem;
-  hr = file.As(&storageItem);
-  if (FAILED(hr)) {
-    if (mCallback)
-      mCallback->Done(nsIFilePicker::returnCancel);
-    return S_OK;
-  }
-  
-  HSTRING path;
-  if (FAILED(storageItem->get_Path(&path))) {
-    if (mCallback)
-      mCallback->Done(nsIFilePicker::returnCancel);
-    return S_OK;
-  }
-  WindowsDuplicateString(path, mFilePath.GetAddressOf());
-  WindowsDeleteString(path);
-
-  if (mCallback) {
-    mCallback->Done(nsIFilePicker::returnOK);
-  }
-  return S_OK;
-}
-
-HRESULT nsMetroFilePicker::OnPickMultipleFiles(IAsyncOperation<IVectorView<StorageFile*>*>* aFileList,
-                                               AsyncStatus aStatus)
-{
-  if (aStatus != ABI::Windows::Foundation::AsyncStatus::Completed) {
-    if (mCallback)
-      mCallback->Done(nsIFilePicker::returnCancel);
-    return S_OK;
-  }
-
-  HRESULT hr;
-  ComPtr<IVectorView<StorageFile*>> view;
-  hr = aFileList->GetResults(view.GetAddressOf());
-  if (FAILED(hr)) {
-    if (mCallback)
-      mCallback->Done(nsIFilePicker::returnCancel);
-    return S_OK;
-  }
-
-  unsigned int length;
-  view->get_Size(&length);
-  for (unsigned int idx = 0; idx < length; idx++) {
-    ComPtr<IStorageFile> file;
-    hr = view->GetAt(idx, file.GetAddressOf());
-    if (FAILED(hr)) {
-      continue;
-    }
-
-    ComPtr<IStorageItem> storageItem;
-    hr = file.As(&storageItem);
-    if (FAILED(hr)) {
-      continue;
-    }
-
-    HSTRING path;
-    if (SUCCEEDED(storageItem->get_Path(&path))) {
-      nsCOMPtr<nsILocalFile> file = 
-        do_CreateInstance("@mozilla.org/file/local;1");
-      unsigned int tmp;
-      if (NS_SUCCEEDED(file->InitWithPath(
-          nsAutoString(WindowsGetStringRawBuffer(path, &tmp))))) {
-        mFiles.AppendObject(file);
-      }
-    }
-    WindowsDeleteString(path);
-  }
-
-  if (mCallback) {
-    mCallback->Done(nsIFilePicker::returnOK);
-  }
-  return S_OK;
-}
-
-NS_IMETHODIMP
-nsMetroFilePicker::Open(nsIFilePickerShownCallback *aCallback)
-{
-  HRESULT hr;
-  // Capture a reference to the callback which we'll also pass into the
-  // closure to ensure it's not freed.
-  mCallback = aCallback;
-
-  // The filepicker cannot open when in snapped view, try to unsnapp
-  // before showing the filepicker.
-  ApplicationViewState viewState;
-  MetroUtils::GetViewState(viewState);
-  if (viewState == ApplicationViewState::ApplicationViewState_Snapped) {
-    bool unsnapped = SUCCEEDED(MetroUtils::TryUnsnap());
-    NS_ENSURE_TRUE(unsnapped, NS_ERROR_FAILURE);
-  }
-
-  switch(mMode) {
-  case nsIFilePicker::modeOpen: {
-    NS_ENSURE_ARG_POINTER(mFileOpenPicker);
-
-    // Initiate the file picker operation
-    ComPtr<IAsyncOperation<StorageFile*>> asyncOperation;
-    hr = mFileOpenPicker->PickSingleFileAsync(asyncOperation.GetAddressOf());
-    AssertRetHRESULT(hr, NS_ERROR_FAILURE);
-
-    // Subscribe to the completed event
-    ComPtr<IAsyncOperationCompletedHandler<StorageFile*>>
-      completedHandler(Callback<IAsyncOperationCompletedHandler<StorageFile*>>(
-        this, &nsMetroFilePicker::OnPickSingleFile));
-    hr = asyncOperation->put_Completed(completedHandler.Get());
-    AssertRetHRESULT(hr, NS_ERROR_UNEXPECTED);
-    break;
-  }
-
-  case nsIFilePicker::modeOpenMultiple: {
-    NS_ENSURE_ARG_POINTER(mFileOpenPicker);
-
-    typedef IVectorView<StorageFile*> StorageTemplate;
-    typedef IAsyncOperation<StorageTemplate*> AsyncCallbackTemplate;
-    typedef IAsyncOperationCompletedHandler<StorageTemplate*> HandlerTemplate;
-
-    // Initiate the file picker operation
-    ComPtr<AsyncCallbackTemplate> asyncOperation;
-    hr = mFileOpenPicker->PickMultipleFilesAsync(asyncOperation.GetAddressOf());
-    AssertRetHRESULT(hr, NS_ERROR_FAILURE);
-
-    // Subscribe to the completed event
-    ComPtr<HandlerTemplate> completedHandler(Callback<HandlerTemplate>(
-      this, &nsMetroFilePicker::OnPickMultipleFiles));
-    hr = asyncOperation->put_Completed(completedHandler.Get());
-    AssertRetHRESULT(hr, NS_ERROR_UNEXPECTED);
-    break;
-  }
-
-  case nsIFilePicker::modeSave: {
-    NS_ENSURE_ARG_POINTER(mFileSavePicker);
-
-    // Set the default file name
-    mFileSavePicker->put_SuggestedFileName(HStringReference(mDefaultFilename.BeginReading()).Get());
-
-    // Set the default file extension
-    if (mDefaultExtension.Length() > 0) {
-      nsAutoString defaultFileExtension(mDefaultExtension);
-
-      // Touch up the extansion format platform hands us.
-      if (defaultFileExtension[0] == L'*') {
-        defaultFileExtension.Cut(0, 1);
-      } else if (defaultFileExtension[0] != L'.') {
-        defaultFileExtension.Insert(L".", 0);
-      }
-
-      // Sometimes the default file extension is not passed in correctly,
-      // so we purposfully ignore failures here.
-      HString ext;
-      ext.Set(defaultFileExtension.BeginReading());
-      hr = mFileSavePicker->put_DefaultFileExtension(ext.Get());
-      NS_ASSERTION(SUCCEEDED(hr), "put_DefaultFileExtension failed, bad format for extension?");
-
-      // Due to a bug in the WinRT file picker, the first file extension in the
-      // list is always used when saving a file. So we explicitly make sure the
-      // default extension is the first one in the list here.
-      if (mFirstTitle.Get()) {
-        ComPtr<IMap<HSTRING, IVector<HSTRING>*>> map;
-        mFileSavePicker->get_FileTypeChoices(map.GetAddressOf());
-        if (map) {
-          boolean found = false;
-          unsigned int index;
-          map->HasKey(mFirstTitle.Get(), &found);
-          if (found) {
-            ComPtr<IVector<HSTRING>> list;
-            if (SUCCEEDED(map->Lookup(mFirstTitle.Get(), list.GetAddressOf()))) {
-              HString ext;
-              ext.Set(defaultFileExtension.get());
-              found = false;
-              list->IndexOf(HStringReference(defaultFileExtension.get()).Get(), &index, &found);
-              if (found) {
-                list->RemoveAt(index);
-                list->InsertAt(0, HStringReference(defaultFileExtension.get()).Get());
-              }
-            }
-          }
-        }
-      }
-    }
-
-    // Dispatch the async show operation
-    ComPtr<IAsyncOperation<StorageFile*>> asyncOperation;
-    hr = mFileSavePicker->PickSaveFileAsync(asyncOperation.GetAddressOf());
-    AssertRetHRESULT(hr, NS_ERROR_FAILURE);
-
-    // Subscribe to the completed event
-    ComPtr<IAsyncOperationCompletedHandler<StorageFile*>>
-      completedHandler(Callback<IAsyncOperationCompletedHandler<StorageFile*>>(
-        this, &nsMetroFilePicker::OnPickSingleFile));
-    hr = asyncOperation->put_Completed(completedHandler.Get());
-    AssertRetHRESULT(hr, NS_ERROR_UNEXPECTED);
-    break;
-  }
-
-  case modeGetFolder:
-    return NS_ERROR_NOT_IMPLEMENTED;
-
-  default:
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMetroFilePicker::GetFile(nsIFile **aFile)
-{
-  NS_ENSURE_ARG_POINTER(aFile);
-  *aFile = nullptr;
-
-  if (WindowsIsStringEmpty(mFilePath.Get()))
-    return NS_OK;
-
-  nsCOMPtr<nsILocalFile> file(do_CreateInstance("@mozilla.org/file/local;1"));
-  NS_ENSURE_TRUE(file, NS_ERROR_FAILURE);
-  unsigned int length;
-  file->InitWithPath(nsAutoString(mFilePath.GetRawBuffer(&length)));
-  NS_ADDREF(*aFile = file);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMetroFilePicker::GetFileURL(nsIURI **aFileURL)
-{
-  *aFileURL = nullptr;
-  nsCOMPtr<nsIFile> file;
-  nsresult rv = GetFile(getter_AddRefs(file));
-  if (!file)
-    return rv;
-
-  return NS_NewFileURI(aFileURL, file);
-}
-
-NS_IMETHODIMP
-nsMetroFilePicker::GetFiles(nsISimpleEnumerator **aFiles)
-{
-  NS_ENSURE_ARG_POINTER(aFiles);
-  return NS_NewArrayEnumerator(aFiles, mFiles);
-}
-
-// Set the filter index
-NS_IMETHODIMP
-nsMetroFilePicker::GetFilterIndex(int32_t *aFilterIndex)
-{
-  // No associated concept with a Metro file picker
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMetroFilePicker::SetFilterIndex(int32_t aFilterIndex)
-{
-  // No associated concept with a Metro file picker
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-// AFACT, it's up to use to supply the implementation of a vector list.
-class MozHStringVector : public RuntimeClass<IVector<HSTRING>> {
-  InspectableClass(L"MozHStringVector", TrustLevel::BaseTrust)
-  ~MozHStringVector() {
-    Clear();
-  }
-
-  // See IVector_impl in windows.foundation.collections.h
-public:
-  STDMETHOD(GetAt)(unsigned aIndex, HSTRING* aString) {
-    if (aIndex >= mList.Length()) {
-      return E_INVALIDARG;
-    }
-    return WindowsDuplicateString(mList[aIndex], aString);
-  }
-
-  STDMETHOD(get_Size)(unsigned int* aLength) {
-    if (!aLength) {
-      return E_INVALIDARG;
-    }
-    *aLength = mList.Length();
-    return S_OK;
-  }
-
-  STDMETHOD(Append)(HSTRING aString) {
-    HSTRING str;
-    if (FAILED(WindowsDuplicateString(aString, &str))) {
-      return E_INVALIDARG;
-    }
-    mList.AppendElement(str);
-    return S_OK;
-  }
-
-  STDMETHOD(Clear)() {
-    int length = mList.Length();
-    for (int idx = 0; idx < length; idx++)
-      WindowsDeleteString(mList[idx]);
-    mList.Clear();
-    return S_OK;
-  }
-
-  // interfaces picker code doesn't seem to need
-  STDMETHOD(GetView)(IVectorView<HSTRING> **aView) { return E_NOTIMPL; }
-  STDMETHOD(IndexOf)(HSTRING aValue, unsigned *aIndex, boolean *found) { return E_NOTIMPL; }
-  STDMETHOD(SetAt)(unsigned aIndex, HSTRING aString) { return E_NOTIMPL; }
-  STDMETHOD(InsertAt)(unsigned aIndex, HSTRING aString) { return E_NOTIMPL; }
-  STDMETHOD(RemoveAt)(unsigned aIndex) { return E_NOTIMPL; }
-  STDMETHOD(RemoveAtEnd)() { return E_NOTIMPL; }
-
-private:
-  nsTArray<HSTRING> mList;
-};
-
-nsresult
-nsMetroFilePicker::ParseFiltersIntoVector(ComPtr<IVector<HSTRING>>& aVector,
-                                          const nsAString& aFilter,
-                                          bool aAllowAll)
-{
-  const char16_t *beg = aFilter.BeginReading();
-  const char16_t *end = aFilter.EndReading();
-  for (const char16_t *cur = beg, *fileTypeStart = beg; cur <= end; ++cur) {
-    // Start of a a filetype, example: *.png
-    if (cur == end || char16_t(' ') == *cur) {
-      int32_t startPos = fileTypeStart - beg;
-      int32_t endPos = cur - fileTypeStart - (cur == end ? 0 : 1);
-      const nsAString& fileType = Substring(aFilter,
-                                            startPos,
-                                            endPos);
-      // There is no way to say show all files in Metro save file picker, so
-      // just use .data if * or *.* is specified.
-      if (fileType.IsEmpty() ||
-          fileType.Equals(L"*") ||
-          fileType.Equals(L"*.*")) {
-        HString str;
-        if (aAllowAll) {
-          str.Set(L"*");
-          aVector->Append(str.Get());
-        } else {
-          str.Set(L".data");
-          aVector->Append(str.Get());
-        }
-      } else {
-        nsAutoString filter(fileType);
-        if (filter[0] == L'*') {
-          filter.Cut(0, 1);
-        } else if (filter[0] != L'.') {
-          filter.Insert(L".", 0);
-        }
-        HString str;
-        str.Set(filter.BeginReading());
-        aVector->Append(str.Get());
-      }
-
-      fileTypeStart = cur + 1;
-    }
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMetroFilePicker::AppendFilter(const nsAString& aTitle, 
-                                const nsAString& aFilter)
-{
-  HRESULT hr;
-  switch(mMode) {
-  case nsIFilePicker::modeOpen:
-  case nsIFilePicker::modeOpenMultiple: {
-    NS_ENSURE_ARG_POINTER(mFileOpenPicker);
-    ComPtr<IVector<HSTRING>> list;
-    mFileOpenPicker->get_FileTypeFilter(list.GetAddressOf());
-    nsresult rv = ParseFiltersIntoVector(list, aFilter, true);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  case nsIFilePicker::modeSave: {
-    NS_ENSURE_ARG_POINTER(mFileSavePicker);
-
-    ComPtr<IMap<HSTRING,IVector<HSTRING>*>> map;
-    hr = mFileSavePicker->get_FileTypeChoices(map.GetAddressOf());
-    AssertRetHRESULT(hr, NS_ERROR_FAILURE);
-
-    HString key;
-    key.Set(aTitle.BeginReading());
-
-    ComPtr<IVector<HSTRING>> saveTypes;
-    saveTypes = Make<MozHStringVector>();
-    nsresult rv = ParseFiltersIntoVector(saveTypes, aFilter, false);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    if (WindowsIsStringEmpty(mFirstTitle.Get())) {
-      mFirstTitle.Set(key.Get());
-    }
-
-    boolean replaced;
-    map->Insert(key.Get(), saveTypes.Get(), &replaced);
-  }
-  break;
-
-  default:
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
-
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/nsMetroFilePicker.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/nsMetroFilePicker.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/nsMetroFilePicker.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/nsMetroFilePicker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +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 nsMetroFilePicker_h__
-#define nsMetroFilePicker_h__
-
-#include "../nsFilePicker.h"
-#include "nsString.h"
-#include "nsCOMArray.h"
-#include "nsCOMPtr.h"
-#include "nsILocalFile.h"
-
-#include "mozwrlbase.h"
-
-#include <windows.system.h>
-#include <windows.ui.core.h>
-#include <windows.foundation.h>
-#include <windows.storage.pickers.h>
-#include <windows.storage.fileproperties.h>
-
-/**
- * Metro file picker
- */
-
-class nsMetroFilePicker :
-  public nsBaseWinFilePicker
-{
-  typedef Microsoft::WRL::Wrappers::HString HString;
-  typedef ABI::Windows::Storage::StorageFile StorageFile;
-  typedef ABI::Windows::Foundation::AsyncStatus AsyncStatus;
-  
-public:
-  nsMetroFilePicker(); 
-  virtual ~nsMetroFilePicker();
-
-  NS_DECL_ISUPPORTS
-  
-  // nsIFilePicker (less what's in nsBaseFilePicker)
-  NS_IMETHOD GetFilterIndex(int32_t *aFilterIndex);
-  NS_IMETHOD SetFilterIndex(int32_t aFilterIndex);
-  NS_IMETHOD GetFile(nsIFile * *aFile);
-  NS_IMETHOD GetFileURL(nsIURI * *aFileURL);
-  NS_IMETHOD GetFiles(nsISimpleEnumerator **aFiles);
-  NS_IMETHOD Show(int16_t *aReturnVal); 
-  NS_IMETHOD Open(nsIFilePickerShownCallback *aCallback); 
-  NS_IMETHOD AppendFilter(const nsAString& aTitle, const nsAString& aFilter);
-  NS_IMETHOD Init(nsIDOMWindow *parent, const nsAString& title,
-                  int16_t mode);
-
-  // Async callbacks
-  HRESULT OnPickSingleFile(ABI::Windows::Foundation::IAsyncOperation<StorageFile*>* aFile, AsyncStatus aStatus);
-  HRESULT OnPickMultipleFiles(ABI::Windows::Foundation::IAsyncOperation<ABI::Windows::Foundation::Collections::IVectorView<StorageFile*>*>* aFileList, AsyncStatus aStatus);
-
-private:
-  void InitNative(nsIWidget*, const nsAString&) {};
-  nsresult ParseFiltersIntoVector(Microsoft::WRL::ComPtr<ABI::Windows::Foundation::Collections::IVector<HSTRING>>& aVector,
-                                  const nsAString& aFilter,
-                                  bool aAllowAll);
-  nsCOMArray<nsILocalFile> mFiles;
-  Microsoft::WRL::ComPtr<ABI::Windows::Storage::Pickers::IFileOpenPicker> mFileOpenPicker;
-  Microsoft::WRL::ComPtr<ABI::Windows::Storage::Pickers::IFileSavePicker> mFileSavePicker;
-  HString mFilePath;
-  HString mFirstTitle;
-  nsRefPtr<nsIFilePickerShownCallback> mCallback;
-};
-
-#endif // nsMetroFilePicker_h__
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/nsWinMetroUtils.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/nsWinMetroUtils.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/nsWinMetroUtils.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/nsWinMetroUtils.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,402 +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/. */
-
-#include "nsWinMetroUtils.h"
-#include "MetroUtils.h"
-#include "nsXULAppAPI.h"
-#include "FrameworkView.h"
-#include "MetroApp.h"
-#include "ToastNotificationHandler.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/WindowsVersion.h"
-#include "nsIWindowsRegKey.h"
-#include "mozilla/widget/MetroD3DCheckHelper.h"
-
-#include <shldisp.h>
-#include <shellapi.h>
-#include <windows.ui.viewmanagement.h>
-#include <windows.ui.startscreen.h>
-
-using namespace ABI::Windows::Foundation;
-using namespace ABI::Windows::UI::StartScreen;
-using namespace ABI::Windows::UI::ViewManagement;
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-using namespace mozilla::widget::winrt;
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-extern ComPtr<MetroApp> sMetroApp;
-extern nsTArray<nsString>* sSettingsArray;
-} } }
-
-namespace mozilla {
-namespace widget {
-
-bool nsWinMetroUtils::sUpdatePending = false;
-
-NS_IMPL_ISUPPORTS(nsWinMetroUtils, nsIWinMetroUtils)
-
-nsWinMetroUtils::nsWinMetroUtils()
-{
-}
-
-nsWinMetroUtils::~nsWinMetroUtils()
-{
-}
-
-/**
- * Pins a new tile to the Windows 8 start screen.
- *
- * @param aTileID         An ID which can later be used to remove the tile
- * @param aShortName      A short name for the tile
- * @param aDiplayName     The name that will be displayed on the tile
- * @param aActivationArgs The arguments to pass to the browser upon
- *                        activation of the tile
- * @param aTileImage An image for the normal tile view
- * @param aSmallTileImage An image for the small tile view
- */
-NS_IMETHODIMP
-nsWinMetroUtils::PinTileAsync(const nsAString &aTileID,
-                              const nsAString &aShortName,
-                              const nsAString &aDisplayName,
-                              const nsAString &aActivationArgs,
-                              const nsAString &aTileImage,
-                              const nsAString &aSmallTileImage)
-{
-  if (XRE_GetWindowsEnvironment() != WindowsEnvironmentType_Metro) {
-    NS_WARNING("PinTileAsync can't be called on the desktop.");
-    return NS_ERROR_FAILURE;
-  }
-  HRESULT hr;
-
-  HString logoStr, smallLogoStr, displayName, shortName;
-
-  logoStr.Set(aTileImage.BeginReading());
-  smallLogoStr.Set(aSmallTileImage.BeginReading());
-  displayName.Set(aDisplayName.BeginReading());
-  shortName.Set(aShortName.BeginReading());
-
-  ComPtr<IUriRuntimeClass> logo, smallLogo;
-  AssertRetHRESULT(MetroUtils::CreateUri(logoStr, logo), NS_ERROR_FAILURE);
-  AssertRetHRESULT(MetroUtils::CreateUri(smallLogoStr, smallLogo), NS_ERROR_FAILURE);
-
-  HString tileActivationArgumentsStr, tileIdStr;
-  tileActivationArgumentsStr.Set(aActivationArgs.BeginReading());
-  tileIdStr.Set(aTileID.BeginReading());
-
-  ComPtr<ISecondaryTileFactory> tileFactory;
-  ComPtr<ISecondaryTile> secondaryTile;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_StartScreen_SecondaryTile).Get(),
-                            tileFactory.GetAddressOf());
-  AssertRetHRESULT(hr, NS_ERROR_FAILURE);
-  hr = tileFactory->CreateWithId(tileIdStr.Get(), secondaryTile.GetAddressOf());
-  AssertRetHRESULT(hr, NS_ERROR_FAILURE);
-
-  secondaryTile->put_Logo(logo.Get());
-  secondaryTile->put_SmallLogo(smallLogo.Get());
-  secondaryTile->put_DisplayName(displayName.Get());
-  secondaryTile->put_ShortName(shortName.Get());
-  secondaryTile->put_Arguments(tileActivationArgumentsStr.Get());
-  secondaryTile->put_TileOptions(TileOptions::TileOptions_ShowNameOnLogo);
-
-  // The tile is created and we can now attempt to pin the tile.
-  ComPtr<IAsyncOperationCompletedHandler<bool>> callback(Callback<IAsyncOperationCompletedHandler<bool>>(
-    sMetroApp.Get(), &MetroApp::OnAsyncTileCreated));
-  ComPtr<IAsyncOperation<bool>> operation;
-  AssertRetHRESULT(secondaryTile->RequestCreateAsync(operation.GetAddressOf()), NS_ERROR_FAILURE);
-  operation->put_Completed(callback.Get());
-  return NS_OK;
-}
-
-/**
- * Unpins a tile from the Windows 8 start screen.
- *
- * @param aTileID An existing ID which was previously pinned
- */
-NS_IMETHODIMP
-nsWinMetroUtils::UnpinTileAsync(const nsAString &aTileID)
-{
-  if (XRE_GetWindowsEnvironment() != WindowsEnvironmentType_Metro) {
-    NS_WARNING("UnpinTileAsync can't be called on the desktop.");
-    return NS_ERROR_FAILURE;
-  }
-  HRESULT hr;
-  HString tileIdStr;
-  tileIdStr.Set(aTileID.BeginReading());
-
-  ComPtr<ISecondaryTileFactory> tileFactory;
-  ComPtr<ISecondaryTile> secondaryTile;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_StartScreen_SecondaryTile).Get(),
-                            tileFactory.GetAddressOf());
-  AssertRetHRESULT(hr, NS_ERROR_FAILURE);
-  hr = tileFactory->CreateWithId(tileIdStr.Get(), secondaryTile.GetAddressOf());
-  AssertRetHRESULT(hr, NS_ERROR_FAILURE);
-
-  // Attempt to unpin the tile
-  ComPtr<IAsyncOperationCompletedHandler<bool>> callback(Callback<IAsyncOperationCompletedHandler<bool>>(
-    sMetroApp.Get(), &MetroApp::OnAsyncTileCreated));
-  ComPtr<IAsyncOperation<bool>> operation;
-  AssertRetHRESULT(secondaryTile->RequestDeleteAsync(operation.GetAddressOf()), NS_ERROR_FAILURE);
-  operation->put_Completed(callback.Get());
-  return NS_OK;
-}
-
-/**
- * Determines if a tile is pinned to the Windows 8 start screen.
- *
- * @param aTileID   An ID which may have been pinned with pinTileAsync
- * @param aIsPinned Out parameter for determining if the tile is pinned or not
- */
-NS_IMETHODIMP
-nsWinMetroUtils::IsTilePinned(const nsAString &aTileID, bool *aIsPinned)
-{
-  if (XRE_GetWindowsEnvironment() != WindowsEnvironmentType_Metro) {
-    NS_WARNING("IsTilePinned can't be called on the desktop.");
-    return NS_ERROR_FAILURE;
-  }
-  NS_ENSURE_ARG_POINTER(aIsPinned);
-
-  HRESULT hr;
-  HString tileIdStr;
-  tileIdStr.Set(aTileID.BeginReading());
-
-  ComPtr<ISecondaryTileStatics> tileStatics;
-  hr = GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_StartScreen_SecondaryTile).Get(),
-                            tileStatics.GetAddressOf());
-  AssertRetHRESULT(hr, NS_ERROR_FAILURE);
-  boolean result = false;
-  tileStatics->Exists(tileIdStr.Get(), &result);
-  *aIsPinned = result;
-  return NS_OK;
-}
-
-/**
- * Launches the specified application with the specified arguments and
- * switches to Desktop mode if in metro mode.
-*/
-NS_IMETHODIMP
-nsWinMetroUtils::LaunchInDesktop(const nsAString &aPath, const nsAString &aArguments)
-{
-  SHELLEXECUTEINFOW sinfo;
-  memset(&sinfo, 0, sizeof(SHELLEXECUTEINFOW));
-  sinfo.cbSize       = sizeof(SHELLEXECUTEINFOW);
-  // Per the Metro style enabled desktop browser, for some reason,
-  // SEE_MASK_FLAG_LOG_USAGE is needed to change from immersive mode
-  // to desktop.
-  sinfo.fMask        = SEE_MASK_FLAG_LOG_USAGE;
-  sinfo.hwnd         = nullptr;
-  sinfo.lpFile       = aPath.BeginReading();
-  sinfo.lpParameters = aArguments.BeginReading();
-  sinfo.lpVerb       = L"open";
-  sinfo.nShow        = SW_SHOWNORMAL;
-
-  if (!ShellExecuteEx(&sinfo)) {
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::ShowNativeToast(const nsAString &aTitle,
-  const nsAString &aMessage, const nsAString &anImage,
-  const nsAString &aCookie, const nsAString& aAppId)
-{
-  ToastNotificationHandler* notification_handler =
-      new ToastNotificationHandler;
-
-  HSTRING title = HStringReference(aTitle.BeginReading()).Get();
-  HSTRING msg = HStringReference(aMessage.BeginReading()).Get();
-
-  bool ret;
-  if (anImage.Length() > 0) {
-    HSTRING imagePath = HStringReference(anImage.BeginReading()).Get();
-    ret = notification_handler->DisplayNotification(title, msg, imagePath,
-                                                    aCookie,
-                                                    aAppId);
-  } else {
-    ret = notification_handler->DisplayTextNotification(title, msg, aCookie,
-                                                        aAppId);
-  }
-
-  if (!ret) {
-    delete notification_handler;
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::ShowSettingsFlyout()
-{
-  if (XRE_GetWindowsEnvironment() != WindowsEnvironmentType_Metro) {
-    NS_WARNING("Settings flyout can't be shown on the desktop.");
-    return NS_ERROR_FAILURE;
-  }
-
-  HRESULT hr = MetroUtils::ShowSettingsFlyout();
-  return SUCCEEDED(hr) ? NS_OK : NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetImmersive(bool *aImersive)
-{
-  *aImersive =
-    XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetActivationURI(nsAString &aActivationURI)
-{
-  if (XRE_GetWindowsEnvironment() != WindowsEnvironmentType_Metro) {
-    return NS_ERROR_FAILURE;
-  }
-  FrameworkView::GetActivationURI(aActivationURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetPreviousExecutionState(int32_t *out)
-{
-  if (XRE_GetWindowsEnvironment() != WindowsEnvironmentType_Metro) {
-    return NS_ERROR_FAILURE;
-  }
-  *out = FrameworkView::GetPreviousExecutionState();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetKeyboardVisible(bool *aImersive)
-{
-  *aImersive = FrameworkView::IsKeyboardVisible();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetKeyboardX(uint32_t *aX)
-{
-  *aX = static_cast<uint32_t>(floor(FrameworkView::KeyboardVisibleRect().X));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetKeyboardY(uint32_t *aY)
-{
-  *aY = static_cast<uint32_t>(floor(FrameworkView::KeyboardVisibleRect().Y));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetKeyboardWidth(uint32_t *aWidth)
-{
-  *aWidth = static_cast<uint32_t>(ceil(FrameworkView::KeyboardVisibleRect().Width));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetKeyboardHeight(uint32_t *aHeight)
-{
-  *aHeight = static_cast<uint32_t>(ceil(FrameworkView::KeyboardVisibleRect().Height));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::AddSettingsPanelEntry(const nsAString &aLabel, uint32_t *aId)
-{
-  NS_ENSURE_ARG_POINTER(aId);
-  if (!sSettingsArray)
-    return NS_ERROR_UNEXPECTED;
-
-  *aId = sSettingsArray->Length();
-  sSettingsArray->AppendElement(nsString(aLabel));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::SwapMouseButton(bool aValue, bool *aOriginalValue)
-{
-  *aOriginalValue = ::SwapMouseButton(aValue);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetUpdatePending(bool *aUpdatePending)
-{
-  *aUpdatePending = sUpdatePending;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::SetUpdatePending(bool aUpdatePending)
-{
-  sUpdatePending = aUpdatePending;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetForeground(bool* aForeground)
-{
-  *aForeground = (::GetActiveWindow() == ::GetForegroundWindow());
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWinMetroUtils::GetSupported(bool *aSupported)
-{
-  *aSupported = false;
-  if (!IsWin8OrLater()) {
-    return NS_OK;
-  }
-
-  // if last_used_feature_level_idx is set, we've previously created a
-  // d3d device that's compatible. See gfxEindowsPlatform for details.
-  if (Preferences::GetInt("gfx.direct3d.last_used_feature_level_idx", -1) != -1) {
-    *aSupported = true;
-    return NS_OK;
-  }
-
-  // if last_used_feature_level_idx isn't set, gfx hasn't attempted to create
-  // a device yet. This could be a case where d2d is pref'd off or blacklisted
-  // on desktop, or we tried to create a device and failed. This could also be
-  // a first run case where we haven't created an accelerated top level window
-  // yet.
-
-  NS_NAMED_LITERAL_STRING(metroRegValueName, "MetroD3DAvailable");
-  NS_NAMED_LITERAL_STRING(metroRegValuePath, "Software\\Mozilla\\Firefox");
-
-  // Check to see if the ceh launched us, it also does this check and caches
-  // a flag in the registry.
-  nsresult rv;
-  uint32_t value = 0;
-  nsCOMPtr<nsIWindowsRegKey> regKey =
-    do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv);
-  if (NS_SUCCEEDED(rv)) {
-    rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER,
-                      metroRegValuePath,
-                      nsIWindowsRegKey::ACCESS_ALL);
-    if (NS_SUCCEEDED(rv)) {
-      rv = regKey->ReadIntValue(metroRegValueName, &value);
-      if (NS_SUCCEEDED(rv)) {
-        *aSupported = (bool)value;
-        return NS_OK;
-      }
-
-      // If all else fails, do the check here. This call is costly but
-      // we shouldn't hit this except in rare situations where the
-      // ceh never launched the browser that's running. 
-      value = D3DFeatureLevelCheck();
-      regKey->WriteIntValue(metroRegValueName, value);
-      *aSupported = (bool)value;
-      return NS_OK;
-    }
-  }
-  return NS_OK;
-}
-
-} // widget
-} // mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/nsWinMetroUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/nsWinMetroUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/nsWinMetroUtils.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/nsWinMetroUtils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +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/. */
-
-#pragma once
-
-#include "nsIWinMetroUtils.h"
-#include "nsString.h"
-
-namespace mozilla {
-namespace widget {
-
-class nsWinMetroUtils : public nsIWinMetroUtils
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIWINMETROUTILS
-
-  nsWinMetroUtils();
-  virtual ~nsWinMetroUtils();
-
-  static bool sUpdatePending;
-};
-
-} // widget
-} // mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/ToastNotificationHandler.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/ToastNotificationHandler.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/ToastNotificationHandler.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/ToastNotificationHandler.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,153 +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/. */
-
-#include "ToastNotificationHandler.h"
-#include "MetroUtils.h"
-#include "mozilla/Services.h"
-#include "FrameworkView.h"
-
-using namespace ABI::Windows::Foundation;
-using namespace ABI::Windows::Data::Xml::Dom;
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-using namespace mozilla;
-using namespace ABI::Windows::UI::Notifications;
-
-typedef __FITypedEventHandler_2_Windows__CUI__CNotifications__CToastNotification_IInspectable_t ToastActivationHandler;
-typedef __FITypedEventHandler_2_Windows__CUI__CNotifications__CToastNotification_Windows__CUI__CNotifications__CToastDismissedEventArgs ToastDismissHandler;
-
-bool
-ToastNotificationHandler::DisplayNotification(HSTRING title,
-                                              HSTRING msg,
-                                              HSTRING imagePath,
-                                              const nsAString& aCookie,
-                                              const nsAString& aAppId)
-{
-  mCookie = aCookie;
-
-  Microsoft::WRL::ComPtr<IXmlDocument> toastXml =
-    InitializeXmlForTemplate(ToastTemplateType::ToastTemplateType_ToastImageAndText03);
-  Microsoft::WRL::ComPtr<IXmlNodeList> toastTextElements, toastImageElements;
-  Microsoft::WRL::ComPtr<IXmlNode> titleTextNodeRoot, msgTextNodeRoot, imageNodeRoot, srcAttribute;
-
-  HSTRING textNodeStr, imageNodeStr, srcNodeStr;
-  HSTRING_HEADER textHeader, imageHeader, srcHeader;
-  WindowsCreateStringReference(L"text", 4, &textHeader, &textNodeStr);
-  WindowsCreateStringReference(L"image", 5, &imageHeader, &imageNodeStr);
-  WindowsCreateStringReference(L"src", 3, &srcHeader, &srcNodeStr);
-  toastXml->GetElementsByTagName(textNodeStr, &toastTextElements);
-  toastXml->GetElementsByTagName(imageNodeStr, &toastImageElements);
-
-  AssertRetHRESULT(toastTextElements->Item(0, &titleTextNodeRoot), false);
-  AssertRetHRESULT(toastTextElements->Item(1, &msgTextNodeRoot), false);
-  AssertRetHRESULT(toastImageElements->Item(0, &imageNodeRoot), false);
-
-  Microsoft::WRL::ComPtr<IXmlNamedNodeMap> attributes;
-  AssertRetHRESULT(imageNodeRoot->get_Attributes(&attributes), false);
-  AssertRetHRESULT(attributes->GetNamedItem(srcNodeStr, &srcAttribute), false);
-
-  SetNodeValueString(title, titleTextNodeRoot.Get(), toastXml.Get());
-  SetNodeValueString(msg, msgTextNodeRoot.Get(), toastXml.Get());
-  SetNodeValueString(imagePath, srcAttribute.Get(), toastXml.Get());
-
-  return CreateWindowsNotificationFromXml(toastXml.Get(), aAppId);
-}
-
-bool
-ToastNotificationHandler::DisplayTextNotification(HSTRING title,
-                                                  HSTRING msg,
-                                                  const nsAString& aCookie,
-                                                  const nsAString& aAppId)
-{
-  mCookie = aCookie;
-
-  Microsoft::WRL::ComPtr<IXmlDocument> toastXml =
-    InitializeXmlForTemplate(ToastTemplateType::ToastTemplateType_ToastText03);
-  Microsoft::WRL::ComPtr<IXmlNodeList> toastTextElements;
-  Microsoft::WRL::ComPtr<IXmlNode> titleTextNodeRoot, msgTextNodeRoot;
-
-  HSTRING textNodeStr;
-  HSTRING_HEADER textHeader;
-  WindowsCreateStringReference(L"text", 4, &textHeader, &textNodeStr);
-  toastXml->GetElementsByTagName(textNodeStr, &toastTextElements);
-
-  AssertRetHRESULT(toastTextElements->Item(0, &titleTextNodeRoot), false);
-  AssertRetHRESULT(toastTextElements->Item(1, &msgTextNodeRoot), false);
-
-  SetNodeValueString(title, titleTextNodeRoot.Get(), toastXml.Get());
-  SetNodeValueString(msg, msgTextNodeRoot.Get(), toastXml.Get());
-
-  return CreateWindowsNotificationFromXml(toastXml.Get(), aAppId);
-}
-
-Microsoft::WRL::ComPtr<IXmlDocument>
-ToastNotificationHandler::InitializeXmlForTemplate(ToastTemplateType templateType) {
-  Microsoft::WRL::ComPtr<IXmlDocument> toastXml;
-
-  AssertRetHRESULT(GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager).Get(),
-    mToastNotificationManagerStatics.GetAddressOf()), nullptr);
-
-  mToastNotificationManagerStatics->GetTemplateContent(templateType, &toastXml);
-
-  return toastXml;
-}
-
-bool
-ToastNotificationHandler::CreateWindowsNotificationFromXml(IXmlDocument *toastXml,
-                                                           const nsAString& aAppId)
-{
-  Microsoft::WRL::ComPtr<IToastNotification> notification;
-  Microsoft::WRL::ComPtr<IToastNotificationFactory> factory;
-  AssertRetHRESULT(GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotification).Get(),
-    factory.GetAddressOf()), false);
-  AssertRetHRESULT(factory->CreateToastNotification(toastXml, &notification),
-                   false);
-
-  EventRegistrationToken activatedToken;
-  AssertRetHRESULT(notification->add_Activated(Callback<ToastActivationHandler>(this,
-    &ToastNotificationHandler::OnActivate).Get(), &activatedToken), false);
-  EventRegistrationToken dismissedToken;
-  AssertRetHRESULT(notification->add_Dismissed(Callback<ToastDismissHandler>(this,
-    &ToastNotificationHandler::OnDismiss).Get(), &dismissedToken), false);
-
-  Microsoft::WRL::ComPtr<IToastNotifier> notifier;
-  if (aAppId.IsEmpty()) {
-    AssertRetHRESULT(mToastNotificationManagerStatics->CreateToastNotifier(
-                       &notifier), false);
-  } else {
-    AssertRetHRESULT(mToastNotificationManagerStatics->CreateToastNotifierWithId(
-                    HStringReference(PromiseFlatString(aAppId).get()).Get(),
-                    &notifier), false);
-  }
-  AssertRetHRESULT(notifier->Show(notification.Get()), false);
-
-  MetroUtils::FireObserver("metro_native_toast_shown", mCookie.get());
-
-  return true;
-}
-
-void ToastNotificationHandler::SetNodeValueString(HSTRING inputString,
-  Microsoft::WRL::ComPtr<IXmlNode> node, Microsoft::WRL::ComPtr<IXmlDocument> xml) {
-  Microsoft::WRL::ComPtr<IXmlText> inputText;
-  Microsoft::WRL::ComPtr<IXmlNode> inputTextNode, pAppendedChild;
-
-  AssertHRESULT(xml->CreateTextNode(inputString, &inputText));
-  AssertHRESULT(inputText.As(&inputTextNode));
-  AssertHRESULT(node->AppendChild(inputTextNode.Get(), &pAppendedChild));
-}
-
-HRESULT ToastNotificationHandler::OnActivate(IToastNotification *notification, IInspectable *inspectable) {
-  MetroUtils::FireObserver("metro_native_toast_clicked", mCookie.get());
-  return S_OK;
-}
-
-HRESULT
-ToastNotificationHandler::OnDismiss(IToastNotification *notification,
-                                    IToastDismissedEventArgs* aArgs)
-{
-  MetroUtils::FireObserver("metro_native_toast_dismissed", mCookie.get());
-  delete this;
-  return S_OK;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/ToastNotificationHandler.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/ToastNotificationHandler.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/ToastNotificationHandler.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/ToastNotificationHandler.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +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/. */
-
-#pragma once
-
-#include <windows.ui.notifications.h>
-#include <windows.data.xml.dom.h>
-#include "mozwrlbase.h"
-#include "nsString.h"
-
-
-class ToastNotificationHandler {
-    typedef ABI::Windows::UI::Notifications::IToastNotification IToastNotification;
-    typedef ABI::Windows::UI::Notifications::IToastDismissedEventArgs IToastDismissedEventArgs;
-    typedef ABI::Windows::UI::Notifications::IToastNotificationManagerStatics IToastNotificationManagerStatics;
-    typedef ABI::Windows::UI::Notifications::ToastTemplateType ToastTemplateType;
-    typedef ABI::Windows::Data::Xml::Dom::IXmlNode IXmlNode;
-    typedef ABI::Windows::Data::Xml::Dom::IXmlDocument IXmlDocument;
-
-    void SetNodeValueString(HSTRING inputString,Microsoft::WRL::ComPtr<IXmlNode> node,
-                                            Microsoft::WRL::ComPtr<IXmlDocument> xml);
-  public:
-    ToastNotificationHandler() {};
-    ~ToastNotificationHandler() {};
-
-    bool DisplayNotification(HSTRING title, HSTRING msg, HSTRING imagePath,
-                             const nsAString& aCookie, const nsAString& aAppId);
-    bool DisplayTextNotification(HSTRING title, HSTRING msg,
-                                 const nsAString& aCookie,
-                                 const nsAString& aAppId);
-    HRESULT OnActivate(IToastNotification *notification, IInspectable *inspectable);
-    HRESULT OnDismiss(IToastNotification *notification,
-                      IToastDismissedEventArgs* aArgs);
-
-  private:
-    nsString mCookie;
-    Microsoft::WRL::ComPtr<IToastNotificationManagerStatics> mToastNotificationManagerStatics;
-
-    bool CreateWindowsNotificationFromXml(IXmlDocument *toastXml,
-                                          const nsAString& aAppId);
-    Microsoft::WRL::ComPtr<IXmlDocument> InitializeXmlForTemplate(ToastTemplateType templateType);
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIAAccessibilityBridge.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIAAccessibilityBridge.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIAAccessibilityBridge.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIAAccessibilityBridge.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +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/. */
-
-#if defined(ACCESSIBILITY)
-
-#include "UIAAccessibilityBridge.h"
-#include "MetroUtils.h"
-
-#include <OAIdl.h>
-
-#include "nsIAccessibleEvent.h"
-#include "nsIPersistentProperties2.h"
-
-// generated
-#include "UIABridge.h"
-
-#include <wrl/implements.h>
-
-using namespace mozilla::a11y;
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-using namespace Microsoft::WRL;
-
-NS_IMPL_ISUPPORTS(AccessibilityBridge, nsIObserver)
-
-nsresult
-AccessibilityBridge::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData)
-{
-  nsCOMPtr<nsIAccessibleEvent> ev = do_QueryInterface(aSubject);
-  if (!ev) {
-    return NS_OK;
-  }
-
-  uint32_t eventType = 0;
-  ev->GetEventType(&eventType);
-  if (eventType == nsIAccessibleEvent::EVENT_FOCUS) {
-    Microsoft::WRL::ComPtr<IUIABridge> bridgePtr;
-    mBridge.As(&bridgePtr);
-    if (bridgePtr) {
-      bridgePtr->FocusChangeEvent();
-    }
-  }
-
-  return NS_OK;
-}
-
-} } }
-
-#endif // ACCESSIBILITY
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIAAccessibilityBridge.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIAAccessibilityBridge.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIAAccessibilityBridge.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIAAccessibilityBridge.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +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/. */
-
-#pragma once
-
-#if defined(ACCESSIBILITY)
-
-#include "nsCOMPtr.h"
-#include "nsIObserver.h"
-#include "nsIObserverService.h"
-#include "nsServiceManagerUtils.h"
-#include "mozilla/a11y/Accessible.h"
-
-#include "mozwrlbase.h"
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-// Connects to our accessibility framework to receive
-// events and query the dom.
-class AccessibilityBridge : public nsIObserver
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIOBSERVER
-
-  AccessibilityBridge() {}
-
-  ~AccessibilityBridge() {
-    Disconnect();
-  }
-
-  bool Init(IUnknown* aBridge, mozilla::a11y::Accessible* aPtr) {
-    mAccess = aPtr;
-    mBridge = aBridge;
-    return Connect();
-  }
-
-  bool Connect() {
-    nsresult rv;
-
-    nsCOMPtr<nsIObserverService> observerService = 
-      do_GetService("@mozilla.org/observer-service;1", &rv);
-    if (NS_FAILED(rv)) {
-      return false;
-    }
-    rv = observerService->AddObserver(this, "accessible-event", false);
-    if (NS_FAILED(rv)) {
-      return false;
-    }
-    return true;
-  }
-
-  bool Connected() {
-    return mAccess ? true : false;
-  }
-
-  void Disconnect() {
-    nsresult rv;
-    nsCOMPtr<nsIObserverService> observerService = 
-      do_GetService("@mozilla.org/observer-service;1", &rv);
-    if (NS_FAILED(rv)) {
-      NS_WARNING("failed to get observersvc on shutdown.");
-      return;
-    }
-    observerService->RemoveObserver(this, "accessible-event");
-    mAccess = nullptr;
-  }
-
-private:
-  nsRefPtr<mozilla::a11y::Accessible> mAccess;
-  Microsoft::WRL::ComPtr<IUnknown> mBridge;
-};
-
-} } }
-
-#endif // ACCESSIBILITY
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIABridge.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIABridge.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIABridge.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIABridge.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,801 +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/. */
-
-#include "UIABridge.h"
-#include "MetroUtils.h"
-#include "UIABridgePrivate.h"
-#include "MetroWidget.h"
-#include "WinUtils.h"
-
-#include <wrl.h>
-#include <OAIdl.h>
-#include <windows.graphics.display.h>
-
-#ifdef ACCESSIBILITY
-using namespace mozilla::a11y;
-#endif
-using namespace mozilla::widget;
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-using namespace ABI::Windows::UI;
-using namespace ABI::Windows::UI::Core;
-using namespace ABI::Windows::Foundation;
-using namespace ABI::Windows::System;
-
-//#define DEBUG_BRIDGE
-#if !defined(DEBUG_BRIDGE)
-#undef LogThread
-#undef LogFunction
-#define LogThread() 
-#define LogFunction()
-#define BridgeLog(...)
-#else
-#define BridgeLog(...) WinUtils::Log(__VA_ARGS__)
-#endif
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
- const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-MIDL_DEFINE_GUID(IID, IID_IUIABridge, 0xc78b35b5, 0x5db, 0x43aa, 0xae, 0x73, 0x94, 0xc2, 0x33, 0xa9, 0x3c, 0x98);
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-#define ProviderOptions_UseClientCoordinates (ProviderOptions)0x100
-
-static int gIDIndex = 2;
-ComPtr<IUIABridge> gProviderRoot = nullptr;
-static ComPtr<IUIAElement> gElement = nullptr;
-
-HRESULT
-UIABridge_CreateInstance(IInspectable **retVal)
-{
-  HRESULT hr = E_OUTOFMEMORY;
-  *retVal = nullptr;
-  ComPtr<UIABridge> spProvider = Make<UIABridge>();
-  if (spProvider != nullptr &&
-      SUCCEEDED(hr = spProvider.Get()->QueryInterface(IID_PPV_ARGS(retVal))) &&
-      SUCCEEDED(hr = spProvider.Get()->QueryInterface(IID_PPV_ARGS(&gProviderRoot)))) {
-    return S_OK;
-  }
-  return hr;
-}
-
-HRESULT
-UIATextElement_CreateInstance(IRawElementProviderFragmentRoot* aRoot)
-{
-  LogFunction();
-  HRESULT hr = E_OUTOFMEMORY;
-  ComPtr<UIATextElement> spProvider = Make<UIATextElement>();
-  if (spProvider != nullptr &&
-      SUCCEEDED(hr = spProvider.Get()->QueryInterface(IID_PPV_ARGS(&gElement)))) {
-    spProvider->SetIndexID(gIDIndex++);
-    return S_OK;
-  }
-  return hr;
-}
-
-// IUIABridge
-
-HRESULT
-UIABridge::Init(IInspectable* aView, IInspectable* aWindow, LONG_PTR aInnerPtr)
-{
-  LogFunction();
-  NS_ASSERTION(aView, "invalid framework view pointer");
-  NS_ASSERTION(aWindow, "invalid window pointer");
-  NS_ASSERTION(aInnerPtr, "invalid Accessible pointer");
-
-#if defined(ACCESSIBILITY)
-  // init AccessibilityBridge and connect to accessibility
-  mAccBridge = new AccessibilityBridge();
-  if (!mAccBridge->Init(CastToUnknown(), (Accessible*)aInnerPtr)) {
-    return E_FAIL;
-  }
-
-  aWindow->QueryInterface(IID_PPV_ARGS(&mWindow));
-
-  if (FAILED(UIATextElement_CreateInstance(this)))
-    return E_FAIL;
-
-  mAccessible = (Accessible*)aInnerPtr;
-
-  return S_OK;
-#endif
-  return E_FAIL;
-}
-
-HRESULT
-UIABridge::Disconnect()
-{
-  LogFunction();
-#if defined(ACCESSIBILITY)
-  mAccBridge->Disconnect();
-  mAccessible = nullptr;
-#endif
-  mWindow = nullptr;
-  gElement = nullptr;
-  gProviderRoot = nullptr;
-  return S_OK;
-}
-
-bool
-UIABridge::Connected()
-{
-  return !!mAccessible;
-}
-
-// IUIAElement
-
-HRESULT
-UIABridge::SetFocusInternal(LONG_PTR aAccessible)
-{
-  LogFunction();
-  return S_OK;
-}
-
-HRESULT
-UIABridge::ClearFocus()
-{
-  LogFunction();
-  return S_OK;
-}
-
-static void
-DumpChildInfo(nsRefPtr<Accessible>& aChild)
-{
-#ifdef DEBUG
-  if (!aChild) {
-    return;
-  }
-  nsString str;
-  aChild->Name(str);
-  BridgeLog("name: %ls", str.BeginReading());
-  aChild->Description(str);
-  BridgeLog("description: %ls", str.BeginReading());
-#endif
-}
-
-static bool
-ChildHasFocus(nsRefPtr<Accessible>& aChild)
-{
-  BridgeLog("Focus element flags: editable:%d focusable:%d readonly:%d",
-    ((aChild->NativeState() & mozilla::a11y::states::EDITABLE) > 0),
-    ((aChild->NativeState() & mozilla::a11y::states::FOCUSABLE) > 0),
-    ((aChild->NativeState() & mozilla::a11y::states::READONLY) > 0));
-  return (((aChild->NativeState() & mozilla::a11y::states::EDITABLE) > 0) &&
-           ((aChild->NativeState() & mozilla::a11y::states::READONLY) == 0));
-}
-
-HRESULT
-UIABridge::FocusChangeEvent()
-{
-  LogFunction();
-  if (!Connected()) {
-    return UIA_E_ELEMENTNOTAVAILABLE;
-  }
-
-  nsRefPtr<Accessible> child = mAccessible->FocusedChild();
-  if (!child) {
-    return S_OK;
-  }
-
-  if (!ChildHasFocus(child)) {
-    ComPtr<IUIAElement> element;
-    gElement.As(&element);
-    if (!element) {
-      return S_OK;
-    }
-    element->ClearFocus();
-    UiaRaiseAutomationEvent(this, UIA_AutomationFocusChangedEventId);
-  }
-
-  return S_OK;
-}
-
-// IRawElementProviderFragmentRoot
-
-HRESULT
-UIABridge::ElementProviderFromPoint(double x, double y, IRawElementProviderFragment ** retVal)
-{
-  LogFunction();
-  *retVal = nullptr;
-  if (!Connected()) {
-    return UIA_E_ELEMENTNOTAVAILABLE;
-  }
-  gElement.Get()->QueryInterface(IID_PPV_ARGS(retVal));
-  return S_OK;
-}
-
-// Windows calls this looking for the current focus element. Windows
-// will call here before accessible sends us any observer events through
-// the accessibility bridge, so update child focus information.
-HRESULT
-UIABridge::GetFocus(IRawElementProviderFragment ** retVal)
-{
-  LogFunction();
-  if (!Connected()) {
-    return UIA_E_ELEMENTNOTAVAILABLE;
-  }
-
-  nsRefPtr<Accessible> child = mAccessible->FocusedChild();
-  if (!child) {
-    BridgeLog("mAccessible->GetFocusedChild failed.");
-    return S_OK;
-  }
-
-  DumpChildInfo(child);
-
-  ComPtr<IUIAElement> element;
-  gElement.As(&element);
-  if (!element) {
-    BridgeLog("gElement as IUIAElement failed.");
-    return S_OK;
-  }
-
-  if (!ChildHasFocus(child)) {
-    element->ClearFocus();
-  } else {
-    element->SetFocusInternal((LONG_PTR)child.get());
-    element.Get()->QueryInterface(IID_PPV_ARGS(retVal));
-  }
-
-  return S_OK;
-}
-
-// IRawElementProviderFragment
-
-HRESULT
-UIABridge::Navigate(NavigateDirection direction, IRawElementProviderFragment ** retVal)
-{
-  LogFunction();
-  if (!Connected()) {
-    return UIA_E_ELEMENTNOTAVAILABLE;
-  }
-  *retVal = nullptr;
-
-  switch(direction) {
-    case NavigateDirection_Parent:
-    BridgeLog("UIABridge::Navigate NavigateDirection_Parent");
-    break;
-    case NavigateDirection_NextSibling:
-    BridgeLog("UIABridge::Navigate NavigateDirection_NextSibling");
-    break;
-    case NavigateDirection_PreviousSibling:
-    BridgeLog("UIABridge::Navigate NavigateDirection_PreviousSibling");
-    break;
-    case NavigateDirection_FirstChild:
-    BridgeLog("UIABridge::Navigate NavigateDirection_FirstChild");
-    gElement.Get()->QueryInterface(IID_PPV_ARGS(retVal));
-    break;
-    case NavigateDirection_LastChild:
-    BridgeLog("UIABridge::Navigate NavigateDirection_LastChild");
-    gElement.Get()->QueryInterface(IID_PPV_ARGS(retVal));
-    break;
-  }
-
-  // For the other directions (parent, next, previous) the default of nullptr is correct
-  return S_OK;
-}
-
-HRESULT
-UIABridge::GetRuntimeId(SAFEARRAY ** retVal)
-{
-  LogFunction();
-  if (!Connected()) {
-    return UIA_E_ELEMENTNOTAVAILABLE;
-  }
-
-  int runtimeId[2] = { UiaAppendRuntimeId, 1 }; // always 1
-  *retVal = SafeArrayCreateVector(VT_I4, 0, ARRAYSIZE(runtimeId));
-  if (*retVal != nullptr) {
-    for (long index = 0; index < ARRAYSIZE(runtimeId); ++index) {
-      SafeArrayPutElement(*retVal, &index, &runtimeId[index]);
-    }
-  } else {
-    return E_OUTOFMEMORY;
-  }
-  return S_OK;
-}
-
-HRESULT
-UIABridge::get_BoundingRectangle(UiaRect * retVal)
-{
-  LogFunction();
-  if (!Connected() || !mWindow) {
-    return UIA_E_ELEMENTNOTAVAILABLE;
-  }
-
-  // returns logical pixels
-  Rect bounds;
-  mWindow->get_Bounds(&bounds);
-
-  // we need to return physical pixels
-  retVal->left = WinUtils::LogToPhys(bounds.X);
-  retVal->top = WinUtils::LogToPhys(bounds.Y);
-  retVal->width = WinUtils::LogToPhys(bounds.Width);
-  retVal->height = WinUtils::LogToPhys(bounds.Height);
-
-  return S_OK;
-}
-
-HRESULT
-UIABridge::GetEmbeddedFragmentRoots(SAFEARRAY ** retVal)
-{
-  if (!Connected()) {
-    return UIA_E_ELEMENTNOTAVAILABLE;
-  }
-  // doesn't apply according to msdn.
-  *retVal = nullptr;
-  return S_OK;
-}
-
-HRESULT
-UIABridge::SetFocus()
-{
-  LogFunction();
-  if (!Connected()) {
-    return UIA_E_ELEMENTNOTAVAILABLE;
-  }
-  return S_OK;
-}
-
-HRESULT
-UIABridge::get_FragmentRoot(IRawElementProviderFragmentRoot ** retVal)
-{
-  // we are the fragment root. Our children return us for this call.
-  return QueryInterface(IID_PPV_ARGS(retVal));
-}
-
-// IRawElementProviderSimple
-
-HRESULT
-UIABridge::get_ProviderOptions(ProviderOptions * pRetVal)
-{
-  LogFunction();
-  if (!Connected()) {
-    return E_FAIL;
-  }
-  *pRetVal = ProviderOptions_ServerSideProvider | 
-             ProviderOptions_UseComThreading | 
-             ProviderOptions_UseClientCoordinates;
-  return S_OK;
-}
-
-HRESULT
-UIABridge::GetPatternProvider(PATTERNID patternId, IUnknown **ppRetVal)
-{
-  LogFunction();
-  BridgeLog("UIABridge::GetPatternProvider=%d", patternId);
-
-  // The root window doesn't support any specific pattern
-  *ppRetVal = nullptr;
-
-  return S_OK;
-}
-
-HRESULT
-UIABridge::GetPropertyValue(PROPERTYID idProp, VARIANT * pRetVal)
-{
-  pRetVal->vt = VT_EMPTY;
-
-  switch (idProp) {
-    case UIA_AutomationIdPropertyId:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=UIA_AutomationIdPropertyId");
-    break;
-    case UIA_ControlTypePropertyId:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=UIA_ControlTypePropertyId");
-    break;
-    case UIA_IsKeyboardFocusablePropertyId:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=UIA_IsKeyboardFocusablePropertyId");
-    break;
-    case UIA_IsContentElementPropertyId:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=UIA_IsContentElementPropertyId");
-    break;
-    case UIA_IsControlElementPropertyId:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=UIA_IsControlElementPropertyId");
-    break;
-    case UIA_IsEnabledPropertyId:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=UIA_IsEnabledPropertyId");
-    break;
-    case UIA_HasKeyboardFocusPropertyId:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=UIA_HasKeyboardFocusPropertyId");
-    break;
-    case UIA_NamePropertyId:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=UIA_NamePropertyId");
-    break;
-    case UIA_IsPasswordPropertyId:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=UIA_IsPasswordPropertyId");
-    break;
-    case UIA_NativeWindowHandlePropertyId:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=UIA_NativeWindowHandlePropertyId");
-    break;
-    default:
-    BridgeLog("UIABridge::GetPropertyValue: idProp=%d", idProp);
-    break;
-  }
-
-  if (!Connected()) {
-    return E_FAIL;
-  }
-
-  switch (idProp) {
-    case UIA_AutomationIdPropertyId:
-      pRetVal->bstrVal = SysAllocString(L"MozillaAccessibilityBridge0001");
-      pRetVal->vt = VT_BSTR;
-      break;
-
-    case UIA_ControlTypePropertyId:
-      pRetVal->vt = VT_I4;
-      pRetVal->lVal = UIA_WindowControlTypeId;
-      break;
-
-    case UIA_IsKeyboardFocusablePropertyId:
-    case UIA_IsContentElementPropertyId:
-    case UIA_IsControlElementPropertyId:
-    case UIA_IsEnabledPropertyId:
-      pRetVal->boolVal = VARIANT_TRUE;
-      pRetVal->vt = VT_BOOL;
-      break;
-
-    case UIA_HasKeyboardFocusPropertyId:
-      pRetVal->vt = VT_BOOL;
-      pRetVal->boolVal = VARIANT_FALSE;
-      break;
-
-    case UIA_NamePropertyId:
-      pRetVal->bstrVal = SysAllocString(L"MozillaAccessibilityBridge");
-      pRetVal->vt = VT_BSTR;
-      break;
-
-    case UIA_IsPasswordPropertyId:
-      pRetVal->vt = VT_BOOL;
-      pRetVal->boolVal = VARIANT_FALSE;
-      break;
-
-    case UIA_NativeWindowHandlePropertyId:
-    pRetVal->vt = VT_I4;
-    pRetVal->lVal = (LONG)MetroWidget::GetICoreWindowHWND();
-    break;
-
-    default:
-      BridgeLog("UIABridge: Unhandled property");
-      break;
-  }
-  return S_OK;
-}
-
-HRESULT
-UIABridge::get_HostRawElementProvider(IRawElementProviderSimple **ppRetVal)
-{
-  // We only have this in the root bridge - this is our parent ICoreWindow.
-  *ppRetVal = nullptr;
-  if (mWindow != nullptr) {
-    IInspectable *pHostAsInspectable = nullptr;
-    if (SUCCEEDED(mWindow->get_AutomationHostProvider(&pHostAsInspectable))) {
-      pHostAsInspectable->QueryInterface(ppRetVal);
-      pHostAsInspectable->Release();
-    }
-  }
-  return S_OK;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Element
-
-HRESULT
-UIATextElement::SetFocusInternal(LONG_PTR aAccessible)
-{
-  LogFunction();
-#if defined(ACCESSIBILITY)
-  NS_ASSERTION(mAccessItem, "Bad accessible pointer");
-  if (mAccessItem == (Accessible*)aAccessible) {
-    return E_UNEXPECTED;
-  }
-  mAccessItem = (Accessible*)aAccessible;
-  return S_OK;
-#endif
-  return E_FAIL;
-}
-
-HRESULT
-UIATextElement::ClearFocus()
-{
-  LogFunction();
-  mAccessItem = nullptr;
-  return S_OK;
-}
-
-// IRawElementProviderFragment
-
-HRESULT
-UIATextElement::Navigate(NavigateDirection direction, IRawElementProviderFragment ** retVal)
-{
-  LogFunction();
-
-  *retVal = nullptr;
-  switch(direction) {
-    case NavigateDirection_Parent:
-    gProviderRoot.Get()->QueryInterface(IID_PPV_ARGS(retVal));
-    break;
-    case NavigateDirection_NextSibling:
-    break;
-    case NavigateDirection_PreviousSibling:
-    break;
-    case NavigateDirection_FirstChild:
-    break;
-    case NavigateDirection_LastChild:
-    break;
-  }
-  return S_OK;
-}
-
-HRESULT
-UIATextElement::GetRuntimeId(SAFEARRAY ** retVal)
-{
-  LogFunction();
-  int runtimeId[2] = { UiaAppendRuntimeId, mIndexID };
-  *retVal = SafeArrayCreateVector(VT_I4, 0, ARRAYSIZE(runtimeId));
-  if (*retVal != nullptr) {
-    for (long index = 0; index < ARRAYSIZE(runtimeId); ++index) {
-      SafeArrayPutElement(*retVal, &index, &runtimeId[index]);
-    }
-  } else {
-    return E_OUTOFMEMORY;
-  }
-  return S_OK;
-}
-
-HRESULT
-UIATextElement::get_BoundingRectangle(UiaRect * retVal)
-{
-  LogFunction();
-  
-  if (!mAccessItem) {
-    return UIA_E_ELEMENTNOTAVAILABLE;
-  }
-
-  // bounds are in physical pixels
-  nsIntRect rect = mAccessItem->Bounds();
-
-  retVal->left = rect.x;
-  retVal->top = rect.y;
-  retVal->width = rect.width;
-  retVal->height = rect.height;
-
-  BridgeLog("get_BoundingRectangle: left=%d top=%d right=%d bottom=%d", rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
-  return S_OK;
-}
-
-HRESULT
-UIATextElement::GetEmbeddedFragmentRoots(SAFEARRAY ** retVal)
-{
-  *retVal = nullptr;
-  return S_OK;
-}
-
-HRESULT
-UIATextElement::SetFocus()
-{
-  LogFunction();
-  return S_OK;
-}
-
-HRESULT
-UIATextElement::get_FragmentRoot(IRawElementProviderFragmentRoot ** retVal)
-{
-  return gProviderRoot.Get()->QueryInterface(IID_PPV_ARGS(retVal));
-}
-
-// IRawElementProviderSimple
-
-HRESULT
-UIATextElement::get_ProviderOptions(ProviderOptions * pRetVal)
-{
-  *pRetVal = ProviderOptions_ServerSideProvider | 
-             ProviderOptions_UseComThreading | 
-             ProviderOptions_UseClientCoordinates;
-  return S_OK;
-}
-
-HRESULT
-UIATextElement::GetPatternProvider(PATTERNID patternId, IUnknown **ppRetVal)
-{
-  LogFunction();
-  BridgeLog("UIATextElement::GetPatternProvider=%d", patternId);
-  
-  // UIA_ValuePatternId - 10002
-  // UIA_TextPatternId  - 10014
-  // UIA_TextChildPatternId - 10029
-
-  *ppRetVal = nullptr;
-  if (patternId == UIA_TextPatternId) {
-    BridgeLog("** TextPattern requested from element.");
-    *ppRetVal = static_cast<ITextProvider*>(this);
-    AddRef();
-    return S_OK;
-  } else if (patternId == UIA_ValuePatternId) {
-    BridgeLog("** ValuePattern requested from element.");
-    *ppRetVal = static_cast<IValueProvider*>(this);
-    AddRef();
-    return S_OK;
-  }
-
-  return S_OK;
-}
-
-HRESULT
-UIATextElement::GetPropertyValue(PROPERTYID idProp, VARIANT * pRetVal)
-{
-  pRetVal->vt = VT_EMPTY;
-
-  // native hwnd, we don't have one for elements
-  if (idProp == 30020) {
-    return S_OK;
-  }
-
-  switch (idProp) {
-    case UIA_AutomationIdPropertyId:
-    BridgeLog("UIATextElement::GetPropertyValue: idProp=UIA_AutomationIdPropertyId");
-    break;
-    case UIA_ControlTypePropertyId:
-    BridgeLog("UIATextElement::GetPropertyValue: idProp=UIA_ControlTypePropertyId");
-    break;
-    case UIA_IsKeyboardFocusablePropertyId:
-    BridgeLog("UIATextElement::GetPropertyValue: idProp=UIA_IsKeyboardFocusablePropertyId");
-    break;
-    case UIA_IsContentElementPropertyId:
-    BridgeLog("UIATextElement::GetPropertyValue: idProp=UIA_IsContentElementPropertyId");
-    break;
-    case UIA_IsControlElementPropertyId:
-    BridgeLog("UIATextElement::GetPropertyValue: idProp=UIA_IsControlElementPropertyId");
-    break;
-    case UIA_IsEnabledPropertyId:
-    BridgeLog("UIATextElement::GetPropertyValue: idProp=UIA_IsEnabledPropertyId");
-    break;
-    case UIA_HasKeyboardFocusPropertyId:
-    BridgeLog("UIATextElement::GetPropertyValue: idProp=UIA_HasKeyboardFocusPropertyId");
-    break;
-    case UIA_NamePropertyId:
-    BridgeLog("UIATextElement::GetPropertyValue: idProp=UIA_NamePropertyId");
-    break;
-    case UIA_IsPasswordPropertyId:
-    BridgeLog("UIATextElement::GetPropertyValue: idProp=UIA_IsPasswordPropertyId");
-    break;
-    default:
-    BridgeLog("UIATextElement::GetPropertyValue: idProp=%d", idProp);
-    break;
-  }
-
-  switch (idProp) {
-    case UIA_AutomationIdPropertyId:
-      pRetVal->bstrVal = SysAllocString(L"MozillaDocument0001");
-      pRetVal->vt = VT_BSTR;
-      break;
-
-    case UIA_ControlTypePropertyId:
-      pRetVal->vt = VT_I4;
-      pRetVal->lVal = UIA_EditControlTypeId;
-      break;
-
-    case UIA_IsTextPatternAvailablePropertyId:
-    case UIA_IsKeyboardFocusablePropertyId:
-    case UIA_IsContentElementPropertyId:
-    case UIA_IsControlElementPropertyId:
-    case UIA_IsEnabledPropertyId:
-      pRetVal->boolVal = VARIANT_TRUE;
-      pRetVal->vt = VT_BOOL;
-      break;
-
-    case UIA_LocalizedControlTypePropertyId:
-    case UIA_LabeledByPropertyId:
-      break;
-
-    case UIA_HasKeyboardFocusPropertyId:
-    {
-      if (mAccessItem) {
-        if (mAccessItem->NativeState() & mozilla::a11y::states::FOCUSED) {
-          pRetVal->vt = VT_BOOL;
-          pRetVal->boolVal = VARIANT_TRUE;
-          return S_OK;
-        }
-      }
-      pRetVal->vt = VT_BOOL;
-      pRetVal->boolVal = VARIANT_FALSE;
-      break;
-    }
-
-    case UIA_NamePropertyId:
-      pRetVal->bstrVal = SysAllocString(L"MozillaDocument");
-      pRetVal->vt = VT_BSTR;
-      break;
-
-    case UIA_IsPasswordPropertyId:
-      pRetVal->vt = VT_BOOL;
-      pRetVal->boolVal = VARIANT_FALSE;
-      break;
-
-    default:
-      BridgeLog("UIATextElement: Unhandled property");
-      break;
-  }
-  return S_OK;
-}
-
-HRESULT
-UIATextElement::get_HostRawElementProvider(IRawElementProviderSimple **ppRetVal)
-{
-  *ppRetVal = nullptr;
-  return S_OK;
-}
-
-// ITextProvider
-
-HRESULT
-UIATextElement::GetSelection(SAFEARRAY * *pRetVal)
-{
-  LogFunction();
-  return E_NOTIMPL;
-}
-
-HRESULT
-UIATextElement::GetVisibleRanges(SAFEARRAY * *pRetVal)
-{
-  LogFunction();
-  return E_NOTIMPL;
-}
-
-HRESULT
-UIATextElement::RangeFromChild(IRawElementProviderSimple *childElement, ITextRangeProvider **pRetVal)
-{
-  LogFunction();
-  return E_NOTIMPL;
-}
-
-HRESULT
-UIATextElement::RangeFromPoint(UiaPoint point, ITextRangeProvider **pRetVal)
-{
-  LogFunction();
-  return E_NOTIMPL;
-}
-
-HRESULT
-UIATextElement::get_DocumentRange(ITextRangeProvider **pRetVal)
-{
-  LogFunction();
-  return E_NOTIMPL;
-}
-
-HRESULT
-UIATextElement::get_SupportedTextSelection(SupportedTextSelection *pRetVal)
-{
-  LogFunction();
-  return E_NOTIMPL;
-}
-
-// IValueProvider
-
-IFACEMETHODIMP
-UIATextElement::SetValue(LPCWSTR val)
-{
-  LogFunction();
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP
-UIATextElement::get_Value(BSTR *pRetVal)
-{
-  LogFunction();
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP
-UIATextElement::get_IsReadOnly(BOOL *pRetVal)
-{
-  LogFunction();
-  *pRetVal = FALSE;
-  return S_OK;
-}
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIABridge.idl thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIABridge.idl
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIABridge.idl	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIABridge.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +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/. */
-
-#define DO_NO_IMPORTS 1
-
-import "oaidl.idl";
-import "oleacc.idl";
-import "Inspectable.idl";
-
-  [uuid(C78B35B5-05DB-43AA-AE73-94C233A93C98)]
-  interface IUIABridge : IInspectable {
-    HRESULT Init([in] IInspectable* view, [in] IInspectable* window, [in] LONG_PTR inner);
-    HRESULT Disconnect();
-    HRESULT FocusChangeEvent();
-  };
-
-  [uuid(9F57311C-E8AE-4991-8D9F-E069EEE96D85)]
-  interface IUIAElement : IInspectable {
-    HRESULT SetFocusInternal([in] LONG_PTR accessible);
-    HRESULT ClearFocus();
-  };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIABridgePrivate.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIABridgePrivate.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIABridgePrivate.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIABridgePrivate.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +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/. */
-
-#pragma once
-
-#include <windows.system.h>
-#include <windows.ui.core.h>
-#include <UIAutomation.h>
-#include <UIAutomationCore.h>
-#include <UIAutomationCoreApi.h>
-
-#include "mozwrlbase.h"
-
-#include "nsCOMPtr.h"
-#include "mozilla/a11y/Accessible.h"
-#include "UIAAccessibilityBridge.h"
-
-// generated
-#include "UIABridge.h"
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-// represents the root window to UIA
-[uuid("D3EDD951-0715-4501-A8E5-25D97EF35D5A")]
-class UIABridge : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags
-  <Microsoft::WRL::RuntimeClassType::WinRtClassicComMix>,
-  IUIABridge,
-  IUIAElement,
-  IRawElementProviderSimple,
-  IRawElementProviderFragment,
-  IRawElementProviderFragmentRoot>
-{
-  typedef ABI::Windows::UI::Core::ICoreWindow ICoreWindow;
-
-  InspectableClass(L"IUIABridge", BaseTrust);
-
-public:
-  UIABridge() {}
-
-  // IUIABridge
-  IFACEMETHODIMP Init(IInspectable* view, IInspectable* window, LONG_PTR inner);
-  IFACEMETHODIMP Disconnect();
-  IFACEMETHODIMP FocusChangeEvent();
-
-  // IUIAElement
-  IFACEMETHODIMP SetFocusInternal(LONG_PTR aAccessible);
-  IFACEMETHODIMP ClearFocus();
-
-  // IRawElementProviderFragmentRoot
-  IFACEMETHODIMP ElementProviderFromPoint(double x, double y, IRawElementProviderFragment ** retVal);
-  IFACEMETHODIMP GetFocus(IRawElementProviderFragment ** retVal);
-
-  // IRawElementProviderFragment
-  IFACEMETHODIMP Navigate(NavigateDirection direction, IRawElementProviderFragment ** retVal);
-  IFACEMETHODIMP GetRuntimeId(SAFEARRAY ** retVal);
-  IFACEMETHODIMP get_BoundingRectangle(UiaRect * retVal);
-  IFACEMETHODIMP GetEmbeddedFragmentRoots(SAFEARRAY ** retVal);
-  IFACEMETHODIMP SetFocus();
-  IFACEMETHODIMP get_FragmentRoot(IRawElementProviderFragmentRoot * * retVal);
-
-  // IRawElementProviderSimple
-  IFACEMETHODIMP get_ProviderOptions(ProviderOptions * retVal);
-  IFACEMETHODIMP GetPatternProvider(PATTERNID iid, IUnknown * * retVal);
-  IFACEMETHODIMP GetPropertyValue(PROPERTYID idProp, VARIANT * retVal );
-  IFACEMETHODIMP get_HostRawElementProvider(IRawElementProviderSimple ** retVal);
-
-protected:
-  bool Connected();
-
-private:
-  Microsoft::WRL::ComPtr<ICoreWindow> mWindow;
-#if defined(ACCESSIBILITY)
-  nsRefPtr<AccessibilityBridge> mAccBridge;
-  nsRefPtr<mozilla::a11y::Accessible> mAccessible;
-#endif
-};
-
-[uuid("4438135F-F624-43DE-A417-275CE7A1A0CD")]
-class UIATextElement : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags
-  <Microsoft::WRL::RuntimeClassType::WinRtClassicComMix>,
-  IUIAElement,
-  IRawElementProviderSimple,
-  IRawElementProviderFragment,
-  ITextProvider,
-  IValueProvider >
-{
-  typedef ABI::Windows::Foundation::Rect Rect;
-
-  InspectableClass(L"UIATextElement", BaseTrust);
-
-public:
-  UIATextElement() {}
-
-  // IUIAElement
-  IFACEMETHODIMP SetFocusInternal(LONG_PTR aAccessible);
-  IFACEMETHODIMP ClearFocus();
-  IFACEMETHODIMP FocusChangeEvent();
-
-  // IRawElementProviderFragment
-  IFACEMETHODIMP Navigate(NavigateDirection direction, IRawElementProviderFragment ** retVal);
-  IFACEMETHODIMP GetRuntimeId(SAFEARRAY ** retVal);
-  IFACEMETHODIMP get_BoundingRectangle(UiaRect * retVal);
-  IFACEMETHODIMP GetEmbeddedFragmentRoots(SAFEARRAY ** retVal);
-  IFACEMETHODIMP SetFocus();
-  IFACEMETHODIMP get_FragmentRoot(IRawElementProviderFragmentRoot * * retVal);
-
-  // IRawElementProviderSimple
-  IFACEMETHODIMP get_ProviderOptions(ProviderOptions * retVal);
-  IFACEMETHODIMP GetPatternProvider(PATTERNID iid, IUnknown * * retVal);
-  IFACEMETHODIMP GetPropertyValue(PROPERTYID idProp, VARIANT * retVal );
-  IFACEMETHODIMP get_HostRawElementProvider(IRawElementProviderSimple ** retVal);
-
-  // ITextProvider
-  IFACEMETHODIMP GetSelection(SAFEARRAY * *pRetVal);
-  IFACEMETHODIMP GetVisibleRanges(SAFEARRAY * *pRetVal);
-  IFACEMETHODIMP RangeFromChild(IRawElementProviderSimple *childElement, ITextRangeProvider **pRetVal);
-  IFACEMETHODIMP RangeFromPoint(UiaPoint point, ITextRangeProvider **pRetVal);
-  IFACEMETHODIMP get_DocumentRange(ITextRangeProvider **pRetVal);
-  IFACEMETHODIMP get_SupportedTextSelection(SupportedTextSelection *pRetVal);
-
-  // IValueProvider
-  IFACEMETHODIMP SetValue(LPCWSTR val);
-  IFACEMETHODIMP get_Value(BSTR *pRetVal);
-  IFACEMETHODIMP get_IsReadOnly(BOOL *pRetVal);
-
-  void SetIndexID(int id) {
-    mIndexID = id;
-  }
-
-private:
-  int mIndexID;
-  nsRefPtr<a11y::Accessible> mAccessItem;
-};
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIABridgePublic.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIABridgePublic.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/UIABridgePublic.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/UIABridgePublic.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +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/. */
-
-#pragma once
-
-#include <windows.system.h>
-#include <windows.ui.core.h>
-#include <UIAutomation.h>
-
-namespace mozilla {
-namespace widget {
-namespace winrt {
-
-// Factory function for UIABridge
-HRESULT UIABridge_CreateInstance(IInspectable **retVal);
-
-} } }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/WakeLockListener.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/WakeLockListener.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/WakeLockListener.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/WakeLockListener.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-
-#include "WakeLockListener.h"
-#include "MetroUtils.h"
-
-using namespace mozilla::widget::winrt;
-
-NS_IMPL_ISUPPORTS(WakeLockListener, nsIDOMMozWakeLockListener)
-
-NS_IMETHODIMP
-WakeLockListener::Callback(const nsAString& aTopic, const nsAString& aState)
-{
-  if (!mDisplayRequest) {
-    if (FAILED(ActivateGenericInstance(RuntimeClass_Windows_System_Display_DisplayRequest, mDisplayRequest))) {
-      NS_WARNING("Failed to instantiate IDisplayRequest, wakelocks will be broken!");
-      return NS_OK;
-    }
-  }
-
-  if (aState.EqualsLiteral("locked-foreground")) {
-    mDisplayRequest->RequestActive();
-  } else {
-    mDisplayRequest->RequestRelease();
-  }
-
-  return NS_OK;
-}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/WakeLockListener.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/WakeLockListener.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/winrt/WakeLockListener.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/winrt/WakeLockListener.h	1970-01-01 00:00:00.000000000 +0000
@@ -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/. */
-
-#include "mozwrlbase.h"
-
-#include "nscore.h"
-#include "nsString.h"
-#include "nsIDOMWakeLockListener.h"
-
-#include <windows.system.display.h>
-
-/*
- * A wake lock is used by dom to prevent the device from turning off the
- * screen when the user is viewing certain types of content, like video.
- */
-class WakeLockListener :
-  public nsIDOMMozWakeLockListener {
-public:
-  NS_DECL_ISUPPORTS;
-  NS_DECL_NSIDOMMOZWAKELOCKLISTENER;
-
-private:
-  Microsoft::WRL::ComPtr<ABI::Windows::System::Display::IDisplayRequest> mDisplayRequest;
-};
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/WinTaskbar.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/WinTaskbar.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/WinTaskbar.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/WinTaskbar.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -243,11 +243,6 @@
 // static
 bool
 WinTaskbar::GetAppUserModelID(nsAString & aDefaultGroupId) {
-  // For win8 metro builds, we can't set this. The value is static
-  // for the app.
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    return false;
-  }
   // If marked as such in prefs, use a hash of the profile path for the id
   // instead of the install path hash setup by the installer.
   bool useProfile =
@@ -336,10 +331,6 @@
   if (!IsWin7OrLater())
     return false;
 
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    return false;
-  }
-
   SetCurrentProcessExplicitAppUserModelIDPtr funcAppUserModelID = nullptr;
   bool retVal = false;
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/WinUtils.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/WinUtils.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/windows/WinUtils.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/windows/WinUtils.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -40,10 +40,6 @@
 #include "nsIThread.h"
 #include "MainThreadUtils.h"
 #include "gfxColor.h"
-#ifdef MOZ_METRO
-#include "winrt/MetroInput.h"
-#include "winrt/MetroUtils.h"
-#endif // MOZ_METRO
 
 #ifdef NS_ENABLE_TSF
 #include <textstor.h>
@@ -538,26 +534,18 @@
 WinUtils::LogToPhysFactor()
 {
   // dpi / 96.0
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-#ifdef MOZ_METRO
-    return MetroUtils::LogToPhysFactor();
-#else
-    return 1.0;
-#endif
-  } else {
-    HDC hdc = ::GetDC(nullptr);
-    double result = ::GetDeviceCaps(hdc, LOGPIXELSY) / 96.0;
-    ::ReleaseDC(nullptr, hdc);
-
-    if (result == 0) {
-      // Bug 1012487 - This can occur when the Screen DC is used off the
-      // main thread on windows. For now just assume a 100% DPI for this
-      // drawing call.
-      // XXX - fixme!
-      result = 1.0;
-    }
-    return result;
+  HDC hdc = ::GetDC(nullptr);
+  double result = ::GetDeviceCaps(hdc, LOGPIXELSY) / 96.0;
+  ::ReleaseDC(nullptr, hdc);
+
+  if (result == 0) {
+    // Bug 1012487 - This can occur when the Screen DC is used off the
+    // main thread on windows. For now just assume a 100% DPI for this
+    // drawing call.
+    // XXX - fixme!
+    result = 1.0;
   }
+  return result;
 }
 
 /* static */
@@ -1685,11 +1673,6 @@
 bool
 WinUtils::ShouldHideScrollbars()
 {
-#ifdef MOZ_METRO
-  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-    return widget::winrt::MetroInput::IsInputModeImprecise();
-  }
-#endif // MOZ_METRO
   return false;
 }
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/xremoteclient/XRemoteClient.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/xremoteclient/XRemoteClient.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/widget/xremoteclient/XRemoteClient.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/widget/xremoteclient/XRemoteClient.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -6,6 +6,7 @@
  * License, v. 2.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 "XRemoteClient.h"
 #include "prmem.h"
 #include "prprf.h"
@@ -48,8 +49,6 @@
 #endif
 #endif
 
-#define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
-
 static PRLogModuleInfo *sRemoteLm = nullptr;
 
 static int (*sOldHandler)(Display *, XErrorEvent *);
@@ -88,7 +87,7 @@
   MOZILLA_PROGRAM_PROP,
   MOZILLA_COMMANDLINE_PROP
 };
-static Atom XAtoms[ARRAY_LENGTH(XAtomNames)];
+static Atom XAtoms[MOZ_ARRAY_LENGTH(XAtomNames)];
 
 nsresult
 XRemoteClient::Init()
@@ -105,7 +104,7 @@
 
   // get our atoms
   XInternAtoms(mDisplay, const_cast<char**>(XAtomNames),
-               ARRAY_LENGTH(XAtomNames), False, XAtoms);
+               MOZ_ARRAY_LENGTH(XAtomNames), False, XAtoms);
 
   int i = 0;
   mMozVersionAtom  = XAtoms[i++];
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/CycleCollectedJSRuntime.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/CycleCollectedJSRuntime.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/CycleCollectedJSRuntime.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/CycleCollectedJSRuntime.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -60,6 +60,7 @@
 #include "mozilla/AutoRestore.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/DebuggerOnGCRunnable.h"
 #include "mozilla/dom/DOMJSClass.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "jsprf.h"
@@ -466,6 +467,7 @@
   : mGCThingCycleCollectorGlobal(sGCThingCycleCollectorGlobal)
   , mJSZoneCycleCollectorGlobal(sJSZoneCycleCollectorGlobal)
   , mJSRuntime(nullptr)
+  , mPrevGCSliceCallback(nullptr)
   , mJSHolders(256)
   , mOutOfMemoryState(OOMState::OK)
   , mLargeAllocationFailureState(OOMState::OK)
@@ -482,6 +484,7 @@
   }
   JS_SetGrayGCRootsTracer(mJSRuntime, TraceGrayJS, this);
   JS_SetGCCallback(mJSRuntime, GCCallback, this);
+  mPrevGCSliceCallback = JS::SetGCSliceCallback(mJSRuntime, GCSliceCallback);
   JS::SetOutOfMemoryCallback(mJSRuntime, OutOfMemoryCallback, this);
   JS::SetLargeAllocationFailureCallback(mJSRuntime,
                                         LargeAllocationFailureCallback, this);
@@ -746,6 +749,23 @@
 }
 
 /* static */ void
+CycleCollectedJSRuntime::GCSliceCallback(JSRuntime* aRuntime,
+                                         JS::GCProgress aProgress,
+                                         const JS::GCDescription& aDesc)
+{
+  CycleCollectedJSRuntime* self = CycleCollectedJSRuntime::Get();
+  MOZ_ASSERT(self->Runtime() == aRuntime);
+
+  if (aProgress == JS::GC_CYCLE_END) {
+    NS_WARN_IF(NS_FAILED(DebuggerOnGCRunnable::Enqueue(aRuntime, aDesc)));
+  }
+
+  if (self->mPrevGCSliceCallback) {
+    self->mPrevGCSliceCallback(aRuntime, aProgress, aDesc);
+  }
+}
+
+/* static */ void
 CycleCollectedJSRuntime::OutOfMemoryCallback(JSContext* aContext,
                                              void* aData)
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/CycleCollectedJSRuntime.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/CycleCollectedJSRuntime.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/CycleCollectedJSRuntime.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/CycleCollectedJSRuntime.h	2015-04-24 19:31:17.000000000 +0000
@@ -194,6 +194,8 @@
   static void TraceBlackJS(JSTracer* aTracer, void* aData);
   static void TraceGrayJS(JSTracer* aTracer, void* aData);
   static void GCCallback(JSRuntime* aRuntime, JSGCStatus aStatus, void* aData);
+  static void GCSliceCallback(JSRuntime* aRuntime, JS::GCProgress aProgress,
+                              const JS::GCDescription& aDesc);
   static void OutOfMemoryCallback(JSContext* aContext, void* aData);
   static void LargeAllocationFailureCallback(void* aData);
   static bool ContextCallback(JSContext* aCx, unsigned aOperation,
@@ -308,6 +310,8 @@
 
   JSRuntime* mJSRuntime;
 
+  JS::GCSliceCallback mPrevGCSliceCallback;
+
   nsDataHashtable<nsPtrHashKey<void>, nsScriptObjectTracer*> mJSHolders;
 
   typedef nsDataHashtable<nsFuncPtrHashKey<DeferredFinalizeFunction>, void*>
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/DebuggerOnGCRunnable.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/DebuggerOnGCRunnable.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/DebuggerOnGCRunnable.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/DebuggerOnGCRunnable.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=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/. */
+
+#include "mozilla/DebuggerOnGCRunnable.h"
+
+#include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/CycleCollectedJSRuntime.h"
+#include "mozilla/Move.h"
+#include "js/Debug.h"
+
+namespace mozilla {
+
+/* static */ NS_METHOD
+DebuggerOnGCRunnable::Enqueue(JSRuntime* aRt, const JS::GCDescription& aDesc)
+{
+  auto gcEvent = aDesc.toGCEvent(aRt);
+  if (!gcEvent) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  nsRefPtr<DebuggerOnGCRunnable> runOnGC =
+    new DebuggerOnGCRunnable(Move(gcEvent));
+  return NS_DispatchToCurrentThread(runOnGC);
+}
+
+NS_IMETHODIMP
+DebuggerOnGCRunnable::Run()
+{
+  AutoJSAPI jsapi;
+  jsapi.Init();
+  if (!JS::dbg::FireOnGarbageCollectionHook(jsapi.cx(), Move(mGCData))) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DebuggerOnGCRunnable::Cancel()
+{
+  mGCData = nullptr;
+  return NS_OK;
+}
+
+} // namespace mozilla
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/DebuggerOnGCRunnable.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/DebuggerOnGCRunnable.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/DebuggerOnGCRunnable.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/DebuggerOnGCRunnable.h	2015-04-24 19:31:17.000000000 +0000
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=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/. */
+
+#ifndef mozilla_DebuggerOnGCRunnable_h
+#define mozilla_DebuggerOnGCRunnable_h
+
+#include "nsThreadUtils.h"
+#include "js/GCAPI.h"
+#include "mozilla/Move.h"
+#include "mozilla/UniquePtr.h"
+
+namespace mozilla {
+
+// Runnable to fire the SpiderMonkey Debugger API's onGarbageCollection hook.
+class DebuggerOnGCRunnable : public nsCancelableRunnable
+{
+  JS::dbg::GarbageCollectionEvent::Ptr mGCData;
+
+  explicit DebuggerOnGCRunnable(JS::dbg::GarbageCollectionEvent::Ptr&& aGCData)
+    : mGCData(Move(aGCData))
+  { }
+
+public:
+  static NS_METHOD Enqueue(JSRuntime* aRt, const JS::GCDescription& aDesc);
+
+  NS_DECL_NSIRUNNABLE
+  NS_DECL_NSICANCELABLERUNNABLE
+};
+
+} // namespace mozilla
+
+#endif // ifdef mozilla_dom_DebuggerOnGCRunnable_h
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/ErrorList.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/ErrorList.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/ErrorList.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/ErrorList.h	2015-04-24 19:31:17.000000000 +0000
@@ -678,6 +678,7 @@
   ERROR(NS_ERROR_MALWARE_URI,           FAILURE(30)),
   ERROR(NS_ERROR_PHISHING_URI,          FAILURE(31)),
   ERROR(NS_ERROR_TRACKING_URI,          FAILURE(34)),
+  ERROR(NS_ERROR_UNWANTED_URI,          FAILURE(35)),
   /* Used when "Save Link As..." doesn't see the headers quickly enough to
    * choose a filename.  See nsContextMenu.js. */
   ERROR(NS_ERROR_SAVE_LINK_AS_TIMEOUT,  FAILURE(32)),
@@ -908,7 +909,6 @@
    * the application should be restarted.  This condition corresponds to the
    * case in which nsIAppStartup::Quit was called with the eRestart flag. */
   ERROR(NS_SUCCESS_RESTART_APP,          SUCCESS(1)),
-  ERROR(NS_SUCCESS_RESTART_METRO_APP,    SUCCESS(2)),
   ERROR(NS_SUCCESS_RESTART_APP_NOT_SAME_PROFILE,    SUCCESS(3)),
   ERROR(NS_SUCCESS_UNORM_NOTFOUND,  SUCCESS(17)),
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/moz.build thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/moz.build
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/moz.build	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/moz.build	2015-04-24 19:31:17.000000000 +0000
@@ -77,6 +77,7 @@
     'CountingAllocatorBase.h',
     'CycleCollectedJSRuntime.h',
     'Debug.h',
+    'DebuggerOnGCRunnable.h',
     'DeferredFinalize.h',
     'ErrorNames.h',
     'HoldDropJSObjects.h',
@@ -101,6 +102,7 @@
     'ClearOnShutdown.cpp',
     'CycleCollectedJSRuntime.cpp',
     'Debug.cpp',
+    'DebuggerOnGCRunnable.cpp',
     'DeferredFinalize.cpp',
     'ErrorNames.cpp',
     'HoldDropJSObjects.cpp',
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsDebugImpl.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsDebugImpl.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsDebugImpl.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsDebugImpl.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -41,9 +41,6 @@
 #if defined(XP_WIN)
 #include <tchar.h>
 #include "nsString.h"
-#ifdef MOZ_METRO
-#include "nsWindowsHelpers.h"
-#endif
 #endif
 
 #if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsMemoryInfoDumper.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsMemoryInfoDumper.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsMemoryInfoDumper.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsMemoryInfoDumper.h	2015-04-24 19:31:17.000000000 +0000
@@ -10,8 +10,6 @@
 #include "nsIMemoryInfoDumper.h"
 #include <stdio.h>
 
-class nsACString;
-
 /**
  * This class facilitates dumping information about our memory usage to disk.
  *
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsQueryObject.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsQueryObject.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsQueryObject.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsQueryObject.h	2015-04-24 19:31:17.000000000 +0000
@@ -15,7 +15,7 @@
 /*****************************************************************************/
 
 template<class T>
-class MOZ_STACK_CLASS nsQueryObject : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsQueryObject final : public nsCOMPtr_helper
 {
 public:
   explicit nsQueryObject(T* aRawPtr)
@@ -35,7 +35,7 @@
 };
 
 template<class T>
-class MOZ_STACK_CLASS nsQueryObjectWithError : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsQueryObjectWithError final : public nsCOMPtr_helper
 {
 public:
   nsQueryObjectWithError(T* aRawPtr, nsresult* aErrorPtr)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsSystemInfo.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsSystemInfo.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsSystemInfo.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsSystemInfo.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -194,22 +194,9 @@
     }
   }
 
-#if defined(XP_WIN) && defined(MOZ_METRO)
-  // Create "hasWindowsTouchInterface" property.
-  nsAutoString version;
-  rv = GetPropertyAsAString(NS_LITERAL_STRING("version"), version);
-  NS_ENSURE_SUCCESS(rv, rv);
-  double versionDouble = version.ToDouble(&rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = SetPropertyAsBool(NS_ConvertASCIItoUTF16("hasWindowsTouchInterface"),
-                         versionDouble >= 6.2);
-  NS_ENSURE_SUCCESS(rv, rv);
-#else
   rv = SetPropertyAsBool(NS_ConvertASCIItoUTF16("hasWindowsTouchInterface"),
                          false);
   NS_ENSURE_SUCCESS(rv, rv);
-#endif
 
   // Additional informations not available through PR_GetSystemInfo.
   SetInt32Property(NS_LITERAL_STRING("pagesize"), PR_GetPageSize());
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsTraceRefcnt.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsTraceRefcnt.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsTraceRefcnt.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsTraceRefcnt.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -116,6 +116,22 @@
 {
   uint64_t mCreates;
   uint64_t mDestroys;
+
+  bool HaveLeaks() const
+  {
+    return mCreates != mDestroys;
+  }
+
+  void Clear()
+  {
+    mCreates = 0;
+    mDestroys = 0;
+  }
+
+  int64_t NumLeaked() const
+  {
+    return (int64_t)(mCreates - mDestroys);
+  }
 };
 
 #ifdef DEBUG
@@ -247,9 +263,10 @@
   BloatEntry(const char* aClassName, uint32_t aClassSize)
     : mClassSize(aClassSize)
   {
+    NS_ASSERTION(strlen(aClassName) > 0, "BloatEntry name must be non-empty");
     mClassName = PL_strdup(aClassName);
-    Clear(&mNewStats);
-    Clear(&mAllStats);
+    mNewStats.Clear();
+    mAllStats.Clear();
     mTotalLeaked = 0;
   }
 
@@ -267,17 +284,11 @@
     return mClassName;
   }
 
-  static void Clear(nsTraceRefcntStats* aStats)
-  {
-    aStats->mCreates = 0;
-    aStats->mDestroys = 0;
-  }
-
   void Accumulate()
   {
     mAllStats.mCreates += mNewStats.mCreates;
     mAllStats.mDestroys += mNewStats.mDestroys;
-    Clear(&mNewStats);
+    mNewStats.Clear();
   }
 
   void Ctor()
@@ -315,9 +326,7 @@
     aTotal->mAllStats.mDestroys += mNewStats.mDestroys + mAllStats.mDestroys;
     uint64_t count = (mNewStats.mCreates + mAllStats.mCreates);
     aTotal->mClassSize += mClassSize * count;    // adjust for average in DumpTotal
-    aTotal->mTotalLeaked += (uint64_t)(mClassSize *
-                                       ((mNewStats.mCreates + mAllStats.mCreates)
-                                        - (mNewStats.mDestroys + mAllStats.mDestroys)));
+    aTotal->mTotalLeaked += mClassSize * (mNewStats.NumLeaked() + mAllStats.NumLeaked());
   }
 
   void DumpTotal(FILE* aOut)
@@ -326,11 +335,6 @@
     Dump(-1, aOut, nsTraceRefcnt::ALL_STATS);
   }
 
-  static bool HaveLeaks(nsTraceRefcntStats* aStats)
-  {
-    return aStats->mCreates != aStats->mDestroys;
-  }
-
   bool PrintDumpHeader(FILE* aOut, const char* aMsg,
                        nsTraceRefcnt::StatisticsType aType)
   {
@@ -338,14 +342,14 @@
             XRE_ChildProcessTypeToString(XRE_GetProcessType()), getpid());
     nsTraceRefcntStats& stats =
       (aType == nsTraceRefcnt::NEW_STATS) ? mNewStats : mAllStats;
-    if (gLogLeaksOnly && !HaveLeaks(&stats)) {
+    if (gLogLeaksOnly && !stats.HaveLeaks()) {
       return false;
     }
 
     fprintf(aOut,
             "\n" \
             "     |<----------------Class--------------->|<-----Bytes------>|<----Objects---->|\n" \
-            "                                              Per-Inst   Leaked    Total      Rem\n");
+            "     |                                      | Per-Inst   Leaked|   Total      Rem|\n");
 
     this->DumpTotal(aOut);
 
@@ -356,27 +360,24 @@
   {
     nsTraceRefcntStats* stats =
       (aType == nsTraceRefcnt::NEW_STATS) ? &mNewStats : &mAllStats;
-    if (gLogLeaksOnly && !HaveLeaks(stats)) {
+    if (gLogLeaksOnly && !stats->HaveLeaks()) {
       return;
     }
 
-    if ((stats->mCreates - stats->mDestroys) != 0 ||
-        stats->mCreates != 0) {
-      fprintf(aOut, "%4d %-40.40s %8d %8" PRIu64 " %8" PRIu64 " %8" PRIu64 "\n",
+    if (stats->HaveLeaks() || stats->mCreates != 0) {
+      fprintf(aOut, "%4d |%-38.38s| %8d %8" PRId64 "|%8" PRIu64 " %8" PRId64"|\n",
               aIndex + 1, mClassName,
-              (int32_t)mClassSize,
-              (nsCRT::strcmp(mClassName, "TOTAL"))
-                ? (uint64_t)((stats->mCreates - stats->mDestroys) * mClassSize)
-                : mTotalLeaked,
+              GetClassSize(),
+              nsCRT::strcmp(mClassName, "TOTAL") ? (stats->NumLeaked() * GetClassSize()) : mTotalLeaked,
               stats->mCreates,
-              (stats->mCreates - stats->mDestroys));
+              stats->NumLeaked());
     }
   }
 
 protected:
   char*         mClassName;
   double        mClassSize;     // this is stored as a double because of the way we compute the avg class size for total bloat
-  uint64_t      mTotalLeaked; // used only for TOTAL entry
+  int64_t       mTotalLeaked; // used only for TOTAL entry
   nsTraceRefcntStats mNewStats;
   nsTraceRefcntStats mAllStats;
 };
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsWindowsHelpers.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsWindowsHelpers.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/base/nsWindowsHelpers.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/base/nsWindowsHelpers.h	2015-04-24 19:31:17.000000000 +0000
@@ -127,36 +127,6 @@
 
 namespace {
 
-bool inline
-IsRunningInWindowsMetro()
-{
-  static bool alreadyChecked = false;
-  static bool isMetro = false;
-  if (alreadyChecked) {
-    return isMetro;
-  }
-
-  HMODULE user32DLL = LoadLibraryW(L"user32.dll");
-  if (!user32DLL) {
-    return false;
-  }
-
-  typedef BOOL (WINAPI* IsImmersiveProcessFunc)(HANDLE aProcess);
-  IsImmersiveProcessFunc IsImmersiveProcessPtr =
-    (IsImmersiveProcessFunc)GetProcAddress(user32DLL,
-                                           "IsImmersiveProcess");
-  FreeLibrary(user32DLL);
-  if (!IsImmersiveProcessPtr) {
-    // isMetro is already set to false.
-    alreadyChecked = true;
-    return false;
-  }
-
-  isMetro = IsImmersiveProcessPtr(GetCurrentProcess());
-  alreadyChecked = true;
-  return isMetro;
-}
-
 HMODULE inline
 LoadLibrarySystem32(LPCWSTR aModule)
 {
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/build/FileLocation.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/build/FileLocation.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/build/FileLocation.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/build/FileLocation.h	2015-04-24 19:31:17.000000000 +0000
@@ -90,9 +90,9 @@
    * or not.
    */
 #if defined(MOZILLA_XPCOMRT_API)
-  operator bool() const { return mBaseFile; }
+  explicit operator bool() const { return mBaseFile; }
 #else
-  operator bool() const { return mBaseFile || mBaseZip; }
+  explicit operator bool() const { return mBaseFile || mBaseZip; }
 #endif // defined(MOZILLA_XPCOMRT_API)
 
   /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/build/IOInterposer.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/build/IOInterposer.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/build/IOInterposer.cpp	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/build/IOInterposer.cpp	2015-04-24 19:31:17.000000000 +0000
@@ -428,12 +428,7 @@
   if (!sThreadLocalData.init()) {
     return false;
   }
-#if defined(XP_WIN)
-  bool isMainThread =
-    XRE_GetWindowsEnvironment() != WindowsEnvironmentType_Metro;
-#else
   bool isMainThread = true;
-#endif
   RegisterCurrentThread(isMainThread);
   sMasterList = new MasterList();
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/build/nsXPCOMPrivate.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/build/nsXPCOMPrivate.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/build/nsXPCOMPrivate.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/build/nsXPCOMPrivate.h	2015-04-24 19:31:17.000000000 +0000
@@ -14,7 +14,6 @@
 
 class nsStringContainer;
 class nsCStringContainer;
-class nsIComponentLoader;
 class nsPurpleBufferEntry;
 
 /**
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/build/nsXULAppAPI.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/build/nsXULAppAPI.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/build/nsXULAppAPI.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/build/nsXULAppAPI.h	2015-04-24 19:31:17.000000000 +0000
@@ -143,14 +143,6 @@
 #define XRE_OS_UPDATE_APPLY_TO_DIR "OSUpdApplyToD"
 
 /**
- * Platform flag values for XRE_main.
- *
- * XRE_MAIN_FLAG_USE_METRO - On Windows, use the winrt backend. Defaults
- * to win32 backend.
- */
-#define XRE_MAIN_FLAG_USE_METRO 0x01
-
-/**
  * Begin an XUL application. Does not return until the user exits the
  * application.
  *
@@ -462,24 +454,6 @@
 XRE_API(void,
         XRE_StopLateWriteChecks, (void))
 
-#ifdef XP_WIN
-/**
- * Valid environment types for XRE_GetWindowsEnvironment.
- */
-enum WindowsEnvironmentType
-{
-  WindowsEnvironmentType_Desktop = 0,
-  WindowsEnvironmentType_Metro = 1
-};
-
-/**
- * Retrieve the Windows desktop environment libXUL is running
- * under. Valid after a call to XRE_main.
- */
-XRE_API(WindowsEnvironmentType,
-        XRE_GetWindowsEnvironment, ())
-#endif // XP_WIN
-
 #ifdef MOZ_B2G_LOADER
 XRE_API(int,
         XRE_ProcLoaderServiceRun, (pid_t, int, int argc, const char* argv[],
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/build/Omnijar.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/build/Omnijar.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/build/Omnijar.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/build/Omnijar.h	2015-04-24 19:31:17.000000000 +0000
@@ -13,8 +13,6 @@
 #include "nsIFile.h"
 #include "nsZipArchive.h"
 
-class nsIURI;
-
 namespace mozilla {
 
 class Omnijar
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/components/ManifestParser.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/components/ManifestParser.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/components/ManifestParser.h	2015-04-22 13:06:21.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/components/ManifestParser.h	2015-04-24 19:31:17.000000000 +0000
@@ -13,8 +13,6 @@
 #endif // !defined(MOZILLA_XPCOMRT_API)
 #include "mozilla/FileLocation.h"
 
-class nsIFile;
-
 void ParseManifest(NSLocationType aType, mozilla::FileLocation& aFile,
                    char* aBuf, bool aChromeOnly, bool aXPTOnly = false);
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/ds/nsObserverList.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/ds/nsObserverList.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/ds/nsObserverList.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/ds/nsObserverList.h	2015-04-24 19:31:17.000000000 +0000
@@ -17,10 +17,6 @@
 #include "nsISimpleEnumerator.h"
 #include "mozilla/Attributes.h"
 
-namespace mozilla {
-class ObserverServiceReporter;
-} // namespace mozilla
-
 struct ObserverRef
 {
   ObserverRef(const ObserverRef& aO) : isWeakRef(aO.isWeakRef), ref(aO.ref) {}
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsArrayUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsArrayUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsArrayUtils.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsArrayUtils.h	2015-04-24 19:31:17.000000000 +0000
@@ -11,7 +11,7 @@
 #include "nsIArray.h"
 
 // helper class for do_QueryElementAt
-class MOZ_STACK_CLASS nsQueryArrayElementAt : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsQueryArrayElementAt final : public nsCOMPtr_helper
 {
 public:
   nsQueryArrayElementAt(nsIArray* aArray, uint32_t aIndex,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsComponentManagerUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsComponentManagerUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsComponentManagerUtils.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsComponentManagerUtils.h	2015-04-24 19:31:17.000000000 +0000
@@ -26,7 +26,7 @@
                             void** aResult);
 
 
-class MOZ_STACK_CLASS nsCreateInstanceByCID : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsCreateInstanceByCID final : public nsCOMPtr_helper
 {
 public:
   nsCreateInstanceByCID(const nsCID& aCID, nsISupports* aOuter,
@@ -46,7 +46,7 @@
   nsresult*       mErrorPtr;
 };
 
-class MOZ_STACK_CLASS nsCreateInstanceByContractID : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsCreateInstanceByContractID final : public nsCOMPtr_helper
 {
 public:
   nsCreateInstanceByContractID(const char* aContractID, nsISupports* aOuter,
@@ -65,7 +65,7 @@
   nsresult*     mErrorPtr;
 };
 
-class MOZ_STACK_CLASS nsCreateInstanceFromFactory : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsCreateInstanceFromFactory final : public nsCOMPtr_helper
 {
 public:
   nsCreateInstanceFromFactory(nsIFactory* aFactory, nsISupports* aOuter,
@@ -124,7 +124,7 @@
 }
 
 
-class MOZ_STACK_CLASS nsGetClassObjectByCID : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsGetClassObjectByCID final : public nsCOMPtr_helper
 {
 public:
   nsGetClassObjectByCID(const nsCID& aCID, nsresult* aErrorPtr)
@@ -140,7 +140,7 @@
   nsresult*       mErrorPtr;
 };
 
-class MOZ_STACK_CLASS nsGetClassObjectByContractID : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsGetClassObjectByContractID final : public nsCOMPtr_helper
 {
 public:
   nsGetClassObjectByContractID(const char* aContractID, nsresult* aErrorPtr)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsCOMPtr.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsCOMPtr.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsCOMPtr.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsCOMPtr.h	2015-04-24 19:31:17.000000000 +0000
@@ -109,9 +109,6 @@
 #endif
 
 namespace mozilla {
-
-struct unused_t;
-
 namespace dom {
 template<class T> class OwningNonNull;
 } // namespace dom
@@ -172,7 +169,7 @@
   nsISupports* MOZ_OWNING_REF mRawPtr;
 };
 
-class nsQueryInterfaceWithError
+class nsQueryInterfaceWithError final
 {
 public:
   nsQueryInterfaceWithError(nsISupports* aRawPtr, nsresult* aError)
@@ -221,7 +218,7 @@
 
 ////////////////////////////////////////////////////////////////////////////
 // Using servicemanager with COMPtrs
-class nsGetServiceByCID
+class nsGetServiceByCID final
 {
 public:
   explicit nsGetServiceByCID(const nsCID& aCID) : mCID(aCID) {}
@@ -232,7 +229,7 @@
   const nsCID& mCID;
 };
 
-class nsGetServiceByCIDWithError
+class nsGetServiceByCIDWithError final
 {
 public:
   nsGetServiceByCIDWithError(const nsCID& aCID, nsresult* aErrorPtr)
@@ -248,7 +245,7 @@
   nsresult* mErrorPtr;
 };
 
-class nsGetServiceByContractID
+class nsGetServiceByContractID final
 {
 public:
   explicit nsGetServiceByContractID(const char* aContractID)
@@ -262,7 +259,7 @@
   const char* mContractID;
 };
 
-class nsGetServiceByContractIDWithError
+class nsGetServiceByContractIDWithError final
 {
 public:
   nsGetServiceByContractIDWithError(const char* aContractID, nsresult* aErrorPtr)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsDebug.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsDebug.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsDebug.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsDebug.h	2015-04-24 19:31:17.000000000 +0000
@@ -197,12 +197,6 @@
 #define STATIC_PASTE2(X,Y) X ## Y
 #define STATIC_PASTE1(X,Y) STATIC_PASTE2(X,Y)
 
-#define STATIC_ASSERT(COND)                          \
-  do {                                               \
-    __attribute__((assert_static(#COND), unused))    \
-    int STATIC_PASTE1(assert_static_, __COUNTER__);  \
-  } while(0)
-
 #define STATIC_ASSUME(COND)                          \
   do {                                               \
     __attribute__((assume_static(#COND), unused))    \
@@ -224,7 +218,6 @@
 #define STATIC_INVARIANT(COND)             /* nothing */
 #define STATIC_INVARIANT_ASSUME(COND)      /* nothing */
 
-#define STATIC_ASSERT(COND)          do { /* nothing */ } while(0)
 #define STATIC_ASSUME(COND)          do { /* nothing */ } while(0)
 #define STATIC_ASSERT_RUNTIME(COND)  do { /* nothing */ } while(0)
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h	2015-04-24 19:31:17.000000000 +0000
@@ -22,7 +22,7 @@
                                reinterpret_cast<void**>(aDestination));
 }
 
-class MOZ_STACK_CLASS nsGetInterface : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsGetInterface final : public nsCOMPtr_helper
 {
 public:
   nsGetInterface(nsISupports* aSource, nsresult* aError)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsIWeakReferenceUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsIWeakReferenceUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsIWeakReferenceUtils.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsIWeakReferenceUtils.h	2015-04-24 19:31:17.000000000 +0000
@@ -30,7 +30,7 @@
 }
 
 
-class MOZ_STACK_CLASS nsQueryReferent : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsQueryReferent final : public nsCOMPtr_helper
 {
 public:
   nsQueryReferent(nsIWeakReference* aWeakPtr, nsresult* aError)
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsServiceManagerUtils.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsServiceManagerUtils.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsServiceManagerUtils.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsServiceManagerUtils.h	2015-04-24 19:31:17.000000000 +0000
@@ -34,7 +34,7 @@
   return nsGetServiceByContractIDWithError(aContractID, aError);
 }
 
-class MOZ_STACK_CLASS nsGetServiceFromCategory : public nsCOMPtr_helper
+class MOZ_STACK_CLASS nsGetServiceFromCategory final : public nsCOMPtr_helper
 {
 public:
   nsGetServiceFromCategory(const char* aCategory, const char* aEntry,
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsTArray.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsTArray.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/nsTArray.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/nsTArray.h	2015-04-24 19:31:18.000000000 +0000
@@ -112,7 +112,7 @@
   // Note: allows implicit conversions from and to bool
   MOZ_IMPLICIT nsTArrayFallibleResult(bool aResult) : mResult(aResult) {}
 
-  operator bool() { return mResult; }
+  MOZ_IMPLICIT operator bool() { return mResult; }
 
 private:
   bool mResult;
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/tests/gtest/TestGCPostBarriers.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/tests/gtest/TestGCPostBarriers.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/glue/tests/gtest/TestGCPostBarriers.cpp	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/glue/tests/gtest/TestGCPostBarriers.cpp	2015-04-24 19:31:18.000000000 +0000
@@ -88,7 +88,7 @@
     "global", JSCLASS_GLOBAL_FLAGS,
     nullptr, nullptr, nullptr, nullptr,
     nullptr, nullptr, nullptr, nullptr,
-    nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr,
     JS_GlobalObjectTraceHook
   };
 
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h	2015-04-24 19:31:18.000000000 +0000
@@ -63,7 +63,6 @@
 
 #define NS_APP_PREFS_50_DIR                     "PrefD"         // Directory which contains user prefs       
 #define NS_APP_PREFS_50_FILE                    "PrefF"
-#define NS_METRO_APP_PREFS_50_FILE              "MetroPrefF"    // Metro browser prefs file
 #define NS_APP_PREFS_DEFAULTS_DIR_LIST          "PrefDL"
 #define NS_EXT_PREFS_DEFAULTS_DIR_LIST          "ExtPrefDL"
 #define NS_APP_PREFS_OVERRIDE_DIR               "PrefDOverride" // Directory for per-profile defaults
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/io/nsLocalFileWin.cpp thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/io/nsLocalFileWin.cpp
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/io/nsLocalFileWin.cpp	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/io/nsLocalFileWin.cpp	2015-04-24 19:31:18.000000000 +0000
@@ -212,9 +212,6 @@
     SHELLEXECUTEINFOW seinfo;
     memset(&seinfo, 0, sizeof(seinfo));
     seinfo.cbSize = sizeof(SHELLEXECUTEINFOW);
-    if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
-      seinfo.fMask  = SEE_MASK_FLAG_LOG_USAGE;
-    }
     seinfo.hwnd   = nullptr;
     seinfo.lpVerb = nullptr;
     seinfo.lpFile = mResolvedPath.get();
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/reflect/xptinfo/ShimInterfaceInfo.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/reflect/xptinfo/ShimInterfaceInfo.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/reflect/xptinfo/ShimInterfaceInfo.h	2015-04-22 13:06:22.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/reflect/xptinfo/ShimInterfaceInfo.h	2015-04-24 19:31:18.000000000 +0000
@@ -19,7 +19,6 @@
 
 namespace mozilla {
 namespace dom {
-struct ConstantSpec;
 struct NativePropertyHooks;
 }
 }
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/reflect/xptinfo/xptinfo.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/reflect/xptinfo/xptinfo.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/reflect/xptinfo/xptinfo.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/reflect/xptinfo/xptinfo.h	2015-04-24 19:31:18.000000000 +0000
@@ -11,8 +11,6 @@
 #include "nscore.h"
 #include "xpt_struct.h"
 
-class nsIInterfaceInfoManager;
-
 // Flyweight wrapper classes for xpt_struct.h structs. 
 // Everything here is dependent upon - and sensitive to changes in -
 // xpcom/typelib/xpt/xpt_struct.h!
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/typelib/xpt/xpt_arena.h thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/typelib/xpt/xpt_arena.h
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpcom/typelib/xpt/xpt_arena.h	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpcom/typelib/xpt/xpt_arena.h	2015-04-24 19:31:18.000000000 +0000
@@ -12,6 +12,7 @@
 
 #include "prtypes.h"
 #include <stdlib.h>
+#include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
 #include <stdint.h>
 
@@ -83,7 +84,8 @@
 
 #ifdef DEBUG
 XPT_PUBLIC_API(void)
-XPT_AssertFailed(const char *s, const char *file, uint32_t lineno);
+XPT_AssertFailed(const char *s, const char *file, uint32_t lineno)
+  MOZ_PRETEND_NORETURN_FOR_STATIC_ANALYSIS;
 #define XPT_ASSERT(_expr) \
     ((_expr)?((void)0):XPT_AssertFailed(# _expr, __FILE__, __LINE__))
 #else
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpfe/appshell/test/chrome.ini thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpfe/appshell/test/chrome.ini
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/mozilla/xpfe/appshell/test/chrome.ini	2015-04-22 13:06:23.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/mozilla/xpfe/appshell/test/chrome.ini	2015-04-24 19:31:18.000000000 +0000
@@ -2,4 +2,3 @@
 skip-if = buildapp == 'b2g'
 
 [test_hiddenPrivateWindow.xul]
-skip-if = toolkit == "windows"
diff -Nru thunderbird-trunk-40.0~a1~hg20150421r17821.240313/suite/installer/package-manifest.in thunderbird-trunk-40.0~a1~hg20150424r17837.240895/suite/installer/package-manifest.in
--- thunderbird-trunk-40.0~a1~hg20150421r17821.240313/suite/installer/package-manifest.in	2015-04-22 13:03:29.000000000 +0000
+++ thunderbird-trunk-40.0~a1~hg20150424r17837.240895/suite/installer/package-manifest.in	2015-04-24 19:30:09.000000000 +0000
@@ -208,6 +208,7 @@
 @RESPATH@/components/dom_offline.xpt
 @RESPATH@/components/dom_permissionsettings.xpt
 @RESPATH@/components/dom_power.xpt
+@RESPATH@/components/dom_push.xpt
 @RESPATH@/components/dom_presentation.xpt
 @RESPATH@/components/dom_quota.xpt
 @RESPATH@/components/dom_range.xpt
@@ -477,6 +478,9 @@
 @RESPATH@/components/PlacesCategoriesStarter.js
 @RESPATH@/components/pluginGlue.manifest
 @RESPATH@/components/ProcessSingleton.manifest
+@RESPATH@/components/Push.js
+@RESPATH@/components/Push.manifest
+@RESPATH@/components/PushNotificationService.js
 @RESPATH@/components/MainProcessSingleton.js
 @RESPATH@/components/ContentProcessSingleton.js
 @RESPATH@/components/servicesComponents.manifest
@@ -783,6 +787,8 @@
 @RESPATH@/components/mimeJSComponents.js
 @RESPATH@/components/msgAsyncPrompter.js
 @RESPATH@/components/msgMime.manifest
+; OAuth2 for mail
+@RESPATH@/components/msgOAuth2Module.js
 @RESPATH@/components/newsblog.js
 @RESPATH@/components/newsblog.manifest
 @RESPATH@/components/nsAbAutoCompleteMyDomain.js